diff --git a/vim/.vimrc b/vim/.vimrc
new file mode 100755
index 0000000..b18b0ab
--- /dev/null
+++ b/vim/.vimrc
@@ -0,0 +1,53 @@
+set encoding=utf-8
+execute pathogen#infect('plugins/{}')
+execute pathogen#infect('snippets/{}')
+autocmd vimenter * Helptags
+syntax on
+filetype plugin on
+filetype plugin indent on
+set number
+set relativenumber
+set autochdir
+set expandtab
+
+let &undodir = expand('~/.vim/.undo')
+let &backupdir = expand('~/.vim/.backup//')
+let &directory = expand('~/.vim/.swp//')
+set undofile
+
+colorscheme new-railscasts
+source ~/.vim/config/plugin.vim
+source ~/.vim/config/keybindings.vim
+
+set tabstop=4
+set shiftwidth=4
+set cc=120
+let g:netrw_liststyle = 3
+let g:netrw_browse_split = 4
+let g:netrw_winsize = 20
+let g:netrw_altv = 0
+let g:netrw_banner = 0
+let g:tex_conceal = ""
+
+function! ForceResizeNetrw()
+let curWin = winnr()
+	for winnr in range(1, winnr('$'))
+		if getwinvar(winnr, '&ft')=="netrw"
+			if curWin != winnr
+				silent noautocmd exec winnr 'wincmd w'
+				silent noautocmd exec 'vertical resize ' . g:netrw_winsize
+				silent noautocmd exec curWin 'wincmd w'
+			else
+				silent noautocmd exec 'vertical resize ' . g:netrw_winsize
+			endif
+		endif
+	endfor
+endfunction
+
+
+autocmd WinEnter * call ForceResizeNetrw()
+" autocmd VimEnter * Vex
+autocmd BufNew * call ForceResizeNetrw()
+
+" Transparency
+hi Normal guibg=NONE ctermbg=NONE
diff --git a/vim/autoload/pathogen.vim b/vim/autoload/pathogen.vim
new file mode 100755
index 0000000..2ec30e1
--- /dev/null
+++ b/vim/autoload/pathogen.vim
@@ -0,0 +1,266 @@
+" 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() 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.
+" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}"
+" on versions of Vim without native package support.
+function! pathogen#infect(...) abort
+  if a:0
+    let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")')
+  else
+    let paths = ['bundle/{}', 'pack/{}/start/{}']
+  endif
+  if has('packages')
+    call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"')
+  endif
+  let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$'
+  for path in filter(copy(paths), 'v:val =~# static')
+    call pathogen#surround(path)
+  endfor
+  for path in filter(copy(paths), 'v:val !~# static')
+    if path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+      call pathogen#surround(path)
+    else
+      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 : ''
+  let pattern = substitute(a:pattern, '^[~$][^\/]*', '\=expand(submatch(0))', '')
+  if pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(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 pattern =~# '{}'
+    let pat = matchstr(pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = pattern[strlen(pat) : -1]
+    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    let results = [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
+
+" 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/colors/happy_hacking.vim b/vim/colors/happy_hacking.vim
new file mode 100644
index 0000000..9361d03
--- /dev/null
+++ b/vim/colors/happy_hacking.vim
@@ -0,0 +1,361 @@
+" # Happy Hacking
+"
+" Happy Hacking is a color scheme heavily inspired by Autumn
+" (https://github.com/yorickpeterse/autumn.vim). The main differences between
+" the two themes are various small tweaks to the colors, an easier to maintain
+" codebase and a much wider range of supported languages. On top of that
+" various inconsistencies that were present in Autumn have been resolved.
+"
+" As with any Vim color scheme the overall look and feel heavily depends on how
+" accurate a syntax highlighter for a language is. For example, the Ruby syntax
+" highlighter is fairly accurate and allows you to customize a lot whereas for
+" example C has a more generic highlighting setup. At worst this will result in
+" a bit more heavy use of red as it's one of the base colors of this theme.
+"
+" Author:  Yorick Peterse
+" License: MIT
+" Website: https://github.com/yorickpeterse/happy_hacking.vim
+"
+
+set background=dark
+set t_Co=256
+
+hi clear
+
+if exists("syntax_on")
+  syntax reset
+end
+
+let colors_name = "happy_hacking"
+
+" ============================================================================
+" GUI Colors
+"
+" This section defines all the colors to use when running Vim as a GUI (Gvim,
+" Macvim, etc). These colors are *not* used when Vim is run in a terminal.
+
+let s:white    = "#F3F2CC"
+let s:black1   = "#000000"
+let s:black2   = "#202020"
+let s:yellow   = "#FAD566"
+let s:blue     = "#81A2C7"
+let s:green    = "#8daf67"
+let s:turqoise = "#B3EBBF"
+let s:orange   = "#FAA166"
+let s:pink     = "#F77EBD"
+let s:red      = "#F05E48"
+let s:gray1    = "#292929"
+let s:gray2    = "#525252"
+let s:gray3    = "#6c6c6c"
+let s:gray4    = "#7c7c7c"
+let s:gray5    = "#aaaaaa"
+let s:gray6    = "#393939"
+
+" ============================================================================
+" Terminal Colors
+"
+" This section defines all the colors that are used when Vim is run inside a
+" terminal instead of a GUI.
+
+let s:t_white    = "230"
+let s:t_black1   = "16"
+let s:t_black2   = "16"
+let s:t_yellow   = "221"
+let s:t_blue     = "103"
+let s:t_green    = "107"
+let s:t_turqoise = "157"
+let s:t_orange   = "179"
+let s:t_pink     = "211"
+let s:t_gold     = "186"
+let s:t_red      = "203"
+let s:t_gray1    = "235"
+let s:t_gray2    = "59"
+let s:t_gray3    = "59"
+let s:t_gray4    = "102"
+let s:t_gray5    = "145"
+let s:t_gray6    = "237"
+
+" ============================================================================
+" Color Functions
+
+" Function for creating a highlight group with a GUI/Terminal foreground and
+" background. No font styling is applied.
+function! s:Color(group, fg, bg, t_fg, t_bg, ...)
+  if empty(a:0)
+    let style = "NONE"
+  else
+    let style = a:1
+  end
+
+  exe "hi " . a:group . " guifg=" . a:fg . " guibg=" . a:bg
+    \ . " ctermfg=" . a:t_fg
+    \ . " ctermbg=" . a:t_bg
+    \ . " gui="     . style
+    \ . " cterm="   . style
+endfunction
+
+" ============================================================================
+" General Syntax Elements
+"
+" Definitions for generic syntax elements such as strings and numbers.
+
+call s:Color("Pmenu",    s:white,  s:black2, s:t_white,  s:t_gray6)
+" Modified Pmenu! original white black2 t_white t_black
+" ~rad4day
+call s:Color("PmenuSel", s:white,  s:gray2,  s:t_white,  s:t_gray2)
+call s:Color("Cursor",   "NONE",   s:gray2,  "NONE",     s:t_gray2)
+call s:Color("Normal",   s:white,  s:gray1,  s:t_white,  s:t_gray1)
+call s:Color("Search",   s:yellow, "NONE",   s:t_yellow, "NONE", "bold")
+call s:Color("Title",    s:white,  "NONE",   s:t_white,  "NONE", "bold")
+
+call s:Color("LineNr",       s:gray3, "NONE",  s:t_gray3, "NONE")
+call s:Color("StatusLine",   s:white, s:gray6, s:t_white, s:t_gray6)
+call s:Color("StatusLineNC", s:gray4, s:gray6, s:t_gray4, s:t_gray6)
+call s:Color("VertSplit",    s:gray3, "NONE",  s:t_gray3, "NONE")
+call s:Color("ColorColumn",  "NONE",  s:gray6, "NONE",    s:t_gray6)
+
+call s:Color("Folded",     s:gray4,  "NONE",  s:t_gray4,  "NONE")
+call s:Color("FoldColumn", s:gray3,  s:gray1, s:t_gray3,  s:t_gray1)
+call s:Color("ErrorMsg",   s:red,   "NONE",  s:t_red,   "NONE", "bold")
+call s:Color("WarningMsg", s:yellow, "NONE",  s:t_yellow, "NONE", "bold")
+call s:Color("Question",   s:white,  "NONE",  s:t_white,  "NONE")
+
+call s:Color("SpecialKey",  s:white, s:gray2, s:t_white, s:t_gray2)
+call s:Color("Directory",   s:blue,  "NONE",  s:t_blue,  "NONE")
+
+call s:Color("Comment",  s:gray4,    "NONE", s:t_gray4,    "NONE")
+call s:Color("Todo",     s:gray5,    "NONE", s:t_gray5,    "NONE")
+call s:Color("String",   s:green,    "NONE", s:t_green,    "NONE")
+call s:Color("Keyword",  s:red,     "NONE", s:t_red,     "NONE")
+call s:Color("Number",   s:turqoise, "NONE", s:t_turqoise, "NONE")
+call s:Color("Regexp",   s:orange,   "NONE", s:t_orange,   "NONE")
+call s:Color("Macro",    s:orange,   "NONE", s:t_orange,   "NONE")
+call s:Color("Function", s:yellow,   "NONE", s:t_yellow,   "NONE")
+call s:Color("Notice",   s:yellow,   "NONE", s:t_yellow,   "NONE")
+
+call s:Color("MatchParen", "NONE", "NONE", "NONE", "NONE", "bold")
+
+hi! link CursorLine   Cursor
+hi! link Identifier   Normal
+hi! link Constant     Normal
+hi! link Operator     Normal
+hi! link Type         Keyword
+hi! link Statement    Keyword
+hi! link PmenuThumb   PmenuSel
+hi! link Visual       Cursor
+hi! link SignColumn   FoldColumn
+hi! link Error        ErrorMsg
+hi! link NonText      LineNr
+hi! link PreProc      Normal
+hi! link Special      Normal
+hi! link Boolean      Keyword
+hi! link StorageClass Keyword
+hi! link MoreMsg      Normal
+hi! link Character    String
+hi! link Label        Special
+hi! link PreCondit    Macro
+
+" ============================================================================
+" Specific Languages
+"
+" Language specific settings that would otherwise be too generic. These
+" definitions are sorted in alphabetical order.
+
+" Coffeescript
+hi! link coffeeRegex        Regexp
+hi! link coffeeSpecialIdent Directory
+
+" CSS
+hi! link cssIdentifier Title
+hi! link cssClassName  Directory
+hi! link cssMedia      Notice
+hi! link cssColor      Number
+hi! link cssTagName    Normal
+hi! link cssImportant  Notice
+
+" CtrlP
+hi! link CtrlPBufferHid Todo
+hi! link CtrlPBufferPath Todo
+
+call s:Color("CtrlPMode1", s:white, s:gray1, s:t_white, s:t_gray1, "bold")
+
+" D
+hi! link dDebug        Notice
+hi! link dOperator     Operator
+hi! link dStorageClass Keyword
+hi! link dAnnotation   Directory
+hi! link dAttribute    dAnnotation
+
+" Diffs
+hi! link diffFile    WarningMsg
+hi! link diffLine    Number
+hi! link diffAdded   String
+hi! link diffRemoved Keyword
+
+hi! link DiffChange Notice
+hi! link DiffAdd    diffAdded
+hi! link DiffDelete diffRemoved
+hi! link DiffText   diffLine
+
+" Dot (GraphViz)
+hi! link dotKeyChar Normal
+
+" Git commits
+hi! link gitCommitSummary  String
+hi! link gitCommitOverflow ErrorMsg
+
+" HAML
+hi! link hamlId      Title
+hi! link hamlClass   Directory
+hi! link htmlArg     Normal
+hi! link hamlDocType Comment
+
+" HTML
+hi! link htmlLink           Directory
+hi! link htmlSpecialTagName htmlTag
+hi! link htmlTagName        htmlTag
+hi! link htmlScriptTag      htmlTag
+
+" Javascript
+hi! link javaScriptBraces     Normal
+hi! link javaScriptMember     Normal
+hi! link javaScriptIdentifier Keyword
+hi! link javaScriptFunction   Keyword
+hi! link JavaScriptNumber     Number
+
+" Java
+hi! link javaCommentTitle javaComment
+hi! link javaDocTags      Todo
+hi! link javaDocParam     Todo
+hi! link javaStorageClass Keyword
+hi! link javaAnnotation   Directory
+hi! link javaExternal     Keyword
+
+" JSON
+hi! link jsonKeyword String
+
+" Less
+hi! link lessClass cssClassName
+
+" Make
+hi! link makeTarget Function
+
+" Markdown
+hi! link markdownCodeBlock         Todo
+hi! link markdownCode              markdownCodeBlock
+hi! link markdownListMarker        Keyword
+hi! link markdownOrderedListMarker Keyword
+
+" NERDTree
+hi! link NERDTreeRO       Notice
+hi! link NERDTreeCWD      Title
+hi! link NERDTreeLink     Number
+hi! link NERDTreeDir      Directory
+hi! link NERDTreeOpenable NERDTreeDir
+hi! link NERDTreeClosable NERDTreeDir
+
+" Perl
+hi! link podCommand           Comment
+hi! link podCmdText           Todo
+hi! link podVerbatimLine      Todo
+hi! link perlStatementInclude Statement
+hi! link perlStatementPackage Statement
+hi! link perlPackageDecl      Normal
+
+" Ragel
+hi! link rlAugmentOps Operator
+
+" Ruby
+hi! link rubySymbol           Regexp
+hi! link rubyConstant         Constant
+hi! link rubyInstanceVariable Directory
+hi! link rubyClassVariable    rubyInstancevariable
+hi! link rubyClass            Keyword
+hi! link rubyModule           rubyClass
+hi! link rubyFunction         Function
+hi! link rubyDefine           Keyword
+hi! link rubyRegexp           Regexp
+hi! link rubyRegexpSpecial    Regexp
+hi! link rubyRegexpCharClass  Normal
+hi! link rubyRegexpQuantifier Normal
+
+" Rust
+hi! link rustFuncCall        Identifier
+hi! link rustCommentBlockDoc Comment
+hi! link rustCommentLineDoc  Comment
+
+" SASS
+hi! link sassClass   cssClassName
+hi! link sassId      cssIdentifier
+hi! link sassInclude cssMedia
+
+" Shell
+hi! link shFunctionKey Keyword
+hi! link shTestOpr     Operator
+hi! link bashStatement Normal
+
+" SQL
+hi! link sqlKeyword Keyword
+
+" TypeScript
+hi! link typescriptBraces       Normal
+hi! link typescriptEndColons    Normal
+hi! link typescriptFunction     Function
+hi! link typescriptFuncKeyword  Keyword
+hi! link typescriptLogicSymbols Operator
+hi! link typescriptIdentifier   Keyword
+hi! link typescriptExceptions   Keyword
+
+" Vimscript
+hi! link vimGroup        Constant
+hi! link vimHiGroup      Constant
+hi! link VimIsCommand    Constant
+hi! link VimCommentTitle Todo
+
+" YAML
+hi! link yamlPlainScalar String
+
+" YARD
+hi! link yardType     Todo
+hi! link yardTypeList Todo
+hi! link yardComment  Comment
+
+" XML
+hi! link xmlTagName Normal
+hi! link xmlTag     Normal
+hi! link xmlAttrib  Normal
+
+" Neomake
+hi! link NeomakeWarningSign WarningMsg
+hi! link NeomakeErrorSign Error
+hi! link NeomakeWarning WarningMsg
+
+" Wild menu completion
+hi! link WildMenu PmenuSel
+
+" Vim tabline
+hi! link TabLine     StatusLine
+hi! link TabLineFill StatusLine
+
+call s:Color("TabLineSel", s:white, s:gray2, s:t_white, s:t_gray2, "bold")
+
+" Line numbers
+call s:Color("CursorLineNR", s:yellow, "NONE", s:t_yellow, "NONE", "bold")
+
+" Neovim terminal colors
+let g:terminal_color_0 = s:black1
+let g:terminal_color_1 = s:red
+let g:terminal_color_2 = s:green
+let g:terminal_color_3 = s:yellow
+let g:terminal_color_4 = s:blue
+let g:terminal_color_5 = s:pink
+let g:terminal_color_6 = s:turqoise
+let g:terminal_color_7 = s:white
+let g:terminal_color_8 = s:black1
+let g:terminal_color_9 = s:red
+let g:terminal_color_10 = s:green
+let g:terminal_color_11 = s:yellow
+let g:terminal_color_12 = s:blue
+let g:terminal_color_13 = s:pink
+let g:terminal_color_14 = s:turqoise
+let g:terminal_color_15 = s:white
diff --git a/vim/colors/jellybeans.vim b/vim/colors/jellybeans.vim
new file mode 100755
index 0000000..a089a5a
--- /dev/null
+++ b/vim/colors/jellybeans.vim
@@ -0,0 +1,687 @@
+" Vim color file
+"
+"  "    __       _ _       _                             "
+"  "    \ \  ___| | |_   _| |__   ___  __ _ _ __  ___    "
+"  "     \ \/ _ \ | | | | |  _ \ / _ \/ _  |  _ \/ __|   "
+"  "  /\_/ /  __/ | | |_| | |_| |  __/ |_| | | | \__ \   "
+"  "  \___/ \___|_|_|\__  |____/ \___|\____|_| |_|___/   "
+"  "                 \___/                               "
+"
+"         "A colorful, dark color scheme for Vim."
+"
+" File:         jellybeans.vim
+" URL:          github.com/nanotech/jellybeans.vim
+" Scripts URL:  vim.org/scripts/script.php?script_id=2555
+" Maintainer:   NanoTech (nanotech.nanotechcorp.net)
+" Version:      1.6
+" Last Change:  October 18th, 2016
+" License:      MIT
+" Contributors: Andrew Wong (w0ng)
+"               Brian Marshall (bmars)
+"               Daniel Herbert (pocketninja)
+"               David Liang <bmdavll at gmail dot com>
+"               Henry So, Jr. <henryso@panix.com>
+"               Joe Doherty (docapotamus)
+"               Karl Litterfeldt (Litterfeldt)
+"               Keith Pitt (keithpitt)
+"               Philipp Rustemeier (12foo)
+"               Rafael Bicalho (rbika)
+"               Rich Healey (richo)
+"               Siwen Yu (yusiwen)
+"               Tim Willis (willist)
+"
+" Copyright (c) 2009-2016 NanoTech
+"
+" Permission is hereby granted, free of charge, to any per‐
+" son obtaining a copy of this software and associated doc‐
+" umentation  files  (the “Software”), to deal in the Soft‐
+" ware without restriction,  including  without  limitation
+" the rights to use, copy, modify, merge, publish, distrib‐
+" ute, 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 PARTICU‐
+" LAR  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 CON‐
+" TRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON‐
+" NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+" THE SOFTWARE.
+
+set background=dark
+
+hi clear
+
+if exists("syntax_on")
+  syntax reset
+endif
+
+let colors_name = "jellybeans"
+
+if has("gui_running") || (has('termguicolors') && &termguicolors) || &t_Co >= 88
+  let s:low_color = 0
+else
+  let s:low_color = 1
+endif
+
+" Configuration Variables:
+" - g:jellybeans_overrides          (default = {})
+" - g:jellybeans_use_lowcolor_black (default = 1)
+" - g:jellybeans_use_gui_italics    (default = 1)
+" - g:jellybeans_use_term_italics   (default = 0)
+
+let s:background_color = "151515"
+
+if exists("g:jellybeans_overrides")
+  let s:overrides = g:jellybeans_overrides
+else
+  let s:overrides = {}
+endif
+
+" Backwards compatibility
+if exists("g:jellybeans_background_color")
+  \ || exists("g:jellybeans_background_color_256")
+  \ || exists("g:jellybeans_use_term_background_color")
+
+  let s:overrides = deepcopy(s:overrides)
+
+  if !has_key(s:overrides, "background")
+    let s:overrides["background"] = {}
+  endif
+
+  if exists("g:jellybeans_background_color")
+    let s:overrides["background"]["guibg"] = g:jellybeans_background_color
+  endif
+
+  if exists("g:jellybeans_background_color_256")
+    let s:overrides["background"]["256ctermbg"] = g:jellybeans_background_color_256
+  endif
+
+  if exists("g:jellybeans_use_term_background_color")
+    \ && g:jellybeans_use_term_background_color
+    let s:overrides["background"]["ctermbg"] = "NONE"
+    let s:overrides["background"]["256ctermbg"] = "NONE"
+  endif
+endif
+
+if !exists("g:jellybeans_use_lowcolor_black") || g:jellybeans_use_lowcolor_black
+  let s:termBlack = "Black"
+else
+  let s:termBlack = "Grey"
+endif
+
+" When `termguicolors` is set, Vim[^1] ignores `guibg=NONE` after
+" `guibg` is already set to a color. See:
+"
+" - https://github.com/vim/vim/issues/981
+" - https://github.com/nanotech/jellybeans.vim/issues/64
+"
+" To work around this, ensure we don't set the default background
+" color before an override changes it to `NONE` by ensuring that the
+" background color isn't set to a value different from its override.
+"
+" [^1]: Tested on 8.0.567. Does not apply to Neovim.
+"
+" TODO: Enable this behavior for all highlights by applying
+"       overrides before calling highlight commands.
+"
+if has_key(s:overrides, "background") && has_key(s:overrides["background"], "guibg")
+    let s:background_color = s:overrides["background"]["guibg"]
+endif
+
+" Color approximation functions by Henry So, Jr. and David Liang {{{
+" Added to jellybeans.vim by Daniel Herbert
+
+" returns an approximate grey index for the given grey level
+fun! s:grey_number(x)
+  if &t_Co == 88
+    if a:x < 23
+      return 0
+    elseif a:x < 69
+      return 1
+    elseif a:x < 103
+      return 2
+    elseif a:x < 127
+      return 3
+    elseif a:x < 150
+      return 4
+    elseif a:x < 173
+      return 5
+    elseif a:x < 196
+      return 6
+    elseif a:x < 219
+      return 7
+    elseif a:x < 243
+      return 8
+    else
+      return 9
+    endif
+  else
+    if a:x < 14
+      return 0
+    else
+      let l:n = (a:x - 8) / 10
+      let l:m = (a:x - 8) % 10
+      if l:m < 5
+        return l:n
+      else
+        return l:n + 1
+      endif
+    endif
+  endif
+endfun
+
+" returns the actual grey level represented by the grey index
+fun! s:grey_level(n)
+  if &t_Co == 88
+    if a:n == 0
+      return 0
+    elseif a:n == 1
+      return 46
+    elseif a:n == 2
+      return 92
+    elseif a:n == 3
+      return 115
+    elseif a:n == 4
+      return 139
+    elseif a:n == 5
+      return 162
+    elseif a:n == 6
+      return 185
+    elseif a:n == 7
+      return 208
+    elseif a:n == 8
+      return 231
+    else
+      return 255
+    endif
+  else
+    if a:n == 0
+      return 0
+    else
+      return 8 + (a:n * 10)
+    endif
+  endif
+endfun
+
+" returns the palette index for the given grey index
+fun! s:grey_color(n)
+  if &t_Co == 88
+    if a:n == 0
+      return 16
+    elseif a:n == 9
+      return 79
+    else
+      return 79 + a:n
+    endif
+  else
+    if a:n == 0
+      return 16
+    elseif a:n == 25
+      return 231
+    else
+      return 231 + a:n
+    endif
+  endif
+endfun
+
+" returns an approximate color index for the given color level
+fun! s:rgb_number(x)
+  if &t_Co == 88
+    if a:x < 69
+      return 0
+    elseif a:x < 172
+      return 1
+    elseif a:x < 230
+      return 2
+    else
+      return 3
+    endif
+  else
+    if a:x < 75
+      return 0
+    else
+      let l:n = (a:x - 55) / 40
+      let l:m = (a:x - 55) % 40
+      if l:m < 20
+        return l:n
+      else
+        return l:n + 1
+      endif
+    endif
+  endif
+endfun
+
+" returns the actual color level for the given color index
+fun! s:rgb_level(n)
+  if &t_Co == 88
+    if a:n == 0
+      return 0
+    elseif a:n == 1
+      return 139
+    elseif a:n == 2
+      return 205
+    else
+      return 255
+    endif
+  else
+    if a:n == 0
+      return 0
+    else
+      return 55 + (a:n * 40)
+    endif
+  endif
+endfun
+
+" returns the palette index for the given R/G/B color indices
+fun! s:rgb_color(x, y, z)
+  if &t_Co == 88
+    return 16 + (a:x * 16) + (a:y * 4) + a:z
+  else
+    return 16 + (a:x * 36) + (a:y * 6) + a:z
+  endif
+endfun
+
+" returns the palette index to approximate the given R/G/B color levels
+fun! s:color(r, g, b)
+  " map greys directly (see xterm's 256colres.pl)
+  if &t_Co == 256 && a:r == a:g && a:g == a:b && a:r > 3 && a:r < 243
+    return (a:r - 8) / 10 + 232
+  endif
+
+  " get the closest grey
+  let l:gx = s:grey_number(a:r)
+  let l:gy = s:grey_number(a:g)
+  let l:gz = s:grey_number(a:b)
+
+  " get the closest color
+  let l:x = s:rgb_number(a:r)
+  let l:y = s:rgb_number(a:g)
+  let l:z = s:rgb_number(a:b)
+
+  if l:gx == l:gy && l:gy == l:gz
+    " there are two possibilities
+    let l:dgr = s:grey_level(l:gx) - a:r
+    let l:dgg = s:grey_level(l:gy) - a:g
+    let l:dgb = s:grey_level(l:gz) - a:b
+    let l:dgrey = (l:dgr * l:dgr) + (l:dgg * l:dgg) + (l:dgb * l:dgb)
+    let l:dr = s:rgb_level(l:gx) - a:r
+    let l:dg = s:rgb_level(l:gy) - a:g
+    let l:db = s:rgb_level(l:gz) - a:b
+    let l:drgb = (l:dr * l:dr) + (l:dg * l:dg) + (l:db * l:db)
+    if l:dgrey < l:drgb
+      " use the grey
+      return s:grey_color(l:gx)
+    else
+      " use the color
+      return s:rgb_color(l:x, l:y, l:z)
+    endif
+  else
+    " only one possibility
+    return s:rgb_color(l:x, l:y, l:z)
+  endif
+endfun
+
+fun! s:is_empty_or_none(str)
+  return empty(a:str) || a:str ==? "NONE"
+endfun
+
+" returns the palette index to approximate the 'rrggbb' hex string
+fun! s:rgb(rgb)
+  if s:is_empty_or_none(a:rgb)
+    return "NONE"
+  endif
+  let l:r = ("0x" . strpart(a:rgb, 0, 2)) + 0
+  let l:g = ("0x" . strpart(a:rgb, 2, 2)) + 0
+  let l:b = ("0x" . strpart(a:rgb, 4, 2)) + 0
+  return s:color(l:r, l:g, l:b)
+endfun
+
+fun! s:prefix_highlight_value_with(prefix, color)
+  if s:is_empty_or_none(a:color)
+    return "NONE"
+  else
+    return a:prefix . a:color
+  endif
+endfun
+
+fun! s:remove_italic_attr(attr)
+  let l:attr = join(filter(split(a:attr, ","), "v:val !=? 'italic'"), ",")
+  if empty(l:attr)
+    let l:attr = "NONE"
+  endif
+  return l:attr
+endfun
+
+" sets the highlighting for the given group
+fun! s:X(group, fg, bg, attr, lcfg, lcbg)
+  if s:low_color
+    exec "hi ".a:group.
+    \ " ctermfg=".s:prefix_highlight_value_with("", a:lcfg).
+    \ " ctermbg=".s:prefix_highlight_value_with("", a:lcbg)
+  else
+    exec "hi ".a:group.
+    \ " guifg=".s:prefix_highlight_value_with("#", a:fg).
+    \ " guibg=".s:prefix_highlight_value_with("#", a:bg).
+    \ " ctermfg=".s:rgb(a:fg).
+    \ " ctermbg=".s:rgb(a:bg)
+  endif
+
+  let l:attr = s:prefix_highlight_value_with("", a:attr)
+
+  if exists("g:jellybeans_use_term_italics") && g:jellybeans_use_term_italics
+    let l:cterm_attr = l:attr
+  else
+    let l:cterm_attr = s:remove_italic_attr(l:attr)
+  endif
+
+  if !exists("g:jellybeans_use_gui_italics") || g:jellybeans_use_gui_italics
+    let l:gui_attr = l:attr
+  else
+    let l:gui_attr = s:remove_italic_attr(l:attr)
+  endif
+
+  exec "hi ".a:group." gui=".l:gui_attr." cterm=".l:cterm_attr
+endfun
+" }}}
+
+call s:X("Normal","e8e8d3",s:background_color,"","White","")
+set background=dark
+
+if version >= 700
+  call s:X("CursorLine","","1c1c1c","","",s:termBlack)
+  call s:X("CursorColumn","","1c1c1c","","",s:termBlack)
+  call s:X("MatchParen","ffffff","556779","bold","","DarkCyan")
+
+  call s:X("TabLine","000000","b0b8c0","italic","",s:termBlack)
+  call s:X("TabLineFill","9098a0","","","",s:termBlack)
+  call s:X("TabLineSel","000000","f0f0f0","italic,bold",s:termBlack,"White")
+
+  " Auto-completion
+  call s:X("Pmenu","ffffff","606060","","White",s:termBlack)
+  call s:X("PmenuSel","101010","eeeeee","",s:termBlack,"White")
+endif
+
+call s:X("Visual","","404040","","",s:termBlack)
+call s:X("Cursor",s:background_color,"b0d0f0","","","")
+
+call s:X("LineNr","605958",s:background_color,"NONE",s:termBlack,"")
+call s:X("CursorLineNr","ccc5c4","","NONE","White","")
+call s:X("Comment","888888","","italic","Grey","")
+call s:X("Todo","c7c7c7","","bold","White",s:termBlack)
+
+call s:X("StatusLine","000000","dddddd","italic","","White")
+call s:X("StatusLineNC","ffffff","403c41","italic","White","Black")
+call s:X("VertSplit","777777","403c41","",s:termBlack,s:termBlack)
+call s:X("WildMenu","f0a0c0","302028","","Magenta","")
+
+call s:X("Folded","a0a8b0","384048","italic",s:termBlack,"")
+call s:X("FoldColumn","535D66","1f1f1f","","",s:termBlack)
+call s:X("SignColumn","777777","333333","","",s:termBlack)
+call s:X("ColorColumn","","000000","","",s:termBlack)
+
+call s:X("Title","70b950","","bold","Green","")
+
+call s:X("Constant","cf6a4c","","","Red","")
+call s:X("Special","799d6a","","","Green","")
+call s:X("Delimiter","668799","","","Grey","")
+
+call s:X("String","99ad6a","","","Green","")
+call s:X("StringDelimiter","556633","","","DarkGreen","")
+
+call s:X("Identifier","c6b6ee","","","LightCyan","")
+call s:X("Structure","8fbfdc","","","LightCyan","")
+call s:X("Function","fad07a","","","Yellow","")
+call s:X("Statement","8197bf","","","DarkBlue","")
+call s:X("PreProc","8fbfdc","","","LightBlue","")
+
+hi! link Operator Structure
+hi! link Conceal Operator
+
+call s:X("Type","ffb964","","","Yellow","")
+call s:X("NonText","606060",s:background_color,"",s:termBlack,"")
+
+call s:X("SpecialKey","444444","1c1c1c","",s:termBlack,"")
+
+call s:X("Search","f0a0c0","302028","underline","Magenta","")
+
+call s:X("Directory","dad085","","","Yellow","")
+call s:X("ErrorMsg","","902020","","","DarkRed")
+hi! link Error ErrorMsg
+hi! link MoreMsg Special
+call s:X("Question","65C254","","","Green","")
+
+
+" Spell Checking
+
+call s:X("SpellBad","","902020","underline","","DarkRed")
+call s:X("SpellCap","","0000df","underline","","Blue")
+call s:X("SpellRare","","540063","underline","","DarkMagenta")
+call s:X("SpellLocal","","2D7067","underline","","Green")
+
+" Diff
+
+hi! link diffRemoved Constant
+hi! link diffAdded String
+
+" VimDiff
+
+call s:X("DiffAdd","D2EBBE","437019","","White","DarkGreen")
+call s:X("DiffDelete","40000A","700009","","DarkRed","DarkRed")
+call s:X("DiffChange","","2B5B77","","White","DarkBlue")
+call s:X("DiffText","8fbfdc","000000","reverse","Yellow","")
+
+" PHP
+
+hi! link phpFunctions Function
+call s:X("StorageClass","c59f6f","","","Red","")
+hi! link phpSuperglobal Identifier
+hi! link phpQuoteSingle StringDelimiter
+hi! link phpQuoteDouble StringDelimiter
+hi! link phpBoolean Constant
+hi! link phpNull Constant
+hi! link phpArrayPair Operator
+hi! link phpOperator Normal
+hi! link phpRelation Normal
+hi! link phpVarSelector Identifier
+
+" Python
+
+hi! link pythonOperator Statement
+
+" Ruby
+
+hi! link rubySharpBang Comment
+call s:X("rubyClass","447799","","","DarkBlue","")
+call s:X("rubyIdentifier","c6b6fe","","","Cyan","")
+hi! link rubyConstant Type
+hi! link rubyFunction Function
+
+call s:X("rubyInstanceVariable","c6b6fe","","","Cyan","")
+call s:X("rubySymbol","7697d6","","","Blue","")
+hi! link rubyGlobalVariable rubyInstanceVariable
+hi! link rubyModule rubyClass
+call s:X("rubyControl","7597c6","","","Blue","")
+
+hi! link rubyString String
+hi! link rubyStringDelimiter StringDelimiter
+hi! link rubyInterpolationDelimiter Identifier
+
+call s:X("rubyRegexpDelimiter","540063","","","Magenta","")
+call s:X("rubyRegexp","dd0093","","","DarkMagenta","")
+call s:X("rubyRegexpSpecial","a40073","","","Magenta","")
+
+call s:X("rubyPredefinedIdentifier","de5577","","","Red","")
+
+" Erlang
+
+hi! link erlangAtom rubySymbol
+hi! link erlangBIF rubyPredefinedIdentifier
+hi! link erlangFunction rubyPredefinedIdentifier
+hi! link erlangDirective Statement
+hi! link erlangNode Identifier
+
+" Elixir
+
+hi! link elixirAtom rubySymbol
+
+
+" JavaScript
+
+hi! link javaScriptValue Constant
+hi! link javaScriptRegexpString rubyRegexp
+hi! link javaScriptTemplateVar StringDelim
+hi! link javaScriptTemplateDelim Identifier
+hi! link javaScriptTemplateString String
+
+" CoffeeScript
+
+hi! link coffeeRegExp javaScriptRegexpString
+
+" Lua
+
+hi! link luaOperator Conditional
+
+" C
+
+hi! link cFormat Identifier
+hi! link cOperator Constant
+
+" Objective-C/Cocoa
+
+hi! link objcClass Type
+hi! link cocoaClass objcClass
+hi! link objcSubclass objcClass
+hi! link objcSuperclass objcClass
+hi! link objcDirective rubyClass
+hi! link objcStatement Constant
+hi! link cocoaFunction Function
+hi! link objcMethodName Identifier
+hi! link objcMethodArg Normal
+hi! link objcMessageName Identifier
+
+" Vimscript
+
+hi! link vimOper Normal
+
+" HTML
+
+hi! link htmlTag Statement
+hi! link htmlEndTag htmlTag
+hi! link htmlTagName htmlTag
+
+" XML
+
+hi! link xmlTag Statement
+hi! link xmlEndTag xmlTag
+hi! link xmlTagName xmlTag
+hi! link xmlEqual xmlTag
+hi! link xmlEntity Special
+hi! link xmlEntityPunct xmlEntity
+hi! link xmlDocTypeDecl PreProc
+hi! link xmlDocTypeKeyword PreProc
+hi! link xmlProcessingDelim xmlAttrib
+
+" Debugger.vim
+
+call s:X("DbgCurrent","DEEBFE","345FA8","","White","DarkBlue")
+call s:X("DbgBreakPt","","4F0037","","","DarkMagenta")
+
+" vim-indent-guides
+
+if !exists("g:indent_guides_auto_colors")
+  let g:indent_guides_auto_colors = 0
+endif
+call s:X("IndentGuidesOdd","","232323","","","")
+call s:X("IndentGuidesEven","","1b1b1b","","","")
+
+" Plugins, etc.
+
+hi! link TagListFileName Directory
+call s:X("PreciseJumpTarget","B9ED67","405026","","White","Green")
+
+" Manual overrides for 256-color terminals. Dark colors auto-map badly.
+if !s:low_color
+  hi StatusLineNC ctermbg=235
+  hi Folded ctermbg=236
+  hi DiffText ctermfg=81
+  hi DbgBreakPt ctermbg=53
+  hi IndentGuidesOdd ctermbg=235
+  hi IndentGuidesEven ctermbg=234
+endif
+
+if !empty("s:overrides")
+  fun! s:current_attr(group)
+    let l:synid = synIDtrans(hlID(a:group))
+    let l:attrs = []
+    for l:attr in ["bold", "italic", "reverse", "standout", "underline", "undercurl"]
+      if synIDattr(l:synid, l:attr, "gui") == 1
+        call add(l:attrs, l:attr)
+      endif
+    endfor
+    return join(l:attrs, ",")
+  endfun
+  fun! s:current_color(group, what, mode)
+    let l:color = synIDattr(synIDtrans(hlID(a:group)), a:what, a:mode)
+    if l:color == -1
+      return ""
+    else
+      return substitute(l:color, "^#", "", "")
+    endif
+  endfun
+  fun! s:load_color_def(group, def)
+    call s:X(a:group, get(a:def, "guifg", s:current_color(a:group, "fg", "gui")),
+    \                 get(a:def, "guibg", s:current_color(a:group, "bg", "gui")),
+    \                 get(a:def, "attr", s:current_attr(a:group)),
+    \                 get(a:def, "ctermfg", s:current_color(a:group, "fg", "cterm")),
+    \                 get(a:def, "ctermbg", s:current_color(a:group, "bg", "cterm")))
+    if !s:low_color
+      for l:prop in ["ctermfg", "ctermbg"]
+        let l:override_key = "256".l:prop
+        if has_key(a:def, l:override_key)
+          exec "hi ".a:group." ".l:prop."=".a:def[l:override_key]
+        endif
+      endfor
+    endif
+  endfun
+  fun! s:load_colors(defs)
+    for [l:group, l:def] in items(a:defs)
+      if l:group == "background"
+        call s:load_color_def("LineNr", l:def)
+        call s:load_color_def("NonText", l:def)
+        call s:load_color_def("Normal", l:def)
+      else
+        call s:load_color_def(l:group, l:def)
+      endif
+      unlet l:group
+      unlet l:def
+    endfor
+  endfun
+  call s:load_colors(s:overrides)
+  delf s:load_colors
+  delf s:load_color_def
+  delf s:current_color
+  delf s:current_attr
+endif
+
+" delete functions {{{
+delf s:X
+delf s:remove_italic_attr
+delf s:prefix_highlight_value_with
+delf s:rgb
+delf s:is_empty_or_none
+delf s:color
+delf s:rgb_color
+delf s:rgb_level
+delf s:rgb_number
+delf s:grey_color
+delf s:grey_level
+delf s:grey_number
+" }}}
diff --git a/vim/colors/molokai.vim b/vim/colors/molokai.vim
new file mode 100755
index 0000000..6d97053
--- /dev/null
+++ b/vim/colors/molokai.vim
@@ -0,0 +1,276 @@
+" Vim color file
+"
+" Author: Tomas Restrepo <tomas@winterdom.com>
+" https://github.com/tomasr/molokai
+"
+" Note: Based on the Monokai theme for TextMate
+" by Wimer Hazenberg and its darker variant
+" by Hamish Stuart Macpherson
+"
+
+hi clear
+
+if version > 580
+    " no guarantees for version 5.8 and below, but this makes it stop
+    " complaining
+    hi clear
+    if exists("syntax_on")
+        syntax reset
+    endif
+endif
+let g:colors_name="molokai"
+
+if exists("g:molokai_original")
+    let s:molokai_original = g:molokai_original
+else
+    let s:molokai_original = 0
+endif
+
+
+hi Boolean         guifg=#AE81FF
+hi Character       guifg=#E6DB74
+hi Number          guifg=#AE81FF
+hi String          guifg=#E6DB74
+hi Conditional     guifg=#F92672               gui=bold
+hi Constant        guifg=#AE81FF               gui=bold
+hi Cursor          guifg=#000000 guibg=#F8F8F0
+hi iCursor         guifg=#000000 guibg=#F8F8F0
+hi Debug           guifg=#BCA3A3               gui=bold
+hi Define          guifg=#66D9EF
+hi Delimiter       guifg=#8F8F8F
+hi DiffAdd                       guibg=#13354A
+hi DiffChange      guifg=#89807D guibg=#4C4745
+hi DiffDelete      guifg=#960050 guibg=#1E0010
+hi DiffText                      guibg=#4C4745 gui=italic,bold
+
+hi Directory       guifg=#A6E22E               gui=bold
+hi Error           guifg=#E6DB74 guibg=#1E0010
+hi ErrorMsg        guifg=#F92672 guibg=#232526 gui=bold
+hi Exception       guifg=#A6E22E               gui=bold
+hi Float           guifg=#AE81FF
+hi FoldColumn      guifg=#465457 guibg=#000000
+hi Folded          guifg=#465457 guibg=#000000
+hi Function        guifg=#A6E22E
+hi Identifier      guifg=#FD971F
+hi Ignore          guifg=#808080 guibg=bg
+hi IncSearch       guifg=#C4BE89 guibg=#000000
+
+hi Keyword         guifg=#F92672               gui=bold
+hi Label           guifg=#E6DB74               gui=none
+hi Macro           guifg=#C4BE89               gui=italic
+hi SpecialKey      guifg=#66D9EF               gui=italic
+
+hi MatchParen      guifg=#000000 guibg=#FD971F gui=bold
+hi ModeMsg         guifg=#E6DB74
+hi MoreMsg         guifg=#E6DB74
+hi Operator        guifg=#F92672
+
+" complete menu
+hi Pmenu           guifg=#66D9EF guibg=#000000
+hi PmenuSel                      guibg=#808080
+hi PmenuSbar                     guibg=#080808
+hi PmenuThumb      guifg=#66D9EF
+
+hi PreCondit       guifg=#A6E22E               gui=bold
+hi PreProc         guifg=#A6E22E
+hi Question        guifg=#66D9EF
+hi Repeat          guifg=#F92672               gui=bold
+hi Search          guifg=#000000 guibg=#FFE792
+" marks
+hi SignColumn      guifg=#A6E22E guibg=#232526
+hi SpecialChar     guifg=#F92672               gui=bold
+hi SpecialComment  guifg=#7E8E91               gui=bold
+hi Special         guifg=#66D9EF guibg=bg      gui=italic
+if has("spell")
+    hi SpellBad    guisp=#FF0000 gui=undercurl
+    hi SpellCap    guisp=#7070F0 gui=undercurl
+    hi SpellLocal  guisp=#70F0F0 gui=undercurl
+    hi SpellRare   guisp=#FFFFFF gui=undercurl
+endif
+hi Statement       guifg=#F92672               gui=bold
+hi StatusLine      guifg=#455354 guibg=fg
+hi StatusLineNC    guifg=#808080 guibg=#080808
+hi StorageClass    guifg=#FD971F               gui=italic
+hi Structure       guifg=#66D9EF
+hi Tag             guifg=#F92672               gui=italic
+hi Title           guifg=#ef5939
+hi Todo            guifg=#FFFFFF guibg=bg      gui=bold
+
+hi Typedef         guifg=#66D9EF
+hi Type            guifg=#66D9EF               gui=none
+hi Underlined      guifg=#808080               gui=underline
+
+hi VertSplit       guifg=#808080 guibg=#080808 gui=bold
+hi VisualNOS                     guibg=#403D3D
+hi Visual                        guibg=#403D3D
+hi WarningMsg      guifg=#FFFFFF guibg=#333333 gui=bold
+hi WildMenu        guifg=#66D9EF guibg=#000000
+
+hi TabLineFill     guifg=#1B1D1E guibg=#1B1D1E
+hi TabLine         guibg=#1B1D1E guifg=#808080 gui=none
+
+if s:molokai_original == 1
+   hi Normal          guifg=#F8F8F2 guibg=#272822
+   hi Comment         guifg=#75715E
+   hi CursorLine                    guibg=#3E3D32
+   hi CursorLineNr    guifg=#FD971F               gui=none
+   hi CursorColumn                  guibg=#3E3D32
+   hi ColorColumn                   guibg=#3B3A32
+   hi LineNr          guifg=#BCBCBC guibg=#3B3A32
+   hi NonText         guifg=#75715E
+   hi SpecialKey      guifg=#75715E
+else
+   hi Normal          guifg=#F8F8F2 guibg=#1B1D1E
+   hi Comment         guifg=#7E8E91
+   hi CursorLine                    guibg=#293739
+   hi CursorLineNr    guifg=#FD971F               gui=none
+   hi CursorColumn                  guibg=#293739
+   hi ColorColumn                   guibg=#232526
+   hi LineNr          guifg=#465457 guibg=#232526
+   hi NonText         guifg=#465457
+   hi SpecialKey      guifg=#465457
+end
+
+"
+" Support for 256-color terminal
+"
+if &t_Co > 255
+   if s:molokai_original == 1
+      hi Normal                   ctermbg=234
+      hi CursorLine               ctermbg=235   cterm=none
+      hi CursorLineNr ctermfg=208               cterm=none
+   else
+      hi Normal       ctermfg=252 ctermbg=233
+      hi CursorLine               ctermbg=234   cterm=none
+      hi CursorLineNr ctermfg=208               cterm=none
+   endif
+   hi Boolean         ctermfg=135
+   hi Character       ctermfg=144
+   hi Number          ctermfg=135
+   hi String          ctermfg=144
+   hi Conditional     ctermfg=161               cterm=bold
+   hi Constant        ctermfg=135               cterm=bold
+   hi Cursor          ctermfg=16  ctermbg=253
+   hi Debug           ctermfg=225               cterm=bold
+   hi Define          ctermfg=81
+   hi Delimiter       ctermfg=241
+
+   hi DiffAdd                     ctermbg=24
+   hi DiffChange      ctermfg=181 ctermbg=239
+   hi DiffDelete      ctermfg=162 ctermbg=53
+   hi DiffText                    ctermbg=102 cterm=bold
+
+   hi Directory       ctermfg=118               cterm=bold
+   hi Error           ctermfg=219 ctermbg=89
+   hi ErrorMsg        ctermfg=199 ctermbg=16    cterm=bold
+   hi Exception       ctermfg=118               cterm=bold
+   hi Float           ctermfg=135
+   hi FoldColumn      ctermfg=67  ctermbg=16
+   hi Folded          ctermfg=67  ctermbg=16
+   hi Function        ctermfg=118
+   hi Identifier      ctermfg=208               cterm=none
+   hi Ignore          ctermfg=244 ctermbg=232
+   hi IncSearch       ctermfg=193 ctermbg=16
+
+   hi keyword         ctermfg=161               cterm=bold
+   hi Label           ctermfg=229               cterm=none
+   hi Macro           ctermfg=193
+   hi SpecialKey      ctermfg=81
+
+   hi MatchParen      ctermfg=233  ctermbg=208 cterm=bold
+   hi ModeMsg         ctermfg=229
+   hi MoreMsg         ctermfg=229
+   hi Operator        ctermfg=161
+
+   " complete menu
+   hi Pmenu           ctermfg=81  ctermbg=16
+   hi PmenuSel        ctermfg=255 ctermbg=242
+   hi PmenuSbar                   ctermbg=232
+   hi PmenuThumb      ctermfg=81
+
+   hi PreCondit       ctermfg=118               cterm=bold
+   hi PreProc         ctermfg=118
+   hi Question        ctermfg=81
+   hi Repeat          ctermfg=161               cterm=bold
+   hi Search          ctermfg=0   ctermbg=222   cterm=NONE
+
+   " marks column
+   hi SignColumn      ctermfg=118 ctermbg=235
+   hi SpecialChar     ctermfg=161               cterm=bold
+   hi SpecialComment  ctermfg=245               cterm=bold
+   hi Special         ctermfg=81
+   if has("spell")
+       hi SpellBad                ctermbg=52
+       hi SpellCap                ctermbg=17
+       hi SpellLocal              ctermbg=17
+       hi SpellRare  ctermfg=none ctermbg=none  cterm=reverse
+   endif
+   hi Statement       ctermfg=161               cterm=bold
+   hi StatusLine      ctermfg=238 ctermbg=253
+   hi StatusLineNC    ctermfg=244 ctermbg=232
+   hi StorageClass    ctermfg=208
+   hi Structure       ctermfg=81
+   hi Tag             ctermfg=161
+   hi Title           ctermfg=166
+   hi Todo            ctermfg=231 ctermbg=232   cterm=bold
+
+   hi Typedef         ctermfg=81
+   hi Type            ctermfg=81                cterm=none
+   hi Underlined      ctermfg=244               cterm=underline
+
+   hi VertSplit       ctermfg=244 ctermbg=232   cterm=bold
+   hi VisualNOS                   ctermbg=238
+   hi Visual                      ctermbg=235
+   hi WarningMsg      ctermfg=231 ctermbg=238   cterm=bold
+   hi WildMenu        ctermfg=81  ctermbg=16
+
+   hi Comment         ctermfg=59
+   hi CursorColumn                ctermbg=236
+   hi ColorColumn                 ctermbg=236
+   hi LineNr          ctermfg=250 ctermbg=236
+   hi NonText         ctermfg=59
+
+   hi SpecialKey      ctermfg=59
+
+   if exists("g:rehash256") && g:rehash256 == 1
+       hi Normal       ctermfg=252 ctermbg=234
+       hi CursorLine               ctermbg=236   cterm=none
+       hi CursorLineNr ctermfg=208               cterm=none
+
+       hi Boolean         ctermfg=141
+       hi Character       ctermfg=222
+       hi Number          ctermfg=141
+       hi String          ctermfg=222
+       hi Conditional     ctermfg=197               cterm=bold
+       hi Constant        ctermfg=141               cterm=bold
+
+       hi DiffDelete      ctermfg=125 ctermbg=233
+
+       hi Directory       ctermfg=154               cterm=bold
+       hi Error           ctermfg=222 ctermbg=233
+       hi Exception       ctermfg=154               cterm=bold
+       hi Float           ctermfg=141
+       hi Function        ctermfg=154
+       hi Identifier      ctermfg=208
+
+       hi Keyword         ctermfg=197               cterm=bold
+       hi Operator        ctermfg=197
+       hi PreCondit       ctermfg=154               cterm=bold
+       hi PreProc         ctermfg=154
+       hi Repeat          ctermfg=197               cterm=bold
+
+       hi Statement       ctermfg=197               cterm=bold
+       hi Tag             ctermfg=197
+       hi Title           ctermfg=203
+       hi Visual                      ctermbg=238
+
+       hi Comment         ctermfg=244
+       hi LineNr          ctermfg=239 ctermbg=235
+       hi NonText         ctermfg=239
+       hi SpecialKey      ctermfg=239
+   endif
+end
+
+" Must be at the end, because of ctermbg=234 bug.
+" https://groups.google.com/forum/#!msg/vim_dev/afPqwAFNdrU/nqh6tOM87QUJ
+set background=dark
diff --git a/vim/colors/new-railscasts.vim b/vim/colors/new-railscasts.vim
new file mode 100644
index 0000000..06374cf
--- /dev/null
+++ b/vim/colors/new-railscasts.vim
@@ -0,0 +1,229 @@
+" Vim color scheme
+"
+" Name:        railscast.vim
+" Maintainer:  Josh O'Rourke <joshorourke@me.com>
+" Modified:    Carlos Ramos, carakan
+" License:     public domain
+"
+" A GUI Only port of the RailsCasts TextMate theme [1] to Vim.
+" Some parts of this theme were borrowed from the well-documented Lucius theme [2].
+"
+
+let g:colors_name = "new-railscasts"
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+highlight clear SignColumn
+set background=dark
+
+hi Normal                    guifg=#E6E1DC guibg=#212121 ctermfg=white ctermbg=234
+hi Cursor                    guifg=#000000 guibg=#FFFFFF ctermfg=0 ctermbg=15
+hi CursorLine                guibg=#282828 ctermbg=235 cterm=NONE
+hi Search                    guibg=#072f95 ctermfg=NONE ctermbg=236
+hi Visual                    guibg=#004568 ctermbg=60
+hi LineNr                    guifg=#707070 guibg=#2d2d2d  ctermfg=242
+hi StatusLine                guifg=#e4e4e4 guibg=#606060 gui=NONE ctermfg=254 ctermbg=241 cterm=NONE
+hi StatusLineNC              guifg=#585858 guibg=#303030 gui=NONE ctermfg=240 ctermbg=236 cterm=NONE
+
+hi! link CursorColumn ColorColumn
+hi VertSplit                 guibg=#212121 gui=bold guifg=#444444 ctermfg=white ctermbg=234
+hi CursorLineNr              guifg=#d7b0fc guibg=#2d2d2d ctermfg=248
+hi ColorColumn               guibg=#333435 ctermbg=235
+highlight SignColumn guibg=#2d2d2d
+
+" StatusLine
+" Bold
+hi User1                     guifg=#eeeeee guibg=#606060 gui=bold ctermfg=255 ctermbg=241 cterm=bold
+" Yellow
+hi User2                     guifg=#FFAF00 guibg=#606060 gui=bold ctermfg=214 ctermbg=241 cterm=bold
+" Green
+hi User3                     guifg=#15d300 guibg=#606060 gui=bold ctermfg=82 ctermbg=241 cterm=bold
+" Red
+hi User4                     guifg=#870000 guibg=#606060 gui=bold ctermfg=88 ctermbg=241 cterm=bold
+hi User5                     guifg=#e4e4e4 guibg=#606060 gui=bold ctermfg=254 ctermbg=241 cterm=bold
+hi User6                     guifg=#e4e4e4 guibg=#606060 gui=bold ctermfg=254 ctermbg=241 cterm=bold
+hi User7                     guifg=#e4e4e4 guibg=#606060 gui=bold ctermfg=254 ctermbg=241 cterm=bold
+hi User8                     guifg=#e4e4e4 guibg=#606060 gui=bold ctermfg=254 ctermbg=241 cterm=bold
+hi User9                     guifg=#e4e4e4 guibg=#606060 gui=bold ctermfg=254 ctermbg=241 cterm=bold
+
+" Folds
+" -----
+hi Folded                    guifg=#F6F3E8 guibg=#444444 gui=NONE
+
+" Invisible Characters
+" ------------------
+hi NonText                   guifg=#777777 gui=NONE
+hi SpecialKey                guifg=#777777 gui=NONE
+
+" Misc
+" ----
+" directory names and other special names in listings
+hi Directory                 guifg=#A5C261 gui=NONE
+
+" Popup Menu
+" ----------
+" normal item in popup
+hi Pmenu                     guifg=#F6F3E8 guibg=#444444 gui=NONE ctermfg=white ctermbg=237
+" selected item in popup
+hi PmenuSel                  guifg=#000000 guibg=#A5C261 gui=NONE
+" scrollbar in popup
+hi PMenuSbar                 guibg=#5A647E gui=NONE
+" thumb of the scrollbar in the popup
+hi PMenuThumb                guibg=#AAAAAA gui=NONE
+
+" Comment
+hi Comment                   guifg=#BC9458 guibg=NONE gui=italic ctermfg=137 cterm=italic
+hi Todo                      guifg=#df5f5f guibg=NONE gui=bold ctermfg=94
+
+"rubyPseudoVariable: nil, self, symbols, etc
+hi Constant                  guifg=#6D9CBE ctermfg=73
+" rubyClass, rubyModule, rubyDefine def, end, include, etc
+hi Define                    guifg=#CC7833 ctermfg=173
+" Interpolation
+hi Delimiter                 guifg=#519F50
+hi WarningMsg                guifg=#DA4939 guibg=NONE ctermfg=1 ctermbg=NONE
+" Error, rubyInvalidVariable
+hi Error                     guifg=#FFFFFF guibg=#990000 ctermfg=221 ctermbg=88
+"rubyFunction
+hi! Function                  guifg=#FFC66D guibg=NONE ctermfg=221 cterm=NONE
+" Identifier: @var, @@var, $var, etc
+hi Identifier                guifg=#d7b0fc guibg=NONE ctermfg=73 cterm=NONE
+" Include: include, autoload, extend, load, require
+hi Include                   guifg=#CC7833  guibg=NONE ctermfg=173 cterm=NONE
+" Keyword, rubyKeywordAsMethod: alias, undef, super, yield, callcc, caller, lambda, proc
+hi Keyword                   guifg=#d8690f ctermfg=172 cterm=NONE
+" same as define
+hi Macro                     guifg=#CC7833  guibg=NONE ctermfg=172
+"rubyInteger
+hi Number                    guifg=#A5C261 ctermfg=107
+hi Boolean                   guifg=#47a3e5 ctermfg=107 gui=italic
+" #if, #else, #endif
+hi PreCondit                 guifg=#CC7833  guibg=NONE ctermfg=172 cterm=NONE
+" generic preprocessor
+hi PreProc                   guifg=#CC7833  guibg=NONE ctermfg=103
+" Control, Access, Eval: case, begin, do, for, if unless, while, until else, etc.
+hi Statement                 guifg=#CC7833 guibg=NONE ctermfg=172 cterm=NONE
+" String
+hi String                    guifg=#74d155 guibg=NONE ctermfg=107
+hi! Title                    guifg=#FFFFFF guibg=NONE ctermfg=15
+" Constant
+hi Type                      guifg=#ff5d4f guibg=NONE gui=NONE
+hi PreProc                   guifg=#ff8700 guibg=NONE ctermfg=208
+hi Special                   guifg=#ff8700 guibg=NONE ctermfg=22
+hi Operator                  guifg=#CC7833 guibg=NONE ctermfg=73
+hi Tag                       guifg=#CC7833 guibg=NONE ctermfg=73
+hi Label                     guifg=#6D9CBE ctermfg=221 gui=bold
+
+" Indentation
+hi IndentGuidesOdd  ctermbg=239 guibg=#282828
+hi IndentGuidesEven ctermbg=237 guibg=#332717
+
+" Diffs
+hi DiffAdd                   guifg=#e4e4e4 guibg=#519F50 ctermfg=254 ctermbg=22
+hi DiffDelete                guifg=#e4e4e4 guibg=#660000 gui=bold ctermfg=16 ctermbg=52 cterm=bold
+hi DiffChange                guifg=#FFFFFF guibg=#870087 ctermfg=15 ctermbg=90
+hi DiffText                  guifg=#FFC66D guibg=#FF0000 gui=bold ctermfg=15 ctermbg=9 cterm=bold
+
+hi diffAdded                 guifg=#008700 ctermfg=28
+hi diffRemoved               guifg=#800000 ctermfg=1
+hi diffNewFile               guifg=#FFFFFF guibg=NONE gui=bold ctermfg=15 ctermbg=NONE cterm=bold
+hi diffFile                  guifg=#FFFFFF guibg=NONE gui=bold ctermfg=15 ctermbg=NONE cterm=bold
+
+
+hi javaScriptOperator        guifg=#c9d05c ctermfg=185 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi javaScriptBraces          guifg=#dd7927 ctermfg=153 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+hi javaScriptNull            guifg=#dd7927 ctermfg=215 guibg=NONE ctermbg=NONE gui=NONE cterm=NONE
+
+" Ruby
+" ----
+hi rubyTodo                  guifg=#fc5858 guibg=NONE gui=bold ctermfg=167 ctermbg=NONE cterm=bold
+hi rubyClass                 guifg=#dd7927 ctermfg=15
+hi rubyConstant              guifg=#fc5858 ctermfg=167
+hi rubyInterpolation         guifg=#ea8c3f ctermfg=15
+hi rubyBlockParameter        guifg=#d7b0fc ctermfg=189
+hi rubyPseudoVariable        guifg=#47a3e5 ctermfg=221 gui=italic
+hi rubySymbol                guifg=#6D9CBE ctermfg=73 gui=bold
+hi rubyStringDelimiter       guifg=#87af5f ctermfg=107
+hi rubyInstanceVariable      guifg=#d7b0fc ctermfg=189
+hi rubyPredefinedConstant    guifg=#fc5858 ctermfg=167
+hi rubyLocalVariableOrMethod guifg=#d7b0fc ctermfg=189
+hi rubyBoolean               guifg=#47a3e5 gui=italic
+
+" JAVASCRIPT
+"
+hi jsFunction                 guifg=#ff8700 ctermfg=221 gui=italic
+hi jsFunctionKey              guifg=#ff8700 ctermfg=221 gui=italic
+hi jsArrowFunction            guifg=#ff8700 ctermfg=221
+hi jsObjectKey                guifg=#6D9CBE ctermfg=73 gui=bold
+hi jsThis                     guifg=#d7b0fc ctermfg=189 gui=italic
+hi jsStorageClass             guifg=#fc5858 ctermfg=167 gui=italic
+hi jsNull                     guifg=#ff8700 ctermfg=221 gui=italic
+
+" Typescript
+"
+hi typescriptArrowFunc        guifg=#ff8700 ctermfg=221 gui=italic
+hi typescriptIdentifier       guifg=#d7b0fc ctermfg=189 gui=italic
+hi typescriptAsyncFuncKeyword guifg=#47a3e5 gui=italic
+hi typescriptType             guifg=#ff8700 ctermfg=167 gui=italic
+hi typescriptObjectLabel      guifg=#6D9CBE ctermfg=73 gui=bold
+
+" Python
+" ------
+hi pythonExceptions          guifg=#ffaf87 ctermfg=216
+hi pythonDoctest             guifg=#8787ff ctermfg=105
+hi pythonDoctestValue        guifg=#87d7af ctermfg=115
+
+" Elixir
+"
+hi elixirAtom                 guifg=#6D9CBE ctermfg=221 gui=bold
+hi elixirTuple                guifg=#6D9CBE ctermfg=221 gui=bold
+hi elixirDefine               guifg=#CC7833 ctermfg=173 gui=bold
+hi elixirPrivateDefine        guifg=#CC7833 ctermfg=173 gui=bold
+hi elixirModuleDefine         guifg=#CC7833 ctermfg=173 gui=bold
+
+" Ember.js
+"
+hi hbsProperty                guifg=#ff8700 ctermfg=221 gui=italic
+hi mustacheHandlebars         guifg=#CC7833 ctermfg=173 gui=bold
+
+" CSS
+hi cssClassName                 guifg=#FFC66D gui=italic
+hi cssIdentifier                guifg=#47a3e5 gui=italic
+
+" JSON
+hi jsonBoolean                 guifg=#47a3e5 gui=italic
+hi jsonNull                    guifg=#47a3e5 gui=italic
+
+" yaml
+hi yamlKey                    guifg=#d7b0fc ctermfg=189 gui=bold
+
+" Mail
+" ----
+hi mailEmail                 guifg=#87af5f ctermfg=107 gui=italic cterm=underline
+hi mailHeaderKey             guifg=#ffdf5f ctermfg=221
+hi! link mailSubject mailHeaderKey
+
+" Spell
+" ----
+hi! SpellBad                  guifg=#df5f87 guibg=NONE gui=NONE ctermfg=160 ctermbg=NONE cterm=underline
+hi! SpellRare                 guifg=#df5f87 guibg=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=underline
+hi! SpellCap                  guifg=#dfdfff guibg=NONE gui=NONE ctermfg=189 ctermbg=NONE cterm=underline
+hi! SpellLocal                guifg=#00FFFF guibg=NONE gui=NONE ctermfg=51 ctermbg=NONE cterm=underline
+hi! MatchParen                guifg=#FFFFFF guibg=#005f5f ctermfg=15 ctermbg=23
+hi! Question                  guifg=#df5f87 guibg=NONE gui=NONE ctermfg=168 ctermbg=NONE cterm=underline
+
+" XML
+" ---
+hi xmlTag                    guifg=#dfaf5f ctermfg=179
+hi xmlTagName                guifg=#dfaf5f ctermfg=179
+hi xmlEndTag                 guifg=#dfaf5f ctermfg=179
+
+hi link htmlTag              xmlTag
+hi link htmlTagName          xmlTagName
+hi link htmlEndTag           xmlEndTag
+hi htmlArg                   guifg=#ff8700 ctermfg=221 gui=italic
+
+hi checkbox guifg=#3a3a3a guibg=NONE gui=NONE ctermfg=237 ctermbg=NONE cterm=NONE
+hi checkboxDone guifg=#15d300 guibg=NONE gui=BOLD ctermfg=82 ctermbg=NONE cterm=BOLD
+hi checkboxNotDone guifg=#005fdf guibg=NONE gui=BOLD ctermfg=26 ctermbg=NONE cterm=BOLD
diff --git a/vim/colors/sexy-railscasts.vim b/vim/colors/sexy-railscasts.vim
new file mode 100755
index 0000000..187fc18
--- /dev/null
+++ b/vim/colors/sexy-railscasts.vim
@@ -0,0 +1,102 @@
+" Name:     sexy-railscast vim colorscheme
+" Modifier: Oguz Bilgic <fisyonet@gmail.com> 
+" Url:      https://github.com/oguzbilgic/sexy-railscasts-theme  
+" License:  public domain
+"
+" A GUI Only port of the RailsCasts TextMate theme [1] to Vim.
+" Some parts of this theme were borrowed from the well-documented Lucius theme [2].
+" Initial file was written by Josh O'Rourke [3] then improved by Oguz Bilgic
+" 
+" [1] http://railscasts.com/about 
+" [2] http://www.vim.org/scripts/script.php?script_id=2536
+" [3] https://github.com/jpo/vim-railscasts-theme
+
+" -----------------------------------------------------------------------------------
+" Settings
+" -----------------------------------------------------------------------------------
+set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name = "sexy-railscasts"
+
+" -----------------------------------------------------------------------------------
+" Basics
+" -----------------------------------------------------------------------------------
+hi Normal                    guifg=#E6E1DC guibg=#222222
+hi Cursor                    guibg=#FFFFFF
+hi CursorLine                guibg=#333435
+hi LineNr                    guifg=#383838 guibg=#141414
+hi SignColumn                guibg=#222222
+hi NonText                   guifg=#383838 guibg=#252525 
+hi Search                    guibg=#5A647E
+hi VertSplit                 guifg=#383838 guibg=#383838
+hi Visual                    guibg=#5A647E
+hi Title                     guifg=#FFFFFF
+
+" -----------------------------------------------------------------------------------
+" Folds
+" -----------------------------------------------------------------------------------
+hi Folded                    guifg=#F6F3E8 guibg=#444444 gui=NONE
+
+" -----------------------------------------------------------------------------------
+" Misc
+" -----------------------------------------------------------------------------------
+hi Directory                 guifg=#A5C261 gui=NONE
+
+" -----------------------------------------------------------------------------------
+" Popup Menu
+" -----------------------------------------------------------------------------------
+hi Pmenu                     guifg=#F6F3E8 guibg=#444444 gui=NONE
+hi PmenuSel                  guifg=#000000 guibg=#A5C261 gui=NONE
+hi PMenuSbar                 guibg=#5A647E gui=NONE
+hi PMenuThumb                guibg=#AAAAAA gui=NONE
+
+" -----------------------------------------------------------------------------------
+" Syntax
+" -----------------------------------------------------------------------------------
+hi Comment                   guifg=#BC9458 gui=italic
+hi Todo                      guifg=#BC9458 guibg=NONE    gui=italic
+hi Constant                  guifg=#6D9CBE
+hi Define                    guifg=#CC7833
+hi Delimiter                 guifg=#519F50
+hi Error                     guifg=#FFFFFF guibg=#990000
+hi Function                  guifg=#FFC66D gui=NONE
+hi Identifier                guifg=#D0D0FF gui=NONE
+hi Include                   guifg=#CC7833 gui=NONE
+hi Keyword                   guifg=#CC7833
+hi Macro                     guifg=#CC7833 gui=NONE
+hi Number                    guifg=#A5C261
+hi PreCondit                 guifg=#CC7833 gui=NONE
+hi PreProc                   guifg=#CC7833 gui=NONE
+hi Statement                 guifg=#CC7833 gui=NONE
+hi String                    guifg=#A5C261
+hi Type                      guifg=#DA4939 gui=NONE
+
+" -----------------------------------------------------------------------------------
+" Ruby
+" -----------------------------------------------------------------------------------
+hi erubyDelimiter            guifg=#DA4939 
+
+" -----------------------------------------------------------------------------------
+" Git
+" -----------------------------------------------------------------------------------
+hi DiffAdd                   guifg=#E6E1DC guibg=#144212
+hi DiffDelete                guifg=#E6E1DC guibg=#660000
+
+" -----------------------------------------------------------------------------------
+" Xml
+" -----------------------------------------------------------------------------------
+hi xmlTag                    guifg=#E8BF6A
+hi xmlTagName                guifg=#E8BF6A
+hi xmlEndTag                 guifg=#E8BF6A
+
+" -----------------------------------------------------------------------------------
+" Html
+" -----------------------------------------------------------------------------------
+hi htmlArg                   guifg=#FFC66D guibg=#222222
+hi link htmlTag              xmlTag
+hi link htmlTagName          xmlTagName
+hi link htmlEndTag           xmlEndTag
+
diff --git a/vim/config/keybindings.vim b/vim/config/keybindings.vim
new file mode 100644
index 0000000..eb8da51
--- /dev/null
+++ b/vim/config/keybindings.vim
@@ -0,0 +1,40 @@
+" No Arrowkeys
+no <up> <NOP>
+no <down> <NOP>
+no <left> <NOP>
+no <right> <NOP>
+ino <up> <NOP>
+ino <down> <NOP>
+ino <left> <NOP>
+ino <right> <NOP>
+vno <up> <NOP>
+vno <down> <NOP>
+vno <left> <NOP>
+vno <right> <NOP>
+
+" Misc Keybindings
+let mapleader = ","
+
+" Window Movement
+nnoremap <silent> <C-H> <C-W><C-H>
+nnoremap <silent> <C-J> <C-W><C-J>
+nnoremap <silent> <C-K> <C-W><C-K>
+nnoremap <silent> <C-L> <C-W><C-L>
+
+" Yankstack
+nmap <silent> <S-P> <Plug>yankstack_substitute_newer_paste
+nmap <silent> <C-P> <Plug>yankstack_substitute_older_paste
+
+" CTRL + Space = Autocomplete
+inoremap <C-space> <C-N>
+imap <C-@> <C-Space>
+
+" Syntastic
+nnoremap <F2> :SyntasticToggleMode<CR>
+
+" SingleCompile
+nmap <F8> :SCChooseCompiler<CR>
+nmap <F9> :SCCompile<cr>
+nmap <F10> :SCCompileRun<cr>
+
+nmap <C-c> g~iw
diff --git a/vim/config/plugin.vim b/vim/config/plugin.vim
new file mode 100644
index 0000000..f08b395
--- /dev/null
+++ b/vim/config/plugin.vim
@@ -0,0 +1,106 @@
+" Airline
+if !exists('g:airline_symbols')
+  let g:airline_symbols = {}
+endif
+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 = ''
+let g:airline#extensions#tabline#left_sep=''
+let g:airline#extensions#tabline#left_alt_sep=''
+let g:airline_symbols.maxlinenr = ''
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#wordcount#enabled = 1
+let g:airline_theme="minimalist"
+
+" GoldenView
+let g:goldenview__enable_default_mapping = 0
+let g:goldenview__ignore_urule = {
+    \   'filetype' : [
+    \     ''        ,
+    \     'qf'      , 'vimpager', 'undotree', 'tagbar',
+    \     'nerdtree', 'vimshell', 'vimfiler', 'voom'  ,
+    \     'tabman'  , 'unite'   , 'quickrun', 'Decho' ,
+	\     'netrw' ,
+    \   ],
+    \   'buftype' : [
+    \     'nofile'  ,
+    \   ],
+    \   'bufname' : [
+    \     'GoToFile'                  , 'diffpanel_\d\+'      ,
+    \     '__Gundo_Preview__'         , '__Gundo__'           ,
+    \     '\[LustyExplorer-Buffers\]' , '\-MiniBufExplorer\-' ,
+    \     '_VOOM\d\+$'                , '__Urannotate_\d\+__' ,
+    \     '__MRU_Files__' ,
+    \   ],
+    \}
+let g:goldenview__restore_urule = {
+   \   'filetype' : [
+    \     'nerdtree', 'vimfiler', 'netrw',
+    \   ],
+    \   'bufname' : [
+    \     '__MRU_Files__' ,
+    \   ],
+    \ }
+
+
+" JavaComplete
+if has("autocmd")
+  autocmd Filetype java setlocal omnifunc=javacomplete#CompleteParamsInfo
+endif
+
+" Deoplete
+let g:deoplete#enable_at_startup = 1
+
+" NeoComplete
+" let g:acp_enableAtStartup = 0
+" let g:neocomplete#enable_at_startup = 1
+" let g:neocomplete#enable_smart_case = 1
+
+" NerdCommenter
+let g:NERDSpaceDelims = 1
+let g:NERDCompactSexyComs = 1
+let g:NERDDefaultAlign = "left"
+let g:NERDCommentEmptyLines = 1
+let g:NERDTrimTrailingWhitespace = 1
+
+" NerdTree
+" let g:NERDTreeShowHidden = 1
+" " let NERDTreeMinimalUI = 1
+" let NERDTreeCascadeSingleChildDir = 1
+" let NERDTreeCascadeOpenSingleChildDir = 1
+" autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+" let g:nerdtree_tabs_open_on_console_startup = 1
+
+" PythonSyntax
+let python_highlight_all = 1
+
+" Simpylfold
+let g:SimpylFold_docstring_preview = 1
+
+" Supertab
+let g:SuperTabDefaultCompletionType = "<c-space>"
+
+" Syntastic
+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
+let g:syntastic_mode_map={"mode":"active", "active_filetypes": [], "passive_filetypes": ['tex']}
+let g:syntastic_python_checkers=['flake8']
+let g:syntastic_python_flake8_args='--ignore=E501,E225'
+
+
+" UltiSnips
+let g:UltiSnipsJumpForwardTrigger="<c-b>"
+let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+" Whitespace
+autocmd BufEnter * EnableStripWhitespaceOnSave
+
+" Yankstack
+let g:yankstack_map_keys = 0
+call yankstack#setup()
diff --git a/vim/plugins/FastFold/.gitignore b/vim/plugins/FastFold/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/FastFold/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/FastFold/README.md b/vim/plugins/FastFold/README.md
new file mode 100644
index 0000000..1c51fb0
--- /dev/null
+++ b/vim/plugins/FastFold/README.md
@@ -0,0 +1,106 @@
+# What good will FastFold do?
+
+Automatic folds (that is, folds generated by a fold method different
+from `manual`), bog down VIM noticeably in insert mode. They are also often
+recomputed too early (for example, when inserting an opening fold marker
+whose closing counterpart is yet missing to complete the fold.)
+
+See http://vim.wikia.com/wiki/Keep_folds_closed_while_inserting_text
+for a discussion.
+
+With this plug-in, the folds in the currently edited buffer are updated by an
+automatic fold method only
+
+- when saving the buffer
+- when closing or opening folds (zo, za, zc, etc...)
+- when moving or operating fold-wise (zj,zk,[z,]z)
+- when typing `zuz` in normal mode
+
+and are kept as is otherwise (by keeping the fold method set to `manual`).
+
+# Example Setup
+
+Each of these triggers for updating folds can be modified or disabled by adding
+the lines
+
+```vim
+nmap zuz <Plug>(FastFoldUpdate)
+let g:fastfold_savehook = 1
+let g:fastfold_fold_command_suffixes =  ['x','X','a','A','o','O','c','C']
+let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk']
+```
+
+to the file `~/.vimrc` (respectively `%USERPROFILE%/_vimrc` on Microsoft Windows).
+
+For example, by adding
+
+```vim
+let g:tex_fold_enabled=1
+let g:vimsyn_folding='af'
+let g:xml_syntax_folding = 1
+let g:php_folding = 1
+let g:perl_fold = 1
+```
+
+to the `.vimrc` file and installing this plug-in, the folds in a TeX, Vim, XML,
+PHP or Perl file are updated by the `syntax` fold method when saving the
+buffer, opening, closing, moving or operating on folds, or typing `zuz` in
+normal mode and are kept as is otherwise.
+
+*Set fold methods for every file type only*! Setting it globally risks that FastFold assumes the wrong, global, fold method instead of that intended by the file type plug-in, for example TagList.
+
+# Configuration
+
+- If you prefer that folds are only updated manually but not when saving the buffer,
+  then add `let g:fastfold_savehook = 0` to your `.vimrc`.
+
+-   If you prefer that folds are updated whenever you close or open folds by a
+    standard keystroke such as `zx`,`zo` or `zc`, then add `let
+    g:fastfold_fold_command_suffixes = []` to your `.vimrc`.
+
+    The exact list of these standard keystrokes is `zx,zX,za,zA,zo,zO,zc,zC` and
+    it can be customized by changing the global variable
+    `g:fastfold_mapsuffixes`. If you wanted to intercept all possible fold
+    commands (such as zr,zm,...), change this to:
+
+    ```vim
+    let g:fastfold_fold_command_suffixes =
+    ['x','X','a','A','o','O','c','C','r','R','m','M','i','n','N']
+    ```
+
+- If you prefer that this plug-in does not add a normal mode mapping that updates
+  folds (that defaults to `zuz`), then add
+  `nmap <SID>(DisableFastFoldUpdate) <Plug>(FastFoldUpdate) ` to your `.vimrc`.
+
+  You can remap `zuz` to your favorite keystroke, say `<F5>`, by adding
+  `nmap <F5> <Plug>(FastFoldUpdate)` to your `.Vimrc`.
+
+  There is also a command `FastFoldUpdate` that updates all folds and its
+  variant `FastFoldUpdate!` that updates all folds and echos by which fold
+  method the folds were updated.
+
+# Addons
+
+## Vim-Stay
+
+`FastFold` integrates with the plug-in
+[vim-stay](https://github.com/kopischke/vim-stay/issues) that restores the
+folds of a file buffer by `:mkview` and `:loadview`.
+
+## Custom Fold Text
+
+A `CustomFoldText()` function that displays the percentage of the number of buffer lines that the folded text takes up and indents folds according to their nesting level, similar to [that](http://www.gregsexton.org/2011/03/improving-the-text-displayed-in-a-fold/) by Greg Sexton, is available at
+
+http://www.github.com/Konfekt/FoldText
+
+## Fold Text-Object
+
+Create a fold text object, mapped to `iz` and `az`, by adding the lines
+
+```vim
+xnoremap iz :<c-u>FastFoldUpdate<cr><esc>:<c-u>normal! ]zv[z<cr>
+xnoremap az :<c-u>FastFoldUpdate<cr><esc>:<c-u>normal! ]zV[z<cr>
+```
+
+to the file `~/.vimrc` (respectively `%USERPROFILE%/_vimrc` on Microsoft Windows).
+
diff --git a/vim/plugins/FastFold/doc/FastFold.txt b/vim/plugins/FastFold/doc/FastFold.txt
new file mode 100644
index 0000000..42484ea
--- /dev/null
+++ b/vim/plugins/FastFold/doc/FastFold.txt
@@ -0,0 +1,153 @@
+          FastFold, folding optimization              *FastFold* *fastfold*
+
+===========================================================================
+0. Introduction ~
+                                          *FastFold-intro* *fastfold-intro*
+
+Automatic folds - that is, folds generated by a fold method different
+from `manual` - bog down VIM considerably in insert mode. Also, they are often
+re-evaluated prematurely for example, when inserting an opening fold marker
+whose closing counterpart has yet to be added to complete the fold.
+
+See http://vim.wikia.com/wiki/Keep_folds_closed_while_inserting_text
+for a discussion.
+
+With this plug-in, the folds in the currently edited buffer are updated when
+certain triggers are met:
+
+- when saving the buffer
+- when closing or opening folds (zo, za, zc, etc...)
+- when moving or operating fold-wise (zj,zk,[z,]z)
+- when typing `zuz` in normal mode
+
+===========================================================================
+1. Commands ~
+                                    *FastFold-commands* *fastfold-commands*
+                                                          *FastFoldUpdate!*
+
+- `:FastFoldUpdate` updates all folds in the current buffer.
+- `:FastFoldUpdate!` updates all folds & echoes what fold method was used
+
+- The mapping `zuz` that invokes `:FastFoldUpdate!` can be changed to your
+  favorite keystroke, say `<F5>`, by adding
+>
+    nmap <F5> <Plug>(FastFoldUpdate)
+<
+  to your `.vimrc`. It can be disabled by adding
+>
+    nmap <SID>(DisableFastFoldUpdate) <Plug>(FastFoldUpdate)
+<
+===========================================================================
+2. Config ~
+                                        *FastFold-config* *fastfold-config*
+
+Each of the above triggers can be enabled or disabled by setting the
+matching global flags in your `.vimrc`. Default values are shown.
+>
+  let g:fastfold_savehook = 1
+  let g:fastfold_fdmhook = 0
+  nmap zuz <Plug>(FastFoldUpdate)
+  let g:fastfold_fold_command_suffixes =  ['x','X','a','A','o','O','c','C']
+  let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk']
+<
+For example, by adding the following  to your `.vimrc`
+>
+  let g:tex_fold_enabled=1
+  let g:vimsyn_folding='af'
+  let g:xml_syntax_folding = 1
+  let g:php_folding = 1
+  let g:perl_fold = 1
+<
+You will enable tex, vim, xml, php and perl syntax folding.
+
+Set fold methods for every file type only! Setting it globally risks that
+FastFold assumes the wrong, global, fold method instead of that intended by the
+file type plug-in, for example TagList.
+
+-----------------------------
+
+- FastFold updates all folds when you open or close folds by the commands
+  zx, zX, za, zA, zo, zO, zc, zC. This list of commands is configured by
+>
+  let g:fastfold_fold_command_suffixes =  ['x','X','a','A','o','O','c','C']
+<
+  To intercept all possible fold commands (such as zr,zm,...),change this to
+>
+  let g:fastfold_fold_command_suffixes =
+  ['x','X','a','A','o','O','c','C','r','R','m','M','i','n','N']
+<
+  To disable all interceptions, change this to
+>
+  let g:fastfold_fold_command_suffixes = []
+<
+- FastFold updates all fold when you move or operate fold-wise by
+  the commands zj,zk,[z or ]z. This list of commands is configured by
+>
+  let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk']
+<
+  It can be disabled by
+>
+  let g:fastfold_fold_movement_commands = []
+<
+- FastFold updates all folds when you save a buffer. This hook is set by
+>
+  let g:fastfold_savehook = 1
+<
+- FastFold intercepts every change of the fold method by
+>
+  let g:fastfold_fdmhook = 1
+<
+  This is disabled by default as it could interfere with other plugins such as
+  `easymotion`.
+
+- To disable FastFold for a list of file types, such as 'taglist', add
+>
+` let g:fastfold_skip_filetypes`= [ 'taglist' ]
+<
+  to your 'vimrc'. Default value is [].
+
+- Add a fold text-object, mapped to `iz` and `az`, by adding the lines
+
+  xnoremap iz :<c-u>FastFoldUpdate<cr><esc>:<c-u>normal! ]zv[z<cr>
+  xnoremap az :<c-u>FastFoldUpdate<cr><esc>:<c-u>normal! ]zV[z<cr>
+
+    to your 'vimrc'.
+===========================================================================
+3. Extra Notes ~
+
+3.1 Related Plugins ~
+
+`FastFold` integrates with the plug-in `vim-stay` available at
+
+https://github.com/kopischke/vim-stay
+
+that stores and restores the last folds by `:mkview` and `:loadview`.
+
+------------------------------
+
+A fold-text function `CustomFoldText()` that displays the percentage of the
+number of buffer lines that the folded text takes up and indents folds
+according to their nesting level is available at
+
+http://www.github.com/Konfekt/FoldText
+
+3.2 Warning ~
+
+FastFold overwrites your manual folds when saving the currently edited buffer,
+unless
+
+- FastFold is disabled for this filetype by `g:fastfold_skip_filetypes`, or
+- the `foldmethod=manual` since having entered the buffer.
+
+3.3 API ~
+
+The last used fold method by which FastFold updates the folds in the current
+buffer can be read off from the window local variable `w:lastdfm`.
+
+3.4 Thanks go to... ~
+
+- starcraftman for providing this documentation, and
+- blueyed, kopischke, sabauma, willywampa, and many others for reporting
+issues and suggesting code improvements.
+
+vim:tw=78:ts=2:sts=2:sw=2:ft=help:norl
diff --git a/vim/plugins/FastFold/plugin/fastfold.vim b/vim/plugins/FastFold/plugin/fastfold.vim
new file mode 100644
index 0000000..19de8f8
--- /dev/null
+++ b/vim/plugins/FastFold/plugin/fastfold.vim
@@ -0,0 +1,224 @@
+scriptencoding utf-8
+
+" LICENCE PUBLIQUE RIEN À BRANLER
+" Version 1, Mars 2009
+"
+" Copyright (C) 2009 Sam Hocevar
+" 14 rue de Plaisance, 75014 Paris, France
+"
+" La copie et la distribution de copies exactes de cette licence sont
+" autorisées, et toute modification est permise à condition de changer
+" le nom de la licence.
+"
+" CONDITIONS DE COPIE, DISTRIBUTON ET MODIFICATION
+" DE LA LICENCE PUBLIQUE RIEN À BRANLER
+"
+" 0. Faites ce que vous voulez, j’en ai RIEN À BRANLER.
+
+if exists('g:loaded_fastfold') || &cp
+  finish
+endif
+let g:loaded_fastfold = 1
+
+let s:keepcpo         = &cpo
+set cpo&vim
+" ------------------------------------------------------------------------------
+
+if !exists('g:fastfold_fdmhook')    | let g:fastfold_fdmhook   = 0 | endif
+if !exists('g:fastfold_savehook')    | let g:fastfold_savehook   = 1 | endif
+if !exists('g:fastfold_fold_command_suffixes')
+  let g:fastfold_fold_command_suffixes = ['x','X','a','A','o','O','c','C']
+endif
+if !exists('g:fastfold_fold_movement_commands')
+  let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk']
+endif
+if !exists('g:fastfold_skip_filetypes')   | let g:fastfold_skip_filetypes = [] | endif
+
+function! s:EnterWin()
+  if exists('w:unchanged')
+    unlet w:unchanged
+  elseif s:Skip()
+    if exists('w:lastfdm')
+      unlet w:lastfdm
+    endif
+  else
+    let w:lastfdm = &l:foldmethod
+    setlocal foldmethod=manual
+  endif
+endfunction
+
+function! s:LeaveWin()
+  if exists('w:predifffdm')
+    if empty(&l:foldmethod) || &l:foldmethod is# 'manual'
+      let &l:foldmethod = w:predifffdm
+      unlet w:predifffdm
+      return
+    elseif &l:foldmethod isnot# 'diff'
+      unlet w:predifffdm
+    endif
+  endif
+
+  if exists('w:lastfdm') && &l:foldmethod is# 'diff'
+    let w:predifffdm = w:lastfdm
+  endif
+
+  if exists('w:lastfdm') && &l:foldmethod is# 'manual' 
+    if !exists('b:last_changedtick') || b:changedtick > b:last_changedtick
+      let &l:foldmethod = w:lastfdm
+      let b:last_changedtick = b:changedtick
+    else
+      let w:unchanged = 1
+    endif
+  endif
+endfunction
+
+" Like windo but restore the current buffer.
+" See http://vim.wikia.com/wiki/Run_a_command_in_multiple_buffers#Restoring_position
+function! s:WinDo( command )
+  " avoid errors in CmdWin
+  if exists('*getcmdwintype') && !empty(getcmdwintype())
+    return
+  endif
+  " Work around Vim bug.
+  " See https://groups.google.com/forum/#!topic/vim_dev/LLTw8JV6wKg
+  let curaltwin = winnr('#') ? winnr('#') : 1
+  let currwin=winnr()
+  if &scrollopt =~# '\<jump\>'
+    set scrollopt-=jump
+    let l:restore = 'set scrollopt+=jump'
+  endif
+  silent! execute 'keepjumps noautocmd windo ' . a:command
+  silent! execute 'noautocmd ' . curaltwin . 'wincmd w'
+  silent! execute 'noautocmd ' . currwin . 'wincmd w'
+  if exists('l:restore')
+    exe l:restore
+  endif
+endfunction
+
+" WinEnter then TabEnter then BufEnter then BufWinEnter
+function! s:UpdateWin(check)
+  " skip if another session still loading
+  if a:check && exists('g:SessionLoad') | return | endif
+
+  let s:curwin = winnr()
+  call s:WinDo('if winnr() is s:curwin | call s:LeaveWin() | endif')
+  call s:WinDo('if winnr() is s:curwin | call s:EnterWin() | endif')
+endfunction
+
+function! s:UpdateBuf(feedback)
+  let s:curbuf = bufnr('%')
+  call s:WinDo("if bufnr('%') is s:curbuf | call s:LeaveWin() | endif")
+  call s:WinDo("if bufnr('%') is s:curbuf | call s:EnterWin() | endif")
+
+  if !a:feedback | return | endif
+
+  if !exists('w:lastfdm')
+    echomsg "'" . &l:foldmethod . "' folds already continuously updated"
+  else
+    echomsg "updated '" . w:lastfdm . "' folds"
+  endif
+endfunction
+
+function! s:UpdateTab()
+  " skip if another session still loading
+  if exists('g:SessionLoad') | return | endif
+
+  call s:WinDo('call s:LeaveWin()')
+  call s:WinDo('call s:EnterWin()')
+endfunction
+
+function! s:Skip()
+  if !s:isReasonable() | return 1 | endif
+  if !&l:modifiable    | return 1 | endif
+  if s:inSkipList()    | return 1 | endif
+
+  return 0
+endfunction
+
+function! s:isReasonable()
+  if &l:foldmethod is# 'syntax' || &l:foldmethod is# 'expr'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! s:inSkipList()
+  for ifiles in g:fastfold_skip_filetypes
+    if index(g:fastfold_skip_filetypes, &l:filetype) >= 0
+      return 1
+    endif
+  endfor
+  return 0
+endfunction
+
+command! -bar -bang FastFoldUpdate call s:UpdateBuf(<bang>0)
+
+nnoremap <silent> <Plug>(FastFoldUpdate) :<c-u>FastFoldUpdate!<CR>
+
+if !hasmapto('<Plug>(FastFoldUpdate)', 'n') && empty(mapcheck('zuz', 'n'))
+  nmap zuz <Plug>(FastFoldUpdate)
+endif
+
+for suffix in g:fastfold_fold_command_suffixes
+  execute 'nnoremap <silent> z'.suffix.' :<c-u>call <SID>UpdateWin(0)<CR>z'.suffix
+endfor
+
+for cmd in g:fastfold_fold_movement_commands
+  exe "nnoremap <silent><expr> " . cmd. " ':<c-u>call <SID>UpdateWin(0)<CR>'.v:count." . "'".cmd."'"
+  exe "xnoremap <silent><expr> " . cmd. " ':<c-u>call <SID>UpdateWin(0)<CR>gv'.v:count." . "'".cmd."'"
+  exe "onoremap <silent><expr> " . cmd. " '<esc>:<c-u>call <SID>UpdateWin(0)<CR>' . '\"' . v:register . v:operator . v:count1 . " . "'".cmd."'"
+endfor
+
+augroup FastFold
+  autocmd!
+  autocmd VimEnter * call s:init()
+  autocmd BufEnter,WinEnter * 
+        \ if !exists('b:last_changedtick') | let b:last_changedtick = b:changedtick | endif
+augroup end
+
+function! s:init()
+  call s:UpdateTab()
+  augroup FastFoldEnter
+    autocmd!
+    " Make &l:foldmethod local to Buffer and NOT Window.
+    autocmd BufEnter,WinEnter *
+          \ if exists('b:lastfdm') | let w:lastfdm = b:lastfdm | call s:LeaveWin() | call s:EnterWin() | endif
+    autocmd BufLeave,WinLeave *
+          \ call s:LeaveWin() | call s:EnterWin() |
+          \ if exists('w:lastfdm')     | let b:lastfdm = w:lastfdm |
+          \ elseif exists('b:lastfdm') | unlet b:lastfdm | endif
+
+    autocmd BufEnter,WinEnter *
+          \ if &l:foldmethod isnot# 'diff' && exists('b:predifffdm') | call s:UpdateBuf(0) | endif
+    autocmd BufLeave,WinLeave *
+          \ if exists('w:predifffdm')     | let b:predifffdm = w:predifffdm |
+          \ elseif exists('b:predifffdm') | unlet b:predifffdm | endif
+
+    " UpdateBuf/Win(1) = skip if another session is still loading.
+    autocmd TabEnter                      * call s:UpdateTab()
+
+    " BufWinEnter = to change &l:foldmethod by modelines.
+    autocmd BufWinEnter,FileType          * call s:UpdateWin(1)
+    " So that FastFold functions correctly after :loadview.
+    autocmd SessionLoadPost               * call s:UpdateWin(0)
+
+    " Update folds on reload.
+    autocmd BufReadPost                   * 
+          \ if !exists('b:already_loaded') | let b:already_loaded = 1 |
+          \ else                          | call s:UpdateBuf(0) | endif
+    " Update folds on saving.
+    if g:fastfold_savehook
+      autocmd BufWritePost                * call s:UpdateBuf(0)
+    endif
+    if g:fastfold_fdmhook
+      if exists('##OptionSet')
+        autocmd OptionSet foldmethod call s:UpdateBuf(0)
+      endif
+    endif
+  augroup end
+endfunction
+
+" ------------------------------------------------------------------------------
+let &cpo= s:keepcpo
+unlet s:keepcpo
diff --git a/vim/plugins/GoldenView/.gitignore b/vim/plugins/GoldenView/.gitignore
new file mode 100644
index 0000000..c4c4ffc
--- /dev/null
+++ b/vim/plugins/GoldenView/.gitignore
@@ -0,0 +1 @@
+*.zip
diff --git a/vim/plugins/GoldenView/.vclog b/vim/plugins/GoldenView/.vclog
new file mode 100644
index 0000000..796c237
--- /dev/null
+++ b/vim/plugins/GoldenView/.vclog
@@ -0,0 +1,31 @@
+# Heuristics used by VCLog itself.
+
+type :major,    3, "Major Enhancements"
+type :minor,    2, "Minor Enhancements"
+type :bug,      1, "Bug Fixes"
+type :fix,      1, "Bug Fixes"
+type :update,   0, "Nominal Changes"
+type :doc,     -1, "Documentation Changes"
+type :test,    -1, "Test/Spec Adjustments"
+type :admin,   -2, "Administrative Changes"
+type :log,     -3, "Just a record"
+
+
+on Regexp.union(/^(?<type> \w+):/, /^\[(?<type>\w+)\]/) do |commit, md|
+  type = md[:type].to_sym
+  commit.type    = type
+  commit.message = commit.message.sub(md[0],'').strip
+end
+
+on /updated? (README\.md|PROFILE|PACKAGE|VERSION|Manifest\.txt)/ do |commit|
+  commit.type = :admin
+end
+
+on /(bump|bumped|prepare) version/ do |commit|
+  commit.type = :admin
+end
+
+colors :grey, :blue, :cyan, :green, :yellow, :red, [:red, :bold]
+
+
+#  vim: set ft=ruby ts=2 sw=2 tw=78 fmr=[[[,]]] fdm=syntax :
diff --git a/vim/plugins/GoldenView/GoldenView.Vim.vimup b/vim/plugins/GoldenView/GoldenView.Vim.vimup
new file mode 100644
index 0000000..7b8d7d2
--- /dev/null
+++ b/vim/plugins/GoldenView/GoldenView.Vim.vimup
@@ -0,0 +1,124 @@
+script_name: GoldenView.Vim
+script_id: '4529'
+script_type: utility
+script_package: '{script_name}-{version}.zip'
+required_vim_version: '7.3'
+summary: Always have a nice view for vim split windows 
+
+detailed_description: |
+
+  Please goto homepage for a better view of the introduction.
+
+  Homepage: http://zhaocai.github.io/GoldenView.Vim/ 
+  Screencast:  http://dl.dropboxusercontent.com/u/1897501/Screencasts/GoldenView.gif 
+  
+
+  If you like it, please star or fork in https://github.com/zhaocai/GoldenView.Vim so that more people may find it.
+  
+
+
+
+
+
+  >>> Introduction: 
+ 
+  The initial motive for GoldenView comes from the frustration of using other vim plugins to autoresize split windows. The idea is deadly simple and very useful: resize the focused window to a proper size. However, in practice, many hiccups makes autoresizing not a smooth experience. Below are a list of issues I am trying to solve: 
+
+  First and the most important one, autoresizing should play nicely with existing plugins like tagbar, vimfiler, unite, VOoM, quickfix, undotree, gundo, etc. These windows should manage there own window size. 
+
+  Second, autoresizing should take care of the other windows too. Resizing the focused window may cause the other windows become too small. When you have 4+ split windows, autoresizing may just make a mess out of it. 
+
+
+
+
+  >>> Features:
+
+  GoldenView has preliminarily solved the issues described above. It also provides other features. Bascally, it does two things:
+
+  1. Autoresizing
+
+  First of all, it automatically resize the focused split window to a "golden" view based on golden ratio and textwidth.
+
+  2. Tiled Windows Management
+
+  Second, it maps a single key (<C-L> by default) to nicely split windows to tiled windows.
+
+        ====+==============+============+===+
+        |   |              |            |   |
+        | F |              |    S1      | T |
+        | I |              +------------| A |
+        | L |  MAIN PANE   |    S2      | G |
+        | E |              +------------+ B |
+        | R |              |    S3      | A |
+        |   |              |            |   |
+        +===+==============+============+===+
+
+  To get this view, just hit <C-L> 4 times. or, if you have a large monitor, you may get tiled windows below.
+  
+        +===+==============+==============+============+===+
+        |   |              |              |            |   |
+        | F |              |              |    S1      | T |
+        | I |              |              +------------| A |
+        | L |  MAIN PANE   |      M2      |    S2      | G |
+        | E |              |              +------------+ B |
+        | R |              |              |    S3      | A |
+        |   |              |              |            |   |
+        +===+==============+==============+============+===+
+
+
+  To quickly switch between those windows, a few keys are mapped to
+
+  - Focuse to the main window
+  - Switch with the largest, smallest, etc.
+  - Jump to next and previous window
+
+  Requirements:
+  - Vim 7.3 or later
+
+install_details: |
+  http://zhaocai.github.io/GoldenView.Vim/
+
+versions:
+- '1.3.6': |
+   - Maintenance update
+- '1.3.5': |
+   - Fix for issue #5 (github).  
+   - Fix for Dirdiff, FencView
+   - Improve tracing
+
+- '1.3.0': |
+   - Diff mode auto-resizing
+   - refactor autocmd function: tweak restore behavior
+
+- '1.2.2': |
+   Improve documents and small bug fixes,
+   Load guard for #4 (github)
+
+- '1.2.0': |
+   add restore rule for some special buffers, which solves all the hiccups I could identify so far.
+
+- '1.1.2': |
+   Improve documents, fix load sequence
+
+- '1.1.1': |
+   Improve documents, fix zl library load
+
+- '1.1.0': |
+   - 3 Major Enhancements
+      * add WinLeave event into account. This version works perfectly.
+      * fix various hiccups caused by winleave
+      * use ignore rules from zl.vim
+   - 4 Minor Enhancements
+      * add mapping to switch to main pane. [minor] speed up buffer switch with noautocmd
+      * include zl.vim into source code
+      * tune for autocmd sequence
+      * treat winfixwidth and winfixheight separately
+   - 2 Bug Fixes
+      * winleave cause ignored windows resized
+      * cannot let &winminwidth > &winwidth
+   - 2 Nominal Changes
+      * change profile variable scope to s\:
+      * tweak golden ratio for win size
+
+# __END__
+# vim: filetype=yaml
diff --git a/vim/plugins/GoldenView/History.md b/vim/plugins/GoldenView/History.md
new file mode 100644
index 0000000..f30e4aa
--- /dev/null
+++ b/vim/plugins/GoldenView/History.md
@@ -0,0 +1,102 @@
+# RELEASE HISTORY
+
+## V1.3.0 / 2013-04-22
+
+Diff Mode auto resizing (Zhao Cai <caizhaoff@gmail.com>)
+
+Changes:
+
+* 1 Major Enhancements
+
+    * diff mode auto-resizing.
+
+* 1 Minor Enhancements
+
+    * refactor autocmd function: tweak restore behavior
+
+
+## V1.2.2 / 2013-04-21
+
+Improve documents and small bug fixes,
+Load guard for #4 (github) (Zhao Cai <caizhaoff@gmail.com>)
+
+Changes:
+
+* 1 Minor Enhancements
+
+    * better tracing
+
+* 1 Bug Fixes
+
+    * load guard for issue #4
+      
+      E806: using Float as a String
+
+
+## V1.2.0 / 2013-04-18
+
+ (Zhao Cai <caizhaoff@gmail.com>)
+
+Changes:
+
+* 1 Major Enhancements
+
+    * add restore rule for some special buffers
+
+* 4 Bug Fixes
+
+    * E36 no enough room to split
+    * issue #2 MRU plugin window
+    * init sequence
+    * zl load guard
+
+
+## V1.1.2 / 2013-04-18
+
+Fix init sequence between zl.vim and GoldenVim (Zhao Cai <caizhaoff@gmail.com>)
+
+
+## HEAD / 2013-04-23
+
+Current Development (Zhao Cai)
+
+
+## V1.1.1 / 2013-04-18
+
+improve documents, fix zl library load (Zhao Cai <caizhaoff@gmail.com>)
+
+
+## V1.1.0 / 2013-04-18
+
+ (Zhao Cai <caizhaoff@gmail.com>)
+
+Changes:
+
+* 3 Major Enhancements
+
+    * add WinLeave event into account. This version works perfectly.
+    * fix various hiccups caused by winleave
+    * use ignore rules from zl.vim
+
+* 4 Minor Enhancements
+
+    * add mapping to switch to main pane. [minor] speed up buffer switch with noautocmd
+    * include zl.vim into source code
+    * tune for autocmd sequence
+    * treat winfixwidth and winfixheight separately
+
+* 2 Bug Fixes
+
+    * winleave cause ignored windows resized
+    * cannot let &winminwidth > &winwidth
+
+* 2 Nominal Changes
+
+    * change profile variable scope to s:
+    * tweak golden ratio for win size
+
+
+## 1.0 / 2012-09-18
+
+ (Zhao Cai <caizhaoff@gmail.com>)
+
diff --git a/vim/plugins/GoldenView/README.md b/vim/plugins/GoldenView/README.md
new file mode 100644
index 0000000..8373a4f
--- /dev/null
+++ b/vim/plugins/GoldenView/README.md
@@ -0,0 +1,343 @@
+# Always have a nice view for vim split windows
+
+    ------------- - -----------------------------------------------
+    Plugin        : GoldenView.vim
+    Author        : Zhao Cai
+    EMail         : caizhaoff@gmail.com
+    Homepage      : http://zhaocai.github.io/GoldenView.Vim/
+    Vim.org       : http://www.vim.org/scripts/script.php?script_id=4529
+    Version       : 1.3.6
+    Date Created  : Tue 18 Sep 2012 05:23:13 PM EDT
+    Last Modified : Mon 22 Apr 2013 05:55:22 PM EDT
+    ------------- - -----------------------------------------------
+
+
+
+The initial motive for [GoldenView][GoldenView] comes from the frustration of using other vim plugins to auto-resize split windows. The idea is deadly simple and very useful: **resize the focused window to a proper size.** However, in practice, many hiccups makes **auto-resizing** not a smooth experience.  Below are a list of issues [GoldenView][GoldenView] attempts to solve:
+
+First and the most important one, auto-resizing should play nicely with existing plugins like `tagbar`, `vimfiler`, `unite`, `VOoM`, `quickfix`, `undotree`, `gundo`, etc. These windows should manage there own window size.
+
+Second, auto-resizing should take care of **the other windows** too. Resizing the focused window may cause the other windows become too small. When you have 4+ split windows, auto-resizing may just make a mess out of it.
+
+
+![GoldView Screencast]( http://dl.dropboxusercontent.com/u/1897501/Screencasts/GoldenView.gif )
+
+
+## Features
+
+[GoldenView][GoldenView] has preliminarily solved the issues described above. It also provides other features. Bascally, it does two things:
+
+### 1. AutoResizing
+First of all, it automatically resize the focused split window to a "golden" view based on [golden ratio][golden-ratio-wikipedia] and `textwidth`.
+
+
+### 2. Tiled Windows Management
+
+Second, it maps a single key (`<C-L>` by default) to nicely split windows to tiled windows.
+
+```
+----+----------------+------------+---+
+|   |                |            |   |
+| F |                |    S1      | T |
+| I |                +------------| A |
+| L |                |    S2      | G |
+| E |   MAIN PANE    +------------+ B |
+| R |                |    S3      | A |
+|   |                |            | R |
+|   |                |            |   |
++---+----------------+------------+---+
+```
+
+To get this view, just hit `<C-L>` 4 times. or, if you have a large monitor, you may get tiled windows below.
+
+
+```
+----+---------------+--------------+------------+---+
+|   |               |              |            |   |
+| F |               |              |    S1      | T |
+| I |               |              +------------| A |
+| L |               |      M2      |    S2      | G |
+| E |   MAIN PANE   |              +------------+ B |
+| R |               |              |    S3      | A |
+|   |               |              |            | B |
+|   |               |              |            |   |
++---+---------------+--------------+------------+---+
+```
+
+
+To quickly switch between those windows, a few keys are mapped to
+
+- Focus to the main window
+- Switch with the `MAIN PANE`, the largest, smallest, etc.
+- Jump to the next and previous window
+
+
+
+
+
+## Installation
+
+Install [GoldenView][GoldenView] is the *same as installing other vim plugins*. If experienced with vim, you can skim the example below and move to [next section](#quick-start).
+
+
+### **Option A** - With [Plugin Manager][vim-plugin-manager] ( **recommended** )
+
+If you use plugin managers like *Pathogen*, *vundle*, *neobundle*, *vim-addon-manager*, etc., just unarchive the zip file or clone the [GoldenView][GoldenView] repo from `git://github.com/zhaocai/GoldenView.git` into your local plugin installation directory (most likely `~/.vim/bundle/`). Then add corresponding scripts in .vimrc for the bundle manager you are using.
+
+**Example**:
+
+- *neobundle*:
+
+```vim
+    NeoBundle 'zhaocai/GoldenView.Vim' "Always have a nice view for vim split windows
+```
+
+- *vundle*:
+
+```vim
+    Bundle 'zhaocai/GoldenView.Vim'
+```
+
+- *vim-addon-manager*:
+
+```vim
+    call vam#ActivateAddons(['GoldenView.Vim'], {'auto_install' : 1})
+```
+
+
+### **Option B** - Without [Plugin Manager][vim-plugin-manager]
+
+Unarchive the zip file into a directory that is under `runtimepath` of your vim, `~/.vim` for example.
+
+
+## Quick Start
+[GoldenView][GoldenView] should work out of the box without configuration. It should automatically start to resize focused window to [golden ratio][golden-ratio-wikipedia] based on `textwidth` and vim available size. You may start to play with it now.
+
+To get you started, a few default keys are mapped as below:
+
+```vim
+" 1. split to tiled windows
+nmap <silent> <C-L>  <Plug>GoldenViewSplit
+
+" 2. quickly switch current window with the main pane
+" and toggle back
+nmap <silent> <F8>   <Plug>GoldenViewSwitchMain
+nmap <silent> <S-F8> <Plug>GoldenViewSwitchToggle
+
+" 3. jump to next and previous window
+nmap <silent> <C-N>  <Plug>GoldenViewNext
+nmap <silent> <C-P>  <Plug>GoldenViewPrevious
+
+```
+
+The meaning of those keys are self-explaining. A general workflow would be `<Plug>GoldenViewSplit` key to quickly and nicely split windows to the layout as below. Then you may open your files.
+
+```
+----+----------------+------------+---+
+|   |                |            |   |
+| F |                |    S1      | T |
+| I |                +------------| A |
+| L |                |    S2      | G |
+| E |   MAIN PANE    +------------+ B |
+| R |                |    S3      | A |
+|   |                |            | R |
+|   |                |            |   |
++---+----------------+------------+---+
+
+```
+
+To switch `S1` with `MAIN PANE`, in `S1` and hit `<Plug>GoldenViewSwitchMain`. To switch back, hit `<Plug>GoldenViewSwitchToggle` in either `MAIN PAIN` or `S1`
+
+#### g:goldenview__enable_default_mapping
+
+Every experienced vim user has a different set of key mappings. If you you are (most likely) unhappy about some of the mappings, map you own keys as below:
+
+```vim
+let g:goldenview__enable_default_mapping = 0
+
+nmap <silent> <MY_KEY> <Plug>GoldenViewSplit
+" ... and so on
+
+```
+
+#### g:goldenview__enable_at_startup
+
+if you do not want to start auto-resizing automatically, you can put the following script in your vimrc.
+
+```vim
+let g:goldenview__enable_at_startup = 0
+```
+
+## More Commands and Mappings
+
+### `:ToggleGoldenViewAutoResize`
+### `:DisableGoldenViewAutoResize`
+### `:EnableGoldenViewAutoResize`
+
+These commands toggle, enable, and disable GoldenView auto-resizing.
+
+
+### `:GoldenViewResize`
+this command do manual resizing of focused window.
+
+You can also map a key for this as below:
+
+```vim
+nmap <silent> <YOUR_KEY> <Plug>GoldenViewResize
+
+```
+
+### `:SwitchGoldenViewMain`
+### `:SwitchGoldenViewLargest`
+### `:SwitchGoldenViewSmallest`
+
+these commands do as it named.
+
+You can also add mappings as below. ( no default keys for these mappings)
+```vim
+nmap <silent> <YOUR_KEY> <Plug>GoldenViewSwitchWithLargest
+nmap <silent> <YOUR_KEY> <Plug>GoldenViewSwitchWithSmallest
+
+```
+
+Other switch rules can be easily defined. If you have some ideas, please post to [github issue][GoldenViewIssue] for discussion.
+
+
+## Rules
+
+[GoldenView][] defines two rules:
+
+### `g:goldenview__ignore_urule`
+is to "ignore"  - allow those special buffers to manage their own window size.
+
+### `g:goldenview__restore_urule`
+is to "restore" - restore window size of some of special buffers.
+
+The `urule` (user rules) are like this, which will be normalize at runtime for faster processing.
+
+```vim
+    \{
+    \   'filetype' : [
+    \     ''        ,
+    \     'qf'      , 'vimpager', 'undotree', 'tagbar',
+    \     'nerdtree', 'vimshell', 'vimfiler', 'voom'  ,
+    \     'tabman'  , 'unite'   , 'quickrun', 'Decho' ,
+    \   ],
+    \   'buftype' : [
+    \     'nofile'  ,
+    \   ],
+    \   'bufname' : [
+    \     'GoToFile'                  , 'diffpanel_\d\+'      ,
+    \     '__Gundo_Preview__'         , '__Gundo__'           ,
+    \     '\[LustyExplorer-Buffers\]' , '\-MiniBufExplorer\-' ,
+    \     '_VOOM\d\+$'                , '__Urannotate_\d\+__' ,
+    \     '__MRU_Files__' ,
+    \   ],
+    \},
+
+```
+
+## Profiles
+[GoldenView][] defines two profile:
+
+### `g:goldenview__active_profile`
+defines the functions and preferences to auto resize windows.
+
+### `g:goldenview__reset_profile`
+
+defines reset preferences to restore everything to default.
+
+
+`function GoldenView#ExtendProfile()` is provided to customize preferences.
+
+For more details, please read the source code! :)
+
+
+
+## Troubleshooting:
+
+### Please do not resize me!
+
+[GoldenView][] maintains rules for "common" cases. But vim offers a great variety of plugins which defines buffers for special purposes. If you find some special buffers which is supposed to not be auto-resized. Please check `g:goldenview__ignore_urule`. You may extend the `g:goldenview__active_profile` yourself or post the issue to [github issue][GoldenViewIssue] for adding it to builtin support.
+
+
+
+### [minibufexpl.vim][] takes 5+ lines
+
+Check my fork [minibufexpl.vim][] to see if it is working for you. I have send pull request to the origin repo.
+
+
+### I cannot resize window height to < 7
+
+This is features. As mentioned in the [Introduction](#always-have-a-nice-view-for-vim-split-windows) section, there is no normal cases to have a normal window too small. For special cases like [minibufexpl.vim][], it can be handled case by case.
+
+
+However, if you really want to have small windows. It can be done by :
+
+```vim
+
+" Extend a new profile named 'small-height' from default profile.
+"
+" 1. Change "2" to your desire minimal height
+" 2. Change "small-height" to the profile name you like
+" ---------------------------------------------------------------
+call GoldenView#ExtendProfile('small-height', {
+\   'other_window_winheight'  : 2  ,
+\ })
+
+let g:goldenview__active_profile = 'small-height'
+```
+
+(refer to issue #5)
+
+### I still have Issues:
+
+If you have any issues, please post it to [github issue][GoldenViewIssue] for discussion.
+
+Remember to run the following command and post the results.
+```vim
+echo GoldenView#Info()
+```
+
+
+## Contributors
+
+
+
+
+## RELEASE HISTORY
+
+Refer to [History.md]( https://github.com/zhaocai/GoldenView.Vim/blob/master/History.md )
+
+
+
+
+## LICENSE:
+
+Copyright (c) 2013 Zhao Cai \<caizhaoff@gmail.com\>
+
+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 3 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, see <http://www.gnu.org/licenses/>.
+
+
+
+
+[dwm]: http://www.vim.org/scripts/script.php?script_id=4186
+[golden-ratio-plugin]: http://www.vim.org/scripts/script.php?script_id=3690
+[golden-ratio-wikipedia]: http://en.wikipedia.org/wiki/Golden_ratio
+[zl]: https://github.com/zhaocai/zl.vim "zl.vim vim script library"
+[GoldenView]:  http://zhaocai.github.io/GoldenView.Vim/ "GoldenView Homepage"
+[GoldenViewCode]: https://github.com/zhaocai/GoldenView.Vim "GoldenView Vim Plugin"
+[vim-plugin-manager]: http://vim-scripts.org/vim/tools.html "Vim Plugin Manangers"
+[GoldenViewIssue]: https://github.com/zhaocai/GoldenView.Vim/issues "GoldenView Issue Track"
+[minibufexpl.vim]: https://github.com/zhaocai/minibufexpl.vim
+
diff --git a/vim/plugins/GoldenView/Rakefile b/vim/plugins/GoldenView/Rakefile
new file mode 100644
index 0000000..208e8aa
--- /dev/null
+++ b/vim/plugins/GoldenView/Rakefile
@@ -0,0 +1,54 @@
+require 'facets/string'
+require 'rake/clean'
+
+project_name = __FILE__.pathmap("%-1d")
+
+def version
+  project_readme = FileList['README.*']
+  version_re = /Version \s+ : \s* (?<version> \d\.\d\.\d) $/x
+
+  project_readme.each { |f| 
+    File.read(f).mscan(version_re).each { |m| 
+      return m[:version]
+    }
+  }
+end
+
+desc "version"
+task :version => [] do
+  puts version
+end
+
+
+
+
+desc "zip for distribution"
+task :zip => [] do
+  sh "zip -r #{project_name}-#{version}.zip autoload plugin doc README.md --exclude='*/.DS_Store'"
+end
+
+CLEAN.include('*.zip')
+
+
+
+
+vimup = File.expand_path('~/Developer/Vim/Bundle/tool/vimup/vimup')
+vimorg = File.expand_path('~/.apps/vimup/vim.org.yml')
+
+namespace :vimup do
+  desc "new vim.org script"
+  task :new do
+    sh vimup, 'new-script', project_name, vimorg
+  end
+
+  desc "updae vim.org script"
+  task :release => [:zip] do
+    sh vimup, 'update-script', project_name, vimorg
+    task(:clean).invoke
+  end
+
+  desc "updae vim.org script detail"
+  task :details do
+    sh vimup, 'update-details', project_name, vimorg
+  end
+end
diff --git a/vim/plugins/GoldenView/autoload/GoldenView.vim b/vim/plugins/GoldenView/autoload/GoldenView.vim
new file mode 100644
index 0000000..7203dd0
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView.vim
@@ -0,0 +1,529 @@
+" =============== ============================================================
+" Name           : GoldenView
+" Description    : Always have a nice view for vim split windows
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/GoldenView.Vim
+" Date Created   : Tue 18 Sep 2012 10:25:23 AM EDT
+" Last Modified  : Fri 19 Oct 2012 05:55:17 PM EDT
+" Tag            : [ vim, window, golden-ratio ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+" ============================================================================
+" Initialization And Profile:                                             ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#ExtendProfile(name, def)
+    let default = get(s:goldenview__profile, a:name,
+                \ copy(s:goldenview__profile['default']))
+
+    let s:goldenview__profile[a:name] = extend(default, a:def)
+endfunction
+
+function! GoldenView#Init()
+    if exists('g:goldenview__initialized') && g:goldenview__initialized == 1
+        return
+    endif
+
+    let s:goldenview__golden_ratio = 1.618
+    lockvar s:goldenview__golden_ratio
+
+    set equalalways
+    set eadirection=ver
+
+
+    let s:goldenview__profile = {
+    \ 'reset'   : {
+    \   'focus_window_winheight' : &winheight    ,
+    \   'focus_window_winwidth'  : &winwidth     ,
+    \   'other_window_winheight' : &winminheight ,
+    \   'other_window_winwidth'  : &winminwidth  ,
+    \ },
+    \ 'default' : {
+    \   'focus_window_winheight' : function('GoldenView#GoldenHeight')    ,
+    \   'focus_window_winwidth'  : function('GoldenView#TextWidth')       ,
+    \   'other_window_winheight' : function('GoldenView#GoldenMinHeight') ,
+    \   'other_window_winwidth'  : function('GoldenView#GoldenMinWidth')  ,
+    \ },
+    \
+    \ }
+
+    call GoldenView#ExtendProfile('golden-ratio', {
+    \   'focus_window_winwidth'  : function('GoldenView#GoldenWidth')  ,
+    \ })
+
+    let s:goldenview__ignore_nrule = GoldenView#zl#rule#norm(
+    \   g:goldenview__ignore_urule, {
+    \     'logic' : 'or',
+    \   }
+    \ )
+
+    let s:goldenview__restore_nrule = GoldenView#zl#rule#norm(
+    \   g:goldenview__restore_urule, {
+    \     'logic' : 'or',
+    \   }
+    \ )
+    let g:goldenview__initialized = 1
+endfunction
+
+
+
+" ============================================================================
+" Auto Resize:                                                            ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#ToggleAutoResize()
+    if exists('s:goldenview__auto_resize') && s:goldenview__auto_resize == 1
+        call GoldenView#DisableAutoResize()
+        call GoldenView#zl#print#moremsg('GoldenView Auto Resize: Off')
+    else
+        call GoldenView#EnableAutoResize()
+        call GoldenView#zl#print#moremsg('GoldenView Auto Resize: On')
+    endif
+endfunction
+
+
+function! GoldenView#EnableAutoResize()
+
+    call GoldenView#Init()
+
+    let active_profile = s:goldenview__profile[g:goldenview__active_profile]
+    call s:set_focus_window(active_profile)
+    call s:set_other_window(active_profile)
+
+    augroup GoldenView
+        au!
+        " Enter
+        autocmd VimResized  * call GoldenView#Enter({'event' : 'VimResized'})
+        autocmd BufWinEnter * call GoldenView#Enter({'event' : 'BufWinEnter'})
+        autocmd WinEnter    * call GoldenView#Enter({'event' : 'WinEnter'})
+
+        " Leave
+        autocmd WinLeave    * call GoldenView#Leave()
+    augroup END
+    let s:goldenview__auto_resize = 1
+
+endfunction
+
+
+function! GoldenView#DisableAutoResize()
+    au! GoldenView
+    call GoldenView#ResetResize()
+
+    let s:goldenview__auto_resize = 0
+endfunction
+
+function! GoldenView#Leave(...)
+
+    " GoldenViewTrace 'WinLeave', a:000
+
+    " Do nothing if there is no split window
+    " --------------------------------------
+    if winnr('$') < 2
+        return
+    endif
+
+    call GoldenView#Diff()
+
+    if GoldenView#IsIgnore()
+        " Record the last size of ignored windows. Restore there sizes if affected
+        " by GoldenView.
+
+        " For new split, the size does not count, which is highly possible
+        " to be resized later. Should use the size with WinLeave event.
+        "
+        call GoldenView#initialize_tab_variable()
+        let t:goldenview['bufs'][bufnr('%')] = {
+        \  'winnr'     : winnr()  ,
+        \  'winwidth'  : winwidth(0)  ,
+        \  'winheight' : winheight(0) ,
+        \ }
+        let t:goldenview['cmdheight'] = &cmdheight
+    end
+endfunction
+
+function! GoldenView#Diff()
+    " Diff Mode: auto-resize to equal size
+    if ! exists('b:goldenview_diff')
+        let b:goldenview_diff = 0
+    endif
+    if &diff
+        if ! b:goldenview_diff
+            for nr in GoldenView#zl#list#uniq(tabpagebuflist())
+                if getbufvar(nr, '&diff')
+                    call setbufvar(nr, 'goldenview_diff', 1)
+                endif
+            endfor
+            exec 'wincmd ='
+        endif
+        return 1
+    else
+        if b:goldenview_diff
+            let b:goldenview_diff = 0
+        endif
+    endif
+    return 0
+endfunction
+
+function! GoldenView#Enter(...)
+
+    if GoldenView#Diff()
+        return
+    endif
+
+    if &lazyredraw
+        return
+    endif
+
+    return call('GoldenView#Resize', a:000)
+endfunction
+
+function! GoldenView#Resize(...)
+    "--------- ------------------------------------------------
+    " Desc    : resize focused window
+    "
+    " Args    : {'event' : event}
+    " Return  : none
+    "
+    " Raise   : none from this function
+    "
+    " Pitfall :
+    "   - Can not set winminwith > winwidth
+    "   - AutoCmd Sequence:
+    "     - `:copen` :
+    "       1. WinEnter (&ft inherited from last buffer)
+    "       2. BufWinEnter (&ft == '')
+    "       3. BufWinEnter (&ft == 'qf', set winfixheight)
+    "     - `:split`
+    "       1. WinLeave current window
+    "       2. WinEnter new split window with current buffer
+    "       3. `split` return, user script may change the buffer
+    "          type, width, etc.
+    "
+    "
+    "--------- ------------------------------------------------
+
+    " GoldenViewTrace 'GoldenView Resize', a:000
+
+    let opts = {'is_force' : 0}
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    let winnr_diff = s:winnr_diff()
+    if winnr_diff > 0
+        " Plus Split Window:
+        " ++++++++++++++++++
+
+        " GoldenViewTrace '+++ winnr +++', a:000
+        return
+
+    elseif winnr_diff < 0
+        " Minus Split Window:
+        " -------------------
+
+        call GoldenView#initialize_tab_variable()
+        let saved_lazyredraw = &lazyredraw
+        set lazyredraw
+        let current_winnr = winnr()
+
+        " Restore: original size based on "g:goldenview__restore_urule"
+        " ------------------------------------------------------------
+        for winnr in range(1, winnr('$'))
+            let bufnr = winbufnr(winnr)
+            let bufsaved = get(t:goldenview['bufs'], bufnr, {})
+
+            " Ignored Case: same buffer displayed in multiply windows
+            " -------------------------------------------------------
+            if ! empty(bufsaved) && bufsaved['winnr'] == winnr
+                silent noautocmd exec winnr 'wincmd w'
+
+                if GoldenView#IsRestore()
+                    silent exec 'vertical resize ' . bufsaved['winwidth']
+                    silent exec 'resize ' . bufsaved['winheight']
+
+                    " GoldenViewTrace 'restore buffer:'. nr, a:000
+                endif
+            endif
+        endfor
+
+        if &cmdheight != t:goldenview['cmdheight']
+            exec 'set cmdheight=' . t:goldenview['cmdheight']
+        endif
+
+        silent exec current_winnr 'wincmd w'
+
+        redraw
+        let &lazyredraw = saved_lazyredraw
+
+        " GoldenViewTrace '--- winnr ---', a:000
+        return
+    endif
+
+    if ! opts['is_force']
+
+        " Do nothing if there is no split window
+        if winnr('$') < 2
+            return
+        endif
+
+        if GoldenView#IsIgnore()
+            " GoldenViewTrace 'Ignored', a:000
+            return
+        endif
+
+    endif
+
+
+    let active_profile = s:goldenview__profile[g:goldenview__active_profile]
+    call s:set_focus_window(active_profile)
+    " GoldenViewTrace 'Set Focuse', a:000
+
+
+
+    " reset focus windows minimal size
+    let &winheight = &winminheight
+    let &winwidth  = &winminwidth
+
+    " GoldenViewTrace 'Reset Focus', a:000
+endfunction
+
+function! GoldenView#IsIgnore()
+    return GoldenView#zl#rule#is_true(s:goldenview__ignore_nrule)
+endfunction
+
+function! GoldenView#IsRestore()
+    return GoldenView#zl#rule#is_true(s:goldenview__restore_nrule)
+endfunction
+
+
+function! GoldenView#ResetResize()
+    let reset_profile = s:goldenview__profile[g:goldenview__reset_profile]
+    call s:set_other_window(reset_profile, {'force' : 1})
+    call s:set_focus_window(reset_profile, {'force' : 1})
+endfunction
+
+
+function! GoldenView#GoldenHeight(...)
+    return float2nr(&lines / s:goldenview__golden_ratio)
+endfunction
+
+
+function! GoldenView#GoldenWidth(...)
+    return float2nr(&columns / s:goldenview__golden_ratio)
+endfunction
+
+
+function! GoldenView#GoldenMinHeight(...)
+    return float2nr(GoldenView#GoldenHeight()/(5*s:goldenview__golden_ratio))
+endfunction
+
+
+function! GoldenView#GoldenMinWidth(...)
+    return float2nr(GoldenView#GoldenWidth()/(3*s:goldenview__golden_ratio))
+endfunction
+
+
+function! GoldenView#TextWidth(...)
+    let tw = &l:textwidth
+
+    if tw != 0
+        return float2nr(tw * 4/3)
+    else
+        let tw = float2nr(80 * 4/3)
+        let gw = GoldenView#GoldenWidth()
+        return tw > gw ? gw : tw
+    endif
+endfunction
+
+
+function! s:set_focus_window(profile,...)
+    let opts = {
+             \ 'force' : 0
+             \ }
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    try
+        if !&winfixwidth || opts['force']
+            let &winwidth  =
+            \ s:eval(a:profile, a:profile['focus_window_winwidth'])
+        endif
+        if !&winfixheight || opts['force']
+            let &winheight =
+            \ s:eval(a:profile, a:profile['focus_window_winheight'])
+        endif
+    catch /^Vim\%((\a\+)\)\=:E36/ " Not enough room
+        call GoldenView#zl#print#warning('GoldenView: ' . v:exception)
+    endtry
+endfunction
+
+function! s:set_other_window(profile,...)
+    let opts = {
+             \ 'force' : 0
+             \ }
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    try
+        if !&winfixwidth || opts['force']
+            let &winminwidth  =
+            \ s:eval(a:profile, a:profile['other_window_winwidth'])
+        endif
+        if !&winfixheight || opts['force']
+            let &winminheight =
+            \ s:eval(a:profile, a:profile['other_window_winheight'])
+        endif
+    catch /^Vim\%((\a\+)\)\=:E36/ " Not enough room
+        call GoldenView#zl#print#warning('GoldenView: ' . v:exception)
+    endtry
+endfunction
+
+
+
+
+
+" ============================================================================
+" Split:                                                                  ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#Split()
+    call GoldenView#zl#window#split_nicely()
+endfunction
+
+
+
+" ============================================================================
+" Switch:                                                                 ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#SwitchMain(...)
+    let opts = {
+                \ 'from_bufnr' : bufnr('%') ,
+            \}
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    let window_count = winnr('$')
+    if window_count < 2
+        return
+    endif
+
+    let current_winnr = winnr()
+    let switched      = 0
+
+    let saved_lazyredraw = &lazyredraw
+    set lazyredraw
+    for i in range(1, window_count)
+        silent noautocmd exec i 'wincmd w'
+
+        if ! GoldenView#IsIgnore()
+            let switched = GoldenView#zl#window#switch_buffer(
+                \ opts['from_bufnr'], winbufnr(i))
+            break
+        endif
+    endfor
+
+    redraw
+    let &lazyredraw = saved_lazyredraw
+
+    if switched
+        call GoldenView#Resize({'event' : 'WinEnter'})
+    else
+        silent noautocmd exec current_winnr 'wincmd w'
+    endif
+endfunction
+
+" ============================================================================
+" Helper Functions:                                                       ⟨⟨⟨1
+" ============================================================================
+
+function! s:eval(profile, val)
+    if GoldenView#zl#var#is_number(a:val)
+        return a:val
+    elseif GoldenView#zl#var#is_funcref(a:val)
+        return a:val(a:profile)
+    else
+        try
+            return eval(a:val)
+        catch /^Vim\%((\a\+)\)\=:E/
+            throw 'GoldenView: invalid profile value type!'
+        endtry
+    endif
+endfunction
+
+function! GoldenView#initialize_tab_variable()
+    if !exists('t:goldenview')
+        let t:goldenview = {
+        \ 'nrwin'     : winnr('$') ,
+        \ 'cmdheight' : &cmdheight ,
+        \ 'bufs'      : {} ,
+        \ }
+    endif
+endfunction
+
+function! s:winnr_diff()
+    call GoldenView#initialize_tab_variable()
+
+    let nrwin = winnr('$')
+    if nrwin != t:goldenview['nrwin']
+        let diff = nrwin - t:goldenview['nrwin']
+        let t:goldenview['nrwin'] = nrwin
+        return diff
+    else
+        return 0
+    endif
+endfunction
+
+
+
+
+" ============================================================================
+" Debug:                                                                  ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#Info()
+    return {
+    \ 'buffer' : {
+    \   'filetype'  : &ft          ,
+    \   'buftype'   : &buftype     ,
+    \   'bufname'   : bufname('%') ,
+    \   'winwidth'  : winwidth(0)  ,
+    \   'winheight' : winheight(0) ,
+    \ },
+    \ 'goldenview'  : get(t:, 'goldenview', GoldenView#initialize_tab_variable()),
+    \ 'setting' : {
+    \   'win_count'    : winnr('$')    ,
+    \   'lazyredraw'   : &lazyredraw   ,
+    \   'cmdheight'    : &cmdheight    ,
+    \   'winfixwidth'  : &winfixwidth  ,
+    \   'winfixheight' : &winfixheight ,
+    \   'winwidth'     : &winwidth     ,
+    \   'winminwidth'  : &winminwidth  ,
+    \   'winheight'    : &winheight    ,
+    \   'winminheight' : &winminheight ,
+    \ }
+    \}
+endfunction
+
+
+function! GoldenView#Trace(...)
+    " -------- - -----------------------------------------------
+    "  Example : >
+    "    GoldenViewTrace 'WinLeave', a:000
+    " -------- - -----------------------------------------------
+
+    call GoldenView#initialize_tab_variable()
+    let info            = GoldenView#Info()
+    let info['context'] = get(g:,'GoldenView_zl_context','')
+    let info['args']    = a:000
+    call GoldenView#zl#log#debug(info)
+endfunction
+
+command! -nargs=* -complete=expression GoldenViewTrace
+    \ exec GoldenView#zl#vim#context() | call GoldenView#Trace(<args>)
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=syntax fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/list.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/list.vim
new file mode 100644
index 0000000..be0f944
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/list.vim
@@ -0,0 +1,126 @@
+" =============== ============================================================
+" Synopsis       : list helper functions
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Version        : 0.1
+" Date Created   : Sat 03 Sep 2011 03:54:00 PM EDT
+" Last Modified  : Thu 20 Sep 2012 04:25:10 PM EDT
+" Tag            : [ vim, list ]
+" Copyright      : (c) 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+" ============================================================================
+" Sort:                                                                   ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#zl#list#unique_sort(list, ...)
+    "--------- ------------------------------------------------
+    " Args    : list, [func]
+    " Return  : unique sorted list
+    " Raise   :
+    "
+    " Refer   : http://vim.wikia.com/wiki/Unique_sorting
+    "--------- ------------------------------------------------
+    let list = copy(a:list)
+
+    if exists('a:1') && type(a:1) == type(function('function'))
+        call sort(list, a:1)
+    else
+        call sort(list)
+    endif
+    if len(list) <= 1 | return list | endif
+    let result = [ list[0] ]
+    let last = list[0]
+    let i = 1
+    while i < len(list)
+        if last != list[i]
+            let last = list[i]
+            call add(result, last)
+        endif
+        let i += 1
+    endwhile
+    return result
+endfunction
+
+
+
+function! GoldenView#zl#list#sort_by(list, expr)
+    "--------- ------------------------------------------------
+    " Desc    : sort list by expr
+    "
+    " Args    : v:val is used in {expr}
+    " Return  : sroted list
+    " Raise   :
+    "
+    " Example : >
+    "   let list = [{'a' : 1}, {'a' : 22}, {'a' : 3}]
+    "   echo GoldenView#zl#list#sort_by(list, 'v:val["a"]')
+    "
+    " Refer   : vital.vim
+    "--------- ------------------------------------------------
+
+    let pairs = map(a:list, printf('[v:val, %s]', a:expr))
+    return map(GoldenView#zl#list#sort(pairs,
+                \ 'a:a[1] ==# a:b[1] ? 0 : a:a[1] ># a:b[1] ? 1 : -1'),
+                \ 'v:val[0]')
+endfunction
+
+function! s:_compare(a, b)
+    return eval(s:expr)
+endfunction
+
+function! GoldenView#zl#list#sort(list, expr)
+    "--------- ------------------------------------------------
+    " Desc    : sort list with expr to compare two values.
+    "
+    " Args    : a:a and a:b can be used in {expr}
+    " Return  : sroted list
+    " Raise   :
+    "
+    " Refer   : vital.vim
+    "--------- ------------------------------------------------
+
+    if type(a:expr) == type(function('function'))
+        return sort(a:list, a:expr)
+    endif
+    let s:expr = a:expr
+    return sort(a:list, 's:_compare')
+endfunction
+
+
+function! GoldenView#zl#list#uniq(list, ...)
+    let list = a:0
+             \ ? map(copy(a:list), printf('[v:val, %s]', a:1))
+             \ : copy(a:list)
+    let i = 0
+    let seen = {}
+    while i < len(list)
+        let key = string(a:0 ? list[i][1] : list[i])
+        if has_key(seen, key)
+            call remove(list, i)
+        else
+            let seen[key] = 1
+            let i += 1
+        endif
+    endwhile
+    return a:0 ? map(list, 'v:val[0]') : list
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/log.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/log.vim
new file mode 100644
index 0000000..ffc5980
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/log.vim
@@ -0,0 +1,310 @@
+" =============== ============================================================
+" Name           : log.vim
+" Synopsis       : vim script library: log
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Sat 03 Sep 2012 03:54:00 PM EDT
+" Last Modified  : Sat 27 Apr 2013 06:58:13 PM EDT
+" Tag            : [ vim, log ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+
+
+
+" ============================================================================
+" Logger:                                                                 [[[1
+" ============================================================================
+
+
+if !has('ruby')
+
+    function! GoldenView#zl#log#info(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+    function! GoldenView#zl#log#level_info(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+            
+
+    function! GoldenView#zl#log#debug(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+    function! GoldenView#zl#log#level_debug(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+            
+
+    function! GoldenView#zl#log#warn(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+    function! GoldenView#zl#log#level_warn(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+            
+
+    function! GoldenView#zl#log#error(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+    function! GoldenView#zl#log#level_error(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+            
+
+    function! GoldenView#zl#log#fatal(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+    function! GoldenView#zl#log#level_fatal(...)
+        call GoldenView#zl#print#warning("GoldenView(log): require vim to be built with +ruby.")
+    endfunction
+            
+
+else
+
+
+function! <SID>get_logfile()
+    if GoldenView#zl#sys#is_mac()
+        let logfile = expand('~/Library/Logs/vim/GoldenView.log')
+    elseif GoldenView#zl#sys#is_win()
+        let logfile = "C:/windows/temp/vim/GoldenView.log" 
+    elseif GoldenView#zl#sys#is_linux()
+        let logfile = expand('/var/log/vim/GoldenView.log')
+    else
+        let logfile = input('Please Input logfile: ', '/var/log/vim/GoldenView.log', 'file')
+    endif
+    let log_dir = fnamemodify(logfile, ':p:h') 
+    if !isdirectory(log_dir)
+        call mkdir(log_dir, 'p')
+    endif
+    return logfile
+endfunction
+
+let s:GoldenView_zl_ruby_loaded = 0
+function! <SID>setup_ruby()
+    if s:GoldenView_zl_ruby_loaded == 0
+
+        let logfile = <SID>get_logfile()
+
+        ruby << __RUBY__
+# ($LOAD_PATH << File.join(Vim.evaluate('g:GoldenView_zl_autoload_path'), 'lib')).uniq!
+require "logger"
+require "awesome_print"
+
+$GoldenView_zl_logger = Logger.new(Vim.evaluate('logfile'), 'weekly')
+__RUBY__
+
+        autocmd VimLeavePre * call <SID>cleanup_ruby()
+        let s:GoldenView_zl_ruby_loaded = 1
+    endif
+endfunction
+
+function! <SID>cleanup_ruby()
+    if s:GoldenView_zl_ruby_loaded
+        ruby $GoldenView_zl_logger.close
+    endif
+endfunction
+
+
+" --------------------------------%>--------------------------------
+" Example:
+"   function! Trace(...) abort
+"     let message = {}
+"     let message['context'] = get(g:,'GoldenView_zl_context','')
+"     let message['args']    = a:000
+"     call GoldenView#zl#log#info(message)
+"   endfunction
+"
+"   command! -nargs=* -complete=expression Trace
+"     \ exec GoldenView#zl#vim#context() | call GoldenView#zl#log#info(<args>)
+" --------------------------------%<--------------------------------
+
+
+
+
+function! GoldenView#zl#log#info(...)
+    call <SID>setup_ruby()
+    ruby << __RUBY__
+
+args = Vim.evaluate('a:000')
+
+case args.size
+when 0
+  return
+when 1
+  $GoldenView_zl_logger.info("GoldenView") { args[0].ai(:plain => true) }
+when 2
+  $GoldenView_zl_logger.info(args[0]) { args[1].ai(:plain => true) }
+else
+  $GoldenView_zl_logger.info(args[0]) { args[1].ai(:plain => true) }
+end
+__RUBY__
+
+endfunction
+
+function! GoldenView#zl#log#level_info()
+    ruby $GoldenView_zl_logger.level = Logger::INFO
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+function! GoldenView#zl#log#debug(...)
+    call <SID>setup_ruby()
+    ruby << __RUBY__
+
+args = Vim.evaluate('a:000')
+
+case args.size
+when 0
+  return
+when 1
+  $GoldenView_zl_logger.debug("GoldenView") { args[0].ai(:plain => true) }
+when 2
+  $GoldenView_zl_logger.debug(args[0]) { args[1].ai(:plain => true) }
+else
+  $GoldenView_zl_logger.debug(args[0]) { args[1].ai(:plain => true) }
+end
+__RUBY__
+
+endfunction
+
+function! GoldenView#zl#log#level_debug()
+    ruby $GoldenView_zl_logger.level = Logger::DEBUG
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+function! GoldenView#zl#log#warn(...)
+    call <SID>setup_ruby()
+    ruby << __RUBY__
+
+args = Vim.evaluate('a:000')
+
+case args.size
+when 0
+  return
+when 1
+  $GoldenView_zl_logger.warn("GoldenView") { args[0].ai(:plain => true) }
+when 2
+  $GoldenView_zl_logger.warn(args[0]) { args[1].ai(:plain => true) }
+else
+  $GoldenView_zl_logger.warn(args[0]) { args[1].ai(:plain => true) }
+end
+__RUBY__
+
+endfunction
+
+function! GoldenView#zl#log#level_warn()
+    ruby $GoldenView_zl_logger.level = Logger::WARN
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+function! GoldenView#zl#log#error(...)
+    call <SID>setup_ruby()
+    ruby << __RUBY__
+
+args = Vim.evaluate('a:000')
+
+case args.size
+when 0
+  return
+when 1
+  $GoldenView_zl_logger.error("GoldenView") { args[0].ai(:plain => true) }
+when 2
+  $GoldenView_zl_logger.error(args[0]) { args[1].ai(:plain => true) }
+else
+  $GoldenView_zl_logger.error(args[0]) { args[1].ai(:plain => true) }
+end
+__RUBY__
+
+endfunction
+
+function! GoldenView#zl#log#level_error()
+    ruby $GoldenView_zl_logger.level = Logger::ERROR
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+function! GoldenView#zl#log#fatal(...)
+    call <SID>setup_ruby()
+    ruby << __RUBY__
+
+args = Vim.evaluate('a:000')
+
+case args.size
+when 0
+  return
+when 1
+  $GoldenView_zl_logger.fatal("GoldenView") { args[0].ai(:plain => true) }
+when 2
+  $GoldenView_zl_logger.fatal(args[0]) { args[1].ai(:plain => true) }
+else
+  $GoldenView_zl_logger.fatal(args[0]) { args[1].ai(:plain => true) }
+end
+__RUBY__
+
+endfunction
+
+function! GoldenView#zl#log#level_fatal()
+    ruby $GoldenView_zl_logger.level = Logger::FATAL
+endfunction
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+endif
+
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
+
+
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/print.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/print.vim
new file mode 100644
index 0000000..68bc9a2
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/print.vim
@@ -0,0 +1,69 @@
+" =============== ============================================================
+" Name           : print.vim
+" Synopsis       : vim script library: print
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Sat 03 Sep 2011 03:54:00 PM EDT
+" Last Modified  : Thu 20 Sep 2012 04:25:11 PM EDT
+" Tag            : [ vim, print ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+
+" ============================================================================
+" Echo Message:                                                           ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#zl#print#echomsg(message, ...)
+    "--------- ------------------------------------------------
+    " Desc    : echomsg wrapper
+    "
+    " Args    :
+    "  - message to print
+    "  - opts : >
+    "  {
+    "    'hl'  : 'MoreMsg'          ,
+    "  }
+    " Return  :
+    " Raise   :
+    "--------- ------------------------------------------------
+
+    if empty(a:message) | return | endif
+    let opts = {
+        \ 'hl' : 'MoreMsg',
+        \ }
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    execute 'echohl ' . opts.hl
+    for m in split(a:message, "\n")
+        echomsg m
+    endfor
+    echohl NONE
+endfunction
+
+function! GoldenView#zl#print#warning(message)
+    call GoldenView#zl#print#echomsg(a:message, {'hl':'WarningMsg'})
+endfunction
+function! GoldenView#zl#print#error(message)
+    call GoldenView#zl#print#echomsg(a:message, {'hl':'ErrorMsg'})
+endfunction
+function! GoldenView#zl#print#moremsg(message)
+    call GoldenView#zl#print#echomsg(a:message, {'hl':'MoreMsg'})
+endfunction
+
+
+
+
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ts=4 sw=4 tw=78 fdm=marker fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
+
+
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/rc.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/rc.vim
new file mode 100644
index 0000000..5eaf483
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/rc.vim
@@ -0,0 +1,222 @@
+" =============== ============================================================
+" Description    : vim script library
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Mon 03 Sep 2012 09:05:14 AM EDT
+" Last Modified  : Thu 18 Apr 2013 03:16:39 PM EDT
+" Tag            : [ vim, library ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+" ============================================================================
+" Initialization:                                                         [[[1
+" ============================================================================
+
+let s:GOLDENVIEW_ZL_VERSION_CURRENT = 140
+
+let s:VERSION_FACTOR = str2float('0.01')
+
+
+function! GoldenView#zl#rc#init() abort
+    if exists('g:loaded_GoldenView_zl')
+        return
+    endif
+
+    if v:version < 700
+        echoerr "zl.vim: requires Vim >= 7"
+        return
+    endif
+
+
+    if !exists("g:GoldenView_zl_force_reload")
+        let g:GoldenView_zl_force_reload = 0
+    endif
+
+    if !exists("g:GoldenView_zl_debug_mode")
+        let g:GoldenView_zl_debug_mode = 0
+    endif
+
+    let g:loaded_GoldenView_zl = s:GOLDENVIEW_ZL_VERSION_CURRENT * s:VERSION_FACTOR
+
+endfunction
+
+
+
+function! GoldenView#zl#rc#load_guard(prefix, vim_version, GoldenView_zl_version,exprs,...)
+    "--------- ------------------------------------------------
+    " Desc    : gereric script load guard function
+    "
+    " Args    :
+    "   - prefix       : to generate loaded_var_name
+    "   - vim_version  : minmium vim version requirement
+    "   - GoldenView_zl_version : minmium zl.vim version requirement.
+    "                    set 0 to ignore.
+    "   - exprs        : assert list of expresses to be true
+    "   - ... scope    : 'g' , 'b', ...
+    "
+    " Return  :
+    "   - 1 : unloaded
+    "   - 0 : already loaded
+    "
+    " Raise   :
+    "
+    " Example : >
+    "   try | if !GoldenView#zl#rc#load_guard(expand('<sfile>:t:r'), 703, 140, ['!&cp'])
+    "           finish
+    "       endif
+    "   catch /^Vim\%((\a\+)\)\=:E117/
+    "       " E117: Unknown Function
+    "       throw 'zl.vim is required!'
+    "   endtry
+    "
+    " Details :
+    "   g:loaded_{script name} is defined as 1 if:
+    "     - vim version > 702
+    "     - zl version > 100
+    "     - test !&cp is true
+    "
+    " Refer   :
+    "--------- ------------------------------------------------
+
+"   call Dfunc('GoldenView#zl#rc#load_guard(' . a:prefix .' '. a:vim_version .' '. a:GoldenView_zl_version .' '. join(a:exprs))
+
+    let l:scope =  a:0 >= 1  ?  a:1  :  'g'
+
+    let l:loaded_var_name = l:scope . ':loaded_'
+                \ . substitute(a:prefix, '[^0-9a-zA-Z_]', '_', 'g')
+"    call Decho("loaded_var_name: " . l:loaded_var_name)
+
+    if exists(l:loaded_var_name) && g:GoldenView_zl_force_reload == 0
+"       call Decho(l:loaded_var_name . ' loaded: return 0')
+"       call Dret('GoldenView#zl#rc#load_guard')
+        return 0
+    endif
+
+    if a:vim_version > 0 && a:vim_version > v:version
+        echoerr l:loaded_var_name . ' requires Vim version '
+                    \ . string(a:vim_version * s:VERSION_FACTOR)
+        return 0
+    elseif a:GoldenView_zl_version > 0
+        if !exists("g:loaded_GoldenView_zl")
+            echoerr 'zl.vim is required but not loaded'
+            return 0
+        endif
+
+        if (a:GoldenView_zl_version > s:GOLDENVIEW_ZL_VERSION_CURRENT)
+            echoerr l:loaded_var_name . ' requires zl library version '
+                        \ . string(a:GoldenView_zl_version * s:VERSION_FACTOR)
+            return 0
+        endif
+    endif
+    for expr in a:exprs
+        if !eval(expr)
+            echoerr l:loaded_var_name . ' requires: ' . expr
+"           call Dret('GoldenView#zl#rc#load_guard')
+            return 0
+        endif
+    endfor
+    let {l:loaded_var_name} = 1
+"   call Dret('GoldenView#zl#rc#load_guard')
+    return 1
+endfunction
+
+function! GoldenView#zl#rc#script_force_reload(...)
+    "--------- ------------------------------------------------
+    " Desc    : Call to ignore GoldenView#zl#rc#load_guard() and source.
+    "
+    " Args    : script path or current script by default
+    " Return  :
+    " Raise   : E484: cannot open file
+    "
+    "--------- ------------------------------------------------
+    let script = a:0 >= 1 ? a:1 : '%'
+
+    let l:saved = g:GoldenView_zl_force_reload
+    let g:GoldenView_zl_force_reload = 1
+
+    exec "so " . script
+
+    let g:GoldenView_zl_force_reload = l:saved
+endfunction
+
+
+
+
+function! GoldenView#zl#rc#init_python()
+    if has("python3")
+        let g:GoldenView_zl_py = 'py3'
+        let g:GoldenView_zl_pyeval = 'py3eval'
+    elseif has("python")
+        let g:GoldenView_zl_py = 'py'
+        let g:GoldenView_zl_pyeval = 'pyeval'
+    else 
+        let g:GoldenView_zl_py = ''
+        let g:GoldenView_zl_pyeval = ''
+    endif
+endfunction
+
+
+
+" ============================================================================
+" Set Initialization Default Variables:                                   [[[1
+" ============================================================================
+function! GoldenView#zl#rc#set_default(var, ...)
+    "--------- ------------------------------------------------
+    " Desc    : Set Initialization Default Variables
+    "
+    " Args    : ('var', val) || ( {dict} )
+    " Return  :
+    " Raise   : 'zl.vim ***'
+    "
+    " Pitfall : avoid 's:' variables, which will be defined in
+    "           this rc.vim script bur your script
+    "
+    " Example : >
+    "   call GoldenView#zl#rc#set_default({
+    "             \ 'g:xxx_yyy'    : {
+    "             \     'abc'        : 1,
+    "             \ }
+    "             \
+    "             \ , 'g:yyy_zzz' : 'bcd'
+    "         \ })
+    "--------- ------------------------------------------------
+
+    if type(a:var) == type({})
+        for key in keys(a:var)
+            call <SID>set_default(key, a:var[key])
+        endfor
+    elseif type(a:var) == type("")
+        if a:0 >= 1
+            call <SID>set_default(a:var, a:1)
+        else
+            throw "zl.vim should call with default value for " . a:var
+        endif
+    else
+        throw "zl.vim unsupported type: " . type(a:var)
+    endif
+endfunction
+
+function! s:set_default(var,val)
+    if !exists(a:var) || type({a:var}) != type(a:val)
+        let {a:var} = a:val
+    endif
+endfunction
+
+
+
+
+
+
+"
+" Note: 
+"   add this call to other files if they need to check g:loaded_GoldenView_zl
+" or g:GoldenView_zl_install_path
+"
+call GoldenView#zl#rc#init()
+
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/regex.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/regex.vim
new file mode 100644
index 0000000..df3cc82
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/regex.vim
@@ -0,0 +1,94 @@
+" =============== ============================================================
+" Name           : regex.vim
+" Description    : vim library: Regular Expression
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Mon 03 Sep 2012 09:05:14 AM EDT
+" Last Modified  : Thu 20 Sep 2012 04:25:12 PM EDT
+" Tag            : [ vim, library, regex ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+
+
+
+
+" ============================================================================
+" Regex Escape:                                                           ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#zl#regex#escape(text, ...) " (text, ?magic='m')            ⟨⟨⟨2
+    "--------- ------------------------------------------------
+    " Desc    : escape common special characters.
+    "
+    " Args    :
+    "
+    "   - text to escape
+    "   - magic : one of m, M, v, V. See :help 'magic'
+    "
+    " Return  : escaped text
+    " Raise   :
+    "
+    " Example : echo GoldenView#zl#regex#escape('I|||love&you\\\', 'v')
+    "
+    " Refer   :
+    "--------- ------------------------------------------------
+
+    let l:magic =  a:0 >= 1  ?  a:1  :  'm'
+
+    if l:magic =~# '^\\\?m$'
+        return escape(a:text, '^$.*\[]~')
+    elseif l:magic =~# '^\\\?M$'
+        return escape(a:text, '^$\')
+    elseif l:magic =~# '^\\\?V$'
+        return escape(a:text, '\')
+    elseif l:magic =~# '^\\\?v$'
+        return substitute(a:text, '[^0-9a-zA-Z_]', '\\&', 'g')
+    else
+        throw 'unsupported magic type'
+        return a:text
+    endif
+endfunction " ⟩⟩⟩
+
+
+
+" ----------------------------------------------------------------------------
+" Regex Builder:                                                          ⟨⟨⟨1
+
+
+function! GoldenView#zl#regex#or(list, ...) "⟨⟨⟨
+    let opts =
+        \ { 'is_capturing' : 0
+        \ , 'magic' : 'm'
+        \ }
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    let begin = opts['is_capturing'] ? '\(' : '\%('
+    let or    = '\|'
+    let end   = '\)'
+
+    if opts['magic'] =~# '^\\\?v$'
+        let begin = opts['is_capturing'] ? '(' : '%('
+        let or    = '|'
+        let end   = ')'
+    endif
+
+    return  begin
+        \ . join(map(
+        \     a:list, 'GoldenView#zl#regex#escape(v:val, "' . opts['magic'] . '")'),
+        \     or)
+        \ . end
+endfunction "⟩⟩⟩
+
+" ⟩⟩⟩
+
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/rule.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/rule.vim
new file mode 100644
index 0000000..4da76f1
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/rule.vim
@@ -0,0 +1,331 @@
+" =============== ============================================================
+" Name           : rule.vim
+" Synopsis       : vim script library: rule
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Sat 03 Sep 2011 03:54:00 PM EDT
+" Last Modified  : Sat 29 Sep 2012 01:03:24 AM EDT
+" Tag            : [ vim, rule ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+" ============================================================================
+" Rule:                                                                   [[[1
+" ============================================================================
+
+" [TODO]( list for at type ) @zhaocai @start(2012-09-27 08:05)
+
+let s:rule_types =  [
+    \   'filetype', 'buftype', 'mode'  , 'cword',
+    \   'bufname' , 'at'     , 'syntax', 'expr' ,
+    \ ]
+let s:nrule = {
+    \ 'eval_order'  : copy(s:rule_types),
+    \ 'eval_negate' : []                ,
+    \ 'logic'       : 'or'              ,
+    \ 'rule'        : {}                ,
+    \ }
+
+function! GoldenView#zl#rule#norm(urule, ...)
+    "--------- ------------------------------------------------
+    " Desc    : normalize rules
+    "
+    " Rule    :
+    "   - "urule" : "Unnormalized RULE", rules written by users.
+    "   - "nrule" : "Nnormalized RULE", rules completed with
+    "               optional items and internal items.
+    "
+    " Args    :
+    "   - urule: un-normalized rule
+    "   - opts :
+    "     - eval_order   : order in s:rule_types,
+    "     - eval_negate  : reverse eval result
+    "     - logic :
+    "       - {or}     : 'v:filetype || v:bufname || ...'
+    "       - {and}    : 'v:filetype && v:bufname && ...'
+    "       - {string} : similar to v:val for filter()
+    "
+    " Return  : normalized rules
+    " Raise   :
+    "
+    " Example : >
+    "
+    " Refer   :
+    "--------- ------------------------------------------------
+    let nrule = deepcopy(s:nrule)
+
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(nrule, a:1)
+    endif
+
+    let type_expr = {
+                  \   'buftype'  : '&buftype'          , 
+                  \   'filetype' : '&ft'               , 
+                  \   'bufname'  : "bufname('%')"      , 
+                  \   'cword'    : "expand('<cword>')" , 
+                  \ }
+
+    let type_pat = {}
+    for type in ['filetype', 'buftype', 'syntax']
+        if has_key(a:urule, type)
+            let type_pat[type] = '^\%(' . join(a:urule[type], '\|') . '\)$'
+        endif
+    endfor
+    for type in ['bufname', 'cword']
+        if has_key(a:urule, type)
+            let type_pat[type] = '^\%('
+            \ . join(map(a:urule[type], 'GoldenView#zl#regex#escape(v:val)'), '\|')
+            \ . '\)$'
+        endif
+    endfor
+
+
+    " normalize each type of rules
+    for type in ['mode']
+        if has_key(a:urule, type)
+            let nrule.rule[type] = a:urule[type]
+        endif
+    endfor
+
+    for type in ['filetype', 'buftype', 'bufname', 'cword']
+        if has_key(a:urule, type)
+            let nrule.rule[type] =
+                \ {
+                \ 'eval_expr' : 1               ,
+                \ 'expr'      : type_expr[type] ,
+                \ 'pat'       : type_pat[type]  ,
+                \ }
+        endif
+    endfor
+
+
+    for type in ['syntax']
+        if has_key(a:urule, type)
+            let nrule.rule[type] = type_pat[type]
+        endif
+    endfor
+
+    for type in ['mode', 'at']
+        if has_key(a:urule, type)
+            let nrule.rule[type] = a:urule[type]
+        endif
+    endfor
+
+    for type in ['expr']
+        if has_key(a:urule, type)
+            try | let nrule.rule[type] =
+                \ join(
+                \   map(
+                \     map(
+                \       copy(a:urule[type])
+                \       ,"join(v:val,' || ')"
+                \     )
+                \     , "'('.v:val.')'"
+                \   )
+                \   ,' && '
+                \ )
+            catch /^Vim\%((\a\+)\)\=:E714/ " E714: List required
+                throw 'zl(rule): expr rule should be written as list of lists.'
+            endtry
+        endif
+    endfor
+
+    call filter(
+    \   nrule['eval_order']
+    \   , 'has_key(nrule.rule, v:val) && !empty(nrule.rule[v:val])'
+    \ )
+
+    return nrule
+endfunction
+
+
+function! GoldenView#zl#rule#is_true(nrule, ...)
+    try
+        return call('GoldenView#zl#rule#logic_'.a:nrule['logic'], [a:nrule] + a:000)
+    catch /^Vim\%((\a\+)\)\=:E129/
+        throw 'zl(rule): undefined logic funcref'
+    endtry
+endfunction
+
+
+function! GoldenView#zl#rule#is_false(nrule, ...)
+    return !call('GoldenView#zl#rule#is_true', [a:nrule] + a:000)
+endfunction
+
+
+" rule logic
+function! s:_return(nrule, type, ret)
+    return
+    \ index(a:nrule.eval_negate, a:type) >= 0
+    \ ? !a:ret
+    \ : a:ret
+endfunction
+
+function! GoldenView#zl#rule#logic_or(nrule, ...)
+    let opts = {}
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    for type in a:nrule['eval_order']
+        if s:_return(a:nrule, type, s:eval_{type}(a:nrule['rule'], opts))
+            return 1
+        endif
+    endfor
+    return 0
+endfunction
+
+function! GoldenView#zl#rule#logic_and(nrule, ...)
+    let opts = {}
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    for type in a:nrule['eval_order']
+        if !s:_return(a:nrule, type, s:eval_{type}(a:nrule['rule'], opts))
+            return 0
+        endif
+    endfor
+    return 1
+endfunction
+
+function! GoldenView#zl#rule#logic_expr(nrule, ...)
+    let opts = {}
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+
+    let str = a:nrule['expr']
+    for type in a:nrule['eval_order']
+        let str = substitute(str
+                \ , 'v:'.type
+                \ , string(
+                \     s:_return(a:nrule, type,
+                \       s:eval_{type}(a:nrule['rule'], opts)
+                \     )
+                \   )
+                \ , 'ge'
+                \ )
+    endfor
+
+    try
+        return eval(str)
+    catch /^Vim\%((\a\+)\)\=:E/
+        throw printf('zl(rule): eval(%s) raises %s', str, v:exception)
+    endtry
+endfunction
+
+
+
+" nrule eval
+function! s:eval_filetype(nrule, ...)
+    return call('s:_eval_match', ['filetype', a:nrule] + a:000)
+endfunction
+
+function! s:eval_cword(nrule, ...)
+    return call('s:_eval_match', ['cword', a:nrule] + a:000)
+endfunction
+
+function! s:eval_buftype(nrule, ...)
+    return call('s:_eval_match', ['buftype', a:nrule] + a:000)
+endfunction
+
+function! s:eval_bufname(nrule, ...)
+    return call('s:_eval_match', ['bufname', a:nrule] + a:000)
+endfunction
+
+
+function! s:eval_at(nrule, ...)
+    return search(get(a:nrule, 'at', '\%#'), 'bcnW')
+endfunction
+
+function! s:eval_mode(nrule, ...)
+    let mode_pat  = get(a:nrule, 'mode', [])
+    let mode_expr =
+    \ a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+    \ ? get(a:1, 'mode', mode())
+    \ : mode()
+
+    return
+    \ !empty(
+    \   filter(
+    \     mode_pat
+    \     , 'stridx(mode_expr, v:val) == -1'
+    \   )
+    \ )
+endfunction
+
+function! s:eval_syntax(nrule, ...)
+    let pat = get(a:nrule, 'syntax', '')
+
+    let opts = {}
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1)
+        call extend(opts, a:1)
+    endif
+    let syn_names = GoldenView#zl#syntax#synstack_names(opts)
+
+    return !empty(filter(syn_names, 'match(v:val, pat) != -1'))
+endfunction
+
+function! s:eval_expr(nrule, ...)
+    try
+        return eval(get(a:nrule, 'expr', 1))
+    catch /^Vim\%((\a\+)\)\=:E/
+        return 0
+    endtry
+endfunction
+
+function! s:_eval_match(type, nrule, ...)
+    "--------- ------------------------------------------------
+    " Desc    : internal match evluation
+    " Rule    :
+    "   { 'type' :
+    "     {
+    "       'eval_expr' : (1|0)  ,
+    "       'expr'      : {expr} ,
+    "       'pat'       : {pat}  ,
+    "     }
+    "   }
+    "
+    " Args    : [{type}, {nrule}[, {opts}]]
+    " Return  :
+    "   - 0 : false
+    "   - 1 : true
+    " Raise   : zl(rule)
+    "
+    " Refer   : vimhelp:match()
+    "--------- ------------------------------------------------
+
+    let rule = copy(get(a:nrule, a:type, {}))
+    if empty(rule)
+        throw 'zl(rule): ' . v:exception
+    endif
+
+    " opt for {expr} from runtime opts
+    if a:0 >= 1 && GoldenView#zl#var#is_dict(a:1) && has_key(a:1, a:type)
+        let rt_rule = a:1[a:type]
+        if GoldenView#zl#var#is_dict(rt_rule)
+            call extend(rule, rt_rule)
+        elseif GoldenView#zl#var#is_string(rt_rule)
+            let rule['expr']      = rt_rule
+            let rule['eval_expr'] = 0
+        endif
+    endif
+    if rule['eval_expr']
+        let rule['expr'] = eval(rule['expr'])
+    endif
+    try
+        return call('match', [rule['expr'], rule['pat']]) != -1
+    catch /^Vim\%((\a\+)\)\=:E/
+        throw 'zl(rule): ' . v:exception
+    endtry
+endfunction
+
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/sys.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/sys.vim
new file mode 100644
index 0000000..74dcdf5
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/sys.vim
@@ -0,0 +1,78 @@
+" =============== ============================================================
+" Name           : sys.vim
+" Description    : vim library
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Mon 03 Sep 2012 09:05:14 AM EDT
+" Last Modified  : Thu 20 Sep 2012 04:25:15 PM EDT
+" Tag            : [ vim, library ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+
+
+
+
+
+
+" ============================================================================
+" Environment:                                                            [[[1
+" ============================================================================
+
+function! GoldenView#zl#sys#ostype()
+    "--------- ------------------------------------------------
+    " Args    :
+    " Return  :
+    "   - Mac, Windows, Linux, FreeBSD, SunOS, Unix,
+    "   - undefined
+    " Raise   :
+    "
+    " Example : >
+    "   call GoldenView#zl#rc#set_default('g:os_type', GoldenView#zl#sys#ostype())
+    "--------- ------------------------------------------------
+    if (has("win32") || has("win95") || has("win64") || has("win16"))
+        let s:os_type = "Windows"
+    elseif has('mac')
+        let s:os_type="Mac"
+    elseif has('unix')
+        let arch = system("uname | tr -d '\n'")
+        if ( arch=="Linux" )
+            let s:os_type="Linux"
+        elseif ( arch=="FreeBSD" )
+            let s:os_type="FreeBSD"
+        elseif ( arch=="SunOS" )
+            let s:os_type="SunOS"
+        elseif ( arch=="Darwin" )
+            let s:os_type="Mac"
+        else
+            let s:os_type="Unix"
+        endif
+    endif
+    return s:os_type
+endfunction
+
+function! GoldenView#zl#sys#is_cygwin()
+    return s:is_cygwin
+endfunction
+
+function! GoldenView#zl#sys#is_win()
+    return s:os_type == 'Windows'
+endfunction
+function! GoldenView#zl#sys#is_mac()
+    return s:os_type == 'Mac'
+endfunction
+function! GoldenView#zl#sys#is_linux()
+    return s:os_type == 'Linux'
+endfunction
+
+let s:os_type   = GoldenView#zl#sys#ostype()
+let s:is_cygwin = has('win32unix')
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/var.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/var.vim
new file mode 100644
index 0000000..77c6d03
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/var.vim
@@ -0,0 +1,86 @@
+" =============== ============================================================
+" Name           : var.vim
+" Synopsis       : vim script library: variable
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Sat 03 Sep 2011 03:54:00 PM EDT
+" Last Modified  : Thu 20 Sep 2012 04:25:16 PM EDT
+" Tag            : [ vim, variable ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+" ============================================================================
+" Type:                                                                   [[[1
+" ============================================================================
+
+
+"--------- ------------------------------------------------
+" Desc    : Wrapper functions for type()
+"
+" Refer   : vital.vim
+"--------- ------------------------------------------------
+
+let [
+\   s:__TYPE_NUMBER,
+\   s:__TYPE_STRING,
+\   s:__TYPE_FUNCREF,
+\   s:__TYPE_LIST,
+\   s:__TYPE_DICT,
+\   s:__TYPE_FLOAT
+\] = [
+\   type(3),
+\   type(""),
+\   type(function('tr')),
+\   type([]),
+\   type({}),
+\   has('float') ? type(str2float('0')) : -1
+\]
+" __TYPE_FLOAT = -1 when -float
+" This doesn't match to anything.
+
+" Number or Float
+function! GoldenView#zl#var#is_numeric(Value)
+  let _ = type(a:Value)
+  return _ ==# s:__TYPE_NUMBER
+  \   || _ ==# s:__TYPE_FLOAT
+endfunction
+" Number
+function! GoldenView#zl#var#is_integer(Value)
+  return type(a:Value) ==# s:__TYPE_NUMBER
+endfunction
+function! GoldenView#zl#var#is_number(Value)
+  return type(a:Value) ==# s:__TYPE_NUMBER
+endfunction
+" Float
+function! GoldenView#zl#var#is_float(Value)
+  return type(a:Value) ==# s:__TYPE_FLOAT
+endfunction
+" String
+function! GoldenView#zl#var#is_string(Value)
+  return type(a:Value) ==# s:__TYPE_STRING
+endfunction
+" Funcref
+function! GoldenView#zl#var#is_funcref(Value)
+  return type(a:Value) ==# s:__TYPE_FUNCREF
+endfunction
+" List
+function! GoldenView#zl#var#is_list(Value)
+  return type(a:Value) ==# s:__TYPE_LIST
+endfunction
+" Dictionary
+function! GoldenView#zl#var#is_dict(Value)
+  return type(a:Value) ==# s:__TYPE_DICT
+endfunction
+
+
+
+
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/vim.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/vim.vim
new file mode 100644
index 0000000..8334121
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/vim.vim
@@ -0,0 +1,50 @@
+" =============== ============================================================
+" Description    : vim library: vim
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Date Created   : Mon 03 Sep 2012 09:05:14 AM EDT
+" Last Modified  : Thu 20 Sep 2012 06:01:48 PM EDT
+" Tag            : [ vim, library, debug ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+
+
+
+
+
+" ============================================================================
+" Context:                                                                [[[1
+" ============================================================================
+function! GoldenView#zl#vim#context()
+    " -------- - -----------------------------------------------
+    "  Desc    : generate context
+    "
+    "  Example : >
+    "            function BeTraced(...)
+    "              exec GoldenView#zl#vim#context() | call XXX#Trace(a:000)
+    "            endfunction
+    "
+    "            function XXX#Trace(...)
+    "              let context = g:GoldenView_zl_context
+    "              "...
+    "            endfunction
+    "  Refer   :
+    " -------- - -----------------------------------------------
+    return
+    \'try
+    \|  throw ""
+    \|catch
+    \|   let g:GoldenView_zl_context = v:throwpoint
+    \|endtry
+    \'
+endfunction
+
+
+" ============================================================================
+" Modeline:                                                               [[[1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=[[[,]]] fdl=1 :
diff --git a/vim/plugins/GoldenView/autoload/GoldenView/zl/window.vim b/vim/plugins/GoldenView/autoload/GoldenView/zl/window.vim
new file mode 100644
index 0000000..a8e7e04
--- /dev/null
+++ b/vim/plugins/GoldenView/autoload/GoldenView/zl/window.vim
@@ -0,0 +1,432 @@
+" =============== ============================================================
+" Name           : window.vim
+" Synopsis       : vim script library: window
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/zl.vim
+" Version        : 0.1
+" Date Created   : Sat 03 Sep 2011 03:54:00 PM EDT
+" Last Modified  : Tue 23 Oct 2012 04:59:06 PM EDT
+" Tag            : [ vim, syntax ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+
+
+" ============================================================================
+" Status:                                                                 ⟨⟨⟨1
+" ============================================================================
+call GoldenView#zl#rc#set_default({
+    \ 'g:GoldenView_zl_window__ignore_urule'           : {
+    \   'filetype' : [
+    \     ''        ,
+    \     'qf'      , 'vimpager', 'undotree', 'tagbar',
+    \     'nerdtree', 'vimshell', 'vimfiler', 'voom'  ,
+    \     'tabman'  , 'unite'   , 'quickrun', 'Decho' ,
+    \   ],
+    \   'buftype' : [
+    \     'nofile'  ,
+    \   ],
+    \   'bufname' : [
+    \     'GoToFile'                  , 'diffpanel_\d\+'      ,
+    \     '__Gundo_Preview__'         , '__Gundo__'           ,
+    \     '\[LustyExplorer-Buffers\]' , '\-MiniBufExplorer\-' ,
+    \     '_VOOM\d\+$'                , '__Urannotate_\d\+__' ,
+    \     '__MRU_Files__' ,
+    \   ],
+    \ },
+    \ })
+
+let s:GoldenView_zl_window__ignore_nrule = GoldenView#zl#rule#norm(
+    \   g:GoldenView_zl_window__ignore_urule, {
+    \     'logic' : 'or',
+    \   }
+    \ )
+
+function! GoldenView#zl#window#is_last_visible()
+    "--------- ------------------------------------------------
+    " Desc    : check if no visible buffer left
+    "
+    " Args    :
+    "
+    " Return  :
+    "   - 0 : false
+    "   - 1 : true
+    " Raise   :
+    "
+    "--------- ------------------------------------------------
+
+    for i in range(tabpagenr('$'))
+        let tabnr = i + 1
+        for bufnr in tabpagebuflist(tabnr)
+            let ft = getbufvar(bufnr, '&ft')
+            let buftype = getbufvar(bufnr, '&buftype')
+            if empty(ft) && empty(buftype)
+                continue
+            endif
+            if ! GoldenView#zl#rule#is_true(s:GoldenView_zl_window__ignore_nrule)
+                return 0
+            endif
+        endfor
+    endfor
+
+    return 1
+endfunction
+
+
+
+
+
+" ============================================================================
+" Move:                                                                   ⟨⟨⟨1
+" ============================================================================
+let s:golden_ratio = 1.618
+function! GoldenView#zl#window#next_window_or_tab()
+    if tabpagenr('$') == 1 && winnr('$') == 1
+        call GoldenView#zl#window#split_nicely()
+    elseif winnr() < winnr("$")
+        wincmd w
+    else
+        tabnext
+        wincmd w
+    endif
+endfunction
+
+function! GoldenView#zl#window#previous_window_or_tab()
+    if winnr() > 1
+        wincmd W
+    else
+        tabprevious
+        execute winnr("$") . "wincmd w"
+    endif
+endfunction
+
+
+
+" ============================================================================
+" Size:                                                                   ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#zl#window#golden_ratio_width()
+    return float2nr(&columns / s:golden_ratio)
+endfunction
+
+function! GoldenView#zl#window#golden_ratio_height()
+    return float2nr(&lines / s:golden_ratio)
+endfunction
+
+function! GoldenView#zl#window#textwidth()
+    return &tw == 0 ? 78 : &tw
+endfunction
+
+" ============================================================================
+" Split:                                                                  ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#zl#window#nicely_split_cmd(...)
+    let opts = {
+                \ 'winnr' : 0 ,
+            \}
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    let ww = winwidth(opts['winnr'])
+    let tw = &textwidth
+
+    if tw != 0 && ww > s:golden_ratio * tw
+        return 'vsplit'
+    endif
+
+    if ww > &columns / s:golden_ratio
+        return 'vsplit'
+    endif
+
+    return 'split'
+endfunction
+
+function! GoldenView#zl#window#split_nicely()
+    let split_cmd = GoldenView#zl#window#nicely_split_cmd()
+    try
+        exec split_cmd
+    catch /^Vim\%((\a\+)\)\=:E36/
+        if split_cmd == 'split'
+            let &winminheight = &winminheight / 2
+        else
+            let &winminwidth = &winminwidth / 2
+        endif
+        exec split_cmd
+    endtry
+    wincmd p
+endfunction
+
+function! GoldenView#zl#window#toggle_split()
+    let prev_name = winnr()
+    silent! wincmd w
+    if prev_name == winnr()
+        split
+    else
+        call GoldenView#zl#buf#quit()
+    endif
+endfunction
+
+
+
+" ============================================================================
+" Sort:                                                                   ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#zl#window#sort_by(...)
+    "--------- ------------------------------------------------
+    " Desc    : sort buffer by size, height, or width
+    "
+    " Args    :
+    "   - opts : > ↓
+    "   {
+    "     'by'            : size|height|width|winnr|bufnr ,
+    "     'tabnr'         : tabpagenr()                   ,
+    "     'width_weight'  : s:golden_ratio                ,
+    "     'height_weight' : 1                             ,
+    "   }
+    "
+    " Return  : sorted list of
+    "   {
+    "     'bufnr'  : bufnr  ,
+    "     'winnr'  : winnr  ,
+    "     'width'  : width  ,
+    "     'height' : height ,
+    "     'size'   : size   ,
+    "   }
+    "
+    " Raise   :
+    "
+    "--------- ------------------------------------------------
+
+    let opts = {
+                \ 'by'            : 'size' ,
+                \ 'tabnr'         : tabpagenr() ,
+                \ 'width_weight'  : s:golden_ratio       ,
+                \ 'height_weight' : 1           ,
+            \}
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    let list = []
+    for bufnr in tabpagebuflist(opts['tabnr'])
+        let winnr  = bufwinnr(bufnr)
+        let width  = winwidth(winnr)
+        let height = winheight(winnr)
+        let size   = width * opts['width_weight']
+                 \ + height * opts['height_weight']
+
+        call add(list, {
+                    \ 'bufnr'  : bufnr  ,
+                    \ 'winnr'  : winnr  ,
+                    \ 'width'  : width  ,
+                    \ 'height' : height ,
+                    \ 'size'   : size   ,
+                \ })
+    endfor
+
+    return GoldenView#zl#list#sort_by(list,'v:val["'.opts['by'].'"]')
+endfunction
+
+
+" ============================================================================
+" Switch:                                                                 ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#zl#window#switch_buffer_toggle(...)
+    "--------- ------------------------------------------------
+    " Desc    : toggle buffer switch
+    "
+    " Args    :
+    "   - opts : >
+    "   {
+    "     'with'         : 'largest'              ,
+    "   }
+    "
+    " Return  :
+    " Raise   :
+    "
+    " Example : >
+    "   nnoremap <silent> <C-@>
+    "   \ :<C-u>call GoldenView#zl#window#switch_buffer_toggle()<CR>
+    "--------- ------------------------------------------------
+
+    let opts = {
+                \ 'with'          : 'largest',
+            \}
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    let bufnr = bufnr('%')
+    if exists('b:switch_buffer')
+            \ && bufwinnr(b:switch_buffer['bufnr']) == b:switch_buffer['winnr']
+        call GoldenView#zl#window#switch_buffer(bufnr, b:switch_buffer['bufnr'])
+    else
+        try
+            let fn = 'GoldenView#zl#window#switch_buffer_with_'.opts['with']
+            exec 'call ' . fn . '()'
+        catch /^Vim%((a+))=:E700/
+            throw "zl: function " . fn . 'for ' . opts['with']
+                \ . ' is not implemented!'
+        endtry
+
+    endif
+endfunction
+
+
+function! GoldenView#zl#window#switch_buffer_with_sorted_by_size_index(index, ...)
+    "--------- ------------------------------------------------
+    " Desc    : switch buffer with the largest window
+    "
+    " Args    :
+    "   - opts : >
+    "   {
+    "     'bufnr'         : bufnr('%')              ,
+    "     'by'            : 'size'|'height'|'width' ,
+    "     'tabnr'         : tabpagenr()             ,
+    "     'width_weight'  : s:golden_ratio                   ,
+    "     'height_weight' : 1                       ,
+    "   }
+    "
+    " Return  :
+    " Raise   :
+    "
+    " Example : >
+    "   nnoremap <silent> <C-@>
+    "   \ :<C-u>call GoldenView#zl#window#switch_buffer_with_largest()<CR>
+    "--------- ------------------------------------------------
+
+
+    let opts = {
+                \ 'bufnr'         : bufnr('%')     ,
+                \ 'by'            : 'size'         ,
+                \ 'tabnr'         : tabpagenr()    ,
+                \ 'width_weight'  : s:golden_ratio ,
+                \ 'height_weight' : 1              ,
+                \}
+    if a:0 >= 1 && type(a:1) == type({})
+        call extend(opts, a:1)
+    endif
+
+    let sorted = GoldenView#zl#window#sort_by(filter(copy(opts),'v:key != "bufnr"'))
+    let bufnr_to = sorted[a:index]['bufnr']
+    call GoldenView#zl#window#switch_buffer(opts['bufnr'], bufnr_to)
+endfunction
+
+
+function! GoldenView#zl#window#switch_buffer_with_largest(...)
+    call GoldenView#zl#window#switch_buffer_with_sorted_by_size_index(-1, a:000)
+endfunction
+
+function! GoldenView#zl#window#switch_buffer_with_smallest(...)
+    call GoldenView#zl#window#switch_buffer_with_sorted_by_size_index(0, a:000)
+endfunction
+
+function! GoldenView#zl#window#switch_buffer(bufnr1, bufnr2)
+    "--------- ------------------------------------------------
+    " Desc    : switch buffer window if both are visible
+    "
+    " Args    : bufnr1 <-> bufnr2
+    " Return  :
+    "   - 0 : fail
+    "   - 1 : success
+    " Raise   :
+    "
+    " Example : >
+    "
+    " Refer   :
+    "--------- ------------------------------------------------
+    let winnr1 = bufwinnr(a:bufnr1)
+    let winnr2 = bufwinnr(a:bufnr2)
+    if winnr1 != -1 && winnr2 != -1
+
+        silent noautocmd exec winnr1 'wincmd w'
+        if bufnr('%') != a:bufnr2
+            silent noautocmd exec 'buffer' a:bufnr2
+            let b:switch_buffer = {
+                        \ 'bufnr' : a:bufnr1 ,
+                        \ 'winnr' : winnr2   ,
+                        \ }
+        endif
+        silent noautocmd exec winnr2 'wincmd w'
+        if bufnr('%') != a:bufnr1
+            silent noautocmd exec 'buffer' a:bufnr1
+
+            " need filetype detect (maybe) because bufnr1 disappears for a
+            " moment
+            silent filetype detect
+
+            let b:switch_buffer = {
+                        \ 'bufnr' : a:bufnr2 ,
+                        \ 'winnr' : winnr1   ,
+                        \ }
+        endif
+
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+function! GoldenView#zl#window#alternate_buffer()
+    if bufnr('%') != bufnr('#') && buflisted(bufnr('#'))
+        buffer #
+    else
+        let cnt = 0
+        let pos = 1
+        let current = 0
+        while pos <= bufnr('$')
+            if buflisted(pos)
+                if pos == bufnr('%')
+                    let current = cnt
+                endif
+
+                let cnt += 1
+            endif
+
+            let pos += 1
+        endwhile
+
+        if current > cnt / 2
+            bprevious
+        else
+            bnext
+        endif
+    endif
+endfunction
+
+" ============================================================================
+" Scroll:                                                                 ⟨⟨⟨1
+" ============================================================================
+
+function! GoldenView#zl#window#scroll_other_window(direction)
+    execute 'wincmd' (winnr('#') == 0 ? 'w' : 'p')
+    execute (a:direction ? "normal! \<C-d>" : "normal! \<C-u>")
+    wincmd p
+endfunction
+
+" ============================================================================
+" View:                                                                   ⟨⟨⟨1
+" ============================================================================
+function! GoldenView#zl#window#save_view_command(command) range
+    let view = winsaveview()
+
+    let range = ''
+    if a:firstline != a:lastline
+       let range = a:firstline.','.a:lastline
+    endif
+    try
+        keepjumps execute range.a:command
+    finally
+        call winrestview(view)
+    endtry
+endfunction
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
+
diff --git a/vim/plugins/GoldenView/doc/GoldenView.txt b/vim/plugins/GoldenView/doc/GoldenView.txt
new file mode 100644
index 0000000..2a085ae
--- /dev/null
+++ b/vim/plugins/GoldenView/doc/GoldenView.txt
@@ -0,0 +1,366 @@
+*GoldenView.txt*  Always have a nice view for vim split windows
+
+===============================================================================
+CONTENTS                                                   *goldenview-contents*
+
+  1. Introduction                                      |goldenview-introduction|
+  2. Features                                              |goldenview-features|
+    1. 1. AutoResizing                              |goldenview-1.-autoresizing|
+    2. 2. Tiled Windows Management      |goldenview-2.-tiled-windows-management|
+  3. Installation                                      |goldenview-installation|
+    1. Option A - With Plugin Manager [4] ( recommanded )
+    2. Option B - Without Plugin Manager [4]
+  4. Quick Start                                        |goldenview-quick-start|
+      1. |g:goldenview__enable_default_mapping|
+      2. |g:goldenview__enable_at_startup|
+  5. More Commands and Mappings          |goldenview-more-commands-and-mappings|
+    1. |:ToggleGoldenViewAutoResize|
+    2. |:DisableGoldenViewAutoResize|
+    3. |:EnableGoldenViewAutoResize|
+    4. |:GoldenViewResize|
+    5. |:SwitchGoldenViewLargest|
+    6. |:SwitchGoldenViewSmallest|
+  6. Rules                                                    |goldenview-rules|
+    1. |g:goldenview__ignore_urule|
+    2. |g:goldenview__restore_urule|
+  7. Profiles                                              |goldenview-profiles|
+    1. |g:goldenview__active_profile|
+    2. |g:goldenview__reset_profile|
+  8. Troubleshooting:                              |goldenview-troubleshooting:|
+    1. Please do not resize me!             |goldenview-please-do-not-resize-me|
+    2. minibufexpl.vim [6] takes 5+ lines |goldenview-minibufexpl.vim-6-takes-5-lines|
+    3. I still have Issues:                    |goldenview-i-still-have-issues:|
+  9. Contributors                                      |goldenview-contributors|
+  10. RELEASE HISTORY                               |goldenview-release-history|
+  11. LICENSE:                                             |goldenview-license:|
+
+===============================================================================
+INTRODUCTION                                           *goldenview-introduction*
+>
+    ------------- - -----------------------------------------------
+    Plugin        : GoldenView.vim
+    Author        : Zhao Cai
+    EMail         : caizhaoff@gmail.com
+    URL           : http://zhaocai.github.io/GoldenView.Vim/
+    Version       : 1.2.2
+    Date Created  : Tue 18 Sep 2012 05:23:13 PM EDT
+    Last Modified : Wed 17 Apr 2013 09:52:45 PM EDT
+    ------------- - -----------------------------------------------
+
+The initial motive for GoldenView [1] comes from the frustration of using
+other vim plugins to auto-resize split windows. The idea is deadly simple and
+very useful: resize the focused window to a proper size. However, in practice,
+many hiccups makes auto-resizing not a smooth experience. Below are a list of
+issues GoldenView [1] attempts to solve:
+
+First and the most important one, auto-resizing should play nicely with
+existing plugins like 'tagbar', 'vimfiler', 'unite', 'VOoM', 'quickfix',
+'undotree', 'gundo', etc. These windows should manage there own window size.
+
+Second, auto-resizing should take care of the other windows too. Resizing the
+focused window may cause the other windows become too small. When you have 4+
+split windows, auto-resizing may just make a mess out of it.
+
+    GoldView Screencast, see reference [2]
+
+GoldView Screencast
+
+===============================================================================
+FEATURES                                                   *goldenview-features*
+
+GoldenView [1] has preliminarily solved the issues described above. It also
+provides other features. Bascally, it does two things:
+
+-------------------------------------------------------------------------------
+1. AUTORESIZING                                     *goldenview-1.-autoresizing*
+
+First of all, it automatically resize the focused split window to a "golden"
+view based on golden ratio [3] and 'textwidth'.
+
+-------------------------------------------------------------------------------
+2. TILED WINDOWS MANAGEMENT             *goldenview-2.-tiled-windows-management*
+
+Second, it maps a single key ('<C-L>' by default) to nicely split windows to
+tiled windows.
+>
+    ----+----------------+------------+---+
+    |   |                |            |   |
+    | F |                |    S1      | T |
+    | I |                +------------| A |
+    | L |                |    S2      | G |
+    | E |   MAIN PANE    +------------+ B |
+    | R |                |    S3      | A |
+    |   |                |            | R |
+    |   |                |            |   |
+    +---+----------------+------------+---+
+
+To get this view, just hit '<C-L>' 4 times. or, if you have a large monitor,
+you may get tiled windows below.
+>
+    ----+---------------+--------------+------------+---+
+    |   |               |              |            |   |
+    | F |               |              |    S1      | T |
+    | I |               |              +------------| A |
+    | L |               |      M2      |    S2      | G |
+    | E |   MAIN PANE   |              +------------+ B |
+    | R |               |              |    S3      | A |
+    |   |               |              |            | B |
+    |   |               |              |            |   |
+    +---+---------------+--------------+------------+---+
+
+To quickly switch between those windows, a few keys are mapped to
+
+- Focus to the main window
+
+- Switch with the 'MAIN PANE', the largest, smallest, etc.
+
+- Jump to the next and previous window
+
+===============================================================================
+INSTALLATION                                           *goldenview-installation*
+
+Install GoldenView [1] is the same as installing other vim plugins. If
+experienced with vim, you can skim the example below and move to next section.
+
+-------------------------------------------------------------------------------
+OPTION A - WITH PLUGIN MANAGER [4] ( RECOMMANDED )
+
+If you use plugin managers like Pathogen, vundle, neobundle,
+vim-addon-manager, etc., just unarchive the zip file or clone the GoldenView
+[1] repo from 'git://github.com/zhaocai/GoldenView.git' into your local plugin
+installation directory (most likely '~/.vim/bundle/'). Then add corresponding
+scripts in .vimrc for the bundle manager you are using.
+
+Example:
+
+- neobundle:
+>
+    NeoBundle 'zhaocai/GoldenView.Vim' "Always have a nice view for vim split windows
+
+- vundle:
+>
+    Bundle 'zhaocai/GoldenView.Vim'
+
+- vim-addon-manager:
+>
+    call vam#ActivateAddons(['GoldenView.Vim'], {'auto_install' : 1})
+
+-------------------------------------------------------------------------------
+OPTION B - WITHOUT PLUGIN MANAGER [4]
+
+Unarchive the zip file into a directory that is under 'runtimepath' of your
+vim, '~/.vim' for example.
+
+===============================================================================
+QUICK START                                             *goldenview-quick-start*
+
+GoldenView [1] should work out of the box without configuration. It should
+automatically start to resize focused window to golden ratio [3] based on
+'textwidth' and vim available size. You may start to play with it now.
+
+To get you started, a few default keys are mapped as below:
+>
+    " 1. split to tiled windows
+    nmap <silent> <C-L>  <Plug>GoldenViewSplit
+    
+    " 2. quickly switch current window with the main pane
+    " and toggle back
+    nmap <silent> <F8>   <Plug>GoldenViewSwitchMain
+    nmap <silent> <S-F8> <Plug>GoldenViewSwitchToggle
+    
+    " 3. jump to next and previous window
+    nmap <silent> <C-N>  <Plug>GoldenViewNext
+    nmap <silent> <C-P>  <Plug>GoldenViewPrevious
+
+The meaning of those keys are self-explaining. A general workflow would be
+'<Plug>GoldenViewSplit' key to quickly and nicely split windows to the layout
+as below. Then you may open your files.
+>
+    ----+----------------+------------+---+
+    |   |                |            |   |
+    | F |                |    S1      | T |
+    | I |                +------------| A |
+    | L |                |    S2      | G |
+    | E |   MAIN PANE    +------------+ B |
+    | R |                |    S3      | A |
+    |   |                |            | R |
+    |   |                |            |   |
+    +---+----------------+------------+---+
+
+To switch 'S1' with 'MAIN PANE', in 'S1' and hit '<Plug>GoldenViewSwitchMain'.
+To switch back, hit '<Plug>GoldenViewSwitchToggle' in either 'MAIN PAIN' or
+'S1'
+
+-------------------------------------------------------------------------------
+*g:goldenview__enable_default_mapping*
+
+Every experienced vim user has a different set of key mappings. If you you are
+(most likely) unhappy about some of the mappings, map you own keys as below:
+>
+    let g:goldenview__enable_default_mapping = 0
+    
+    nmap <silent> <MY_KEY> <Plug>GoldenViewSplit
+    " ... and so on
+
+-------------------------------------------------------------------------------
+*g:goldenview__enable_at_startup*
+
+if you do not want to start auto-resizing automatically, you can put 'let
+g:goldenview__enable_at_startup = 0' in your vimrc.
+
+===============================================================================
+MORE COMMANDS AND MAPPINGS               *goldenview-more-commands-and-mappings*
+
+-------------------------------------------------------------------------------
+*:ToggleGoldenViewAutoResize*
+
+-------------------------------------------------------------------------------
+*:DisableGoldenViewAutoResize*
+
+-------------------------------------------------------------------------------
+*:EnableGoldenViewAutoResize*
+
+These commands toggle, enable, and disable GoldenView auto-resizing.
+
+-------------------------------------------------------------------------------
+*:GoldenViewResize*
+
+this command do manual resizing of focused window.
+
+You can also map a key for this as below:
+>
+    nmap <silent> <YOUR_KEY> <Plug>GoldenViewResize
+
+-------------------------------------------------------------------------------
+*:SwitchGoldenViewLargest*
+
+-------------------------------------------------------------------------------
+*:SwitchGoldenViewSmallest*
+
+these commands do as it named.
+
+You can also add mappings as below. ( no default keys for these mappings)
+```vim nmap GoldenViewSwitchWithLargest nmap GoldenViewSwitchWithSmallest
+
+```
+
+Other switch rules can be easily defined. If you have some ideas, please post
+to github issue [5] for discussion.
+
+===============================================================================
+RULES                                                         *goldenview-rules*
+
+GoldenView [1] defines two rules:
+
+-------------------------------------------------------------------------------
+*g:goldenview__ignore_urule*
+
+is to "ignore" - allow those special buffers to manage their own window size.
+
+-------------------------------------------------------------------------------
+*g:goldenview__restore_urule*
+
+is to "restore" - restore window size of some of special buffers.
+
+The 'urule' (user rules) are like this, which will be normalize at runtime for
+faster processing.
+>
+    \{
+    \   'filetype' : [
+    \     ''        ,
+    \     'qf'      , 'vimpager', 'undotree', 'tagbar',
+    \     'nerdtree', 'vimshell', 'vimfiler', 'voom'  ,
+    \     'tabman'  , 'unite'   , 'quickrun', 'Decho' ,
+    \   ],
+    \   'buftype' : [
+    \     'nofile'  ,
+    \   ],
+    \   'bufname' : [
+    \     'GoToFile'                  , 'diffpanel_\d\+'      , 
+    \     '__Gundo_Preview__'         , '__Gundo__'           , 
+    \     '\[LustyExplorer-Buffers\]' , '\-MiniBufExplorer\-' , 
+    \     '_VOOM\d\+$'                , '__Urannotate_\d\+__' , 
+    \     '__MRU_Files__' , 
+    \   ],
+    \},
+
+===============================================================================
+PROFILES                                                   *goldenview-profiles*
+
+GoldenView [1] defines two profile:
+
+-------------------------------------------------------------------------------
+*g:goldenview__active_profile*
+
+defines the functions and preferences to auto resize windows.
+
+-------------------------------------------------------------------------------
+*g:goldenview__reset_profile*
+
+defines reset preferences to restore everything to default.
+
+'function GoldenView#ExtendProfile()' is provided to customize preferences.
+
+For more details, please read the source code! :)
+
+===============================================================================
+TROUBLESHOOTING:                                   *goldenview-troubleshooting:*
+
+-------------------------------------------------------------------------------
+PLEASE DO NOT RESIZE ME!                    *goldenview-please-do-not-resize-me*
+
+GoldenView [1] maintains rules for "common" cases. But vim offers a great
+variety of plugins which defines buffers for special purposes. If you find
+some special buffers which is supposed to not be auto-resized. Please check
+|g:goldenview__ignore_urule|. You may extend the |g:goldenview__active_profile|
+or post the issue to github issue [5] for adding it to builtin support.
+
+-------------------------------------------------------------------------------
+MINIBUFEXPL.VIM [6] TAKES 5+ LINES  *goldenview-minibufexpl.vim-6-takes-5-lines*
+
+Check my fork minibufexpl.vim [6] to see if it is working for you. I have send
+pull request to the origin repo.
+
+-------------------------------------------------------------------------------
+I STILL HAVE ISSUES:                           *goldenview-i-still-have-issues:*
+
+If you have any issues, please post it to github issue [5] for discussion.
+
+===============================================================================
+CONTRIBUTORS                                           *goldenview-contributors*
+
+===============================================================================
+RELEASE HISTORY                                     *goldenview-release-history*
+
+Refer to History.md [7]
+
+===============================================================================
+LICENSE:                                                   *goldenview-license:*
+
+Copyright (c) 2013 Zhao Cai <caizhaoff@gmail.com>
+
+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 3 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, see 'http://www.gnu.org/licenses/' [8].
+
+===============================================================================
+REFERENCES                                               *goldenview-references*
+
+[1] http://zhaocai.github.io/GoldenView.Vim/
+[2] http://dl.dropboxusercontent.com/u/1897501/Screencasts/GoldenView.gif
+[3] http://en.wikipedia.org/wiki/Golden_ratio
+[4] http://vim-scripts.org/vim/tools.html
+[5] https://github.com/zhaocai/GoldenView.Vim/issues
+[6] https://github.com/zhaocai/minibufexpl.vim
+[7] https://github.com/zhaocai/GoldenView.Vim/blob/master/History.md
+[8] http://www.gnu.org/licenses/
+
+vim: ft=help
diff --git a/vim/plugins/GoldenView/plugin/GoldenView.vim b/vim/plugins/GoldenView/plugin/GoldenView.vim
new file mode 100644
index 0000000..ae244fb
--- /dev/null
+++ b/vim/plugins/GoldenView/plugin/GoldenView.vim
@@ -0,0 +1,177 @@
+" =============== ============================================================
+" Name           : GoldenView
+" Description    : Golden view for vim split windows
+" Author         : Zhao Cai <caizhaoff@gmail.com>
+" HomePage       : https://github.com/zhaocai/GoldenView.Vim
+" Date Created   : Tue 18 Sep 2012 10:25:23 AM EDT
+" Last Modified  : Sat 29 Sep 2012 01:23:02 AM EDT
+" Tag            : [ vim, window, size, golden-ratio ]
+" Copyright      : © 2012 by Zhao Cai,
+"                  Released under current GPL license.
+" =============== ============================================================
+
+" ============================================================================
+" Load Guard:                                                             ⟨⟨⟨1
+" ============================================================================
+if !GoldenView#zl#rc#load_guard(
+	\ expand('<sfile>:t:r'), 700, 130, ['!&cp', "has('float')"])
+    finish
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+" ============================================================================
+" Settings:                                                               ⟨⟨⟨1
+" ============================================================================
+
+call GoldenView#zl#rc#set_default({
+    \ 'g:goldenview__enable_at_startup'      : 1         ,
+    \ 'g:goldenview__enable_default_mapping' : 1         ,
+    \ 'g:goldenview__active_profile'         : 'default' ,
+    \ 'g:goldenview__reset_profile'          : 'reset'   ,
+    \ 'g:goldenview__ignore_urule'           : {
+    \   'filetype' : [
+    \     ''        ,
+    \     'qf'      , 'vimpager', 'undotree', 'tagbar',
+    \     'nerdtree', 'vimshell', 'vimfiler', 'voom'  ,
+    \     'tabman'  , 'unite'   , 'quickrun', 'Decho' ,
+    \     'ControlP', 'diff'    , 'extradite'
+    \   ],
+    \   'buftype' : [
+    \     'nofile'  ,
+    \   ],
+    \   'bufname' : [
+    \     'GoToFile'                  , 'diffpanel_\d\+'      , 
+    \     '__Gundo_Preview__'         , '__Gundo__'           , 
+    \     '\[LustyExplorer-Buffers\]' , '\-MiniBufExplorer\-' , 
+    \     '_VOOM\d\+$'                , '__Urannotate_\d\+__' , 
+    \     '__MRU_Files__' , 'FencView_\d\+$'
+    \   ],
+    \ },
+    \ 'g:goldenview__restore_urule'           : {
+    \   'filetype' : [
+    \     'nerdtree', 'vimfiler',
+    \   ],
+    \   'bufname' : [
+    \     '__MRU_Files__' , 
+    \   ],
+    \ },
+    \
+    \ })
+
+
+
+" ============================================================================
+" Public Interface:                                                       ⟨⟨⟨1
+" ============================================================================
+
+
+
+" Auto Resize:
+" ------------
+command! -nargs=0 ToggleGoldenViewAutoResize
+\ call GoldenView#ToggleAutoResize()
+
+command! -nargs=0 DisableGoldenViewAutoResize
+\ call GoldenView#DisableAutoResize()
+
+command! -nargs=0 EnableGoldenViewAutoResize
+\ call GoldenView#EnableAutoResize()
+
+nnoremap <Plug>ToggleGoldenViewAutoResize
+\ :<C-U>ToggleGoldenViewAutoResize<CR>
+
+
+
+" Manual Resize:
+" --------------
+command! -nargs=0 GoldenViewResize
+\ call GoldenView#EnableAutoResize()
+\|call GoldenView#DisableAutoResize()
+
+nnoremap <Plug>GoldenViewResize
+\ :<C-U>GoldenViewResize<CR>
+
+
+
+" Layout Split:
+" -------------
+nnoremap <Plug>GoldenViewSplit
+\ :<C-u>call GoldenView#Split()<CR>
+" [TODO]( define comfortable width &tw * 4/3) @zhaocai @start(2012-09-29 01:17)
+
+
+
+" Goto Window:
+" ------------
+nnoremap <Plug>GoldenViewNext
+\ :<C-u>call GoldenView#zl#window#next_window_or_tab()<CR>
+
+nnoremap <Plug>GoldenViewPrevious
+\ :<C-u>call GoldenView#zl#window#previous_window_or_tab()<CR>
+
+
+
+" Switch Window:
+" --------------
+nnoremap <Plug>GoldenViewSwitchMain
+\ :<C-u>call GoldenView#SwitchMain()<CR>
+command! -nargs=0 SwitchGoldenViewMain
+\ call GoldenView#SwitchMain()
+
+
+nnoremap <Plug>GoldenViewSwitchToggle
+\ :<C-u>call GoldenView#zl#window#switch_buffer_toggle()<CR>
+command! -nargs=0 SwitchGoldenViewToggle
+\ call GoldenView#zl#window#switch_buffer_toggle()
+
+
+nnoremap <Plug>GoldenViewSwitchWithLargest
+\ :<C-u>call GoldenView#zl#window#switch_buffer_with_largest()<CR>
+command! -nargs=0 SwitchGoldenViewLargest
+\ call GoldenView#zl#window#switch_buffer_with_largest()
+
+
+nnoremap <Plug>GoldenViewSwitchWithSmallest
+\ :<C-u>call GoldenView#zl#window#switch_buffer_with_smallest()<CR>
+command! -nargs=0 SwitchGoldenViewSmallest
+\ call GoldenView#zl#window#switch_buffer_with_smallest()
+
+
+
+
+" ============================================================================
+" Initialization:                                                         ⟨⟨⟨1
+" ============================================================================
+if g:goldenview__enable_at_startup == 1
+    call GoldenView#EnableAutoResize()
+endif
+
+if g:goldenview__enable_default_mapping == 1
+    nmap <silent> <C-N>  <Plug>GoldenViewNext
+    nmap <silent> <C-P>  <Plug>GoldenViewPrevious
+
+    nmap <silent> <F8>   <Plug>GoldenViewSwitchMain
+    nmap <silent> <S-F8> <Plug>GoldenViewSwitchToggle
+
+    nmap <silent> <C-L>  <Plug>GoldenViewSplit
+endif
+
+
+
+
+
+
+
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" ============================================================================
+" Modeline:                                                               ⟨⟨⟨1
+" ============================================================================
+" vim: set ft=vim ts=4 sw=4 tw=78 fdm=marker fmr=⟨⟨⟨,⟩⟩⟩ fdl=1 :
+
diff --git a/vim/plugins/GoldenView/plugin/zl/bootstrap.vim b/vim/plugins/GoldenView/plugin/zl/bootstrap.vim
new file mode 100644
index 0000000..33694e8
--- /dev/null
+++ b/vim/plugins/GoldenView/plugin/zl/bootstrap.vim
@@ -0,0 +1,5 @@
+if !exists('g:GoldenView_zl_bundle_path') 
+  let g:GoldenView_zl_bundle_path = fnamemodify(expand("<sfile>"), ":p:h:h:h")
+  let g:GoldenView_zl_autoload_path = expand(g:GoldenView_zl_bundle_path . '/autoload/GoldenView/zl')
+end
+
diff --git a/vim/plugins/auto-pairs/.gitignore b/vim/plugins/auto-pairs/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/auto-pairs/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/auto-pairs/README.md b/vim/plugins/auto-pairs/README.md
new file mode 100644
index 0000000..7cdcbf9
--- /dev/null
+++ b/vim/plugins/auto-pairs/README.md
@@ -0,0 +1,325 @@
+Auto Pairs
+==========
+Insert or delete brackets, parens, quotes in pair.
+
+Installation
+------------
+copy plugin/auto-pairs.vim to ~/.vim/plugin
+
+or if you are using `pathogen`:
+
+```git clone git://github.com/jiangmiao/auto-pairs.git ~/.vim/bundle/auto-pairs```
+
+Features
+--------
+*   Insert in pair
+
+        input: [
+        output: [|]
+
+*   Delete in pair
+
+        input: foo[<BS>]
+        output: foo
+
+*   Insert new indented line after Return
+
+        input: {|} (press <CR> at |)
+        output: {
+            |
+        }
+
+*   Insert spaces before closing characters, only for [], (), {}
+
+        input: {|} (press <SPACE> at |)
+        output: { | }
+
+        input: {|} (press <SPACE>foo} at |)
+        output: { foo }|
+
+        input: '|' (press <SPACE> at |)
+        output: ' |'
+
+*   Skip ' when inside a word
+
+        input: foo| (press ' at |)
+        output: foo'
+
+*   Skip closed bracket.
+
+        input: []
+        output: []
+
+*   Ignore auto pair when previous character is \
+
+        input: "\'
+        output: "\'"
+
+*   Fast Wrap
+
+        input: |'hello' (press (<M-e> at |)
+        output: ('hello')
+
+        wrap string, only support c style string
+        input: |'h\\el\'lo' (press (<M-e> at |)
+        output ('h\\ello\'')
+
+        input: |[foo, bar()] (press (<M-e> at |)
+        output: ([foo, bar()])
+
+*   Quick move char to closed pair
+
+        input: (|){["foo"]} (press <M-}> at |)
+        output: ({["foo"]}|)
+
+        input: |[foo, bar()] (press (<M-]> at |)
+        output: ([foo, bar()]|)
+
+*   Quick jump to closed pair.
+
+        input:
+        {
+            something;|
+        }
+
+        (press } at |)
+
+        output:
+        {
+
+        }|
+
+*   Support ``` ''' and """
+
+        input:
+            '''
+
+        output:
+            '''|'''
+
+*   Delete Repeated Pairs in one time
+
+        input: """|""" (press <BS> at |)
+        output: |
+
+        input: {{|}} (press <BS> at |)
+        output: |
+
+        input: [[[[[[|]]]]]] (press <BS> at |)
+        output: |
+
+*  Fly Mode
+
+        input: if(a[3)
+        output: if(a[3])| (In Fly Mode)
+        output: if(a[3)]) (Without Fly Mode)
+
+        input:
+        {
+            hello();|
+            world();
+        }
+
+        (press } at |)
+
+        output:
+        {
+            hello();
+            world();
+        }|
+
+        (then press <M-b> at | to do backinsert)
+        output:
+        {
+            hello();}|
+            world();
+        }
+
+        See Fly Mode section for details
+
+Fly Mode
+--------
+Fly Mode will always force closed-pair jumping instead of inserting. only for ")", "}", "]"
+
+If jumps in mistake, could use AutoPairsBackInsert(Default Key: `<M-b>`) to jump back and insert closed pair.
+
+the most situation maybe want to insert single closed pair in the string, eg ")"
+
+Fly Mode is DISABLED by default.
+
+add **let g:AutoPairsFlyMode = 1** .vimrc to turn it on
+
+Default Options:
+
+    let g:AutoPairsFlyMode = 0
+    let g:AutoPairsShortcutBackInsert = '<M-b>'
+
+Shortcuts
+---------
+
+    System Shortcuts:
+        <CR>  : Insert new indented line after return if cursor in blank brackets or quotes.
+        <BS>  : Delete brackets in pair
+        <M-p> : Toggle Autopairs (g:AutoPairsShortcutToggle)
+        <M-e> : Fast Wrap (g:AutoPairsShortcutFastWrap)
+        <M-n> : Jump to next closed pair (g:AutoPairsShortcutJump)
+        <M-b> : BackInsert (g:AutoPairsShortcutBackInsert)
+
+    If <M-p> <M-e> or <M-n> conflict with another keys or want to bind to another keys, add
+
+        let g:AutoPairsShortcutToggle = '<another key>'
+
+    to .vimrc, if the key is empty string '', then the shortcut will be disabled.
+
+Options
+-------
+*   g:AutoPairs
+
+        Default: {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`'}
+
+*   b:AutoPairs
+
+        Default: g:AutoPairs
+
+        Buffer level pairs set.
+
+*   g:AutoPairsShortcutToggle
+
+        Default: '<M-p>'
+
+        The shortcut to toggle autopairs.
+
+*   g:AutoPairsShortcutFastWrap
+
+        Default: '<M-e>'
+
+        Fast wrap the word. all pairs will be consider as a block (include <>).
+        (|)'hello' after fast wrap at |, the word will be ('hello')
+        (|)<hello> after fast wrap at |, the word will be (<hello>)
+
+*   g:AutoPairsShortcutJump
+
+        Default: '<M-n>'
+
+        Jump to the next closed pair
+
+*   g:AutoPairsMapBS
+
+        Default : 1
+
+        Map <BS> to delete brackets, quotes in pair
+        execute 'inoremap <buffer> <silent> <BS> <C-R>=AutoPairsDelete()<CR>'
+
+*   g:AutoPairsMapCh
+
+        Default : 1
+
+        Map <C-h> to delete brackets, quotes in pair
+
+*   g:AutoPairsMapCR
+
+        Default : 1
+
+        Map <CR> to insert a new indented line if cursor in (|), {|} [|], '|', "|"
+        execute 'inoremap <buffer> <silent> <CR> <C-R>=AutoPairsReturn()<CR>'
+
+*   g:AutoPairsCenterLine
+
+        Default : 1
+
+        When g:AutoPairsMapCR is on, center current line after return if the line is at the bottom 1/3 of the window.
+
+*   g:AutoPairsMapSpace
+
+        Default : 1
+
+        Map <space> to insert a space after the opening character and before the closing one.
+        execute 'inoremap <buffer> <silent> <CR> <C-R>=AutoPairsSpace()<CR>'
+
+*   g:AutoPairsFlyMode
+
+        Default : 0
+
+        set it to 1 to enable FlyMode.
+        see FlyMode section for details.
+
+*   g:AutoPairsMultilineClose
+
+        Default : 1
+
+        When you press the key for the closing pair (e.g. `)`) it jumps past it.
+        If set to 1, then it'll jump to the next line, if there is only whitespace.
+        If set to 0, then it'll only jump to a closing pair on the same line.
+
+*   g:AutoPairsShortcutBackInsert
+
+        Default : <M-b>
+
+        Work with FlyMode, insert the key at the Fly Mode jumped postion
+
+*   g:AutoPairsMoveCharacter
+
+        Default: "()[]{}\"'"
+
+        Map <M-(> <M-)> <M-[> <M-]> <M-{> <M-}> <M-"> <M-'> to
+        move character under the cursor to the pair.
+
+Buffer Level Pairs Setting
+--------------------------
+
+Set b:AutoPairs before BufEnter
+
+eg:
+
+    " When the filetype is FILETYPE then make AutoPairs only match for parenthesis
+    au Filetype FILETYPE let b:AutoPairs = {"(": ")"}
+
+TroubleShooting
+---------------
+    The script will remap keys ([{'"}]) <BS>,
+    If auto pairs cannot work, use :imap ( to check if the map is corrected.
+    The correct map should be <C-R>=AutoPairsInsert("\(")<CR>
+    Or the plugin conflict with some other plugins.
+    use command :call AutoPairsInit() to remap the keys.
+
+
+* How to insert parens purely
+
+    There are 3 ways
+
+    1. use Ctrl-V ) to insert paren without trigger the plugin.
+
+    2. use Alt-P to turn off the plugin.
+
+    3. use DEL or <C-O>x to delete the character insert by plugin.
+
+* Swedish Character Conflict
+
+    Because AutoPairs uses Meta(Alt) key as shortcut, it is conflict with some Swedish character such as å.
+    To fix the issue, you need remap or disable the related shortcut.
+
+Known Issues
+-----------------------
+Breaks '.' - [issue #3](https://github.com/jiangmiao/auto-pairs/issues/3)
+
+    Description: After entering insert mode and inputing `[hello` then leave insert
+                 mode by `<ESC>`. press '.' will insert 'hello' instead of '[hello]'.
+    Reason: `[` actually equals `[]\<LEFT>` and \<LEFT> will break '.'.
+            After version 7.4.849, Vim implements new keyword <C-G>U to avoid the break
+    Solution: Update Vim to 7.4.849+
+
+Contributors
+------------
+* [camthompson](https://github.com/camthompson)
+
+
+License
+-------
+
+Copyright (C) 2011-2013 Miao Jiang
+
+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/auto-pairs/doc/AutoPairs.txt b/vim/plugins/auto-pairs/doc/AutoPairs.txt
new file mode 100644
index 0000000..49ff549
--- /dev/null
+++ b/vim/plugins/auto-pairs/doc/AutoPairs.txt
@@ -0,0 +1,356 @@
+*AutoPairs.txt*  Insert or delete brackets, parens, quotes in pair
+
+Author:  jiangmiao
+License: MIT
+URL: https://github.com/jiangmiao/auto-pairs
+
+==============================================================================
+CONTENTS                                                    *autopairs-contents*
+
+    1. Installation ............................. |autopairs-installation|
+    2. Features ..................................... |autopairs-features|
+    3. Fly Mode ..................................... |autopairs-fly-mode|
+    4. Shortcuts ................................... |autopairs-shortcuts|
+    5. Options ....................................... |autopairs-options|
+    6. Troubleshooting ......................  |autopairs-troubleshooting|
+
+==============================================================================
+1. Introduction                                         *autopairs-installation*
+
+Copy `plugin/auto-pairs.vim` to `~/.vim/plugin`.
+
+Or if you are using `pathogen`: >
+
+    git clone git://github.com/jiangmiao/auto-pairs.git ~/.vim/bundle/auto-pairs
+
+==============================================================================
+2. Features                                                 *autopairs-features*
+
+Insert in pair: >
+
+        input: [
+        output: [|]
+
+Delete in pair: >
+
+        input: foo[<BS>]
+        output: foo
+
+Insert new indented line after Return: >
+
+        input: {|} (press <CR> at |)
+        output: {
+            |
+        }
+
+Insert spaces before closing characters, only for [], (), {}: >
+
+        input: {|} (press <SPACE> at |)
+        output: { | }
+
+        input: {|} (press <SPACE>foo} at |)
+        output: { foo }|
+
+        input: '|' (press <SPACE> at |)
+        output: ' |'
+
+Skip ' when inside a word: >
+
+        input: foo| (press ' at |)
+        output: foo'
+
+Skip closed bracket: >
+
+        input: []
+        output: []
+
+Ignore auto pair when previous character is '\': >
+
+        input: "\'
+        output: "\'"
+
+Fast Wrap: >
+
+        input: |'hello' (press (<M-e> at |)
+        output: ('hello')
+
+    Wrap string, only support c style string.
+        input: |'h\\el\'lo' (press (<M-e> at |)
+        output ('h\\ello\'')
+
+        input: |[foo, bar()] (press (<M-e> at |)
+        output: ([foo, bar()])
+
+Quick jump to closed pair: >
+
+        input:
+        {
+            something;|
+        }
+
+        (press } at |)
+
+        output:
+        {
+
+        }|
+
+Support ```, ''' and """: >
+
+        input:
+            '''
+
+        output:
+            '''|'''
+
+Delete Repeated Pairs in one time: >
+
+        input: """|""" (press <BS> at |)
+        output: |
+
+        input: {{|}} (press <BS> at |)
+        output: |
+
+        input: [[[[[[|]]]]]] (press <BS> at |)
+        output: |
+
+Fly Mode (|autopairs-flymode|): >
+
+        input: if(a[3)
+        output: if(a[3])| (In Fly Mode)
+        output: if(a[3)]) (Without Fly Mode)
+
+        input:
+        {
+            hello();|
+            world();
+        }
+
+        (press } at |)
+
+        output:
+        {
+            hello();
+            world();
+        }|
+
+        (then press <M-b> at | to do backinsert)
+        output:
+        {
+            hello();}|
+            world();
+        }
+
+        See |Fly Mode| section for details
+
+==============================================================================
+3. Fly Mode                                                  *autopairs-flymode*
+
+Fly Mode will always force closed-pair jumping instead of inserting. Only for
+")", "}", "]". If jumps in mistake, you can use |g:AutoPairsBackInsert| (default
+Key: <M-b>) to jump back and insert closed pair.
+
+The most situation maybe you want to insert single closed pair in the string,
+eg: >
+
+    ")"
+
+Fly Mode is DISABLED by default. To enable Fly Mode add following to your
+'.vimrc': >
+
+    let g:AutoPairsFlyMode = 1
+
+Default Options: >
+
+    let g:AutoPairsFlyMode = 0
+    let g:AutoPairsShortcutBackInsert = '<M-b>'
+
+==============================================================================
+4. Shortcuts                                             *autopairs-shortcuts*
+
+System Shortcuts:
+    <CR> : Insert new indented line after return if cursor in blank brackets
+           or quotes.
+    <BS> : Delete brackets in pair
+    <M-p>: Toggle Autopairs (|g:AutoPairsShortcutToggle|)
+    <M-e>: Fast Wrap (|g:AutoPairsShortcutFastWrap|)
+    <M-n>: Jump to next closed pair (|g:AutoPairsShortcutJump|)
+    <M-b>: BackInsert (|g:AutoPairsShortcutBackInsert|)
+
+
+    To rebind keys <M-p>, <M-e> or <M-n> or in case of conflicts conflicts with
+    another keys:
+
+        let g:AutoPairsShortcutToggle = '<another key>'
+
+    If the key is empty string '', then the shortcut will be disabled.
+
+==============================================================================
+5. Options                                                 *autopairs-options*
+
+                                                                 *g:AutoPairs*
+|g:AutoPairs|                                                             dict
+
+Default: >
+    {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`'}
+
+Specifies which symbols should be automatically paired.
+
+To append new pairs without overwriting defaults, add values in your `.vimrc`.:
+
+    let g:AutoPairs['<']='>'
+
+This example will enable matching of `<` with `>`.
+
+
+                                                                  *b:AutoPairs*
+|b:AutoPairs|                                                              dict
+
+Default: |g:AutoPairs|
+
+Buffer level pairs set.
+
+You can set |b:AutoPairs| before |BufEnter|: >
+
+    au Filetype FILETYPE let b:AutoPairs = {"(": ")"}
+
+This sets |AutoPairs| to only match for parenthesis for 'FILETYPE'.
+
+
+
+                                                    *g:AutoPairsShortcutToggle*
+|g:AutoPairsShortcutToggle|                                              string
+
+Default: <M-p>
+
+The shortcut to toggle autopairs.
+
+
+
+                                                  *g:AutoPairsShortcutFastWrap*
+|g:AutoPairsShortcutFastWrap|                                            string
+
+Default: <M-e>
+
+Fast wrap the word. All pairs will be considered as a block (including <>).
+
+        (|)'hello' after fast wrap at |, the word will be ('hello')
+        (|)<hello> after fast wrap at |, the word will be (<hello>)
+
+
+
+                                                      *g:AutoPairsShortcutJump*
+|g:AutoPairsShortcutJump|                                                string
+
+Default: <M-n>
+
+Jump to the next closed pair.
+
+
+                                                *g:AutoPairsShortcutBackInsert*
+|g:AutoPairsShortcutBackInsert|                                          string
+
+Default: <M-b>
+
+Work with |autopairs-flymode|, insert the key at the Fly Mode jumped position.
+
+
+
+                                                             *g:AutoPairsMapBS*
+|g:AutoPairsMapBS|                                                          int
+
+Default: 1
+
+Map <BS> to delete brackets and quotes in pair, executes:
+
+    inoremap <buffer> <silent> <BS> <C-R>=AutoPairsDelete()<CR>
+
+
+                                                             *g:AutoPairsMapCh*
+|g:AutoPairsMapCh|                                                          int
+
+Default: 1
+
+Map <C-h> to delete brackets and quotes in pair.
+
+
+                                                             *g:AutoPairsMapCR*
+|g:AutoPairsMapCR|                                                          int
+
+Default: 1
+
+Map <CR> to insert a new indented line if cursor in (|), {|} [|], '|', "|".
+Executes:
+
+    inoremap <buffer> <silent> <CR> <C-R>=AutoPairsReturn()<CR>
+
+
+                                                        *g:AutoPairsCenterLine*
+|g:AutoPairsCenterLine|                                                     int
+
+Default: 1
+
+When |g:AutoPairsMapCR| is on, center current line after return if the line
+is at the bottom 1/3 of the window.
+
+
+                                                          *g:AutoPairsMapSpace*
+|g:AutoPairsMapSpace|                                                       int
+
+Default: 1
+
+Map <space> to insert a space after the opening character and before the
+closing one.
+
+Executes:
+
+    inoremap <buffer> <silent> <CR> <C-R>=AutoPairsSpace()<CR>
+
+
+                                                           *g:AutoPairsFlyMode*
+|g:AutoPairsFlyMode|                                                        int
+
+Default: 0
+
+Set it to 1 to enable |autopairs-flymode|.
+
+
+                                                    *g:AutoPairsMultilineClose*
+|g:AutoPairsMultilineClose|                                                 int
+
+Default: 1
+
+When you press the key for the closing pair (e.g. `)`) it jumps past it.
+If set to 1, then it'll jump to the next line, if there is only 'whitespace'.
+If set to 0, then it'll only jump to a closing pair on the same line.
+
+==============================================================================
+6. Troubleshooting                                 *autopairs-troubleshooting*
+
+This plugin remaps keys `([{'"}]) <BS>`
+
+If auto pairs cannot work, use |:imap| to check if the map is corrected.
+
+The correct map should be: >
+
+    <C-R>=AutoPairsInsert("\(")<CR>
+
+Or the plugin conflicts with some other plugins. Use command: >
+
+    :call AutoPairsInit() to remap the keys.
+
+--- How to insert parens purely? ---
+
+There are 3 ways:
+
+    1. Use Ctrl-V ) to insert paren without trigger the plugin.
+
+    2. Use Alt-P to turn off the plugin.
+
+    3. Use DEL or <C-O>x to delete the character insert by plugin.
+
+--- Swedish Character Conflict ---
+
+Because AutoPairs uses Meta(Alt) key as a shortcut, it conflicts with some
+Swedish character such as å. To fix the issue, you need remap or disable the
+related shortcut.
diff --git a/vim/plugins/auto-pairs/plugin/auto-pairs.vim b/vim/plugins/auto-pairs/plugin/auto-pairs.vim
new file mode 100644
index 0000000..b2a9af7
--- /dev/null
+++ b/vim/plugins/auto-pairs/plugin/auto-pairs.vim
@@ -0,0 +1,582 @@
+" Insert or delete brackets, parens, quotes in pairs.
+" Maintainer:	JiangMiao <jiangfriend@gmail.com>
+" Contributor: camthompson
+" Last Change:  2017-06-17
+" Version: 1.3.3
+" Homepage: http://www.vim.org/scripts/script.php?script_id=3599
+" Repository: https://github.com/jiangmiao/auto-pairs
+" License: MIT
+
+if exists('g:AutoPairsLoaded') || &cp
+  finish
+end
+let g:AutoPairsLoaded = 1
+
+if !exists('g:AutoPairs')
+  let g:AutoPairs = {'(':')', '[':']', '{':'}',"'":"'",'"':'"', '`':'`'}
+end
+
+if !exists('g:AutoPairsParens')
+  let g:AutoPairsParens = {'(':')', '[':']', '{':'}'}
+end
+
+if !exists('g:AutoPairsMapBS')
+  let g:AutoPairsMapBS = 1
+end
+
+" Map <C-h> as the same BS
+if !exists('g:AutoPairsMapCh')
+  let g:AutoPairsMapCh = 1
+end
+
+if !exists('g:AutoPairsMapCR')
+  let g:AutoPairsMapCR = 1
+end
+
+if !exists('g:AutoPairsMapSpace')
+  let g:AutoPairsMapSpace = 1
+end
+
+if !exists('g:AutoPairsCenterLine')
+  let g:AutoPairsCenterLine = 1
+end
+
+if !exists('g:AutoPairsShortcutToggle')
+  let g:AutoPairsShortcutToggle = '<M-p>'
+end
+
+if !exists('g:AutoPairsShortcutFastWrap')
+  let g:AutoPairsShortcutFastWrap = '<M-e>'
+end
+
+if !exists('g:AutoPairsMoveCharacter')
+  let g:AutoPairsMoveCharacter = "()[]{}\"'"
+end
+
+if !exists('g:AutoPairsShortcutJump')
+  let g:AutoPairsShortcutJump = '<M-n>'
+endif
+
+" Fly mode will for closed pair to jump to closed pair instead of insert.
+" also support AutoPairsBackInsert to insert pairs where jumped.
+if !exists('g:AutoPairsFlyMode')
+  let g:AutoPairsFlyMode = 0
+endif
+
+" When skipping the closed pair, look at the current and
+" next line as well.
+if !exists('g:AutoPairsMultilineClose')
+  let g:AutoPairsMultilineClose = 1
+endif
+
+" Work with Fly Mode, insert pair where jumped
+if !exists('g:AutoPairsShortcutBackInsert')
+  let g:AutoPairsShortcutBackInsert = '<M-b>'
+endif
+
+if !exists('g:AutoPairsSmartQuotes')
+  let g:AutoPairsSmartQuotes = 1
+endif
+
+" 7.4.849 support <C-G>U to avoid breaking '.'
+" Issue talk: https://github.com/jiangmiao/auto-pairs/issues/3
+" Vim note: https://github.com/vim/vim/releases/tag/v7.4.849
+if v:version > 704 || v:version == 704 && has("patch849")
+  let s:Go = "\<C-G>U"
+else
+  let s:Go = ""
+endif
+
+let s:Left = s:Go."\<LEFT>"
+let s:Right = s:Go."\<RIGHT>"
+
+
+" Will auto generated {']' => '[', ..., '}' => '{'}in initialize.
+let g:AutoPairsClosedPairs = {}
+
+
+function! AutoPairsInsert(key)
+  if !b:autopairs_enabled
+    return a:key
+  end
+
+  let line = getline('.')
+  let pos = col('.') - 1
+  let before = strpart(line, 0, pos)
+  let after = strpart(line, pos)
+  let next_chars = split(after, '\zs')
+  let current_char = get(next_chars, 0, '')
+  let next_char = get(next_chars, 1, '')
+  let prev_chars = split(before, '\zs')
+  let prev_char = get(prev_chars, -1, '')
+
+  let eol = 0
+  if col('$') -  col('.') <= 1
+    let eol = 1
+  end
+
+  " Ignore auto close if prev character is \
+  if prev_char == '\'
+    return a:key
+  end
+
+  " The key is difference open-pair, then it means only for ) ] } by default
+  if !has_key(b:AutoPairs, a:key)
+    let b:autopairs_saved_pair = [a:key, getpos('.')]
+
+    " Skip the character if current character is the same as input
+    if current_char == a:key
+      return s:Right
+    end
+
+    if !g:AutoPairsFlyMode
+      " Skip the character if next character is space
+      if current_char == ' ' && next_char == a:key
+        return s:Right.s:Right
+      end
+
+      " Skip the character if closed pair is next character
+      if current_char == ''
+        if g:AutoPairsMultilineClose
+          let next_lineno = line('.')+1
+          let next_line = getline(nextnonblank(next_lineno))
+          let next_char = matchstr(next_line, '\s*\zs.')
+        else
+          let next_char = matchstr(line, '\s*\zs.')
+        end
+        if next_char == a:key
+          return "\<ESC>e^a"
+        endif
+      endif
+    endif
+
+    " Fly Mode, and the key is closed-pairs, search closed-pair and jump
+    if g:AutoPairsFlyMode && has_key(b:AutoPairsClosedPairs, a:key)
+      let n = stridx(after, a:key)
+      if n != -1
+        return repeat(s:Right, n+1)
+      end
+      if search(a:key, 'W')
+        " force break the '.' when jump to different line
+        return "\<Right>"
+      endif
+    endif
+
+    " Insert directly if the key is not an open key
+    return a:key
+  end
+
+  let open = a:key
+  let close = b:AutoPairs[open]
+
+  if current_char == close && open == close
+    return s:Right
+  end
+
+  " Ignore auto close ' if follows a word
+  " MUST after closed check. 'hello|'
+  if a:key == "'" && prev_char =~ '\v\w'
+    return a:key
+  end
+
+  " support for ''' ``` and """
+  if open == close
+    " The key must be ' " `
+    let pprev_char = line[col('.')-3]
+    if pprev_char == open && prev_char == open
+      " Double pair found
+      return repeat(a:key, 4) . repeat(s:Left, 3)
+    end
+  end
+
+  let quotes_num = 0
+  " Ignore comment line for vim file
+  if &filetype == 'vim' && a:key == '"'
+    if before =~ '^\s*$'
+      return a:key
+    end
+    if before =~ '^\s*"'
+      let quotes_num = -1
+    end
+  end
+
+  " Keep quote number is odd.
+  " Because quotes should be matched in the same line in most of situation
+  if g:AutoPairsSmartQuotes && open == close
+    " Remove \\ \" \'
+    let cleaned_line = substitute(line, '\v(\\.)', '', 'g')
+    let n = quotes_num
+    let pos = 0
+    while 1
+      let pos = stridx(cleaned_line, open, pos)
+      if pos == -1
+        break
+      end
+      let n = n + 1
+      let pos = pos + 1
+    endwhile
+    if n % 2 == 1
+      return a:key
+    endif
+  endif
+
+  return open.close.s:Left
+endfunction
+
+function! AutoPairsDelete()
+  if !b:autopairs_enabled
+    return "\<BS>"
+  end
+
+  let line = getline('.')
+  let pos = col('.') - 1
+  let current_char = get(split(strpart(line, pos), '\zs'), 0, '')
+  let prev_chars = split(strpart(line, 0, pos), '\zs')
+  let prev_char = get(prev_chars, -1, '')
+  let pprev_char = get(prev_chars, -2, '')
+
+  if pprev_char == '\'
+    return "\<BS>"
+  end
+
+  " Delete last two spaces in parens, work with MapSpace
+  if has_key(b:AutoPairs, pprev_char) && prev_char == ' ' && current_char == ' '
+    return "\<BS>\<DEL>"
+  endif
+
+  " Delete Repeated Pair eg: '''|''' [[|]] {{|}}
+  if has_key(b:AutoPairs, prev_char)
+    let times = 0
+    let p = -1
+    while get(prev_chars, p, '') == prev_char
+      let p = p - 1
+      let times = times + 1
+    endwhile
+
+    let close = b:AutoPairs[prev_char]
+    let left = repeat(prev_char, times)
+    let right = repeat(close, times)
+
+    let before = strpart(line, pos-times, times)
+    let after  = strpart(line, pos, times)
+    if left == before && right == after
+      return repeat("\<BS>\<DEL>", times)
+    end
+  end
+
+
+  if has_key(b:AutoPairs, prev_char)
+    let close = b:AutoPairs[prev_char]
+    if match(line,'^\s*'.close, col('.')-1) != -1
+      " Delete (|___)
+      let space = matchstr(line, '^\s*', col('.')-1)
+      return "\<BS>". repeat("\<DEL>", len(space)+1)
+    elseif match(line, '^\s*$', col('.')-1) != -1
+      " Delete (|__\n___)
+      let nline = getline(line('.')+1)
+      if nline =~ '^\s*'.close
+        if &filetype == 'vim' && prev_char == '"'
+          " Keep next line's comment
+          return "\<BS>"
+        end
+
+        let space = matchstr(nline, '^\s*')
+        return "\<BS>\<DEL>". repeat("\<DEL>", len(space)+1)
+      end
+    end
+  end
+
+  return "\<BS>"
+endfunction
+
+function! AutoPairsJump()
+  call search('["\]'')}]','W')
+endfunction
+" string_chunk cannot use standalone
+let s:string_chunk = '\v%(\\\_.|[^\1]|[\r\n]){-}'
+let s:ss_pattern = '\v''' . s:string_chunk . ''''
+let s:ds_pattern = '\v"'  . s:string_chunk . '"'
+
+func! s:RegexpQuote(str)
+  return substitute(a:str, '\v[\[\{\(\<\>\)\}\]]', '\\&', 'g')
+endf
+
+func! s:RegexpQuoteInSquare(str)
+  return substitute(a:str, '\v[\[\]]', '\\&', 'g')
+endf
+
+" Search next open or close pair
+func! s:FormatChunk(open, close)
+  let open = s:RegexpQuote(a:open)
+  let close = s:RegexpQuote(a:close)
+  let open2 = s:RegexpQuoteInSquare(a:open)
+  let close2 = s:RegexpQuoteInSquare(a:close)
+  if open == close
+    return '\v'.open.s:string_chunk.close
+  else
+    return '\v%(' . s:ss_pattern . '|' . s:ds_pattern . '|' . '[^'.open2.close2.']|[\r\n]' . '){-}(['.open2.close2.'])'
+  end
+endf
+
+" Fast wrap the word in brackets
+function! AutoPairsFastWrap()
+  let line = getline('.')
+  let current_char = line[col('.')-1]
+  let next_char = line[col('.')]
+  let open_pair_pattern = '\v[({\[''"]'
+  let at_end = col('.') >= col('$') - 1
+  normal! x
+  " Skip blank
+  if next_char =~ '\v\s' || at_end
+    call search('\v\S', 'W')
+    let line = getline('.')
+    let next_char = line[col('.')-1]
+  end
+
+  if has_key(b:AutoPairs, next_char)
+    let followed_open_pair = next_char
+    let inputed_close_pair = current_char
+    let followed_close_pair = b:AutoPairs[next_char]
+    if followed_close_pair != followed_open_pair
+      " TODO replace system searchpair to skip string and nested pair.
+      " eg: (|){"hello}world"} will transform to ({"hello})world"}
+      call searchpair('\V'.followed_open_pair, '', '\V'.followed_close_pair, 'W')
+    else
+      call search(s:FormatChunk(followed_open_pair, followed_close_pair), 'We')
+    end
+    return s:Right.inputed_close_pair.s:Left
+  else
+    normal! he
+    return s:Right.current_char.s:Left
+  end
+endfunction
+
+function! AutoPairsMap(key)
+  " | is special key which separate map command from text
+  let key = a:key
+  if key == '|'
+    let key = '<BAR>'
+  end
+  let escaped_key = substitute(key, "'", "''", 'g')
+  " use expr will cause search() doesn't work
+  execute 'inoremap <buffer> <silent> '.key." <C-R>=AutoPairsInsert('".escaped_key."')<CR>"
+
+endfunction
+
+function! AutoPairsToggle()
+  if b:autopairs_enabled
+    let b:autopairs_enabled = 0
+    echo 'AutoPairs Disabled.'
+  else
+    let b:autopairs_enabled = 1
+    echo 'AutoPairs Enabled.'
+  end
+  return ''
+endfunction
+
+function! AutoPairsMoveCharacter(key)
+  let c = getline(".")[col(".")-1]
+  let escaped_key = substitute(a:key, "'", "''", 'g')
+  return "\<DEL>\<ESC>:call search("."'".escaped_key."'".")\<CR>a".c."\<LEFT>"
+endfunction
+
+function! AutoPairsReturn()
+  if b:autopairs_enabled == 0
+    return ''
+  end
+  let line = getline('.')
+  let pline = getline(line('.')-1)
+  let prev_char = pline[strlen(pline)-1]
+  let cmd = ''
+  let cur_char = line[col('.')-1]
+  if has_key(b:AutoPairs, prev_char) && b:AutoPairs[prev_char] == cur_char
+    if g:AutoPairsCenterLine && winline() * 3 >= winheight(0) * 2
+      " Recenter before adding new line to avoid replacing line content
+      let cmd = "zz"
+    end
+
+    " If equalprg has been set, then avoid call =
+    " https://github.com/jiangmiao/auto-pairs/issues/24
+    if &equalprg != ''
+      return "\<ESC>".cmd."O"
+    endif
+
+    " conflict with javascript and coffee
+    " javascript   need   indent new line
+    " coffeescript forbid indent new line
+    if &filetype == 'coffeescript' || &filetype == 'coffee'
+      return "\<ESC>".cmd."k==o"
+    else
+      return "\<ESC>".cmd."=ko"
+    endif
+  end
+  return ''
+endfunction
+
+function! AutoPairsSpace()
+  let line = getline('.')
+  let prev_char = line[col('.')-2]
+  let cmd = ''
+  let cur_char =line[col('.')-1]
+  if has_key(g:AutoPairsParens, prev_char) && g:AutoPairsParens[prev_char] == cur_char
+    let cmd = "\<SPACE>".s:Left
+  endif
+  return "\<SPACE>".cmd
+endfunction
+
+function! AutoPairsBackInsert()
+  if exists('b:autopairs_saved_pair')
+    let pair = b:autopairs_saved_pair[0]
+    let pos  = b:autopairs_saved_pair[1]
+    call setpos('.', pos)
+    return pair
+  endif
+  return ''
+endfunction
+
+function! AutoPairsInit()
+  let b:autopairs_loaded  = 1
+  if !exists('b:autopairs_enabled')
+    let b:autopairs_enabled = 1
+  end
+  let b:AutoPairsClosedPairs = {}
+
+  if !exists('b:AutoPairs')
+    let b:AutoPairs = g:AutoPairs
+  end
+
+  if !exists('b:AutoPairsMoveCharacter')
+    let b:AutoPairsMoveCharacter = g:AutoPairsMoveCharacter
+  end
+
+  " buffer level map pairs keys
+  for [open, close] in items(b:AutoPairs)
+    call AutoPairsMap(open)
+    if open != close
+      call AutoPairsMap(close)
+    end
+    let b:AutoPairsClosedPairs[close] = open
+  endfor
+
+  for key in split(b:AutoPairsMoveCharacter, '\s*')
+    let escaped_key = substitute(key, "'", "''", 'g')
+    execute 'inoremap <silent> <buffer> <M-'.key."> <C-R>=AutoPairsMoveCharacter('".escaped_key."')<CR>"
+  endfor
+
+  " Still use <buffer> level mapping for <BS> <SPACE>
+  if g:AutoPairsMapBS
+    " Use <C-R> instead of <expr> for issue #14 sometimes press BS output strange words
+    execute 'inoremap <buffer> <silent> <BS> <C-R>=AutoPairsDelete()<CR>'
+  end
+
+  if g:AutoPairsMapCh
+    execute 'inoremap <buffer> <silent> <C-h> <C-R>=AutoPairsDelete()<CR>'
+  endif
+
+  if g:AutoPairsMapSpace
+    " Try to respect abbreviations on a <SPACE>
+    let do_abbrev = ""
+    if v:version == 703 && has("patch489") || v:version > 703
+      let do_abbrev = "<C-]>"
+    endif
+    execute 'inoremap <buffer> <silent> <SPACE> '.do_abbrev.'<C-R>=AutoPairsSpace()<CR>'
+  end
+
+  if g:AutoPairsShortcutFastWrap != ''
+    execute 'inoremap <buffer> <silent> '.g:AutoPairsShortcutFastWrap.' <C-R>=AutoPairsFastWrap()<CR>'
+  end
+
+  if g:AutoPairsShortcutBackInsert != ''
+    execute 'inoremap <buffer> <silent> '.g:AutoPairsShortcutBackInsert.' <C-R>=AutoPairsBackInsert()<CR>'
+  end
+
+  if g:AutoPairsShortcutToggle != ''
+    " use <expr> to ensure showing the status when toggle
+    execute 'inoremap <buffer> <silent> <expr> '.g:AutoPairsShortcutToggle.' AutoPairsToggle()'
+    execute 'noremap <buffer> <silent> '.g:AutoPairsShortcutToggle.' :call AutoPairsToggle()<CR>'
+  end
+
+  if g:AutoPairsShortcutJump != ''
+    execute 'inoremap <buffer> <silent> ' . g:AutoPairsShortcutJump. ' <ESC>:call AutoPairsJump()<CR>a'
+    execute 'noremap <buffer> <silent> ' . g:AutoPairsShortcutJump. ' :call AutoPairsJump()<CR>'
+  end
+
+endfunction
+
+function! s:ExpandMap(map)
+  let map = a:map
+  let map = substitute(map, '\(<Plug>\w\+\)', '\=maparg(submatch(1), "i")', 'g')
+  return map
+endfunction
+
+function! AutoPairsTryInit()
+  if exists('b:autopairs_loaded')
+    return
+  end
+
+  " for auto-pairs starts with 'a', so the priority is higher than supertab and vim-endwise
+  "
+  " vim-endwise doesn't support <Plug>AutoPairsReturn
+  " when use <Plug>AutoPairsReturn will cause <Plug> isn't expanded
+  "
+  " supertab doesn't support <SID>AutoPairsReturn
+  " when use <SID>AutoPairsReturn  will cause Duplicated <CR>
+  "
+  " and when load after vim-endwise will cause unexpected endwise inserted.
+  " so always load AutoPairs at last
+
+  " Buffer level keys mapping
+  " comptible with other plugin
+  if g:AutoPairsMapCR
+    if v:version == 703 && has('patch32') || v:version > 703
+      " VIM 7.3 supports advancer maparg which could get <expr> info
+      " then auto-pairs could remap <CR> in any case.
+      let info = maparg('<CR>', 'i', 0, 1)
+      if empty(info)
+        let old_cr = '<CR>'
+        let is_expr = 0
+      else
+        let old_cr = info['rhs']
+        let old_cr = s:ExpandMap(old_cr)
+        let old_cr = substitute(old_cr, '<SID>', '<SNR>' . info['sid'] . '_', 'g')
+        let is_expr = info['expr']
+        let wrapper_name = '<SID>AutoPairsOldCRWrapper73'
+      endif
+    else
+      " VIM version less than 7.3
+      " the mapping's <expr> info is lost, so guess it is expr or not, it's
+      " not accurate.
+      let old_cr = maparg('<CR>', 'i')
+      if old_cr == ''
+        let old_cr = '<CR>'
+        let is_expr = 0
+      else
+        let old_cr = s:ExpandMap(old_cr)
+        " old_cr contain (, I guess the old cr is in expr mode
+        let is_expr = old_cr =~ '\V(' && toupper(old_cr) !~ '\V<C-R>'
+
+        " The old_cr start with " it must be in expr mode
+        let is_expr = is_expr || old_cr =~ '\v^"'
+        let wrapper_name = '<SID>AutoPairsOldCRWrapper'
+      end
+    end
+
+    if old_cr !~ 'AutoPairsReturn'
+      if is_expr
+        " remap <expr> to `name` to avoid mix expr and non-expr mode
+        execute 'inoremap <buffer> <expr> <script> '. wrapper_name . ' ' . old_cr
+        let old_cr = wrapper_name
+      end
+      " Always silent mapping
+      execute 'inoremap <script> <buffer> <silent> <CR> '.old_cr.'<SID>AutoPairsReturn'
+    end
+  endif
+  call AutoPairsInit()
+endfunction
+
+" Always silent the command
+inoremap <silent> <SID>AutoPairsReturn <C-R>=AutoPairsReturn()<CR>
+imap <script> <Plug>AutoPairsReturn <SID>AutoPairsReturn
+
+
+au BufEnter * :call AutoPairsTryInit()
diff --git a/vim/plugins/deoplete-jedi/.flake8 b/vim/plugins/deoplete-jedi/.flake8
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/.github/ISSUE_TEMPLATE.md b/vim/plugins/deoplete-jedi/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..9793074
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,44 @@
+# Problem summary
+
+
+## Expected
+
+
+## Environment Information
+
+ * OS:
+ * Neovim version:
+
+
+## Provide a minimal init.vim with less than 50 lines (required)
+
+```vim
+" Use the following as a template.
+set runtimepath+=~/path/to/deoplete.nvim/
+set runtimepath+=~/path/to/deoplete-jedi/
+let g:deoplete#enable_at_startup = 1
+call deoplete#custom#set('jedi', 'debug_enabled', 1)
+call deoplete#enable_logging('DEBUG', '/tmp/deoplete.log')
+```
+
+## Generate logfiles if appropriate
+
+ 1. export NVIM_PYTHON_LOG_FILE=/tmp/nvim-log
+ 2. export NVIM_PYTHON_LOG_LEVEL=DEBUG
+ 3. nvim -u minimal.vimrc
+
+Then look at and attach the files `/tmp/nvim-log_{PID}` and
+`/tmp/deoplete.log` here.
+
+
+## Steps to reproduce the issue after starting Neovim (required)
+
+ 1.
+ 2.
+ 3.
+
+
+## Screen shot (if possible)
+
+
+## Upload the logfile(s)
diff --git a/vim/plugins/deoplete-jedi/.gitignore b/vim/plugins/deoplete-jedi/.gitignore
new file mode 100644
index 0000000..3cfb958
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/.gitignore
@@ -0,0 +1,66 @@
+### https://raw.github.com/github/gitignore//Python.gitignore
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*,cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+#Ipython Notebook
+.ipynb_checkpoints
+
+.-rplugin~
diff --git a/vim/plugins/deoplete-jedi/.gitmodules b/vim/plugins/deoplete-jedi/.gitmodules
new file mode 100644
index 0000000..a10bc30
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "rplugin/python3/deoplete/jedi"]
+	path = rplugin/python3/deoplete/vendored/jedi
+	url = https://github.com/davidhalter/jedi.git
+[submodule "rplugin/python3/deoplete/parso"]
+	path = rplugin/python3/deoplete/vendored/parso
+	url = https://github.com/davidhalter/parso.git
diff --git a/vim/plugins/deoplete-jedi/.travis.yml b/vim/plugins/deoplete-jedi/.travis.yml
new file mode 100644
index 0000000..8a664f3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/.travis.yml
@@ -0,0 +1,34 @@
+language: python
+
+cache:
+  directories:
+  - "$HOME/.cache/pip"
+
+matrix:
+  include:
+  - sudo: required
+    os: linux
+    dist: trusty
+    compiler: clang
+    python: '3.5'
+  - sudo: required
+    os: linux
+    dist: trusty
+    compiler: clang
+    python: 'nightly'
+
+before_install:
+  - uname -a
+  - cat /etc/lsb-release
+
+install:
+  - pip3 install -q -U -r ./tests/requirements.txt
+
+script:
+  - make test
+
+notifications:
+  email: false
+  slack:
+    rooms:
+      secure: Kjl0kgnF4qcnW/wjk++HnmLGD0FeQLHeaFHAlmeN1Iql7z+I7cBaW35I4P0W0sgZPzF4y6LSReGlxtmEFlqNmmYll6SPw4n2BvNv2Ir+sSl6r61plQdTQsh6RlnW4lRQMZ8JSgP/E6jci3cuchCFWnN7miYP08vmJmKTh3MlW5TjksPpNx6B+zC0zr0JqjXNXZwaSXpQYrA0hwKt0pZOQbgPxEeRnUYEAqiJxR30GmSTZ8OxWHNupNWKtSxaYV1e8/6vcaq3iae6fsP6qceVmNZzPc/IUVXA8NNmu+TKZUaQEQAKWkIm8QJVY7cnHMBdfG56L/NgX7lwmv3cRq+1mDOxEGWtOfnQwQIeV3wRKK8yactQ5cCD32WE2cioAUnvwryjOjRG5Vt8aBuFINoxdz7KTcQye1JqrjDU14ob6JAQnLafClLDhTXht+/W6/UeUr9ZOAX1nVWuuLvIJsU1SP1Uvv/PvuLk+XDrBCunDZwWssRwn1q8pBnEubhe6vbOO134hAeF0/SMnWXKuL/knTL5aqICLQOhj+ooNpb+hU3D3phlHIddhufz8cAWSxR/eqnwQ4LkKfZa2L4DMW02dou8HMl973ft/g/DCdFXFGz53VYqD7V8Mpb2DQ7nkvqmsokSDNNs99cMIDV9LVI3QJGW8OR88wUgIlONl+795a0=
diff --git a/vim/plugins/deoplete-jedi/Dockerfile b/vim/plugins/deoplete-jedi/Dockerfile
new file mode 100644
index 0000000..338cae8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/Dockerfile
@@ -0,0 +1,14 @@
+FROM zchee/neovim:python
+MAINTAINER zchee <zchee.io@gmail.com>
+
+RUN pip3 install jedi \
+	&& git clone https://github.com/Shougo/deoplete.nvim /src/deoplete.nvim \
+	\
+	&& echo 'set rtp+=/src/deoplete.nvim' >> /root/.config/nvim/init.vim \
+	&& echo 'set rtp+=/src/deoplete-jedi' >> /root/.config/nvim/init.vim \
+	&& echo 'let g:deoplete#enable_at_startup = 1' >> /root/.config/nvim/init.vim \
+	&& echo 'let g:deoplete#auto_completion_start_length = 1' >> /root/.config/nvim/init.vim
+
+COPY . /src/deoplete-jedi
+
+RUN /src/run.sh
diff --git a/vim/plugins/deoplete-jedi/LICENSE b/vim/plugins/deoplete-jedi/LICENSE
new file mode 100644
index 0000000..da7eb6d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 Koichi Shiraishi
+
+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/deoplete-jedi/Makefile b/vim/plugins/deoplete-jedi/Makefile
new file mode 100644
index 0000000..8ccb039
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/Makefile
@@ -0,0 +1,10 @@
+RPLUGIN_PATH := ./rplugin/python3/deoplete/sources
+
+all: test
+
+test: flake8
+
+flake8:
+	flake8 rplugin tests
+
+.PHONY: test flake8
diff --git a/vim/plugins/deoplete-jedi/README.md b/vim/plugins/deoplete-jedi/README.md
new file mode 100644
index 0000000..bb31618
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/README.md
@@ -0,0 +1,86 @@
+# deoplete-jedi
+
+
+[deoplete.nvim](https://github.com/Shougo/deoplete.nvim) source for [jedi](https://github.com/davidhalter/jedi).
+
+|| **Status** |
+|:---:|:---:|
+| **Travis CI** |[![Build Status](https://travis-ci.org/zchee/deoplete-jedi.svg?branch=master)](https://travis-ci.org/zchee/deoplete-jedi)|
+| **Gitter** |[![Join the chat at https://gitter.im/zchee/deoplete-jedi](https://badges.gitter.im/zchee/deoplete-jedi.svg)](https://gitter.im/zchee/deoplete-jedi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)|
+
+
+## Required
+
+- Neovim and neovim/python-client
+  - https://github.com/neovim/neovim
+  - https://github.com/neovim/python-client
+
+- deoplete.nvim
+  - https://github.com/Shougo/deoplete.nvim
+
+- jedi
+  - https://github.com/davidhalter/jedi
+
+
+## Install
+
+```vim
+NeoBundle 'zchee/deoplete-jedi'
+# or
+Plug 'zchee/deoplete-jedi'
+```
+
+**Note:** If you don't want to use a plugin manager, you will need to clone
+this repo recursively:
+
+```
+git clone --recursive https://github.com/zchee/deoplete-jedi
+```
+
+When updating the plugin, you will want to be sure that the Jedi submodule is
+kept up to date with:
+
+```
+git submodule update --init
+```
+
+
+## Options
+
+- `g:deoplete#sources#jedi#server_timeout`:  The timeout (in seconds) for jedi
+  server to workaround endless loop in jedi.  Increase it if you cannot get
+  completions for large package such as pandas (see #125).  Default: 10
+- `g:deoplete#sources#jedi#statement_length`: Sets the maximum length of
+  completion description text.  If this is exceeded, a simple description is
+  used instead.  Default: `50`
+- `g:deoplete#sources#jedi#enable_cache`: Enables caching of completions for
+  faster results.  Default: `1`
+- `g:deoplete#sources#jedi#show_docstring`: Shows docstring in preview window.
+  Default: `0`
+- `g:deoplete#sources#jedi#python_path`: Set the Python interpreter path to use
+  for the completion server.  deoplete-jedi uses the first available `python`
+  in `$PATH`.  Use this only if you want use a specific Python interpreter.
+  This has no effect if `$VIRTUAL_ENV` is present in the environment.
+  **Note**: This is completely unrelated to configuring Neovim.
+- `g:deoplete#sources#jedi#debug_server`: Enable logging from the server.  If
+  set to `1`, server messages are emitted to Deoplete's log file.  This can
+  optionally be a string that points to a file for separate logging.  The log
+  level will be inherited from `deoplete#enable_logging()`.
+- `g:deoplete#sources#jedi#extra_path`: A list of extra paths to add to
+  `sys.path` when performing completions.
+
+
+## Virtual Environments
+
+If you are using virtualenv, it is recommended that you create environments
+specifically for Neovim.  This way, you will not need to install the neovim
+package in each virtualenv.  Once you have created them, add the following to
+your vimrc file:
+
+```vim
+let g:python_host_prog = '/full/path/to/neovim2/bin/python'
+let g:python3_host_prog = '/full/path/to/neovim3/bin/python'
+```
+
+Deoplete only requires Python 3.  See `:h nvim-python-quickstart` for more
+information.
diff --git a/vim/plugins/deoplete-jedi/mk/color.mk b/vim/plugins/deoplete-jedi/mk/color.mk
new file mode 100644
index 0000000..3d803e3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/mk/color.mk
@@ -0,0 +1,10 @@
+# Colorable output
+CRESET := \x1b[0m
+CBLACK := \x1b[30;01m
+CRED := \x1b[31;01m
+CGREEN := \x1b[32;01m
+CYELLOW := \x1b[33;01m
+CBLUE := \x1b[34;01m
+CMAGENTA := \x1b[35;01m
+CCYAN := \x1b[36;01m
+CWHITE := \x1b[37;01m
diff --git a/vim/plugins/deoplete-jedi/mk/debug_code.mk b/vim/plugins/deoplete-jedi/mk/debug_code.mk
new file mode 100644
index 0000000..91a2698
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/mk/debug_code.mk
@@ -0,0 +1,13 @@
+IMPORT_LOGGER := from logging import getLogger\nlogger = getLogger(__name__)
+IMPORT_TIMEIT := from profiler import timeit
+IMPORT_PYVMMONITOR := import sys\nsys.path.append("\/Applications\/PyVmMonitor.app\/Contents\/MacOS\/public_api")\nimport pyvmmonitor
+
+SET_DEBUG_PREFIX := jedi_settings.cache_directory \= os.path.join\(cache_home, 'jedi'\)
+SET_DEBUG := try:\n            from helper import set_debug\n            if self.vim.vars["deoplete\#enable_debug"]:\n                log_file \= self.vim.vars["deoplete\#sources\#jedi\#debug\#log_file"]\n                set_debug(logger, os.path.expanduser(log_file))\n        except Exception:\n            pass\n
+
+TIMEIT_PREFIX := @timeit(logger, 
+TIMEIT_SUFFIX := )
+TIMEIT_GET_COMPLETE_POSITION := ${TIMEIT_PREFIX}"simple", [0.00003000, 0.00015000]${TIMEIT_SUFFIX}
+TIMEIT_GATHER_CANDIDATES := ${TIMEIT_PREFIX}"simple", [0.10000000, 0.20000000]${TIMEIT_SUFFIX}
+
+PYVMMONITOR_DECORATOR := @pyvmmonitor.profile_method()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi.py
new file mode 100644
index 0000000..8be40df
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi.py
@@ -0,0 +1,290 @@
+import logging
+import os
+import re
+import sys
+import time
+
+from deoplete.util import getlines
+
+sys.path.insert(1, os.path.dirname(__file__)) # noqa: E261
+from deoplete_jedi import cache, profiler, utils, worker
+
+from .base import Base
+
+
+def sort_key(item):
+    w = item.get('name')
+    z = len(w) - len(w.lstrip('_'))
+    return (('z' * z) + w.lower()[z:], len(w))
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        Base.__init__(self, vim)
+        self.name = 'jedi'
+        self.mark = '[jedi]'
+        self.rank = 500
+        self.filetypes = ['python', 'cython', 'pyrex']
+        self.input_pattern = (r'[\w\)\]\}\'\"]+\.\w*$|'
+                              r'^\s*@\w*$|'
+                              r'^\s*from\s+[\w\.]*(?:\s+import\s+(?:\w*(?:,\s*)?)*)?|'
+                              r'^\s*import\s+(?:[\w\.]*(?:,\s*)?)*')
+        self._async_keys = set()
+        self.workers_started = False
+
+    def on_init(self, context):
+        vars = context['vars']
+
+        self.statement_length = vars.get(
+            'deoplete#sources#jedi#statement_length', 0)
+        self.server_timeout = vars.get(
+            'deoplete#sources#jedi#server_timeout', 10)
+        self.use_short_types = vars.get(
+            'deoplete#sources#jedi#short_types', False)
+        self.show_docstring = vars.get(
+            'deoplete#sources#jedi#show_docstring', False)
+        self.debug_server = vars.get(
+            'deoplete#sources#jedi#debug_server', None)
+        # Only one worker is really needed since deoplete-jedi has a pretty
+        # aggressive cache.
+        # Two workers may be needed if working with very large source files.
+        self.worker_threads = vars.get(
+            'deoplete#sources#jedi#worker_threads', 2)
+        # Hard coded python interpreter location
+        self.python_path = vars.get(
+            'deoplete#sources#jedi#python_path', '')
+        self.extra_path = vars.get(
+            'deoplete#sources#jedi#extra_path', [])
+
+        self.boilerplate = []  # Completions that are included in all results
+
+        log_file = ''
+        root_log = logging.getLogger('deoplete')
+
+        if self.debug_server:
+            self.is_debug_enabled = True
+            if isinstance(self.debug_server, str):
+                log_file = self.debug_server
+            else:
+                for handler in root_log.handlers:
+                    if isinstance(handler, logging.FileHandler):
+                        log_file = handler.baseFilename
+                        break
+
+        if not self.is_debug_enabled:
+            child_log = root_log.getChild('jedi')
+            child_log.propagate = False
+
+        if not self.workers_started:
+            if self.python_path and 'VIRTUAL_ENV' not in os.environ:
+                cache.python_path = self.python_path
+            worker.start(max(1, self.worker_threads), self.statement_length,
+                         self.server_timeout, self.use_short_types, self.show_docstring,
+                         (log_file, root_log.level), self.python_path)
+            cache.start_background(worker.comp_queue)
+            self.workers_started = True
+
+    def get_complete_position(self, context):
+        pattern = r'\w*$'
+        if context['input'].lstrip().startswith(('from ', 'import ')):
+            m = re.search(r'[,\s]$', context['input'])
+            if m:
+                return m.end()
+        m = re.search(pattern, context['input'])
+        return m.start() if m else -1
+
+    def mix_boilerplate(self, completions):
+        seen = set()
+        for item in self.boilerplate + completions:
+            if item['name'] in seen:
+                continue
+            seen.add(item['name'])
+            yield item
+
+    def finalize(self, item):
+        abbr = item['name']
+
+        if self.show_docstring:
+            desc = item['doc']
+        else:
+            desc = ''
+
+        if item['params'] is not None:
+            sig = '{}({})'.format(item['name'], ', '.join(item['params']))
+            sig_len = len(sig)
+
+            desc = sig + '\n\n' + desc
+
+            if self.statement_length > 0 and sig_len > self.statement_length:
+                params = []
+                length = len(item['name']) + 2
+
+                for p in item['params']:
+                    p = p.split('=', 1)[0]
+                    length += len(p)
+                    params.append(p)
+
+                length += 2 * (len(params) - 1)
+
+                # +5 for the ellipsis and separator
+                while length + 5 > self.statement_length and len(params):
+                    length -= len(params[-1]) + 2
+                    params = params[:-1]
+
+                if len(item['params']) > len(params):
+                    params.append('...')
+
+                sig = '{}({})'.format(item['name'], ', '.join(params))
+
+            abbr = sig
+
+        if self.use_short_types:
+            kind = item['short_type'] or item['type']
+        else:
+            kind = item['type']
+
+        return {
+            'word': item['name'],
+            'abbr': abbr,
+            'kind': kind,
+            'info': desc.strip(),
+            'menu': '[jedi] ',
+            'dup': 1,
+        }
+
+    def finalize_cached(self, cache_key, filters, cached):
+        if cached:
+            if cached.completions is None:
+                out = self.mix_boilerplate([])
+            elif cache_key[-1] == 'vars':
+                out = self.mix_boilerplate(cached.completions)
+            else:
+                out = cached.completions
+            if filters:
+                out = (x for x in out if x['type'] in filters)
+            return [self.finalize(x) for x in sorted(out, key=sort_key)]
+        return []
+
+    @profiler.profile
+    def gather_candidates(self, context):
+        refresh_boilerplate = False
+        if not self.boilerplate:
+            bp = cache.retrieve(('boilerplate~',))
+            if bp:
+                self.boilerplate = bp.completions[:]
+                refresh_boilerplate = True
+            else:
+                # This should be the first time any completion happened, so
+                # `wait` will be True.
+                worker.work_queue.put((('boilerplate~',), [], '', 1, 0, '', None))
+
+        line = context['position'][1]
+        col = context['complete_position']
+        buf = self.vim.current.buffer
+        src = getlines(self.vim)
+
+        extra_modules = []
+        cache_key = None
+        cached = None
+        refresh = True
+        wait = False
+
+        # Inclusion filters for the results
+        filters = []
+
+        if re.match('^\s*(from|import)\s+', context['input']) \
+                and not re.match('^\s*from\s+\S+\s+', context['input']):
+            # If starting an import, only show module results
+            filters.append('module')
+
+        cache_key, extra_modules = cache.cache_context(buf.name, context, src,
+                                                       self.extra_path)
+        cached = cache.retrieve(cache_key)
+        if cached and not cached.refresh:
+            modules = cached.modules
+            if all([filename in modules for filename in extra_modules]) \
+                    and all([utils.file_mtime(filename) == mtime
+                             for filename, mtime in modules.items()]):
+                # The cache is still valid
+                refresh = False
+
+        if cache_key and (cache_key[-1] in ('dot', 'vars', 'import', 'import~') or
+                          (cached and cache_key[-1] == 'package' and
+                           not len(cached.modules))):
+            # Always refresh scoped variables and module imports.  Additionally
+            # refresh cached items that did not have associated module files.
+            refresh = True
+
+        # Extra options to pass to the server.
+        options = {
+            'cwd': context.get('cwd'),
+            'extra_path': self.extra_path,
+            'runtimepath': context.get('runtimepath'),
+        }
+
+        if (not cached or refresh) and cache_key and cache_key[-1] == 'package':
+            # Create a synthetic completion for a module import as a fallback.
+            synthetic_src = ['import {0}; {0}.'.format(cache_key[0])]
+            options.update({
+                'synthetic': {
+                    'src': synthetic_src,
+                    'line': 1,
+                    'col': len(synthetic_src[0]),
+                }
+            })
+
+        if not cached:
+            wait = True
+
+        # Note: This waits a very short amount of time to give the server or
+        # cache a chance to reply.  If there's no reply during this period,
+        # empty results are returned and we defer to deoplete's async refresh.
+        # The current requests's async status is tracked in `_async_keys`.
+        # If the async cache result is older than 5 seconds, the completion
+        # request goes back to the default behavior of attempting to refresh as
+        # needed by the `refresh` and `wait` variables above.
+        self.debug('Key: %r, Refresh: %r, Wait: %r, Async: %r', cache_key,
+                   refresh, wait, cache_key in self._async_keys)
+
+        context['is_async'] = cache_key in self._async_keys
+        if context['is_async']:
+            if not cached:
+                self.debug('[async] waiting for completions: %r', cache_key)
+                return []
+            else:
+                self._async_keys.remove(cache_key)
+                context['is_async'] = False
+                if time.time() - cached.time < 5:
+                    self.debug('[async] finished: %r', cache_key)
+                    return self.finalize_cached(cache_key, filters, cached)
+                else:
+                    self.debug('[async] outdated: %r', cache_key)
+
+        if cache_key and (not cached or refresh):
+            n = time.time()
+            wait_complete = False
+            worker.work_queue.put((cache_key, extra_modules, '\n'.join(src),
+                                   line, col, str(buf.name), options))
+            while wait and time.time() - n < 0.25:
+                cached = cache.retrieve(cache_key)
+                if cached and cached.time >= n:
+                    self.debug('Got updated cache, stopped waiting.')
+                    wait_complete = True
+                    break
+                time.sleep(0.01)
+
+            if wait and not wait_complete:
+                self._async_keys.add(cache_key)
+                context['is_async'] = True
+                self.debug('[async] deferred: %r', cache_key)
+                return []
+
+        if refresh_boilerplate:
+            # This should only occur the first time completions happen.
+            # Refresh the boilerplate to ensure it's always up to date (just in
+            # case).
+            self.debug('Refreshing boilerplate')
+            worker.work_queue.put((('boilerplate~',), [], '', 1, 0, '', None))
+
+        return self.finalize_cached(cache_key, filters, cached)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/cache.py
new file mode 100644
index 0000000..e48b073
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/cache.py
@@ -0,0 +1,451 @@
+import glob
+import hashlib
+import json
+import logging
+import os
+import re
+import subprocess
+import threading
+import time
+from itertools import chain
+from string import whitespace
+
+from deoplete_jedi import utils
+
+_paths = []
+_cache_path = None
+# List of items in the file system cache. `import~` is a special key for
+# caching import modules. It should not be cached to disk.
+_file_cache = set(['import~'])
+
+# Cache version allows us to invalidate outdated cache data structures.
+_cache_version = 16
+_cache_lock = threading.RLock()
+_cache = {}
+
+python_path = 'python'
+
+log = logging.getLogger('deoplete.jedi.cache')
+
+# This uses [\ \t] to avoid spanning lines
+_import_re = re.compile(r'''
+    ^[\ \t]*(
+        from[\ \t]+[\w\.]+[\ \t]+import\s+\([\s\w,]+\)|
+        from[\ \t]+[\w\.]+[\ \t]+import[\ \t\w,]+|
+        import[\ \t]+\([\s\w,]+\)|
+        import[\ \t]+[\ \t\w,]+
+    )
+''', re.VERBOSE | re.MULTILINE)
+
+
+class CacheEntry(object):
+    def __init__(self, dict):
+        self.key = tuple(dict.get('cache_key'))
+        self._touched = time.time()
+        self.time = dict.get('time')
+        self.modules = dict.get('modules')
+        self.completions = dict.get('completions', [])
+        self.refresh = False
+        if self.completions is None:
+            self.refresh = True
+            self.completions = []
+
+    def update_from(self, other):
+        self.key = other.key
+        self.time = other.time
+        self.modules = other.modules
+        self.completions = other.completions
+
+    def touch(self):
+        self._touched = time.time()
+
+    def to_dict(self):
+        return {
+            'version': _cache_version,
+            'cache_key': self.key,
+            'time': self.time,
+            'modules': self.modules,
+            'completions': self.completions,
+        }
+
+
+def get_cache_path():
+    global _cache_path
+    if not _cache_path or not os.path.isdir(_cache_path):
+        p = subprocess.Popen([python_path, '-V'], stdout=subprocess.PIPE,
+                             stderr=subprocess.PIPE)
+        stdout, stderr = p.communicate()
+        version = re.search(r'(\d+\.\d+)\.', (stdout or stderr).decode('utf8')).group(1)
+        cache_dir = os.getenv('XDG_CACHE_HOME', '~/.cache')
+        cache_dir = os.path.join(os.path.expanduser(cache_dir), 'deoplete/jedi',
+                                 version)
+        if not os.path.exists(cache_dir):
+            umask = os.umask(0)
+            os.makedirs(cache_dir, 0o0700)
+            os.umask(umask)
+        _cache_path = cache_dir
+    return _cache_path
+
+
+def retrieve(key):
+    if not key:
+        return None
+
+    with _cache_lock:
+        if key[-1] == 'package' and key[0] not in _file_cache:
+            # This will only load the cached item from a file the first time it
+            # was seen.
+            cache_file = os.path.join(get_cache_path(), '{}.json'.format(key[0]))
+            if os.path.isfile(cache_file):
+                with open(cache_file, 'rt') as fp:
+                    try:
+                        data = json.load(fp)
+                        if data.get('version', 0) >= _cache_version:
+                            _file_cache.add(key[0])
+                            cached = CacheEntry(data)
+                            cached.time = time.time()
+                            _cache[key] = cached
+                            log.debug('Loaded from file: %r', key)
+                            return cached
+                    except Exception:
+                        pass
+        cached = _cache.get(key)
+        if cached:
+            cached.touch()
+        return cached
+
+
+def store(key, value):
+    with _cache_lock:
+        if not isinstance(value, CacheEntry):
+            value = CacheEntry(value)
+
+        if value.refresh:
+            # refresh is set when completions is None.  This will be due to
+            # Jedi producing an error and not getting any completions.  Use any
+            # previously cached completions while a refresh is attempted.
+            old = _cache.get(key)
+            if old is not None:
+                value.completions = old.completions
+
+        _cache[key] = value
+
+        if key[-1] == 'package' and key[0] not in _file_cache:
+            _file_cache.add(key[0])
+            cache_file = os.path.join(get_cache_path(), '{}.json'.format(key[0]))
+            with open(cache_file, 'wt') as fp:
+                json.dump(value.to_dict(), fp)
+                log.debug('Stored to file: %r', key)
+        return value
+
+
+def exists(key):
+    with _cache_lock:
+        return key in _cache
+
+
+def reap_cache(max_age=300):
+    """Clear the cache of old items
+
+    Module level completions are exempt from reaping.  It is assumed that
+    module level completions will have a key length of 1.
+    """
+    while True:
+        time.sleep(300)
+
+        with _cache_lock:
+            now = time.time()
+            cur_len = len(_cache)
+            for cached in list(_cache.values()):
+                if cached.key[-1] not in ('package', 'local', 'boilerplate~',
+                                          'import~') \
+                        and now - cached._touched > max_age:
+                    _cache.pop(cached.key)
+
+            if cur_len - len(_cache) > 0:
+                log.debug('Removed %d of %d cache items', len(_cache), cur_len)
+
+
+def cache_processor_thread(compl_queue):
+    errors = 0
+    while True:
+        try:
+            compl = compl_queue.get()
+            cache_key = compl.get('cache_key')
+            cached = retrieve(cache_key)
+            if cached is None or cached.time <= compl.get('time'):
+                cached = store(cache_key, compl)
+                log.debug('Processed: %r', cache_key)
+            errors = 0
+        except Exception as e:
+            errors += 1
+            if errors > 3:
+                break
+            log.error('Got exception while processing: %r', e)
+
+
+def start_background(compl_queue):
+    log.debug('Starting reaper thread')
+    t = threading.Thread(target=cache_processor_thread, args=(compl_queue,))
+    t.daemon = True
+    t.start()
+    t = threading.Thread(target=reap_cache)
+    t.daemon = True
+    t.start()
+
+
+# balanced() taken from:
+# http://stackoverflow.com/a/6753172/4932879
+# Modified to include string delimiters
+def _balanced():
+    # Doc strings might be an issue, but we don't care.
+    idelim = iter("""(){}[]""''""")
+    delims = dict(zip(idelim, idelim))
+    odelims = {v: k for k, v in delims.items()}
+    closing = delims.values()
+
+    def balanced(astr):
+        """Test if a string has balanced delimiters.
+
+        Returns a boolean and a string of the opened delimiter.
+        """
+        stack = []
+        skip = False
+        open_d = ''
+        open_str = ''
+        for c in astr:
+            if c == '\\':
+                skip = True
+                continue
+            if skip:
+                skip = False
+                continue
+            d = delims.get(c, None)
+            if d and not open_str:
+                if d in '"\'':
+                    open_str = d
+                open_d = odelims.get(d)
+                stack.append(d)
+            elif c in closing:
+                if c == open_str:
+                    open_str = ''
+                if not open_str and (not stack or c != stack.pop()):
+                    return False, open_d
+                if stack:
+                    open_d = odelims.get(stack[-1])
+                else:
+                    open_d = ''
+        return not stack, open_d
+    return balanced
+balanced = _balanced()
+
+
+def split_module(text, default_value=None):
+    """Utility to split the module text.
+
+    If there is nothing to split, return `default_value`.
+    """
+    b, d = balanced(text)
+    if not b:
+        # Handles cases where the cursor is inside of unclosed delimiters.
+        # If the input is: re.search(x.spl
+        # The returned value should be: x
+        if d and d not in '\'"':
+            di = text.rfind(d)
+            if di != -1:
+                text = text[di+1:]
+        else:
+            return default_value
+    m = re.search('([\S\.]+)$', text)
+    if m and '.' in m.group(1):
+        return m.group(1).rsplit('.', 1)[0]
+    return default_value
+
+
+def get_parents(source, line, class_only=False):
+    """Find the parent blocks
+
+    Collects parent blocks that contain the current line to help form a cache
+    key based on variable scope.
+    """
+    parents = []
+    start = line - 1
+    indent = len(source[start]) - len(source[start].lstrip())
+    if class_only:
+        pattern = r'^\s*class\s+(\w+)'
+    else:
+        pattern = r'^\s*(?:def|class)\s+(\w+)'
+
+    for i in range(start, 0, -1):
+        s_line = source[i].lstrip()
+        l_indent = len(source[i]) - len(s_line)
+        if s_line and l_indent < indent:
+            m = re.search(pattern, s_line)
+            indent = l_indent
+            if m:
+                parents.insert(0, m.group(1))
+
+    return parents
+
+
+def full_module(source, obj):
+    """Construct the full module path
+
+    This finds all imports and attempts to reconstruct the full module path.
+    If matched on a standard `import` line, `obj` itself is a full module path.
+    On `from` import lines, the parent module is prepended to `obj`.
+    """
+
+    module = ''
+    obj_pat = r'(?:(\S+)\s+as\s+)?\b{0}\b'.format(re.escape(obj.split('.', 1)[0]))
+    for match in _import_re.finditer('\n'.join(source)):
+        module = ''
+        imp_line = ' '.join(match.group(0).split())
+        if imp_line.startswith('from '):
+            _, module, imp_line = imp_line.split(' ', 2)
+        m = re.search(obj_pat, imp_line)
+        if m:
+            # If the import is aliased, use the alias as part of the key
+            alias = m.group(1)
+            if alias:
+                obj = obj.split('.')
+                obj[0] = alias
+                obj = '.'.join(obj)
+            if module:
+                return '.'.join((module, obj))
+            return obj
+    return None
+
+
+def sys_path(refresh=False):
+    global _paths
+    if not _paths or refresh:
+        p = subprocess.Popen([
+            python_path,
+            '-c', r'import sys; print("\n".join(sys.path))',
+        ], stdout=subprocess.PIPE)
+        stdout, _ = p.communicate()
+        _paths = [x for x in stdout.decode('utf8').split('\n')
+                  if x and os.path.isdir(x)]
+    return _paths
+
+
+def is_package(module, refresh=False):
+    """Test if a module path is an installed package
+
+    The current interpreter's sys.path is retrieved on first run.
+    """
+    if re.search(r'[^\w\.]', module):
+        return False
+
+    paths = sys_path(refresh)
+
+    module = module.split('.', 1)[0]
+    pglobs = [os.path.join(x, module, '__init__.py') for x in paths]
+    pglobs.extend([os.path.join(x, '{}.*'.format(module)) for x in paths])
+    return any(map(glob.glob, pglobs))
+
+
+def cache_context(filename, context, source, extra_path):
+    """Caching based on context input.
+
+    If the input is blank, it was triggered with `.` to get module completions.
+
+    The module files as reported by Jedi are stored with their modification
+    times to help detect if a cache needs to be refreshed.
+
+    For scoped variables in the buffer, construct a cache key using the
+    filename.  The buffer file's modification time is checked to see if the
+    completion needs to be refreshed.  The approximate scope lines are cached
+    to help invalidate the cache based on line position.
+
+    Cache keys are made using tuples to make them easier to interpret later.
+    """
+    cinput = context['input'].lstrip().lstrip('@')
+    if not re.sub(r'[\s\d\.]+', '', cinput):
+        return None, []
+    filename_hash = hashlib.md5(filename.encode('utf8')).hexdigest()
+    line = context['position'][1]
+    log.debug('Input: "%s"', cinput)
+    cache_key = None
+    extra_modules = []
+    cur_module = os.path.splitext(os.path.basename(filename))[0]
+
+    if cinput.startswith(('import ', 'from ')):
+        # Cache imports with buffer filename as the key prefix.
+        # For `from` imports, the first part of the statement is
+        # considered to be the same as `import` for caching.
+
+        import_key = 'import~'
+        cinput = context['input'].lstrip()
+        m = re.search(r'^from\s+(\S+)(.*)', cinput)
+        if m:
+            if m.group(2).lstrip() in 'import':
+                cache_key = ('importkeyword~', )
+                return cache_key, extra_modules
+            import_key = m.group(1) or 'import~'
+        elif cinput.startswith('import ') and cinput.rstrip().endswith('.'):
+            import_key = re.sub(r'[^\s\w\.]', ' ', cinput.strip()).split()[-1]
+
+        if import_key:
+            if '.' in import_key and import_key[-1] not in whitespace \
+                    and not re.search(r'^from\s+\S+\s+import', cinput):
+                # Dot completion on the import line
+                import_key, _ = import_key.rsplit('.', 1)
+            import_key = import_key.rstrip('.')
+            module_file = utils.module_search(
+                import_key,
+                chain(extra_path,
+                      [context.get('cwd'), os.path.dirname(filename)],
+                      utils.rplugin_runtime_paths(context)))
+            if module_file:
+                cache_key = (import_key, 'local')
+                extra_modules.append(module_file)
+            elif is_package(import_key):
+                cache_key = (import_key, 'package')
+            elif not cinput.endswith('.'):
+                cache_key = ('import~',)
+            else:
+                return None, extra_modules
+
+    if not cache_key:
+        obj = split_module(cinput.strip())
+        if obj:
+            cache_key = (obj, 'package')
+            if obj.startswith('self'):
+                if os.path.exists(filename):
+                    extra_modules.append(filename)
+                # `self` is a special case object that needs a scope included
+                # in the cache key.
+                parents = get_parents(source, line, class_only=True)
+                parents.insert(0, cur_module)
+                cache_key = (filename_hash, tuple(parents), obj)
+            else:
+                module_path = full_module(source, obj)
+                if module_path and not module_path.startswith('.') \
+                        and is_package(module_path):
+                    cache_key = (module_path, 'package')
+                else:
+                    # A quick scan revealed that the dot completion doesn't
+                    # involve an imported module.  Treat it like a scoped
+                    # variable and ensure the cache invalidates when the file
+                    # is saved.
+                    if os.path.exists(filename):
+                        extra_modules.append(filename)
+
+                    module_file = utils.module_search(module_path,
+                                                      [os.path.dirname(filename)])
+                    if module_file:
+                        cache_key = (module_path, 'local')
+                    else:
+                        parents = get_parents(source, line)
+                        parents.insert(0, cur_module)
+                        cache_key = (filename_hash, tuple(parents), obj, 'dot')
+        elif context.get('complete_str') or cinput.rstrip().endswith('='):
+            parents = get_parents(source, line)
+            parents.insert(0, cur_module)
+            cache_key = (filename_hash, tuple(parents), 'vars')
+            if os.path.exists(filename):
+                extra_modules.append(filename)
+
+    return cache_key, extra_modules
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/helper.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/helper.py
new file mode 100644
index 0000000..643e5ec
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/helper.py
@@ -0,0 +1,9 @@
+def set_debug(logger, path):
+    from logging import FileHandler, Formatter, DEBUG
+    hdlr = FileHandler(path)
+    logger.addHandler(hdlr)
+    datefmt = '%Y/%m/%d %H:%M:%S'
+    fmt = Formatter(
+        "%(levelname)s %(asctime)s %(message)s", datefmt=datefmt)
+    hdlr.setFormatter(fmt)
+    logger.setLevel(DEBUG)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/profiler.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/profiler.py
new file mode 100644
index 0000000..ac366d0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/profiler.py
@@ -0,0 +1,63 @@
+import functools
+import queue
+
+try:
+    import statistics
+    stdev = statistics.stdev
+    mean = statistics.mean
+except ImportError:
+    stdev = None
+
+    def mean(l):
+        return sum(l) / len(l)
+
+try:
+    import time
+    clock = time.perf_counter
+except Exception:
+    import timeit
+    clock = timeit.default_timer
+
+
+class tfloat(float):
+    color = 39
+
+    def __str__(self):
+        n = self * 1000
+        return '\x1b[%dm%f\x1b[mms' % (self.color, n)
+
+
+def profile(func):
+    name = func.__name__
+    samples = queue.deque(maxlen=5)
+
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        if not self.is_debug_enabled:
+            return func(self, *args, **kwargs)
+        start = clock()
+        ret = func(self, *args, **kwargs)
+        n = tfloat(clock() - start)
+
+        if len(samples) < 2:
+            m = 0
+            d = 0
+            n.color = 36
+        else:
+            m = mean(samples)
+            if stdev:
+                d = tfloat(stdev(samples))
+            else:
+                d = 0
+
+            if n <= m + d:
+                n.color = 32
+            elif n > m + d * 2:
+                n.color = 31
+            else:
+                n.color = 33
+        samples.append(n)
+        self.info('\x1b[34m%s\x1b[m t = %s, \u00b5 = %s, \u03c3 = %s)',
+                  name, n, m, d)
+        return ret
+    return wrapper
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/server.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/server.py
new file mode 100644
index 0000000..60e2c29
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/server.py
@@ -0,0 +1,576 @@
+"""Jedi mini server for deoplete-jedi
+
+This script allows Jedi to run using the Python interpreter that is found in
+the user's environment instead of the one Neovim is using.
+
+Jedi seems to accumulate latency with each completion.  To deal with this, the
+server is restarted after 50 completions.  This threshold is relatively high
+considering that deoplete-jedi caches completion results.  These combined
+should make deoplete-jedi's completions pretty fast and responsive.
+"""
+from __future__ import unicode_literals
+
+import argparse
+import functools
+import logging
+import os
+import re
+import struct
+import subprocess
+import sys
+import threading
+import time
+from glob import glob
+
+# This is be possible because the path is inserted in deoplete_jedi.py as well
+# as set in PYTHONPATH by the Client class.
+from deoplete_jedi import utils
+
+log = logging.getLogger('deoplete')
+nullHandler = logging.NullHandler()
+
+if not log.handlers:
+    log.addHandler(nullHandler)
+
+try:
+    import cPickle as pickle
+except ImportError:
+    import pickle
+
+libpath = os.path.join(
+    os.path.dirname(os.path.dirname(os.path.dirname(__file__))), 'vendored')
+jedi_path = os.path.join(libpath, 'jedi')
+parso_path = os.path.join(libpath, 'parso')
+
+# Type mapping.  Empty values will use the key value instead.
+# Keep them 5 characters max to minimize required space to display.
+_types = {
+    'import': 'imprt',
+    'class': '',
+    'function': 'def',
+    'globalstmt': 'var',
+    'instance': 'var',
+    'statement': 'var',
+    'keyword': 'keywd',
+    'module': 'mod',
+    'param': 'arg',
+    'property': 'prop',
+
+    'bool': '',
+    'bytes': 'byte',
+    'complex': 'cmplx',
+    'dict': '',
+    'list': '',
+    'float': '',
+    'int': '',
+    'object': 'obj',
+    'set': '',
+    'slice': '',
+    'str': '',
+    'tuple': '',
+    'mappingproxy': 'dict',  # cls.__dict__
+    'member_descriptor': 'cattr',
+    'getset_descriptor': 'cprop',
+    'method_descriptor': 'cdef',
+}
+
+
+class StreamError(Exception):
+    """Error in reading/writing streams."""
+
+
+class StreamEmpty(StreamError):
+    """Empty stream data"""
+
+
+def stream_read(pipe):
+    """Read data from the pipe."""
+    buffer = getattr(pipe, 'buffer', pipe)
+    header = buffer.read(4)
+    if not len(header):
+        raise StreamEmpty
+
+    if len(header) < 4:
+        raise StreamError('Incorrect byte length')
+
+    length = struct.unpack('I', header)[0]
+    data = buffer.read(length)
+    if len(data) < length:
+        raise StreamError('Got less data than expected')
+    return pickle.loads(data)
+
+
+def stream_write(pipe, obj):
+    """Write data to the pipe."""
+    data = pickle.dumps(obj, 2)
+    header = struct.pack(b'I', len(data))
+    buffer = getattr(pipe, 'buffer', pipe)
+    buffer.write(header + data)
+    pipe.flush()
+
+
+def strip_decor(source):
+    """Remove decorators lines
+
+    If the decorator is a function call, this will leave them dangling.  Jedi
+    should be fine with this since they'll look like tuples just hanging out
+    not doing anything important.
+    """
+    return re.sub(r'^(\s*)@\w+', r'\1', source, flags=re.M)
+
+
+def retry_completion(func):
+    """Decorator to retry a completion
+
+    A second attempt is made with decorators stripped from the source.
+    """
+    @functools.wraps(func)
+    def wrapper(self, source, *args, **kwargs):
+        try:
+            return func(self, source, *args, **kwargs)
+        except Exception:
+            if '@' in source:
+                log.warn('Retrying completion %r', func.__name__, exc_info=True)
+                try:
+                    return func(self, strip_decor(source), *args, **kwargs)
+                except Exception:
+                    pass
+            log.warn('Failed completion %r', func.__name__, exc_info=True)
+    return wrapper
+
+
+class Server(object):
+    """Server class
+
+    This is created when this script is ran directly.
+    """
+    def __init__(self, desc_len=0, short_types=False, show_docstring=False):
+        self.desc_len = desc_len
+        self.use_short_types = short_types
+        self.show_docstring = show_docstring
+        self.unresolved_imports = set()
+
+        from jedi import settings
+
+        settings.use_filesystem_cache = False
+
+    def _loop(self):
+        from jedi.evaluate.sys_path import _get_venv_sitepackages
+
+        while True:
+            data = stream_read(sys.stdin)
+            if not isinstance(data, tuple):
+                continue
+
+            cache_key, source, line, col, filename, options = data
+            orig_path = sys.path[:]
+            venv = os.getenv('VIRTUAL_ENV')
+            if venv:
+                sys.path.insert(0, _get_venv_sitepackages(venv))
+            add_path = self.find_extra_sys_path(filename)
+            if add_path and add_path not in sys.path:
+                # Add the found path to sys.path.  I'm not 100% certain if this
+                # is actually helping anything, but it feels like the right
+                # thing to do.
+                sys.path.insert(0, add_path)
+            if filename:
+                sys.path.append(os.path.dirname(filename))
+
+            if isinstance(options, dict):
+                extra = options.get('extra_path')
+                if extra:
+                    if not isinstance(extra, list):
+                        extra = [extra]
+                    sys.path.extend(extra)
+
+                # Add extra paths if working on a Python remote plugin.
+                sys.path.extend(utils.rplugin_runtime_paths(options))
+
+            # Decorators on incomplete functions cause an error to be raised by
+            # Jedi.  I assume this is because Jedi is attempting to evaluate
+            # the return value of the wrapped, but broken, function.
+            # Our solution is to simply strip decorators from the source since
+            # we are a completion service, not the syntax police.
+            out = self.script_completion(source, line, col, filename)
+
+            if not out and cache_key[-1] == 'vars':
+                # Attempt scope completion.  If it fails, it should fall
+                # through to script completion.
+                log.debug('Fallback to scoped completions')
+                out = self.scoped_completions(source, filename, cache_key[-2])
+
+            if not out and isinstance(options, dict) and 'synthetic' in options:
+                synthetic = options.get('synthetic')
+                log.debug('Using synthetic completion: %r', synthetic)
+                out = self.script_completion(synthetic['src'],
+                                             synthetic['line'],
+                                             synthetic['col'], filename)
+
+            if not out and cache_key[-1] in ('package', 'local'):
+                # The backup plan
+                log.debug('Fallback to module completions')
+                try:
+                    out = self.module_completions(cache_key[0], sys.path)
+                except Exception:
+                    pass
+
+            stream_write(sys.stdout, out)
+            sys.path[:] = orig_path
+
+    def run(self):
+        log.debug('Starting server.  sys.path = %r', sys.path)
+        try:
+            stream_write(sys.stdout, tuple(sys.version_info))
+            self._loop()
+        except StreamEmpty:
+            log.debug('Input closed.  Shutting down.')
+        except Exception:
+            log.exception('Server Exception.  Shutting down.')
+
+    def find_extra_sys_path(self, filename):
+        """Find the file's "root"
+
+        This tries to determine the script's root package.  The first step is
+        to scan upward until there are no longer __init__.py files.  If that
+        fails, check immediate subdirectories to find __init__.py files which
+        could mean that the current script is not part of a package, but has
+        sub-modules.
+        """
+        add_path = ''
+        dirname = os.path.dirname(filename)
+        scan_dir = dirname
+        while len(scan_dir) \
+                and os.path.isfile(os.path.join(scan_dir, '__init__.py')):
+            scan_dir = os.path.dirname(scan_dir)
+
+        if scan_dir != dirname:
+            add_path = scan_dir
+        elif glob('{}/*/__init__.py'.format(dirname)):
+            add_path = dirname
+
+        return add_path
+
+    def module_completions(self, module, paths):
+        """Directly get completions from the module file
+
+        This is the fallback if all else fails for module completion.
+        """
+        found = utils.module_search(module, paths)
+        if not found:
+            return None
+
+        log.debug('Found script for fallback completions: %r', found)
+        mod_parts = tuple(re.sub(r'\.+', '.', module).strip('.').split('.'))
+        path_parts = os.path.splitext(found)[0].split('/')
+        if path_parts[-1] == '__init__':
+            path_parts.pop()
+        path_parts = tuple(path_parts)
+        match_mod = mod_parts
+        ml = len(mod_parts)
+        for i in range(ml):
+            if path_parts[i-ml:] == mod_parts[:ml-i]:
+                match_mod = mod_parts[-i:]
+                break
+        log.debug('Remainder to match: %r', match_mod)
+
+        import jedi
+
+        completions = jedi.api.names(path=found, references=True)
+        completions = utils.jedi_walk(completions)
+        while len(match_mod):
+            for c in completions:
+                if c.name == match_mod[0]:
+                    completions = c.defined_names()
+                    break
+            else:
+                log.debug('No more matches at %r', match_mod[0])
+                return []
+            match_mod = match_mod[:-1]
+
+        out = []
+        tmp_filecache = {}
+        seen = set()
+        for c in completions:
+            parsed = self.parse_completion(c, tmp_filecache)
+            seen_key = (parsed['type'], parsed['name'])
+            if seen_key in seen:
+                continue
+            seen.add(seen_key)
+            out.append(parsed)
+        return out
+
+    @retry_completion
+    def script_completion(self, source, line, col, filename):
+        """Standard Jedi completions"""
+        import jedi
+
+        log.debug('Line: %r, Col: %r, Filename: %r', line, col, filename)
+        completions = jedi.Script(source, line, col, filename).completions()
+        out = []
+        tmp_filecache = {}
+        for c in completions:
+            out.append(self.parse_completion(c, tmp_filecache))
+        return out
+
+    def get_parents(self, c):
+        """Collect parent blocks
+
+        This is for matching a request's cache key when performing scoped
+        completions.
+        """
+        parents = []
+        while True:
+            try:
+                c = c.parent()
+                parents.insert(0, c.name)
+                if c.type == 'module':
+                    break
+            except AttributeError:
+                break
+        return tuple(parents)
+
+    def resolve_import(self, completion, depth=0, max_depth=10, seen=None):
+        """Follow import until it no longer is an import type"""
+        if seen is None:
+            seen = []
+        seen.append(completion)
+        log.debug('Resolving: %r', completion)
+        defs = completion.goto_assignments()
+        if not defs:
+            return None
+        resolved = defs[0]
+        if resolved in seen:
+            return None
+        if resolved.type == 'import' and depth < max_depth:
+            return self.resolve_import(resolved, depth + 1, max_depth, seen)
+        log.debug('Resolved: %r', resolved)
+        return resolved
+
+    @retry_completion
+    def scoped_completions(self, source, filename, parent):
+        """Scoped completion
+
+        This gets all definitions for a specific scope allowing them to be
+        cached without needing to consider the current position in the source.
+        This would be slow in Vim without threading.
+        """
+        import jedi
+
+        completions = jedi.api.names(source, filename, all_scopes=True)
+        out = []
+        tmp_filecache = {}
+        seen = set()
+        for c in completions:
+            c_parents = self.get_parents(c)
+            if parent and (len(c_parents) > len(parent) or
+                           c_parents != parent[:len(c_parents)]):
+                continue
+            if c.type == 'import' and c.full_name not in self.unresolved_imports:
+                resolved = self.resolve_import(c)
+                if resolved is None:
+                    log.debug('Could not resolve import: %r', c.full_name)
+                    self.unresolved_imports.add(c.full_name)
+                    continue
+                else:
+                    c = resolved
+            parsed = self.parse_completion(c, tmp_filecache)
+            seen_key = (parsed['name'], parsed['type'])
+            if seen_key in seen:
+                continue
+            seen.add(seen_key)
+            out.append(parsed)
+        return out
+
+    def completion_dict(self, name, type_, comp):
+        """Final construction of the completion dict."""
+        doc = comp.docstring()
+        i = doc.find('\n\n')
+        if i != -1:
+            doc = doc[i:]
+
+        params = None
+        try:
+            if type_ in ('function', 'class'):
+                params = []
+                for i, p in enumerate(comp.params):
+                    desc = p.description.strip()
+                    if i == 0 and desc == 'self':
+                        continue
+                    if '\\n' in desc:
+                        desc = desc.replace('\\n', '\\x0A')
+                    # Note: Hack for jedi param bugs
+                    if desc.startswith('param ') or desc == 'param':
+                        desc = desc[5:].strip()
+                    if desc:
+                        params.append(desc)
+        except Exception:
+            params = None
+
+        return {
+            'module': comp.module_path,
+            'name': name,
+            'type': type_,
+            'short_type': _types.get(type_),
+            'doc': doc.strip(),
+            'params': params,
+        }
+
+    def parse_completion(self, comp, cache):
+        """Return a tuple describing the completion.
+
+        Returns (name, type, description, abbreviated)
+        """
+        name = comp.name
+
+        type_ = comp.type
+        desc = comp.description
+
+        if type_ == 'instance' and desc.startswith(('builtins.', 'posix.')):
+            # Simple description
+            builtin_type = desc.rsplit('.', 1)[-1]
+            if builtin_type in _types:
+                return self.completion_dict(name, builtin_type, comp)
+
+        if type_ == 'class' and desc.startswith('builtins.'):
+            return self.completion_dict(name, type_, comp)
+
+        if type_ == 'function':
+            if comp.module_path not in cache and comp.line and comp.line > 1 \
+                    and os.path.exists(comp.module_path):
+                with open(comp.module_path, 'r') as fp:
+                    cache[comp.module_path] = fp.readlines()
+            lines = cache.get(comp.module_path)
+            if isinstance(lines, list) and len(lines) > 1 \
+                    and comp.line < len(lines) and comp.line > 1:
+                # Check the function's decorators to check if it's decorated
+                # with @property
+                i = comp.line - 2
+                while i >= 0:
+                    line = lines[i].lstrip()
+                    if not line.startswith('@'):
+                        break
+                    if line.startswith('@property'):
+                        return self.completion_dict(name, 'property', comp)
+                    i -= 1
+            return self.completion_dict(name, type_, comp)
+
+        return self.completion_dict(name, type_, comp)
+
+
+class Client(object):
+    """Client object
+
+    This will be used by deoplete-jedi to interact with the server.
+    """
+    max_completion_count = 50
+
+    def __init__(self, desc_len=0, short_types=False, show_docstring=False,
+                 debug=False, python_path=None):
+        self._server = None
+        self.restarting = threading.Lock()
+        self.version = (0, 0, 0, 'final', 0)
+        self.env = os.environ.copy()
+        self.env.update({
+            'PYTHONPATH': os.pathsep.join(
+                (parso_path, jedi_path,
+                 os.path.dirname(os.path.dirname(__file__)))),
+        })
+
+        if 'VIRTUAL_ENV' in os.environ:
+            self.env['VIRTUAL_ENV'] = os.getenv('VIRTUAL_ENV')
+            prog = os.path.join(self.env['VIRTUAL_ENV'], 'bin', 'python')
+        elif python_path:
+            prog = python_path
+        else:
+            prog = 'python'
+
+        self.cmd = [prog, '-u', __file__, '--desc-length', str(desc_len)]
+        if short_types:
+            self.cmd.append('--short-types')
+        if show_docstring:
+            self.cmd.append('--docstrings')
+        if debug:
+            self.cmd.extend(('--debug', debug[0], '--debug-level',
+                             str(debug[1])))
+
+        try:
+            self.restart()
+        except Exception as exc:
+            from deoplete.exceptions import SourceInitError
+            raise SourceInitError('Failed to start server ({}): {}'.format(
+                ' '.join(self.cmd), exc))
+
+    def shutdown(self):
+        """Shut down the server."""
+        if self._server is not None and self._server.returncode is None:
+            # Closing the server's stdin will cause it to exit.
+            self._server.stdin.close()
+            self._server.kill()
+
+    def restart(self):
+        """Start or restart the server
+
+        If a server is already running, shut it down.
+        """
+        with self.restarting:
+            self.shutdown()
+            self._server = subprocess.Popen(self.cmd, stdin=subprocess.PIPE,
+                                            stdout=subprocess.PIPE,
+                                            stderr=subprocess.PIPE,
+                                            env=self.env)
+            # Might result in "pyenv: version `foo' is not installed (set by
+            # /cwd/.python-version)" on stderr.
+            try:
+                self.version = stream_read(self._server.stdout)
+            except StreamEmpty:
+                out, err = self._server.communicate()
+                raise Exception('Server exited with {}: error: {}'.format(
+                    err, self._server.returncode))
+            self._count = 0
+
+    def completions(self, *args):
+        """Get completions from the server.
+
+        If the number of completions already performed reaches a threshold,
+        restart the server.
+        """
+        if self._count > self.max_completion_count:
+            self.restart()
+
+        self._count += 1
+        try:
+            stream_write(self._server.stdin, args)
+            return stream_read(self._server.stdout)
+        except StreamError as exc:
+            if self.restarting.acquire(False):
+                self.restarting.release()
+                log.error('Caught %s during handling completions(%s), '
+                          ' restarting server', exc, args)
+                self.restart()
+                time.sleep(0.2)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--desc-length', type=int)
+    parser.add_argument('--short-types', action='store_true')
+    parser.add_argument('--docstrings', action='store_true')
+    parser.add_argument('--debug', default='')
+    parser.add_argument('--debug-level', type=int, default=logging.DEBUG)
+    args = parser.parse_args()
+
+    if args.debug:
+        log.removeHandler(nullHandler)
+        formatter = logging.Formatter('%(asctime)s %(levelname)-8s '
+                                      '(%(name)s) %(message)s')
+        handler = logging.FileHandler(args.debug)
+        handler.setFormatter(formatter)
+        handler.setLevel(args.debug_level)
+        log.addHandler(handler)
+        log.setLevel(logging.DEBUG)
+        log = log.getChild('jedi.server')
+
+    s = Server(args.desc_length, args.short_types, args.docstrings)
+    s.run()
+else:
+    log = log.getChild('jedi.client')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/utils.py
new file mode 100644
index 0000000..4f81a7f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/utils.py
@@ -0,0 +1,90 @@
+import os
+import re
+import sys
+
+
+def file_mtime(filename):
+    """Get file modification time
+
+    Return 0 if the file does not exist
+    """
+    if not os.path.exists(filename):
+        return 0
+    return int(os.path.getmtime(filename))
+
+
+def module_file(dirname, suffix, base):
+    """Find a script that matches the suffix path."""
+    search = os.path.abspath(os.path.join(dirname, suffix))
+    # dirname = os.path.dirname(dirname)
+    found = ''
+    while True:
+        p = os.path.join(search, '__init__.py')
+        if os.path.isfile(p):
+            found = p
+            break
+        p = search + '.py'
+        if os.path.isfile(p):
+            found = p
+            break
+        if os.path.basename(search) == base or search == dirname:
+            break
+        search = os.path.dirname(search)
+    return found
+
+
+def module_search(module, paths):
+    """Search paths for a file matching the module."""
+    if not module:
+        return ''
+
+    base = re.sub(r'\.+', '.', module).strip('.').split('.')[0]
+    module_path = os.path.normpath(re.sub(r'(\.+)', r'/\1/', module).strip('/'))
+    for p in paths:
+        found = module_file(p, module_path, base)
+        if found:
+            return found
+    return ''
+
+
+def rplugin_runtime_paths(context):
+    """Adds Neovim runtime paths.
+
+    Additional paths are added only if a `rplugin/python*` exists.
+    """
+    paths = []
+
+    if context and 'cwd' in context:
+        cwd = context.get('cwd')
+        rplugins = ('rplugin/python{}'.format(sys.version_info[0]),
+                    'rplugin/pythonx')
+
+        paths.extend(filter(os.path.exists,
+                            (os.path.join(cwd, x)
+                             for x in rplugins)))
+
+        if paths:
+            for rtp in context.get('runtimepath', '').split(','):
+                if not rtp:
+                    continue
+                paths.extend(filter(os.path.exists,
+                                    (os.path.join(rtp, x)
+                                     for x in rplugins)))
+    return paths
+
+
+def jedi_walk(completions, depth=0, max_depth=5):
+    """Walk through Jedi objects
+
+    The purpose for this is to help find an object with a specific name.  Once
+    found, the walking will stop.
+    """
+    for c in completions:
+        yield c
+        if hasattr(c, 'description') and c.type == 'import':
+            d = c.description
+            if d.startswith('from ') and d.endswith('*') and depth < max_depth:
+                # Haven't determined the lowest Python 3 version required.
+                # If we determine 3.3, we can use `yield from`
+                for sub in jedi_walk(c.defined_names(), depth+1, max_depth):
+                    yield sub
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/worker.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/worker.py
new file mode 100644
index 0000000..994c9b7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/sources/deoplete_jedi/worker.py
@@ -0,0 +1,85 @@
+import logging
+import os
+import queue
+import threading
+import time
+
+from .server import Client
+from .utils import file_mtime
+
+log = logging.getLogger('deoplete.jedi.worker')
+workers = []
+work_queue = queue.Queue()
+comp_queue = queue.Queue()
+
+
+class Worker(threading.Thread):
+    daemon = True
+
+    def __init__(self, in_queue, out_queue, desc_len=0, server_timeout=10,
+                 short_types=False, show_docstring=False, debug=False,
+                 python_path=None):
+        self._client = Client(desc_len, short_types, show_docstring, debug,
+                              python_path)
+
+        self.server_timeout = server_timeout
+        self.in_queue = in_queue
+        self.out_queue = out_queue
+        super(Worker, self).__init__()
+        self.log = log.getChild(self.name)
+
+    def completion_work(self, cache_key, extra_modules, source, line, col,
+                        filename, options):
+        completions = self._client.completions(cache_key, source, line, col,
+                                               filename, options)
+        modules = {f: file_mtime(f) for f in extra_modules}
+        if completions is not None:
+            for c in completions:
+                m = c['module']
+                if m and m not in modules and os.path.exists(m):
+                    modules[m] = file_mtime(m)
+
+        self.results = {
+            'cache_key': cache_key,
+            'time': time.time(),
+            'modules': modules,
+            'completions': completions,
+        }
+
+    def run(self):
+        while True:
+            try:
+                work = self.in_queue.get()
+                self.log.debug('Got work')
+
+                self.results = None
+                t = threading.Thread(target=self.completion_work, args=work)
+                t.start()
+                t.join(timeout=self.server_timeout)
+
+                if self.results:
+                    self.out_queue.put(self.results)
+                    self.log.debug('Completed work')
+                else:
+                    self.log.warn('Restarting server because it\'s taking '
+                                  'too long')
+                    # Kill all but the last queued job since they're most
+                    # likely a backlog that are no longer relevant.
+                    while self.in_queue.qsize() > 1:
+                        self.in_queue.get()
+                        self.in_queue.task_done()
+                    self._client.restart()
+                self.in_queue.task_done()
+            except Exception:
+                self.log.debug('Worker error', exc_info=True)
+
+
+def start(count, desc_len=0, server_timeout=10, short_types=False,
+          show_docstring=False, debug=False, python_path=None):
+    while count > 0:
+        t = Worker(work_queue, comp_queue, desc_len, server_timeout, short_types,
+                   show_docstring, debug, python_path)
+        workers.append(t)
+        t.start()
+        log.debug('Started worker: %r', t)
+        count -= 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.coveragerc b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.coveragerc
new file mode 100644
index 0000000..939a317
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.gitignore b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.gitignore
new file mode 100644
index 0000000..369f71c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.gitignore
@@ -0,0 +1,13 @@
+*~
+*.sw?
+*.pyc
+.ropeproject
+.tox
+.coveralls.yml
+.coverage
+/build/
+/docs/_build/
+/dist/
+jedi.egg-info/
+record.json
+/.cache/
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.travis.yml b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.travis.yml
new file mode 100644
index 0000000..8bd67ff
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/.travis.yml
@@ -0,0 +1,30 @@
+language: python
+sudo: false
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+  - pypy
+matrix:
+  allow_failures:
+    - python: pypy
+    - env: TOXENV=cov
+    - env: TOXENV=sith
+  include:
+    - python: 3.5
+      env: TOXENV=cov
+    - python: 3.5
+      env: TOXENV=sith
+install:
+    - pip install --quiet tox-travis
+script:
+    - tox
+after_script:
+    - if [ $TOXENV == "cov" ]; then
+      pip install --quiet coveralls;
+      coveralls;
+      fi
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/AUTHORS.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/AUTHORS.txt
new file mode 100644
index 0000000..52204a8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/AUTHORS.txt
@@ -0,0 +1,49 @@
+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)
+Mathias Rav (@Mortal) <rav@cs.au.dk>
+Daniel Fiterman (@dfit99) <fitermandaniel2@gmail.com>
+Simon Ruggier (@sruggier)
+Élie Gouzien (@ElieGouzien)
+
+
+Note: (@user) means a github user name.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CHANGELOG.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CHANGELOG.rst
new file mode 100644
index 0000000..1d52dc5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CHANGELOG.rst
@@ -0,0 +1,87 @@
+.. :changelog:
+
+Changelog
+---------
+
+0.11.0 (2017-09-20)
++++++++++++++++++++
+
+- Split Jedi's parser into a separate project called ``parso``.
+- Avoiding side effects in REPL completion.
+- Numpy docstring support should be much better.
+- Moved the `settings.*recursion*` away, they are no longer usable.
+
+0.10.2 (2017-04-05)
++++++++++++++++++++
+
+- Python Packaging sucks. Some files were not included in 0.10.1.
+
+0.10.1 (2017-04-05)
++++++++++++++++++++
+
+- Fixed a few very annoying bugs.
+- Prepared the parser to be factored out of Jedi.
+
+0.10.0 (2017-02-03)
++++++++++++++++++++
+
+- 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.
+- Completely rewritten the type inference engine.
+- A new and better parser for (fast) parsing diffs of Python code.
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CONTRIBUTING.md b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CONTRIBUTING.md
new file mode 100644
index 0000000..609e639
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+Pull Requests are great.
+
+ 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.
+
+**Try to use the PEP8 style guide.**
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/LICENSE.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/LICENSE.txt
new file mode 100644
index 0000000..94f9545
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/LICENSE.txt
@@ -0,0 +1,24 @@
+All contributions towards Jedi are MIT licensed.
+
+-------------------------------------------------------------------------------
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/MANIFEST.in b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/MANIFEST.in
new file mode 100644
index 0000000..5ba58e6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/MANIFEST.in
@@ -0,0 +1,15 @@
+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 requirements.txt
+include jedi/evaluate/compiled/fake/*.pym
+include jedi/parser/python/grammar*.txt
+recursive-include test *
+recursive-include docs *
+recursive-exclude * *.pyc
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/README.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/README.rst
new file mode 100644
index 0000000..38f29d6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/README.rst
@@ -0,0 +1,215 @@
+###################################################################
+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/questions/tagged/python-jedi>`_ *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_, completor.vim_)
+- 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-jedi_)
+- 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)
+- `Ipython 6.0.0+ <http://ipython.readthedocs.io/en/stable/whatsnew/version6.html>`_
+
+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.)
+-------------------------------------------
+
+Starting with Ipython `6.0.0` Jedi is a dependency of IPython. Autocompletion
+in IPython is therefore possible without additional configuration.
+
+It's possible to have Jedi autocompletion in REPL modes - `example video <https://vimeo.com/122332037>`_.
+This means that in Python you can enable tab completion in a `REPL
+<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
+.. _completor.vim: https://github.com/maralla/completor.vim
+.. _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-jedi: https://atom.io/packages/autocomplete-python-jedi
+.. _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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/conftest.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/conftest.py
new file mode 100644
index 0000000..2567fcd
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/deploy-master.sh b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/deploy-master.sh
new file mode 100644
index 0000000..d1e76cb
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/deploy-master.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# The script creates a separate folder in build/ and creates tags there, pushes
+# them and then uploads the package to PyPI.
+
+set -eu -o pipefail
+
+BASE_DIR=$(dirname $(readlink -f "$0"))
+cd $BASE_DIR
+
+git fetch --tags
+
+PROJECT_NAME=jedi
+BRANCH=master
+BUILD_FOLDER=build
+
+[ -d $BUILD_FOLDER ] || mkdir $BUILD_FOLDER
+# Remove the previous deployment first.
+# Checkout the right branch
+cd $BUILD_FOLDER
+rm -rf $PROJECT_NAME
+git clone .. $PROJECT_NAME
+cd $PROJECT_NAME
+git checkout $BRANCH
+
+# Test first.
+tox
+
+# Create tag
+tag=v$(python -c "import $PROJECT_NAME; print($PROJECT_NAME.__version__)")
+
+master_ref=$(git show-ref -s heads/$BRANCH)
+tag_ref=$(git show-ref -s $tag || true)
+if [[ $tag_ref ]]; then
+    if [[ $tag_ref != $master_ref ]]; then
+        echo 'Cannot tag something that has already been tagged with another commit.'
+        exit 1
+    fi
+else
+    git tag $tag
+    git push --tags
+fi
+
+# Package and upload to PyPI
+#rm -rf dist/ - Not needed anymore, because the folder is never reused.
+echo `pwd`
+python setup.py sdist bdist_wheel
+# Maybe do a pip install twine before.
+twine upload dist/*
+
+cd $BASE_DIR
+# The tags have been pushed to this repo. Push the tags to github, now.
+git push --tags
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/Makefile b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/Makefile
new file mode 100644
index 0000000..14cfdf4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/README.md b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/README.md
new file mode 100644
index 0000000..5eac8a2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/README.md
@@ -0,0 +1,14 @@
+Installation
+------------
+
+Install the graphviz library::
+    
+    sudo apt-get install graphviz
+
+Install sphinx::
+
+    sudo pip install sphinx
+
+You might also need to install the Python graphviz interface::
+
+    sudo pip install graphviz
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_complete.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_complete.png
new file mode 100644
index 0000000..2bafad6
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_complete.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_function.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_function.png
new file mode 100644
index 0000000..6109703
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_function.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_pydoc.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_pydoc.png
new file mode 100644
index 0000000..a399d5f
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_screenshots/screenshot_pydoc.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_static/logo-src.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_static/logo-src.txt
new file mode 100644
index 0000000..59aa4f6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_static/logo.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_static/logo.png
new file mode 100644
index 0000000..9f3d244
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_static/logo.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_templates/ghbuttons.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_templates/ghbuttons.html
new file mode 100644
index 0000000..badb06a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_templates/sidebarlogo.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_templates/sidebarlogo.html
new file mode 100644
index 0000000..d9243c4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/LICENSE b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/LICENSE
new file mode 100644
index 0000000..8daab7e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/layout.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/layout.html
new file mode 100644
index 0000000..e781a11
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/relations.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/relations.html
new file mode 100644
index 0000000..3bbcde8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/static/flasky.css_t b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/static/flasky.css_t
new file mode 100644
index 0000000..79ab478
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/static/small_flask.css b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/static/small_flask.css
new file mode 100644
index 0000000..1c6df30
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/theme.conf b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask/theme.conf
new file mode 100644
index 0000000..1d5657f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask_theme_support.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/_themes/flask_theme_support.py
new file mode 100644
index 0000000..d3e33c0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/conf.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/conf.py
new file mode 100644
index 0000000..0e25a88
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/development.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/development.rst
new file mode 100644
index 0000000..90027ec
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/development.rst
@@ -0,0 +1,244 @@
+.. 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| internals. 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 Tree (parser/tree.py)
+++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. automodule:: jedi.parser.tree
+
+Class inheritance diagram:
+
+.. inheritance-diagram::
+   Module
+   Class
+   Function
+   Lambda
+   Flow
+   ForStmt
+   Import
+   ExprStmt
+   Param
+   Name
+   CompFor
+   :parts: 1
+
+.. _evaluate:
+
+Evaluation of python code (evaluate/__init__.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate
+
+Evaluation Representation (evaluate/representation.py)
+++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. automodule:: jedi.evaluate.representation
+
+.. inheritance-diagram::
+   jedi.evaluate.instance.TreeInstance
+   jedi.evaluate.representation.ClassContext
+   jedi.evaluate.representation.FunctionContext
+   jedi.evaluate.representation.FunctionExecutionContext
+   :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:`Diff Parser <diff-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 like lists that are filled after creation:
+
+.. automodule:: jedi.evaluate.iterable
+
+
+.. _dynamic:
+
+Parameter completion (evaluate/dynamic.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.evaluate.dynamic
+
+
+.. _diff-parser:
+
+Diff Parser (parser/diff.py)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: jedi.parser.python.diff
+
+.. _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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/features.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/features.rst
new file mode 100644
index 0000000..03361c7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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 eventually
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/installation.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/installation.rst
new file mode 100644
index 0000000..80ad54d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/parser.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/parser.rst
new file mode 100644
index 0000000..9ec8201
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/parser.rst
@@ -0,0 +1,36 @@
+.. _xxx:
+
+Parser Tree
+===========
+
+Usage
+-----
+
+.. automodule:: jedi.parser.python
+    :members:
+    :undoc-members:
+
+
+Parser Tree Base Class
+----------------------
+
+All nodes and leaves have these methods/properties:
+
+.. autoclass:: jedi.parser.tree.NodeOrLeaf
+    :members:
+    :undoc-members:
+
+
+Python Parser Tree
+------------------
+
+.. automodule:: jedi.parser.python.tree
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Utility
+-------
+
+.. autofunction:: jedi.parser.tree.search_ancestor
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/plugin-api-classes.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/plugin-api-classes.rst
new file mode 100644
index 0000000..74eb28b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/plugin-api.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/plugin-api.rst
new file mode 100644
index 0000000..93b081e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/settings.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/settings.rst
new file mode 100644
index 0000000..640a110
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/settings.rst
@@ -0,0 +1,6 @@
+.. include:: ../global.rst
+
+Settings
+========
+
+.. automodule:: jedi.settings
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/static_analysis.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/static_analysis.rst
new file mode 100644
index 0000000..7ad03c7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/static_analysis.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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/testing.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/testing.rst
new file mode 100644
index 0000000..0c666a1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/usage.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/usage.rst
new file mode 100644
index 0000000..243c62b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/docs/usage.rst
@@ -0,0 +1,122 @@
+.. 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-jedi_
+
+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
+----------------------------------
+
+Starting with Ipython `6.0.0` Jedi is a dependency of IPython. Autocompletion
+in IPython is therefore possible without additional configuration.
+
+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.api.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-jedi: https://atom.io/packages/autocomplete-python-jedi
+.. _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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/global.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/global.rst
new file mode 100644
index 0000000..0279842
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/global.rst
@@ -0,0 +1,3 @@
+:orphan:
+
+.. |jedi| replace:: *Jedi*
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/index.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/docs/index.rst
new file mode 100644
index 0000000..19c0706
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/__init__.py
new file mode 100644
index 0000000..08e41e7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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.11.0'
+
+from jedi.api import Script, Interpreter, set_debug_function, \
+    preload_module, names
+from jedi import settings
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/__main__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/__main__.py
new file mode 100644
index 0000000..f2ee047
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/_compatibility.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/_compatibility.py
new file mode 100644
index 0000000..a467ef5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/_compatibility.py
@@ -0,0 +1,299 @@
+"""
+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
+import warnings
+try:
+    import importlib
+except ImportError:
+    pass
+
+# Cannot use sys.version.major and minor names, because in Python 2.6 it's not
+# a namedtuple.
+is_py3 = sys.version_info[0] >= 3
+is_py33 = is_py3 and sys.version_info[1] >= 3
+is_py34 = is_py3 and sys.version_info[1] >= 4
+is_py35 = is_py3 and sys.version_info[1] >= 5
+is_py26 = not is_py3 and sys.version_info[1] < 7
+py_version = int(str(sys.version_info[0]) + str(sys.version_info[1]))
+
+
+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_py34(string, path=None, fullname=None):
+    implicit_namespace_pkg = False
+    spec = None
+    loader = None
+
+    spec = importlib.machinery.PathFinder.find_spec(string, path)
+    if hasattr(spec, 'origin'):
+        origin = spec.origin
+        implicit_namespace_pkg = origin == 'namespace'
+
+    # We try to disambiguate implicit namespace pkgs with non implicit namespace pkgs
+    if implicit_namespace_pkg:
+        fullname = string if not path else fullname
+        implicit_ns_info = ImplicitNSInfo(fullname, spec.submodule_search_locations._path)
+        return None, implicit_ns_info, False
+
+    # we have found the tail end of the dotted path
+    if hasattr(spec, 'loader'):
+        loader = spec.loader
+    return find_module_py33(string, path, loader)
+
+def find_module_py33(string, path=None, loader=None, fullname=None):
+    loader = loader or importlib.machinery.PathFinder.find_module(string, path)
+
+    if loader is None and path is None:  # Fallback to find builtins
+        try:
+            with warnings.catch_warnings(record=True):
+                # Mute "DeprecationWarning: Use importlib.util.find_spec()
+                # instead." While we should replace that in the future, it's
+                # probably good to wait until we deprecate Python 3.3, since
+                # it was added in Python 3.4 and find_loader hasn't been
+                # removed in 3.6.
+                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, fullname=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 = find_module_py34 if is_py34  else find_module
+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.
+"""
+
+
+class ImplicitNSInfo(object):
+    """Stores information returned from an implicit namespace spec"""
+    def __init__(self, name, paths):
+        self.name = name
+        self.paths = paths
+
+# unicode function
+try:
+    unicode = unicode
+except NameError:
+    unicode = str
+
+
+# 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)
+
+    if 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
+
+try:
+    FileNotFoundError = FileNotFoundError
+except NameError:
+    FileNotFoundError = IOError
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/__init__.py
new file mode 100644
index 0000000..54a6502
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/__init__.py
@@ -0,0 +1,458 @@
+"""
+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 sys
+
+import parso
+from parso.python import tree
+from parso import python_bytes_to_unicode, split_lines
+
+from jedi.parser_utils import get_executable_nodes, get_statement_of_position
+from jedi import debug
+from jedi import settings
+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, evaluate_call_of_leaf
+from jedi.evaluate.sys_path import get_venv_path, dotted_path_in_sys_path
+from jedi.evaluate.iterable import unpack_tuple_to_dict
+from jedi.evaluate.filters import TreeNameDefinition
+
+# Jedi uses lots and lots of recursion. By setting this a little bit higher, we
+# can remove some "maximum recursion depth" errors.
+sys.setrecursionlimit(3000)
+
+
+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', sys_path=None):
+        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()
+
+        # TODO do we really want that?
+        self._source = python_bytes_to_unicode(source, encoding, errors='replace')
+        self._code_lines = split_lines(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()
+
+        # Load the Python grammar of the current interpreter.
+        self._grammar = parso.load_grammar()
+        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')
+
+    @cache.memoize_method
+    def _get_module_node(self):
+        return self._grammar.parse(
+            code=self._source,
+            path=self.path,
+            cache=False,  # No disk cache, because the current script often changes.
+            diff_cache=True,
+            cache_path=settings.cache_directory
+        )
+
+    @cache.memoize_method
+    def _get_module(self):
+        module = er.ModuleContext(
+            self._evaluator,
+            self._get_module_node(),
+            self.path
+        )
+        if self.path is not None:
+            name = dotted_path_in_sys_path(self._evaluator.sys_path, self.path)
+            if name is not None:
+                imports.add_module(self._evaluator, name, module)
+        return module
+
+    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`
+        """
+        module_node = self._get_module_node()
+        leaf = module_node.get_name_of_position(self._pos)
+        if leaf is None:
+            leaf = module_node.get_leaf_for_position(self._pos)
+            if leaf is None:
+                return []
+
+        context = self._evaluator.create_context(self._get_module(), leaf)
+        definitions = helpers.evaluate_goto_definition(self._evaluator, context, 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, check):
+            for name in names:
+                if check(name):
+                    for result in filter_follow_imports(name.goto(), check):
+                        yield result
+                else:
+                    yield name
+
+        names = self._goto()
+        if follow_imports:
+            def check(name):
+                if isinstance(name, er.ModuleName):
+                    return False
+                return name.api_type == 'module'
+        else:
+            def check(name):
+                return isinstance(name, imports.SubModuleName)
+
+        names = filter_follow_imports(names, check)
+
+        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_node().get_name_of_position(self._pos)
+        if name is None:
+            return []
+        context = self._evaluator.create_context(self._get_module(), name)
+        return list(self._evaluator.goto(context, 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:
+            module_node = self._get_module_node()
+            user_stmt = get_statement_of_position(module_node, self._pos)
+            definition_names = self._goto()
+            if not definition_names 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.get_name_of_position(self._pos)
+                if name is None:
+                    # Must be syntax
+                    return []
+                definition_names = [TreeNameDefinition(self._get_module(), name)]
+
+            if not definition_names:
+                # Without a definition for a name we cannot find references.
+                return []
+
+            definition_names = usages.resolve_potential_imports(self._evaluator,
+                                                                definition_names)
+
+            modules = set([d.get_root_context() for d in definition_names])
+            modules.add(self._get_module())
+            definitions = usages.usages(self._evaluator, definition_names, modules)
+        finally:
+            settings.dynamic_flow_information = temp
+
+        return helpers.sorted_definitions(set(definitions))
+
+    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_node(), self._pos)
+        if call_signature_details is None:
+            return []
+
+        context = self._evaluator.create_context(
+            self._get_module(),
+            call_signature_details.bracket_leaf
+        )
+        definitions = helpers.cache_call_signatures(
+            self._evaluator,
+            context,
+            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
+        module_node = self._get_module_node()
+        self._evaluator.analysis_modules = [module_node]
+        try:
+            for node in get_executable_nodes(module_node):
+                context = self._get_module().create_context(node)
+                if node.type in ('funcdef', 'classdef'):
+                    # TODO This is stupid, should be private
+                    from jedi.evaluate.finder import _name_to_types
+                    # Resolve the decorators.
+                    _name_to_types(self._evaluator, context, node.children[1])
+                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.get_paths())
+                    for n in import_names:
+                        imports.infer_import(context, n)
+                elif node.type == 'expr_stmt':
+                    types = context.eval_node(node)
+                    for testlist in node.children[:-1:2]:
+                        # Iterate tuples.
+                        unpack_tuple_to_dict(context, types, testlist)
+                else:
+                    if node.type == 'name':
+                        defs = self._evaluator.goto_definitions(context, node)
+                    else:
+                        defs = evaluate_call_of_leaf(context, node)
+                    try_iter_content(defs)
+                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
+
+    def _get_module(self):
+        parser_module = super(Interpreter, self)._get_module_node()
+        return interpreter.MixedModuleContext(
+            self._evaluator,
+            parser_module,
+            self.namespaces,
+            path=self.path
+        )
+
+
+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._name.tree_name.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)
+    module_context = script._get_module()
+    defs = [
+        classes.Definition(
+            script._evaluator,
+            TreeNameDefinition(
+                module_context.create_context(name if name.parent.type == 'file_input' else name.parent),
+                name
+            )
+        ) for name in get_module_names(script._get_module_node(), 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/classes.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/classes.py
new file mode 100644
index 0000000..8fe5bac
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/classes.py
@@ -0,0 +1,678 @@
+"""
+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 re
+
+from parso.cache import parser_cache
+from parso.python.tree import search_ancestor
+
+from jedi._compatibility import u
+from jedi import settings
+from jedi import common
+from jedi.cache import memoize_method
+from jedi.evaluate import representation as er
+from jedi.evaluate import instance
+from jedi.evaluate import imports
+from jedi.evaluate import compiled
+from jedi.evaluate.filters import ParamName
+from jedi.evaluate.imports import ImportName
+from jedi.api.keywords import KeywordName
+
+
+def _sort_names_by_start_pos(names):
+    return sorted(names, key=lambda s: s.start_pos or (0, 0))
+
+
+def defined_names(evaluator, context):
+    """
+    List sub-definitions (e.g., methods in class).
+
+    :type scope: Scope
+    :rtype: list of Definition
+    """
+    filter = next(context.get_filters(search_global=True))
+    names = [name for name in filter.values()]
+    return [Definition(evaluator, n) for n in _sort_names_by_start_pos(names)]
+
+
+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',
+    }.items())
+
+    def __init__(self, evaluator, name):
+        self._evaluator = evaluator
+        self._name = name
+        """
+        An instance of :class:`parso.reprsentation.Name` subclass.
+        """
+        self.is_keyword = isinstance(self._name, KeywordName)
+
+        # generate a path to the definition
+        self._module = name.get_root_context()
+        if self.in_builtin_module():
+            self.module_path = None
+        else:
+            self.module_path = self._module.py__file__()
+            """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 self._name.string_name
+
+    @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 instance 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'
+
+        """
+        tree_name = self._name.tree_name
+        resolve = False
+        if tree_name is not None:
+            # TODO move this to their respective names.
+            definition = tree_name.get_definition()
+            if definition is not None and definition.type == 'import_from' and \
+                    tree_name.is_definition():
+                resolve = True
+
+        if isinstance(self._name, imports.SubModuleName) or resolve:
+            for context in self._name.infer():
+                return context.api_type
+        return self._name.api_type
+
+    def _path(self):
+        """The path to a module/class/function definition."""
+        def to_reverse():
+            name = self._name
+            if name.api_type == 'module':
+                try:
+                    name = list(name.infer())[0].name
+                except IndexError:
+                    pass
+
+            if name.api_type == 'module':
+                module_contexts = name.infer()
+                if module_contexts:
+                    module_context, = module_contexts
+                    for n in reversed(module_context.py__name__().split('.')):
+                        yield n
+                else:
+                    # We don't really know anything about the path here. This
+                    # module is just an import that would lead in an
+                    # ImportError. So simply return the name.
+                    yield name.string_name
+                    return
+            else:
+                yield name.string_name
+
+            parent_context = name.parent_context
+            while parent_context is not None:
+                try:
+                    method = parent_context.py__name__
+                except AttributeError:
+                    try:
+                        yield parent_context.name.string_name
+                    except AttributeError:
+                        pass
+                else:
+                    for name in reversed(method().split('.')):
+                        yield name
+                parent_context = parent_context.parent_context
+        return reversed(list(to_reverse()))
+
+    @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 self._module.name.string_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)."""
+        start_pos = self._name.start_pos
+        if start_pos is None:
+            return None
+        return start_pos[0]
+
+    @property
+    def column(self):
+        """The column where the definition occurs (starting with 0)."""
+        start_pos = self._name.start_pos
+        if start_pos is None:
+            return None
+        return start_pos[1]
+
+    def docstring(self, raw=False, fast=True):
+        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.
+
+        :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``.
+        """
+        return _Help(self._name).docstring(fast=fast, raw=raw)
+
+    @property
+    def description(self):
+        """A textual description of the object."""
+        return u(self._name.string_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 returns ``'os.path.join'`` instead of (for example)
+        ``'posixpath.join'``. This is not correct, since the modules name would
+        be ``<module 'posixpath' ...>```. However most users find the latter
+        more practical.
+        """
+        path = list(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):
+        if self._name.tree_name is None:
+            return self
+
+        names = self._evaluator.goto(self._name.parent_context, self._name.tree_name)
+        return [Definition(self._evaluator, n) for n in names]
+
+    def _goto_definitions(self):
+        # TODO make this function public.
+        return [Definition(self._evaluator, d.name) for d in self._name.infer()]
+
+    @property
+    @memoize_method
+    def params(self):
+        """
+        Raises an ``AttributeError``if the definition is not callable.
+        Otherwise returns a list of `Definition` that represents the params.
+        """
+        def get_param_names(context):
+            param_names = []
+            if context.api_type == 'function':
+                param_names = list(context.get_param_names())
+                if isinstance(context, instance.BoundMethod):
+                    param_names = param_names[1:]
+            elif isinstance(context, (instance.AbstractInstanceContext, er.ClassContext)):
+                if isinstance(context, er.ClassContext):
+                    search = '__init__'
+                else:
+                    search = '__call__'
+                names = context.get_function_slot_names(search)
+                if not names:
+                    return []
+
+                # Just take the first one here, not optimal, but currently
+                # there's no better solution.
+                inferred = names[0].infer()
+                param_names = get_param_names(next(iter(inferred)))
+                if isinstance(context, er.ClassContext):
+                    param_names = param_names[1:]
+                return param_names
+            elif isinstance(context, compiled.CompiledObject):
+                return list(context.get_param_names())
+            return param_names
+
+        followed = list(self._name.infer())
+        if not followed or not hasattr(followed[0], 'py__call__'):
+            raise AttributeError()
+        context = followed[0]  # only check the first one.
+
+        return [Definition(self._evaluator, n) for n in get_param_names(context)]
+
+    def parent(self):
+        context = self._name.parent_context
+        if context is None:
+            return None
+
+        if isinstance(context, er.FunctionExecutionContext):
+            # TODO the function context should be a part of the function
+            # execution context.
+            context = er.FunctionContext(
+                self._evaluator, context.parent_context, context.tree_node)
+        return Definition(self._evaluator, context.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._name.get_root_context().py__file__()
+        lines = parser_cache[self._evaluator.grammar._hashed][path].lines
+
+        index = self._name.start_pos[0] - 1
+        start_index = max(index - before, 0)
+        return ''.join(lines[start_index:index + 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._name, ParamName) and self._stack is not None:
+            node_names = list(self._stack.get_node_names(self._evaluator.grammar._pgen_grammar))
+            if 'trailer' in node_names and 'argument' not in node_names:
+                append += '='
+
+        name = self._name.string_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`.
+
+        Assuming the following function definition::
+
+            def foo(param=0):
+                pass
+
+        completing ``foo(par`` would give a ``Completion`` which `complete`
+        would be `am=`
+
+
+        """
+        return self._complete(True)
+
+    @property
+    def name_with_symbols(self):
+        """
+        Similar to :attr:`name`, but like :attr:`name` returns also the
+        symbols, for example assuming the following function definition::
+
+            def foo(param=0):
+                pass
+
+        completing ``foo(`` would give a ``Completion`` which
+        ``name_with_symbols`` would be "param=".
+
+        """
+        return self._complete(False)
+
+    def docstring(self, raw=False, fast=True):
+        if self._like_name_length >= 3:
+            # In this case we can just resolve the like name, because we
+            # wouldn't load like > 100 Python modules anymore.
+            fast = False
+        return super(Completion, self).docstring(raw=raw, fast=fast)
+
+    @property
+    def description(self):
+        """Provide a description of the completion object."""
+        # TODO improve the class structure.
+        return Definition.description.__get__(self)
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, self._name.string_name)
+
+    @memoize_method
+    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._name.infer()
+        return [Definition(self._evaluator, d.name) for d in defs]
+
+
+class Definition(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'
+
+        """
+        typ = self.type
+        tree_name = self._name.tree_name
+        if typ in ('function', 'class', 'module', 'instance') or tree_name is None:
+            if typ == 'function':
+                # For the description we want a short and a pythonic way.
+                typ = 'def'
+            return typ + ' ' + u(self._name.string_name)
+        elif typ == 'param':
+            code = search_ancestor(tree_name, 'param').get_code(
+                include_prefix=False,
+                include_comma=False
+            )
+            return typ + ' ' + code
+
+
+        definition = tree_name.get_definition() or tree_name
+        # Remove the prefix, because that's not what we want for get_code
+        # here.
+        txt = definition.get_code(include_prefix=False)
+        # Delete comments:
+        txt = re.sub('#[^\n]+\n', ' ', txt)
+        # Delete multi spaces/newlines
+        txt = re.sub('\s+', ' ', txt).strip()
+        return txt
+
+    @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_method
+    def defined_names(self):
+        """
+        List sub-definitions (e.g., methods in class).
+
+        :rtype: list of Definition
+        """
+        defs = self._name.infer()
+        return sorted(
+            common.unite(defined_names(self._evaluator, d) for d in defs),
+            key=lambda s: s._name.start_pos or (0, 0)
+        )
+
+    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.
+        """
+        if self._name.tree_name is None:
+            return True
+        else:
+            return self._name.tree_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:
+                param_name = self.params[-1]._name
+                if param_name.tree_name is not None:
+                    if param_name.tree_name.get_definition().star_count == 2:
+                        return i
+            return None
+
+        if self._index >= len(self.params):
+            for i, param in enumerate(self.params):
+                tree_name = param._name.tree_name
+                if tree_name is not None:
+                    # *args case
+                    if tree_name.get_definition().star_count == 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
+
+    def __repr__(self):
+        return '<%s: %s index %s>' % \
+            (type(self).__name__, self._name.string_name, self.index)
+
+
+class _Help(object):
+    """
+    Temporary implementation, will be used as `Script.help() or something in
+    the future.
+    """
+    def __init__(self, definition):
+        self._name = definition
+
+    @memoize_method
+    def _get_contexts(self, fast):
+        if isinstance(self._name, ImportName) and fast:
+            return {}
+
+        if self._name.api_type == 'statement':
+            return {}
+
+        return self._name.infer()
+
+    def docstring(self, fast=True, raw=True):
+        """
+        The docstring ``__doc__`` for any object.
+
+        See :attr:`doc` for example.
+        """
+        # TODO: Use all of the followed objects as output. Possibly divinding
+        # them by a few dashes.
+        for context in self._get_contexts(fast=fast):
+            return context.py__doc__(include_call_signature=not raw)
+
+        return ''
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/completion.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/completion.py
new file mode 100644
index 0000000..559a4d3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/completion.py
@@ -0,0 +1,291 @@
+from parso.python import token
+from parso.python import tree
+from parso.tree import search_ancestor, Leaf
+
+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.helpers import evaluate_call_of_leaf
+from jedi.evaluate.filters import get_global_filters
+from jedi.parser_utils import get_statement_of_position
+
+
+def get_call_signature_param_names(call_signatures):
+    # add named params
+    for call_sig in call_signatures:
+        for p in call_sig.params:
+            # Allow protected access, because it's a public API.
+            tree_name = p._name.tree_name
+            # Compiled modules typically don't allow keyword arguments.
+            if tree_name is not None:
+                # Allow access on _definition here, because it's a
+                # public API and we don't want to make the internal
+                # Name object public.
+                tree_param = tree.search_ancestor(tree_name, 'param')
+                if tree_param.star_count == 0:  # no *args/**kwargs
+                    yield p._name
+
+
+def filter_names(evaluator, completion_names, stack, like_name):
+    comp_dct = {}
+    for name in completion_names:
+        if settings.case_insensitive_completion \
+                and name.string_name.lower().startswith(like_name.lower()) \
+                or name.string_name.startswith(like_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_context, position):
+    """
+    Returns the scope in which the user resides. This includes flows.
+    """
+    user_stmt = get_statement_of_position(module_context.tree_node, 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
+
+        scanned_node = scan(module_context.tree_node)
+        if scanned_node:
+            return module_context.create_context(scanned_node, node_is_context=True)
+        return module_context
+    else:
+        return module_context.create_context(user_stmt)
+
+
+def get_flow_scope_node(module_node, position):
+    node = module_node.get_leaf_for_position(position, include_prefixes=True)
+    while not isinstance(node, (tree.Scope, tree.Flow)):
+        node = node.parent
+
+    return node
+
+
+class Completion:
+    def __init__(self, evaluator, module, code_lines, position, call_signatures_method):
+        self._evaluator = evaluator
+        self._module_context = module
+        self._module_node = module.tree_node
+        self._code_lines = code_lines
+
+        # The first step of completions is to get the name
+        self._like_name = helpers.get_on_completion_name(self._module_node, 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_node, 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._pgen_grammar, self.stack)
+
+        if 'if' in allowed_keywords:
+            leaf = self._module_node.get_leaf_for_position(self._position, include_prefixes=True)
+            previous_leaf = leaf.get_previous_leaf()
+
+            indent = self._position[1]
+            if not (leaf.start_pos <= self._position <= leaf.end_pos):
+                indent = leaf.start_pos[1]
+
+            if previous_leaf is not None:
+                stmt = previous_leaf
+                while True:
+                    stmt = search_ancestor(
+                        stmt, 'if_stmt', 'for_stmt', 'while_stmt', 'try_stmt',
+                        'error_node',
+                    )
+                    if stmt is None:
+                        break
+
+                    type_ = stmt.type
+                    if type_ == 'error_node':
+                        first = stmt.children[0]
+                        if isinstance(first, Leaf):
+                            type_ = first.value + '_stmt'
+                    # Compare indents
+                    if stmt.start_pos[1] == indent:
+                        if type_ == 'if_stmt':
+                            allowed_keywords += ['elif', 'else']
+                        elif type_ == 'try_stmt':
+                            allowed_keywords += ['except', 'finally', 'else']
+                        elif type_ == 'for_stmt':
+                            allowed_keywords.append('else')
+
+        completion_names = list(self._get_keyword_completion_names(allowed_keywords))
+
+        if token.NAME in allowed_tokens or token.INDENT in allowed_tokens:
+            # This means that we actually have to do type inference.
+
+            symbol_names = list(self.stack.get_node_names(grammar._pgen_grammar))
+
+            nodes = list(self.stack.get_nodes())
+
+            if 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 "import_stmt" in symbol_names:
+                level, names = self._parse_dotted_names(nodes, "import_from" in symbol_names)
+
+                only_modules = not ("import_from" in symbol_names and 'import' in nodes)
+                completion_names += self._get_importer_names(
+                    names,
+                    level,
+                    only_modules=only_modules,
+                )
+            elif symbol_names[-1] in ('trailer', 'dotted_name') and nodes[-1] == '.':
+                dot = self._module_node.get_leaf_for_position(self._position)
+                completion_names += self._trailer_completions(dot.get_previous_leaf())
+            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):
+        context = get_user_scope(self._module_context, self._position)
+        debug.dbg('global completion scope: %s', context)
+        flow_scope_node = get_flow_scope_node(self._module_node, self._position)
+        filters = get_global_filters(
+            self._evaluator,
+            context,
+            self._position,
+            origin_scope=flow_scope_node
+        )
+        completion_names = []
+        for filter in filters:
+            completion_names += filter.values()
+        return completion_names
+
+    def _trailer_completions(self, previous_leaf):
+        user_context = get_user_scope(self._module_context, self._position)
+        evaluation_context = self._evaluator.create_context(
+            self._module_context, previous_leaf
+        )
+        contexts = evaluate_call_of_leaf(evaluation_context, previous_leaf)
+        completion_names = []
+        debug.dbg('trailer completion contexts: %s', contexts)
+        for context in contexts:
+            for filter in context.get_filters(
+                    search_global=False, origin_scope=user_context.tree_node):
+                completion_names += filter.values()
+        return completion_names
+
+    def _parse_dotted_names(self, nodes, is_import_from):
+        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)
+            elif node == ',':
+                if not is_import_from:
+                    names = []
+            else:
+                # Here if the keyword `import` comes along it stops checking
+                # for names.
+                break
+        return level, names
+
+    def _get_importer_names(self, names, level=0, only_modules=True):
+        names = [n.value for n in names]
+        i = imports.Importer(self._evaluator, names, self._module_context, 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_node.get_leaf_for_position(self._position, include_prefixes=True)
+        cls = tree.search_ancestor(leaf, 'classdef')
+        if isinstance(cls, (tree.Class, tree.Function)):
+            # Complete the methods that are defined in the super classes.
+            random_context = self._module_context.create_context(
+                cls,
+                node_is_context=True
+            )
+        else:
+            return
+
+        if cls.start_pos[1] >= leaf.start_pos[1]:
+            return
+
+        filters = random_context.get_filters(search_global=False, is_instance=True)
+        # The first dict is the dictionary of class itself.
+        next(filters)
+        for filter in filters:
+            for name in filter.values():
+                if (name.api_type == 'function') == is_function:
+                    yield name
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/helpers.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/helpers.py
new file mode 100644
index 0000000..b467aa7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/helpers.py
@@ -0,0 +1,315 @@
+"""
+Helpers for the API
+"""
+import re
+from collections import namedtuple
+from textwrap import dedent
+
+from parso.python.parser import Parser
+from parso.python import tree
+from parso import split_lines
+
+from jedi._compatibility import u
+from jedi.evaluate.helpers import evaluate_call_of_leaf
+from jedi.cache import time_cache
+
+
+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_node, lines, position):
+    leaf = module_node.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):
+    comment_lines = split_lines(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_node, position):
+    leaf = module_node.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.
+        leaf = leaf.get_previous_leaf()
+        if leaf is None:
+            return u('')  # At the beginning of the file.
+
+    is_after_newline = leaf.type == 'newline'
+    while leaf.type == 'newline':
+        leaf = leaf.get_previous_leaf()
+        if leaf is None:
+            return u('')
+
+    if leaf.type == 'error_leaf' or leaf.type == 'string':
+        if leaf.start_pos[0] < position[0]:
+            # On a different line, we just begin anew.
+            return u('')
+
+        # Error leafs cannot be parsed, completion in strings is also
+        # impossible.
+        raise OnErrorLeaf(leaf)
+    else:
+        user_stmt = leaf
+        while True:
+            if user_stmt.parent.type in ('file_input', 'suite', 'simple_stmt'):
+                break
+            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_node, pos):
+    """
+    Returns the possible node names (e.g. import_from, xor_test or yield_stmt).
+    """
+    class EndMarkerReached(Exception):
+        pass
+
+    def tokenize_without_endmarker(code):
+        # TODO This is for now not an official parso API that exists purely
+        #   for Jedi.
+        tokens = grammar._tokenize(code)
+        for token_ in tokens:
+            if token_.string == safeword:
+                raise EndMarkerReached()
+            else:
+                yield token_
+
+    # The code might be indedented, just remove it.
+    code = dedent(_get_code_for_stack(code_lines, module_node, 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'
+    code = code + safeword
+
+    p = Parser(grammar._pgen_grammar, error_recovery=True)
+    try:
+        p.parse(tokens=tokenize_without_endmarker(code))
+    except EndMarkerReached:
+        return Stack(p.pgen_parser.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(pgen_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 = pgen_grammar.labels[label_index]
+                assert t >= 256
+                # See if it's a symbol and if we're in its first set
+                inversed_keywords
+                itsdfa = pgen_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 pgen_grammar.keywords.items())
+    inversed_tokens = dict((v, k) for k, v in pgen_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, context, 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(context, leaf)
+
+    parent = leaf.parent
+    if parent.type == 'atom':
+        return context.eval_node(leaf.parent)
+    elif parent.type == 'trailer':
+        return evaluate_call_of_leaf(context, leaf)
+    elif isinstance(leaf, tree.Literal):
+        return context.evaluator.eval_atom(context, leaf)
+    return []
+
+
+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 is None:
+                continue
+            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.start_pos >= position:
+        # Whitespace / comments after the leaf count towards the previous leaf.
+        leaf = leaf.get_previous_leaf()
+        if leaf is None:
+            return None
+
+    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()
+            if leaf is None:
+                return None
+            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, context, 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 = context.get_root_context().py__file__()
+    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,
+        context,
+        bracket_leaf.get_previous_leaf()
+    )
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/interpreter.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/interpreter.py
new file mode 100644
index 0000000..e4b5dbb
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/interpreter.py
@@ -0,0 +1,47 @@
+"""
+TODO Some parts of this module are still not well documented.
+"""
+
+from jedi.evaluate.representation import ModuleContext
+from jedi.evaluate import compiled
+from jedi.evaluate.compiled import mixed
+from jedi.evaluate.context import Context
+
+
+class NamespaceObject(object):
+    def __init__(self, dct):
+        self.__dict__ = dct
+
+
+class MixedModuleContext(Context):
+    resets_positions = True
+    type = 'mixed_module'
+
+    def __init__(self, evaluator, tree_module, namespaces, path):
+        self.evaluator = evaluator
+        self._namespaces = namespaces
+
+        self._namespace_objects = [NamespaceObject(n) for n in namespaces]
+        self._module_context = ModuleContext(evaluator, tree_module, path=path)
+        self.tree_node = tree_module
+
+    def get_node(self):
+        return self.tree_node
+
+    def get_filters(self, *args, **kwargs):
+        for filter in self._module_context.get_filters(*args, **kwargs):
+            yield filter
+
+        for namespace_obj in self._namespace_objects:
+            compiled_object = compiled.create(self.evaluator, namespace_obj)
+            mixed_object = mixed.MixedObject(
+                self.evaluator,
+                parent_context=self,
+                compiled_object=compiled_object,
+                tree_context=self._module_context
+            )
+            for filter in mixed_object.get_filters(*args, **kwargs):
+                yield filter
+
+    def __getattr__(self, name):
+        return getattr(self._module_context, name)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/keywords.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/keywords.py
new file mode 100644
index 0000000..295add6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/keywords.py
@@ -0,0 +1,144 @@
+import pydoc
+import keyword
+
+from jedi._compatibility import is_py3, is_py35
+from jedi import common
+from jedi.evaluate.filters import AbstractNameDefinition
+from parso.python.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 KeywordName(AbstractNameDefinition):
+    api_type = 'keyword'
+
+    def __init__(self, evaluator, name):
+        self.evaluator = evaluator
+        self.string_name = name
+        self.parent_context = evaluator.BUILTINS
+
+    def eval(self):
+        return set()
+
+    def infer(self):
+        return [Keyword(self.evaluator, self.string_name, (0, 0))]
+
+
+class Keyword(object):
+    api_type = 'keyword'
+
+    def __init__(self, evaluator, name, pos):
+        self.name = KeywordName(evaluator, name)
+        self.start_pos = pos
+        self.parent = evaluator.BUILTINS
+
+    @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]
+
+    def py__doc__(self, include_call_signature=False):
+        return imitate_pydoc(self.name.string_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].strip() if pydoc_topics else ''
+    except KeyError:
+        return ''
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/replstartup.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/replstartup.py
new file mode 100644
index 0000000..5bfcc8c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/usages.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/usages.py
new file mode 100644
index 0000000..47b100e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/api/usages.py
@@ -0,0 +1,75 @@
+from jedi.api import classes
+from parso.python import tree
+from jedi.evaluate import imports
+from jedi.evaluate.filters import TreeNameDefinition
+from jedi.evaluate.representation import ModuleContext
+
+
+def compare_contexts(c1, c2):
+    return c1 == c2 or (c1[1] == c2[1] and c1[0].tree_node == c2[0].tree_node)
+
+
+def usages(evaluator, definition_names, mods):
+    """
+    :param definitions: list of Name
+    """
+    def resolve_names(definition_names):
+        for name in definition_names:
+            if name.api_type == 'module':
+                found = False
+                for context in name.infer():
+                    if isinstance(context, ModuleContext):
+                        found = True
+                        yield context.name
+                if not found:
+                    yield name
+            else:
+                yield name
+
+    def compare_array(definition_names):
+        """ `definitions` are being compared by module/start_pos, because
+        sometimes the id's of the objects change (e.g. executions).
+        """
+        return [
+            (name.get_root_context(), name.start_pos)
+            for name in resolve_names(definition_names)
+        ]
+
+    search_name = list(definition_names)[0].string_name
+    compare_definitions = compare_array(definition_names)
+    mods = mods | set([d.get_root_context() for d in definition_names])
+    definition_names = set(resolve_names(definition_names))
+    for m in imports.get_modules_containing_name(evaluator, mods, search_name):
+        if isinstance(m, ModuleContext):
+            for name_node in m.tree_node.get_used_names().get(search_name, []):
+                context = evaluator.create_context(m, name_node)
+                result = evaluator.goto(context, name_node)
+                if any(compare_contexts(c1, c2)
+                       for c1 in compare_array(result)
+                       for c2 in compare_definitions):
+                    name = TreeNameDefinition(context, name_node)
+                    definition_names.add(name)
+                    # Previous definitions might be imports, so include them
+                    # (because goto might return that import name).
+                    compare_definitions += compare_array([name])
+        else:
+            # compiled objects
+            definition_names.add(m.name)
+
+    return [classes.Definition(evaluator, n) for n in definition_names]
+
+
+def resolve_potential_imports(evaluator, definitions):
+    """ Adds the modules of the imports """
+    new = set()
+    for d in definitions:
+        if isinstance(d, TreeNameDefinition):
+            imp_or_stmt = d.tree_name.get_definition()
+            if isinstance(imp_or_stmt, tree.Import):
+                new |= resolve_potential_imports(
+                    evaluator,
+                    set(imports.infer_import(
+                        d.parent_context, d.tree_name, is_goto=True
+                    ))
+                )
+    return set(definitions) | new
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/cache.py
new file mode 100644
index 0000000..f875a63
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/cache.py
@@ -0,0 +1,124 @@
+"""
+This caching is very important for speed and memory optimizations. There's
+nothing really spectacular, just some decorators. The following cache types are
+available:
+
+- ``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
+import inspect
+
+from jedi import settings
+from parso.cache import parser_cache
+
+_time_caches = {}
+
+
+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
+
+
+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):
+        cache_dict = self.__dict__.setdefault('_memoize_method_dct', {})
+        dct = cache_dict.setdefault(method, {})
+        key = (args, frozenset(kwargs.items()))
+        try:
+            return dct[key]
+        except KeyError:
+            result = method(self, *args, **kwargs)
+            dct[key] = result
+            return result
+    return wrapper
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/common.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/common.py
new file mode 100644
index 0000000..007a185
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/common.py
@@ -0,0 +1,111 @@
+""" A universal module with functions / classes without dependencies. """
+import sys
+import contextlib
+import functools
+
+from jedi._compatibility import 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
+
+
+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 unite(iterable):
+    """Turns a two dimensional array into a one dimensional."""
+    return set(typ for types in iterable for typ in types)
+
+
+def to_list(func):
+    def wrapper(*args, **kwargs):
+        return list(func(*args, **kwargs))
+    return wrapper
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/debug.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/debug.py
new file mode 100644
index 0000000..8caf1ac
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/debug.py
@@ -0,0 +1,128 @@
+from jedi._compatibility import encoding, is_py3, u
+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
+_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:
+        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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/__init__.py
new file mode 100644
index 0000000..fc07444
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/__init__.py
@@ -0,0 +1,629 @@
+"""
+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 parso.python import tree
+import parso
+
+from jedi import debug
+from jedi.common import unite
+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 evaluator_function_cache
+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
+from jedi.evaluate import pep0484
+from jedi.evaluate.filters import TreeNameDefinition, ParamName
+from jedi.evaluate.instance import AnonymousInstance, BoundMethod
+from jedi.evaluate.context import ContextualizedName, ContextualizedNode
+from jedi import parser_utils
+
+
+def _limit_context_infers(func):
+    """
+    This is for now the way how we limit type inference going wild. There are
+    other ways to ensure recursion limits as well. This is mostly necessary
+    because of instance (self) access that can be quite tricky to limit.
+
+    I'm still not sure this is the way to go, but it looks okay for now and we
+    can still go anther way in the future. Tests are there. ~ dave
+    """
+    def wrapper(evaluator, context, *args, **kwargs):
+        n = context.tree_node
+        try:
+            evaluator.inferred_element_counts[n] += 1
+            if evaluator.inferred_element_counts[n] > 300:
+                debug.warning('In context %s there were too many inferences.', n)
+                return set()
+        except KeyError:
+            evaluator.inferred_element_counts[n] = 1
+        return func(evaluator, context, *args, **kwargs)
+
+    return wrapper
+
+
+class Evaluator(object):
+    def __init__(self, grammar, sys_path=None):
+        self.grammar = grammar
+        self.latest_grammar = parso.load_grammar(version='3.6')
+        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.inferred_element_counts = {}
+        self.mixed_cache = {}  # see `evaluate.compiled.mixed._create()`
+        self.analysis = []
+        self.dynamic_params_depth = 0
+        self.is_analysis = False
+        self.python_version = sys.version_info[:2]
+
+        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.execution_recursion_detector = recursion.ExecutionRecursionDetector(self)
+
+    def find_types(self, context, name_or_str, name_context, position=None,
+                   search_global=False, is_goto=False, analysis_errors=True):
+        """
+        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, context, name_context, name_or_str,
+                              position, analysis_errors=analysis_errors)
+        filters = f.get_filters(search_global)
+        if is_goto:
+            return f.filter_name(filters)
+        return f.find(filters, attribute_lookup=not search_global)
+
+    @_limit_context_infers
+    def eval_statement(self, context, stmt, seek_name=None):
+        with recursion.execution_allowed(self, stmt) as allowed:
+            if allowed or context.get_root_context() == self.BUILTINS:
+                return self._eval_stmt(context, stmt, seek_name)
+        return set()
+
+    #@evaluator_function_cache(default=[])
+    @debug.increase_indent
+    def _eval_stmt(self, context, 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(context, rhs)
+
+        if seek_name:
+            c_node = ContextualizedName(context, seek_name)
+            types = finder.check_tuple_assignments(self, c_node, types)
+
+        first_operator = next(stmt.yield_operators(), None)
+        if first_operator not in ('=', None) and first_operator.type == 'operator':
+            # `=` is always the last character in aug assignments -> -1
+            operator = copy.copy(first_operator)
+            operator.value = operator.value[:-1]
+            name = stmt.get_defined_names()[0].value
+            left = context.py__getattribute__(
+                name, position=stmt.start_pos, search_global=True)
+
+            for_stmt = tree.search_ancestor(stmt, 'for_stmt')
+            if for_stmt is not None and for_stmt.type == 'for_stmt' and types \
+                    and parser_utils.for_stmt_defines_one_name(for_stmt):
+                # 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_testlist()
+                cn = ContextualizedNode(context, node)
+                ordered = list(iterable.py__iter__(self, cn.infer(), cn))
+
+                for lazy_context in ordered:
+                    dct = {for_stmt.children[1].value: lazy_context.infer()}
+                    with helpers.predefine_names(context, for_stmt, dct):
+                        t = self.eval_element(context, rhs)
+                        left = precedence.calculate(self, context, left, operator, t)
+                types = left
+            else:
+                types = precedence.calculate(self, context, left, operator, types)
+        debug.dbg('eval_statement result %s', types)
+        return types
+
+    def eval_element(self, context, element):
+        if isinstance(context, iterable.CompForContext):
+            return self._eval_element_not_cached(context, element)
+
+        if_stmt = element
+        while if_stmt is not None:
+            if_stmt = if_stmt.parent
+            if if_stmt.type in ('if_stmt', 'for_stmt'):
+                break
+            if parser_utils.is_scope(if_stmt):
+                if_stmt = None
+                break
+        predefined_if_name_dict = context.predefined_names.get(if_stmt)
+        if predefined_if_name_dict is None and if_stmt and if_stmt.type == 'if_stmt':
+            if_stmt_test = if_stmt.children[1]
+            name_dicts = [{}]
+            # If we already did a check, we don't want to do it again -> If
+            # context.predefined_names 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 = [e.value for e in element_names]
+                if any(i.value in str_element_names for i in if_names):
+                    for if_name in if_names:
+                        definitions = self.goto_definitions(context, 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][if_name.value] = set([definition])
+
+                                name_dicts += new_name_dicts
+                        else:
+                            for name_dict in name_dicts:
+                                name_dict[if_name.value] = definitions
+            if len(name_dicts) > 1:
+                result = set()
+                for name_dict in name_dicts:
+                    with helpers.predefine_names(context, if_stmt, name_dict):
+                        result |= self._eval_element_not_cached(context, element)
+                return result
+            else:
+                return self._eval_element_if_evaluated(context, element)
+        else:
+            if predefined_if_name_dict:
+                return self._eval_element_not_cached(context, element)
+            else:
+                return self._eval_element_if_evaluated(context, element)
+
+    def _eval_element_if_evaluated(self, context, element):
+        """
+        TODO This function is temporary: Merge with eval_element.
+        """
+        parent = element
+        while parent is not None:
+            parent = parent.parent
+            predefined_if_name_dict = context.predefined_names.get(parent)
+            if predefined_if_name_dict is not None:
+                return self._eval_element_not_cached(context, element)
+        return self._eval_element_cached(context, element)
+
+    @evaluator_function_cache(default=set())
+    def _eval_element_cached(self, context, element):
+        return self._eval_element_not_cached(context, element)
+
+    @debug.increase_indent
+    @_limit_context_infers
+    def _eval_element_not_cached(self, context, element):
+        debug.dbg('eval_element %s@%s', element, element.start_pos)
+        types = set()
+        typ = element.type
+        if typ in ('name', 'number', 'string', 'atom'):
+            types = self.eval_atom(context, element)
+        elif typ == '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 typ == 'lambdef':
+            types = set([er.FunctionContext(self, context, element)])
+        elif typ == 'expr_stmt':
+            types = self.eval_statement(context, element)
+        elif typ in ('power', 'atom_expr'):
+            first_child = element.children[0]
+            if not (first_child.type == 'keyword' and first_child.value == 'await'):
+                types = self.eval_atom(context, first_child)
+                for trailer in element.children[1:]:
+                    if trailer == '**':  # has a power operation.
+                        right = self.eval_element(context, element.children[2])
+                        types = set(precedence.calculate(self, context, types, trailer, right))
+                        break
+                    types = self.eval_trailer(context, types, trailer)
+        elif typ in ('testlist_star_expr', 'testlist',):
+            # The implicit tuple in statements.
+            types = set([iterable.SequenceLiteralContext(self, context, element)])
+        elif typ in ('not_test', 'factor'):
+            types = self.eval_element(context, element.children[-1])
+            for operator in element.children[:-1]:
+                types = set(precedence.factor_calculate(self, types, operator))
+        elif typ == 'test':
+            # `x if foo else y` case.
+            types = (self.eval_element(context, element.children[0]) |
+                     self.eval_element(context, element.children[-1]))
+        elif typ == 'operator':
+            # Must be an ellipsis, other operators are not evaluated.
+            # In Python 2 ellipsis is coded as three single dot tokens, not
+            # as one token 3 dot token.
+            assert element.value in ('.', '...')
+            types = set([compiled.create(self, Ellipsis)])
+        elif typ == 'dotted_name':
+            types = self.eval_atom(context, element.children[0])
+            for next_name in element.children[2::2]:
+                # TODO add search_global=True?
+                types = unite(
+                    typ.py__getattribute__(next_name, name_context=context)
+                    for typ in types
+                )
+            types = types
+        elif typ == 'eval_input':
+            types = self._eval_element_not_cached(context, element.children[0])
+        elif typ == 'annassign':
+            types = pep0484._evaluate_for_annotation(context, element.children[1])
+        else:
+            types = precedence.calculate_children(self, context, element.children)
+        debug.dbg('eval_element result %s', types)
+        return types
+
+    def eval_atom(self, context, 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 atom.type == 'name':
+            # This is the first global lookup.
+            stmt = tree.search_ancestor(
+                atom, 'expr_stmt', 'lambdef'
+            ) or atom
+            if stmt.type == 'lambdef':
+                stmt = atom
+            return context.py__getattribute__(
+                name_or_str=atom,
+                position=stmt.start_pos,
+                search_global=True
+            )
+        elif isinstance(atom, tree.Literal):
+            string = parser_utils.safe_literal_eval(atom.value)
+            return set([compiled.create(self, string)])
+        else:
+            c = atom.children
+            if c[0].type == 'string':
+                # Will be one string.
+                types = self.eval_atom(context, c[0])
+                for string in c[1:]:
+                    right = self.eval_atom(context, string)
+                    types = precedence.calculate(self, context, types, '+', right)
+                return types
+            # Parentheses without commas are not tuples.
+            elif c[0] == '(' and not len(c) == 2 \
+                    and not(c[1].type == 'testlist_comp' and
+                            len(c[1].children) > 1):
+                return self.eval_element(context, 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, context, atom)])
+
+            # It's a dict/list/tuple literal.
+            array_node = c[1]
+            try:
+                array_node_c = array_node.children
+            except AttributeError:
+                array_node_c = []
+            if c[0] == '{' and (array_node == '}' or ':' in array_node_c):
+                context = iterable.DictLiteralContext(self, context, atom)
+            else:
+                context = iterable.SequenceLiteralContext(self, context, atom)
+            return set([context])
+
+    def eval_trailer(self, context, 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, context, types, trailer)
+        else:
+            for typ in types:
+                debug.dbg('eval_trailer: %s in scope %s', trailer, typ)
+                if trailer_op == '.':
+                    new_types |= typ.py__getattribute__(
+                        name_context=context,
+                        name_or_str=node
+                    )
+                elif trailer_op == '(':
+                    arguments = param.TreeArguments(self, context, node, trailer)
+                    new_types |= self.execute(typ, arguments)
+        return new_types
+
+    @debug.increase_indent
+    def execute(self, obj, arguments):
+        if self.is_analysis:
+            arguments.eval_all()
+
+        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, context, name):
+        def_ = name.get_definition(import_name_always=True)
+        if def_ is not None:
+            type_ = def_.type
+            if type_ == 'classdef':
+                return [er.ClassContext(self, name.parent, context)]
+            elif type_ == 'funcdef':
+                return [er.FunctionContext(self, context, name.parent)]
+
+            if type_ == 'expr_stmt':
+                is_simple_name = name.parent.type not in ('power', 'trailer')
+                if is_simple_name:
+                    return self.eval_statement(context, def_, name)
+            if type_ == 'for_stmt':
+                container_types = self.eval_element(context, def_.children[3])
+                cn = ContextualizedNode(context, def_.children[3])
+                for_types = iterable.py__iter__types(self, container_types, cn)
+                c_node = ContextualizedName(context, name)
+                return finder.check_tuple_assignments(self, c_node, for_types)
+            if type_ in ('import_from', 'import_name'):
+                return imports.infer_import(context, name)
+
+        return helpers.evaluate_call_of_leaf(context, name)
+
+    def goto(self, context, name):
+        definition = name.get_definition(import_name_always=True)
+        if definition is not None:
+            type_ = definition.type
+            if type_ == 'expr_stmt':
+                # Only take the parent, because if it's more complicated than just
+                # a name it's something you can "goto" again.
+                is_simple_name = name.parent.type not in ('power', 'trailer')
+                if is_simple_name:
+                    return [TreeNameDefinition(context, name)]
+            elif type_ == 'param':
+                return [ParamName(context, name)]
+            elif type_ in ('funcdef', 'classdef'):
+                return [TreeNameDefinition(context, name)]
+            elif type_ in ('import_from', 'import_name'):
+                module_names = imports.infer_import(context, name, is_goto=True)
+                return module_names
+
+        par = name.parent
+        typ = par.type
+        if typ == '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(context, trailer.children[1])
+                else:
+                    i = trailer.parent.children.index(trailer)
+                    to_evaluate = trailer.parent.children[:i]
+                    types = self.eval_element(context, to_evaluate[0])
+                    for trailer in to_evaluate[1:]:
+                        types = self.eval_trailer(context, types, trailer)
+                param_names = []
+                for typ in types:
+                    try:
+                        get_param_names = typ.get_param_names
+                    except AttributeError:
+                        pass
+                    else:
+                        for param_name in get_param_names():
+                            if param_name.string_name == name.value:
+                                param_names.append(param_name)
+                return param_names
+        elif typ == '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:] = []
+                values = self.eval_element(context, new_dotted)
+                return unite(
+                    value.py__getattribute__(name, name_context=context, is_goto=True)
+                    for value in values
+                )
+
+        if typ == 'trailer' and par.children[0] == '.':
+            values = helpers.evaluate_call_of_leaf(context, name, cut_own_trailer=True)
+            return unite(
+                value.py__getattribute__(name, name_context=context, is_goto=True)
+                for value in values
+            )
+        else:
+            stmt = tree.search_ancestor(
+                name, 'expr_stmt', 'lambdef'
+            ) or name
+            if stmt.type == 'lambdef':
+                stmt = name
+            return context.py__getattribute__(
+                name,
+                position=stmt.start_pos,
+                search_global=True, is_goto=True
+            )
+
+    def create_context(self, base_context, node, node_is_context=False, node_is_object=False):
+        def parent_scope(node):
+            while True:
+                node = node.parent
+
+                if parser_utils.is_scope(node):
+                    return node
+                elif node.type in ('argument', 'testlist_comp'):
+                    if node.children[1].type == 'comp_for':
+                        return node.children[1]
+                elif node.type == 'dictorsetmaker':
+                    for n in node.children[1:4]:
+                        # In dictionaries it can be pretty much anything.
+                        if n.type == 'comp_for':
+                            return n
+
+        def from_scope_node(scope_node, child_is_funcdef=None, is_nested=True, node_is_object=False):
+            if scope_node == base_node:
+                return base_context
+
+            is_funcdef = scope_node.type in ('funcdef', 'lambdef')
+            parent_scope = parser_utils.get_parent_scope(scope_node)
+            parent_context = from_scope_node(parent_scope, child_is_funcdef=is_funcdef)
+
+            if is_funcdef:
+                if isinstance(parent_context, AnonymousInstance):
+                    func = BoundMethod(
+                        self, parent_context, parent_context.class_context,
+                        parent_context.parent_context, scope_node
+                    )
+                else:
+                    func = er.FunctionContext(
+                        self,
+                        parent_context,
+                        scope_node
+                    )
+                if is_nested and not node_is_object:
+                    return func.get_function_execution()
+                return func
+            elif scope_node.type == 'classdef':
+                class_context = er.ClassContext(self, scope_node, parent_context)
+                if child_is_funcdef:
+                    # anonymous instance
+                    return AnonymousInstance(self, parent_context, class_context)
+                else:
+                    return class_context
+            elif scope_node.type == 'comp_for':
+                if node.start_pos >= scope_node.children[-1].start_pos:
+                    return parent_context
+                return iterable.CompForContext.from_comp_for(parent_context, scope_node)
+            raise Exception("There's a scope that was not managed.")
+
+        base_node = base_context.tree_node
+
+        if node_is_context and parser_utils.is_scope(node):
+            scope_node = node
+        else:
+            if node.parent.type in ('funcdef', 'classdef') and node.parent.name == node:
+                # When we're on class/function names/leafs that define the
+                # object itself and not its contents.
+                node = node.parent
+            scope_node = parent_scope(node)
+        return from_scope_node(scope_node, is_nested=True, node_is_object=node_is_object)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/analysis.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/analysis.py
new file mode 100644
index 0000000..cdd0023
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/analysis.py
@@ -0,0 +1,214 @@
+"""
+Module for statical analysis.
+"""
+from jedi import debug
+from parso.python import tree
+from jedi.evaluate.compiled import CompiledObject
+
+
+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(node_context, error_name, node, message=None, typ=Error, payload=None):
+    exception = CODES[error_name][1]
+    if _check_for_exception_catch(node_context, node, exception, payload):
+        return
+
+    # TODO this path is probably not right
+    module_context = node_context.get_root_context()
+    module_path = module_context.py__file__()
+    instance = typ(error_name, module_path, node.start_pos, message)
+    debug.warning(str(instance), format=False)
+    node_context.evaluator.analysis.append(instance)
+
+
+def _check_for_setattr(instance):
+    """
+    Check if there's any setattr method inside an instance. If so, return True.
+    """
+    from jedi.evaluate.representation import ModuleContext
+    module = instance.get_root_context()
+    if not isinstance(module, ModuleContext):
+        return False
+
+    node = module.tree_node
+    try:
+        stmts = node.get_used_names()['setattr']
+    except KeyError:
+        return False
+
+    return any(node.start_pos < stmt.start_pos < node.end_pos
+               for stmt in stmts)
+
+
+def add_attribute_error(name_context, lookup_context, name):
+    message = ('AttributeError: %s has no attribute %s.' % (lookup_context, name))
+    from jedi.evaluate.instance import AbstractInstanceContext, CompiledInstanceName
+    # Check for __getattr__/__getattribute__ existance and issue a warning
+    # instead of an error, if that happens.
+    typ = Error
+    if isinstance(lookup_context, AbstractInstanceContext):
+        slot_names = lookup_context.get_function_slot_names('__getattr__') + \
+            lookup_context.get_function_slot_names('__getattribute__')
+        for n in slot_names:
+            if isinstance(name, CompiledInstanceName) and \
+                    n.parent_context.obj == object:
+                typ = Warning
+                break
+
+        if _check_for_setattr(lookup_context):
+            typ = Warning
+
+    payload = lookup_context, name
+    add(name_context, 'attribute-error', name, message, typ, payload)
+
+
+def _check_for_exception_catch(node_context, jedi_name, 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_name.start_pos <= suite.end_pos):
+                return False
+
+        for node in obj.get_except_clause_tests():
+            if node is None:
+                return True  # An exception block that catches everything.
+            else:
+                except_classes = node_context.eval_node(node)
+                for cls in except_classes:
+                    from jedi.evaluate import iterable
+                    if isinstance(cls, iterable.AbstractSequence) and \
+                            cls.array_type == 'tuple':
+                        # multiple exceptions
+                        for lazy_context in cls.py__iter__():
+                            for typ in lazy_context.infer():
+                                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_name.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 TreeArguments
+            args = list(TreeArguments(node_context.evaluator, node_context, arglist).unpack())
+            # Arguments should be very simple
+            assert len(args) == 2
+
+            # Check name
+            key, lazy_context = args[1]
+            names = list(lazy_context.infer())
+            assert len(names) == 1 and isinstance(names[0], CompiledObject)
+            assert names[0].obj == payload[1].value
+
+            # Check objects
+            key, lazy_context = args[0]
+            objects = lazy_context.infer()
+            return payload[0] in objects
+        except AssertionError:
+            return False
+
+    obj = jedi_name
+    while obj is not None and not isinstance(obj, (tree.Function, tree.Class)):
+        if isinstance(obj, tree.Flow):
+            # try/except catch check
+            if obj.type == 'try_stmt' and check_try_for_except(obj, exception):
+                return True
+            # hasattr check
+            if exception == AttributeError and obj.type in ('if_stmt', 'while_stmt'):
+                if check_hasattr(obj.children[1], obj.children[3]):
+                    return True
+        obj = obj.parent
+
+    return False
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/cache.py
new file mode 100644
index 0000000..37bd0e8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/cache.py
@@ -0,0 +1,81 @@
+"""
+- 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):
+            # TODO These checks are kind of ugly and slow.
+            if evaluator_is_first_arg:
+                cache = obj.memoize_cache
+            elif second_arg_is_evaluator:
+                cache = args[0].memoize_cache  # needed for meta classes
+            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
+
+
+def evaluator_function_cache(default=_NO_DEFAULT):
+    def decorator(func):
+        return _memoize_default(default=default, evaluator_is_first_arg=True)(func)
+
+    return decorator
+
+
+def evaluator_method_cache(default=_NO_DEFAULT):
+    def decorator(func):
+        return _memoize_default(default=default)(func)
+
+    return decorator
+
+
+def _memoize_meta_class():
+    def decorator(call):
+        return _memoize_default(second_arg_is_evaluator=True)(call)
+
+    return decorator
+
+
+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_meta_class()
+    def __call__(self, *args, **kwargs):
+        return super(CachedMetaClass, self).__call__(*args, **kwargs)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/__init__.py
new file mode 100644
index 0000000..cd59b6b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/__init__.py
@@ -0,0 +1,637 @@
+"""
+Imitate the parser representation.
+"""
+import inspect
+import re
+import sys
+import os
+import types
+from functools import partial
+
+from jedi._compatibility import builtins as _builtins, unicode, py_version
+from jedi import debug
+from jedi.cache import underscore_memoization, memoize_method
+from jedi.evaluate.filters import AbstractFilter, AbstractNameDefinition, \
+    ContextNameMixin
+from jedi.evaluate.context import Context, LazyKnownContext
+from jedi.evaluate.compiled.getattr_static import getattr_static
+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
+
+# Those types don't exist in typing.
+MethodDescriptorType = type(str.replace)
+WrapperDescriptorType = type(set.__iter__)
+# `object.__subclasshook__` is an already executed descriptor.
+object_class_dict = type.__dict__["__dict__"].__get__(object)
+ClassMethodDescriptorType = type(object_class_dict['__subclasshook__'])
+
+ALLOWED_DESCRIPTOR_ACCESS = (
+    types.FunctionType,
+    types.GetSetDescriptorType,
+    types.MemberDescriptorType,
+    MethodDescriptorType,
+    WrapperDescriptorType,
+    ClassMethodDescriptorType,
+    staticmethod,
+    classmethod,
+)
+
+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.
+        if self.check_name == '__iter__':
+            # Python iterators are a bit strange, because there's no need for
+            # the __iter__ function as long as __getitem__ is defined (it will
+            # just start with __getitem__(0). This is especially true for
+            # Python 2 strings, where `str.__iter__` is not even defined.
+            try:
+                iter(instance.obj)
+            except TypeError:
+                raise AttributeError
+        else:
+            getattr(instance.obj, self.check_name)
+        return partial(self.func, instance)
+
+
+class CompiledObject(Context):
+    path = None  # modules have this attribute - set it to None.
+    used_names = lambda self: {}  # To be consistent with modules.
+
+    def __init__(self, evaluator, obj, parent_context=None, faked_class=None):
+        super(CompiledObject, self).__init__(evaluator, parent_context)
+        self.obj = obj
+        # This attribute will not be set for most classes, except for fakes.
+        self.tree_node = faked_class
+
+    def get_root_node(self):
+        # To make things a bit easier with filters we add this method here.
+        return self.get_root_context()
+
+    @CheckAttribute
+    def py__call__(self, params):
+        if inspect.isclass(self.obj):
+            from jedi.evaluate.instance import CompiledInstance
+            return set([CompiledInstance(self.evaluator, self.parent_context, 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 (self,) + tuple(create(self.evaluator, cls) for cls in self.obj.__mro__[1:])
+
+    @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):
+        try:
+            return self.obj.__file__
+        except AttributeError:
+            return None
+
+    def is_class(self):
+        return inspect.isclass(self.obj)
+
+    def py__doc__(self, include_call_signature=False):
+        return inspect.getdoc(self.obj) or ''
+
+    def get_param_names(self):
+        obj = self.obj
+        try:
+            if py_version < 33:
+                raise ValueError("inspect.signature was introduced in 3.3")
+            if py_version == 34:
+                # In 3.4 inspect.signature are wrong for str and int. This has
+                # been fixed in 3.5. The signature of object is returned,
+                # because no signature was found for str. Here we imitate 3.5
+                # logic and just ignore the signature if the magic methods
+                # don't match object.
+                # 3.3 doesn't even have the logic and returns nothing for str
+                # and classes that inherit from object.
+                user_def = inspect._signature_get_user_defined_method
+                if (inspect.isclass(obj)
+                        and not user_def(type(obj), '__init__')
+                        and not user_def(type(obj), '__new__')
+                        and (obj.__init__ != object.__init__
+                             or obj.__new__ != object.__new__)):
+                    raise ValueError
+
+            signature = inspect.signature(obj)
+        except ValueError:  # Has no signature
+            params_str, ret = self._parse_function_doc()
+            tokens = params_str.split(',')
+            if inspect.ismethoddescriptor(obj):
+                tokens.insert(0, 'self')
+            for p in tokens:
+                parts = p.strip().split('=')
+                yield UnresolvableParamName(self, parts[0])
+        else:
+            for signature_param in signature.parameters.values():
+                yield SignatureParamName(self, signature_param)
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, repr(self.obj))
+
+    @underscore_memoization
+    def _parse_function_doc(self):
+        doc = self.py__doc__()
+        if doc is None:
+            return '', ''
+
+        return _parse_function_doc(doc)
+
+    @property
+    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
+
+    def get_filters(self, search_global=False, is_instance=False,
+                    until_position=None, origin_scope=None):
+        yield self._ensure_one_filter(is_instance)
+
+    @memoize_method
+    def _ensure_one_filter(self, is_instance):
+        """
+        search_global shouldn't change the fact that there's one dict, this way
+        there's only one `object`.
+        """
+        return CompiledObjectFilter(self.evaluator, self, is_instance)
+
+    @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 i, part in enumerate(self.obj):
+            if i > 20:
+                # Should not go crazy with large iterators
+                break
+            yield LazyKnownContext(create(self.evaluator, part))
+
+    def py__name__(self):
+        try:
+            return self._get_class().__name__
+        except AttributeError:
+            return None
+
+    @property
+    def name(self):
+        try:
+            name = self._get_class().__name__
+        except AttributeError:
+            name = repr(self.obj)
+        return CompiledContextName(self, name)
+
+    def _execute_function(self, params):
+        from jedi.evaluate import docstrings
+        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
+        for type_ in docstrings.infer_return_types(self):
+            yield type_
+
+    def get_self_attributes(self):
+        return []  # Instance compatibility
+
+    def get_imports(self):
+        return []  # Builtins don't have imports
+
+    def dict_values(self):
+        return set(create(self.evaluator, v) for v in self.obj.values())
+
+
+class CompiledName(AbstractNameDefinition):
+    def __init__(self, evaluator, parent_context, name):
+        self._evaluator = evaluator
+        self.parent_context = parent_context
+        self.string_name = name
+
+    def __repr__(self):
+        try:
+            name = self.parent_context.name  # __name__ is not defined all the time
+        except AttributeError:
+            name = None
+        return '<%s: (%s).%s>' % (self.__class__.__name__, name, self.string_name)
+
+    @property
+    def api_type(self):
+        return next(iter(self.infer())).api_type
+
+    @underscore_memoization
+    def infer(self):
+        module = self.parent_context.get_root_context()
+        return [_create_from_name(self._evaluator, module, self.parent_context, self.string_name)]
+
+
+class SignatureParamName(AbstractNameDefinition):
+    api_type = 'param'
+
+    def __init__(self, compiled_obj, signature_param):
+        self.parent_context = compiled_obj.parent_context
+        self._signature_param = signature_param
+
+    @property
+    def string_name(self):
+        return self._signature_param.name
+
+    def infer(self):
+        p = self._signature_param
+        evaluator = self.parent_context.evaluator
+        types = set()
+        if p.default is not p.empty:
+            types.add(create(evaluator, p.default))
+        if p.annotation is not p.empty:
+            annotation = create(evaluator, p.annotation)
+            types |= annotation.execute_evaluated()
+        return types
+
+
+class UnresolvableParamName(AbstractNameDefinition):
+    api_type = 'param'
+
+    def __init__(self, compiled_obj, name):
+        self.parent_context = compiled_obj.parent_context
+        self.string_name = name
+
+    def infer(self):
+        return set()
+
+
+class CompiledContextName(ContextNameMixin, AbstractNameDefinition):
+    def __init__(self, context, name):
+        self.string_name = name
+        self._context = context
+        self.parent_context = context.parent_context
+
+
+class EmptyCompiledName(AbstractNameDefinition):
+    """
+    Accessing some names will raise an exception. To avoid not having any
+    completions, just give Jedi the option to return this object. It infers to
+    nothing.
+    """
+    def __init__(self, evaluator, name):
+        self.parent_context = evaluator.BUILTINS
+        self.string_name = name
+
+    def infer(self):
+        return []
+
+
+class CompiledObjectFilter(AbstractFilter):
+    name_class = CompiledName
+
+    def __init__(self, evaluator, compiled_object, is_instance=False):
+        self._evaluator = evaluator
+        self._compiled_object = compiled_object
+        self._is_instance = is_instance
+
+    @memoize_method
+    def get(self, name):
+        name = str(name)
+        obj = self._compiled_object.obj
+        try:
+            attr, is_get_descriptor = getattr_static(obj, name)
+        except AttributeError:
+            return []
+        else:
+            if is_get_descriptor \
+                    and not type(attr) in ALLOWED_DESCRIPTOR_ACCESS:
+                # In case of descriptors that have get methods we cannot return
+                # it's value, because that would mean code execution.
+                return [EmptyCompiledName(self._evaluator, name)]
+            if self._is_instance and name not in dir(obj):
+                return []
+        return [self._create_name(name)]
+
+    def values(self):
+        obj = self._compiled_object.obj
+
+        names = []
+        for name in dir(obj):
+            names += self.get(name)
+
+        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 is not type) and not is_instance:
+            for filter in create(self._evaluator, type).get_filters():
+                names += filter.values()
+        return names
+
+    def _create_name(self, name):
+        return self.name_class(self._evaluator, self._compiled_object, name)
+
+
+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 in path %s.', dotted_path, 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, compiled_object, name):
+    obj = compiled_object.obj
+    faked = None
+    try:
+        faked = fake.get_faked(evaluator, module, obj, parent_context=compiled_object, name=name)
+        if faked.type == 'funcdef':
+            from jedi.evaluate.representation import FunctionContext
+            return FunctionContext(evaluator, compiled_object, faked)
+    except fake.FakeDoesNotExist:
+        pass
+
+    try:
+        obj = getattr(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_context=compiled_object, faked=faked)
+
+
+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_context=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_context=None, module=None, faked=None):
+            cache = getattr(evaluator, attribute_name)
+            # Do a very cheap form of caching here.
+            key = id(obj), id(parent_context)
+            try:
+                return cache[key][0]
+            except KeyError:
+                # TODO this whole decorator is way too ugly
+                result = func(evaluator, obj, parent_context, module, faked)
+                # Need to cache all of them, otherwise the id could be overwritten.
+                cache[key] = result, obj, parent_context, module, faked
+                return result
+        return wrapper
+
+    return decorator
+
+
+@compiled_objects_cache('compiled_cache')
+def create(evaluator, obj, parent_context=None, module=None, faked=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_context is not None:
+            # Modules don't have parents, be careful with caching: recurse.
+            return create(evaluator, obj)
+    else:
+        if parent_context is None and obj is not _builtins:
+            return create(evaluator, obj, create(evaluator, _builtins))
+
+        try:
+            faked = fake.get_faked(evaluator, module, obj, parent_context=parent_context)
+            if faked.type == 'funcdef':
+                from jedi.evaluate.representation import FunctionContext
+                return FunctionContext(evaluator, parent_context, faked)
+        except fake.FakeDoesNotExist:
+            pass
+
+    return CompiledObject(evaluator, obj, parent_context, faked)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake.py
new file mode 100644
index 0000000..60dbefe
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake.py
@@ -0,0 +1,213 @@
+"""
+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 itertools import chain
+
+from parso.python import tree
+
+from jedi._compatibility import is_py3, builtins, unicode, is_py34
+
+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(grammar, 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
+        modules[module_name] = m = grammar.parse(unicode(source))
+
+        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(m, 'open')
+            open_func.children[1].value = 'open_python3'
+            open_func = _search_scope(m, 'open_python2')
+            open_func.children[1].value = 'open'
+        return m
+
+
+def _search_scope(scope, obj_name):
+    for s in chain(scope.iter_classdefs(), scope.iter_funcdefs()):
+        if s.name.value == 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(grammar, 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(grammar, module)
+    if faked_mod is None:
+        return None, None
+
+    # Having the module as a `parser.python.tree.Module`, we need to scan
+    # for methods.
+    if name is None:
+        if inspect.isbuiltin(obj) or inspect.isclass(obj):
+            return _search_scope(faked_mod, obj.__name__), faked_mod
+        elif not inspect.isclass(obj):
+            # object is a method or descriptor
+            try:
+                objclass = obj.__objclass__
+            except AttributeError:
+                return None, None
+            else:
+                cls = _search_scope(faked_mod, objclass.__name__)
+                if cls is None:
+                    return None, None
+                return _search_scope(cls, obj.__name__), faked_mod
+    else:
+        if obj is module:
+            return _search_scope(faked_mod, name), faked_mod
+        else:
+            try:
+                cls_name = obj.__name__
+            except AttributeError:
+                return None, None
+            cls = _search_scope(faked_mod, cls_name)
+            if cls is None:
+                return None, None
+            return _search_scope(cls, name), faked_mod
+    return None, None
+
+
+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, ValueError):
+            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(grammar, module, obj, name=None):
+    result, fake_module = _faked(grammar, module, obj, name)
+    if result is None:
+        # We're not interested in classes. What we want is functions.
+        raise FakeDoesNotExist
+    elif result.type == 'classdef':
+        return result, fake_module
+    else:
+        # Set the docstr which was previously not set (faked modules don't
+        # contain it).
+        assert result.type == 'funcdef'
+        doc = '"""%s"""' % obj.__doc__  # TODO need escapes.
+        suite = result.children[-1]
+        string = tree.String(doc, (0, 0), '')
+        new_line = tree.Newline('\n', (0, 0))
+        docstr_node = tree.PythonNode('simple_stmt', [string, new_line])
+        suite.children.insert(1, docstr_node)
+        return result, fake_module
+
+
+def get_faked(evaluator, module, obj, name=None, parent_context=None):
+    if parent_context and parent_context.tree_node is not None:
+        # Try to search in already clearly defined stuff.
+        found = _search_scope(parent_context.tree_node, name)
+        if found is not None:
+            return found
+        else:
+            raise FakeDoesNotExist
+
+    faked, fake_module = _get_faked(evaluator.latest_grammar, module and module.obj, obj, name)
+    if module is not None:
+        module.get_used_names = fake_module.get_used_names
+    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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_functools.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_functools.pym
new file mode 100644
index 0000000..909ef03
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_sqlite3.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_sqlite3.pym
new file mode 100644
index 0000000..2151e65
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_sre.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_sre.pym
new file mode 100644
index 0000000..217be56
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_weakref.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_weakref.pym
new file mode 100644
index 0000000..298d0b0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/_weakref.pym
@@ -0,0 +1,9 @@
+def proxy(object, callback=None):
+    return object
+
+class ref():
+    def __init__(self, object, callback=None):
+        self.__object = object
+
+    def __call__(self):
+        return self.__object
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/builtins.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/builtins.pym
new file mode 100644
index 0000000..1225929
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/builtins.pym
@@ -0,0 +1,274 @@
+"""
+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 ''
+
+    def readlines(self):
+        return ['']
+
+    def __enter__(self):
+        return self
+
+
+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
+
+    def strip(self):
+        return str()
+
+    def split(self):
+        return [str()]
+
+class type():
+    def mro():
+        return [object]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/datetime.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/datetime.pym
new file mode 100644
index 0000000..823ac5b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/datetime.pym
@@ -0,0 +1,4 @@
+class datetime():
+    @staticmethod
+    def now():
+        return datetime()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/io.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/io.pym
new file mode 100644
index 0000000..c1f4fc0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/io.pym
@@ -0,0 +1,12 @@
+class TextIOWrapper():
+    def __next__(self):
+        return str()
+
+    def __iter__(self):
+        yield str()
+
+    def readlines(self):
+        return ['']
+
+    def __enter__(self):
+        return self
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/operator.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/operator.pym
new file mode 100644
index 0000000..d40d468
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/operator.pym
@@ -0,0 +1,33 @@
+# Just copied this code from Python 3.6.
+
+class itemgetter:
+    """
+    Return a callable object that fetches the given item(s) from its operand.
+    After f = itemgetter(2), the call f(r) returns r[2].
+    After g = itemgetter(2, 5, 3), the call g(r) returns (r[2], r[5], r[3])
+    """
+    __slots__ = ('_items', '_call')
+
+    def __init__(self, item, *items):
+        if not items:
+            self._items = (item,)
+            def func(obj):
+                return obj[item]
+            self._call = func
+        else:
+            self._items = items = (item,) + items
+            def func(obj):
+                return tuple(obj[i] for i in items)
+            self._call = func
+
+    def __call__(self, obj):
+        return self._call(obj)
+
+    def __repr__(self):
+        return '%s.%s(%s)' % (self.__class__.__module__,
+                              self.__class__.__name__,
+                              ', '.join(map(repr, self._items)))
+
+    def __reduce__(self):
+        return self.__class__, self._items
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/posix.pym b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/posix.pym
new file mode 100644
index 0000000..4417f7c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/fake/posix.pym
@@ -0,0 +1,5 @@
+def getcwd():
+    return ''
+
+def getcwdu():
+    return ''
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/getattr_static.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/getattr_static.py
new file mode 100644
index 0000000..9f8cd8a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/getattr_static.py
@@ -0,0 +1,175 @@
+"""
+A static version of getattr.
+This is a backport of the Python 3 code with a little bit of additional
+information returned to enable Jedi to make decisions.
+"""
+
+import types
+
+from jedi._compatibility import py_version
+
+_sentinel = object()
+
+def _check_instance(obj, attr):
+    instance_dict = {}
+    try:
+        instance_dict = object.__getattribute__(obj, "__dict__")
+    except AttributeError:
+        pass
+    return dict.get(instance_dict, attr, _sentinel)
+
+
+def _check_class(klass, attr):
+    for entry in _static_getmro(klass):
+        if _shadowed_dict(type(entry)) is _sentinel:
+            try:
+                return entry.__dict__[attr]
+            except KeyError:
+                pass
+    return _sentinel
+
+def _is_type(obj):
+    try:
+        _static_getmro(obj)
+    except TypeError:
+        return False
+    return True
+
+
+def _shadowed_dict_newstyle(klass):
+    dict_attr = type.__dict__["__dict__"]
+    for entry in _static_getmro(klass):
+        try:
+            class_dict = dict_attr.__get__(entry)["__dict__"]
+        except KeyError:
+            pass
+        else:
+            if not (type(class_dict) is types.GetSetDescriptorType and
+                    class_dict.__name__ == "__dict__" and
+                    class_dict.__objclass__ is entry):
+                return class_dict
+    return _sentinel
+
+
+def _static_getmro_newstyle(klass):
+    return type.__dict__['__mro__'].__get__(klass)
+
+
+if py_version >= 30:
+    _shadowed_dict = _shadowed_dict_newstyle
+    _get_type = type
+    _static_getmro = _static_getmro_newstyle
+else:
+    def _shadowed_dict(klass):
+        """
+        In Python 2 __dict__ is not overwritable:
+
+            class Foo(object): pass
+            setattr(Foo, '__dict__', 4)
+
+            Traceback (most recent call last):
+              File "<stdin>", line 1, in <module>
+            TypeError: __dict__ must be a dictionary object
+
+        It applies to both newstyle and oldstyle classes:
+
+            class Foo(object): pass
+            setattr(Foo, '__dict__', 4)
+            Traceback (most recent call last):
+              File "<stdin>", line 1, in <module>
+            AttributeError: attribute '__dict__' of 'type' objects is not writable
+
+        It also applies to instances of those objects. However to keep things
+        straight forward, newstyle classes always use the complicated way of
+        accessing it while oldstyle classes just use getattr.
+        """
+        if type(klass) is _oldstyle_class_type:
+            return getattr(klass, '__dict__', _sentinel)
+        return _shadowed_dict_newstyle(klass)
+
+    class _OldStyleClass():
+        pass
+
+    _oldstyle_instance_type = type(_OldStyleClass())
+    _oldstyle_class_type = type(_OldStyleClass)
+
+    def _get_type(obj):
+        type_ = object.__getattribute__(obj, '__class__')
+        if type_ is _oldstyle_instance_type:
+            # Somehow for old style classes we need to access it directly.
+            return obj.__class__
+        return type_
+
+    def _static_getmro(klass):
+        if type(klass) is _oldstyle_class_type:
+            def oldstyle_mro(klass):
+                """
+                Oldstyle mro is a really simplistic way of look up mro:
+                https://stackoverflow.com/questions/54867/what-is-the-difference-between-old-style-and-new-style-classes-in-python
+                """
+                yield klass
+                for base in klass.__bases__:
+                    for yield_from in oldstyle_mro(base):
+                        yield yield_from
+
+            return oldstyle_mro(klass)
+
+        return _static_getmro_newstyle(klass)
+
+
+def _safe_hasattr(obj, name):
+    return _check_class(_get_type(obj), name) is not _sentinel
+
+
+def _safe_is_data_descriptor(obj):
+    return (_safe_hasattr(obj, '__set__') or _safe_hasattr(obj, '__delete__'))
+
+
+def getattr_static(obj, attr, default=_sentinel):
+    """Retrieve attributes without triggering dynamic lookup via the
+       descriptor protocol,  __getattr__ or __getattribute__.
+
+       Note: this function may not be able to retrieve all attributes
+       that getattr can fetch (like dynamically created attributes)
+       and may find attributes that getattr can't (like descriptors
+       that raise AttributeError). It can also return descriptor objects
+       instead of instance members in some cases. See the
+       documentation for details.
+
+       Returns a tuple `(attr, is_get_descriptor)`. is_get_descripter means that
+       the attribute is a descriptor that has a `__get__` attribute.
+    """
+    instance_result = _sentinel
+    if not _is_type(obj):
+        klass = _get_type(obj)
+        dict_attr = _shadowed_dict(klass)
+        if (dict_attr is _sentinel or
+            type(dict_attr) is types.MemberDescriptorType):
+            instance_result = _check_instance(obj, attr)
+    else:
+        klass = obj
+
+    klass_result = _check_class(klass, attr)
+
+    if instance_result is not _sentinel and klass_result is not _sentinel:
+        if _safe_hasattr(klass_result, '__get__') \
+                and _safe_is_data_descriptor(klass_result):
+            # A get/set descriptor has priority over everything.
+            return klass_result, True
+
+    if instance_result is not _sentinel:
+        return instance_result, False
+    if klass_result is not _sentinel:
+        return klass_result, _safe_hasattr(klass_result, '__get__')
+
+    if obj is klass:
+        # for types we check the metaclass too
+        for entry in _static_getmro(type(klass)):
+            if _shadowed_dict(type(entry)) is _sentinel:
+                try:
+                    return entry.__dict__[attr], False
+                except KeyError:
+                    pass
+    if default is not _sentinel:
+        return default, False
+    raise AttributeError(attr)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/mixed.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/mixed.py
new file mode 100644
index 0000000..0be5007
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/compiled/mixed.py
@@ -0,0 +1,232 @@
+"""
+Used only for REPL Completion.
+"""
+
+import inspect
+import os
+
+from jedi import settings
+from jedi.evaluate import compiled
+from jedi.cache import underscore_memoization
+from jedi.evaluate import imports
+from jedi.evaluate.context import Context
+from jedi.evaluate.cache import evaluator_function_cache
+from jedi.evaluate.compiled.getattr_static import getattr_static
+
+
+class MixedObject(object):
+    """
+    A ``MixedObject`` is used in two ways:
+
+    1. It uses the default logic of ``parser.python.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, parent_context, compiled_object, tree_context):
+        self.evaluator = evaluator
+        self.parent_context = parent_context
+        self.compiled_object = compiled_object
+        self._context = tree_context
+        self.obj = compiled_object.obj
+
+    # We have to overwrite everything that has to do with trailers, name
+    # lookups and filters to make it possible to route name lookups towards
+    # compiled objects and the rest towards tree node contexts.
+    def eval_trailer(*args, **kwags):
+        return Context.eval_trailer(*args, **kwags)
+
+    def py__getattribute__(*args, **kwargs):
+        return Context.py__getattribute__(*args, **kwargs)
+
+    def get_filters(self, *args, **kwargs):
+        yield MixedObjectFilter(self.evaluator, self)
+
+    def __repr__(self):
+        return '<%s: %s>' % (type(self).__name__, repr(self.obj))
+
+    def __getattr__(self, name):
+        return getattr(self._context, name)
+
+
+class MixedName(compiled.CompiledName):
+    """
+    The ``CompiledName._compiled_object`` is our MixedObject.
+    """
+    @property
+    def start_pos(self):
+        contexts = list(self.infer())
+        if not contexts:
+            # This means a start_pos that doesn't exist (compiled objects).
+            return (0, 0)
+        return contexts[0].name.start_pos
+
+    @start_pos.setter
+    def start_pos(self, value):
+        # Ignore the __init__'s start_pos setter call.
+        pass
+
+    @underscore_memoization
+    def infer(self):
+        obj = self.parent_context.obj
+        try:
+            # TODO use logic from compiled.CompiledObjectFilter
+            obj = getattr(obj, self.string_name)
+        except AttributeError:
+            # Happens e.g. in properties of
+            # PyQt4.QtGui.QStyleOptionComboBox.currentText
+            # -> just set it to None
+            obj = None
+        return [_create(self._evaluator, obj, parent_context=self.parent_context)]
+
+    @property
+    def api_type(self):
+        return next(iter(self.infer())).api_type
+
+
+class MixedObjectFilter(compiled.CompiledObjectFilter):
+    name_class = MixedName
+
+    def __init__(self, evaluator, mixed_object, is_instance=False):
+        super(MixedObjectFilter, self).__init__(
+            evaluator, mixed_object, is_instance)
+        self._mixed_object = mixed_object
+
+    #def _create(self, name):
+        #return MixedName(self._evaluator, self._compiled_object, name)
+
+
+@evaluator_function_cache()
+def _load_module(evaluator, path, python_object):
+    module = evaluator.grammar.parse(
+        path=path,
+        cache=True,
+        diff_cache=True,
+        cache_path=settings.cache_directory
+    ).get_root_node()
+    python_module = inspect.getmodule(python_object)
+
+    evaluator.modules[python_module.__name__] = module
+    return module
+
+
+def _get_object_to_check(python_object):
+    """Check if inspect.getfile has a chance to find the source."""
+    if (inspect.ismodule(python_object) or
+            inspect.isclass(python_object) or
+            inspect.ismethod(python_object) or
+            inspect.isfunction(python_object) or
+            inspect.istraceback(python_object) or
+            inspect.isframe(python_object) or
+            inspect.iscode(python_object)):
+        return python_object
+
+    try:
+        return python_object.__class__
+    except AttributeError:
+        raise TypeError  # Prevents computation of `repr` within inspect.
+
+
+def find_syntax_node_name(evaluator, python_object):
+    try:
+        python_object = _get_object_to_check(python_object)
+        path = inspect.getsourcefile(python_object)
+    except TypeError:
+        # The type might not be known (e.g. class_with_dict.__weakref__)
+        return None, None
+    if path is None or not os.path.exists(path):
+        # The path might not exist or be e.g. <stdin>.
+        return None, 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, path
+
+    try:
+        name_str = python_object.__name__
+    except AttributeError:
+        # Stuff like python_function.__code__.
+        return None, None
+
+    if name_str == '<lambda>':
+        return None, None  # It's too hard to find lambdas.
+
+    # Doesn't always work (e.g. os.stat_result)
+    try:
+        names = module.get_used_names()[name_str]
+    except KeyError:
+        return None, None
+    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].parent, path
+
+    # 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].parent, path
+
+
+@compiled.compiled_objects_cache('mixed_cache')
+def _create(evaluator, obj, parent_context=None, *args):
+    tree_node, path = find_syntax_node_name(evaluator, obj)
+
+    compiled_object = compiled.create(
+        evaluator, obj, parent_context=parent_context.compiled_object)
+    if tree_node is None:
+        return compiled_object
+
+    module_node = tree_node.get_root_node()
+    if parent_context.tree_node.get_root_node() == module_node:
+        module_context = parent_context.get_root_context()
+    else:
+        from jedi.evaluate.representation import ModuleContext
+        module_context = ModuleContext(evaluator, module_node, path=path)
+        # TODO this __name__ is probably wrong.
+        name = compiled_object.get_root_context().py__name__()
+        imports.add_module(evaluator, name, module_context)
+
+    tree_context = module_context.create_context(
+        tree_node,
+        node_is_context=True,
+        node_is_object=True
+    )
+    if tree_node.type == 'classdef':
+        if not inspect.isclass(obj):
+            # Is an instance, not a class.
+            tree_context, = tree_context.execute_evaluated()
+
+    return MixedObject(
+        evaluator,
+        parent_context,
+        compiled_object,
+        tree_context=tree_context
+    )
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/context.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/context.py
new file mode 100644
index 0000000..d111ff2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/context.py
@@ -0,0 +1,206 @@
+from jedi._compatibility import Python3Method
+from jedi.common import unite
+from parso.python.tree import ExprStmt, CompFor
+from jedi.parser_utils import clean_scope_docstring, get_doc_with_call_signature
+
+
+class Context(object):
+    """
+    Should be defined, otherwise the API returns empty types.
+    """
+
+    """
+    To be defined by subclasses.
+    """
+    predefined_names = {}
+    tree_node = None
+
+    def __init__(self, evaluator, parent_context=None):
+        self.evaluator = evaluator
+        self.parent_context = parent_context
+
+    @property
+    def api_type(self):
+        # By default just lower name of the class. Can and should be
+        # overwritten.
+        return self.__class__.__name__.lower()
+
+    def get_root_context(self):
+        context = self
+        while True:
+            if context.parent_context is None:
+                return context
+            context = context.parent_context
+
+    def execute(self, arguments):
+        return self.evaluator.execute(self, arguments)
+
+    def execute_evaluated(self, *value_list):
+        """
+        Execute a function with already executed arguments.
+        """
+        from jedi.evaluate.param import ValuesArguments
+        arguments = ValuesArguments([[value] for value in value_list])
+        return self.execute(arguments)
+
+    def eval_node(self, node):
+        return self.evaluator.eval_element(self, node)
+
+    def eval_stmt(self, stmt, seek_name=None):
+        return self.evaluator.eval_statement(self, stmt, seek_name)
+
+    def eval_trailer(self, types, trailer):
+        return self.evaluator.eval_trailer(self, types, trailer)
+
+    @Python3Method
+    def py__getattribute__(self, name_or_str, name_context=None, position=None,
+                           search_global=False, is_goto=False,
+                           analysis_errors=True):
+        if name_context is None:
+            name_context = self
+        return self.evaluator.find_types(
+            self, name_or_str, name_context, position, search_global, is_goto,
+            analysis_errors)
+
+    def create_context(self, node, node_is_context=False, node_is_object=False):
+        return self.evaluator.create_context(self, node, node_is_context, node_is_object)
+
+    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
+
+    def py__doc__(self, include_call_signature=False):
+        try:
+            self.tree_node.get_doc_node
+        except AttributeError:
+            return ''
+        else:
+            if include_call_signature:
+                return get_doc_with_call_signature(self.tree_node)
+            else:
+                return clean_scope_docstring(self.tree_node)
+        return None
+
+
+class TreeContext(Context):
+    def __init__(self, evaluator, parent_context=None):
+        super(TreeContext, self).__init__(evaluator, parent_context)
+        self.predefined_names = {}
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.tree_node)
+
+
+class AbstractLazyContext(object):
+    def __init__(self, data):
+        self.data = data
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.data)
+
+    def infer(self):
+        raise NotImplementedError
+
+
+class LazyKnownContext(AbstractLazyContext):
+    """data is a context."""
+    def infer(self):
+        return set([self.data])
+
+
+class LazyKnownContexts(AbstractLazyContext):
+    """data is a set of contexts."""
+    def infer(self):
+        return self.data
+
+
+class LazyUnknownContext(AbstractLazyContext):
+    def __init__(self):
+        super(LazyUnknownContext, self).__init__(None)
+
+    def infer(self):
+        return set()
+
+
+class LazyTreeContext(AbstractLazyContext):
+    def __init__(self, context, node):
+        super(LazyTreeContext, self).__init__(node)
+        self._context = context
+        # We need to save the predefined names. It's an unfortunate side effect
+        # that needs to be tracked otherwise results will be wrong.
+        self._predefined_names = dict(context.predefined_names)
+
+    def infer(self):
+        old, self._context.predefined_names = \
+            self._context.predefined_names, self._predefined_names
+        try:
+            return self._context.eval_node(self.data)
+        finally:
+            self._context.predefined_names = old
+
+
+def get_merged_lazy_context(lazy_contexts):
+    if len(lazy_contexts) > 1:
+        return MergedLazyContexts(lazy_contexts)
+    else:
+        return lazy_contexts[0]
+
+
+class MergedLazyContexts(AbstractLazyContext):
+    """data is a list of lazy contexts."""
+    def infer(self):
+        return unite(l.infer() for l in self.data)
+
+
+class ContextualizedNode(object):
+    def __init__(self, context, node):
+        self.context = context
+        self._node = node
+
+    def get_root_context(self):
+        return self.context.get_root_context()
+
+    def infer(self):
+        return self.context.eval_node(self._node)
+
+
+class ContextualizedName(ContextualizedNode):
+    # TODO merge with TreeNameDefinition?!
+    @property
+    def name(self):
+        return self._node
+
+    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._node.parent
+        compare = self._node
+        while node is not None:
+            if node.type in ('testlist', '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
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/docstrings.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/docstrings.py
new file mode 100644
index 0000000..3a14100
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/docstrings.py
@@ -0,0 +1,282 @@
+"""
+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 three 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>`_
+- `Numpydoc <https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt>`_
+
+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.
+"""
+
+import re
+from textwrap import dedent
+
+from parso import parse
+
+from jedi._compatibility import u
+from jedi.common import unite
+from jedi.evaluate import context
+from jedi.evaluate.cache import evaluator_method_cache
+from jedi.common import indent_block
+from jedi.evaluate.iterable import SequenceLiteralContext, FakeSequence
+
+
+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 []
+
+    def _search_return_in_numpydocstr(docstr):
+        return []
+else:
+    def _search_param_in_numpydocstr(docstr, param_str):
+        """Search `docstr` (in numpydoc format) for type(-s) of `param_str`."""
+        try:
+            # This is a non-public API. If it ever changes we should be 
+            # prepared and return gracefully.
+            params = NumpyDocString(docstr)._parsed_data['Parameters']
+        except (KeyError, AttributeError):
+            return []
+        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)
+                return list(_expand_typestr(p_type))
+        return []
+
+    def _search_return_in_numpydocstr(docstr):
+        """
+        Search `docstr` (in numpydoc format) for type(-s) of function returns.
+        """
+        doc = NumpyDocString(docstr)
+        try:
+            # This is a non-public API. If it ever changes we should be 
+            # prepared and return gracefully.
+            returns = doc._parsed_data['Returns']
+            returns += doc._parsed_data['Yields']
+        except (KeyError, AttributeError):
+            raise StopIteration
+        for r_name, r_type, r_descr in returns:
+            #Return names are optional and if so the type is in the name
+            if not r_type:
+                r_type = r_name
+            for type_ in _expand_typestr(r_type):
+                yield type_
+
+
+def _expand_typestr(type_str):
+    """
+    Attempts to interpret the possible types in `type_str`
+    """
+    # Check if alternative types are specified with 'or'
+    if re.search('\\bor\\b', type_str):
+        for t in type_str.split('or'):
+            yield t.split('of')[0].strip()
+    # Check if like "list of `type`" and set type to list
+    elif re.search('\\bof\\b', type_str):
+        yield type_str.split('of')[0]
+    # Check if type has is a set of valid literal values eg: {'C', 'F', 'A'}
+    elif type_str.startswith('{'):
+        node = parse(type_str, version='3.6').children[0]
+        if node.type == 'atom':
+            for leaf in node.children[1].children:
+                if leaf.type == 'number':
+                    if '.' in leaf.value:
+                        yield 'float'
+                    else:
+                        yield 'int'
+                elif leaf.type == 'string':
+                    if 'b' in leaf.string_prefix.lower():
+                        yield 'bytes'
+                    else:
+                        yield 'str'
+                # Ignore everything else.
+
+    # Otherwise just work with what we have.
+    else:
+        yield type_str
+
+
+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(module_context, string):
+    code = dedent(u("""
+    def pseudo_docstring_stuff():
+        '''
+        Create a pseudo function for docstring statements.
+        Need this docstring so that if the below part is not valid Python this
+        is still a function.
+        '''
+    {0}
+    """))
+    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.
+    grammar = module_context.evaluator.latest_grammar
+    module = grammar.parse(code.format(indent_block(string)))
+    try:
+        funcdef = next(module.iter_funcdefs())
+        # First pick suite, then simple_stmt and then the node,
+        # which is also not the last item, because there's a newline.
+        stmt = funcdef.children[-1].children[-1].children[-2]
+    except (AttributeError, IndexError):
+        return []
+
+    from jedi.evaluate.representation import FunctionContext
+    function_context = FunctionContext(
+        module_context.evaluator,
+        module_context,
+        funcdef
+    )
+    func_execution_context = function_context.get_function_execution()
+    # 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.
+    return list(_execute_types_in_stmt(func_execution_context, stmt))
+
+
+def _execute_types_in_stmt(module_context, 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 = module_context.eval_node(stmt)
+    return unite(_execute_array_values(module_context.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, SequenceLiteralContext):
+        values = []
+        for lazy_context in array.py__iter__():
+            objects = unite(_execute_array_values(evaluator, typ) for typ in lazy_context.infer())
+            values.append(context.LazyKnownContexts(objects))
+        return set([FakeSequence(evaluator, array.array_type, values)])
+    else:
+        return array.execute_evaluated()
+
+
+@evaluator_method_cache()
+def infer_param(execution_context, param):
+    from jedi.evaluate.instance import AnonymousInstanceFunctionExecution
+
+    def eval_docstring(docstring):
+        return set(
+            p
+            for param_str in _search_param_in_docstr(docstring, param.name.value)
+            for p in _evaluate_for_statement_string(module_context, param_str)
+        )
+    module_context = execution_context.get_root_context()
+    func = param.get_parent_function()
+    if func.type == 'lambdef':
+        return set()
+
+    types = eval_docstring(execution_context.py__doc__())
+    if isinstance(execution_context, AnonymousInstanceFunctionExecution) and \
+            execution_context.function_context.name.string_name == '__init__':
+        class_context = execution_context.instance.class_context
+        types |= eval_docstring(class_context.py__doc__())
+
+    return types
+
+
+@evaluator_method_cache()
+def infer_return_types(function_context):
+    def search_return_in_docstr(code):
+        for p in DOCSTRING_RETURN_PATTERNS:
+            match = p.search(code)
+            if match:
+                yield _strip_rst_role(match.group(1))
+        # Check for numpy style return hint
+        for type_ in _search_return_in_numpydocstr(code):
+            yield type_
+
+    for type_str in search_return_in_docstr(function_context.py__doc__()):
+        for type_eval in _evaluate_for_statement_string(function_context.get_root_context(), type_str):
+            yield type_eval
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/dynamic.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/dynamic.py
new file mode 100644
index 0000000..00c38f5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/dynamic.py
@@ -0,0 +1,212 @@
+"""
+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 parso.python import tree
+from jedi import settings
+from jedi import debug
+from jedi.evaluate.cache import evaluator_function_cache
+from jedi.evaluate import imports
+from jedi.evaluate.param import TreeArguments, create_default_params
+from jedi.evaluate.helpers import is_stdlib_path
+from jedi.common import to_list, unite
+from jedi.parser_utils import get_parent_scope
+
+
+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
+
+
+class MergedExecutedParams(object):
+    """
+    Simulates being a parameter while actually just being multiple params.
+    """
+    def __init__(self, executed_params):
+        self._executed_params = executed_params
+
+    def infer(self):
+        return unite(p.infer() for p in self._executed_params)
+
+
+@debug.increase_indent
+def search_params(evaluator, execution_context, funcdef):
+    """
+    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 create_default_params(execution_context, funcdef)
+
+    evaluator.dynamic_params_depth += 1
+    try:
+        path = execution_context.get_root_context().py__file__()
+        if path is not None and is_stdlib_path(path):
+            # We don't want to search for usages in the stdlib. Usually people
+            # don't work with it (except if you are a core maintainer, sorry).
+            # This makes everything slower. Just disable it and run the tests,
+            # you will see the slowdown, especially in 3.6.
+            return create_default_params(execution_context, funcdef)
+
+        debug.dbg('Dynamic param search in %s.', funcdef.name.value, color='MAGENTA')
+
+        module_context = execution_context.get_root_context()
+        function_executions = _search_function_executions(
+            evaluator,
+            module_context,
+            funcdef
+        )
+        if function_executions:
+            zipped_params = zip(*list(
+                function_execution.get_params()
+                for function_execution in function_executions
+            ))
+            params = [MergedExecutedParams(executed_params) for executed_params in zipped_params]
+            # Evaluate the ExecutedParams to types.
+        else:
+            return create_default_params(execution_context, funcdef)
+        debug.dbg('Dynamic param result finished', color='MAGENTA')
+        return params
+    finally:
+        evaluator.dynamic_params_depth -= 1
+
+
+@evaluator_function_cache(default=[])
+@to_list
+def _search_function_executions(evaluator, module_context, funcdef):
+    """
+    Returns a list of param names.
+    """
+    from jedi.evaluate import representation as er
+
+    func_string_name = funcdef.name.value
+    compare_node = funcdef
+    if func_string_name == '__init__':
+        cls = get_parent_scope(funcdef)
+        if isinstance(cls, tree.Class):
+            func_string_name = cls.name.value
+            compare_node = cls
+
+    found_executions = False
+    i = 0
+    for for_mod_context in imports.get_modules_containing_name(
+            evaluator, [module_context], func_string_name):
+        if not isinstance(module_context, er.ModuleContext):
+            return
+        for name, trailer in _get_possible_nodes(for_mod_context, func_string_name):
+            i += 1
+
+            # This is a simple way to stop Jedi's dynamic param recursion
+            # from going wild: The deeper Jedi's in the recursion, the less
+            # code should be evaluated.
+            if i * evaluator.dynamic_params_depth > MAX_PARAM_SEARCHES:
+                return
+
+            random_context = evaluator.create_context(for_mod_context, name)
+            for function_execution in _check_name_for_execution(
+                    evaluator, random_context, compare_node, name, trailer):
+                found_executions = True
+                yield function_execution
+
+        # If there are results after processing a module, we're probably
+        # good to process. This is a speed optimization.
+        if found_executions:
+            return
+
+
+def _get_possible_nodes(module_context, func_string_name):
+    try:
+        names = module_context.tree_node.get_used_names()[func_string_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 _check_name_for_execution(evaluator, context, compare_node, name, trailer):
+    from jedi.evaluate import representation as er, instance
+
+    def create_func_excs():
+        arglist = trailer.children[1]
+        if arglist == ')':
+            arglist = ()
+        args = TreeArguments(evaluator, context, arglist, trailer)
+        if value_node.type == 'funcdef':
+            yield value.get_function_execution(args)
+        else:
+            created_instance = instance.TreeInstance(
+                evaluator,
+                value.parent_context,
+                value,
+                args
+            )
+            for execution in created_instance.create_init_executions():
+                yield execution
+
+    for value in evaluator.goto_definitions(context, name):
+        value_node = value.tree_node
+        if compare_node == value_node:
+            for func_execution in create_func_excs():
+                yield func_execution
+        elif isinstance(value.parent_context, er.FunctionExecutionContext) and \
+                compare_node.type == 'funcdef':
+            # Here we're trying to find decorators by checking the first
+            # parameter. It's not very generic though. Should find a better
+            # solution that also applies to nested decorators.
+            params = value.parent_context.get_params()
+            if len(params) != 1:
+                continue
+            values = params[0].infer()
+            nodes = [v.tree_node for v in values]
+            if nodes == [compare_node]:
+                # Found a decorator.
+                module_context = context.get_root_context()
+                execution_context = next(create_func_excs())
+                for name, trailer in _get_possible_nodes(module_context, params[0].string_name):
+                    if value_node.start_pos < name.start_pos < value_node.end_pos:
+                        random_context = evaluator.create_context(execution_context, name)
+                        iterator = _check_name_for_execution(
+                            evaluator,
+                            random_context,
+                            compare_node,
+                            name,
+                            trailer
+                        )
+                        for function_execution in iterator:
+                            yield function_execution
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/filters.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/filters.py
new file mode 100644
index 0000000..54eb01f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/filters.py
@@ -0,0 +1,345 @@
+"""
+Filters are objects that you can use to filter names in different scopes. They
+are needed for name resolution.
+"""
+from abc import abstractmethod
+
+from parso.tree import search_ancestor
+from jedi.evaluate import flow_analysis
+from jedi.common import to_list, unite
+from jedi.parser_utils import get_parent_scope
+
+
+class AbstractNameDefinition(object):
+    start_pos = None
+    string_name = None
+    parent_context = None
+    tree_name = None
+
+    @abstractmethod
+    def infer(self):
+        raise NotImplementedError
+
+    @abstractmethod
+    def goto(self):
+        # Typically names are already definitions and therefore a goto on that
+        # name will always result on itself.
+        return set([self])
+
+    def get_root_context(self):
+        return self.parent_context.get_root_context()
+
+    def __repr__(self):
+        if self.start_pos is None:
+            return '<%s: %s>' % (self.__class__.__name__, self.string_name)
+        return '<%s: %s@%s>' % (self.__class__.__name__, self.string_name, self.start_pos)
+
+    def execute(self, arguments):
+        return unite(context.execute(arguments) for context in self.infer())
+
+    def execute_evaluated(self, *args, **kwargs):
+        return unite(context.execute_evaluated(*args, **kwargs) for context in self.infer())
+
+    @property
+    def api_type(self):
+        return self.parent_context.api_type
+
+
+class AbstractTreeName(AbstractNameDefinition):
+    def __init__(self, parent_context, tree_name):
+        self.parent_context = parent_context
+        self.tree_name = tree_name
+
+    def goto(self):
+        return self.parent_context.evaluator.goto(self.parent_context, self.tree_name)
+
+    @property
+    def string_name(self):
+        return self.tree_name.value
+
+    @property
+    def start_pos(self):
+        return self.tree_name.start_pos
+
+
+class ContextNameMixin(object):
+    def infer(self):
+        return set([self._context])
+
+    def get_root_context(self):
+        if self.parent_context is None:
+            return self._context
+        return super(ContextNameMixin, self).get_root_context()
+
+    @property
+    def api_type(self):
+        return self._context.api_type
+
+
+class ContextName(ContextNameMixin, AbstractTreeName):
+    def __init__(self, context, tree_name):
+        super(ContextName, self).__init__(context.parent_context, tree_name)
+        self._context = context
+
+
+class TreeNameDefinition(AbstractTreeName):
+    _API_TYPES = dict(
+        import_name='module',
+        import_from='module',
+        funcdef='function',
+        param='param',
+        classdef='class',
+    )
+
+    def infer(self):
+        # Refactor this, should probably be here.
+        from jedi.evaluate.finder import _name_to_types
+        return _name_to_types(self.parent_context.evaluator, self.parent_context, self.tree_name)
+
+    @property
+    def api_type(self):
+        definition = self.tree_name.get_definition(import_name_always=True)
+        if definition is None:
+            return 'statement'
+        return self._API_TYPES.get(definition.type, 'statement')
+
+
+class ParamName(AbstractTreeName):
+    api_type = 'param'
+
+    def __init__(self, parent_context, tree_name):
+        self.parent_context = parent_context
+        self.tree_name = tree_name
+
+    def infer(self):
+        return self.get_param().infer()
+
+    def get_param(self):
+        params = self.parent_context.get_params()
+        param_node = search_ancestor(self.tree_name, 'param')
+        return params[param_node.position_index]
+
+
+class AnonymousInstanceParamName(ParamName):
+    def infer(self):
+        param_node = search_ancestor(self.tree_name, 'param')
+        # TODO I think this should not belong here. It's not even really true,
+        #      because classmethod and other descriptors can change it.
+        if param_node.position_index == 0:
+            # This is a speed optimization, to return the self param (because
+            # it's known). This only affects anonymous instances.
+            return set([self.parent_context.instance])
+        else:
+            return self.get_param().infer()
+
+
+class AbstractFilter(object):
+    _until_position = None
+
+    def _filter(self, names):
+        if self._until_position is not None:
+            return [n for n in names if n.start_pos < self._until_position]
+        return names
+
+    @abstractmethod
+    def get(self, name):
+        raise NotImplementedError
+
+    @abstractmethod
+    def values(self):
+        raise NotImplementedError
+
+
+class AbstractUsedNamesFilter(AbstractFilter):
+    name_class = TreeNameDefinition
+
+    def __init__(self, context, parser_scope):
+        self._parser_scope = parser_scope
+        self._used_names = self._parser_scope.get_root_node().get_used_names()
+        self.context = context
+
+    def get(self, name):
+        try:
+            names = self._used_names[str(name)]
+        except KeyError:
+            return []
+
+        return self._convert_names(self._filter(names))
+
+    def _convert_names(self, names):
+        return [self.name_class(self.context, name) for name in names]
+
+    def values(self):
+        return self._convert_names(name for name_list in self._used_names.values()
+                                   for name in self._filter(name_list))
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.context)
+
+
+class ParserTreeFilter(AbstractUsedNamesFilter):
+    def __init__(self, evaluator, context, node_context=None, until_position=None,
+                 origin_scope=None):
+        """
+        node_context is an option to specify a second context for use cases
+        like the class mro where the parent class of a new name would be the
+        context, but for some type inference it's important to have a local
+        context of the other classes.
+        """
+        if node_context is None:
+            node_context = context
+        super(ParserTreeFilter, self).__init__(context, node_context.tree_node)
+        self._node_context = node_context
+        self._origin_scope = origin_scope
+        self._until_position = until_position
+
+    def _filter(self, names):
+        names = super(ParserTreeFilter, self)._filter(names)
+        names = [n for n in names if self._is_name_reachable(n)]
+        return list(self._check_flows(names))
+
+    def _is_name_reachable(self, name):
+        if not name.is_definition():
+            return False
+        parent = name.parent
+        if parent.type == 'trailer':
+            return False
+        base_node = parent if parent.type in ('classdef', 'funcdef') else name
+        return get_parent_scope(base_node) == self._parser_scope
+
+    def _check_flows(self, names):
+        for name in sorted(names, key=lambda name: name.start_pos, reverse=True):
+            check = flow_analysis.reachability_check(
+                self._node_context, self._parser_scope, name, self._origin_scope
+            )
+            if check is not flow_analysis.UNREACHABLE:
+                yield name
+
+            if check is flow_analysis.REACHABLE:
+                break
+
+
+class FunctionExecutionFilter(ParserTreeFilter):
+    param_name = ParamName
+
+    def __init__(self, evaluator, context, node_context=None,
+                 until_position=None, origin_scope=None):
+        super(FunctionExecutionFilter, self).__init__(
+            evaluator,
+            context,
+            node_context,
+            until_position,
+            origin_scope
+        )
+
+    @to_list
+    def _convert_names(self, names):
+        for name in names:
+            param = search_ancestor(name, 'param')
+            if param:
+                yield self.param_name(self.context, name)
+            else:
+                yield TreeNameDefinition(self.context, name)
+
+
+class AnonymousInstanceFunctionExecutionFilter(FunctionExecutionFilter):
+    param_name = AnonymousInstanceParamName
+
+
+class GlobalNameFilter(AbstractUsedNamesFilter):
+    def __init__(self, context, parser_scope):
+        super(GlobalNameFilter, self).__init__(context, parser_scope)
+
+    @to_list
+    def _filter(self, names):
+        for name in names:
+            if name.parent.type == 'global_stmt':
+                yield name
+
+
+class DictFilter(AbstractFilter):
+    def __init__(self, dct):
+        self._dct = dct
+
+    def get(self, name):
+        try:
+            value = self._convert(name, self._dct[str(name)])
+        except KeyError:
+            return []
+
+        return list(self._filter([value]))
+
+    def values(self):
+        return self._filter(self._convert(*item) for item in self._dct.items())
+
+    def _convert(self, name, value):
+        return value
+
+
+def get_global_filters(evaluator, context, until_position, origin_scope):
+    """
+    Returns all filters in order of priority for name resolution.
+
+    For global name lookups. The filters will handle name resolution
+    themselves, but here we gather possible filters downwards.
+
+    >>> from jedi._compatibility import u, no_unicode_pprint
+    >>> from jedi import Script
+    >>> script = Script(u('''
+    ... x = ['a', 'b', 'c']
+    ... def func():
+    ...     y = None
+    ... '''))
+    >>> module_node = script._get_module_node()
+    >>> scope = next(module_node.iter_funcdefs())
+    >>> scope
+    <Function: func@3-5>
+    >>> context = script._get_module().create_context(scope)
+    >>> filters = list(get_global_filters(context.evaluator, context, (4, 0), None))
+
+    First we get the names names from the function scope.
+
+    >>> no_unicode_pprint(filters[0])
+    <ParserTreeFilter: <ModuleContext: @2-5>>
+    >>> sorted(str(n) for n in filters[0].values())
+    ['<TreeNameDefinition: func@(3, 4)>', '<TreeNameDefinition: x@(2, 0)>']
+    >>> filters[0]._until_position
+    (4, 0)
+
+    Then it yields the names from one level "lower". In this example, this is
+    the module scope. As a side note, you can see, that the position in the
+    filter is now None, because typically the whole module is loaded before the
+    function is called.
+
+    >>> filters[1].values()  # global names -> there are none in our example.
+    []
+    >>> list(filters[2].values())  # package modules -> Also empty.
+    []
+    >>> sorted(name.string_name for name in filters[3].values())  # Module attributes
+    ['__doc__', '__file__', '__name__', '__package__']
+    >>> print(filters[1]._until_position)
+    None
+
+    Finally, it yields the builtin filter, if `include_builtin` is
+    true (default).
+
+    >>> filters[4].values()                              #doctest: +ELLIPSIS
+    [<CompiledName: ...>, ...]
+    """
+    from jedi.evaluate.representation import FunctionExecutionContext
+    while context is not None:
+        # Names in methods cannot be resolved within the class.
+        for filter in context.get_filters(
+                search_global=True,
+                until_position=until_position,
+                origin_scope=origin_scope):
+            yield filter
+        if isinstance(context, FunctionExecutionContext):
+            # The position should be reset if the current scope is a function.
+            until_position = None
+
+        context = context.parent_context
+
+    # Add builtins to the global scope.
+    for filter in evaluator.BUILTINS.get_filters(search_global=True):
+        yield filter
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/finder.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/finder.py
new file mode 100644
index 0000000..aba190e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/finder.py
@@ -0,0 +1,410 @@
+"""
+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 parso.python import tree
+from parso.tree import search_ancestor
+from jedi import debug
+from jedi.common import unite
+from jedi import settings
+from jedi.evaluate import representation as er
+from jedi.evaluate.instance import AbstractInstanceContext
+from jedi.evaluate import compiled
+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.filters import get_global_filters, TreeNameDefinition
+from jedi.evaluate.context import ContextualizedName, ContextualizedNode
+from jedi.parser_utils import is_scope, get_parent_scope
+
+
+class NameFinder(object):
+    def __init__(self, evaluator, context, name_context, name_or_str,
+                 position=None, analysis_errors=True):
+        self._evaluator = evaluator
+        # Make sure that it's not just a syntax tree node.
+        self._context = context
+        self._name_context = name_context
+        self._name = name_or_str
+        if isinstance(name_or_str, tree.Name):
+            self._string_name = name_or_str.value
+        else:
+            self._string_name = name_or_str
+        self._position = position
+        self._found_predefined_types = None
+        self._analysis_errors = analysis_errors
+
+    @debug.increase_indent
+    def find(self, filters, attribute_lookup):
+        """
+        :params bool attribute_lookup: Tell to logic if we're accessing the
+            attribute or the contents of e.g. a function.
+        """
+        names = self.filter_name(filters)
+        if self._found_predefined_types is not None and names:
+            check = flow_analysis.reachability_check(
+                self._context, self._context.tree_node, self._name)
+            if check is flow_analysis.UNREACHABLE:
+                return set()
+            return self._found_predefined_types
+
+        types = self._names_to_types(names, attribute_lookup)
+
+        if not names and self._analysis_errors and not types \
+                and not (isinstance(self._name, tree.Name) and
+                         isinstance(self._name.parent.parent, tree.Param)):
+            if isinstance(self._name, tree.Name):
+                if attribute_lookup:
+                    analysis.add_attribute_error(
+                        self._name_context, self._context, self._name)
+                else:
+                    message = ("NameError: name '%s' is not defined."
+                               % self._string_name)
+                    analysis.add(self._name_context, 'name-error', self._name, message)
+
+        return types
+
+    def _get_origin_scope(self):
+        if isinstance(self._name, tree.Name):
+            scope = self._name
+            while scope.parent is not None:
+                # TODO why if classes?
+                if not isinstance(scope, tree.Scope):
+                    break
+                scope = scope.parent
+            return scope
+        else:
+            return None
+
+    def get_filters(self, search_global=False):
+        origin_scope = self._get_origin_scope()
+        if search_global:
+            return get_global_filters(self._evaluator, self._context, self._position, origin_scope)
+        else:
+            return self._context.get_filters(search_global, self._position, origin_scope=origin_scope)
+
+    def filter_name(self, filters):
+        """
+        Searches names that are defined in a scope (the different
+        ``filters``), until a name fits.
+        """
+        names = []
+        if self._context.predefined_names:
+            # TODO is this ok? node might not always be a tree.Name
+            node = self._name
+            while node is not None and not is_scope(node):
+                node = node.parent
+                if node.type in ("if_stmt", "for_stmt", "comp_for"):
+                    try:
+                        name_dict = self._context.predefined_names[node]
+                        types = name_dict[self._string_name]
+                    except KeyError:
+                        continue
+                    else:
+                        self._found_predefined_types = types
+                        break
+
+        for filter in filters:
+            names = filter.get(self._string_name)
+            if names:
+                if len(names) == 1:
+                    n, = names
+                    if isinstance(n, TreeNameDefinition):
+                        # Something somewhere went terribly wrong. This
+                        # typically happens when using goto on an import in an
+                        # __init__ file. I think we need a better solution, but
+                        # it's kind of hard, because for Jedi it's not clear
+                        # that that name has not been defined, yet.
+                        if n.tree_name == self._name:
+                            if self._name.get_definition().type == 'import_from':
+                                continue
+                break
+
+        debug.dbg('finder.filter_name "%s" in (%s): %s@%s', self._string_name,
+                  self._context, names, self._position)
+        return list(names)
+
+    def _check_getattr(self, inst):
+        """Checks for both __getattr__ and __getattribute__ methods"""
+        # str is important, because it shouldn't be `Name`!
+        name = compiled.create(self._evaluator, self._string_name)
+
+        # 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.
+        names = (inst.get_function_slot_names('__getattr__') or
+                 inst.get_function_slot_names('__getattribute__'))
+        return inst.execute_function_slots(names, name)
+
+    def _names_to_types(self, names, attribute_lookup):
+        types = set()
+
+        types = unite(name.infer() for name in names)
+
+        debug.dbg('finder._names_to_types: %s -> %s', names, types)
+        if not names and isinstance(self._context, AbstractInstanceContext):
+            # handling __getattr__ / __getattribute__
+            return self._check_getattr(self._context)
+
+        # Add isinstance and other if/assert knowledge.
+        if not types and isinstance(self._name, tree.Name) and \
+                not isinstance(self._name_context, AbstractInstanceContext):
+            flow_scope = self._name
+            base_node = self._name_context.tree_node
+            if base_node.type == 'comp_for':
+                return types
+            while True:
+                flow_scope = get_parent_scope(flow_scope, include_flows=True)
+                n = _check_flow_information(self._name_context, flow_scope,
+                                            self._name, self._position)
+                if n is not None:
+                    return n
+                if flow_scope == base_node:
+                    break
+        return types
+
+
+def _name_to_types(evaluator, context, tree_name):
+    types = []
+    node = tree_name.get_definition(import_name_always=True)
+    if node is None:
+        node = tree_name.parent
+        if node.type == 'global_stmt':
+            context = evaluator.create_context(context, tree_name)
+            finder = NameFinder(evaluator, context, context, tree_name.value)
+            filters = finder.get_filters(search_global=True)
+            # For global_stmt lookups, we only need the first possible scope,
+            # which means the function itself.
+            filters = [next(filters)]
+            return finder.find(filters, attribute_lookup=False)
+        elif node.type not in ('import_from', 'import_name'):
+            raise ValueError("Should not happen.")
+
+    typ = node.type
+    if typ == 'for_stmt':
+        types = pep0484.find_type_from_comment_hint_for(context, node, tree_name)
+        if types:
+            return types
+    if typ == 'with_stmt':
+        types = pep0484.find_type_from_comment_hint_with(context, node, tree_name)
+        if types:
+            return types
+    if typ in ('for_stmt', 'comp_for'):
+        try:
+            types = context.predefined_names[node][tree_name.value]
+        except KeyError:
+            cn = ContextualizedNode(context, node.children[3])
+            for_types = iterable.py__iter__types(evaluator, cn.infer(), cn)
+            c_node = ContextualizedName(context, tree_name)
+            types = check_tuple_assignments(evaluator, c_node, for_types)
+    elif typ == 'expr_stmt':
+        types = _remove_statements(evaluator, context, node, tree_name)
+    elif typ == 'with_stmt':
+        context_managers = context.eval_node(node.get_test_node_from_name(tree_name))
+        enter_methods = unite(
+            context_manager.py__getattribute__('__enter__')
+            for context_manager in context_managers
+        )
+        types = unite(method.execute_evaluated() for method in enter_methods)
+    elif typ in ('import_from', 'import_name'):
+        types = imports.infer_import(context, tree_name)
+    elif typ in ('funcdef', 'classdef'):
+        types = _apply_decorators(evaluator, context, node)
+    elif typ == 'try_stmt':
+        # 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 = context.eval_node(tree_name.get_previous_sibling().get_previous_sibling())
+        types = unite(
+            evaluator.execute(t, param.ValuesArguments([]))
+            for t in exceptions
+        )
+    else:
+        raise ValueError("Should not happen.")
+    return types
+
+
+def _apply_decorators(evaluator, context, node):
+    """
+    Returns the function, that should to be executed in the end.
+    This is also the places where the decorators are processed.
+    """
+    if node.type == 'classdef':
+        decoratee_context = er.ClassContext(
+            evaluator,
+            parent_context=context,
+            classdef=node
+        )
+    else:
+        decoratee_context = er.FunctionContext(
+            evaluator,
+            parent_context=context,
+            funcdef=node
+        )
+    initial = values = set([decoratee_context])
+    for dec in reversed(node.get_decorators()):
+        debug.dbg('decorator: %s %s', dec, values)
+        dec_values = context.eval_node(dec.children[1])
+        trailer_nodes = dec.children[2:-1]
+        if trailer_nodes:
+            # Create a trailer and evaluate it.
+            trailer = tree.PythonNode('trailer', trailer_nodes)
+            trailer.parent = dec
+            dec_values = evaluator.eval_trailer(context, dec_values, trailer)
+
+        if not len(dec_values):
+            debug.warning('decorator not found: %s on %s', dec, node)
+            return initial
+
+        values = unite(dec_value.execute(param.ValuesArguments([values]))
+                       for dec_value in dec_values)
+        if not len(values):
+            debug.warning('not possible to resolve wrappers found %s', node)
+            return initial
+
+        debug.dbg('decorator end %s', values)
+    return values
+
+
+def _remove_statements(evaluator, context, 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()
+    check_instance = None
+
+    pep0484types = \
+        pep0484.find_type_from_comment_hint_assign(context, stmt, name)
+    if pep0484types:
+        return pep0484types
+    types |= context.eval_stmt(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) else a for a in types])
+    return types
+
+
+def _check_flow_information(context, 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 = None
+    if is_scope(flow):
+        # Check for asserts.
+        module_node = flow.get_root_node()
+        try:
+            names = module_node.get_used_names()[search_name.value]
+        except KeyError:
+            return None
+        names = reversed([
+            n for n in names
+            if flow.start_pos <= n.start_pos < (pos or flow.end_pos)
+        ])
+
+        for name in names:
+            ass = search_ancestor(name, 'assert_stmt')
+            if ass is not None:
+                result = _check_isinstance_type(context, ass.assertion, search_name)
+                if result is not None:
+                    return result
+
+    if flow.type in ('if_stmt', 'while_stmt'):
+        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(context, if_test, search_name)
+    return result
+
+
+def _check_isinstance_type(context, 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 first.type == '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.TreeArguments(context.evaluator, context, arglist, trailer)
+        param_list = list(args.unpack())
+        # Disallow keyword arguments
+        assert len(param_list) == 2
+        (key1, lazy_context_object), (key2, lazy_context_cls) = param_list
+        assert key1 is None and key2 is None
+        call = helpers.call_of_leaf(search_name)
+        is_instance_call = helpers.call_of_leaf(lazy_context_object.data)
+        # Do a simple get_code comparison. They should just have the same code,
+        # and everything will be all right.
+        normalize = context.evaluator.grammar._normalize
+        assert normalize(is_instance_call) == normalize(call)
+    except AssertionError:
+        return None
+
+    result = set()
+    for cls_or_tup in lazy_context_cls.infer():
+        if isinstance(cls_or_tup, iterable.AbstractSequence) and \
+                cls_or_tup.array_type == 'tuple':
+            for lazy_context in cls_or_tup.py__iter__():
+                for context in lazy_context.infer():
+                    result |= context.execute_evaluated()
+        else:
+            result |= cls_or_tup.execute_evaluated()
+    return result
+
+
+def check_tuple_assignments(evaluator, contextualized_name, types):
+    """
+    Checks if tuples are assigned.
+    """
+    lazy_context = None
+    for index, node in contextualized_name.assignment_indexes():
+        cn = ContextualizedNode(contextualized_name.context, node)
+        iterated = iterable.py__iter__(evaluator, types, cn)
+        for _ in range(index + 1):
+            try:
+                lazy_context = 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.
+                return set()
+        types = lazy_context.infer()
+    return types
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/flow_analysis.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/flow_analysis.py
new file mode 100644
index 0000000..670b7a7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/flow_analysis.py
@@ -0,0 +1,112 @@
+from jedi.parser_utils import get_flow_branch_keyword, is_scope, get_parent_scope
+
+
+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 _get_flow_scopes(node):
+    while True:
+        node = get_parent_scope(node, include_flows=True)
+        if node is None or is_scope(node):
+            return
+        yield node
+
+
+def reachability_check(context, context_scope, node, origin_scope=None):
+    first_flow_scope = get_parent_scope(node, include_flows=True)
+    if origin_scope is not None:
+        origin_flow_scopes = list(_get_flow_scopes(origin_scope))
+        node_flow_scopes = list(_get_flow_scopes(node))
+
+        branch_matches = True
+        for flow_scope in origin_flow_scopes:
+            if flow_scope in node_flow_scopes:
+                node_keyword = get_flow_branch_keyword(flow_scope, node)
+                origin_keyword = get_flow_branch_keyword(flow_scope, origin_scope)
+                branch_matches = node_keyword == origin_keyword
+                if flow_scope.type == 'if_stmt':
+                    if not branch_matches:
+                        return UNREACHABLE
+                elif flow_scope.type == 'try_stmt':
+                    if not branch_matches and origin_keyword == 'else' \
+                            and node_keyword == 'except':
+                        return UNREACHABLE
+                break
+
+        # 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 first_flow_scope == origin_scope and branch_matches:
+                return REACHABLE
+            origin_scope = origin_scope.parent
+
+    return _break_check(context, context_scope, first_flow_scope, node)
+
+
+def _break_check(context, context_scope, flow_scope, node):
+    reachable = REACHABLE
+    if flow_scope.type == 'if_stmt':
+        if flow_scope.is_node_after_else(node):
+            for check_node in flow_scope.get_test_nodes():
+                reachable = _check_if(context, check_node)
+                if reachable in (REACHABLE, UNSURE):
+                    break
+            reachable = reachable.invert()
+        else:
+            flow_node = flow_scope.get_corresponding_test_node(node)
+            if flow_node is not None:
+                reachable = _check_if(context, flow_node)
+    elif flow_scope.type in ('try_stmt', 'while_stmt'):
+        return UNSURE
+
+    # Only reachable branches need to be examined further.
+    if reachable in (UNREACHABLE, UNSURE):
+        return reachable
+
+    if context_scope != flow_scope and context_scope != flow_scope.parent:
+        flow_scope = get_parent_scope(flow_scope, include_flows=True)
+        return reachable & _break_check(context, context_scope, flow_scope, node)
+    else:
+        return reachable
+
+
+def _check_if(context, node):
+    types = context.eval_node(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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/helpers.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/helpers.py
new file mode 100644
index 0000000..b2de367
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/helpers.py
@@ -0,0 +1,174 @@
+import copy
+import sys
+import re
+import os
+from itertools import chain
+from contextlib import contextmanager
+
+from parso.python import tree
+from jedi.parser_utils import get_parent_scope
+
+
+def is_stdlib_path(path):
+    # Python standard library paths look like this:
+    # /usr/lib/python3.5/...
+    # TODO The implementation below is probably incorrect and not complete.
+    if 'dist-packages' in path or 'site-packages' in path:
+        return False
+
+    base_path = os.path.join(sys.prefix, 'lib', 'python')
+    return bool(re.match(re.escape(base_path) + '\d.\d', path))
+
+
+def deep_ast_copy(obj):
+    """
+    Much, much faster than copy.deepcopy, but just for parser tree nodes.
+    """
+    # If it's already in the cache, just return it.
+    new_obj = copy.copy(obj)
+
+    # Copy children
+    new_children = []
+    for child in obj.children:
+        if isinstance(child, tree.Leaf):
+            new_child = copy.copy(child)
+            new_child.parent = new_obj
+        else:
+            new_child = deep_ast_copy(child)
+            new_child.parent = new_obj
+        new_children.append(new_child)
+    new_obj.children = new_children
+
+    return new_obj
+
+
+def evaluate_call_of_leaf(context, 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 context.eval_node(trailer)
+        return context.eval_node(leaf)
+
+    power = trailer.parent
+    index = power.children.index(trailer)
+    if cut_own_trailer:
+        cut = index
+    else:
+        cut = index + 1
+
+    if power.type == 'error_node':
+        start = index
+        while True:
+            start -= 1
+            base = power.children[start]
+            if base.type != 'trailer':
+                break
+        trailers = power.children[start + 1: index + 1]
+    else:
+        base = power.children[0]
+        trailers = power.children[1:cut]
+
+    values = context.eval_node(base)
+    for trailer in trailers:
+        values = context.eval_trailer(values, trailer)
+    return values
+
+
+def call_of_leaf(leaf):
+    """
+    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 this is the old version of this call. Try to remove it.
+    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)
+
+    new_power = copy.copy(power)
+    new_power.children = list(new_power.children)
+    new_power.children[index + 1:] = []
+
+    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.
+    """
+    names = chain.from_iterable(module.get_used_names().values())
+    if not all_scopes:
+        # We have to filter all the names that don't have the module as a
+        # parent_scope. There's None as a parent, because nodes in the module
+        # node have the parent module and not suite as all the others.
+        # Therefore it's important to catch that case.
+        names = [n for n in names if get_parent_scope(n).parent in (module, None)]
+    return names
+
+
+@contextmanager
+def predefine_names(context, flow_scope, dct):
+    predefined = context.predefined_names
+    if flow_scope in predefined:
+        raise NotImplementedError('Why does this happen?')
+    predefined[flow_scope] = dct
+    try:
+        yield
+    finally:
+        del predefined[flow_scope]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/imports.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/imports.py
new file mode 100644
index 0000000..d0aec51
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/imports.py
@@ -0,0 +1,564 @@
+"""
+: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 parso.python import tree
+from parso.tree import search_ancestor
+from parso.cache import parser_cache
+from parso import python_bytes_to_unicode
+
+from jedi._compatibility import find_module, unicode, ImplicitNSInfo
+from jedi import debug
+from jedi import settings
+from jedi.common import unite
+from jedi.evaluate import sys_path
+from jedi.evaluate import helpers
+from jedi.evaluate import compiled
+from jedi.evaluate import analysis
+from jedi.evaluate.cache import evaluator_method_cache
+from jedi.evaluate.filters import AbstractNameDefinition
+
+
+# This memoization is needed, because otherwise we will infinitely loop on
+# certain imports.
+@evaluator_method_cache(default=set())
+def infer_import(context, tree_name, is_goto=False):
+    module_context = context.get_root_context()
+    import_node = search_ancestor(tree_name, 'import_name', 'import_from')
+    import_path = import_node.get_path_for_name(tree_name)
+    from_import_name = None
+    evaluator = context.evaluator
+    try:
+        from_names = import_node.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(evaluator, tuple(import_path),
+                        module_context, import_node.level)
+
+    types = importer.follow()
+
+    #if import_node.is_nested() and not self.nested_resolve:
+    #    scopes = [NestedImportModule(module, import_node)]
+
+    if not types:
+        return set()
+
+    if from_import_name is not None:
+        types = unite(
+            t.py__getattribute__(
+                from_import_name,
+                name_context=context,
+                is_goto=is_goto,
+                analysis_errors=False
+            ) for t in types
+        )
+
+        if not types:
+            path = import_path + [from_import_name]
+            importer = Importer(evaluator, tuple(path),
+                                module_context, import_node.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(context, name, message=None):
+    # Should be a name, not a string!
+    if hasattr(name, 'parent'):
+        analysis.add(context, '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 ImportName(AbstractNameDefinition):
+    start_pos = (1, 0)
+    _level = 0
+
+    def __init__(self, parent_context, string_name):
+        self.parent_context = parent_context
+        self.string_name = string_name
+
+    def infer(self):
+        return Importer(
+            self.parent_context.evaluator,
+            [self.string_name],
+            self.parent_context,
+            level=self._level,
+        ).follow()
+
+    def goto(self):
+        return [m.name for m in self.infer()]
+
+    def get_root_context(self):
+        # Not sure if this is correct.
+        return self.parent_context.get_root_context()
+
+    @property
+    def api_type(self):
+        return 'module'
+
+
+class SubModuleName(ImportName):
+    _level = 1
+
+
+class Importer(object):
+    def __init__(self, evaluator, import_path, module_context, 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_context = module_context
+        try:
+            self.file_path = module_context.py__file__()
+        except AttributeError:
+            # Can be None for certain compiled modules like 'builtins'.
+            self.file_path = None
+
+        if level:
+            base = module_context.py__package__().split('.')
+            if base == ['']:
+                base = []
+            if level > len(base):
+                path = module_context.py__file__()
+                if path is not None:
+                    import_path = list(import_path)
+                    p = path
+                    for i in range(level):
+                        p = os.path.dirname(p)
+                    dir_name = os.path.basename(p)
+                    # 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:
+                        # TODO those sys.modules modifications are getting
+                        # really stupid. this is the 3rd time that we're using
+                        # this. We should probably refactor.
+                        if path.endswith(os.path.sep + 'os.py'):
+                            import_path.insert(0, 'os')
+                        else:
+                            import_path.insert(0, dir_name)
+                    else:
+                        _add_error(module_context, import_path[-1])
+                        import_path = []
+                        # TODO add import error.
+                        debug.warning('Attempted relative import beyond top-level package.')
+                # If no path is defined in the module we have no ideas where we
+                # are in the file system. Therefore we cannot know what to do.
+                # In this case we just let the path there and ignore that it's
+                # a relative path. Not sure if that's a good idea.
+            else:
+                # Here we basically rewrite the level to 0.
+                base = tuple(base)
+                if level > 1:
+                    base = base[:-level + 1]
+
+                import_path = 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(
+            name.value if isinstance(name, tree.Name) else name
+            for name in self.import_path)
+
+    def sys_path_with_modifications(self):
+        in_path = []
+        sys_path_mod = list(sys_path.sys_path_with_modifications(
+            self._evaluator,
+            self.module_context
+        ))
+        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
+
+    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 = [
+            i.value if isinstance(i, tree.Name) else 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 import_parts == ['os', 'path']:
+                return parent_module.py__getattribute__('path')
+
+            try:
+                method = parent_module.py__path__
+            except AttributeError:
+                # The module is not a package.
+                _add_error(self.module_context, import_path[-1])
+                return set()
+            else:
+                paths = method()
+                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:
+                        if not isinstance(path, list):
+                            path = [path]
+                        module_file, module_path, is_pkg = \
+                            find_module(import_parts[-1], path, fullname=module_name)
+                        break
+                    except ImportError:
+                        module_path = None
+                if module_path is None:
+                    _add_error(self.module_context, 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], fullname=module_name)
+                finally:
+                    sys.path = temp
+            except ImportError:
+                # The module is not a package.
+                _add_error(self.module_context, import_path[-1])
+                return set()
+
+        code = 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')):
+                code = module_file.loader.get_source(module_name)
+            else:
+                module_path = get_init_path(module_path)
+        elif module_file:
+            code = module_file.read()
+            module_file.close()
+
+        if isinstance(module_path, ImplicitNSInfo):
+            from jedi.evaluate.representation import ImplicitNamespaceContext
+            fullname, paths = module_path.name, module_path.paths
+            module = ImplicitNamespaceContext(self._evaluator, fullname=fullname)
+            module.paths = paths
+        elif 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, code, 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, in_module=None):
+        # Create a pseudo import to be able to follow them.
+        if in_module is None:
+            return ImportName(self.module_context, name)
+        return SubModuleName(in_module, name)
+
+    def _get_module_names(self, search_path=None, in_module=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 and in_module 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, in_module=in_module))
+        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.representation import ModuleContext, ImplicitNamespaceContext
+        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 = mod.string_name
+                    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 context in self.follow():
+                # Non-modules are not completable.
+                if context.api_type != 'module':  # not a module
+                    continue
+                # namespace packages
+                if isinstance(context, ModuleContext) and context.py__file__().endswith('__init__.py'):
+                    paths = context.py__path__()
+                    names += self._get_module_names(paths, in_module=context)
+
+                # implicit namespace packages
+                elif isinstance(context, ImplicitNamespaceContext):
+                    paths = context.paths
+                    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', context))
+
+                    continue
+
+                for filter in context.get_filters(search_global=False):
+                    names += filter.values()
+        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, code=None, sys_path=None, parent_module=None):
+    if sys_path is None:
+        sys_path = evaluator.sys_path
+
+    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:
+
+        module_node = evaluator.grammar.parse(
+            code=code, path=path, cache=True, diff_cache=True,
+            cache_path=settings.cache_directory)
+
+        from jedi.evaluate.representation import ModuleContext
+        return ModuleContext(evaluator, module_node, path=path)
+    else:
+        return compiled.load_module(evaluator, path)
+
+
+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, modules, name):
+    """
+    Search a name in the directories of modules.
+    """
+    from jedi.evaluate import representation as er
+
+    def check_python_file(path):
+        try:
+            # TODO I don't think we should use the cache here?!
+            node_cache_item = parser_cache[evaluator.grammar._hashed][path]
+        except KeyError:
+            try:
+                return check_fs(path)
+            except IOError:
+                return None
+        else:
+            module_node = node_cache_item.node
+            return er.ModuleContext(evaluator, module_node, path=path)
+
+    def check_fs(path):
+        with open(path, 'rb') as f:
+            code = python_bytes_to_unicode(f.read(), errors='replace')
+            if name in code:
+                module = _load_module(evaluator, path, code)
+
+                module_name = sys_path.dotted_path_in_sys_path(evaluator.sys_path, path)
+                if module_name is not None:
+                    add_module(evaluator, module_name, module)
+                return module
+
+    # skip non python modules
+    used_mod_paths = set()
+    for m in modules:
+        try:
+            path = m.py__file__()
+        except AttributeError:
+            pass
+        else:
+            used_mod_paths.add(path)
+        yield m
+
+    if not settings.dynamic_params_for_other_modules:
+        return
+
+    paths = set(settings.additional_dynamic_modules)
+    for p in used_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 file_name in os.listdir(d):
+                path = os.path.join(d, file_name)
+                if path not in used_mod_paths and path not in paths:
+                    if file_name.endswith('.py'):
+                        paths.add(path)
+
+    # Sort here to make issues less random.
+    for p in sorted(paths):
+        # make testing easier, sort it - same results on every interpreter
+        m = check_python_file(p)
+        if m is not None and not isinstance(m, compiled.CompiledObject):
+            yield m
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/instance.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/instance.py
new file mode 100644
index 0000000..6ce26f6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/instance.py
@@ -0,0 +1,433 @@
+from abc import abstractproperty
+
+from jedi._compatibility import is_py3
+from jedi.common import unite
+from jedi import debug
+from jedi.evaluate import compiled
+from jedi.evaluate import filters
+from jedi.evaluate.context import Context, LazyKnownContext, LazyKnownContexts
+from jedi.evaluate.cache import evaluator_method_cache
+from jedi.evaluate.param import AbstractArguments, AnonymousArguments
+from jedi.cache import memoize_method
+from jedi.evaluate import representation as er
+from jedi.evaluate import iterable
+from jedi.parser_utils import get_parent_scope
+
+
+
+class InstanceFunctionExecution(er.FunctionExecutionContext):
+    def __init__(self, instance, parent_context, function_context, var_args):
+        self.instance = instance
+        var_args = InstanceVarArgs(self, var_args)
+
+        super(InstanceFunctionExecution, self).__init__(
+            instance.evaluator, parent_context, function_context, var_args)
+
+
+class AnonymousInstanceFunctionExecution(er.FunctionExecutionContext):
+    function_execution_filter = filters.AnonymousInstanceFunctionExecutionFilter
+
+    def __init__(self, instance, parent_context, function_context, var_args):
+        self.instance = instance
+        super(AnonymousInstanceFunctionExecution, self).__init__(
+            instance.evaluator, parent_context, function_context, var_args)
+
+
+class AbstractInstanceContext(Context):
+    """
+    This class is used to evaluate instances.
+    """
+    api_type = 'instance'
+    function_execution_cls = InstanceFunctionExecution
+
+    def __init__(self, evaluator, parent_context, class_context, var_args):
+        super(AbstractInstanceContext, self).__init__(evaluator, parent_context)
+        # Generated instances are classes that are just generated by self
+        # (No var_args) used.
+        self.class_context = class_context
+        self.var_args = var_args
+
+    def is_class(self):
+        return False
+
+    @property
+    def py__call__(self):
+        names = self.get_function_slot_names('__call__')
+        if not names:
+            # Means the Instance is not callable.
+            raise AttributeError
+
+        def execute(arguments):
+            return unite(name.execute(arguments) for name in names)
+
+        return execute
+
+    def py__class__(self):
+        return self.class_context
+
+    def py__bool__(self):
+        # Signalize that we don't know about the bool type.
+        return None
+
+    def get_function_slot_names(self, name):
+        # Python classes don't look at the dictionary of the instance when
+        # looking up `__call__`. This is something that has to do with Python's
+        # internal slot system (note: not __slots__, but C slots).
+        for filter in self.get_filters(include_self_names=False):
+            names = filter.get(name)
+            if names:
+                return names
+        return []
+
+    def execute_function_slots(self, names, *evaluated_args):
+        return unite(
+            name.execute_evaluated(*evaluated_args)
+            for name in names
+        )
+
+    def py__get__(self, obj):
+        # Arguments in __get__ descriptors are obj, class.
+        # `method` is the new parent of the array, don't know if that's good.
+        names = self.get_function_slot_names('__get__')
+        if names:
+            if isinstance(obj, AbstractInstanceContext):
+                return self.execute_function_slots(names, obj, obj.class_context)
+            else:
+                none_obj = compiled.create(self.evaluator, None)
+                return self.execute_function_slots(names, none_obj, obj)
+        else:
+            return set([self])
+
+    def get_filters(self, search_global=None, until_position=None,
+                    origin_scope=None, include_self_names=True):
+        if include_self_names:
+            for cls in self.class_context.py__mro__():
+                if isinstance(cls, compiled.CompiledObject):
+                    if cls.tree_node is not None:
+                        # In this case we're talking about a fake object, it
+                        # doesn't make sense for normal compiled objects to
+                        # search for self variables.
+                        yield SelfNameFilter(self.evaluator, self, cls, origin_scope)
+                else:
+                    yield SelfNameFilter(self.evaluator, self, cls, origin_scope)
+
+        for cls in self.class_context.py__mro__():
+            if isinstance(cls, compiled.CompiledObject):
+                yield CompiledInstanceClassFilter(self.evaluator, self, cls)
+            else:
+                yield InstanceClassFilter(self.evaluator, self, cls, origin_scope)
+
+    def py__getitem__(self, index):
+        try:
+            names = self.get_function_slot_names('__getitem__')
+        except KeyError:
+            debug.warning('No __getitem__, cannot access the array.')
+            return set()
+        else:
+            index_obj = compiled.create(self.evaluator, index)
+            return self.execute_function_slots(names, index_obj)
+
+    def py__iter__(self):
+        iter_slot_names = self.get_function_slot_names('__iter__')
+        if not iter_slot_names:
+            debug.warning('No __iter__ on %s.' % self)
+            return
+
+        for generator in self.execute_function_slots(iter_slot_names):
+            if isinstance(generator, AbstractInstanceContext):
+                # `__next__` logic.
+                name = '__next__' if is_py3 else 'next'
+                iter_slot_names = generator.get_function_slot_names(name)
+                if iter_slot_names:
+                    yield LazyKnownContexts(
+                        generator.execute_function_slots(iter_slot_names)
+                    )
+                else:
+                    debug.warning('Instance has no __next__ function in %s.', generator)
+            else:
+                for lazy_context in generator.py__iter__():
+                    yield lazy_context
+
+    @abstractproperty
+    def name(self):
+        pass
+
+    def _create_init_execution(self, class_context, func_node):
+        bound_method = BoundMethod(
+            self.evaluator, self, class_context, self.parent_context, func_node
+        )
+        return self.function_execution_cls(
+            self,
+            class_context.parent_context,
+            bound_method,
+            self.var_args
+        )
+
+    def create_init_executions(self):
+        for name in self.get_function_slot_names('__init__'):
+            if isinstance(name, LazyInstanceName):
+                yield self._create_init_execution(name.class_context, name.tree_name.parent)
+
+    @evaluator_method_cache()
+    def create_instance_context(self, class_context, node):
+        if node.parent.type in ('funcdef', 'classdef'):
+            node = node.parent
+        scope = get_parent_scope(node)
+        if scope == class_context.tree_node:
+            return class_context
+        else:
+            parent_context = self.create_instance_context(class_context, scope)
+            if scope.type == 'funcdef':
+                if scope.name.value == '__init__' and parent_context == class_context:
+                    return self._create_init_execution(class_context, scope)
+                else:
+                    bound_method = BoundMethod(
+                        self.evaluator, self, class_context,
+                        parent_context, scope
+                    )
+                    return bound_method.get_function_execution()
+            elif scope.type == 'classdef':
+                class_context = er.ClassContext(self.evaluator, scope, parent_context)
+                return class_context
+            elif scope.type == 'comp_for':
+                # Comprehensions currently don't have a special scope in Jedi.
+                return self.create_instance_context(class_context, scope)
+            else:
+                raise NotImplementedError
+        return class_context
+
+    def __repr__(self):
+        return "<%s of %s(%s)>" % (self.__class__.__name__, self.class_context,
+                                   self.var_args)
+
+
+class CompiledInstance(AbstractInstanceContext):
+    def __init__(self, *args, **kwargs):
+        super(CompiledInstance, self).__init__(*args, **kwargs)
+        # I don't think that dynamic append lookups should happen here. That
+        # sounds more like something that should go to py__iter__.
+        if self.class_context.name.string_name in ['list', 'set'] \
+                and self.parent_context.get_root_context() == self.evaluator.BUILTINS:
+            # compare the module path with the builtin name.
+            self.var_args = iterable.get_dynamic_array_instance(self)
+
+    @property
+    def name(self):
+        return compiled.CompiledContextName(self, self.class_context.name.string_name)
+
+    def create_instance_context(self, class_context, node):
+        if get_parent_scope(node).type == 'classdef':
+            return class_context
+        else:
+            return super(CompiledInstance, self).create_instance_context(class_context, node)
+
+
+class TreeInstance(AbstractInstanceContext):
+    def __init__(self, evaluator, parent_context, class_context, var_args):
+        super(TreeInstance, self).__init__(evaluator, parent_context,
+                                           class_context, var_args)
+        self.tree_node = class_context.tree_node
+
+    @property
+    def name(self):
+        return filters.ContextName(self, self.class_context.name.tree_name)
+
+
+class AnonymousInstance(TreeInstance):
+    function_execution_cls = AnonymousInstanceFunctionExecution
+
+    def __init__(self, evaluator, parent_context, class_context):
+        super(AnonymousInstance, self).__init__(
+            evaluator,
+            parent_context,
+            class_context,
+            var_args=AnonymousArguments(),
+        )
+
+
+class CompiledInstanceName(compiled.CompiledName):
+    def __init__(self, evaluator, instance, parent_context, name):
+        super(CompiledInstanceName, self).__init__(evaluator, parent_context, name)
+        self._instance = instance
+
+    def infer(self):
+        for result_context in super(CompiledInstanceName, self).infer():
+            if isinstance(result_context, er.FunctionContext):
+                parent_context = result_context.parent_context
+                while parent_context.is_class():
+                    parent_context = parent_context.parent_context
+
+                yield BoundMethod(
+                    result_context.evaluator, self._instance, self.parent_context,
+                    parent_context, result_context.tree_node
+                )
+            else:
+                if result_context.api_type == 'function':
+                    yield CompiledBoundMethod(result_context)
+                else:
+                    yield result_context
+
+
+class CompiledInstanceClassFilter(compiled.CompiledObjectFilter):
+    name_class = CompiledInstanceName
+
+    def __init__(self, evaluator, instance, compiled_object):
+        super(CompiledInstanceClassFilter, self).__init__(
+            evaluator,
+            compiled_object,
+            is_instance=True,
+        )
+        self._instance = instance
+
+    def _create_name(self, name):
+        return self.name_class(
+            self._evaluator, self._instance, self._compiled_object, name)
+
+
+class BoundMethod(er.FunctionContext):
+    def __init__(self, evaluator, instance, class_context, *args, **kwargs):
+        super(BoundMethod, self).__init__(evaluator, *args, **kwargs)
+        self._instance = instance
+        self._class_context = class_context
+
+    def get_function_execution(self, arguments=None):
+        if arguments is None:
+            arguments = AnonymousArguments()
+            return AnonymousInstanceFunctionExecution(
+                self._instance, self.parent_context, self, arguments)
+        else:
+            return InstanceFunctionExecution(
+                self._instance, self.parent_context, self, arguments)
+
+
+class CompiledBoundMethod(compiled.CompiledObject):
+    def __init__(self, func):
+        super(CompiledBoundMethod, self).__init__(
+            func.evaluator, func.obj, func.parent_context, func.tree_node)
+
+    def get_param_names(self):
+        return list(super(CompiledBoundMethod, self).get_param_names())[1:]
+
+
+class InstanceNameDefinition(filters.TreeNameDefinition):
+    def infer(self):
+        contexts = super(InstanceNameDefinition, self).infer()
+        for context in contexts:
+            yield context
+
+
+class LazyInstanceName(filters.TreeNameDefinition):
+    """
+    This name calculates the parent_context lazily.
+    """
+    def __init__(self, instance, class_context, tree_name):
+        self._instance = instance
+        self.class_context = class_context
+        self.tree_name = tree_name
+
+    @property
+    def parent_context(self):
+        return self._instance.create_instance_context(self.class_context, self.tree_name)
+
+
+class LazyInstanceClassName(LazyInstanceName):
+    def infer(self):
+        for result_context in super(LazyInstanceClassName, self).infer():
+            if isinstance(result_context, er.FunctionContext):
+                # Classes are never used to resolve anything within the
+                # functions. Only other functions and modules will resolve
+                # those things.
+                parent_context = result_context.parent_context
+                while parent_context.is_class():
+                    parent_context = parent_context.parent_context
+
+                yield BoundMethod(
+                    result_context.evaluator, self._instance, self.class_context,
+                    parent_context, result_context.tree_node
+                )
+            else:
+                for c in er.apply_py__get__(result_context, self._instance):
+                    yield c
+
+
+class InstanceClassFilter(filters.ParserTreeFilter):
+    name_class = LazyInstanceClassName
+
+    def __init__(self, evaluator, context, class_context, origin_scope):
+        super(InstanceClassFilter, self).__init__(
+            evaluator=evaluator,
+            context=context,
+            node_context=class_context,
+            origin_scope=origin_scope
+        )
+        self._class_context = class_context
+
+    def _equals_origin_scope(self):
+        node = self._origin_scope
+        while node is not None:
+            if node == self._parser_scope or node == self.context:
+                return True
+            node = get_parent_scope(node)
+        return False
+
+    def _access_possible(self, name):
+        return not name.value.startswith('__') or name.value.endswith('__') \
+            or self._equals_origin_scope()
+
+    def _filter(self, names):
+        names = super(InstanceClassFilter, self)._filter(names)
+        return [name for name in names if self._access_possible(name)]
+
+    def _convert_names(self, names):
+        return [self.name_class(self.context, self._class_context, name) for name in names]
+
+
+class SelfNameFilter(InstanceClassFilter):
+    name_class = LazyInstanceName
+
+    def _filter(self, names):
+        names = self._filter_self_names(names)
+        if isinstance(self._parser_scope, compiled.CompiledObject) and False:
+            # This would be for builtin skeletons, which are not yet supported.
+            return list(names)
+        else:
+            start, end = self._parser_scope.start_pos, self._parser_scope.end_pos
+            return [n for n in names if start < n.start_pos < end]
+
+    def _filter_self_names(self, names):
+        for name in names:
+            trailer = name.parent
+            if trailer.type == 'trailer' \
+                    and len(trailer.children) == 2 \
+                    and trailer.children[0] == '.':
+                if name.is_definition() and self._access_possible(name):
+                    yield name
+
+    def _check_flows(self, names):
+        return names
+
+
+class InstanceVarArgs(AbstractArguments):
+    def __init__(self, execution_context, var_args):
+        self._execution_context = execution_context
+        self._var_args = var_args
+
+    @memoize_method
+    def _get_var_args(self):
+        return self._var_args
+
+    @property
+    def argument_node(self):
+        return self._var_args.argument_node
+
+    @property
+    def trailer(self):
+        return self._var_args.trailer
+
+    def unpack(self, func=None):
+        yield None, LazyKnownContext(self._execution_context.instance)
+        for values in self._get_var_args().unpack(func):
+            yield values
+
+    def get_calling_nodes(self):
+        return self._get_var_args().get_calling_nodes()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/iterable.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/iterable.py
new file mode 100644
index 0000000..83cf8cf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/iterable.py
@@ -0,0 +1,884 @@
+"""
+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 import debug
+from jedi import settings
+from jedi import common
+from jedi.common import unite, safe_property
+from jedi._compatibility import unicode, zip_longest, is_py3
+from jedi.evaluate import compiled
+from jedi.evaluate import helpers
+from jedi.evaluate import analysis
+from jedi.evaluate import pep0484
+from jedi.evaluate import context
+from jedi.evaluate import precedence
+from jedi.evaluate import recursion
+from jedi.evaluate.cache import evaluator_method_cache
+from jedi.evaluate.filters import DictFilter, AbstractNameDefinition, \
+    ParserTreeFilter
+from jedi.parser_utils import get_comp_fors
+
+
+class AbstractSequence(context.Context):
+    builtin_methods = {}
+    api_type = 'instance'
+
+    def __init__(self, evaluator):
+        super(AbstractSequence, self).__init__(evaluator, evaluator.BUILTINS)
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        raise NotImplementedError
+
+    @property
+    def name(self):
+        return compiled.CompiledContextName(self, self.array_type)
+
+
+class BuiltinMethod(object):
+    """``Generator.__next__`` ``dict.values`` methods and so on."""
+    def __init__(self, builtin_context, method, builtin_func):
+        self._builtin_context = builtin_context
+        self._method = method
+        self._builtin_func = builtin_func
+
+    def py__call__(self, params):
+        return self._method(self._builtin_context)
+
+    def __getattr__(self, name):
+        return getattr(self._builtin_func, name)
+
+
+class SpecialMethodFilter(DictFilter):
+    """
+    A filter for methods that are defined in this module on the corresponding
+    classes like Generator (for __next__, etc).
+    """
+    class SpecialMethodName(AbstractNameDefinition):
+        api_type = 'function'
+
+        def __init__(self, parent_context, string_name, callable_, builtin_context):
+            self.parent_context = parent_context
+            self.string_name = string_name
+            self._callable = callable_
+            self._builtin_context = builtin_context
+
+        def infer(self):
+            filter = next(self._builtin_context.get_filters())
+            # We can take the first index, because on builtin methods there's
+            # always only going to be one name. The same is true for the
+            # inferred values.
+            builtin_func = next(iter(filter.get(self.string_name)[0].infer()))
+            return set([BuiltinMethod(self.parent_context, self._callable, builtin_func)])
+
+    def __init__(self, context, dct, builtin_context):
+        super(SpecialMethodFilter, self).__init__(dct)
+        self.context = context
+        self._builtin_context = builtin_context
+        """
+        This context is what will be used to introspect the name, where as the
+        other context will be used to execute the function.
+
+        We distinguish, because we have to.
+        """
+
+    def _convert(self, name, value):
+        return self.SpecialMethodName(self.context, name, value, self._builtin_context)
+
+
+def has_builtin_methods(cls):
+    base_dct = {}
+    # Need to care properly about inheritance. Builtin Methods should not get
+    # lost, just because they are not mentioned in a class.
+    for base_cls in reversed(cls.__bases__):
+        try:
+            base_dct.update(base_cls.builtin_methods)
+        except AttributeError:
+            pass
+
+    cls.builtin_methods = base_dct
+    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, python_version_match=None):
+    def wrapper(func):
+        if python_version_match and python_version_match != 2 + int(is_py3):
+            # Some functions do only apply to certain versions.
+            return func
+        dct = func.__dict__.setdefault('registered_builtin_methods', {})
+        dct[method_name] = func
+        return func
+    return wrapper
+
+
+@has_builtin_methods
+class GeneratorMixin(object):
+    array_type = None
+
+    @register_builtin_method('send')
+    @register_builtin_method('next', python_version_match=2)
+    @register_builtin_method('__next__', python_version_match=3)
+    def py__next__(self):
+        # TODO add TypeError if params are given.
+        return unite(lazy_context.infer() for lazy_context in self.py__iter__())
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        gen_obj = compiled.get_special_object(self.evaluator, 'GENERATOR_OBJECT')
+        yield SpecialMethodFilter(self, self.builtin_methods, gen_obj)
+        for filter in gen_obj.get_filters(search_global):
+            yield filter
+
+    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__()
+
+    @property
+    def name(self):
+        return compiled.CompiledContextName(self, 'generator')
+
+
+class Generator(GeneratorMixin, context.Context):
+    """Handling of `yield` functions."""
+    def __init__(self, evaluator, func_execution_context):
+        super(Generator, self).__init__(evaluator, parent_context=evaluator.BUILTINS)
+        self._func_execution_context = func_execution_context
+
+    def py__iter__(self):
+        return self._func_execution_context.get_yield_values()
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self._func_execution_context)
+
+
+class CompForContext(context.TreeContext):
+    @classmethod
+    def from_comp_for(cls, parent_context, comp_for):
+        return cls(parent_context.evaluator, parent_context, comp_for)
+
+    def __init__(self, evaluator, parent_context, comp_for):
+        super(CompForContext, self).__init__(evaluator, parent_context)
+        self.tree_node = comp_for
+
+    def get_node(self):
+        return self.tree_node
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        yield ParserTreeFilter(self.evaluator, self)
+
+
+class Comprehension(AbstractSequence):
+    @staticmethod
+    def from_atom(evaluator, context, 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, context, atom)
+
+    def __init__(self, evaluator, defining_context, atom):
+        super(Comprehension, self).__init__(evaluator)
+        self._defining_context = defining_context
+        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]
+
+    def _eval_node(self, index=0):
+        """
+        The first part `x + 1` of the list comprehension:
+
+            [x + 1 for x in foo]
+        """
+        return self._get_comprehension().children[index]
+
+    @evaluator_method_cache()
+    def _get_comp_for_context(self, parent_context, comp_for):
+        # TODO shouldn't this be part of create_context?
+        return CompForContext.from_comp_for(parent_context, comp_for)
+
+    def _nested(self, comp_fors, parent_context=None):
+        evaluator = self.evaluator
+        comp_for = comp_fors[0]
+        input_node = comp_for.children[3]
+        parent_context = parent_context or self._defining_context
+        input_types = parent_context.eval_node(input_node)
+
+        cn = context.ContextualizedNode(parent_context, input_node)
+        iterated = py__iter__(evaluator, input_types, cn)
+        exprlist = comp_for.children[1]
+        for i, lazy_context in enumerate(iterated):
+            types = lazy_context.infer()
+            dct = unpack_tuple_to_dict(parent_context, types, exprlist)
+            context_ = self._get_comp_for_context(
+                parent_context,
+                comp_for,
+            )
+            with helpers.predefine_names(context_, comp_for, dct):
+                try:
+                    for result in self._nested(comp_fors[1:], context_):
+                        yield result
+                except IndexError:
+                    iterated = context_.eval_node(self._eval_node())
+                    if self.array_type == 'dict':
+                        yield iterated, context_.eval_node(self._eval_node(2))
+                    else:
+                        yield iterated
+
+    @evaluator_method_cache(default=[])
+    @common.to_list
+    def _iterate(self):
+        comp_fors = tuple(get_comp_fors(self._get_comp_for()))
+        for result in self._nested(comp_fors):
+            yield result
+
+    def py__iter__(self):
+        for set_ in self._iterate():
+            yield context.LazyKnownContexts(set_)
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self._atom)
+
+
+class ArrayMixin(object):
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        # `array.type` is a string with the type, e.g. 'list'.
+        compiled_obj = compiled.builtin_from_name(self.evaluator, self.array_type)
+        yield SpecialMethodFilter(self, self.builtin_methods, compiled_obj)
+        for typ in compiled_obj.execute_evaluated(self):
+            for filter in typ.get_filters():
+                yield filter
+
+    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.array_type)
+
+    @safe_property
+    def parent(self):
+        return self.evaluator.BUILTINS
+
+    def dict_values(self):
+        return unite(self._defining_context.eval_node(v) for k, v in self._items())
+
+
+class ListComprehension(ArrayMixin, Comprehension):
+    array_type = 'list'
+
+    def py__getitem__(self, index):
+        if isinstance(index, slice):
+            return set([self])
+
+        all_types = list(self.py__iter__())
+        return all_types[index].infer()
+
+
+class SetComprehension(ArrayMixin, Comprehension):
+    array_type = 'set'
+
+
+@has_builtin_methods
+class DictComprehension(ArrayMixin, Comprehension):
+    array_type = 'dict'
+
+    def _get_comp_for(self):
+        return self._get_comprehension().children[3]
+
+    def py__iter__(self):
+        for keys, values in self._iterate():
+            yield context.LazyKnownContexts(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('values')
+    def _imitate_values(self):
+        lazy_context = context.LazyKnownContexts(self.dict_values())
+        return set([FakeSequence(self.evaluator, 'list', [lazy_context])])
+
+    @register_builtin_method('items')
+    def _imitate_items(self):
+        items = set(
+            FakeSequence(
+                self.evaluator, 'tuple'
+                (context.LazyKnownContexts(keys), context.LazyKnownContexts(values))
+            ) for keys, values in self._iterate()
+        )
+
+        return create_evaluated_sequence_set(self.evaluator, items, sequence_type='list')
+
+
+class GeneratorComprehension(GeneratorMixin, Comprehension):
+    pass
+
+
+class SequenceLiteralContext(ArrayMixin, AbstractSequence):
+    mapping = {'(': 'tuple',
+               '[': 'list',
+               '{': 'set'}
+
+    def __init__(self, evaluator, defining_context, atom):
+        super(SequenceLiteralContext, self).__init__(evaluator)
+        self.atom = atom
+        self._defining_context = defining_context
+
+        if self.atom.type in ('testlist_star_expr', 'testlist'):
+            self.array_type = 'tuple'
+        else:
+            self.array_type = SequenceLiteralContext.mapping[atom.children[0]]
+            """The builtin name of the array (list, set, tuple or dict)."""
+
+    def py__getitem__(self, index):
+        """Here the index is an int/str. Raises IndexError/KeyError."""
+        if self.array_type == 'dict':
+            for key, value in self._items():
+                for k in self._defining_context.eval_node(key):
+                    if isinstance(k, compiled.CompiledObject) \
+                            and index == k.obj:
+                        return self._defining_context.eval_node(value)
+            raise KeyError('No key found in dictionary %s.' % self)
+
+        # Can raise an IndexError
+        if isinstance(index, slice):
+            return set([self])
+        else:
+            return self._defining_context.eval_node(self._items()[index])
+
+    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.array_type == 'dict':
+            # Get keys.
+            types = set()
+            for k, _ in self._items():
+                types |= self._defining_context.eval_node(k)
+            # We don't know which dict index comes first, therefore always
+            # yield all the types.
+            for _ in types:
+                yield context.LazyKnownContexts(types)
+        else:
+            for node in self._items():
+                yield context.LazyTreeContext(self._defining_context, node)
+
+            for addition in check_array_additions(self._defining_context, self):
+                yield addition
+
+    def _values(self):
+        """Returns a list of a list of node."""
+        if self.array_type == 'dict':
+            return unite(v for k, v in self._items())
+        else:
+            return self._items()
+
+    def _items(self):
+        c = self.atom.children
+
+        if self.atom.type in ('testlist_star_expr', 'testlist'):
+            return c[::2]
+
+        array_node = c[1]
+        if array_node in (']', '}', ')'):
+            return []  # Direct closing bracket, doesn't contain items.
+
+        if array_node.type == 'testlist_comp':
+            return array_node.children[::2]
+        elif array_node.type == '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 exact_key_items(self):
+        """
+        Returns a generator of tuples like dict.items(), where the key is
+        resolved (as a string) and the values are still lazy contexts.
+        """
+        for key_node, value in self._items():
+            for key in self._defining_context.eval_node(key_node):
+                if precedence.is_string(key):
+                    yield key.obj, context.LazyTreeContext(self._defining_context, value)
+
+    def __repr__(self):
+        return "<%s of %s>" % (self.__class__.__name__, self.atom)
+
+
+@has_builtin_methods
+class DictLiteralContext(SequenceLiteralContext):
+    array_type = 'dict'
+
+    def __init__(self, evaluator, defining_context, atom):
+        super(SequenceLiteralContext, self).__init__(evaluator)
+        self._defining_context = defining_context
+        self.atom = atom
+
+    @register_builtin_method('values')
+    def _imitate_values(self):
+        lazy_context = context.LazyKnownContexts(self.dict_values())
+        return set([FakeSequence(self.evaluator, 'list', [lazy_context])])
+
+    @register_builtin_method('items')
+    def _imitate_items(self):
+        lazy_contexts = [
+            context.LazyKnownContext(FakeSequence(
+                self.evaluator, 'tuple',
+                (context.LazyTreeContext(self._defining_context, key_node),
+                 context.LazyTreeContext(self._defining_context, value_node))
+            )) for key_node, value_node in self._items()
+        ]
+
+        return set([FakeSequence(self.evaluator, 'list', lazy_contexts)])
+
+
+class _FakeArray(SequenceLiteralContext):
+    def __init__(self, evaluator, container, type):
+        super(SequenceLiteralContext, self).__init__(evaluator)
+        self.array_type = type
+        self.atom = container
+        # TODO is this class really needed?
+
+
+class FakeSequence(_FakeArray):
+    def __init__(self, evaluator, array_type, lazy_context_list):
+        """
+        type should be one of "tuple", "list"
+        """
+        super(FakeSequence, self).__init__(evaluator, None, array_type)
+        self._lazy_context_list = lazy_context_list
+
+    def py__getitem__(self, index):
+        return set(self._lazy_context_list[index].infer())
+
+    def py__iter__(self):
+        return self._lazy_context_list
+
+    def py__bool__(self):
+        return bool(len(self._lazy_context_list))
+
+    def __repr__(self):
+        return "<%s of %s>" % (type(self).__name__, self._lazy_context_list)
+
+
+class FakeDict(_FakeArray):
+    def __init__(self, evaluator, dct):
+        super(FakeDict, self).__init__(evaluator, dct, 'dict')
+        self._dct = dct
+
+    def py__iter__(self):
+        for key in self._dct:
+            yield context.LazyKnownContext(compiled.create(self.evaluator, key))
+
+    def py__getitem__(self, index):
+        return self._dct[index].infer()
+
+    def dict_values(self):
+        return unite(lazy_context.infer() for lazy_context in self._dct.values())
+
+    def exact_key_items(self):
+        return self._dct.items()
+
+
+class MergedArray(_FakeArray):
+    def __init__(self, evaluator, arrays):
+        super(MergedArray, self).__init__(evaluator, arrays, arrays[-1].array_type)
+        self._arrays = arrays
+
+    def py__iter__(self):
+        for array in self._arrays:
+            for lazy_context in array.py__iter__():
+                yield lazy_context
+
+    def py__getitem__(self, index):
+        return unite(lazy_context.infer() for lazy_context in 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(context, 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(context, types, exprlist.children[1])
+    elif exprlist.type in ('testlist', 'testlist_comp', 'exprlist',
+                           'testlist_star_expr'):
+        dct = {}
+        parts = iter(exprlist.children[::2])
+        n = 0
+        for lazy_context in py__iter__(context.evaluator, types, exprlist):
+            n += 1
+            try:
+                part = next(parts)
+            except StopIteration:
+                # TODO this context is probably not right.
+                analysis.add(context, 'value-error-too-many-values', part,
+                             message="ValueError: too many values to unpack (expected %s)" % n)
+            else:
+                dct.update(unpack_tuple_to_dict(context, lazy_context.infer(), part))
+        has_parts = next(parts, None)
+        if types and has_parts is not None:
+            # TODO this context is probably not right.
+            analysis.add(context, '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, contextualized_node=None):
+    debug.dbg('py__iter__')
+    type_iters = []
+    for typ in types:
+        try:
+            iter_method = typ.py__iter__
+        except AttributeError:
+            if contextualized_node is not None:
+                analysis.add(
+                    contextualized_node.context,
+                    'type-error-not-iterable',
+                    contextualized_node._node,
+                    message="TypeError: '%s' object is not iterable" % typ)
+        else:
+            type_iters.append(iter_method())
+
+    for lazy_contexts in zip_longest(*type_iters):
+        yield context.get_merged_lazy_context(
+            [l for l in lazy_contexts if l is not None]
+        )
+
+
+def py__iter__types(evaluator, types, contextualized_node=None):
+    """
+    Calls `py__iter__`, but ignores the ordering in the end and just returns
+    all types that it contains.
+    """
+    return unite(
+        lazy_context.infer()
+        for lazy_context in py__iter__(evaluator, types, contextualized_node)
+    )
+
+
+def py__getitem__(evaluator, context, types, trailer):
+    from jedi.evaluate.representation import ClassContext
+    from jedi.evaluate.instance import TreeInstance
+    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, (ClassContext, TreeInstance)):
+            typing_module_types = pep0484.py__getitem__(context, 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, context, node):
+        if isinstance(index, (compiled.CompiledObject, Slice)):
+            index = index.obj
+
+        if type(index) not in (float, int, str, unicode, slice, type(Ellipsis)):
+            # If the index is not clearly defined, we have to get all the
+            # possiblities.
+            for typ in list(types):
+                if isinstance(typ, AbstractSequence) and typ.array_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:
+                # TODO this context is probably not right.
+                analysis.add(context, '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(context, sequence):
+    """ Just a mapper function for the internal _check_array_additions """
+    if sequence.array_type not in ('list', 'set'):
+        # TODO also check for dict updates
+        return set()
+
+    return _check_array_additions(context, sequence)
+
+
+@evaluator_method_cache(default=set())
+@debug.increase_indent
+def _check_array_additions(context, sequence):
+    """
+    Checks if a `Array` has "add" (append, insert, extend) statements:
+
+    >>> a = [""]
+    >>> a.append(1)
+    """
+    from jedi.evaluate import param
+
+    debug.dbg('Dynamic array search for %s' % sequence, color='MAGENTA')
+    module_context = context.get_root_context()
+    if not settings.dynamic_array_additions or isinstance(module_context, compiled.CompiledObject):
+        debug.dbg('Dynamic array search aborted.', color='MAGENTA')
+        return set()
+
+    def find_additions(context, arglist, add_name):
+        params = list(param.TreeArguments(context.evaluator, context, arglist).unpack())
+        result = set()
+        if add_name in ['insert']:
+            params = params[1:]
+        if add_name in ['append', 'add', 'insert']:
+            for key, lazy_context in params:
+                result.add(lazy_context)
+        elif add_name in ['extend', 'update']:
+            for key, lazy_context in params:
+                result |= set(py__iter__(context.evaluator, lazy_context.infer()))
+        return result
+
+    temp_param_add, settings.dynamic_params_for_other_modules = \
+        settings.dynamic_params_for_other_modules, False
+
+    is_list = sequence.name.string_name == 'list'
+    search_names = (['append', 'extend', 'insert'] if is_list else ['add', 'update'])
+
+    added_types = set()
+    for add_name in search_names:
+        try:
+            possible_names = module_context.tree_node.get_used_names()[add_name]
+        except KeyError:
+            continue
+        else:
+            for name in possible_names:
+                context_node = context.tree_node
+                if not (context_node.start_pos < name.start_pos < context_node.end_pos):
+                    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
+
+                random_context = context.create_context(name)
+
+                with recursion.execution_allowed(context.evaluator, power) as allowed:
+                    if allowed:
+                        found = helpers.evaluate_call_of_leaf(
+                            random_context,
+                            name,
+                            cut_own_trailer=True
+                        )
+                        if sequence in found:
+                            # The arrays match. Now add the results
+                            added_types |= find_additions(
+                                random_context,
+                                execution_trailer.children[1],
+                                add_name
+                            )
+
+    # 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 get_dynamic_array_instance(instance):
+    """Used for set() and list() instances."""
+    if not settings.dynamic_array_additions:
+        return instance.var_args
+
+    ai = _ArrayInstance(instance)
+    from jedi.evaluate import param
+    return param.ValuesArguments([[ai]])
+
+
+class _ArrayInstance(object):
+    """
+    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 filters, `py__bool__` and so on, because
+    we don't use these operations in `builtins.py`.
+    """
+    def __init__(self, instance):
+        self.instance = instance
+        self.var_args = instance.var_args
+
+    def py__iter__(self):
+        var_args = self.var_args
+        try:
+            _, lazy_context = next(var_args.unpack())
+        except StopIteration:
+            pass
+        else:
+            for lazy in py__iter__(self.instance.evaluator, lazy_context.infer()):
+                yield lazy
+
+        from jedi.evaluate import param
+        if isinstance(var_args, param.TreeArguments):
+            additions = _check_array_additions(var_args.context, self.instance)
+            for addition in additions:
+                yield addition
+
+
+class Slice(context.Context):
+    def __init__(self, context, start, stop, step):
+        super(Slice, self).__init__(
+            context.evaluator,
+            parent_context=context.evaluator.BUILTINS
+        )
+        self._context = context
+        # 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._context.eval_node(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, context, index):
+    """
+    Handles slices in subscript nodes.
+    """
+    if index == ':':
+        # Like array[:]
+        return set([Slice(context, None, None, None)])
+
+    elif index.type == 'subscript' and not index.children[0] == '.':
+        # subscript basically implies a slice operation, except for Python 2's
+        # Ellipsis.
+        # e.g. array[:3]
+        result = []
+        for el in index.children:
+            if el == ':':
+                if not result:
+                    result.append(None)
+            elif el.type == 'sliceop':
+                if len(el.children) == 2:
+                    result.append(el.children[1])
+            else:
+                result.append(el)
+        result += [None] * (3 - len(result))
+
+        return set([Slice(context, *result)])
+
+    # No slices
+    return context.eval_node(index)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/jedi_typing.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/jedi_typing.py
new file mode 100644
index 0000000..f48a567
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/param.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/param.py
new file mode 100644
index 0000000..c6fb55f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/param.py
@@ -0,0 +1,433 @@
+from collections import defaultdict
+
+from jedi._compatibility import zip_longest
+from jedi import debug
+from jedi import common
+from parso.python import tree
+from jedi.evaluate import iterable
+from jedi.evaluate import analysis
+from jedi.evaluate import context
+from jedi.evaluate import docstrings
+from jedi.evaluate import pep0484
+from jedi.evaluate.filters import ParamName
+
+
+def add_argument_issue(parent_context, error_name, lazy_context, message):
+    if isinstance(lazy_context, context.LazyTreeContext):
+        node = lazy_context.data
+        if node.parent.type == 'argument':
+            node = node.parent
+        analysis.add(parent_context, error_name, node, message)
+
+
+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 lazy_context in f():
+                try_iter_content(lazy_context.infer(), depth + 1)
+
+
+class AbstractArguments():
+    context = None
+
+    def eval_argument_clinic(self, parameters):
+        """Uses a list with argument clinic information (see PEP 436)."""
+        iterator = self.unpack()
+        for i, (name, optional, allow_kwargs) in enumerate(parameters):
+            key, argument = next(iterator, (None, None))
+            if key is not None:
+                raise NotImplementedError
+            if argument is None and not optional:
+                debug.warning('TypeError: %s expected at least %s arguments, got %s',
+                              name, len(parameters), i)
+                raise ValueError
+            values = set() if argument is None else argument.infer()
+
+            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 eval_all(self, funcdef=None):
+        """
+        Evaluates all arguments as a support for static analysis
+        (normally Jedi).
+        """
+        for key, lazy_context in self.unpack():
+            types = lazy_context.infer()
+            try_iter_content(types)
+
+    def get_calling_nodes(self):
+        raise NotImplementedError
+
+    def unpack(self, funcdef=None):
+        raise NotImplementedError
+
+    def get_params(self, execution_context):
+        return get_params(execution_context, self)
+
+
+class AnonymousArguments(AbstractArguments):
+    def get_params(self, execution_context):
+        from jedi.evaluate.dynamic import search_params
+        return search_params(
+            execution_context.evaluator,
+            execution_context,
+            execution_context.tree_node
+        )
+
+
+class TreeArguments(AbstractArguments):
+    def __init__(self, evaluator, context, 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.context = context
+        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 (self.argument_node.type == 'arglist' or (
+                    # in python 3.5 **arg is an argument, not arglist
+                    (self.argument_node.type == '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 child.type == '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 unpack(self, funcdef=None):
+        named_args = []
+        for star_count, el in self._split():
+            if star_count == 1:
+                arrays = self.context.eval_node(el)
+                iterators = [_iterate_star_args(self.context, a, el, funcdef)
+                             for a in arrays]
+                iterators = list(iterators)
+                for values in list(zip_longest(*iterators)):
+                    # TODO zip_longest yields None, that means this would raise
+                    # an exception?
+                    yield None, context.get_merged_lazy_context(
+                        [v for v in values if v is not None]
+                    )
+            elif star_count == 2:
+                arrays = self._evaluator.eval_element(self.context, el)
+                for dct in arrays:
+                    for key, values in _star_star_dict(self.context, dct, el, funcdef):
+                        yield key, values
+            else:
+                if el.type == 'argument':
+                    c = el.children
+                    if len(c) == 3:  # Keyword argument.
+                        named_args.append((c[0].value, context.LazyTreeContext(self.context, c[2]),))
+                    else:  # Generator comprehension.
+                        # Include the brackets with the parent.
+                        comp = iterable.GeneratorComprehension(
+                            self._evaluator, self.context, self.argument_node.parent)
+                        yield None, context.LazyKnownContext(comp)
+                else:
+                    yield None, context.LazyTreeContext(self.context, el)
+
+        # Reordering var_args is necessary, because star args sometimes appear
+        # after named argument, but in the actual order it's prepended.
+        for named_arg in named_args:
+            yield named_arg
+
+    def as_tree_tuple_objects(self):
+        for star_count, argument in self._split():
+            if argument.type == 'argument':
+                argument, default = argument.children[::2]
+            else:
+                default = None
+            yield argument, default, star_count
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.argument_node)
+
+    def get_calling_nodes(self):
+        from jedi.evaluate.dynamic import MergedExecutedParams
+        old_arguments_list = []
+        arguments = self
+
+        while arguments not in old_arguments_list:
+            if not isinstance(arguments, TreeArguments):
+                break
+
+            old_arguments_list.append(arguments)
+            for name, default, star_count in reversed(list(arguments.as_tree_tuple_objects())):
+                if not star_count or not isinstance(name, tree.Name):
+                    continue
+
+                names = self._evaluator.goto(arguments.context, name)
+                if len(names) != 1:
+                    break
+                if not isinstance(names[0], ParamName):
+                    break
+                param = names[0].get_param()
+                if isinstance(param, MergedExecutedParams):
+                    # For dynamic searches we don't even want to see errors.
+                    return []
+                if not isinstance(param, ExecutedParam):
+                    break
+                if param.var_args is None:
+                    break
+                arguments = param.var_args
+                break
+
+        return [arguments.argument_node or arguments.trailer]
+
+
+class ValuesArguments(AbstractArguments):
+    def __init__(self, values_list):
+        self._values_list = values_list
+
+    def unpack(self, funcdef=None):
+        for values in self._values_list:
+            yield None, context.LazyKnownContexts(values)
+
+    def get_calling_nodes(self):
+        return []
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self._values_list)
+
+
+class ExecutedParam(object):
+    """Fake a param and give it values."""
+    def __init__(self, execution_context, param_node, lazy_context):
+        self._execution_context = execution_context
+        self._param_node = param_node
+        self._lazy_context = lazy_context
+        self.string_name = param_node.name.value
+
+    def infer(self):
+        pep0484_hints = pep0484.infer_param(self._execution_context, self._param_node)
+        doc_params = docstrings.infer_param(self._execution_context, self._param_node)
+        if pep0484_hints or doc_params:
+            return list(set(pep0484_hints) | set(doc_params))
+
+        return self._lazy_context.infer()
+
+    @property
+    def var_args(self):
+        return self._execution_context.var_args
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.string_name)
+
+
+def get_params(execution_context, var_args):
+    result_params = []
+    param_dict = {}
+    funcdef = execution_context.tree_node
+    parent_context = execution_context.parent_context
+
+    for param in funcdef.get_params():
+        param_dict[param.name.value] = param
+    unpacked_va = list(var_args.unpack(funcdef))
+    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 funcdef.get_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.
+        key, argument = next(var_arg_iterator, (None, None))
+        while key is not None:
+            keys_only = True
+            try:
+                key_param = param_dict[key]
+            except KeyError:
+                non_matching_keys[key] = argument
+            else:
+                if key in keys_used:
+                    had_multiple_value_error = True
+                    m = ("TypeError: %s() got multiple values for keyword argument '%s'."
+                         % (funcdef.name, key))
+                    for node in var_args.get_calling_nodes():
+                        analysis.add(parent_context, 'type-error-multiple-values',
+                                     node, message=m)
+                else:
+                    keys_used[key] = ExecutedParam(execution_context, key_param, argument)
+            key, argument = next(var_arg_iterator, (None, None))
+
+        try:
+            result_params.append(keys_used[param.name.value])
+            continue
+        except KeyError:
+            pass
+
+        if param.star_count == 1:
+            # *args param
+            lazy_context_list = []
+            if argument is not None:
+                lazy_context_list.append(argument)
+                for key, argument in var_arg_iterator:
+                    # Iterate until a key argument is found.
+                    if key:
+                        var_arg_iterator.push_back((key, argument))
+                        break
+                    lazy_context_list.append(argument)
+            seq = iterable.FakeSequence(execution_context.evaluator, 'tuple', lazy_context_list)
+            result_arg = context.LazyKnownContext(seq)
+        elif param.star_count == 2:
+            # **kwargs param
+            dct = iterable.FakeDict(execution_context.evaluator, dict(non_matching_keys))
+            result_arg = context.LazyKnownContext(dct)
+            non_matching_keys = {}
+        else:
+            # normal param
+            if argument is None:
+                # No value: Return an empty container
+                if param.default is None:
+                    result_arg = context.LazyUnknownContext()
+                    if not keys_only:
+                        for node in var_args.get_calling_nodes():
+                            m = _error_argument_count(funcdef, len(unpacked_va))
+                            analysis.add(parent_context, 'type-error-too-few-arguments',
+                                         node, message=m)
+                else:
+                    result_arg = context.LazyTreeContext(parent_context, param.default)
+            else:
+                result_arg = argument
+
+        result_params.append(ExecutedParam(execution_context, param, result_arg))
+        if not isinstance(result_arg, context.LazyUnknownContext):
+            keys_used[param.name.value] = result_params[-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]
+
+            if not (non_matching_keys or had_multiple_value_error or
+                    param.star_count or param.default):
+                # add a warning only if there's not another one.
+                for node in var_args.get_calling_nodes():
+                    m = _error_argument_count(funcdef, len(unpacked_va))
+                    analysis.add(parent_context, 'type-error-too-few-arguments',
+                                 node, message=m)
+
+    for key, lazy_context in non_matching_keys.items():
+        m = "TypeError: %s() got an unexpected keyword argument '%s'." \
+            % (funcdef.name, key)
+        add_argument_issue(
+            parent_context,
+            'type-error-keyword-argument',
+            lazy_context,
+            message=m
+        )
+
+    remaining_arguments = list(var_arg_iterator)
+    if remaining_arguments:
+        m = _error_argument_count(funcdef, len(unpacked_va))
+        # Just report an error for the first param that is not needed (like
+        # cPython).
+        first_key, lazy_context = remaining_arguments[0]
+        if var_args.get_calling_nodes():
+            # There might not be a valid calling node so check for that first.
+            add_argument_issue(parent_context, 'type-error-too-many-arguments', lazy_context, message=m)
+    return result_params
+
+
+def _iterate_star_args(context, array, input_node, funcdef=None):
+    try:
+        iter_ = array.py__iter__
+    except AttributeError:
+        if funcdef is not None:
+            # TODO this funcdef should not be needed.
+            m = "TypeError: %s() argument after * must be a sequence, not %s" \
+                % (funcdef.name.value, array)
+            analysis.add(context, 'type-error-star', input_node, message=m)
+    else:
+        for lazy_context in iter_():
+            yield lazy_context
+
+
+def _star_star_dict(context, array, input_node, funcdef):
+    from jedi.evaluate.instance import CompiledInstance
+    if isinstance(array, CompiledInstance) and array.name.string_name == 'dict':
+        # For now ignore this case. In the future add proper iterators and just
+        # make one call without crazy isinstance checks.
+        return {}
+    elif isinstance(array, iterable.AbstractSequence) and array.array_type == 'dict':
+        return array.exact_key_items()
+    else:
+        if funcdef is not None:
+            m = "TypeError: %s argument after ** must be a mapping, not %s" \
+                % (funcdef.name.value, array)
+            analysis.add(context, 'type-error-star-star', input_node, message=m)
+        return {}
+
+
+def _error_argument_count(funcdef, actual_count):
+    params = funcdef.get_params()
+    default_arguments = sum(1 for p in params if p.default or p.star_count)
+
+    if default_arguments == 0:
+        before = 'exactly '
+    else:
+        before = 'from %s to ' % (len(params) - default_arguments)
+    return ('TypeError: %s() takes %s%s arguments (%s given).'
+            % (funcdef.name, before, len(params), actual_count))
+
+
+def _create_default_param(execution_context, param):
+    if param.star_count == 1:
+        result_arg = context.LazyKnownContext(
+            iterable.FakeSequence(execution_context.evaluator, 'tuple', [])
+        )
+    elif param.star_count == 2:
+        result_arg = context.LazyKnownContext(
+            iterable.FakeDict(execution_context.evaluator, {})
+        )
+    elif param.default is None:
+        result_arg = context.LazyUnknownContext()
+    else:
+        result_arg = context.LazyTreeContext(execution_context.parent_context, param.default)
+    return ExecutedParam(execution_context, param, result_arg)
+
+
+def create_default_params(execution_context, funcdef):
+    return [_create_default_param(execution_context, p)
+            for p in funcdef.get_params()]
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/parser_cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/parser_cache.py
new file mode 100644
index 0000000..84fe52d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/parser_cache.py
@@ -0,0 +1,6 @@
+from jedi.evaluate.cache import evaluator_function_cache
+
+
+@evaluator_function_cache()
+def get_yield_exprs(evaluator, funcdef):
+    return list(funcdef.iter_yield_exprs())
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/pep0484.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/pep0484.py
new file mode 100644
index 0000000..bd90957
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/pep0484.py
@@ -0,0 +1,224 @@
+"""
+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
+import re
+
+from parso import ParserSyntaxError
+from parso.python import tree
+
+from jedi.common import unite
+from jedi.evaluate.cache import evaluator_method_cache
+from jedi.evaluate import compiled
+from jedi.evaluate.context import LazyTreeContext
+from jedi import debug
+from jedi import _compatibility
+from jedi import parser_utils
+
+
+def _evaluate_for_annotation(context, 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 = context.eval_node(
+            _fix_forward_reference(context, annotation))
+        if index is not None:
+            definitions = list(itertools.chain.from_iterable(
+                definition.py__getitem__(index) for definition in definitions
+                if definition.array_type == 'tuple' and
+                len(list(definition.py__iter__())) >= index))
+        return unite(d.execute_evaluated() for d in definitions)
+    else:
+        return set()
+
+
+def _fix_forward_reference(context, node):
+    evaled_nodes = context.eval_node(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:
+            new_node = context.evaluator.grammar.parse(
+                _compatibility.unicode(evaled_node.obj),
+                start_symbol='eval_input',
+                error_recovery=False
+            )
+        except ParserSyntaxError:
+            debug.warning('Annotation not parsed: %s' % evaled_node.obj)
+            return node
+        else:
+            module = node.get_root_node()
+            parser_utils.move(new_node, module.end_pos[0])
+            new_node.parent = context.tree_node
+            return new_node
+    else:
+        return node
+
+
+@evaluator_method_cache()
+def infer_param(execution_context, param):
+    annotation = param.annotation
+    module_context = execution_context.get_root_context()
+    return _evaluate_for_annotation(module_context, annotation)
+
+
+def py__annotations__(funcdef):
+    return_annotation = funcdef.annotation
+    if return_annotation:
+        dct = {'return': return_annotation}
+    else:
+        dct = {}
+    for function_param in funcdef.get_params():
+        param_annotation = function_param.annotation
+        if param_annotation is not None:
+            dct[function_param.name.value] = param_annotation
+    return dct
+
+
+@evaluator_method_cache()
+def infer_return_types(function_context):
+    annotation = py__annotations__(function_context.tree_node).get("return", None)
+    module_context = function_context.get_root_context()
+    return _evaluate_for_annotation(module_context, annotation)
+
+
+_typing_module = None
+
+
+def _get_typing_replacement_module(grammar):
+    """
+    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())
+        _typing_module = grammar.parse(code)
+    return _typing_module
+
+
+def py__getitem__(context, typ, node):
+    if not typ.get_root_context().name.string_name == "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 node.type == "subscriptlist":
+        nodes = node.children[::2]  # skip the commas
+    else:
+        nodes = [node]
+    del node
+
+    nodes = [_fix_forward_reference(context, node) for node in nodes]
+    type_name = typ.name.string_name
+
+    # hacked in Union and Optional, since it's hard to do nicely in parsed code
+    if type_name in ("Union", '_Union'):
+        # In Python 3.6 it's still called typing.Union but it's an instance
+        # called _Union.
+        return unite(context.eval_node(node) for node in nodes)
+    if type_name in ("Optional", '_Optional'):
+        # Here we have the same issue like in Union. Therefore we also need to
+        # check for the instance typing._Optional (Python 3.6).
+        return context.eval_node(nodes[0])
+
+    from jedi.evaluate.representation import ModuleContext
+    typing = ModuleContext(
+        context.evaluator,
+        module_node=_get_typing_replacement_module(context.evaluator.latest_grammar),
+        path=None
+    )
+    factories = typing.py__getattribute__("factory")
+    assert len(factories) == 1
+    factory = list(factories)[0]
+    assert factory
+    function_body_nodes = factory.tree_node.children[4].children
+    valid_classnames = set(child.name.value
+                           for child in function_body_nodes
+                           if isinstance(child, tree.Class))
+    if type_name not in valid_classnames:
+        return None
+    compiled_classname = compiled.create(context.evaluator, type_name)
+
+    from jedi.evaluate.iterable import FakeSequence
+    args = FakeSequence(
+        context.evaluator,
+        "tuple",
+        [LazyTreeContext(context, n) for n in nodes]
+    )
+
+    result = factory.execute_evaluated(compiled_classname, args)
+    return result
+
+
+def find_type_from_comment_hint_for(context, node, name):
+    return _find_type_from_comment_hint(context, node, node.children[1], name)
+
+
+def find_type_from_comment_hint_with(context, node, name):
+    assert len(node.children[1].children) == 3, \
+        "Can only be here when children[1] is 'foo() as f'"
+    varlist = node.children[1].children[2]
+    return _find_type_from_comment_hint(context, node, varlist, name)
+
+
+def find_type_from_comment_hint_assign(context, node, name):
+    return _find_type_from_comment_hint(context, node, node.children[0], name)
+
+
+def _find_type_from_comment_hint(context, node, varlist, name):
+    index = None
+    if varlist.type in ("testlist_star_expr", "exprlist", "testlist"):
+        # 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 = parser_utils.get_following_comment_same_line(node)
+    if comment is None:
+        return []
+    match = re.match(r"^#\s*type:\s*([^#]*)", comment)
+    if not match:
+        return []
+    annotation = tree.String(
+        repr(str(match.group(1).strip())),
+        node.start_pos)
+    annotation.parent = node.parent
+    return _evaluate_for_annotation(context, annotation, index)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/precedence.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/precedence.py
new file mode 100644
index 0000000..4433521
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/precedence.py
@@ -0,0 +1,178 @@
+"""
+Handles operator precedence.
+"""
+import operator as op
+
+from jedi._compatibility import unicode
+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 = {
+    '==': op.eq,
+    '!=': op.ne,
+    'is': op.is_,
+    'is not': op.is_not,
+    '<': op.lt,
+    '<=': op.le,
+    '>': op.gt,
+    '>=': op.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.string_name)
+            new_result |= cls.execute_evaluated()
+        else:
+            new_result.add(typ)
+    return new_result
+
+
+def calculate_children(evaluator, context, children):
+    """
+    Calculate a list of children with operators.
+    """
+    iterator = iter(children)
+    types = context.eval_node(next(iterator))
+    for operator in iterator:
+        right = next(iterator)
+        if operator.type == 'comp_op':  # not in / is not
+            operator = ' '.join(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 = context.eval_node(right)
+            elif left_bools == set([False]):
+                if operator != 'and':
+                    types = context.eval_node(right)
+            # Otherwise continue, because of uncertainty.
+        else:
+            types = calculate(evaluator, context, types, operator,
+                              context.eval_node(right))
+    debug.dbg('calculate_children types %s', types)
+    return types
+
+
+def calculate(evaluator, context, 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, context, 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.AbstractSequence) and obj.array_type == 'tuple'
+
+
+def _is_list(obj):
+    from jedi.evaluate import iterable
+    return isinstance(obj, iterable.AbstractSequence) and obj.array_type == 'list'
+
+
+def _element_calculate(evaluator, context, left, operator, right):
+    from jedi.evaluate import iterable, instance
+    l_is_num = _is_number(left)
+    r_is_num = _is_number(right)
+    if operator == '*':
+        # for iterables, ignore * operations
+        if isinstance(left, iterable.AbstractSequence) or is_string(left):
+            return set([left])
+        elif isinstance(right, iterable.AbstractSequence) 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, instance.CompiledInstance) and \
+            obj.name.string_name 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(context, 'type-error-operation', operator,
+                     message % (left, right))
+
+    return set([left, right])
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/recursion.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/recursion.py
new file mode 100644
index 0000000..8549949
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/recursion.py
@@ -0,0 +1,134 @@
+"""
+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.
+
+.. _settings-recursion:
+
+Settings
+~~~~~~~~~~
+
+Recursion settings are important if you don't want extremly
+recursive python code to go absolutely crazy.
+
+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. Completion should also be fast and
+therefore the quality might not always be maximal.
+
+.. autodata:: recursion_limit
+.. autodata:: total_function_execution_limit
+.. autodata:: per_function_execution_limit
+.. autodata:: per_function_recursion_limit
+"""
+
+from contextlib import contextmanager
+
+from jedi import debug
+
+
+recursion_limit = 15
+"""
+Like ``sys.getrecursionlimit()``, just for |jedi|.
+"""
+total_function_execution_limit = 200
+"""
+This is a hard limit of how many non-builtin functions can be executed.
+"""
+per_function_execution_limit = 6
+"""
+The maximal amount of times a specific function may be executed.
+"""
+per_function_recursion_limit = 2
+"""
+A function may not be executed more than this number of times recursively.
+"""
+
+class RecursionDetector(object):
+    def __init__(self):
+        self.pushed_nodes = []
+
+
+@contextmanager
+def execution_allowed(evaluator, node):
+    """
+    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.
+    """
+    pushed_nodes = evaluator.recursion_detector.pushed_nodes
+
+    if node in pushed_nodes:
+        debug.warning('catched stmt recursion: %s @%s', node,
+                      node.start_pos)
+        yield False
+    else:
+        pushed_nodes.append(node)
+        yield True
+        pushed_nodes.pop()
+
+
+def execution_recursion_decorator(default=set()):
+    def decorator(func):
+        def wrapper(execution, **kwargs):
+            detector = execution.evaluator.execution_recursion_detector
+            allowed = detector.push_execution(execution)
+            try:
+                if allowed:
+                    result = default
+                else:
+                    result = func(execution, **kwargs)
+            finally:
+                detector.pop_execution()
+            return result
+        return wrapper
+    return decorator
+
+
+class ExecutionRecursionDetector(object):
+    """
+    Catches recursions of executions.
+    """
+    def __init__(self, evaluator):
+        self._evaluator = evaluator
+
+        self._recursion_level = 0
+        self._parent_execution_funcs = []
+        self._funcdef_execution_counts = {}
+        self._execution_count = 0
+
+    def pop_execution(self):
+        self._parent_execution_funcs.pop()
+        self._recursion_level -= 1
+
+    def push_execution(self, execution):
+        funcdef = execution.tree_node
+
+        # These two will be undone in pop_execution.
+        self._recursion_level += 1
+        self._parent_execution_funcs.append(funcdef)
+
+        module = execution.get_root_context()
+        if module == self._evaluator.BUILTINS:
+            # We have control over builtins so we know they are not recursing
+            # like crazy. Therefore we just let them execute always, because
+            # they usually just help a lot with getting good results.
+            return False
+
+        if self._recursion_level > recursion_limit:
+            return True
+
+        if self._execution_count >= total_function_execution_limit:
+            return True
+        self._execution_count += 1
+
+        if self._funcdef_execution_counts.setdefault(funcdef, 0) >= per_function_execution_limit:
+            return True
+        self._funcdef_execution_counts[funcdef] += 1
+
+        if self._parent_execution_funcs.count(funcdef) > per_function_recursion_limit:
+            return True
+        return False
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/representation.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/representation.py
new file mode 100644
index 0000000..8a0d616
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/representation.py
@@ -0,0 +1,684 @@
+"""
+Like described in the :mod:`parso.python.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. Returns None if does
+                                       not exist.
+py__package__()                        Only on modules. For the import system.
+py__path__()                           Only on modules. For the import system.
+py__get__(call_object)                 Only on instances. Simulates
+                                       descriptors.
+py__doc__(include_call_signature:      Returns the docstring for a context.
+          bool)
+====================================== ========================================
+
+"""
+import os
+import pkgutil
+import imp
+import re
+from itertools import chain
+
+from parso.python import tree
+from parso import python_bytes_to_unicode
+
+from jedi._compatibility import use_metaclass
+from jedi import debug
+from jedi.evaluate.cache import evaluator_method_cache, CachedMetaClass
+from jedi.evaluate import compiled
+from jedi.evaluate import recursion
+from jedi.evaluate import iterable
+from jedi.evaluate import docstrings
+from jedi.evaluate import pep0484
+from jedi.evaluate import param
+from jedi.evaluate import flow_analysis
+from jedi.evaluate import imports
+from jedi.evaluate import helpers
+from jedi.evaluate.filters import ParserTreeFilter, FunctionExecutionFilter, \
+    GlobalNameFilter, DictFilter, ContextName, AbstractNameDefinition, \
+    ParamName, AnonymousInstanceParamName, TreeNameDefinition, \
+    ContextNameMixin
+from jedi.evaluate import context
+from jedi.evaluate.context import ContextualizedNode
+from jedi import parser_utils
+from jedi.evaluate.parser_cache import get_yield_exprs
+
+
+def apply_py__get__(context, base_context):
+    try:
+        method = context.py__get__
+    except AttributeError:
+        yield context
+    else:
+        for descriptor_context in method(base_context):
+            yield descriptor_context
+
+
+class ClassName(TreeNameDefinition):
+    def __init__(self, parent_context, tree_name, name_context):
+        super(ClassName, self).__init__(parent_context, tree_name)
+        self._name_context = name_context
+
+    def infer(self):
+        # TODO this _name_to_types might get refactored and be a part of the
+        # parent class. Once it is, we can probably just overwrite method to
+        # achieve this.
+        from jedi.evaluate.finder import _name_to_types
+        inferred = _name_to_types(
+            self.parent_context.evaluator, self._name_context, self.tree_name)
+
+        for result_context in inferred:
+            for c in apply_py__get__(result_context, self.parent_context):
+                yield c
+
+
+class ClassFilter(ParserTreeFilter):
+    name_class = ClassName
+
+    def _convert_names(self, names):
+        return [self.name_class(self.context, name, self._node_context)
+                for name in names]
+
+
+class ClassContext(use_metaclass(CachedMetaClass, context.TreeContext)):
+    """
+    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).
+    """
+    api_type = 'class'
+
+    def __init__(self, evaluator, classdef, parent_context):
+        super(ClassContext, self).__init__(evaluator, parent_context=parent_context)
+        self.tree_node = classdef
+
+    @evaluator_method_cache(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 lazy_cls in self.py__bases__():
+            # TODO there's multiple different mro paths possible if this yields
+            # multiple possibilities. Could be changed to be more correct.
+            for cls in lazy_cls.infer():
+                # 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)
+
+    @evaluator_method_cache(default=())
+    def py__bases__(self):
+        arglist = self.tree_node.get_super_arglist()
+        if arglist:
+            args = param.TreeArguments(self.evaluator, self, arglist)
+            return [value for key, value in args.unpack() if key is None]
+        else:
+            return [context.LazyKnownContext(compiled.create(self.evaluator, object))]
+
+    def py__call__(self, params):
+        from jedi.evaluate.instance import TreeInstance
+        return set([TreeInstance(self.evaluator, self.parent_context, self, params)])
+
+    def py__class__(self):
+        return compiled.create(self.evaluator, type)
+
+    def get_params(self):
+        from jedi.evaluate.instance import AnonymousInstance
+        anon = AnonymousInstance(self.evaluator, self.parent_context, self)
+        return [AnonymousInstanceParamName(anon, param.name) for param in self.funcdef.get_params()]
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None, is_instance=False):
+        if search_global:
+            yield ParserTreeFilter(
+                self.evaluator,
+                context=self,
+                until_position=until_position,
+                origin_scope=origin_scope
+            )
+        else:
+            for cls in self.py__mro__():
+                if isinstance(cls, compiled.CompiledObject):
+                    for filter in cls.get_filters(is_instance=is_instance):
+                        yield filter
+                else:
+                    yield ClassFilter(
+                        self.evaluator, self, node_context=cls,
+                        origin_scope=origin_scope)
+
+    def is_class(self):
+        return True
+
+    def get_function_slot_names(self, name):
+        for filter in self.get_filters(search_global=False):
+            names = filter.get(name)
+            if names:
+                return names
+        return []
+
+    def get_param_names(self):
+        for name in self.get_function_slot_names('__init__'):
+            for context_ in name.infer():
+                try:
+                    method = context_.get_param_names
+                except AttributeError:
+                    pass
+                else:
+                    return list(method())[1:]
+        return []
+
+    @property
+    def name(self):
+        return ContextName(self, self.tree_node.name)
+
+
+class LambdaName(AbstractNameDefinition):
+    string_name = '<lambda>'
+
+    def __init__(self, lambda_context):
+        self._lambda_context = lambda_context
+        self.parent_context = lambda_context.parent_context
+
+    def start_pos(self):
+        return self._lambda_context.tree_node.start_pos
+
+    def infer(self):
+        return set([self._lambda_context])
+
+
+class FunctionContext(use_metaclass(CachedMetaClass, context.TreeContext)):
+    """
+    Needed because of decorators. Decorators are evaluated here.
+    """
+    api_type = 'function'
+
+    def __init__(self, evaluator, parent_context, funcdef):
+        """ This should not be called directly """
+        super(FunctionContext, self).__init__(evaluator, parent_context)
+        self.tree_node = funcdef
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        if search_global:
+            yield ParserTreeFilter(
+                self.evaluator,
+                context=self,
+                until_position=until_position,
+                origin_scope=origin_scope
+            )
+        else:
+            scope = self.py__class__()
+            for filter in scope.get_filters(search_global=False, origin_scope=origin_scope):
+                yield filter
+
+    def infer_function_execution(self, function_execution):
+        """
+        Created to be used by inheritance.
+        """
+        yield_exprs = get_yield_exprs(self.evaluator, self.tree_node)
+        if yield_exprs:
+            return set([iterable.Generator(self.evaluator, function_execution)])
+        else:
+            return function_execution.get_return_values()
+
+    def get_function_execution(self, arguments=None):
+        if arguments is None:
+            arguments = param.AnonymousArguments()
+
+        return FunctionExecutionContext(self.evaluator, self.parent_context, self, arguments)
+
+    def py__call__(self, arguments):
+        function_execution = self.get_function_execution(arguments)
+        return self.infer_function_execution(function_execution)
+
+    def py__class__(self):
+        # This differentiation is only necessary for Python2. Python3 does not
+        # use a different method class.
+        if isinstance(parser_utils.get_parent_scope(self.tree_node), tree.Class):
+            name = 'METHOD_CLASS'
+        else:
+            name = 'FUNCTION_CLASS'
+        return compiled.get_special_object(self.evaluator, name)
+
+    @property
+    def name(self):
+        if self.tree_node.type == 'lambdef':
+            return LambdaName(self)
+        return ContextName(self, self.tree_node.name)
+
+    def get_param_names(self):
+        function_execution = self.get_function_execution()
+        return [ParamName(function_execution, param.name)
+                for param in self.tree_node.get_params()]
+
+
+class FunctionExecutionContext(context.TreeContext):
+    """
+    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.
+    """
+    function_execution_filter = FunctionExecutionFilter
+
+    def __init__(self, evaluator, parent_context, function_context, var_args):
+        super(FunctionExecutionContext, self).__init__(evaluator, parent_context)
+        self.function_context = function_context
+        self.tree_node = function_context.tree_node
+        self.var_args = var_args
+
+    @evaluator_method_cache(default=set())
+    @recursion.execution_recursion_decorator()
+    def get_return_values(self, check_yields=False):
+        funcdef = self.tree_node
+        if funcdef.type == 'lambdef':
+            return self.evaluator.eval_element(self, funcdef.children[-1])
+
+        if check_yields:
+            types = set()
+            returns = get_yield_exprs(self.evaluator, funcdef)
+        else:
+            returns = funcdef.iter_return_stmts()
+            types = set(docstrings.infer_return_types(self.function_context))
+            types |= set(pep0484.infer_return_types(self.function_context))
+
+        for r in returns:
+            check = flow_analysis.reachability_check(self, funcdef, r)
+            if check is flow_analysis.UNREACHABLE:
+                debug.dbg('Return unreachable: %s', r)
+            else:
+                if check_yields:
+                    types |= set(self._eval_yield(r))
+                else:
+                    try:
+                        children = r.children
+                    except AttributeError:
+                        types.add(compiled.create(self.evaluator, None))
+                    else:
+                        types |= self.eval_node(children[1])
+            if check is flow_analysis.REACHABLE:
+                debug.dbg('Return reachable: %s', r)
+                break
+        return types
+
+    def _eval_yield(self, yield_expr):
+        if yield_expr.type == 'keyword':
+            # `yield` just yields None.
+            yield context.LazyKnownContext(compiled.create(self.evaluator, None))
+            return
+
+        node = yield_expr.children[1]
+        if node.type == 'yield_arg':  # It must be a yield from.
+            cn = ContextualizedNode(self, node.children[1])
+            for lazy_context in iterable.py__iter__(self.evaluator, cn.infer(), cn):
+                yield lazy_context
+        else:
+            yield context.LazyTreeContext(self, node)
+
+    @recursion.execution_recursion_decorator(default=iter([]))
+    def get_yield_values(self):
+        for_parents = [(y, tree.search_ancestor(y, 'for_stmt', 'funcdef',
+                                                'while_stmt', 'if_stmt'))
+                       for y in get_yield_exprs(self.evaluator, self.tree_node)]
+
+        # 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.tree_node \
+                    and parser_utils.for_stmt_defines_one_name(for_stmt):  # 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.tree_node:
+                yields_order.append((None, [yield_]))
+            else:
+                types = self.get_return_values(check_yields=True)
+                if types:
+                    yield context.get_merged_lazy_context(list(types))
+                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_testlist()
+                cn = ContextualizedNode(self, input_node)
+                ordered = iterable.py__iter__(evaluator, cn.infer(), cn)
+                ordered = list(ordered)
+                for lazy_context in ordered:
+                    dct = {str(for_stmt.children[1].value): lazy_context.infer()}
+                    with helpers.predefine_names(self, for_stmt, dct):
+                        for yield_in_same_for_stmt in yields:
+                            for result in self._eval_yield(yield_in_same_for_stmt):
+                                yield result
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        yield self.function_execution_filter(self.evaluator, self,
+                                             until_position=until_position,
+                                             origin_scope=origin_scope)
+
+    @evaluator_method_cache()
+    def get_params(self):
+        return self.var_args.get_params(self)
+
+
+class ModuleAttributeName(AbstractNameDefinition):
+    """
+    For module attributes like __file__, __str__ and so on.
+    """
+    api_type = 'instance'
+
+    def __init__(self, parent_module, string_name):
+        self.parent_context = parent_module
+        self.string_name = string_name
+
+    def infer(self):
+        return compiled.create(self.parent_context.evaluator, str).execute(
+            param.ValuesArguments([])
+        )
+
+
+class ModuleName(ContextNameMixin, AbstractNameDefinition):
+    start_pos = 1, 0
+
+    def __init__(self, context, name):
+        self._context = context
+        self._name = name
+
+    @property
+    def string_name(self):
+        return self._name
+
+
+class ModuleContext(use_metaclass(CachedMetaClass, context.TreeContext)):
+    api_type = 'module'
+    parent_context = None
+
+    def __init__(self, evaluator, module_node, path):
+        super(ModuleContext, self).__init__(evaluator, parent_context=None)
+        self.tree_node = module_node
+        self._path = path
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        yield ParserTreeFilter(
+            self.evaluator,
+            context=self,
+            until_position=until_position,
+            origin_scope=origin_scope
+        )
+        yield GlobalNameFilter(self, self.tree_node)
+        yield DictFilter(self._sub_modules_dict())
+        yield DictFilter(self._module_attributes_dict())
+        for star_module in self.star_imports():
+            yield next(star_module.get_filters(search_global))
+
+    # 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.
+    @evaluator_method_cache([])
+    def star_imports(self):
+        modules = []
+        for i in self.tree_node.iter_imports():
+            if i.is_star_import():
+                name = i.get_paths()[-1][-1]
+                new = imports.infer_import(self, name)
+                for module in new:
+                    if isinstance(module, ModuleContext):
+                        modules += module.star_imports()
+                modules += new
+        return modules
+
+    @evaluator_method_cache()
+    def _module_attributes_dict(self):
+        names = ['__file__', '__package__', '__doc__', '__name__']
+        # All the additional module attributes are strings.
+        return dict((n, ModuleAttributeName(self, n)) for n in names)
+
+    @property
+    def _string_name(self):
+        """ This is used for the goto functions. """
+        if self._path is None:
+            return ''  # 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
+            return re.sub('\.[a-z]+-\d{2}[mud]{0,3}$', '', r.group(1))
+
+    @property
+    @evaluator_method_cache()
+    def name(self):
+        return ModuleName(self, self._string_name)
+
+    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 and name != '':
+                return name
+
+        return '__main__'
+
+    def py__file__(self):
+        """
+        In contrast to Python's __file__ can be None.
+        """
+        if self._path is None:
+            return None
+
+        return os.path.abspath(self._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):
+        search_path = self.evaluator.sys_path
+        init_path = self.py__file__()
+        if os.path.basename(init_path) == '__init__.py':
+            with open(init_path, 'rb') as f:
+                content = python_bytes_to_unicode(f.read(), errors='replace')
+                # 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, self.name.string_name)
+                        if os.path.isdir(other):
+                            paths.add(other)
+                    if paths:
+                        return list(paths)
+                    # TODO I'm not sure if this is how nested namespace
+                    # packages work. The tests are not really good enough to
+                    # show that.
+        # 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__
+
+    @evaluator_method_cache()
+    def _sub_modules_dict(self):
+        """
+        Lists modules in the directory of this module (if this module is a
+        package).
+        """
+        path = self._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:
+                # It's obviously a relative import to the current module.
+                names[name] = imports.SubModuleName(self, name)
+
+        # 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(Name('path', parent_context=self))
+
+        return names
+
+    def py__class__(self):
+        return compiled.get_special_object(self.evaluator, 'MODULE_CLASS')
+
+    def __repr__(self):
+        return "<%s: %s@%s-%s>" % (
+            self.__class__.__name__, self._string_name,
+            self.tree_node.start_pos[0], self.tree_node.end_pos[0])
+
+
+class ImplicitNSName(AbstractNameDefinition):
+    """
+    Accessing names for implicit namespace packages should infer to nothing.
+    This object will prevent Jedi from raising exceptions
+    """
+    def __init__(self, implicit_ns_context, string_name):
+        self.implicit_ns_context = implicit_ns_context
+        self.string_name = string_name
+
+    def infer(self):
+        return []
+
+    def get_root_context(self):
+        return self.implicit_ns_context
+
+
+class ImplicitNamespaceContext(use_metaclass(CachedMetaClass, context.TreeContext)):
+    """
+    Provides support for implicit namespace packages
+    """
+    api_type = 'module'
+    parent_context = None
+
+    def __init__(self, evaluator, fullname):
+        super(ImplicitNamespaceContext, self).__init__(evaluator, parent_context=None)
+        self.evaluator = evaluator
+        self.fullname = fullname
+
+    def get_filters(self, search_global, until_position=None, origin_scope=None):
+        yield DictFilter(self._sub_modules_dict())
+
+    @property
+    @evaluator_method_cache()
+    def name(self):
+        string_name = self.py__package__().rpartition('.')[-1]
+        return ImplicitNSName(self, string_name)
+
+    def py__file__(self):
+        return None
+
+    def py__package__(self):
+        """Return the fullname
+        """
+        return self.fullname
+
+    @property
+    def py__path__(self):
+        return lambda: [self.paths]
+
+    @evaluator_method_cache()
+    def _sub_modules_dict(self):
+        names = {}
+
+        paths = self.paths
+        file_names = chain.from_iterable(os.listdir(path) for path in paths)
+        mods = [
+            file_name.rpartition('.')[0] if '.' in file_name else file_name
+            for file_name in file_names
+            if file_name != '__pycache__'
+        ]
+
+        for name in mods:
+            names[name] = imports.SubModuleName(self, name)
+        return names
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/site.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/site.py
new file mode 100644
index 0000000..bf884fa
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/stdlib.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/stdlib.py
new file mode 100644
index 0000000..d6a506f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/stdlib.py
@@ -0,0 +1,323 @@
+"""
+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.common import unite
+from jedi.evaluate import compiled
+from jedi.evaluate import representation as er
+from jedi.evaluate.instance import InstanceFunctionExecution, \
+    AbstractInstanceContext, CompiledInstance, BoundMethod, \
+    AnonymousInstanceFunctionExecution
+from jedi.evaluate import iterable
+from jedi import debug
+from jedi.evaluate import precedence
+from jedi.evaluate import param
+from jedi.evaluate import analysis
+from jedi.evaluate.context import LazyTreeContext, ContextualizedNode
+
+# Now this is all part of fake tuples in Jedi. However super doesn't work on
+# __init__ and __new__ doesn't work at all. So adding this to nametuples is
+# just the easiest way.
+_NAMEDTUPLE_INIT = """
+    def __init__(_cls, {arg_list}):
+        'A helper function for namedtuple.'
+        self.__iterable = ({arg_list})
+
+    def __iter__(self):
+        for i in self.__iterable:
+            yield i
+
+    def __getitem__(self, y):
+        return self.__iterable[y]
+
+"""
+
+
+class NotInStdLib(LookupError):
+    pass
+
+
+def execute(evaluator, obj, arguments):
+    if isinstance(obj, BoundMethod):
+        raise NotInStdLib()
+
+    try:
+        obj_name = obj.name.string_name
+    except AttributeError:
+        pass
+    else:
+        if obj.parent_context == evaluator.BUILTINS:
+            module_name = 'builtins'
+        elif isinstance(obj.parent_context, er.ModuleContext):
+            module_name = obj.parent_context.name.string_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, lazy_context = list(arguments.unpack())[index]
+    except IndexError:
+        return set()
+    else:
+        return lazy_context.infer()
+
+
+def argument_clinic(string, want_obj=False, want_context=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_context:
+                    kwargs['context'] = arguments.context
+                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('iterator[, default], /')
+def builtins_next(evaluator, iterators, defaults):
+    """
+    TODO this function is currently not used. It's a stab at implementing next
+    in a different way than fake objects. This would be a bit more flexible.
+    """
+    if evaluator.python_version[0] == 2:
+        name = 'next'
+    else:
+        name = '__next__'
+
+    types = set()
+    for iterator in iterators:
+        if isinstance(iterator, AbstractInstanceContext):
+            for filter in iterator.get_filters(include_self_names=True):
+                for n in filter.get(name):
+                    for context in n.infer():
+                        types |= context.execute_evaluated()
+    if types:
+        return types
+    return defaults
+
+
+@argument_clinic('object, name[, default], /')
+def builtins_getattr(evaluator, objects, names, defaults=None):
+    # follow the first param
+    for obj in objects:
+        for name in names:
+            if precedence.is_string(name):
+                return obj.py__getattribute__(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(AbstractInstanceContext):
+    """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_context=True)
+def builtins_super(evaluator, types, objects, context):
+    # TODO make this able to detect multiple inheritance super
+    if isinstance(context, (InstanceFunctionExecution,
+                            AnonymousInstanceFunctionExecution)):
+        su = context.instance.py__class__().py__bases__()
+        return unite(context.execute_evaluated() for context in su[0].infer())
+    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.
+    key, lazy_context = next(arguments.unpack())
+    cn = None
+    if isinstance(lazy_context, LazyTreeContext):
+        # TODO access private
+        cn = ContextualizedNode(lazy_context._context, lazy_context.data)
+    ordered = list(iterable.py__iter__(evaluator, sequences, cn))
+
+    rev = list(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.
+    seq = iterable.FakeSequence(evaluator, 'list', rev)
+    arguments = param.ValuesArguments([[seq]])
+    return set([CompiledInstance(evaluator, evaluator.BUILTINS, obj, arguments)])
+
+
+@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 cls_or_tup.name.string_name == 'tuple' \
+                    and cls_or_tup.get_root_context() == evaluator.BUILTINS:
+                # Check for tuples.
+                classes = unite(
+                    lazy_context.infer()
+                    for lazy_context in cls_or_tup.py__iter__()
+                )
+                bool_results.add(any(cls in mro for cls in classes))
+            else:
+                _, lazy_context = list(arguments.unpack())[1]
+                if isinstance(lazy_context, LazyTreeContext):
+                    node = lazy_context.data
+                    message = 'TypeError: isinstance() arg 2 must be a ' \
+                              'class, type, or tuple of classes and types, ' \
+                              'not %s.' % cls_or_tup
+                    analysis.add(lazy_context._context, '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.AbstractSequence):
+        fields = [
+            v.obj
+            for lazy_context in _fields.py__iter__()
+            for v in lazy_context.infer() if hasattr(v, 'obj')
+        ]
+    else:
+        return set()
+
+    base = collections._class_template
+    base += _NAMEDTUPLE_INIT
+    # Build source
+    source = base.format(
+        typename=name,
+        field_names=tuple(fields),
+        num_fields=len(fields),
+        arg_list = repr(tuple(fields)).replace("'", "")[1:-1],
+        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
+    module = evaluator.grammar.parse(source)
+    generated_class = next(module.iter_classdefs())
+    parent_context = er.ModuleContext(evaluator, module, '')
+    return set([er.ClassContext(evaluator, generated_class, parent_context)])
+
+
+@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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/sys_path.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/sys_path.py
new file mode 100644
index 0000000..a4990c3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/evaluate/sys_path.py
@@ -0,0 +1,314 @@
+import glob
+import os
+import sys
+import imp
+from jedi.evaluate.site import addsitedir
+
+from jedi._compatibility import exec_function, unicode
+from jedi.evaluate.cache import evaluator_function_cache
+from jedi.evaluate.compiled import CompiledObject
+from jedi.evaluate.context import ContextualizedNode
+from jedi import settings
+from jedi import debug
+from jedi import common
+
+
+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(module_context, 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 assignee.type in ('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
+        cn = ContextualizedNode(module_context.create_context(expr_stmt), expr_stmt)
+        for lazy_context in py__iter__(module_context.evaluator, cn.infer(), cn):
+            for context in lazy_context.infer():
+                if is_string(context):
+                    yield context.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 (trailer1.type == 'trailer' and trailer1.children[0] == '.'
+            and trailer2.type == '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(module_context):
+    """
+    Detect sys.path modifications within module.
+    """
+    def get_sys_path_powers(names):
+        for name in names:
+            power = name.parent.parent
+            if power.type in ('power', 'atom_expr'):
+                c = power.children
+                if c[0].type == 'name' and c[0].value == 'sys' \
+                        and c[1].type == 'trailer':
+                    n = c[1].children[1]
+                    if n.type == 'name' and n.value == 'path':
+                        yield name, power
+
+    sys_path = list(module_context.evaluator.sys_path)  # copy
+    if isinstance(module_context, CompiledObject):
+        return sys_path
+
+    try:
+        possible_names = module_context.tree_node.get_used_names()['path']
+    except KeyError:
+        pass
+    else:
+        for name, power in get_sys_path_powers(possible_names):
+            expr_stmt = power.parent
+            if len(power.children) >= 4:
+                sys_path.extend(
+                    _paths_from_list_modifications(
+                        module_context.py__file__(), *power.children[2:4]
+                    )
+                )
+            elif expr_stmt is not None and expr_stmt.type == 'expr_stmt':
+                sys_path.extend(_paths_from_assignment(module_context, expr_stmt))
+    return sys_path
+
+
+@evaluator_function_cache(default=[])
+def sys_path_with_modifications(evaluator, module_context):
+    path = module_context.py__file__()
+    if 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(path))
+
+    buildout_script_paths = set()
+
+    result = _check_module(module_context)
+    result += _detect_django_path(path)
+    for buildout_script_path in _get_buildout_script_paths(path):
+        for path in _get_paths_from_buildout_script(evaluator, buildout_script_path):
+            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_path):
+    try:
+        module_node = evaluator.grammar.parse(
+            path=buildout_script_path,
+            cache=True,
+            cache_path=settings.cache_directory
+        )
+    except IOError:
+        debug.warning('Error trying to read buildout_script: %s', buildout_script_path)
+        return
+
+    from jedi.evaluate.representation import ModuleContext
+    for path in _check_module(ModuleContext(evaluator, module_node, buildout_script_path)):
+        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_script_paths(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
+
+
+def dotted_path_in_sys_path(sys_path, module_path):
+    """
+    Returns the dotted path inside a sys.path.
+    """
+    # First remove the suffix.
+    for suffix, _, _ in imp.get_suffixes():
+        if module_path.endswith(suffix):
+            module_path = module_path[:-len(suffix)]
+        break
+    else:
+        # There should always be a suffix in a valid Python file on the path.
+        return None
+
+    if module_path.startswith(os.path.sep):
+        # The paths in sys.path most of the times don't end with a slash.
+        module_path = module_path[1:]
+
+    for p in sys_path:
+        if module_path.startswith(p):
+            rest = module_path[len(p):]
+            if rest:
+                split = rest.split(os.path.sep)
+                for string in split:
+                    if not string or '.' in string:
+                        return None
+                return '.'.join(split)
+
+    return None
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/parser_utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/parser_utils.py
new file mode 100644
index 0000000..59c6408
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/parser_utils.py
@@ -0,0 +1,241 @@
+import textwrap
+from inspect import cleandoc
+
+from jedi._compatibility import literal_eval, is_py3
+from parso.python import tree
+
+_EXECUTE_NODES = set([
+    'funcdef', 'classdef', 'import_from', 'import_name', 'test', 'or_test',
+    'and_test', 'not_test', 'comparison', 'expr', 'xor_expr', 'and_expr',
+    'shift_expr', 'arith_expr', 'atom_expr', 'term', 'factor', 'power', 'atom'
+])
+
+_FLOW_KEYWORDS = (
+    'try', 'except', 'finally', 'else', 'if', 'elif', 'with', 'for', 'while'
+)
+
+
+def get_executable_nodes(node, last_added=False):
+    """
+    For static analysis.
+    """
+    result = []
+    typ = node.type
+    if typ == 'name':
+        next_leaf = node.get_next_leaf()
+        if last_added is False and node.parent.type != 'param' and next_leaf != '=':
+            result.append(node)
+    elif typ == 'expr_stmt':
+        # I think evaluating the statement (and possibly returned arrays),
+        # should be enough for static analysis.
+        result.append(node)
+        for child in node.children:
+            result += get_executable_nodes(child, last_added=True)
+    elif typ == 'decorator':
+        # decorator
+        if node.children[-2] == ')':
+            node = node.children[-3]
+            if node != '(':
+                result += get_executable_nodes(node)
+    else:
+        try:
+            children = node.children
+        except AttributeError:
+            pass
+        else:
+            if node.type in _EXECUTE_NODES and not last_added:
+                result.append(node)
+
+            for child in children:
+                result += get_executable_nodes(child, last_added)
+
+    return result
+
+
+def get_comp_fors(comp_for):
+    yield comp_for
+    last = comp_for.children[-1]
+    while True:
+        if last.type == 'comp_for':
+            yield last
+        elif not last.type == 'comp_if':
+            break
+        last = last.children[-1]
+
+
+def for_stmt_defines_one_name(for_stmt):
+    """
+    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 for_stmt.children[1].type == 'name'
+
+
+def get_flow_branch_keyword(flow_node, node):
+    start_pos = node.start_pos
+    if not (flow_node.start_pos < start_pos <= flow_node.end_pos):
+        raise ValueError('The node is not part of the flow.')
+
+    keyword = None
+    for i, child in enumerate(flow_node.children):
+        if start_pos < child.start_pos:
+            return keyword
+        first_leaf = child.get_first_leaf()
+        if first_leaf in _FLOW_KEYWORDS:
+            keyword = first_leaf
+    return 0
+
+def get_statement_of_position(node, pos):
+    for c in node.children:
+        if c.start_pos <= pos <= c.end_pos:
+            if c.type not in ('decorated', 'simple_stmt', 'suite') \
+                    and not isinstance(c, (tree.Flow, tree.ClassOrFunc)):
+                return c
+            else:
+                try:
+                    return get_statement_of_position(c, pos)
+                except AttributeError:
+                    pass  # Must be a non-scope
+    return None
+
+
+def clean_scope_docstring(scope_node):
+    """ Returns a cleaned version of the docstring token. """
+    node = scope_node.get_doc_node()
+    if node is not None:
+        # 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(safe_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 ''
+
+
+def safe_literal_eval(value):
+    first_two = value[:2].lower()
+    if first_two[0] == 'f' or first_two in ('fr', 'rf'):
+        # literal_eval is not able to resovle f literals. We have to do that
+        # manually, but that's right now not implemented.
+        return ''
+
+    try:
+        return literal_eval(value)
+    except SyntaxError:
+        # It's possible to create syntax errors with literals like rb'' in
+        # Python 2. This should not be possible and in that case just return an
+        # empty string.
+        # Before Python 3.3 there was a more strict definition in which order
+        # you could define literals.
+        return ''
+
+
+def get_call_signature(funcdef, width=72, call_string=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
+    """
+    # Lambdas have no name.
+    if call_string is None:
+        if funcdef.type == 'lambdef':
+            call_string = '<lambda>'
+        else:
+            call_string = funcdef.name.value
+    if funcdef.type == 'lambdef':
+        p = '(' + ''.join(param.get_code() for param in funcdef.get_params()).strip() + ')'
+    else:
+        p = funcdef.children[2].get_code()
+    code = call_string + p
+
+    return '\n'.join(textwrap.wrap(code, width))
+
+
+def get_doc_with_call_signature(scope_node):
+    """
+    Return a document string including call signature.
+    """
+    call_signature = None
+    if scope_node.type == 'classdef':
+        for funcdef in scope_node.iter_funcdefs():
+            if funcdef.name.value == '__init__':
+                call_signature = \
+                    get_call_signature(funcdef, call_string=scope_node.name.value)
+    elif scope_node.type in ('funcdef', 'lambdef'):
+        call_signature = get_call_signature(scope_node)
+
+    doc = clean_scope_docstring(scope_node)
+    if call_signature is None:
+        return doc
+    return '%s\n\n%s' % (call_signature, doc)
+
+
+def move(node, line_offset):
+    """
+    Move the `Node` start_pos.
+    """
+    try:
+        children = node.children
+    except AttributeError:
+        node.line += line_offset
+    else:
+        for c in children:
+            move(c, line_offset)
+
+
+def get_following_comment_same_line(node):
+    """
+    returns (as string) any comment that appears on the same line,
+    after the node, including the #
+    """
+    try:
+        if node.type == 'for_stmt':
+            whitespace = node.children[5].get_first_leaf().prefix
+        elif node.type == 'with_stmt':
+            whitespace = node.children[3].get_first_leaf().prefix
+        else:
+            whitespace = node.get_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
+
+
+def is_scope(node):
+    return node.type in ('file_input', 'classdef', 'funcdef', 'lambdef', 'comp_for')
+
+
+def get_parent_scope(node, include_flows=False):
+    """
+    Returns the underlying scope.
+    """
+    scope = node.parent
+    while scope is not None:
+        if include_flows and isinstance(scope, tree.Flow):
+            return scope
+        if is_scope(scope):
+            break
+        scope = scope.parent
+    return scope
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/refactoring.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/refactoring.py
new file mode 100644
index 0000000..b04caed
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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 parso import python_bytes_to_unicode, split_lines
+from jedi.evaluate import helpers
+
+
+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[old_path] = '\n'.join(old_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 = split_lines(python_bytes_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 = split_lines(python_bytes_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 = split_lines(python_bytes_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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/settings.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/settings.py
new file mode 100644
index 0000000..f1ae6db
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/settings.py
@@ -0,0 +1,163 @@
+"""
+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_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
+
+
+Caching
+~~~~~~~
+
+.. 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 the cache is stored.
+
+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.
+"""
+
+# ----------------
+# caching validity (time)
+# ----------------
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/utils.py
new file mode 100644
index 0000000..177524c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/jedi/utils.py
@@ -0,0 +1,136 @@
+"""
+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 parso import split_lines
+
+from jedi import Interpreter
+from jedi.api.helpers import get_on_completion_name
+
+
+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 = split_lines(text)
+                    position = (len(lines), len(lines[-1]))
+                    name = get_on_completion_name(
+                        interpreter._get_module_node(),
+                        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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/pytest.ini b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/pytest.ini
new file mode 100644
index 0000000..323d03e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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 simple_import
+
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/requirements.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/requirements.txt
new file mode 100644
index 0000000..2c72b5f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/requirements.txt
@@ -0,0 +1 @@
+parso==0.1.0
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/diff_parser_profile.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/diff_parser_profile.py
new file mode 100755
index 0000000..a152a3e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/diff_parser_profile.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+"""
+Profile a piece of Python code with ``cProfile`` that uses the diff parser.
+
+Usage:
+  profile.py <file> [-d] [-s <sort>]
+  profile.py -h | --help
+
+Options:
+  -h --help     Show this screen.
+  -d --debug    Enable Jedi internal debugging.
+  -s <sort>     Sort the profile results, e.g. cumtime, name [default: time].
+"""
+
+import cProfile
+
+from docopt import docopt
+from jedi.parser.python import load_grammar
+from jedi.parser.diff import DiffParser
+from jedi.parser.python import ParserWithRecovery
+from jedi._compatibility import u
+from jedi.common import splitlines
+import jedi
+
+
+def run(parser, lines):
+    diff_parser = DiffParser(parser)
+    diff_parser.update(lines)
+    # Make sure used_names is loaded
+    parser.module.used_names
+
+
+def main(args):
+    if args['--debug']:
+        jedi.set_debug_function(notices=True)
+
+    with open(args['<file>']) as f:
+        code = f.read()
+    grammar = load_grammar()
+    parser = ParserWithRecovery(grammar, u(code))
+    # Make sure used_names is loaded
+    parser.module.used_names
+
+    code =  code + '\na\n'  # Add something so the diff parser needs to run.
+    lines = splitlines(code, keepends=True)
+    cProfile.runctx('run(parser, lines)', globals(), locals(), sort=args['-s'])
+
+if __name__ == '__main__':
+    args = docopt(__doc__)
+    main(args)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/memory_check.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/memory_check.py
new file mode 100755
index 0000000..7bbcad2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/profile_output.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/profile_output.py
new file mode 100755
index 0000000..f692e00
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/profile_output.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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/wx_check.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/scripts/wx_check.py
new file mode 100755
index 0000000..1e48c39
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.cfg b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.cfg
new file mode 100644
index 0000000..3c6e79c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.py
new file mode 100755
index 0000000..b531d9d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/setup.py
@@ -0,0 +1,54 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+import ast
+
+
+__AUTHOR__ = 'David Halter'
+__AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
+
+# Get the version from within jedi. It's defined in exactly one place now.
+with open('jedi/__init__.py') as f:
+    tree = ast.parse(f.read())
+version = tree.body[1].value.s
+
+readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
+packages = ['jedi', 'jedi.evaluate', 'jedi.evaluate.compiled', 'jedi.api']
+with open('requirements.txt') as f:
+    install_requires = f.read().splitlines()
+
+setup(name='jedi',
+      version=version,
+      description='An autocompletion tool for Python that can be used for text editors.',
+      author=__AUTHOR__,
+      author_email=__AUTHOR_EMAIL__,
+      include_package_data=True,
+      maintainer=__AUTHOR__,
+      maintainer_email=__AUTHOR_EMAIL__,
+      url='https://github.com/davidhalter/jedi',
+      license='MIT',
+      keywords='python completion refactoring vim',
+      long_description=readme,
+      packages=packages,
+      install_requires=install_requires,
+      package_data={'jedi': ['evaluate/compiled/fake/*.pym']},
+      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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/sith.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/sith.py
new file mode 100755
index 0000000..ab2ba29
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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):
+        sys.stderr.write(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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/blabla_test_documentation.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/blabla_test_documentation.py
new file mode 100644
index 0000000..db31bf0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/__init__.py
new file mode 100644
index 0000000..374dd94
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/arrays.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/arrays.py
new file mode 100644
index 0000000..8be1cec
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/arrays.py
@@ -0,0 +1,436 @@
+# -----------------
+# 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()
+next(iter(set(a)))
+#? 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]
+
+# 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
+
+
+# python >= 2.7
+# Set literals are not valid in 2.6.
+#? int()
+tuple({1})[0]
+
+# python >= 3.3
+# -----------------
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/async_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/async_.py
new file mode 100644
index 0000000..c6035e3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/async_.py
@@ -0,0 +1,25 @@
+"""
+Tests for all async use cases.
+
+Currently we're not supporting completion of them, but they should at least not
+raise errors or return extremely strange results.
+"""
+
+async def x():
+    argh = await x()
+    #? 
+    argh
+    return 2
+
+#? int()
+x()
+
+a = await x()
+#?
+a
+
+
+async def x2():
+    async with open('asdf') as f:
+        #? ['readlines']
+        f.readlines
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/basic.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/basic.py
new file mode 100644
index 0000000..34e8810
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/basic.py
@@ -0,0 +1,295 @@
+# -----------------
+# 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]
+
+# -----------------
+# 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__
+
+
+# -----------------
+# with statements
+# -----------------
+
+with open('') as f:
+    #? ['closed']
+    f.closed
+    for line in f:
+        #? str()
+        line
+
+# Nested with statements don't exist in Python 2.6.
+# python >= 2.7
+with open('') as f1, open('') as f2:
+    #? ['closed']
+    f1.closed
+    #? ['closed']
+    f2.closed
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/classes.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/classes.py
new file mode 100644
index 0000000..292cfc3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/classes.py
@@ -0,0 +1,535 @@
+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_
+        #?
+        var_local
+
+    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
+
+    def __private_func(self):
+        return 1
+
+    def wrap_private(self):
+        return self.__private_func()
+#? []
+PrivateVar().__var
+#?
+PrivateVar().__var
+#? []
+PrivateVar().__private_func
+#? int()
+PrivateVar().wrap_private()
+
+
+class PrivateSub(PrivateVar):
+    def test(self):
+        #? []
+        self.__var
+
+    def wrap_private(self):
+        #? []
+        self.__var
+
+#? []
+PrivateSub().__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
+
+
+# -----------------
+# With import
+# -----------------
+
+from import_tree.classes import Config2, BaseClass
+
+class Config(BaseClass):
+    """#884"""
+
+#? Config2()
+Config.mode
+
+#? int()
+Config.mode2
+
+
+# -----------------
+# Nested class/def/class
+# -----------------
+class Foo(object):
+    a = 3
+    def create_class(self):
+        class X():
+            a = self.a
+            self.b = 3.0
+        return X
+
+#? int()
+Foo().create_class().a
+#? float()
+Foo().b
+
+class Foo(object):
+    def comprehension_definition(self):
+        return [1 for self.b in [1]]
+
+#? int()
+Foo().b
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/completion.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/completion.py
new file mode 100644
index 0000000..6700fa6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/completion.py
@@ -0,0 +1,50 @@
+"""
+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
+
+
+if x:
+    pass
+#? ['else']
+else
+
+try:
+    pass
+#? ['except', 'Exception']
+except
+
+try:
+    pass
+#? 6 ['except', 'Exception']
+except AttributeError:
+    pass
+#? ['finally']
+finally
+
+for x in y:
+    pass
+#? ['else']
+else
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/complex.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/complex.py
new file mode 100644
index 0000000..3ea8327
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/comprehensions.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/comprehensions.py
new file mode 100644
index 0000000..2894cf3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/comprehensions.py
@@ -0,0 +1,215 @@
+# -----------------
+# 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]
+
+# -----------------
+# nested list comprehensions
+# -----------------
+
+b = [a for arr in [[1, 1.0]] for a in arr]
+#? int()
+b[0]
+#? float()
+b[1]
+
+b = [arr for arr in [[1, 1.0]] for a in arr]
+#? int()
+b[0][0]
+#? float()
+b[1][1]
+
+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]
+
+#? str()
+[x for x in 'chr'][0]
+
+# jedi issue #26
+#? list()
+a = [[int(v) for v in line.strip().split() if v] for line in ["123", str(), "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
+
+# -----------------
+# 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]
+#? str()
+foo[1]
+
+# -----------------
+# 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()
+
+# set/dict comprehensions were introduced in 2.7, therefore:
+# python >= 2.7
+# -----------------
+# 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)}))
+
+
+# with a set literal (also doesn't work in 2.6).
+#? int()
+[a for a in {1, 2, 3}][0]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/context.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/context.py
new file mode 100644
index 0000000..d3e79b8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/context.py
@@ -0,0 +1,45 @@
+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
+
+# -----------------
+# Inheritance
+# -----------------
+
+class Super():
+    enabled = True
+    if enabled:
+        yo_dude = 4
+
+class Sub(Super):
+    #? ['yo_dude']
+    yo_dud
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/decorators.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/decorators.py
new file mode 100644
index 0000000..27e455a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/decorators.py
@@ -0,0 +1,318 @@
+# -----------------
+# 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()
+
+
+# -----------------
+# On decorator completions
+# -----------------
+
+import abc
+#? ['abc']
+@abc
+
+#? ['abstractmethod']
+@abc.abstractmethod
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/definition.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/definition.py
new file mode 100644
index 0000000..f896984
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/descriptors.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/descriptors.py
new file mode 100644
index 0000000..3cc01fa
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/descriptors.py
@@ -0,0 +1,221 @@
+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)
+    #?
+    f.__func
+
+    @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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/docstring.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/docstring.py
new file mode 100644
index 0000000..88db52d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/docstring.py
@@ -0,0 +1,246 @@
+""" 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()
+
+
+def sphinxy_param_type_wrapped(a):
+    """
+    :param str a:
+        Some description wrapped onto the next line with no space after the
+        colon.
+    """
+    #? str()
+    a
+
+
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/dynamic_arrays.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/dynamic_arrays.py
new file mode 100644
index 0000000..9be530f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/dynamic_arrays.py
@@ -0,0 +1,310 @@
+"""
+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]
+
+# -----------------
+# 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]
+
+
+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]
+
+
+# -----------------
+# set.add
+# -----------------
+# Set literals are not valid in 2.6.
+# python >= 2.7
+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()
+
+st = {1.0}
+st.add(1)
+lst = list(st)
+
+lst.append('')
+
+#? float() int() str()
+lst[0]
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/dynamic_params.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/dynamic_params.py
new file mode 100644
index 0000000..8af1730
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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("something")
+
+@def_func
+def func(c=1):
+    #? 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()
+
+
+# -----------------
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/flow_analysis.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/flow_analysis.py
new file mode 100644
index 0000000..af292b4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/flow_analysis.py
@@ -0,0 +1,298 @@
+# -----------------
+# First a few name resolution things
+# -----------------
+
+x = 3
+if NOT_DEFINED:
+    x = ''
+#? 6 int()
+elif x:
+    pass
+else:
+    #? int()
+    x
+
+x = 1
+try:
+    x = ''
+#? 8 int() str()
+except x:
+    #? 5 int() str()
+    x
+    x = 1.0
+else:
+    #? 5 int() str()
+    x
+    x = list
+finally:
+    #? 5 int() str() float() list
+    x
+    x = tuple
+
+
+# -----------------
+# Return checks
+# -----------------
+
+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
+
+if False:
+    in_false = 1
+    #? ['in_false']
+    in_false
+
+# -----------------
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/functions.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/functions.py
new file mode 100644
index 0000000..893e4a3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/functions.py
@@ -0,0 +1,481 @@
+def x():
+    return
+
+#? None
+x()
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/generators.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/generators.py
new file mode 100644
index 0000000..2327b18
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/generators.py
@@ -0,0 +1,231 @@
+# -----------------
+# 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
+
+
+# -----------------
+# tuple assignments
+# -----------------
+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
+
+a, = (a for a in [1])
+#? int()
+a
+
+# -----------------
+# 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()()
+
+# -----------------
+# empty yield
+# -----------------
+
+def x():
+    yield
+
+#? None
+next(x())
+#? gen()
+x()
+
+def x():
+    for i in range(3):
+        yield
+
+#? None
+next(x())
+
+# -----------------
+# yield in expression
+# -----------------
+
+def x():
+     a= [(yield 1)]
+
+#? int()
+next(x())
+
+# -----------------
+# 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/goto.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/goto.py
new file mode 100644
index 0000000..adff012
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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
+#! ['module math']
+math
+
+#! ['module 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 ['param 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 ['param 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
+
+#! ['module 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 param']
+def ab1(param): pass
+#! 9 ['param 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 ['param 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/__init__.py
new file mode 100644
index 0000000..5cbbcd7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/classes.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/classes.py
new file mode 100644
index 0000000..23b088c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/classes.py
@@ -0,0 +1,10 @@
+blub = 1
+
+class Config2():
+    pass
+
+
+class BaseClass():
+    mode = Config2()
+    if isinstance(whaat, int):
+        mode2 = whaat
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/flow_import.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/flow_import.py
new file mode 100644
index 0000000..a0a779e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/flow_import.py
@@ -0,0 +1,4 @@
+if name:
+    env = 1
+else:
+    env = 2
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/invisible_pkg.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/invisible_pkg.py
new file mode 100644
index 0000000..9c78ce2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/mod1.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/mod1.py
new file mode 100644
index 0000000..bd696d6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/mod2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/mod2.py
new file mode 100644
index 0000000..19914f5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/mod2.py
@@ -0,0 +1 @@
+from . import mod1 as fake
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/__init__.py
new file mode 100644
index 0000000..480f222
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/__init__.py
@@ -0,0 +1,3 @@
+a = list
+
+from math import *
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/mod1.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/mod1.py
new file mode 100644
index 0000000..fe1d27f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/pkg/mod1.py
@@ -0,0 +1,3 @@
+a = 1.0
+
+from ..random import foobar
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/random.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/random.py
new file mode 100644
index 0000000..7a34c4e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/random.py
@@ -0,0 +1,6 @@
+"""
+Here because random is also a builtin module.
+"""
+a = set
+
+foobar = 0
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/recurse_class1.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/recurse_class1.py
new file mode 100644
index 0000000..773408c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/recurse_class2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/recurse_class2.py
new file mode 100644
index 0000000..42f84ef
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/rename1.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/rename1.py
new file mode 100644
index 0000000..bdc3315
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/rename1.py
@@ -0,0 +1,3 @@
+""" used for renaming tests """
+
+abc = 3
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/rename2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/import_tree/rename2.py
new file mode 100644
index 0000000..8423895
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/imports.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/imports.py
new file mode 100644
index 0000000..5c8626f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/imports.py
@@ -0,0 +1,295 @@
+# -----------------
+# 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', 'foobar', '__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__
+
+
+# -----------------
+# complex relative imports #784
+# -----------------
+def relative():
+    #? ['foobar']
+    from import_tree.pkg.mod1 import foobar
+    #? int()
+    foobar
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/invalid.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/invalid.py
new file mode 100644
index 0000000..7c047e6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/isinstance.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/isinstance.py
new file mode 100644
index 0000000..15fb9a7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/isinstance.py
@@ -0,0 +1,101 @@
+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):
+            # TODO this is wrong, it should only be str.
+            #? str() int()
+            self.testing
+            #? Test()
+            self
+
+# -----------------
+# Syntax
+# -----------------
+
+#?
+isinstance(1, int())
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/keywords.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/keywords.py
new file mode 100644
index 0000000..9631e8d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/lambdas.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/lambdas.py
new file mode 100644
index 0000000..524df0c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/lambdas.py
@@ -0,0 +1,113 @@
+# -----------------
+# 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()
+
+    lambd = lambda self: self.foo
+
+#? int()
+C().a()
+
+#? str()
+C('foo').ret()()
+
+index = C().with_param()(1)
+#? float()
+['', 1, 1.0][index]
+
+#? float()
+C().lambd()
+#? int()
+C(1).lambd()
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/named_param.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/named_param.py
new file mode 100644
index 0000000..66ba59e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/named_param.py
@@ -0,0 +1,62 @@
+"""
+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__ / __init__
+class Test(object):
+    def __init__(self, hello_other):
+        pass
+
+    def __call__(self, hello):
+        pass
+
+    def test(self, blub):
+        pass
+
+#? 10 ['hello_other']
+Test(hello=)
+#? 12 ['hello']
+Test()(hello=)
+#? 11 []
+Test()(self=)
+#? 16 []
+Test().test(self=)
+#? 16 ['blub']
+Test().test(blub=)
+
+# builtins
+
+#? 12 []
+any(iterable=)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/on_import.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/on_import.py
new file mode 100644
index 0000000..733d741
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/on_import.py
@@ -0,0 +1,110 @@
+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 json as 
+
+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', 'foobar', '__name__', '__doc__', '__file__', '__package__']
+from import_tree.pkg.mod1 import not_existant,    # whitespace before
+#? ['a', 'foobar', '__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', 'classes', '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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/ordering.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/ordering.py
new file mode 100644
index 0000000..61eb192
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/parser.py
new file mode 100644
index 0000000..68793f4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_basic.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_basic.py
new file mode 100644
index 0000000..0230d37
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_basic.py
@@ -0,0 +1,167 @@
+""" 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
+
+
+def keyword_only(a: str, *, b: str):
+    #? ['startswith']
+    a.startswi
+    #? ['startswith']
+    b.startswi
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_comments.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_comments.py
new file mode 100644
index 0000000..7d5f7c2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_typing.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0484_typing.py
new file mode 100644
index 0000000..75c1c0b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0526_variables.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0526_variables.py
new file mode 100644
index 0000000..24b681d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/pep0526_variables.py
@@ -0,0 +1,22 @@
+"""
+PEP 526 introduced a new way of using type annotations on variables. It was
+introduced in Python 3.6.
+"""
+# python >= 3.6
+
+import typing
+
+asdf = ''
+asdf: int
+# This is not necessarily correct, but for now this is ok (at least no error).
+#? int()
+asdf
+
+
+direct: int = NOT_DEFINED
+#? int()
+direct
+
+with_typing_module: typing.List[float] = NOT_DEFINED
+#? float()
+with_typing_module[0]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/precedence.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/precedence.py
new file mode 100644
index 0000000..6078115
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/recursion.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/recursion.py
new file mode 100644
index 0000000..a3e7670
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/recursion.py
@@ -0,0 +1,78 @@
+"""
+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]
+
+
+class InstanceAttributeIfs:
+    def b(self):
+        self.a1 = 1
+        self.a2 = 1
+
+    def c(self):
+        self.a2 = ''
+
+    def x(self):
+        self.b()
+
+        if self.a1 == 1:
+            self.a1 = self.a1 + 1
+        if self.a2 == UNDEFINED:
+            self.a2 = self.a2 + 1
+
+        #? int()
+        self.a1
+        #? int() str()
+        self.a2
+
+#? int()
+InstanceAttributeIfs().a1
+#? int() str()
+InstanceAttributeIfs().a2
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/stdlib.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/stdlib.py
new file mode 100644
index 0000000..b6b739a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/stdlib.py
@@ -0,0 +1,249 @@
+"""
+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)
+
+
+with open('foo') as f:
+    for line in f.readlines():
+        #? str()
+        line
+# -----------------
+# 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
+
+# -----------------
+# contextlib
+# -----------------
+
+import contextlib
+with contextlib.closing('asd') as string:
+    #? str()
+    string
+
+# -----------------
+# shlex
+# -----------------
+
+# Github issue #929
+import shlex
+qsplit = shlex.split("foo, ferwerwerw werw werw e")
+for part in qsplit:
+    #? str() None
+    part
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/sys_path.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/sys_path.py
new file mode 100644
index 0000000..c168a97
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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_function_cache']
+evaluate.Evaluator_fu
+
+#? ['jedi_']
+import jedi_
+
+#? ['el']
+jedi_.el
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/PyQt4_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/PyQt4_.py
new file mode 100644
index 0000000..f4e4183
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/django_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/django_.py
new file mode 100644
index 0000000..9914a6d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/jedi_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/jedi_.py
new file mode 100644
index 0000000..dc384b1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/psycopg2_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/psycopg2_.py
new file mode 100644
index 0000000..834704b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/pylab_.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/thirdparty/pylab_.py
new file mode 100644
index 0000000..ab132a4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/types.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/types.py
new file mode 100644
index 0000000..2ef01f9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/types.py
@@ -0,0 +1,129 @@
+# -----------------
+# 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]
+
+# -----------------
+# tuples
+# -----------------
+tup = ('',2)
+
+#? ['count']
+tup.c
+
+tup2 = tuple()
+#? ['index']
+tup2.i
+#? ['index']
+().i
+
+tup3 = 1,""
+#? ['index']
+tup3.index
+
+tup4 = 1,""
+#? ['index']
+tup4.index
+
+# -----------------
+# set
+# -----------------
+# Set literals are not valid in 2.6.
+# python >= 2.7
+set_t = {1,2}
+
+#? ['clear', 'copy']
+set_t.c
+
+set_t2 = set()
+
+#? ['clear', 'copy']
+set_t2.c
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/usages.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/usages.py
new file mode 100644
index 0000000..55891b7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/completion/usages.py
@@ -0,0 +1,304 @@
+"""
+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), (11,17), (14,17), ('imports', 72, 16)
+from import_tree import rename1
+
+#< (0,8), ('rename1',3,0), ('rename2',4,20), ('rename2',6,0), (3,32), (8,32), (5,0)
+rename1.abc
+
+#< (-3,8), ('rename1', 3,0), ('rename2', 4,20), ('rename2', 6,0), (0,32), (5,32), (2,0)
+from import_tree.rename1 import abc
+#< (-5,8), (-2,32), ('rename1', 3,0), ('rename2', 4,20), ('rename2', 6,0), (0,0), (3,32)
+abc
+
+#< 20 ('rename1', 1,0), ('rename2', 4,5), (-11,24), (-8,0), (-5,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
+
+# -----------------
+# comprehensions
+# -----------------
+
+#< 0 (0,0), (2,12)
+x = 32
+#< 12 (-2,0), (0,12)
+[x for x in x]
+
+#< 0 (0,0), (2,1), (2,12)
+x = 32
+#< 12 (-2,0), (0,1), (0,12)
+[x for b in x]
+
+
+#< 1 (0,1), (0,7)
+[x for x in something]
+#< 7 (0,1), (0,7)
+[x for x in something]
+
+x = 3
+# Not supported syntax in Python 2.6.
+# python >= 2.7
+#< 1 (0,1), (0,10)
+{x:1 for  x in something}
+#< 10 (0,1), (0,10)
+{x:1 for  x in something}
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/conftest.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/conftest.py
new file mode 100644
index 0000000..db2f826
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/conftest.py
@@ -0,0 +1,127 @@
+import os
+import re
+
+import pytest
+
+from . import helpers
+from . import run
+from . import refactor
+
+import jedi
+from jedi.evaluate.analysis import Warning
+
+
+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')
+        cases = list(collect_static_analysis_tests(base_dir, test_files))
+        metafunc.parametrize(
+            'static_analysis_case',
+            cases,
+            ids=[c.name for c in cases]
+        )
+
+
+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
+        self.name = os.path.basename(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 cwd_tmpdir(monkeypatch, tmpdir):
+    with helpers.set_cwd(tmpdir.dirpath):
+        yield tmpdir
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/helpers.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/helpers.py
new file mode 100644
index 0000000..b29dd29
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/helpers.py
@@ -0,0 +1,49 @@
+"""
+A helper module for testing, improves compatibility for testing (as
+``jedi._compatibility``) as well as introducing helper functions.
+"""
+
+import sys
+from contextlib import contextmanager
+
+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):
+            with set_cwd(path):
+                return func(*args, **kwds)
+        return wrapper
+    return decorator
+
+
+@contextmanager
+def set_cwd(path, absolute_path=False):
+    repo_root = os.path.dirname(test_dir)
+
+    oldcwd = os.getcwd()
+    os.chdir(os.path.join(repo_root, path))
+    try:
+        yield
+    finally:
+        os.chdir(oldcwd)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor.py
new file mode 100755
index 0000000..9cc10fd
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/extract.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/extract.py
new file mode 100644
index 0000000..312aced
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/inline.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/inline.py
new file mode 100644
index 0000000..c373be2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/rename.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/refactor/rename.py
new file mode 100644
index 0000000..e98c589
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/run.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/run.py
new file mode 100755
index 0000000..00b0c65
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/run.py
@@ -0,0 +1,451 @@
+#!/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 parso
+
+import jedi
+from jedi import debug
+from jedi._compatibility import unicode, is_py3
+from jedi.api.classes import Definition
+from jedi.api.completion import get_user_scope
+from jedi import parser_utils
+
+
+TEST_COMPLETIONS = 0
+TEST_DEFINITIONS = 1
+TEST_ASSIGNMENTS = 2
+TEST_USAGES = 3
+
+
+grammar36 = parso.load_grammar(version='3.6')
+
+
+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 = grammar36.parse(string, start_symbol='eval_input', error_recovery=False)
+                parser_utils.move(parser.get_root_node(), self.line_nr)
+                element = parser.get_root_node()
+                module_context = script._get_module()
+                # The context shouldn't matter for the test results.
+                user_context = get_user_scope(module_context, (self.line_nr, 0))
+                if user_context.api_type == 'function':
+                    user_context = user_context.get_function_execution()
+                element.parent = user_context.tree_node
+                results = evaluator.eval_element(user_context, 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.name) for r in results)
+            debug.dbg('Finished getting types', color='YELLOW')
+
+            # 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()
+
+    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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/speed/precedence.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/speed/precedence.py
new file mode 100644
index 0000000..afd8824
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/attribute_error.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/attribute_error.py
new file mode 100644
index 0000000..4b084c1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/attribute_warnings.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/attribute_warnings.py
new file mode 100644
index 0000000..0e1e5e9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/branches.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/branches.py
new file mode 100644
index 0000000..6828d33
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/builtins.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/builtins.py
new file mode 100644
index 0000000..86caca6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/class_simple.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/class_simple.py
new file mode 100644
index 0000000..3f84fde
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/comprehensions.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/comprehensions.py
new file mode 100644
index 0000000..8701b11
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/comprehensions.py
@@ -0,0 +1,42 @@
+[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
+# ----------
+
+abcdef = []
+#! 12 name-error
+[1 for a in NOT_DEFINFED for b in abcdef 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/descriptors.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/descriptors.py
new file mode 100644
index 0000000..0fc5d15
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/generators.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/generators.py
new file mode 100644
index 0000000..b941800
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/__init__.py
new file mode 100644
index 0000000..cb485f1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/a.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/a.py
new file mode 100644
index 0000000..b02981c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/a.py
@@ -0,0 +1 @@
+from . import b
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/b.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/import_tree/b.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/imports.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/imports.py
new file mode 100644
index 0000000..0df9bac
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/iterable.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/iterable.py
new file mode 100644
index 0000000..0eae367
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/keywords.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/keywords.py
new file mode 100644
index 0000000..e3fcaa4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/normal_arguments.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/normal_arguments.py
new file mode 100644
index 0000000..2fc8e81
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/normal_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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/operations.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/operations.py
new file mode 100644
index 0000000..05e1406
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/python2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/python2.py
new file mode 100644
index 0000000..4d896e3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/star_arguments.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/star_arguments.py
new file mode 100644
index 0000000..34be43b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/try_except.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/static_analysis/try_except.py
new file mode 100644
index 0000000..e654328
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/__init__.py
new file mode 100644
index 0000000..d2ae403
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/__init__.py
@@ -0,0 +1,4 @@
+"""
+An import tree, for testing usages.
+"""
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/a.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/a.py
new file mode 100644
index 0000000..acc8183
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/a.py
@@ -0,0 +1,4 @@
+from . import b
+
+def foo():
+    b.bar()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/b.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/b.py
new file mode 100644
index 0000000..4371a5a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/import_tree_for_usages/b.py
@@ -0,0 +1,2 @@
+def bar():
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/__init__.py
new file mode 100644
index 0000000..3a03a82
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/__init__.py
@@ -0,0 +1,5 @@
+from simple_import import module
+
+
+def in_function():
+    from simple_import import module2
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/module.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/module.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/module2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/simple_import/module2.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_analysis.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_analysis.py
new file mode 100644
index 0000000..cfcd405
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_api.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_api.py
new file mode 100644
index 0000000..a8064d7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_api.py
@@ -0,0 +1,224 @@
+"""
+Test all things related to the ``jedi.api`` module.
+"""
+
+import os
+from textwrap import dedent
+
+from jedi import api
+from jedi._compatibility import is_py3
+from pytest import raises
+from parso import cache
+
+
+def test_preload_modules():
+    def check_loaded(*modules):
+        # +1 for None module (currently used)
+        grammar_cache = next(iter(cache.parser_cache.values()))
+        assert len(grammar_cache) == len(modules) + 1
+        for i in modules:
+            assert [i in k for k in grammar_cache.keys() if k is not None]
+
+    old_cache = cache.parser_cache.copy()
+    cache.parser_cache.clear()
+
+    try:
+        api.preload_module('sys')
+        check_loaded()  # compiled (c_builtin) modules shouldn't be in the cache.
+        api.preload_module('types', 'token')
+        check_loaded('types', 'token')
+    finally:
+        cache.parser_cache.update(old_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 == 'instance True'
+
+
+def test_goto_definitions_on_non_name():
+    assert api.Script('import x', column=0).goto_definitions() == []
+
+
+def test_goto_definitions_on_generator():
+    def_, = api.Script('def x(): yield 1\ny=x()\ny').goto_definitions()
+    assert def_.name == 'generator'
+
+
+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
+    first_line = 'def foo():\n'
+    line = '    foo'
+    code = '%s%s' % (first_line, line)
+    assert get_line_code(code) == first_line
+
+    # With before/after
+    code = code + '\nother_line'
+    assert get_line_code(code, line=2) == first_line
+    assert get_line_code(code, line=2, after=1) == first_line + line + '\n'
+    assert get_line_code(code, line=2, after=2, before=1) == code
+    # Should just be the whole thing, since there are no more lines on both
+    # sides.
+    assert get_line_code(code, line=2, after=3, before=3) == code
+
+
+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.line, definition.column) == (1, 0)
+
+    definition, = api.Script(code).goto_assignments(follow_imports=True)
+    assert 'inspect.py' in definition.module_path
+    assert (definition.line, definition.column) > (1, 0)
+
+    code = '''def param(p): pass\nparam(1)'''
+    start_pos = 1, len('def param(')
+
+    script = api.Script(code, *start_pos)
+    definition, = script.goto_assignments(follow_imports=True)
+    assert (definition.line, definition.column) == start_pos
+    assert definition.name == 'p'
+    result, = definition.goto_assignments()
+    assert result.name == 'p'
+    result, = definition._goto_definitions()
+    assert result.name == 'int'
+    result, = result._goto_definitions()
+    assert result.name == 'int'
+
+    definition, = script.goto_assignments()
+    assert (definition.line, definition.column) == start_pos
+
+    d, = api.Script('a = 1\na').goto_assignments(follow_imports=True)
+    assert d.name == 'a'
+
+
+def test_goto_module():
+    def check(line, expected):
+        script = api.Script(path=path, line=line)
+        module, = script.goto_assignments()
+        assert module.module_path == expected
+
+    base_path = os.path.join(os.path.dirname(__file__), 'simple_import')
+    path = os.path.join(base_path, '__init__.py')
+
+    check(1, os.path.join(base_path, 'module.py'))
+    check(5, os.path.join(base_path, 'module2.py'))
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_api_classes_follow_definition.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_api_classes_follow_definition.py
new file mode 100644
index 0000000..ffc0cb6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_call_signatures.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_call_signatures.py
new file mode 100644
index 0000000..c0fc976
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_call_signatures.py
@@ -0,0 +1,426 @@
+from textwrap import dedent
+import inspect
+import warnings
+
+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', None, 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 == ['param *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', 'parent', 'goto_assignments', 'params']
+        if attr_name.startswith('_') or attr_name in dont_scan:
+            continue
+
+        # Might trigger some deprecation warnings.
+        with warnings.catch_warnings(record=True):
+            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
+    assert Script('').call_signatures() == []
+
+
+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']
+
+
+def test_class_creation():
+    code = dedent('''\
+    class X():
+        def __init__(self, foo, bar):
+            self.foo = foo
+    ''')
+    sig, = Script(code + 'X(').call_signatures()
+    assert sig.index == 0
+    assert sig.name == 'X'
+    assert [p.name for p in sig.params] == ['foo', 'bar']
+
+    sig, = Script(code + 'X.__init__(').call_signatures()
+    assert [p.name for p in sig.params] == ['self', 'foo', 'bar']
+    sig, = Script(code + 'X().__init__(').call_signatures()
+    assert [p.name for p in sig.params] == ['foo', 'bar']
+
+
+def test_call_magic_method():
+    code = dedent('''\
+    class X():
+        def __call__(self, baz):
+            pass
+    ''')
+    sig, = Script(code + 'X()(').call_signatures()
+    assert sig.index == 0
+    assert sig.name == 'X'
+    assert [p.name for p in sig.params] == ['baz']
+
+    sig, = Script(code + 'X.__call__(').call_signatures()
+    assert [p.name for p in sig.params] == ['self', 'baz']
+    sig, = Script(code + 'X().__call__(').call_signatures()
+    assert [p.name for p in sig.params] == ['baz']
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_classes.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_classes.py
new file mode 100644
index 0000000..cc01c2a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_classes.py
@@ -0,0 +1,393 @@
+""" Test all things related to the ``jedi.api_classes`` module.
+"""
+
+from textwrap import dedent
+from inspect import cleandoc
+
+import pytest
+
+from jedi import Script, __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 += 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].docstring()
+    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].docstring()
+    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', '')
+    docstr(dedent('''
+        def x():
+            "hello"
+            0
+        x'''),
+        'hello'
+    )
+    docstr(dedent('''
+        def x():
+            "hello";0
+        x'''),
+        'hello'
+    )
+    # Shouldn't work with a tuple.
+    docstr(dedent('''
+        def x():
+            "hello",0
+        x'''),
+        ''
+    )
+    # Should also not work if we rename something.
+    docstr(dedent('''
+        def x():
+            "hello"
+        y = x
+        y'''),
+        ''
+    )
+
+
+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] == ['param a', 'param b=5', 'param 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):
+        def_, = Script(dedent(source), line, column).goto_assignments()
+        return def_.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 == 'class'
+
+        parent = Script('str.join').completions()[0].parent()
+        assert parent.name == 'str'
+        assert parent.type == 'class'
+
+
+def test_type():
+    for c in Script('a = [str()]; a[0].').completions():
+        if c.name == '__class__':
+            assert c.type == 'class'
+        else:
+            assert c.type in ('function', 'instance')
+
+    # Github issue #397, type should never raise an error.
+    for c in Script('import os; os.path.').completions():
+        assert c.type
+
+def test_type_II():
+    """
+    GitHub Issue #833, `keyword`s are seen as `module`s
+    """
+    for c in Script('f').completions():
+        if c.name == 'for':
+            assert c.type == 'keyword'
+
+
+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.line, param.column) == (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 == 'module'
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'json'
+        assert n.type == 'module'
+
+        assert nms[1].name == 'load'
+        assert nms[1].type == 'function'
+        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 == 'module'
+        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 == 'module'
+
+        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 == 'module'
+        assert nms[0]._name.tree_name.parent.type == 'dotted_as_name'
+        n = nms[0].goto_assignments()[0]
+        assert n.name == 'json'
+        assert n.type == 'module'
+        assert n._name._context.tree_node.type == 'file_input'
+
+        assert nms[1].name == 'foo'
+        assert nms[1].type == 'module'
+        assert nms[1]._name.tree_name.parent.type == 'dotted_as_name'
+        ass = nms[1].goto_assignments()
+        assert len(ass) == 1
+        assert ass[0].name == 'json'
+        assert ass[0].type == 'module'
+        assert ass[0]._name._context.tree_node.type == 'file_input'
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_completion.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_completion.py
new file mode 100644
index 0000000..6cd7e04
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_completion.py
@@ -0,0 +1,49 @@
+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
+
+
+def test_empty_init():
+    """This was actually an issue."""
+    code = dedent('''\
+    class X(object): pass
+    X(''')
+    assert Script(code).completions()
+
+
+def test_in_empty_space():
+    code = dedent('''\
+    class X(object):
+        def __init__(self):
+            hello
+            ''')
+    comps = Script(code, 3, 7).completions()
+    self, = [c for c in comps if c.name == 'self']
+    assert self.name == 'self'
+    def_, = self._goto_definitions()
+    assert def_.name == 'X'
+
+
+def test_indent_context():
+    """
+    If an INDENT is the next supposed token, we should still be able to
+    complete.
+    """
+    code = 'if 1:\nisinstanc'
+    comp, = Script(code).completions()
+    assert comp.name == 'isinstance'
+
+
+def test_keyword_context():
+    def get_names(*args, **kwargs):
+        return [d.name for d in Script(*args, **kwargs).completions()]
+
+    names = get_names('if 1:\n pass\n')
+    assert 'if' in names
+    assert 'elif' in names
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_defined_names.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_defined_names.py
new file mode 100644
index 0000000..b982594
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_defined_names.py
@@ -0,0 +1,92 @@
+"""
+Tests for `api.defined_names`.
+"""
+
+from textwrap import dedent
+
+from jedi import 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],
+                         ['__main__.Class.f', '__main__.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 = 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_full_name.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_full_name.py
new file mode 100644
index 0000000..d2ad9d0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_full_name.py
@@ -0,0 +1,104 @@
+"""
+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.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.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
+        """, ['__main__.f', '__main__.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']
+
+
+def test_os_path():
+    d, = jedi.Script('from os.path import join').completions()
+    assert d.full_name == 'os.path.join'
+    d, = jedi.Script('import os.p').completions()
+    assert d.full_name == 'os.path'
+
+
+def test_os_issues():
+    """Issue #873"""
+    c, = jedi.Script('import os\nos.nt''').completions()
+    assert c.full_name == 'nt'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_interpreter.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_interpreter.py
new file mode 100644
index 0000000..1a132de
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_interpreter.py
@@ -0,0 +1,292 @@
+"""
+Tests of ``jedi.api.Interpreter``.
+"""
+import pytest
+
+import jedi
+from jedi._compatibility import is_py33, exec_function, py_version
+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_numpy_like_non_zero():
+    """
+    Numpy-like array can't be caster to bool and need to be compacre with
+    `is`/`is not` and not `==`/`!=`
+    """
+
+    class NumpyNonZero:
+
+        def __zero__(self):
+            raise ValueError('Numpy arrays would raise and tell you to use .any() or all()')
+        def __bool__(self):
+            raise ValueError('Numpy arrays would raise and tell you to use .any() or all()')
+
+    class NumpyLike:
+
+        def __eq__(self, other):
+            return NumpyNonZero()
+
+        def something(self):
+            pass
+
+    x = NumpyLike()
+    d = {'a': x}
+
+    # just assert these do not raise. They (strangely) trigger different
+    # codepath
+    get_completion('d["a"].some', {'d':d})
+    get_completion('x.some', {'x':x})
+
+
+def test_nested_resolve():
+    class XX():
+        def x():
+            pass
+
+    cls = get_completion('XX', locals())
+    func = get_completion('XX.x', locals())
+    assert (func.line, func.column) == (cls.line + 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.
+    context, = side_effect._name.infer()
+    assert isinstance(context, mixed.MixedObject)
+    foo = get_completion('SideEffectContainer.foo', _GlobalNameSpace.__dict__)
+    assert foo.name == 'foo'
+
+
+def _assert_interpreter_complete(source, namespace, completions,
+                                 **kwds):
+    script = jedi.Interpreter(source, [namespace], **kwds)
+    cs = script.completions()
+    actual = [c.name for c in cs]
+    assert sorted(actual) == sorted(completions)
+
+
+def test_complete_raw_function():
+    from os.path import join
+    _assert_interpreter_complete('join("").up',
+                                 locals(),
+                                 ['upper'])
+
+
+def test_complete_raw_function_different_name():
+    from os.path import join as pjoin
+    _assert_interpreter_complete('pjoin("").up',
+                                 locals(),
+                                 ['upper'])
+
+
+def test_complete_raw_module():
+    import os
+    _assert_interpreter_complete('os.path.join("a").up',
+                                 locals(),
+                                 ['upper'])
+
+
+def test_complete_raw_instance():
+    import datetime
+    dt = datetime.datetime(2013, 1, 1)
+    completions = ['time', 'timetz', 'timetuple']
+    if is_py33:
+        completions += ['timestamp']
+    _assert_interpreter_complete('(dt - dt).ti',
+                                 locals(),
+                                 completions)
+
+
+def test_list():
+    array = ['haha', 1]
+    _assert_interpreter_complete('array[0].uppe',
+                                 locals(),
+                                 ['upper'])
+    _assert_interpreter_complete('array[0].real',
+                                 locals(),
+                                 [])
+
+    # something different, no index given, still just return the right
+    _assert_interpreter_complete('array[int].real',
+                                 locals(),
+                                 ['real'])
+    _assert_interpreter_complete('array[int()].real',
+                                 locals(),
+                                 ['real'])
+    # inexistent index
+    _assert_interpreter_complete('array[2].upper',
+                                 locals(),
+                                 ['upper'])
+
+
+def test_slice():
+    class Foo1():
+        bar = []
+    baz = 'xbarx'
+    _assert_interpreter_complete('getattr(Foo1, baz[1:-1]).append',
+                                 locals(),
+                                 ['append'])
+
+
+def test_getitem_side_effects():
+    class Foo2():
+        def __getitem__(self, index):
+            # Possible side effects here, should therefore not call this.
+            if True:
+                raise NotImplementedError()
+            return index
+
+    foo = Foo2()
+    _assert_interpreter_complete('foo["asdf"].upper', locals(), ['upper'])
+
+
+def test_property_error_oldstyle():
+    lst = []
+    class Foo3():
+        @property
+        def bar(self):
+            lst.append(1)
+            raise ValueError
+
+    foo = Foo3()
+    _assert_interpreter_complete('foo.bar', locals(), ['bar'])
+    _assert_interpreter_complete('foo.bar.baz', locals(), [])
+
+    # There should not be side effects
+    assert lst == []
+
+
+def test_property_error_newstyle():
+    lst = []
+    class Foo3(object):
+        @property
+        def bar(self):
+            lst.append(1)
+            raise ValueError
+
+    foo = Foo3()
+    _assert_interpreter_complete('foo.bar', locals(), ['bar'])
+    _assert_interpreter_complete('foo.bar.baz', locals(), [])
+
+    # There should not be side effects
+    assert lst == []
+
+
+def test_param_completion():
+    def foo(bar):
+        pass
+
+    lambd = lambda xyz: 3
+
+    _assert_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()
+
+
+def test_endless_yield():
+    lst = [1] * 10000
+    # If iterating over lists it should not be possible to take an extremely
+    # long time.
+    _assert_interpreter_complete('list(lst)[9000].rea', locals(), ['real'])
+
+
+@pytest.mark.skipif('py_version < 33', reason='inspect.signature was created in 3.3.')
+def test_completion_params():
+    foo = lambda a, b=3: None
+
+    script = jedi.Interpreter('foo', [locals()])
+    c, = script.completions()
+    assert [p.name for p in c.params] == ['a', 'b']
+    assert c.params[0]._goto_definitions() == []
+    t, = c.params[1]._goto_definitions()
+    assert t.name == 'int'
+
+
+@pytest.mark.skipif('py_version < 33', reason='inspect.signature was created in 3.3.')
+def test_completion_param_annotations():
+    # Need to define this function not directly in Python. Otherwise Jedi is to
+    # clever and uses the Python code instead of the signature object.
+    code = 'def foo(a: 1, b: str, c: int = 1.0): pass'
+    exec_function(code, locals())
+    script = jedi.Interpreter('foo', [locals()])
+    c, = script.completions()
+    a, b, c = c.params
+    assert a._goto_definitions() == []
+    assert [d.name for d in b._goto_definitions()] == ['str']
+    assert set([d.name for d in c._goto_definitions()]) == set(['int', 'float'])
+
+
+def test_more_complex_instances():
+    class Something:
+        def foo(self, other):
+            return self
+
+    class Base():
+        def wow(self):
+            return Something()
+
+    #script = jedi.Interpreter('Base().wow().foo', [locals()])
+    #c, = script.completions()
+    #assert c.name == 'foo'
+
+    x = Base()
+    script = jedi.Interpreter('x.wow().foo', [locals()])
+    c, = script.completions()
+    assert c.name == 'foo'
+
+
+def test_repr_execution_issue():
+    """
+    Anticipate inspect.getfile executing a __repr__ of all kinds of objects.
+    See also #919.
+    """
+    class ErrorRepr:
+        def __repr__(self):
+            raise Exception('xyz')
+
+    er = ErrorRepr()
+
+    script = jedi.Interpreter('er', [locals()])
+    d, = script.goto_definitions()
+    assert d.name == 'ErrorRepr'
+    assert d.type == 'instance'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_unicode.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_unicode.py
new file mode 100644
index 0000000..bcd8ad4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_usages.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_usages.py
new file mode 100644
index 0000000..e1852aa
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_api/test_usages.py
@@ -0,0 +1,48 @@
+import jedi
+import os.path
+
+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]
+
+
+def usages_with_additional_modules(script, additional_modules):
+    """
+    Stripped down version of `jedi.api.Script.usages` that can take an
+    explicit set of additional modules. For use with `test_cross_module_usages`.
+    """
+
+    definition_names = jedi.api.usages.resolve_potential_imports(script._evaluator,
+                                                        script._goto())
+    modules = set([d.get_root_context() for d in definition_names])
+    modules.add(script._get_module())
+    for additional_module in additional_modules:
+        modules.add(additional_module._name.get_root_context())
+    return jedi.api.usages.usages(script._evaluator, definition_names, modules)
+
+
+def test_cross_module_usages():
+    """
+    This tests finding of usages between different modules. In
+    `jedi.api.usages.compare_contexts`, this exercises the case where
+    `c1 != c2`. This tests whether `jedi` can find the usage of
+    `import_tree_for_usages.b.bar` in `import_tree_for_usages.a`
+    """
+
+    def usages_script():
+        source = 'import import_tree_for_usages.b; import_tree_for_usages.b.bar'
+        return jedi.api.Script(source=source, line=1, column=len(source),
+                               sys_path=[os.path.dirname(os.path.abspath(__file__))])
+
+    def module_script():
+        source = 'import import_tree_for_usages.a; import_tree_for_usages.a'
+        return jedi.api.Script(source=source, line=1, column=len(source),
+                               sys_path=[os.path.dirname(os.path.abspath(__file__))])
+
+    module = module_script().goto_definitions()[0]
+    module_definition = module._name.get_root_context()
+    usages_list = usages_with_additional_modules(usages_script(), set([module]))
+
+    assert any([elt for elt in usages_list if elt.module_name == 'a']), (
+        "Did not find cross-module usage of :func:`b.bar` in :mod:`a`. Usages list was: {}"
+        .format(usages_list))
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_cache.py
new file mode 100644
index 0000000..d94a78e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_cache.py
@@ -0,0 +1,31 @@
+"""
+Test all things related to the ``jedi.cache`` module.
+"""
+
+import jedi
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_debug.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_debug.py
new file mode 100644
index 0000000..0033107
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/absolute_import/local_module.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/absolute_import/local_module.py
new file mode 100644
index 0000000..aa4bf00
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/absolute_import/unittest.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/absolute_import/unittest.py
new file mode 100644
index 0000000..eee1e93
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/app b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/app
new file mode 100644
index 0000000..7394d2d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/binary_file b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/binary_file
new file mode 100644
index 0000000..f1ad755
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/binary_file
@@ -0,0 +1 @@
+�PNG
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/empty_file b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/bin/empty_file
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/buildout.cfg b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/buildout.cfg
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/src/proj_name/module_name.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/buildout_project/src/proj_name/module_name.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py
new file mode 100644
index 0000000..e876bc1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/__init__.py
@@ -0,0 +1 @@
+                    
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask/ext/__init__.py
@@ -0,0 +1 @@
+
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py
new file mode 100644
index 0000000..e9b3fff
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_baz/__init__.py
@@ -0,0 +1 @@
+Baz = 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_foo.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_foo.py
new file mode 100644
index 0000000..0b910b8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flask_foo.py
@@ -0,0 +1,2 @@
+class Foo(object):
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py
new file mode 100644
index 0000000..6629f9a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/bar.py
@@ -0,0 +1,2 @@
+class Bar(object):
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py
new file mode 100644
index 0000000..266e809
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/flask-site-packages/flaskext/moo/__init__.py
@@ -0,0 +1 @@
+Moo = 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns1/pkg/ns1_file.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns1/pkg/ns1_file.py
new file mode 100644
index 0000000..940279f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns1/pkg/ns1_file.py
@@ -0,0 +1 @@
+foo = 'ns1_file!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns2/pkg/ns2_file.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns2/pkg/ns2_file.py
new file mode 100644
index 0000000..e87d7d8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_namespace_package/ns2/pkg/ns2_file.py
@@ -0,0 +1 @@
+foo = 'ns2_file!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_nested_namespaces/namespace/pkg/module.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_nested_namespaces/namespace/pkg/module.py
new file mode 100644
index 0000000..3c37820
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/implicit_nested_namespaces/namespace/pkg/module.py
@@ -0,0 +1 @@
+CONST = 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/init_extension_module/module.c b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/init_extension_module/module.c
new file mode 100644
index 0000000..bfa06f6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/init_extension_module/setup.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/init_extension_module/setup.py
new file mode 100644
index 0000000..5ce0517
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/__init__.py
new file mode 100644
index 0000000..bc10ee2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
new file mode 100644
index 0000000..940279f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_file.py
@@ -0,0 +1 @@
+foo = 'ns1_file!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
new file mode 100644
index 0000000..9eeeb29
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns1/pkg/ns1_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns1_folder!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
new file mode 100644
index 0000000..e87d7d8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_file.py
@@ -0,0 +1 @@
+foo = 'ns2_file!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
new file mode 100644
index 0000000..70b24ae
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/__init__.py
@@ -0,0 +1 @@
+foo = 'ns2_folder!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/namespace_package/ns2/pkg/ns2_folder/nested/__init__.py
@@ -0,0 +1 @@
+foo = 'nested!'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/namespace/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/namespace/__init__.py
new file mode 100644
index 0000000..42e33a7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py
new file mode 100644
index 0000000..3c37820
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/nested_namespaces/namespace/pkg/__init__.py
@@ -0,0 +1 @@
+CONST = 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path.py
@@ -0,0 +1 @@
+value = 3
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/not_in_sys_path_package/module.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/pkg/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/pkg/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/pkg/module.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/not_in_sys_path/pkg/module.py
new file mode 100644
index 0000000..53c44ca
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_absolute_import.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_absolute_import.py
new file mode 100644
index 0000000..418cd56
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_absolute_import.py
@@ -0,0 +1,12 @@
+"""
+Tests ``from __future__ import absolute_import`` (only important for
+Python 2.X)
+"""
+import jedi
+from .. import helpers
+
+
+@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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_annotations.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_annotations.py
new file mode 100644
index 0000000..67fe84e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_buildout_detection.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_buildout_detection.py
new file mode 100644
index 0000000..08e5309
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_buildout_detection.py
@@ -0,0 +1,96 @@
+import os
+from textwrap import dedent
+
+import parso
+
+from jedi._compatibility import u
+from jedi.evaluate.sys_path import (_get_parent_dir_with_file,
+                                    _get_buildout_script_paths,
+                                    sys_path_with_modifications,
+                                    _check_module)
+from jedi.evaluate import Evaluator
+from jedi.evaluate.representation import ModuleContext
+
+from ..helpers import cwd_at
+
+
+def check_module_test(code):
+    grammar = parso.load_grammar()
+    module_context = ModuleContext(Evaluator(grammar), parso.parse(code), path=None)
+    return _check_module(module_context)
+
+
+@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_script_paths(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():
+    code = dedent(u("""
+        class Dummy(object):
+            path = []
+
+        d = Dummy()
+        d.path.append('foo')"""))
+
+    paths = check_module_test(code)
+    assert len(paths) > 0
+    assert 'foo' not in paths
+
+
+def test_path_from_invalid_sys_path_assignment():
+    code = dedent(u("""
+        import sys
+        sys.path = 'invalid'"""))
+
+    paths = check_module_test(code)
+    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():
+    code = dedent("""
+        import os
+    """)
+
+    path = os.path.abspath(os.path.join(os.curdir, 'module_name.py'))
+    grammar = parso.load_grammar()
+    module_node = parso.parse(code, path=path)
+    module_context = ModuleContext(Evaluator(grammar), module_node, path=path)
+    paths = sys_path_with_modifications(module_context.evaluator, module_context)
+    assert '/tmp/.buildout/eggs/important_package.egg' in paths
+
+
+def test_path_from_sys_path_assignment():
+    code = 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())"""))
+
+    paths = check_module_test(code)
+    assert 1 not in paths
+    assert '/home/test/.buildout/eggs/important_package.egg' in paths
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_compiled.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_compiled.py
new file mode 100644
index 0000000..0ff4693
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_compiled.py
@@ -0,0 +1,98 @@
+from textwrap import dedent
+
+import parso
+
+from jedi._compatibility import builtins, is_py3
+from jedi.evaluate import compiled, instance
+from jedi.evaluate.representation import FunctionContext
+from jedi.evaluate import Evaluator
+from jedi.parser_utils import clean_scope_docstring
+from jedi import Script
+
+
+def _evaluator():
+    return Evaluator(parso.load_grammar())
+
+
+def test_simple():
+    e = _evaluator()
+    bltn = compiled.CompiledObject(e, builtins)
+    obj = compiled.CompiledObject(e, '_str_', bltn)
+    upper, = obj.py__getattribute__('upper')
+    objs = list(upper.execute_evaluated())
+    assert len(objs) == 1
+    assert isinstance(objs[0], instance.CompiledInstance)
+
+
+def test_fake_loading():
+    e = _evaluator()
+    assert isinstance(compiled.create(e, next), FunctionContext)
+
+    builtin = compiled.get_special_object(e, 'BUILTINS')
+    string, = builtin.py__getattribute__('str')
+    from_name = compiled._create_from_name(e, builtin, string, '__init__')
+    assert isinstance(from_name, FunctionContext)
+
+
+def test_fake_docstr():
+    node = compiled.create(_evaluator(), next).tree_node
+    assert clean_scope_docstring(node) == 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.py__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
+
+
+def test_time_docstring():
+    import time
+    comp, = Script('import time\ntime.sleep').completions()
+    assert comp.docstring() == time.sleep.__doc__
+
+
+def test_dict_values():
+    assert Script('import sys/sys.modules["alshdb;lasdhf"]').goto_definitions()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_context.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_context.py
new file mode 100644
index 0000000..178b879
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_context.py
@@ -0,0 +1,10 @@
+from jedi import Script
+
+
+def test_module_attributes():
+    def_, = Script('__name__').completions()
+    assert def_.name == '__name__'
+    assert def_.line == None
+    assert def_.column == None
+    str_, = def_._goto_definitions()
+    assert str_.name == 'str'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_docstring.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_docstring.py
new file mode 100644
index 0000000..b1676ab
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_docstring.py
@@ -0,0 +1,331 @@
+"""
+Testing of docstring related issues and especially ``jedi.docstrings``.
+"""
+
+from textwrap import dedent
+import jedi
+import pytest
+from ..helpers import unittest
+
+try:
+    import numpydoc  # NOQA
+except ImportError:
+    numpydoc_unavailable = True
+else:
+    numpydoc_unavailable = False
+    
+try:
+    import numpy
+except ImportError:
+    numpy_unavailable = True
+else:
+    numpy_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].docstring(), 'func()\n\nDocstring of `func`.')
+
+    def test_class_doc(self):
+        defs = jedi.Script("""
+        class TestClass():
+            '''Docstring of `TestClass`.'''
+        TestClass""").goto_definitions()
+        self.assertEqual(defs[0].docstring(), 'Docstring of `TestClass`.')
+
+    def test_instance_doc(self):
+        defs = jedi.Script("""
+        class TestClass():
+            '''Docstring of `TestClass`.'''
+        tc = TestClass()
+        tc""").goto_definitions()
+        self.assertEqual(defs[0].docstring(), 'Docstring of `TestClass`.')
+
+    @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].docstring(), '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.docstring() 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.
+
+    def test_docstring_keyword(self):
+        completions = jedi.Script('assert').completions()
+        self.assertIn('assert', completions[0].docstring())
+
+# ---- Numpy Style Tests ---
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_parameters():
+    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
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_parameters_set_of_values():
+    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
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_parameters_alternative_types():
+    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
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_returns():
+    s = dedent('''
+    def foobar():
+        """
+        Returns
+        ----------
+        x : int
+        y : str
+        """
+        return x
+
+    def bazbiz():
+        z = foobar()
+        z.''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    assert 'isupper' in names
+    assert 'capitalize' in names
+    assert 'numerator' in names
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_returns_set_of_values():
+    s = dedent('''
+    def foobar():
+        """
+        Returns
+        ----------
+        x : {'foo', 'bar', 100500}
+        """
+        return x
+
+    def bazbiz():
+        z = foobar()
+        z.''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    assert 'isupper' in names
+    assert 'capitalize' in names
+    assert 'numerator' in names
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_returns_alternative_types():
+    s = dedent('''
+    def foobar():
+        """
+        Returns
+        ----------
+        int or list of str
+        """
+        return x
+
+    def bazbiz():
+        z = foobar()
+        z.''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    assert 'isupper' not in names
+    assert 'capitalize' not in names
+    assert 'numerator' in names
+    assert 'append' in names
+    
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_returns_list_of():
+    s = dedent('''
+    def foobar():
+        """
+        Returns
+        ----------
+        list of str
+        """
+        return x
+
+    def bazbiz():
+        z = foobar()
+        z.''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    assert 'append' in names
+    assert 'isupper' not in names
+    assert 'capitalize' not in names
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_returns_obj():
+    s = dedent('''
+    def foobar(x, y):
+        """
+        Returns
+        ----------
+        int or random.Random
+        """
+        return x + y
+
+    def bazbiz():
+        z = foobar(x, y)
+        z.''')
+    script = jedi.Script(s)
+    names = [c.name for c in script.completions()]
+    assert 'numerator' in names
+    assert 'seed' in names
+
+@pytest.mark.skipif(numpydoc_unavailable, 
+                    reason='numpydoc module is unavailable')
+def test_numpydoc_yields():
+    s = dedent('''
+    def foobar():
+        """
+        Yields
+        ----------
+        x : int
+        y : str
+        """
+        return x
+
+    def bazbiz():
+        z = foobar():
+        z.''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    print('names',names)
+    assert 'isupper' in names
+    assert 'capitalize' in names
+    assert 'numerator' in names
+
+@pytest.mark.skipif(numpydoc_unavailable or numpy_unavailable, 
+                    reason='numpydoc or numpy module is unavailable')
+def test_numpy_returns():
+    s = dedent('''
+    import numpy
+    x = numpy.asarray([])
+    x.d''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    print(names)
+    assert 'diagonal' in names
+
+@pytest.mark.skipif(numpydoc_unavailable or numpy_unavailable, 
+                    reason='numpydoc or numpy module is unavailable')
+def test_numpy_comp_returns():
+    s = dedent('''
+    import numpy
+    x = numpy.array([])
+    x.d''')
+    names = [c.name for c in jedi.Script(s).completions()]
+    print(names)
+    assert 'diagonal' in names
+    
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_extension.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_extension.py
new file mode 100644
index 0000000..83efc20
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_helpers.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_helpers.py
new file mode 100644
index 0000000..4484c2b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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.tree_name
+
+    call = helpers.call_of_leaf(name)
+    assert call == name
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_implicit_namespace_package.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_implicit_namespace_package.py
new file mode 100644
index 0000000..9bc9098
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_implicit_namespace_package.py
@@ -0,0 +1,58 @@
+from os.path import dirname, join
+
+import jedi
+import pytest
+
+
+@pytest.mark.skipif('sys.version_info[:2] < (3,4)')
+def test_implicit_namespace_package():
+    sys_path = [join(dirname(__file__), d)
+                for d in ['implicit_namespace_package/ns1', 'implicit_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_file import foo': 'ns2_file!',
+        'from pkg.ns1_file import foo': 'ns1_file!',
+    }
+    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 = [c.name for c in completions]
+    compare = ['ns1_file', 'ns2_file']
+    # must at least contain these items, other items are not important
+    assert set(compare) == set(names)
+
+    tests = {
+        'from pkg import ns2_file as x': 'ns2_file!',
+        'from pkg import ns1_file as x': 'ns1_file!'
+    }
+    for source, solution in tests.items():
+        for c in script_with_path(source + '; x.').completions():
+            if c.name == 'foo':
+                completion = c
+        solution = "foo = '%s'" % solution
+        assert completion.description == solution
+
+@pytest.mark.skipif('sys.version_info[:2] < (3,4)')
+def test_implicit_nested_namespace_package():
+    CODE = 'from implicit_nested_namespaces.namespace.pkg.module import CONST'
+
+    sys_path = [dirname(__file__)]
+
+    script = jedi.Script(sys_path=sys_path, source=CODE, line=1, column=61)
+
+    result = script.goto_definitions()
+
+    assert len(result) == 1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_imports.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_imports.py
new file mode 100644
index 0000000..a41d4f0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_imports.py
@@ -0,0 +1,237 @@
+"""
+Tests of various import related things that could not be tested with "Black Box
+Tests".
+"""
+
+import os
+import sys
+
+import pytest
+
+import jedi
+from jedi._compatibility import find_module_py33, find_module
+from ..helpers import cwd_at
+
+from jedi import Script
+from jedi._compatibility import is_py26
+
+
+@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()
+    parent_contexts = [d._name._context for d in defs]
+    assert len(parent_contexts) == len(set(parent_contexts))
+
+
+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() == ''
+
+
+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_os_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'])
+
+
+def test_os_issues():
+    def import_names(*args, **kwargs):
+        return [d.name for d in jedi.Script(*args, **kwargs).completions()]
+
+    # Github issue #759
+    s = 'import os, s'
+    assert 'sys' in import_names(s)
+    assert 'path' not in import_names(s, column=len(s) - 1)
+    assert 'os' in import_names(s, column=len(s) - 3)
+
+    # Some more checks
+    s = 'from os import path, e'
+    assert 'environ' in import_names(s)
+    assert 'json' not in import_names(s, column=len(s) - 1)
+    assert 'environ' in import_names(s, column=len(s) - 1)
+    assert 'path' in import_names(s, column=len(s) - 3)
+
+
+def test_path_issues():
+    """
+    See pull request #684 for details.
+    """
+    source = '''from datetime import '''
+    assert jedi.Script(source).completions()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_literals.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_literals.py
new file mode 100644
index 0000000..403020a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_literals.py
@@ -0,0 +1,41 @@
+import pytest
+
+import jedi
+from jedi._compatibility import py_version, unicode
+
+
+def _eval_literal(code):
+    def_, = jedi.Script(code).goto_definitions()
+    return def_._name._context.obj
+
+
+@pytest.mark.skipif('sys.version_info[:2] < (3, 6)')
+def test_f_strings():
+    """
+    f literals are not really supported in Jedi. They just get ignored and an
+    empty string is returned.
+    """
+    assert _eval_literal('f"asdf"') == ''
+    assert _eval_literal('f"{asdf}"') == ''
+    assert _eval_literal('F"{asdf}"') == ''
+    assert _eval_literal('rF"{asdf}"') == ''
+
+
+def test_rb_strings():
+    assert _eval_literal('br"asdf"') == b'asdf'
+    obj = _eval_literal('rb"asdf"')
+    if py_version < 33:
+        # rb is not valid in Python 2. Due to error recovery we just get a
+        # string.
+        assert obj == 'asdf'
+    else:
+        assert obj == b'asdf'
+
+
+@pytest.mark.skipif('sys.version_info[:2] < (3, 6)')
+def test_thousand_separators():
+    assert _eval_literal('1_2_3') == 123
+    assert _eval_literal('123_456_789') == 123456789
+    assert _eval_literal('0x3_4') == 52
+    assert _eval_literal('0b1_0') == 2
+    assert _eval_literal('0o1_0') == 8
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_mixed.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_mixed.py
new file mode 100644
index 0000000..5940fe6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_mixed.py
@@ -0,0 +1,7 @@
+import jedi
+
+
+def test_on_code():
+    from functools import wraps
+    i = jedi.Interpreter("wraps.__code__", [{'wraps':wraps}])
+    assert i.goto_definitions()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_namespace_package.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_namespace_package.py
new file mode 100644
index 0000000..9d3aeb7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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 = "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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_precedence.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_precedence.py
new file mode 100644
index 0000000..f5e0770
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_precedence.py
@@ -0,0 +1,17 @@
+from jedi.evaluate.compiled import CompiledObject
+from jedi import Script
+
+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):
+    script = Script(source)
+    node = script._get_module_node().children[0]
+    first, = script._get_module().eval_node(node)
+    assert isinstance(first, CompiledObject) and first.obj is True
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_pyc.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_pyc.py
new file mode 100644
index 0000000..c101da1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_representation.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_representation.py
new file mode 100644
index 0000000..1323a9c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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):
+    first, = Script(dedent(source)).goto_definitions()
+    return first._name._context, first._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(func.execute_evaluated()) == 1
+    assert len(func.execute_evaluated()) == 1
+
+
+def test_class_mro():
+    s = """
+    class X(object):
+        pass
+    X"""
+    cls, evaluator = get_definition_and_evaluator(s)
+    mro = cls.py__mro__()
+    assert [c.name.string_name for c in mro] == ['X', 'object']
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_stdlib.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_stdlib.py
new file mode 100644
index 0000000..7347d84
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_stdlib.py
@@ -0,0 +1,77 @@
+"""
+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'])
+
+
+def test_namedtuple_content():
+    source = dedent("""\
+        import collections
+        Foo = collections.namedtuple('Foo', ['bar', 'baz'])
+        named = Foo(baz=4, bar=3.0)
+        unnamed = Foo(4, '')
+        """)
+
+    def d(source):
+        x, = Script(source).goto_definitions()
+        return x.name
+
+    assert d(source + 'unnamed.bar') == 'int'
+    assert d(source + 'unnamed.baz') == 'str'
+    assert d(source + 'named.bar') == 'float'
+    assert d(source + 'named.baz') == 'int'
+
+
+def test_nested_namedtuples():
+    """
+    From issue #730.
+    """
+    s = Script(dedent('''
+        import collections
+        Dataset = collections.namedtuple('Dataset', ['data'])
+        Datasets = collections.namedtuple('Datasets', ['train'])
+        train_x = Datasets(train=Dataset('data_value'))
+        train_x.train.'''
+    ))
+    assert 'data' in [c.name for c in s.completions()]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_sys_path.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_sys_path.py
new file mode 100644
index 0000000..dc61f01
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/test_sys_path.py
@@ -0,0 +1,58 @@
+import os
+from glob import glob
+import sys
+
+import pytest
+
+from jedi.evaluate import sys_path
+from jedi import Script
+
+
+def test_paths_from_assignment():
+    def paths(src):
+        script = Script(src)
+        expr_stmt = script._get_module_node().children[0]
+        return set(sys_path._paths_from_assignment(script._get_module(), expr_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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/not_pkg.zip b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/not_pkg.zip
new file mode 100644
index 0000000..f1516a6
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/not_pkg.zip differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/pkg.zip b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/pkg.zip
new file mode 100644
index 0000000..ec8eac4
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_evaluate/zipped_imports/pkg.zip differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_integration.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_integration.py
new file mode 100644
index 0000000..edca711
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_integration_keyword.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_integration_keyword.py
new file mode 100644
index 0000000..9ed6d20
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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.docstring() 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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_basic.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_basic.py
new file mode 100644
index 0000000..4eebaa8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_basic.py
@@ -0,0 +1,96 @@
+from textwrap import dedent
+
+from parso import parse
+import jedi
+
+
+def test_form_feed_characters():
+    s = "\f\nclass Test(object):\n    pass"
+    jedi.Script(s, line=2, column=18).call_signatures()
+
+
+def check_p(src):
+    module_node = parse(src)
+    assert src == module_node.get_code()
+    return module_node
+
+
+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_p(src)
+    assert [d.name for d in jedi.Script(src, 8, 6).goto_definitions()] == ['int']
+
+
+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_p(src)
+    assert [d.name for d in jedi.Script(src).goto_definitions()] == ['int']
+
+
+def test_add_to_end():
+    """
+    The diff 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 g(self):
+            self
+    """)      # ^ here is the first completion
+
+    b = "    def h(self):\n" \
+        "        self."
+
+    def complete(code, line=None, column=None):
+        script = jedi.Script(code, line, column, 'example.py')
+        assert script.completions()
+
+    complete(a, 7, 12)
+    complete(a + b)
+
+    a = a[:-1] + '.\n'
+    complete(a, 7, 13)
+    complete(a + b)
+
+
+def test_tokenizer_with_string_literal_backslash():
+    c = jedi.Script("statement = u'foo\\\n'; statement").goto_definitions()
+    assert c[0]._name._context.obj == 'foo'
+
+
+def test_ellipsis():
+    def_, = jedi.Script(dedent("""\
+        class Foo():
+            def __getitem__(self, index):
+                return index
+        Foo()[...]""")).goto_definitions()
+
+    assert def_.name == 'ellipsis'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_error_correction.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_error_correction.py
new file mode 100644
index 0000000..4981473
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_error_correction.py
@@ -0,0 +1,52 @@
+from textwrap import dedent
+
+import jedi
+
+
+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_string_literals():
+    """Simplified case of jedi-vim#377."""
+    source = dedent("""
+    x = ur'''
+
+    def foo():
+        pass
+    """)
+
+    script = jedi.Script(dedent(source))
+    assert script._get_module().tree_node.end_pos == (6, 0)
+    assert script.completions()
+
+
+def test_incomplete_function():
+    source = '''return ImportErr'''
+
+    script = jedi.Script(dedent(source), 1, 3)
+    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().tree_node.get_code() == source
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_parser_utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_parser_utils.py
new file mode 100644
index 0000000..e49c3f5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_parso_integration/test_parser_utils.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+from jedi._compatibility import is_py3
+from jedi import parser_utils
+from parso import parse
+from parso.python import tree
+
+import pytest
+
+
+class TestCallAndName():
+    def get_call(self, source):
+        # Get the simple_stmt and then the first one.
+        node = parse(source).children[0]
+        if node.type == 'simple_stmt':
+            return node.children[0]
+        return node
+
+    def test_name_and_call_positions(self):
+        name = self.get_call('name\nsomething_else')
+        assert name.value == '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 parser_utils.safe_literal_eval(leaf.value) == 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, tree.Name)
+
+    def test_literal_type(self):
+        literal = self.get_call('1.0')
+        assert isinstance(literal, tree.Literal)
+        assert type(parser_utils.safe_literal_eval(literal.value)) == float
+
+        literal = self.get_call('1')
+        assert isinstance(literal, tree.Literal)
+        assert type(parser_utils.safe_literal_eval(literal.value)) == int
+
+        literal = self.get_call('"hello"')
+        assert isinstance(literal, tree.Literal)
+        assert parser_utils.safe_literal_eval(literal.value) == 'hello'
+
+
+def test_user_statement_on_import():
+    """github #285"""
+    s = "from datetime import (\n" \
+        "    time)"
+
+    for pos in [(2, 1), (2, 4)]:
+        p = parse(s)
+        stmt = parser_utils.get_statement_of_position(p, pos)
+        assert isinstance(stmt, tree.Import)
+        assert [n.value for n in stmt.get_defined_names()] == ['time']
+
+
+def test_hex_values_in_docstring():
+    source = r'''
+        def foo(object):
+            """
+             \xff
+            """
+            return 1
+        '''
+
+    doc = parser_utils.clean_scope_docstring(next(parse(source).iter_funcdefs()))
+    if is_py3:
+        assert doc == '\xff'
+    else:
+        assert doc == u'�'
+
+
+@pytest.mark.parametrize(
+    'code,call_signature', [
+        ('def my_function(x, y, z) -> str:\n return', 'my_function(x, y, z)'),
+        ('lambda x, y, z: x + y * z\n', '<lambda>(x, y, z)')
+    ])
+def test_get_call_signature(code, call_signature):
+    node = parse(code, version='3.5').children[0]
+    if node.type == 'simple_stmt':
+        node = node.children[0]
+    assert parser_utils.get_call_signature(node) == call_signature
+
+    assert parser_utils.get_doc_with_call_signature(node) == (call_signature + '\n\n')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_regression.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_regression.py
new file mode 100644
index 0000000..57edfd9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_regression.py
@@ -0,0 +1,186 @@
+"""
+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
+
+import pytest
+
+from jedi import Script
+from jedi import api
+from jedi.evaluate import imports
+from .helpers import TestCase, cwd_at
+
+#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 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()
+        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)
+            str_context, = c._name.infer()
+            n = len(str_context.tree_node.children[-1].children)
+            if i == 0:
+                limit = n
+            else:
+                assert n == limit
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_speed.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_speed.py
new file mode 100644
index 0000000..8d5bc9a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_speed.py
@@ -0,0 +1,69 @@
+"""
+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
+                message = 'speed issue %s, %s' % (func, single_time)
+                assert single_time < time_per_run, message
+            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()
+
+    @_check_speed(0.1)
+    def test_no_repr_computation(self):
+        """
+        For Interpreter completion aquisition of sourcefile can trigger
+        unwanted computation of repr(). Exemple : big pandas data.
+        See issue #919.
+        """
+        class SlowRepr():
+            "class to test what happens if __repr__ is very slow."
+            def some_method(self):
+                pass
+            def __repr__(self):
+                time.sleep(0.2)
+        test = SlowRepr()
+        jedi.Interpreter('test.som', [locals()]).completions()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/test/test_utils.py
new file mode 100644
index 0000000..2eb6e8c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/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/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/tox.ini b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/tox.ini
new file mode 100644
index 0000000..5e0c74a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/jedi/tox.ini
@@ -0,0 +1,57 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, py36
+[testenv]
+deps =
+    pytest>=2.3.5
+    pytest-cache
+# docopt for sith doctests
+    docopt
+# coloroma for colored debug output
+    colorama
+    -rrequirements.txt
+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
+# numpydoc for typing scipy stack
+    numpydoc
+    {[testenv]deps}
+[testenv:py33]
+deps =
+    typing
+    {[testenv]deps}
+[testenv:py34]
+deps =
+    typing
+    numpydoc
+    {[testenv]deps}
+[testenv:py35]
+deps =
+    numpydoc
+    {[testenv]deps}
+[testenv:py36]
+deps =
+    numpydoc
+    {[testenv]deps}
+[testenv:cov]
+deps =
+    coverage
+    numpydoc
+    {[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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.coveragerc b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.coveragerc
new file mode 100644
index 0000000..7059cc3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.coveragerc
@@ -0,0 +1,10 @@
+[run]
+
+[report]
+# Regexes for lines to exclude from consideration
+exclude_lines =
+    # Don't complain about missing debug-only code:
+    def __repr__
+
+    # Don't complain if non-runnable code isn't run:
+    if __name__ == .__main__.:
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.gitignore b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.gitignore
new file mode 100644
index 0000000..661eafa
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.gitignore
@@ -0,0 +1,11 @@
+*~
+*.sw?
+*.pyc
+.tox
+.coveralls.yml
+.coverage
+/build/
+/docs/_build/
+/dist/
+parso.egg-info/
+/.cache/
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.travis.yml b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.travis.yml
new file mode 100644
index 0000000..7102085
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/.travis.yml
@@ -0,0 +1,25 @@
+language: python
+sudo: false
+python:
+  - 2.6
+  - 2.7
+  - 3.3
+  - 3.4
+  - 3.5
+  - 3.6
+  - pypy
+matrix:
+  allow_failures:
+    - env: TOXENV=cov
+  include:
+    - python: 3.5
+      env: TOXENV=cov
+install:
+    - pip install --quiet tox-travis
+script:
+    - tox
+after_script:
+    - if [ $TOXENV == "cov" ]; then
+      pip install --quiet coveralls;
+      coveralls;
+      fi
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/AUTHORS.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/AUTHORS.txt
new file mode 100644
index 0000000..c26821a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/AUTHORS.txt
@@ -0,0 +1,53 @@
+Main Authors
+============
+
+David Halter (@davidhalter) <davidhalter88@gmail.com>
+
+Code Contributors
+=================
+
+
+Code Contributors (to Jedi and therefore possibly to this library)
+==================================================================
+
+Takafumi Arakaki (@tkf) <aka.tkf@gmail.com>
+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)
+Mathias Rav (@Mortal) <rav@cs.au.dk>
+Daniel Fiterman (@dfit99) <fitermandaniel2@gmail.com>
+Simon Ruggier (@sruggier)
+Élie Gouzien (@ElieGouzien)
+
+
+Note: (@user) means a github user name.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CHANGELOG.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CHANGELOG.rst
new file mode 100644
index 0000000..7b0d15c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CHANGELOG.rst
@@ -0,0 +1,10 @@
+.. :changelog:
+
+Changelog
+---------
+
+
+0.1.0 (2017-05-30)
++++++++++++++++++++
+
+- Pulling the library out of Jedi. Some APIs will definitely change.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CONTRIBUTING.md b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CONTRIBUTING.md
new file mode 100644
index 0000000..60aa841
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/CONTRIBUTING.md
@@ -0,0 +1,8 @@
+We <3 Pull Requests! Three core things:
+
+ 1. If you are adding functionality or fixing a bug, please add a test!
+ 2. Add your name to AUTHORS.txt
+ 3. Use the PEP8 style guide.
+
+ If you want to add methods to the parser tree, we will need to discuss this in
+ an issue first.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/LICENSE.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/LICENSE.txt
new file mode 100644
index 0000000..08c41db
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/LICENSE.txt
@@ -0,0 +1,86 @@
+All contributions towards parso 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:
+
+- parso/pgen2/*
+- parso/tokenize.py
+- parso/token.py
+- test/test_pgen2.py
+
+Also some test files under test/normalizer_issue_files have been copied from
+https://github.com/PyCQA/pycodestyle (Expat License == MIT License).
+
+-------------------------------------------------------------------------------
+The MIT License (MIT)
+
+Copyright (c) <2013-2017> <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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/MANIFEST.in b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/MANIFEST.in
new file mode 100644
index 0000000..fb90b35
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/MANIFEST.in
@@ -0,0 +1,12 @@
+include README.rst
+include CHANGELOG.rst
+include LICENSE.txt
+include AUTHORS.txt
+include .coveragerc
+include conftest.py
+include pytest.ini
+include tox.ini
+include parso/python/grammar*.txt
+recursive-include test *
+recursive-include docs *
+recursive-exclude * *.pyc
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/README.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/README.rst
new file mode 100644
index 0000000..44caee4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/README.rst
@@ -0,0 +1,90 @@
+###################################################################
+parso - A Python Parser
+###################################################################
+
+.. image:: https://secure.travis-ci.org/davidhalter/parso.png?branch=master
+    :target: http://travis-ci.org/davidhalter/parso
+    :alt: Travis-CI build status
+
+.. image:: https://coveralls.io/repos/davidhalter/parso/badge.png?branch=master
+    :target: https://coveralls.io/r/davidhalter/parso
+    :alt: Coverage Status
+
+.. image:: https://raw.githubusercontent.com/davidhalter/parso/master/docs/_static/logo_characters.png
+
+Parso is a Python parser that supports error recovery and round-trip parsing
+for different Python versions (in multiple Python versions). Parso is also able
+to list multiple syntax errors in your python file.
+
+Parso has been battle-tested by jedi_. It was pulled out of jedi to be useful
+for other projects as well.
+
+Parso consists of a small API to parse Python and analyse the syntax tree.
+
+A simple example:
+
+.. code-block:: python
+
+    >>> import parso
+    >>> module = parso.parse('hello + 1', version="3.6")
+    >>> expr = module.children[0]
+    >>> expr
+    PythonNode(arith_expr, [<Name: hello@1,0>, <Operator: +>, <Number: 1>])
+    >>> print(expr.get_code())
+    hello + 1
+    >>> name = expr.children[0]
+    >>> name
+    <Name: hello@1,0>
+    >>> name.end_pos
+    (1, 5)
+    >>> expr.end_pos
+    (1, 9)
+
+To list multiple issues:
+
+.. code-block:: python
+
+    >>> grammar = parso.load_grammar()
+    >>> module = grammar.parse('foo +\nbar\ncontinue')
+    >>> error1, error2 = grammar.iter_errors(module)
+    >>> error1.message
+    'SyntaxError: invalid syntax'
+    >>> error2.message
+    "SyntaxError: 'continue' not properly in loop"
+
+Resources
+=========
+
+- `Testing <http://parso.readthedocs.io/en/latest/docs/development.html#testing>`_
+- `PyPI <https://pypi.python.org/pypi/parso>`_
+- `Docs <https://parso.readthedocs.org/en/latest/>`_
+- Uses `semantic versioning <http://semver.org/>`_
+
+Installation
+============
+
+    pip install parso
+
+Future
+======
+
+- There will be better support for refactoring and comments. Stay tuned.
+- There's a WIP PEP8 validator. It's however not in a good shape, yet.
+
+Known Issues
+============
+
+- `async`/`await` are already used as keywords in Python3.6.
+- `from __future__ import print_function` is not ignored.
+
+
+Acknowledgements
+================
+
+- Guido van Rossum (@gvanrossum) for creating the parser generator pgen2
+  (originally used in lib2to3).
+- `Salome Schneider <https://www.crepes-schnaegg.ch/cr%C3%AApes-schn%C3%A4gg/kunst-f%C3%BCrs-cr%C3%AApes-mobil/>`_
+  for the extremely awesome parso logo.
+
+
+.. _jedi: https://github.com/davidhalter/jedi
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/conftest.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/conftest.py
new file mode 100644
index 0000000..45c6ef8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/conftest.py
@@ -0,0 +1,174 @@
+import re
+import tempfile
+import shutil
+import logging
+import sys
+import os
+
+import pytest
+
+import parso
+from parso import cache
+from parso.utils import parse_version_string
+
+
+collect_ignore = ["setup.py"]
+
+@pytest.fixture(scope='session')
+def clean_parso_cache():
+    """
+    Set the default cache directory to a temporary directory during tests.
+
+    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.
+    """
+    old = cache._default_cache_path
+    tmp = tempfile.mkdtemp(prefix='parso-test-')
+    cache._default_cache_path = tmp
+    yield
+    cache._default_cache_path = old
+    shutil.rmtree(tmp)
+
+
+def pytest_addoption(parser):
+    parser.addoption("--logging", "-L", action='store_true',
+                     help="Enables the logging output.")
+
+
+def pytest_generate_tests(metafunc):
+    if 'normalizer_issue_case' in metafunc.fixturenames:
+        base_dir = os.path.join(os.path.dirname(__file__), 'test', 'normalizer_issue_files')
+
+        cases = list(colllect_normalizer_tests(base_dir))
+        metafunc.parametrize(
+            'normalizer_issue_case',
+            cases,
+            ids=[c.name for c in cases]
+        )
+    elif 'each_version' in metafunc.fixturenames:
+        metafunc.parametrize(
+            'each_version',
+            ['2.6', '2.7', '3.3', '3.4', '3.5', '3.6'],
+        )
+    elif 'each_py2_version' in metafunc.fixturenames:
+        metafunc.parametrize(
+            'each_py2_version',
+            ['2.6', '2.7'],
+        )
+    elif 'each_py3_version' in metafunc.fixturenames:
+        metafunc.parametrize(
+            'each_py3_version',
+            ['3.3', '3.4', '3.5', '3.6'],
+        )
+
+
+class NormalizerIssueCase(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
+        self.name = os.path.basename(path)
+        match = re.search(r'python([\d.]+)\.py', self.name)
+        self.python_version = match and match.group(1)
+
+
+def colllect_normalizer_tests(base_dir):
+    for f_name in os.listdir(base_dir):
+        if f_name.endswith(".py"):
+            path = os.path.join(base_dir, f_name)
+            yield NormalizerIssueCase(path)
+
+
+def pytest_configure(config):
+    if config.option.logging:
+        root = logging.getLogger()
+        root.setLevel(logging.DEBUG)
+
+        ch = logging.StreamHandler(sys.stdout)
+        ch.setLevel(logging.DEBUG)
+        #formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
+        #ch.setFormatter(formatter)
+
+        root.addHandler(ch)
+
+
+@pytest.fixture
+def each_py3_version():
+    return '3.3', '3.4', '3.5', '3.6'
+
+
+@pytest.fixture
+def each_py2_version():
+    return '2.6', '2.7'
+
+
+class Checker():
+    def __init__(self, version, is_passing):
+        self.version = version
+        self._is_passing = is_passing
+        self.grammar = parso.load_grammar(version=self.version)
+
+    def parse(self, code):
+        if self._is_passing:
+            return parso.parse(code, version=self.version, error_recovery=False)
+        else:
+            self._invalid_syntax(code)
+
+    def _invalid_syntax(self, code):
+        with pytest.raises(parso.ParserSyntaxError):
+            module = parso.parse(code, version=self.version, error_recovery=False)
+            # For debugging
+            print(module.children)
+
+    def get_error(self, code):
+        errors = list(self.grammar.iter_errors(self.grammar.parse(code)))
+        assert bool(errors) != self._is_passing
+        if errors:
+            return errors[0]
+
+    def get_error_message(self, code):
+        error = self.get_error(code)
+        if error is None:
+            return
+        return error.message
+
+    def assert_no_error_in_passing(self, code):
+        if self._is_passing:
+            module = self.grammar.parse(code)
+            assert not list(self.grammar.iter_errors(module))
+
+
+@pytest.fixture
+def works_not_in_py(each_version):
+    return Checker(each_version, False)
+
+
+@pytest.fixture
+def works_in_py2(each_version):
+    return Checker(each_version, each_version.startswith('2'))
+
+
+@pytest.fixture
+def works_ge_py27(each_version):
+    version_info = parse_version_string(each_version)
+    return Checker(each_version, version_info >= (2, 7))
+
+
+@pytest.fixture
+def works_ge_py3(each_version):
+    version_info = parse_version_string(each_version)
+    return Checker(each_version, version_info >= (3, 0))
+
+
+@pytest.fixture
+def works_ge_py35(each_version):
+    """
+    Works only greater equal Python 3.3.
+    """
+    version_info = parse_version_string(each_version)
+    return Checker(each_version, version_info >= (3, 5))
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/deploy-master.sh b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/deploy-master.sh
new file mode 100755
index 0000000..9441f8d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/deploy-master.sh
@@ -0,0 +1,52 @@
+#!/usr/bin/env bash
+# The script creates a separate folder in build/ and creates tags there, pushes
+# them and then uploads the package to PyPI.
+
+set -eu -o pipefail
+
+BASE_DIR=$(dirname $(readlink -f "$0"))
+cd $BASE_DIR
+
+git fetch --tags
+
+PROJECT_NAME=parso
+BRANCH=master
+BUILD_FOLDER=build
+
+[ -d $BUILD_FOLDER ] || mkdir $BUILD_FOLDER
+# Remove the previous deployment first.
+# Checkout the right branch
+cd $BUILD_FOLDER
+rm -rf $PROJECT_NAME
+git clone .. $PROJECT_NAME
+cd $PROJECT_NAME
+git checkout $BRANCH
+
+# Test first.
+tox
+
+# Create tag
+tag=v$(python -c "import $PROJECT_NAME; print($PROJECT_NAME.__version__)")
+
+master_ref=$(git show-ref -s heads/$BRANCH)
+tag_ref=$(git show-ref -s $tag || true)
+if [[ $tag_ref ]]; then
+    if [[ $tag_ref != $master_ref ]]; then
+        echo 'Cannot tag something that has already been tagged with another commit.'
+        exit 1
+    fi
+else
+    git tag $tag
+    git push --tags
+fi
+
+# Package and upload to PyPI
+#rm -rf dist/ - Not needed anymore, because the folder is never reused.
+echo `pwd`
+python setup.py sdist bdist_wheel
+# Maybe do a pip install twine before.
+twine upload dist/*
+
+cd $BASE_DIR
+# The tags have been pushed to this repo. Push the tags to github, now.
+git push --tags
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/Makefile b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/Makefile
new file mode 100644
index 0000000..1348ee3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/parso.qhcp"
+	@echo "To view the help file:"
+	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/parso.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/parso"
+	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/parso"
+	@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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/README.md b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/README.md
new file mode 100644
index 0000000..d931ca3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/README.md
@@ -0,0 +1,6 @@
+Installation
+------------
+
+Install sphinx::
+
+    sudo pip install sphinx
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo.png
new file mode 100644
index 0000000..5c3e47a
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo_characters.png b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo_characters.png
new file mode 100644
index 0000000..c2387ec
Binary files /dev/null and b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_static/logo_characters.png differ
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_templates/ghbuttons.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_templates/ghbuttons.html
new file mode 100644
index 0000000..75d98a2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_templates/ghbuttons.html
@@ -0,0 +1,4 @@
+<h3>Github</h3>
+<iframe src="http://ghbtns.com/github-btn.html?user=davidhalter&repo=parso&type=watch&count=true&size=large"
+        frameborder="0" scrolling="0" width="170" height="30" allowtransparency="true"></iframe>
+<br><br>
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_templates/sidebarlogo.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_templates/sidebarlogo.html
new file mode 100644
index 0000000..d9243c4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/LICENSE b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/LICENSE
new file mode 100644
index 0000000..8daab7e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/layout.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/layout.html
new file mode 100644
index 0000000..a4498f5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/parso">
+    <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">
+  </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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/relations.html b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/relations.html
new file mode 100644
index 0000000..3bbcde8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/static/flasky.css_t b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/static/flasky.css_t
new file mode 100644
index 0000000..79ab478
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/static/small_flask.css b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/static/small_flask.css
new file mode 100644
index 0000000..1c6df30
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/theme.conf b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask/theme.conf
new file mode 100644
index 0000000..1d5657f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask_theme_support.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/_themes/flask_theme_support.py
new file mode 100644
index 0000000..d3e33c0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/conf.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/conf.py
new file mode 100644
index 0000000..015a40e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/conf.py
@@ -0,0 +1,291 @@
+# -*- coding: utf-8 -*-
+#
+# parso 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'parso'
+copyright = u'2012 - {today.year}, parso contributors'.format(today=datetime.date.today())
+
+import parso
+from parso.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 = parso.__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 = 'parsodoc'
+
+#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', 'parso.tex', u'parso documentation',
+     u'parso 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', 'parso', u'parso Documentation',
+     [u'parso 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', 'parso', u'parso documentation',
+     u'parso contributors', 'parso', '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/': ('https://docs.python.org/3.6', 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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/development.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/development.rst
new file mode 100644
index 0000000..f723162
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/development.rst
@@ -0,0 +1,38 @@
+.. include:: ../global.rst
+
+Development
+===========
+
+If you want to contribute anything to |parso|, just open an issue or pull
+request to discuss it. We welcome changes! Please check the ``CONTRIBUTING.md``
+file in the repository, first.
+
+
+Deprecations Process
+--------------------
+
+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.
+
+
+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/parso/>`_.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/installation.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/installation.rst
new file mode 100644
index 0000000..a2de258
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/installation.rst
@@ -0,0 +1,32 @@
+.. include:: ../global.rst
+
+Installation and Configuration
+==============================
+
+The preferred way (pip)
+-----------------------
+
+On any system you can install |parso| directly from the Python package index
+using pip::
+
+    sudo pip install parso
+
+
+From git
+--------
+If you want to install the current development version (master branch)::
+
+    sudo pip install -e git://github.com/davidhalter/parso.git#egg=parso
+
+
+Manual installation from a downloaded package (not recommended)
+---------------------------------------------------------------
+
+If you prefer not to use an automated package installer, you can `download
+<https://github.com/davidhalter/parso/archive/master.zip>`__ a current copy of
+|parso| and install it manually.
+
+To install it, navigate to the directory containing `setup.py` on your console
+and type::
+
+    sudo python setup.py install
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/parser-tree.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/parser-tree.rst
new file mode 100644
index 0000000..6eb2006
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/parser-tree.rst
@@ -0,0 +1,49 @@
+.. include:: ../global.rst
+
+.. _parser-tree:
+
+Parser Tree
+===========
+
+The parser tree is returned by calling :py:meth:`parso.Grammar.parse`.
+
+.. note:: Note that parso positions are always 1 based for lines and zero
+   based for columns. This means the first position in a file is (1, 0).
+
+Parser Tree Base Classes
+------------------------
+
+Generally there are two types of classes you will deal with:
+:py:class:`parso.tree.Leaf` and :py:class:`parso.tree.BaseNode`.
+
+.. autoclass:: parso.tree.BaseNode
+    :show-inheritance:
+    :members:
+
+.. autoclass:: parso.tree.Leaf
+    :show-inheritance:
+    :members:
+
+All nodes and leaves have these methods/properties:
+
+.. autoclass:: parso.tree.NodeOrLeaf
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Python Parser Tree
+------------------
+
+.. currentmodule:: parso.python.tree
+
+.. automodule:: parso.python.tree
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
+
+Utility
+-------
+
+.. autofunction:: parso.tree.search_ancestor
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/usage.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/usage.rst
new file mode 100644
index 0000000..fdda3c9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/docs/usage.rst
@@ -0,0 +1,66 @@
+.. include:: ../global.rst
+
+Usage
+=====
+
+|parso| works around grammars. You can simply create Python grammars by calling
+:py:func:`parso.load_grammar`. Grammars (with a custom tokenizer and custom parser trees)
+can also be created by directly instantiating :py:func:`parso.Grammar`. More information
+about the resulting objects can be found in the :ref:`parser tree documentation
+<parser-tree>`.
+
+The simplest way of using parso is without even loading a grammar
+(:py:func:`parso.parse`):
+
+.. sourcecode:: python
+
+   >>> import parso
+   >>> parso.parse('foo + bar')
+   <Module: @1-1>
+
+Loading a Grammar
+-----------------
+
+Typically if you want to work with one specific Python version, use:
+
+.. autofunction:: parso.load_grammar
+
+Grammar methods
+---------------
+
+You will get back a grammar object that you can use to parse code and find
+issues in it:
+
+.. autoclass:: parso.Grammar
+    :members:
+    :undoc-members:
+
+
+Error Retrieval
+---------------
+
+|parso| is able to find multiple errors in your source code. Iterating through
+those errors yields the following instances:
+
+.. autoclass:: parso.normalizer.Issue
+    :members:
+    :undoc-members:
+
+
+Utility
+-------
+
+|parso| also offers some utility functions that can be really useful:
+
+.. autofunction:: parso.parse
+.. autofunction:: parso.split_lines
+.. autofunction:: parso.python_bytes_to_unicode
+
+
+Used By
+-------
+
+- jedi_ (which is used by IPython and a lot of editor plugins).
+
+
+.. _jedi: https://github.com/davidhalter/jedi
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/global.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/global.rst
new file mode 100644
index 0000000..ec50aaf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/global.rst
@@ -0,0 +1,4 @@
+:orphan:
+
+.. |jedi| replace:: *jedi*
+.. |parso| replace:: *parso*
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/index.rst b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/index.rst
new file mode 100644
index 0000000..50fb0a8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/docs/index.rst
@@ -0,0 +1,31 @@
+.. include global.rst
+
+parso - A Python Parser
+=======================
+
+Release v\ |release|. (:doc:`Installation <docs/installation>`)
+
+.. automodule:: parso
+
+.. _toc:
+
+Docs
+----
+
+.. toctree::
+   :maxdepth: 2
+
+   docs/installation
+   docs/usage
+   docs/parser-tree
+   docs/development
+
+
+.. _resources:
+
+Resources
+---------
+
+- `Source Code on Github <https://github.com/davidhalter/parso>`_
+- `Travis Testing <https://travis-ci.org/davidhalter/parso>`_
+- `Python Package Index <http://pypi.python.org/pypi/parso/>`_
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/__init__.py
new file mode 100644
index 0000000..ecd64bf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/__init__.py
@@ -0,0 +1,58 @@
+r"""
+Parso is a Python parser that supports error recovery and round-trip parsing
+for different Python versions (in multiple Python versions). Parso is also able
+to list multiple syntax errors in your python file.
+
+Parso has been battle-tested by jedi_. It was pulled out of jedi to be useful
+for other projects as well.
+
+Parso consists of a small API to parse Python and analyse the syntax tree.
+
+.. _jedi: https://github.com/davidhalter/jedi
+
+A simple example:
+
+>>> import parso
+>>> module = parso.parse('hello + 1', version="3.6")
+>>> expr = module.children[0]
+>>> expr
+PythonNode(arith_expr, [<Name: hello@1,0>, <Operator: +>, <Number: 1>])
+>>> print(expr.get_code())
+hello + 1
+>>> name = expr.children[0]
+>>> name
+<Name: hello@1,0>
+>>> name.end_pos
+(1, 5)
+>>> expr.end_pos
+(1, 9)
+
+To list multiple issues:
+
+>>> grammar = parso.load_grammar()
+>>> module = grammar.parse('foo +\nbar\ncontinue')
+>>> error1, error2 = grammar.iter_errors(module)
+>>> error1.message
+'SyntaxError: invalid syntax'
+>>> error2.message
+"SyntaxError: 'continue' not properly in loop"
+"""
+
+from parso.parser import ParserSyntaxError
+from parso.grammar import Grammar, load_grammar
+from parso.utils import split_lines, python_bytes_to_unicode
+
+
+__version__ = '0.1.0'
+
+
+def parse(code=None, **kwargs):
+    """
+    A utility function to avoid loading grammars.
+    Params are documented in :py:meth:`parso.Grammar.parse`.
+
+    :param str version: The version used by :py:func:`parso.load_grammar`.
+    """
+    version = kwargs.pop('version', None)
+    grammar = load_grammar(version=version)
+    return grammar.parse(code, **kwargs)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/_compatibility.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/_compatibility.py
new file mode 100644
index 0000000..9ddf23d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/_compatibility.py
@@ -0,0 +1,103 @@
+"""
+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 platform
+
+# Cannot use sys.version.major and minor names, because in Python 2.6 it's not
+# a namedtuple.
+py_version = int(str(sys.version_info[0]) + str(sys.version_info[1]))
+
+# unicode function
+try:
+    unicode = unicode
+except NameError:
+    unicode = str
+
+is_pypy = platform.python_implementation() == 'PyPy'
+
+
+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 py_version >= 30:
+        return str(string)
+
+    if not isinstance(string, unicode):
+        return unicode(str(string), 'UTF-8')
+    return string
+
+
+try:
+    FileNotFoundError = FileNotFoundError
+except NameError:
+    FileNotFoundError = IOError
+
+
+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 py_version >= 30:
+        return func
+    else:
+        return wrapper
+
+
+try:
+    from functools import total_ordering
+except ImportError:
+    # Python 2.6
+    def total_ordering(cls):
+        """Class decorator that fills in missing ordering methods"""
+        convert = {
+            '__lt__': [('__gt__', lambda self, other: not (self < other or self == other)),
+                       ('__le__', lambda self, other: self < other or self == other),
+                       ('__ge__', lambda self, other: not self < other)],
+            '__le__': [('__ge__', lambda self, other: not self <= other or self == other),
+                       ('__lt__', lambda self, other: self <= other and not self == other),
+                       ('__gt__', lambda self, other: not self <= other)],
+            '__gt__': [('__lt__', lambda self, other: not (self > other or self == other)),
+                       ('__ge__', lambda self, other: self > other or self == other),
+                       ('__le__', lambda self, other: not self > other)],
+            '__ge__': [('__le__', lambda self, other: (not self >= other) or self == other),
+                       ('__gt__', lambda self, other: self >= other and not self == other),
+                       ('__lt__', lambda self, other: not self >= other)]
+        }
+        roots = set(dir(cls)) & set(convert)
+        if not roots:
+            raise ValueError('must define at least one ordering operation: < > <= >=')
+        root = max(roots)       # prefer __lt__ to __le__ to __gt__ to __ge__
+        for opname, opfunc in convert[root]:
+            if opname not in roots:
+                opfunc.__name__ = opname
+                opfunc.__doc__ = getattr(int, opname).__doc__
+                setattr(cls, opname, opfunc)
+        return cls
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/cache.py
new file mode 100644
index 0000000..d0465d0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/cache.py
@@ -0,0 +1,162 @@
+import time
+import os
+import sys
+import hashlib
+import gc
+import shutil
+import platform
+import errno
+import logging
+
+try:
+    import cPickle as pickle
+except:
+    import pickle
+
+from parso._compatibility import FileNotFoundError
+
+LOG = logging.getLogger(__name__)
+
+
+_PICKLE_VERSION = 30
+"""
+Version number (integer) for file system cache.
+
+Increment this number when there are any incompatible changes in
+the parser tree classes.  For example, the following changes
+are regarded as incompatible.
+
+- A class name is changed.
+- A class is moved to another module.
+- A __slot__ of a class is changed.
+"""
+
+_VERSION_TAG = '%s-%s%s-%s' % (
+    platform.python_implementation(),
+    sys.version_info[0],
+    sys.version_info[1],
+    _PICKLE_VERSION
+)
+"""
+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
+"""
+
+def _get_default_cache_path():
+    if platform.system().lower() == 'windows':
+        dir_ = os.path.join(os.getenv('LOCALAPPDATA') or '~', 'Parso', 'Parso')
+    elif platform.system().lower() == 'darwin':
+        dir_ = os.path.join('~', 'Library', 'Caches', 'Parso')
+    else:
+        dir_ = os.path.join(os.getenv('XDG_CACHE_HOME') or '~/.cache', 'parso')
+    return os.path.expanduser(dir_)
+
+_default_cache_path = _get_default_cache_path()
+"""
+The path where the cache is stored.
+
+On Linux, this defaults to ``~/.cache/parso/``, on OS X to
+``~/Library/Caches/Parso/`` and on Windows to ``%LOCALAPPDATA%\\Parso\\Parso\\``.
+On Linux, if environment variable ``$XDG_CACHE_HOME`` is set,
+``$XDG_CACHE_HOME/parso`` is used instead of the default one.
+"""
+
+parser_cache = {}
+
+
+class _NodeCacheItem(object):
+    def __init__(self, node, lines, change_time=None):
+        self.node = node
+        self.lines = lines
+        if change_time is None:
+            change_time = time.time()
+        self.change_time = change_time
+
+
+def load_module(hashed_grammar, path, cache_path=None):
+    """
+    Returns a module or None, if it fails.
+    """
+    try:
+        p_time = os.path.getmtime(path)
+    except FileNotFoundError:
+        return None
+
+    try:
+        module_cache_item = parser_cache[hashed_grammar][path]
+        if p_time <= module_cache_item.change_time:
+            return module_cache_item.node
+    except KeyError:
+        return _load_from_file_system(hashed_grammar, path, p_time, cache_path=cache_path)
+
+
+def _load_from_file_system(hashed_grammar, path, p_time, cache_path=None):
+    cache_path = _get_hashed_path(hashed_grammar, path, cache_path=cache_path)
+    try:
+        try:
+            if p_time > os.path.getmtime(cache_path):
+                # Cache is outdated
+                return None
+        except OSError as e:
+            if e.errno == errno.ENOENT:
+                # In Python 2 instead of an IOError here we get an OSError.
+                raise FileNotFoundError
+            else:
+                raise
+
+        with open(cache_path, 'rb') as f:
+            gc.disable()
+            try:
+                module_cache_item = pickle.load(f)
+            finally:
+                gc.enable()
+    except FileNotFoundError:
+        return None
+    else:
+        parser_cache.setdefault(hashed_grammar, {})[path] = module_cache_item
+        LOG.debug('pickle loaded: %s', path)
+        return module_cache_item.node
+
+
+def save_module(hashed_grammar, path, module, lines, pickling=True, cache_path=None):
+    try:
+        p_time = None if path is None else os.path.getmtime(path)
+    except OSError:
+        p_time = None
+        pickling = False
+
+    item = _NodeCacheItem(module, lines, p_time)
+    parser_cache.setdefault(hashed_grammar, {})[path] = item
+    if pickling and path is not None:
+        _save_to_file_system(hashed_grammar, path, item, cache_path=cache_path)
+
+
+def _save_to_file_system(hashed_grammar, path, item, cache_path=None):
+    with open(_get_hashed_path(hashed_grammar, path, cache_path=cache_path), 'wb') as f:
+        pickle.dump(item, f, pickle.HIGHEST_PROTOCOL)
+
+
+def clear_cache(cache_path=None):
+    if cache_path is None:
+        cache_path = _default_cache_path
+    shutil.rmtree(cache_path)
+    parser_cache.clear()
+
+
+def _get_hashed_path(hashed_grammar, path, cache_path=None):
+    directory = _get_cache_directory_path(cache_path=cache_path)
+
+    file_hash = hashlib.sha256(path.encode("utf-8")).hexdigest()
+    return os.path.join(directory, '%s-%s.pkl' % (hashed_grammar, file_hash))
+
+
+def _get_cache_directory_path(cache_path=None):
+    if cache_path is None:
+        cache_path = _default_cache_path
+    directory = os.path.join(cache_path, _VERSION_TAG)
+    if not os.path.exists(directory):
+        os.makedirs(directory)
+    return directory
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/grammar.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/grammar.py
new file mode 100644
index 0000000..a886b67
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/grammar.py
@@ -0,0 +1,283 @@
+import hashlib
+import os
+
+from parso._compatibility import FileNotFoundError, is_pypy
+from parso.pgen2.pgen import generate_grammar
+from parso.utils import split_lines, python_bytes_to_unicode, parse_version_string
+from parso.python.diff import DiffParser
+from parso.python.tokenize import tokenize_lines, tokenize
+from parso.python import token
+from parso.cache import parser_cache, load_module, save_module
+from parso.parser import BaseParser
+from parso.python.parser import Parser as PythonParser
+from parso.python.errors import ErrorFinderConfig
+from parso.python import pep8
+from parso.python import fstring
+
+_loaded_grammars = {}
+
+
+class Grammar(object):
+    """
+    :py:func:`parso.load_grammar` returns instances of this class.
+
+    Creating custom grammars by calling this is not supported, yet.
+    """
+    #:param text: A BNF representation of your grammar.
+    _error_normalizer_config = None
+    _token_namespace = None
+    _default_normalizer_config = pep8.PEP8NormalizerConfig()
+
+    def __init__(self, text, tokenizer, parser=BaseParser, diff_parser=None):
+        self._pgen_grammar = generate_grammar(
+            text,
+            token_namespace=self._get_token_namespace()
+        )
+        self._parser = parser
+        self._tokenizer = tokenizer
+        self._diff_parser = diff_parser
+        self._hashed = hashlib.sha256(text.encode("utf-8")).hexdigest()
+
+    def parse(self, code=None, **kwargs):
+        """
+        If you want to parse a Python file you want to start here, most likely.
+
+        If you need finer grained control over the parsed instance, there will be
+        other ways to access it.
+
+        :param str code: A unicode or bytes string. When it's not possible to
+            decode bytes to a string, returns a
+            :py:class:`UnicodeDecodeError`.
+        :param bool error_recovery: If enabled, any code will be returned. If
+            it is invalid, it will be returned as an error node. If disabled,
+            you will get a ParseError when encountering syntax errors in your
+            code.
+        :param str start_symbol: The grammar symbol that you want to parse. Only
+            allowed to be used when error_recovery is False.
+        :param str path: The path to the file you want to open. Only needed for caching.
+        :param bool cache: Keeps a copy of the parser tree in RAM and on disk
+            if a path is given. Returns the cached trees if the corresponding
+            files on disk have not changed.
+        :param bool diff_cache: Diffs the cached python module against the new
+            code and tries to parse only the parts that have changed. Returns
+            the same (changed) module that is found in cache. Using this option
+            requires you to not do anything anymore with the cached modules
+            under that path, because the contents of it might change. This
+            option is still somewhat experimental. If you want stability,
+            please don't use it.
+        :param bool cache_path: If given saves the parso cache in this
+            directory. If not given, defaults to the default cache places on
+            each platform.
+
+        :return: A subclass of :py:class:`parso.tree.NodeOrLeaf`. Typically a
+            :py:class:`parso.python.tree.Module`.
+        """
+        if 'start_pos' in kwargs:
+            raise TypeError("parse() got an unexpected keyworda argument.")
+        return self._parse(code=code, **kwargs)
+
+    def _parse(self, code=None, error_recovery=True, path=None,
+               start_symbol=None, cache=False, diff_cache=False,
+               cache_path=None, start_pos=(1, 0)):
+        """
+        Wanted python3.5 * operator and keyword only arguments. Therefore just
+        wrap it all.
+        start_pos here is just a parameter internally used. Might be public
+        sometime in the future.
+        """
+        if code is None and path is None:
+            raise TypeError("Please provide either code or a path.")
+
+        if start_symbol is None:
+            start_symbol = self._start_symbol
+
+        if error_recovery and start_symbol != 'file_input':
+            raise NotImplementedError("This is currently not implemented.")
+
+        if cache and code is None and path is not None:
+            # With the current architecture we cannot load from cache if the
+            # code is given, because we just load from cache if it's not older than
+            # the latest change (file last modified).
+            module_node = load_module(self._hashed, path, cache_path=cache_path)
+            if module_node is not None:
+                return module_node
+
+        if code is None:
+            with open(path, 'rb') as f:
+                code = f.read()
+
+        code = python_bytes_to_unicode(code)
+
+        lines = split_lines(code, keepends=True)
+        if diff_cache:
+            if self._diff_parser is None:
+                raise TypeError("You have to define a diff parser to be able "
+                                "to use this option.")
+            try:
+                module_cache_item = parser_cache[self._hashed][path]
+            except KeyError:
+                pass
+            else:
+                module_node = module_cache_item.node
+                old_lines = module_cache_item.lines
+                if old_lines == lines:
+                    return module_node
+
+                new_node = self._diff_parser(
+                    self._pgen_grammar, self._tokenizer, module_node
+                ).update(
+                    old_lines=old_lines,
+                    new_lines=lines
+                )
+                save_module(self._hashed, path, new_node, lines,
+                            # Never pickle in pypy, it's slow as hell.
+                            pickling=cache and not is_pypy,
+                            cache_path=cache_path)
+                return new_node
+
+        tokens = self._tokenizer(lines, start_pos)
+
+        p = self._parser(
+            self._pgen_grammar,
+            error_recovery=error_recovery,
+            start_symbol=start_symbol
+        )
+        root_node = p.parse(tokens=tokens)
+
+        if cache or diff_cache:
+            save_module(self._hashed, path, root_node, lines,
+                        # Never pickle in pypy, it's slow as hell.
+                        pickling=cache and not is_pypy,
+                        cache_path=cache_path)
+        return root_node
+
+    def _get_token_namespace(self):
+        ns = self._token_namespace
+        if ns is None:
+            raise ValueError("The token namespace should be set.")
+        return ns
+
+    def iter_errors(self, node):
+        """
+        Given a :py:class:`parso.tree.NodeOrLeaf` returns a generator of
+        :py:class:`parso.normalizer.Issue` objects. For Python this is
+        a list of syntax/indentation errors.
+        """
+        if self._error_normalizer_config is None:
+            raise ValueError("No error normalizer specified for this grammar.")
+
+        return self._get_normalizer_issues(node, self._error_normalizer_config)
+
+    def _get_normalizer(self, normalizer_config):
+        if normalizer_config is None:
+            normalizer_config = self._default_normalizer_config
+            if normalizer_config is None:
+                raise ValueError("You need to specify a normalizer, because "
+                                 "there's no default normalizer for this tree.")
+        return normalizer_config.create_normalizer(self)
+
+    def _normalize(self, node, normalizer_config=None):
+        """
+        TODO this is not public, yet.
+        The returned code will be normalized, e.g. PEP8 for Python.
+        """
+        normalizer = self._get_normalizer(normalizer_config)
+        return normalizer.walk(node)
+
+    def _get_normalizer_issues(self, node, normalizer_config=None):
+        normalizer = self._get_normalizer(normalizer_config)
+        normalizer.walk(node)
+        return normalizer.issues
+
+
+    def __repr__(self):
+        labels = self._pgen_grammar.number2symbol.values()
+        txt = ' '.join(list(labels)[:3]) + ' ...'
+        return '<%s:%s>' % (self.__class__.__name__, txt)
+
+
+class PythonGrammar(Grammar):
+    _error_normalizer_config = ErrorFinderConfig()
+    _token_namespace = token
+    _start_symbol = 'file_input'
+
+    def __init__(self, version_info, bnf_text):
+        super(PythonGrammar, self).__init__(
+            bnf_text,
+            tokenizer=self._tokenize_lines,
+            parser=PythonParser,
+            diff_parser=DiffParser
+        )
+        self.version_info = version_info
+
+    def _tokenize_lines(self, lines, start_pos):
+        return tokenize_lines(lines, self.version_info, start_pos=start_pos)
+
+    def _tokenize(self, code):
+        # Used by Jedi.
+        return tokenize(code, self.version_info)
+
+
+class PythonFStringGrammar(Grammar):
+    _token_namespace = fstring.TokenNamespace
+    _start_symbol = 'fstring'
+
+    def __init__(self):
+        super(PythonFStringGrammar, self).__init__(
+            text=fstring.GRAMMAR,
+            tokenizer=fstring.tokenize,
+            parser=fstring.Parser
+        )
+
+    def parse(self, code, **kwargs):
+        return self._parse(code, **kwargs)
+
+    def _parse(self, code, error_recovery=True, start_pos=(1, 0)):
+        tokens = self._tokenizer(code, start_pos=start_pos)
+        p = self._parser(
+            self._pgen_grammar,
+            error_recovery=error_recovery,
+            start_symbol=self._start_symbol,
+        )
+        return p.parse(tokens=tokens)
+
+    def parse_leaf(self, leaf, error_recovery=True):
+        code = leaf._get_payload()
+        return self.parse(code, error_recovery=True, start_pos=leaf.start_pos)
+
+
+def load_grammar(**kwargs):
+    """
+    Loads a :py:class:`parso.Grammar`. The default version is the current Python
+    version.
+
+    :param str version: A python version string, e.g. ``version='3.3'``.
+    """
+    def load_grammar(language='python', version=None):
+        if language == 'python':
+            version_info = parse_version_string(version)
+
+            file = 'python/grammar%s%s.txt' % (version_info.major, version_info.minor)
+
+            global _loaded_grammars
+            path = os.path.join(os.path.dirname(__file__), file)
+            try:
+                return _loaded_grammars[path]
+            except KeyError:
+                try:
+                    with open(path) as f:
+                        bnf_text = f.read()
+
+                    grammar = PythonGrammar(version_info, bnf_text)
+                    return _loaded_grammars.setdefault(path, grammar)
+                except FileNotFoundError:
+                    message = "Python version %s is currently not supported." % version
+                    raise NotImplementedError(message)
+        elif language == 'python-f-string':
+            if version is not None:
+                raise NotImplementedError("Currently different versions are not supported.")
+            return PythonFStringGrammar()
+        else:
+            raise NotImplementedError("No support for language %s." % language)
+
+    return load_grammar(**kwargs)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/normalizer.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/normalizer.py
new file mode 100644
index 0000000..9a3e82e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/normalizer.py
@@ -0,0 +1,184 @@
+from contextlib import contextmanager
+
+from parso._compatibility import use_metaclass
+
+
+class _NormalizerMeta(type):
+    def __new__(cls, name, bases, dct):
+        new_cls = type.__new__(cls, name, bases, dct)
+        new_cls.rule_value_classes = {}
+        new_cls.rule_type_classes = {}
+        return new_cls
+
+
+class Normalizer(use_metaclass(_NormalizerMeta)):
+    def __init__(self, grammar, config):
+        self.grammar = grammar
+        self._config = config
+        self.issues = []
+
+        self._rule_type_instances = self._instantiate_rules('rule_type_classes')
+        self._rule_value_instances = self._instantiate_rules('rule_value_classes')
+
+    def _instantiate_rules(self, attr):
+        dct = {}
+        for base in type(self).mro():
+            rules_map = getattr(base, attr, {})
+            for type_, rule_classes in rules_map.items():
+                new = [rule_cls(self) for rule_cls in rule_classes]
+                dct.setdefault(type_, []).extend(new)
+        return dct
+
+    def walk(self, node):
+        self.initialize(node)
+        value = self.visit(node)
+        self.finalize()
+        return value
+
+    def visit(self, node):
+        try:
+            children = node.children
+        except AttributeError:
+            return self.visit_leaf(node)
+        else:
+           with self.visit_node(node):
+               return ''.join(self.visit(child) for child in children)
+
+    @contextmanager
+    def visit_node(self, node):
+        self._check_type_rules(node)
+        yield
+
+    def _check_type_rules(self, node):
+        for rule in self._rule_type_instances.get(node.type, []):
+            rule.feed_node(node)
+
+    def visit_leaf(self, leaf):
+        self._check_type_rules(leaf)
+
+        for rule in self._rule_value_instances.get(leaf.value, []):
+            rule.feed_node(leaf)
+
+        return leaf.prefix + leaf.value
+
+    def initialize(self, node):
+        pass
+
+    def finalize(self):
+        pass
+
+    def add_issue(self, node, code, message):
+        issue = Issue(node, code, message)
+        if issue not in self.issues:
+            self.issues.append(issue)
+        return True
+
+    @classmethod
+    def register_rule(cls, **kwargs):
+        """
+        Use it as a class decorator::
+
+            normalizer = Normalizer('grammar', 'config')
+            @normalizer.register_rule(value='foo')
+            class MyRule(Rule):
+                error_code = 42
+        """
+        return cls._register_rule(**kwargs)
+
+    @classmethod
+    def _register_rule(cls, value=None, values=(), type=None, types=()):
+        values = list(values)
+        types = list(types)
+        if value is not None:
+            values.append(value)
+        if type is not None:
+            types.append(type)
+
+        if not values and not types:
+            raise ValueError("You must register at least something.")
+
+        def decorator(rule_cls):
+            for v in values:
+                cls.rule_value_classes.setdefault(v, []).append(rule_cls)
+            for t in types:
+                cls.rule_type_classes.setdefault(t, []).append(rule_cls)
+            return rule_cls
+
+        return decorator
+
+
+class NormalizerConfig(object):
+    normalizer_class = Normalizer
+
+    def create_normalizer(self, grammar):
+        if self.normalizer_class is None:
+            return None
+
+        return self.normalizer_class(grammar, self)
+
+
+class Issue(object):
+    def __init__(self, node, code, message):
+        self._node = node
+        self.code = code
+        """
+        An integer code that stands for the type of error.
+        """
+        self.message = message
+        """
+        A message (string) for the issue.
+        """
+        self.start_pos = node.start_pos
+        """
+        The start position position of the error as a tuple (line, column). As
+        always in |parso| the first line is 1 and the first column 0.
+        """
+
+    def __eq__(self, other):
+        return self.start_pos == other.start_pos and self.code == other.code
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash((self.code, self.start_pos))
+
+    def __repr__(self):
+        return '<%s: %s>' % (self.__class__.__name__, self.code)
+
+
+
+class Rule(object):
+    code = None
+    message = None
+
+    def __init__(self, normalizer):
+        self._normalizer = normalizer
+
+    def is_issue(self, node):
+        raise NotImplementedError()
+
+    def get_node(self, node):
+        return node
+
+    def _get_message(self, message):
+        if message is None:
+            message = self.message
+            if message is None:
+                raise ValueError("The message on the class is not set.")
+        return message
+
+    def add_issue(self, node, code=None, message=None):
+        if code is None:
+            code = self.code
+            if code is None:
+                raise ValueError("The error code on the class is not set.")
+
+        message = self._get_message(message)
+
+        self._normalizer.add_issue(node, code, message)
+
+    def feed_node(self, node):
+        if self.is_issue(node):
+            issue_node = self.get_node(node)
+            self.add_issue(issue_node)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/parser.py
new file mode 100644
index 0000000..555ebc7
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/parser.py
@@ -0,0 +1,78 @@
+"""
+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:`parso.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``).
+"""
+from parso import tree
+from parso.pgen2.parse import PgenParser
+
+
+class ParserSyntaxError(Exception):
+    """
+    Contains error information about the parser tree.
+
+    May be raised as an exception.
+    """
+    def __init__(self, message, error_leaf):
+        self.message = message
+        self.error_leaf = error_leaf
+
+
+class BaseParser(object):
+    node_map = {}
+    default_node = tree.Node
+
+    leaf_map = {
+    }
+    default_leaf = tree.Leaf
+
+    def __init__(self, pgen_grammar, start_symbol='file_input', error_recovery=False):
+        self._pgen_grammar = pgen_grammar
+        self._start_symbol = start_symbol
+        self._error_recovery = error_recovery
+
+    def parse(self, tokens):
+        start_number = self._pgen_grammar.symbol2number[self._start_symbol]
+        self.pgen_parser = PgenParser(
+            self._pgen_grammar, self.convert_node, self.convert_leaf,
+            self.error_recovery, start_number
+        )
+
+        node = self.pgen_parser.parse(tokens)
+        # The stack is empty now, we don't need it anymore.
+        del self.pgen_parser
+        return node
+
+    def error_recovery(self, pgen_grammar, stack, arcs, typ, value, start_pos, prefix,
+                       add_token_callback):
+        if self._error_recovery:
+            raise NotImplementedError("Error Recovery is not implemented")
+        else:
+            error_leaf = tree.ErrorLeaf('TODO %s' % typ, value, start_pos, prefix)
+            raise ParserSyntaxError('SyntaxError: invalid syntax', error_leaf)
+
+    def convert_node(self, pgen_grammar, type_, children):
+        # TODO REMOVE symbol, we don't want type here.
+        symbol = pgen_grammar.number2symbol[type_]
+        try:
+            return self.node_map[symbol](children)
+        except KeyError:
+            return self.default_node(symbol, children)
+
+    def convert_leaf(self, pgen_grammar, type_, value, prefix, start_pos):
+        try:
+            return self.leaf_map[type_](value, start_pos, prefix)
+        except KeyError:
+            return self.default_leaf(value, start_pos, prefix)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/__init__.py
new file mode 100644
index 0000000..1ddae5f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/grammar.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/grammar.py
new file mode 100644
index 0000000..e5f2114
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/grammar.py
@@ -0,0 +1,128 @@
+# 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.
+
+"""
+
+try:
+    import cPickle as pickle
+except:
+    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, bnf_text):
+        self.symbol2number = {}
+        self.number2symbol = {}
+        self.states = []
+        self.dfas = {}
+        self.labels = [(0, "EMPTY")]
+        self.keywords = {}
+        self.tokens = {}
+        self.symbol2label = {}
+        self.label2symbol = {}
+        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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/parse.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/parse.py
new file mode 100644
index 0000000..aaacfce
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/parse.py
@@ -0,0 +1,223 @@
+# 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.
+"""
+
+from parso.python 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
+
+
+class Stack(list):
+    def get_tos_nodes(self):
+        tos = self[-1]
+        return tos[2][1]
+
+
+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.add_token(...):           # 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 add_token() 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 = Stack([stackentry])
+        self.rootnode = None
+        self.error_recovery = error_recovery
+
+    def parse(self, tokens):
+        for type_, value, start_pos, prefix in tokens:
+            if self.add_token(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 add_token(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
+        _gram = self.grammar
+        _labels = _gram.labels
+        _push = self._push
+        _pop = self._pop
+        _shift = self._shift
+        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 = _labels[i]
+                if ilabel == i:
+                    # Look it up in the list of labels
+                    assert t < 256
+                    # Shift a token; we're done with it
+                    _shift(type_, value, newstate, prefix, start_pos)
+                    # Pop while we are in an accept-only state
+                    state = newstate
+                    while states[state] == [(0, state)]:
+                        _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 = _gram.dfas[t]
+                    itsstates, itsfirst = itsdfa
+                    if ilabel in itsfirst:
+                        # Push a symbol
+                        _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
+                    _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.add_token)
+                    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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/pgen.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/pgen.py
new file mode 100644
index 0000000..10ef6ff
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/pgen2/pgen.py
@@ -0,0 +1,399 @@
+# 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.
+
+from parso.pgen2 import grammar
+from parso.python import token
+from parso.python import tokenize
+from parso.utils import parse_version_string
+
+
+class ParserGenerator(object):
+    def __init__(self, bnf_text, token_namespace):
+        self._bnf_text = bnf_text
+        self.generator = tokenize.tokenize(
+            bnf_text,
+            version_info=parse_version_string('3.6')
+        )
+        self._gettoken()  # Initialize lookahead
+        self.dfas, self.startsymbol = self._parse()
+        self.first = {}  # map from symbol name to set of tokens
+        self._addfirstsets()
+        self._token_namespace = token_namespace
+
+    def make_grammar(self):
+        c = grammar.Grammar(self._bnf_text)
+        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
+                    c.label2symbol[ilabel] = label
+                    return ilabel
+            else:
+                # A named token (NAME, NUMBER, STRING)
+                itoken = getattr(self._token_namespace, label, None)
+                assert isinstance(itoken, int), 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:
+                    # TODO this might be an issue?! Using token.NAME here?
+                    c.labels.append((token.NAME, value))
+                    c.keywords[value] = ilabel
+                    return ilabel
+            else:
+                # An operator (any non-numeric token)
+                itoken = self._token_namespace.generate_token_id(value)
+                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.COLON)
+            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.RSQB)
+            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.RPAR)
+            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):
+        if self.type != type:
+            self._raise_error("expected %s, got %s(%s)",
+                              type, 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
+
+    def _raise_error(self, msg, *args):
+        if args:
+            try:
+                msg = msg % args
+            except:
+                msg = " ".join([msg] + list(map(str, args)))
+        line = self._bnf_text.splitlines()[self.begin[0] - 1]
+        raise SyntaxError(msg, ('<grammar>', 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(bnf_text, token_namespace):
+    """
+    ``bnf_text`` is a grammar in extended BNF (using * for repetition, + for
+    at-least-once repetition, [] for optional parts, | for alternatives and ()
+    for grouping).
+
+    It's not EBNF according to ISO/IEC 14977. It's a dialect Python uses in its
+    own parser.
+    """
+    p = ParserGenerator(bnf_text, token_namespace)
+    return p.make_grammar()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/diff.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/diff.py
new file mode 100644
index 0000000..c2e44fd
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/diff.py
@@ -0,0 +1,587 @@
+"""
+Basically a contains parser that is faster, because it tries to parse only
+parts and if anything changes, it only reparses the changed parts.
+
+It works with a simple diff in the beginning and will try to reuse old parser
+fragments.
+"""
+import re
+import difflib
+from collections import namedtuple
+import logging
+
+from parso.utils import split_lines
+from parso.python.parser import Parser
+from parso.python.tree import EndMarker
+from parso.python.tokenize import (NEWLINE, PythonToken, ERROR_DEDENT,
+                                   ENDMARKER, INDENT, DEDENT)
+
+LOG = logging.getLogger(__name__)
+
+
+def _get_last_line(node_or_leaf):
+    last_leaf = node_or_leaf.get_last_leaf()
+    if _ends_with_newline(last_leaf):
+        return last_leaf.start_pos[0]
+    else:
+        return last_leaf.end_pos[0]
+
+
+def _ends_with_newline(leaf, suffix=''):
+    if leaf.type == 'error_leaf':
+        typ = leaf.original_type
+    else:
+        typ = leaf.type
+
+    return typ == 'newline' or suffix.endswith('\n')
+
+
+def _flows_finished(pgen_grammar, stack):
+    """
+    if, while, for and try might not be finished, because another part might
+    still be parsed.
+    """
+    for dfa, newstate, (symbol_number, nodes) in stack:
+        if pgen_grammar.number2symbol[symbol_number] in ('if_stmt', 'while_stmt',
+                                                    'for_stmt', 'try_stmt'):
+            return False
+    return True
+
+
+def suite_or_file_input_is_valid(pgen_grammar, stack):
+    if not _flows_finished(pgen_grammar, stack):
+        return False
+
+    for dfa, newstate, (symbol_number, nodes) in reversed(stack):
+        if pgen_grammar.number2symbol[symbol_number] == 'suite':
+            # If only newline is in the suite, the suite is not valid, yet.
+            return len(nodes) > 1
+    # Not reaching a suite means that we're dealing with file_input levels
+    # where there's no need for a valid statement in it. It can also be empty.
+    return True
+
+
+def _is_flow_node(node):
+    try:
+        value = node.children[0].value
+    except AttributeError:
+        return False
+    return value in ('if', 'for', 'while', 'try')
+
+
+class _PositionUpdatingFinished(Exception):
+    pass
+
+
+def _update_positions(nodes, line_offset, last_leaf):
+    for node in nodes:
+        try:
+            children = node.children
+        except AttributeError:
+            # Is a leaf
+            node.line += line_offset
+            if node is last_leaf:
+                raise _PositionUpdatingFinished
+        else:
+            _update_positions(children, line_offset, last_leaf)
+
+
+class DiffParser(object):
+    """
+    An advanced form of parsing a file faster. Unfortunately comes with huge
+    side effects. It changes the given module.
+    """
+    def __init__(self, pgen_grammar, tokenizer, module):
+        self._pgen_grammar = pgen_grammar
+        self._tokenizer = tokenizer
+        self._module = module
+
+    def _reset(self):
+        self._copy_count = 0
+        self._parser_count = 0
+
+        self._nodes_stack = _NodesStack(self._module)
+
+    def update(self, old_lines, new_lines):
+        '''
+        The algorithm works as follows:
+
+        Equal:
+            - Assure that the start is a newline, otherwise parse until we get
+              one.
+            - Copy from parsed_until_line + 1 to max(i2 + 1)
+            - Make sure that the indentation is correct (e.g. add DEDENT)
+            - Add old and change positions
+        Insert:
+            - Parse from parsed_until_line + 1 to min(j2 + 1), hopefully not
+              much more.
+
+        Returns the new module node.
+        '''
+        LOG.debug('diff parser start')
+        # Reset the used names cache so they get regenerated.
+        self._module._used_names = None
+
+        self._parser_lines_new = new_lines
+
+        self._reset()
+
+        line_length = len(new_lines)
+        sm = difflib.SequenceMatcher(None, old_lines, self._parser_lines_new)
+        opcodes = sm.get_opcodes()
+        LOG.debug('diff parser calculated')
+        LOG.debug('diff: line_lengths old: %s, new: %s' % (len(old_lines), line_length))
+
+        for operation, i1, i2, j1, j2 in opcodes:
+            LOG.debug('diff %s old[%s:%s] new[%s:%s]',
+                      operation, i1 + 1, i2, j1 + 1, j2)
+
+            if j2 == line_length and new_lines[-1] == '':
+                # The empty part after the last newline is not relevant.
+                j2 -= 1
+
+            if operation == 'equal':
+                line_offset = j1 - i1
+                self._copy_from_old_parser(line_offset, i2, j2)
+            elif operation == 'replace':
+                self._parse(until_line=j2)
+            elif operation == 'insert':
+                self._parse(until_line=j2)
+            else:
+                assert operation == 'delete'
+
+        # With this action all change will finally be applied and we have a
+        # changed module.
+        self._nodes_stack.close()
+
+        last_pos = self._module.end_pos[0]
+        if last_pos != line_length:
+            current_lines = split_lines(self._module.get_code(), keepends=True)
+            diff = difflib.unified_diff(current_lines, new_lines)
+            raise Exception(
+                "There's an issue (%s != %s) with the diff parser. Please report:\n%s"
+                % (last_pos, line_length, ''.join(diff))
+            )
+
+        LOG.debug('diff parser end')
+        return self._module
+
+    def _enabled_debugging(self, old_lines, lines_new):
+        if self._module.get_code() != ''.join(lines_new):
+            LOG.warning('parser issue:\n%s\n%s', ''.join(old_lines),
+                            ''.join(lines_new))
+
+    def _copy_from_old_parser(self, line_offset, until_line_old, until_line_new):
+        copied_nodes = [None]
+
+        last_until_line = -1
+        while until_line_new > self._nodes_stack.parsed_until_line:
+            parsed_until_line_old = self._nodes_stack.parsed_until_line - line_offset
+            line_stmt = self._get_old_line_stmt(parsed_until_line_old + 1)
+            if line_stmt is None:
+                # Parse 1 line at least. We don't need more, because we just
+                # want to get into a state where the old parser has statements
+                # again that can be copied (e.g. not lines within parentheses).
+                self._parse(self._nodes_stack.parsed_until_line + 1)
+            elif not copied_nodes:
+                # We have copied as much as possible (but definitely not too
+                # much). Therefore we just parse the rest.
+                # We might not reach the end, because there's a statement
+                # that is not finished.
+                self._parse(until_line_new)
+            else:
+                p_children = line_stmt.parent.children
+                index = p_children.index(line_stmt)
+
+                copied_nodes = self._nodes_stack.copy_nodes(
+                    p_children[index:],
+                    until_line_old,
+                    line_offset
+                )
+                # Match all the nodes that are in the wanted range.
+                if copied_nodes:
+                    self._copy_count += 1
+
+                    from_ = copied_nodes[0].get_start_pos_of_prefix()[0] + line_offset
+                    to = self._nodes_stack.parsed_until_line
+
+                    LOG.debug('diff actually copy %s to %s', from_, to)
+            # Since there are potential bugs that might loop here endlessly, we
+            # just stop here.
+            assert last_until_line != self._nodes_stack.parsed_until_line \
+                or not copied_nodes, last_until_line
+            last_until_line = self._nodes_stack.parsed_until_line
+
+    def _get_old_line_stmt(self, old_line):
+        leaf = self._module.get_leaf_for_position((old_line, 0), include_prefixes=True)
+
+        if _ends_with_newline(leaf):
+            leaf = leaf.get_next_leaf()
+        if leaf.get_start_pos_of_prefix()[0] == old_line:
+            node = leaf
+            while node.parent.type not in ('file_input', 'suite'):
+                node = node.parent
+            return node
+        # Must be on the same line. Otherwise we need to parse that bit.
+        return None
+
+    def _get_before_insertion_node(self):
+        if self._nodes_stack.is_empty():
+            return None
+
+        line = self._nodes_stack.parsed_until_line + 1
+        node = self._new_module.get_last_leaf()
+        while True:
+            parent = node.parent
+            if parent.type in ('suite', 'file_input'):
+                assert node.end_pos[0] <= line
+                assert node.end_pos[1] == 0 or '\n' in self._prefix
+                return node
+            node = parent
+
+    def _parse(self, until_line):
+        """
+        Parses at least until the given line, but might just parse more until a
+        valid state is reached.
+        """
+        last_until_line = 0
+        while until_line > self._nodes_stack.parsed_until_line:
+            node = self._try_parse_part(until_line)
+            nodes = node.children
+
+            self._nodes_stack.add_parsed_nodes(nodes)
+            LOG.debug(
+                'parse_part from %s to %s (to %s in part parser)',
+                nodes[0].get_start_pos_of_prefix()[0],
+                self._nodes_stack.parsed_until_line,
+                node.end_pos[0] - 1
+            )
+            # Since the tokenizer sometimes has bugs, we cannot be sure that
+            # this loop terminates. Therefore assert that there's always a
+            # change.
+            assert last_until_line != self._nodes_stack.parsed_until_line, last_until_line
+            last_until_line = self._nodes_stack.parsed_until_line
+
+    def _try_parse_part(self, until_line):
+        """
+        Sets up a normal parser that uses a spezialized tokenizer to only parse
+        until a certain position (or a bit longer if the statement hasn't
+        ended.
+        """
+        self._parser_count += 1
+        # TODO speed up, shouldn't copy the whole list all the time.
+        # memoryview?
+        parsed_until_line = self._nodes_stack.parsed_until_line
+        lines_after = self._parser_lines_new[parsed_until_line:]
+        #print('parse_content', parsed_until_line, lines_after, until_line)
+        tokens = self._diff_tokenize(
+            lines_after,
+            until_line,
+            line_offset=parsed_until_line
+        )
+        self._active_parser = Parser(
+            self._pgen_grammar,
+            error_recovery=True
+        )
+        return self._active_parser.parse(tokens=tokens)
+
+    def _diff_tokenize(self, lines, until_line, line_offset=0):
+        is_first_token = True
+        omitted_first_indent = False
+        indents = []
+        tokens = self._tokenizer(lines, (1, 0))
+        stack = self._active_parser.pgen_parser.stack
+        for typ, string, start_pos, prefix in tokens:
+            start_pos = start_pos[0] + line_offset, start_pos[1]
+            if typ == INDENT:
+                indents.append(start_pos[1])
+                if is_first_token:
+                    omitted_first_indent = True
+                    # We want to get rid of indents that are only here because
+                    # we only parse part of the file. These indents would only
+                    # get parsed as error leafs, which doesn't make any sense.
+                    is_first_token = False
+                    continue
+            is_first_token = False
+
+            # In case of omitted_first_indent, it might not be dedented fully.
+            # However this is a sign for us that a dedent happened.
+            if typ == DEDENT \
+                    or typ == ERROR_DEDENT and omitted_first_indent and len(indents) == 1:
+                indents.pop()
+                if omitted_first_indent and not indents:
+                    # We are done here, only thing that can come now is an
+                    # endmarker or another dedented code block.
+                    typ, string, start_pos, prefix = next(tokens)
+                    if '\n' in prefix:
+                        prefix = re.sub(r'(<=\n)[^\n]+$', '', prefix)
+                    else:
+                        prefix = ''
+                    yield PythonToken(ENDMARKER, '', (start_pos[0] + line_offset, 0), prefix)
+                    break
+            elif typ == NEWLINE and start_pos[0] >= until_line:
+                yield PythonToken(typ, string, start_pos, prefix)
+                # Check if the parser is actually in a valid suite state.
+                if suite_or_file_input_is_valid(self._pgen_grammar, stack):
+                    start_pos = start_pos[0] + 1, 0
+                    while len(indents) > int(omitted_first_indent):
+                        indents.pop()
+                        yield PythonToken(DEDENT, '', start_pos, '')
+
+                    yield PythonToken(ENDMARKER, '', start_pos, '')
+                    break
+                else:
+                    continue
+
+            yield PythonToken(typ, string, start_pos, prefix)
+
+
+class _NodesStackNode(object):
+    ChildrenGroup = namedtuple('ChildrenGroup', 'children line_offset last_line_offset_leaf')
+
+    def __init__(self, tree_node, parent=None):
+        self.tree_node = tree_node
+        self.children_groups = []
+        self.parent = parent
+
+    def close(self):
+        children = []
+        for children_part, line_offset, last_line_offset_leaf in self.children_groups:
+            if line_offset != 0:
+                try:
+                    _update_positions(
+                        children_part, line_offset, last_line_offset_leaf)
+                except _PositionUpdatingFinished:
+                    pass
+            children += children_part
+        self.tree_node.children = children
+        # Reset the parents
+        for node in children:
+            node.parent = self.tree_node
+
+    def add(self, children, line_offset=0, last_line_offset_leaf=None):
+        group = self.ChildrenGroup(children, line_offset, last_line_offset_leaf)
+        self.children_groups.append(group)
+
+    def get_last_line(self, suffix):
+        line = 0
+        if self.children_groups:
+            children_group = self.children_groups[-1]
+            last_leaf = children_group.children[-1].get_last_leaf()
+            line = last_leaf.end_pos[0]
+
+            # Calculate the line offsets
+            offset = children_group.line_offset
+            if offset:
+                # In case the line_offset is not applied to this specific leaf,
+                # just ignore it.
+                if last_leaf.line <= children_group.last_line_offset_leaf.line:
+                    line += children_group.line_offset
+
+            # Newlines end on the next line, which means that they would cover
+            # the next line. That line is not fully parsed at this point.
+            if _ends_with_newline(last_leaf, suffix):
+                line -= 1
+        line += suffix.count('\n')
+        if suffix and not suffix.endswith('\n'):
+            # This is the end of a file (that doesn't end with a newline).
+            line += 1
+        return line
+
+
+class _NodesStack(object):
+    endmarker_type = 'endmarker'
+
+    def __init__(self, module):
+        # Top of stack
+        self._tos = self._base_node = _NodesStackNode(module)
+        self._module = module
+        self._last_prefix = ''
+        self.prefix = ''
+
+    def is_empty(self):
+        return not self._base_node.children
+
+    @property
+    def parsed_until_line(self):
+        return self._tos.get_last_line(self.prefix)
+
+    def _get_insertion_node(self, indentation_node):
+        indentation = indentation_node.start_pos[1]
+
+        # find insertion node
+        node = self._tos
+        while True:
+            tree_node = node.tree_node
+            if tree_node.type == 'suite':
+                # A suite starts with NEWLINE, ...
+                node_indentation = tree_node.children[1].start_pos[1]
+
+                if indentation >= node_indentation:  # Not a Dedent
+                    # We might be at the most outer layer: modules. We
+                    # don't want to depend on the first statement
+                    # having the right indentation.
+                    return node
+
+            elif tree_node.type == 'file_input':
+                return node
+
+            node = self._close_tos()
+
+    def _close_tos(self):
+        self._tos.close()
+        self._tos = self._tos.parent
+        return self._tos
+
+    def add_parsed_nodes(self, tree_nodes):
+        tree_nodes = self._remove_endmarker(tree_nodes)
+        if not tree_nodes:
+            return
+
+        assert tree_nodes[0].type != 'newline'
+
+        node = self._get_insertion_node(tree_nodes[0])
+        assert node.tree_node.type in ('suite', 'file_input')
+        node.add(tree_nodes)
+        self._update_tos(tree_nodes[-1])
+
+    def _remove_endmarker(self, tree_nodes):
+        """
+        Helps cleaning up the tree nodes that get inserted.
+        """
+        last_leaf = tree_nodes[-1].get_last_leaf()
+        is_endmarker = last_leaf.type == self.endmarker_type
+        self._last_prefix = ''
+        if is_endmarker:
+            try:
+                separation = last_leaf.prefix.rindex('\n')
+            except ValueError:
+                pass
+            else:
+                # Remove the whitespace part of the prefix after a newline.
+                # That is not relevant if parentheses were opened. Always parse
+                # until the end of a line.
+                last_leaf.prefix, self._last_prefix = \
+                    last_leaf.prefix[:separation + 1], last_leaf.prefix[separation + 1:]
+
+        first_leaf = tree_nodes[0].get_first_leaf()
+        first_leaf.prefix = self.prefix + first_leaf.prefix
+        self.prefix = ''
+
+        if is_endmarker:
+            self.prefix = last_leaf.prefix
+
+            tree_nodes = tree_nodes[:-1]
+
+        return tree_nodes
+
+    def copy_nodes(self, tree_nodes, until_line, line_offset):
+        """
+        Copies tree nodes from the old parser tree.
+
+        Returns the number of tree nodes that were copied.
+        """
+        tos = self._get_insertion_node(tree_nodes[0])
+
+        new_nodes, self._tos = self._copy_nodes(tos, tree_nodes, until_line, line_offset)
+        return new_nodes
+
+    def _copy_nodes(self, tos, nodes, until_line, line_offset):
+        new_nodes = []
+
+        new_tos = tos
+        for node in nodes:
+            if node.type == 'endmarker':
+                # Endmarkers just distort all the checks below. Remove them.
+                break
+
+            if node.start_pos[0] > until_line:
+                break
+            # TODO this check might take a bit of time for large files. We
+            # might want to change this to do more intelligent guessing or
+            # binary search.
+            if _get_last_line(node) > until_line:
+                # We can split up functions and classes later.
+                if node.type in ('classdef', 'funcdef') and node.children[-1].type == 'suite':
+                    new_nodes.append(node)
+                break
+
+            new_nodes.append(node)
+
+        if not new_nodes:
+            return [], tos
+
+        last_node = new_nodes[-1]
+        line_offset_index = -1
+        if last_node.type in ('classdef', 'funcdef'):
+            suite = last_node.children[-1]
+            if suite.type == 'suite':
+                suite_tos = _NodesStackNode(suite)
+                # Don't need to pass line_offset here, it's already done by the
+                # parent.
+                suite_nodes, recursive_tos = self._copy_nodes(
+                    suite_tos, suite.children, until_line, line_offset)
+                if len(suite_nodes) < 2:
+                    # A suite only with newline is not valid.
+                    new_nodes.pop()
+                else:
+                    suite_tos.parent = tos
+                    new_tos = recursive_tos
+                    line_offset_index = -2
+
+        elif (new_nodes[-1].type in ('error_leaf', 'error_node') or
+                          _is_flow_node(new_nodes[-1])):
+            # Error leafs/nodes don't have a defined start/end. Error
+            # nodes might not end with a newline (e.g. if there's an
+            # open `(`). Therefore ignore all of them unless they are
+            # succeeded with valid parser state.
+            # If we copy flows at the end, they might be continued
+            # after the copy limit (in the new parser).
+            # In this while loop we try to remove until we find a newline.
+            new_nodes.pop()
+            while new_nodes:
+                last_node = new_nodes[-1]
+                if last_node.get_last_leaf().type == 'newline':
+                    break
+                new_nodes.pop()
+
+        if new_nodes:
+            try:
+                last_line_offset_leaf = new_nodes[line_offset_index].get_last_leaf()
+            except IndexError:
+                line_offset = 0
+                # In this case we don't have to calculate an offset, because
+                # there's no children to be managed.
+                last_line_offset_leaf = None
+            tos.add(new_nodes, line_offset, last_line_offset_leaf)
+        return new_nodes, new_tos
+
+    def _update_tos(self, tree_node):
+        if tree_node.type in ('suite', 'file_input'):
+            self._tos = _NodesStackNode(tree_node, self._tos)
+            self._tos.add(list(tree_node.children))
+            self._update_tos(tree_node.children[-1])
+        elif tree_node.type in ('classdef', 'funcdef'):
+            self._update_tos(tree_node.children[-1])
+
+    def close(self):
+        while self._tos is not None:
+            self._close_tos()
+
+        # Add an endmarker.
+        try:
+            last_leaf = self._module.get_last_leaf()
+            end_pos = list(last_leaf.end_pos)
+        except IndexError:
+            end_pos = [1, 0]
+        lines = split_lines(self.prefix)
+        assert len(lines) > 0
+        if len(lines) == 1:
+            end_pos[1] += len(lines[0])
+        else:
+            end_pos[0] += len(lines) - 1
+            end_pos[1] = len(lines[-1])
+
+        endmarker = EndMarker('', tuple(end_pos), self.prefix + self._last_prefix)
+        endmarker.parent = self._module
+        self._module.children.append(endmarker)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/errors.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/errors.py
new file mode 100644
index 0000000..6529656
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/errors.py
@@ -0,0 +1,1053 @@
+# -*- coding: utf-8 -*-
+import codecs
+import warnings
+import re
+from contextlib import contextmanager
+
+from parso.normalizer import Normalizer, NormalizerConfig, Issue, Rule
+from parso.python.tree import search_ancestor
+from parso.parser import ParserSyntaxError
+
+_BLOCK_STMTS = ('if_stmt', 'while_stmt', 'for_stmt', 'try_stmt', 'with_stmt')
+_STAR_EXPR_PARENTS = ('testlist_star_expr', 'testlist_comp', 'exprlist')
+# This is the maximal block size given by python.
+_MAX_BLOCK_SIZE = 20
+_MAX_INDENT_COUNT = 100
+ALLOWED_FUTURES = (
+    'all_feature_names', 'nested_scopes', 'generators', 'division',
+    'absolute_import', 'with_statement', 'print_function', 'unicode_literals',
+)
+
+
+def _iter_stmts(scope):
+    """
+    Iterates over all statements and splits up  simple_stmt.
+    """
+    for child in scope.children:
+        if child.type == 'simple_stmt':
+            for child2 in child.children:
+                if child2.type == 'newline' or child2 == ';':
+                    continue
+                yield child2
+        else:
+            yield child
+
+
+def _get_comprehension_type(atom):
+    first, second = atom.children[:2]
+    if second.type == 'testlist_comp' and second.children[1].type == 'comp_for':
+        if first == '[':
+            return 'list comprehension'
+        else:
+            return 'generator expression'
+    elif second.type == 'dictorsetmaker' and second.children[-1].type == 'comp_for':
+        if second.children[1] == ':':
+            return 'dict comprehension'
+        else:
+            return 'set comprehension'
+    return None
+
+
+def _is_future_import(import_from):
+    # It looks like a __future__ import that is relative is still a future
+    # import. That feels kind of odd, but whatever.
+    # if import_from.level != 0:
+        # return False
+    from_names = import_from.get_from_names()
+    return [n.value for n in from_names] == ['__future__']
+
+
+def _remove_parens(atom):
+    """
+    Returns the inner part of an expression like `(foo)`. Also removes nested
+    parens.
+    """
+    try:
+        children = atom.children
+    except AttributeError:
+        pass
+    else:
+        if len(children) == 3 and children[0] == '(':
+            return _remove_parens(atom.children[1])
+    return atom
+
+
+def _iter_params(parent_node):
+    return (n for n in parent_node.children if n.type == 'param')
+
+
+def _is_future_import_first(import_from):
+    """
+    Checks if the import is the first statement of a file.
+    """
+    found_docstring = False
+    for stmt in _iter_stmts(import_from.get_root_node()):
+        if stmt.type == 'string' and not found_docstring:
+            continue
+        found_docstring = True
+
+        if stmt == import_from:
+            return True
+        if stmt.type == 'import_from' and _is_future_import(stmt):
+            continue
+        return False
+
+
+def _iter_definition_exprs_from_lists(exprlist):
+    for child in exprlist.children[::2]:
+        if child.type == 'atom' and child.children[0] in ('(', '['):
+            testlist_comp = child.children[0]
+            if testlist_comp.type == 'testlist_comp':
+                for expr in _iter_definition_exprs_from_lists(testlist_comp):
+                    yield expr
+                continue
+            elif child.children[0] == '[':
+                yield testlist_comp
+                continue
+
+        yield child
+
+def _get_expr_stmt_definition_exprs(expr_stmt):
+    exprs = []
+    for list_ in expr_stmt.children[:-2:2]:
+        if list_.type in ('testlist_star_expr', 'testlist'):
+            exprs += _iter_definition_exprs_from_lists(list_)
+        else:
+            exprs.append(list_)
+    return exprs
+
+
+def _get_for_stmt_definition_exprs(for_stmt):
+    exprlist = for_stmt.children[1]
+    if exprlist.type != 'exprlist':
+        return [exprlist]
+    return list(_iter_definition_exprs_from_lists(exprlist))
+
+
+class _Context(object):
+    def __init__(self, node, add_syntax_error, parent_context=None):
+        self.node = node
+        self.blocks = []
+        self.parent_context = parent_context
+        self._used_name_dict = {}
+        self._global_names = []
+        self._nonlocal_names = []
+        self._nonlocal_names_in_subscopes = []
+        self._add_syntax_error = add_syntax_error
+
+    def is_async_funcdef(self):
+        # Stupidly enough async funcdefs can have two different forms,
+        # depending if a decorator is used or not.
+        return self.is_function() \
+            and self.node.parent.type in ('async_funcdef', 'async_stmt')
+
+    def is_function(self):
+        return self.node.type == 'funcdef'
+
+    def add_name(self, name):
+        parent_type = name.parent.type
+        if parent_type == 'trailer':
+            # We are only interested in first level names.
+            return
+
+        if parent_type == 'global_stmt':
+            self._global_names.append(name)
+        elif parent_type == 'nonlocal_stmt':
+            self._nonlocal_names.append(name)
+        else:
+            self._used_name_dict.setdefault(name.value, []).append(name)
+
+    def finalize(self):
+        """
+        Returns a list of nonlocal names that need to be part of that scope.
+        """
+        self._analyze_names(self._global_names, 'global')
+        self._analyze_names(self._nonlocal_names, 'nonlocal')
+
+        # Python2.6 doesn't have dict comprehensions.
+        global_name_strs = dict((n.value, n) for n in self._global_names)
+        for nonlocal_name in self._nonlocal_names:
+            try:
+                global_name = global_name_strs[nonlocal_name.value]
+            except KeyError:
+                continue
+
+            message = "name '%s' is nonlocal and global" % global_name.value
+            if global_name.start_pos < nonlocal_name.start_pos:
+                error_name = global_name
+            else:
+                error_name = nonlocal_name
+            self._add_syntax_error(error_name, message)
+
+        nonlocals_not_handled = []
+        for nonlocal_name in self._nonlocal_names_in_subscopes:
+            search = nonlocal_name.value
+            if search in global_name_strs or self.parent_context is None:
+                message = "no binding for nonlocal '%s' found" % nonlocal_name.value
+                self._add_syntax_error(nonlocal_name, message)
+            elif not self.is_function() or \
+                    nonlocal_name.value not in self._used_name_dict:
+                nonlocals_not_handled.append(nonlocal_name)
+        return self._nonlocal_names + nonlocals_not_handled
+
+    def _analyze_names(self, globals_or_nonlocals, type_):
+        def raise_(message):
+            self._add_syntax_error(base_name, message % (base_name.value, type_))
+
+        params = []
+        if self.node.type == 'funcdef':
+            params = self.node.get_params()
+
+        for base_name in globals_or_nonlocals:
+            found_global_or_nonlocal = False
+            # Somehow Python does it the reversed way.
+            for name in reversed(self._used_name_dict.get(base_name.value, [])):
+                if name.start_pos > base_name.start_pos:
+                    # All following names don't have to be checked.
+                    found_global_or_nonlocal = True
+
+                parent = name.parent
+                if parent.type == 'param' and parent.name == name:
+                    # Skip those here, these definitions belong to the next
+                    # scope.
+                    continue
+
+                if name.is_definition():
+                    if parent.type == 'expr_stmt' \
+                            and parent.children[1].type == 'annassign':
+                        if found_global_or_nonlocal:
+                            # If it's after the global the error seems to be
+                            # placed there.
+                            base_name = name
+                        raise_("annotated name '%s' can't be %s")
+                        break
+                    else:
+                        message = "name '%s' is assigned to before %s declaration"
+                else:
+                    message = "name '%s' is used prior to %s declaration"
+
+                if not found_global_or_nonlocal:
+                    raise_(message)
+                    # Only add an error for the first occurence.
+                    break
+
+            for param in params:
+                if param.name.value == base_name.value:
+                    raise_("name '%s' is parameter and %s"),
+
+    @contextmanager
+    def add_block(self, node):
+        self.blocks.append(node)
+        yield
+        self.blocks.pop()
+
+    def add_context(self, node):
+        return _Context(node, self._add_syntax_error, parent_context=self)
+
+    def close_child_context(self, child_context):
+        self._nonlocal_names_in_subscopes += child_context.finalize()
+
+
+class ErrorFinder(Normalizer):
+    """
+    Searches for errors in the syntax tree.
+    """
+    def __init__(self, *args, **kwargs):
+        super(ErrorFinder, self).__init__(*args, **kwargs)
+        self._error_dict = {}
+        self.version = self.grammar.version_info
+
+    def initialize(self, node):
+        def create_context(node):
+            if node is None:
+                return None
+
+            parent_context = create_context(node.parent)
+            if node.type in ('classdef', 'funcdef', 'file_input'):
+                return _Context(node, self._add_syntax_error, parent_context)
+            return parent_context
+
+        self.context = create_context(node) or _Context(node, self._add_syntax_error)
+        self._indentation_count = 0
+
+    def visit(self, node):
+        if node.type == 'error_node':
+            with self.visit_node(node):
+               # Don't need to investigate the inners of an error node. We
+               # might find errors in there that should be ignored, because
+               # the error node itself already shows that there's an issue.
+               return ''
+        return super(ErrorFinder, self).visit(node)
+
+
+    @contextmanager
+    def visit_node(self, node):
+        self._check_type_rules(node)
+
+        if node.type in _BLOCK_STMTS:
+            with self.context.add_block(node):
+                if len(self.context.blocks) == _MAX_BLOCK_SIZE:
+                    self._add_syntax_error(node, "too many statically nested blocks")
+                yield
+            return
+        elif node.type == 'suite':
+            self._indentation_count += 1
+            if self._indentation_count == _MAX_INDENT_COUNT:
+                self._add_indentation_error(node.children[1], "too many levels of indentation")
+
+        yield
+
+        if node.type == 'suite':
+            self._indentation_count -= 1
+        elif node.type in ('classdef', 'funcdef'):
+            context = self.context
+            self.context = context.parent_context
+            self.context.close_child_context(context)
+
+    def visit_leaf(self, leaf):
+        if leaf.type == 'error_leaf':
+            if leaf.original_type in ('indent', 'error_dedent'):
+                # Indents/Dedents itself never have a prefix. They are just
+                # "pseudo" tokens that get removed by the syntax tree later.
+                # Therefore in case of an error we also have to check for this.
+                spacing = list(leaf.get_next_leaf()._split_prefix())[-1]
+                if leaf.original_type == 'indent':
+                    message = 'unexpected indent'
+                else:
+                    message = 'unindent does not match any outer indentation level'
+                self._add_indentation_error(spacing, message)
+            else:
+                if leaf.value.startswith('\\'):
+                    message = 'unexpected character after line continuation character'
+                else:
+                    match = re.match('\\w{,2}("{1,3}|\'{1,3})', leaf.value)
+                    if match is None:
+                        message = 'invalid syntax'
+                    else:
+                        if len(match.group(1)) == 1:
+                            message = 'EOL while scanning string literal'
+                        else:
+                            message = 'EOF while scanning triple-quoted string literal'
+                self._add_syntax_error(leaf, message)
+            return ''
+        elif leaf.value == ':':
+            parent = leaf.parent
+            if parent.type in ('classdef', 'funcdef'):
+                self.context = self.context.add_context(parent)
+
+        # The rest is rule based.
+        return super(ErrorFinder, self).visit_leaf(leaf)
+
+    def _add_indentation_error(self, spacing, message):
+        self.add_issue(spacing, 903, "IndentationError: " + message)
+
+    def _add_syntax_error(self, node, message):
+        self.add_issue(node, 901, "SyntaxError: " + message)
+
+    def add_issue(self, node, code, message):
+        # Overwrite the default behavior.
+        # Check if the issues are on the same line.
+        line = node.start_pos[0]
+        args = (code, message, node)
+        self._error_dict.setdefault(line, args)
+
+    def finalize(self):
+        self.context.finalize()
+
+        for code, message, node in self._error_dict.values():
+            self.issues.append(Issue(node, code, message))
+
+
+class IndentationRule(Rule):
+    code = 903
+
+    def _get_message(self, message):
+        message = super(IndentationRule, self)._get_message(message)
+        return "IndentationError: " + message
+
+
+@ErrorFinder.register_rule(type='error_node')
+class _ExpectIndentedBlock(IndentationRule):
+    message = 'expected an indented block'
+
+    def get_node(self, node):
+        leaf = node.get_next_leaf()
+        return list(leaf._split_prefix())[-1]
+
+    def is_issue(self, node):
+        # This is the beginning of a suite that is not indented.
+        return node.children[-1].type == 'newline'
+
+
+class ErrorFinderConfig(NormalizerConfig):
+    normalizer_class = ErrorFinder
+
+
+class SyntaxRule(Rule):
+    code = 901
+
+    def _get_message(self, message):
+        message = super(SyntaxRule, self)._get_message(message)
+        return "SyntaxError: " + message
+
+
+@ErrorFinder.register_rule(type='error_node')
+class _InvalidSyntaxRule(SyntaxRule):
+    message = "invalid syntax"
+
+    def get_node(self, node):
+        return node.get_next_leaf()
+
+    def is_issue(self, node):
+        # Error leafs will be added later as an error.
+        return node.get_next_leaf().type != 'error_leaf'
+
+
+@ErrorFinder.register_rule(value='await')
+class _AwaitOutsideAsync(SyntaxRule):
+    message = "'await' outside async function"
+
+    def is_issue(self, leaf):
+        return not self._normalizer.context.is_async_funcdef()
+
+    def get_error_node(self, node):
+        # Return the whole await statement.
+        return node.parent
+
+
+@ErrorFinder.register_rule(value='break')
+class _BreakOutsideLoop(SyntaxRule):
+    message = "'break' outside loop"
+
+    def is_issue(self, leaf):
+        in_loop = False
+        for block in self._normalizer.context.blocks:
+            if block.type in ('for_stmt', 'while_stmt'):
+                in_loop = True
+        return not in_loop
+
+
+@ErrorFinder.register_rule(value='continue')
+class _ContinueChecks(SyntaxRule):
+    message = "'continue' not properly in loop"
+    message_in_finally = "'continue' not supported inside 'finally' clause"
+
+    def is_issue(self, leaf):
+        in_loop = False
+        for block in self._normalizer.context.blocks:
+            if block.type in ('for_stmt', 'while_stmt'):
+                in_loop = True
+            if block.type == 'try_stmt':
+                last_block = block.children[-3]
+                if last_block == 'finally' and leaf.start_pos > last_block.start_pos:
+                    self.add_issue(leaf, message=self.message_in_finally)
+                    return False  # Error already added
+        if not in_loop:
+            return True
+
+
+@ErrorFinder.register_rule(value='from')
+class _YieldFromCheck(SyntaxRule):
+    message = "'yield from' inside async function"
+
+    def get_node(self, leaf):
+        return leaf.parent.parent  # This is the actual yield statement.
+
+    def is_issue(self, leaf):
+        return leaf.parent.type == 'yield_arg' \
+                and self._normalizer.context.is_async_funcdef()
+
+
+@ErrorFinder.register_rule(type='name')
+class _NameChecks(SyntaxRule):
+    message = 'cannot assign to __debug__'
+    message_keyword = 'assignment to keyword'
+    message_none = 'cannot assign to None'
+
+    def is_issue(self, leaf):
+        self._normalizer.context.add_name(leaf)
+
+        if leaf.value == '__debug__' and leaf.is_definition():
+            if self._normalizer.version < (3, 0):
+                return True
+            else:
+                self.add_issue(leaf, message=self.message_keyword)
+        if leaf.value == 'None' and self._normalizer.version < (3, 0) \
+                and leaf.is_definition():
+            self.add_issue(leaf, message=self.message_none)
+
+
+@ErrorFinder.register_rule(type='string')
+class _StringChecks(SyntaxRule):
+    message = "bytes can only contain ASCII literal characters."
+
+    def is_issue(self, leaf):
+            string_prefix = leaf.string_prefix.lower()
+            if 'b' in string_prefix \
+                    and self._normalizer.version >= (3, 0) \
+                    and any(c for c in leaf.value if ord(c) > 127):
+                # b'ä'
+                return True
+
+            if 'r' not in string_prefix:
+                # Raw strings don't need to be checked if they have proper
+                # escaping.
+                is_bytes = self._normalizer.version < (3, 0)
+                if 'b' in string_prefix:
+                    is_bytes = True
+                if 'u' in string_prefix:
+                    is_bytes = False
+
+                payload = leaf._get_payload()
+                if is_bytes:
+                    payload = payload.encode('utf-8')
+                    func = codecs.escape_decode
+                else:
+                    func = codecs.unicode_escape_decode
+
+                try:
+                    with warnings.catch_warnings():
+                        # The warnings from parsing strings are not relevant.
+                        warnings.filterwarnings('ignore')
+                        func(payload)
+                except UnicodeDecodeError as e:
+                    self.add_issue(leaf, message='(unicode error) ' + str(e))
+                except ValueError as e:
+                    self.add_issue(leaf, message='(value error) ' + str(e))
+
+
+@ErrorFinder.register_rule(value='*')
+class _StarCheck(SyntaxRule):
+    message = "named arguments must follow bare *"
+
+    def is_issue(self, leaf):
+        params = leaf.parent
+        if params.type == 'parameters' and params:
+            after = params.children[params.children.index(leaf) + 1:]
+            after = [child for child in after
+                     if child not in (',', ')') and not child.star_count]
+            return len(after) == 0
+
+
+@ErrorFinder.register_rule(value='**')
+class _StarStarCheck(SyntaxRule):
+    # e.g. {**{} for a in [1]}
+    # TODO this should probably get a better end_pos including
+    #      the next sibling of leaf.
+    message = "dict unpacking cannot be used in dict comprehension"
+
+    def is_issue(self, leaf):
+        if leaf.parent.type == 'dictorsetmaker':
+            comp_for = leaf.get_next_sibling().get_next_sibling()
+            return comp_for is not None and comp_for.type == 'comp_for'
+
+
+@ErrorFinder.register_rule(value='yield')
+@ErrorFinder.register_rule(value='return')
+class _ReturnAndYieldChecks(SyntaxRule):
+    message = "'return' with value in async generator"
+    message_async_yield = "'yield' inside async function"
+
+    def get_node(self, leaf):
+        return leaf.parent
+
+    def is_issue(self, leaf):
+        if self._normalizer.context.node.type != 'funcdef':
+            self.add_issue(self.get_node(leaf), message="'%s' outside function" % leaf.value)
+        elif self._normalizer.context.is_async_funcdef() \
+                and any(self._normalizer.context.node.iter_yield_exprs()):
+            if leaf.value == 'return' and leaf.parent.type == 'return_stmt':
+                return True
+            elif leaf.value == 'yield' \
+                    and leaf.get_next_leaf() != 'from' \
+                    and self._normalizer.version == (3, 5):
+                self.add_issue(self.get_node(leaf), message=self.message_async_yield)
+
+@ErrorFinder.register_rule(type='atom')
+class _BytesAndStringMix(SyntaxRule):
+    # e.g. 's' b''
+    message = "cannot mix bytes and nonbytes literals"
+
+    def _is_bytes_literal(self, string):
+        return 'b' in string.string_prefix.lower()
+
+    def is_issue(self, node):
+        first = node.children[0]
+        if first.type == 'string' and self._normalizer.version >= (3, 0):
+            first_is_bytes = self._is_bytes_literal(first)
+            for string in node.children[1:]:
+                if first_is_bytes != self._is_bytes_literal(string):
+                    return True
+
+
+@ErrorFinder.register_rule(type='import_as_names')
+class _TrailingImportComma(SyntaxRule):
+    # e.g. from foo import a,
+    message = "trailing comma not allowed without surrounding parentheses"
+
+    def is_issue(self, node):
+        if node.children[-1] == ',':
+            return True
+
+
+@ErrorFinder.register_rule(type='import_from')
+class _ImportStarInFunction(SyntaxRule):
+    message = "import * only allowed at module level"
+
+    def is_issue(self, node):
+        return node.is_star_import() and self._normalizer.context.parent_context is not None
+
+
+@ErrorFinder.register_rule(type='import_from')
+class _FutureImportRule(SyntaxRule):
+    message = "from __future__ imports must occur at the beginning of the file"
+
+    def is_issue(self, node):
+        if _is_future_import(node):
+            if not _is_future_import_first(node):
+                return True
+
+            for from_name, future_name in node.get_paths():
+                name = future_name.value
+                allowed_futures = list(ALLOWED_FUTURES)
+                if self._normalizer.version >= (3, 5):
+                    allowed_futures.append('generator_stop')
+
+                if name == 'braces':
+                    self.add_issue(node, message = "not a chance")
+                elif name == 'barry_as_FLUFL':
+                    m = "Seriously I'm not implementing this :) ~ Dave"
+                    self.add_issue(node, message=m)
+                elif name not in ALLOWED_FUTURES:
+                    message = "future feature %s is not defined" % name
+                    self.add_issue(node, message=message)
+
+
+@ErrorFinder.register_rule(type='star_expr')
+class _StarExprRule(SyntaxRule):
+    message = "starred assignment target must be in a list or tuple"
+    message_iterable_unpacking = "iterable unpacking cannot be used in comprehension"
+    message_assignment = "can use starred expression only as assignment target"
+
+    def is_issue(self, node):
+        if node.parent.type not in _STAR_EXPR_PARENTS:
+            return True
+        if node.parent.type == 'testlist_comp':
+            # [*[] for a in [1]]
+            if node.parent.children[1].type == 'comp_for':
+                self.add_issue(node, message=self.message_iterable_unpacking)
+        if self._normalizer.version <= (3, 4):
+            n = search_ancestor(node, 'for_stmt', 'expr_stmt')
+            found_definition = False
+            if n is not None:
+                if n.type == 'expr_stmt':
+                    exprs = _get_expr_stmt_definition_exprs(n)
+                else:
+                    exprs = _get_for_stmt_definition_exprs(n)
+                if node in exprs:
+                    found_definition = True
+
+            if not found_definition:
+                self.add_issue(node, message=self.message_assignment)
+
+
+@ErrorFinder.register_rule(types=_STAR_EXPR_PARENTS)
+class _StarExprParentRule(SyntaxRule):
+    def is_issue(self, node):
+        if node.parent.type == 'del_stmt':
+            self.add_issue(node.parent, message="can't use starred expression here")
+        else:
+            def is_definition(node, ancestor):
+                if ancestor is None:
+                    return False
+
+                type_ = ancestor.type
+                if type_ == 'trailer':
+                    return False
+
+                if type_ == 'expr_stmt':
+                    return node.start_pos < ancestor.children[-1].start_pos
+
+                return is_definition(node, ancestor.parent)
+
+            if is_definition(node, node.parent):
+                args = [c for c in node.children if c != ',']
+                starred = [c for c in args if c.type == 'star_expr']
+                if len(starred) > 1:
+                    message = "two starred expressions in assignment"
+                    self.add_issue(starred[1], message=message)
+                elif starred:
+                    count = args.index(starred[0])
+                    if count >= 256:
+                        message = "too many expressions in star-unpacking assignment"
+                        self.add_issue(starred[0], message=message)
+
+
+@ErrorFinder.register_rule(type='annassign')
+class _AnnotatorRule(SyntaxRule):
+    # True: int
+    # {}: float
+    message = "illegal target for annotation"
+
+    def get_node(self, node):
+        return node.parent
+
+    def is_issue(self, node):
+        type_ = None
+        lhs = node.parent.children[0]
+        lhs = _remove_parens(lhs)
+        try:
+            children = lhs.children
+        except AttributeError:
+            pass
+        else:
+            if ',' in children or lhs.type == 'atom' and children[0] == '(':
+                type_ = 'tuple'
+            elif lhs.type == 'atom' and children[0] == '[':
+                type_ = 'list'
+            trailer = children[-1]
+
+        if type_ is None:
+            if not (lhs.type == 'name'
+                    # subscript/attributes are allowed
+                    or lhs.type in ('atom_expr', 'power')
+                        and trailer.type == 'trailer'
+                        and trailer.children[0] != '('):
+                return True
+        else:
+            # x, y: str
+            message = "only single target (not %s) can be annotated"
+            self.add_issue(lhs.parent, message=message % type_)
+
+
+@ErrorFinder.register_rule(type='argument')
+class _ArgumentRule(SyntaxRule):
+    def is_issue(self, node):
+        first = node.children[0]
+        if node.children[1] == '=' and first.type != 'name':
+            if first.type == 'lambdef':
+                # f(lambda: 1=1)
+                message = "lambda cannot contain assignment"
+            else:
+                # f(+x=1)
+                message = "keyword can't be an expression"
+            self.add_issue(first, message=message)
+
+
+@ErrorFinder.register_rule(type='nonlocal_stmt')
+class _NonlocalModuleLevelRule(SyntaxRule):
+    message = "nonlocal declaration not allowed at module level"
+
+    def is_issue(self, node):
+        return self._normalizer.context.parent_context is None
+
+
+@ErrorFinder.register_rule(type='arglist')
+class _ArglistRule(SyntaxRule):
+    message = "Generator expression must be parenthesized if not sole argument"
+
+    def is_issue(self, node):
+        first_arg = node.children[0]
+        if first_arg.type == 'argument' \
+                and first_arg.children[1].type == 'comp_for':
+            # e.g. foo(x for x in [], b)
+            return len(node.children) >= 2
+        else:
+            arg_set = set()
+            kw_only = False
+            kw_unpacking_only = False
+            is_old_starred = False
+            # In python 3 this would be a bit easier (stars are part of
+            # argument), but we have to understand both.
+            for argument in node.children:
+                if argument == ',':
+                    continue
+
+                if argument in ('*', '**'):
+                    # Python < 3.5 has the order engraved in the grammar
+                    # file.  No need to do anything here.
+                    is_old_starred = True
+                    continue
+                if is_old_starred:
+                    is_old_starred = False
+                    continue
+
+                if argument.type == 'argument':
+                    first = argument.children[0]
+                    if first in ('*', '**'):
+                        if first == '*':
+                            if kw_unpacking_only:
+                                # foo(**kwargs, *args)
+                                message = "iterable argument unpacking follows keyword argument unpacking"
+                                self.add_issue(argument, message=message)
+                        else:
+                            kw_unpacking_only = True
+                    else:  # Is a keyword argument.
+                        kw_only = True
+                        if first.type == 'name':
+                            if first.value in arg_set:
+                                # f(x=1, x=2)
+                                self.add_issue(first, message="keyword argument repeated")
+                            else:
+                                arg_set.add(first.value)
+                else:
+                    if kw_unpacking_only:
+                        # f(**x, y)
+                        message = "positional argument follows keyword argument unpacking"
+                        self.add_issue(argument, message=message)
+                    elif kw_only:
+                        # f(x=2, y)
+                        message = "positional argument follows keyword argument"
+                        self.add_issue(argument, message=message)
+
+@ErrorFinder.register_rule(type='parameters')
+@ErrorFinder.register_rule(type='lambdef')
+class _ParameterRule(SyntaxRule):
+    # def f(x=3, y): pass
+    message = "non-default argument follows default argument"
+
+    def is_issue(self, node):
+        param_names = set()
+        default_only = False
+        for p in _iter_params(node):
+            if p.name.value in param_names:
+                message = "duplicate argument '%s' in function definition"
+                self.add_issue(p.name, message=message % p.name.value)
+            param_names.add(p.name.value)
+
+            if p.default is None and not p.star_count:
+                if default_only:
+                    return True
+            else:
+                default_only = True
+
+
+@ErrorFinder.register_rule(type='try_stmt')
+class _TryStmtRule(SyntaxRule):
+    message = "default 'except:' must be last"
+
+    def is_issue(self, try_stmt):
+        default_except = None
+        for except_clause in try_stmt.children[3::3]:
+            if except_clause in ('else', 'finally'):
+                break
+            if except_clause == 'except':
+                default_except = except_clause
+            elif default_except is not None:
+                self.add_issue(default_except, message=self.message)
+
+
+@ErrorFinder.register_rule(type='string')
+class _FStringRule(SyntaxRule):
+    _fstring_grammar = None
+    message_empty = "f-string: empty expression not allowed"  # f'{}'
+    message_single_closing = "f-string: single '}' is not allowed"  # f'}'
+    message_nested = "f-string: expressions nested too deeply"
+    message_backslash = "f-string expression part cannot include a backslash"  # f'{"\"}' or f'{"\\"}'
+    message_comment = "f-string expression part cannot include '#'"  # f'{#}'
+    message_unterminated_string = "f-string: unterminated string"  # f'{"}'
+    message_conversion = "f-string: invalid conversion character: expected 's', 'r', or 'a'"
+    message_incomplete = "f-string: expecting '}'"  # f'{'
+    message_syntax = "invalid syntax"
+
+    @classmethod
+    def _load_grammar(cls):
+        import parso
+
+        if cls._fstring_grammar is None:
+            cls._fstring_grammar = parso.load_grammar(language='python-f-string')
+        return cls._fstring_grammar
+
+    def is_issue(self, fstring):
+        if 'f' not in fstring.string_prefix.lower():
+            return
+
+        parsed = self._load_grammar().parse_leaf(fstring)
+        for child in parsed.children:
+            if child.type == 'expression':
+                self._check_expression(child)
+            elif child.type == 'error_node':
+                next_ = child.get_next_leaf()
+                if next_.type == 'error_leaf' and next_.original_type == 'unterminated_string':
+                    self.add_issue(next_, message=self.message_unterminated_string)
+                    # At this point nothing more is comming except the error
+                    # leaf that we've already checked here.
+                    break
+                self.add_issue(child, message=self.message_incomplete)
+            elif child.type == 'error_leaf':
+                self.add_issue(child, message=self.message_single_closing)
+
+    def _check_python_expr(self, python_expr):
+        value = python_expr.value
+        if '\\' in value:
+            self.add_issue(python_expr, message=self.message_backslash)
+            return
+        if '#' in value:
+            self.add_issue(python_expr, message=self.message_comment)
+            return
+        if re.match('\s*$', value) is not None:
+            self.add_issue(python_expr, message=self.message_empty)
+            return
+
+        # This is now nested parsing. We parsed the fstring and now
+        # we're parsing Python again.
+        try:
+            # CPython has a bit of a special ways to parse Python code within
+            # f-strings. It wraps the code in brackets to make sure that
+            # whitespace doesn't make problems (indentation/newlines).
+            # Just use that algorithm as well here and adapt start positions.
+            start_pos = python_expr.start_pos
+            start_pos = start_pos[0], start_pos[1] - 1
+            eval_input = self._normalizer.grammar._parse(
+                '(%s)' % value,
+                start_symbol='eval_input',
+                start_pos=start_pos,
+                error_recovery=False
+            )
+        except ParserSyntaxError as e:
+            self.add_issue(e.error_leaf, message=self.message_syntax)
+            return
+
+        issues = self._normalizer.grammar.iter_errors(eval_input)
+        self._normalizer.issues += issues
+
+    def _check_format_spec(self, format_spec):
+        for expression in format_spec.children[1:]:
+            nested_format_spec = expression.children[-2]
+            if nested_format_spec.type == 'format_spec':
+                if len(nested_format_spec.children) > 1:
+                    self.add_issue(
+                        nested_format_spec.children[1],
+                        message=self.message_nested
+                    )
+
+            self._check_expression(expression)
+
+    def _check_expression(self, expression):
+        for c in expression.children:
+            if c.type == 'python_expr':
+                self._check_python_expr(c)
+            elif c.type == 'conversion':
+                if c.value not in ('s', 'r', 'a'):
+                    self.add_issue(c, message=self.message_conversion)
+            elif c.type == 'format_spec':
+                self._check_format_spec(c)
+
+
+class _CheckAssignmentRule(SyntaxRule):
+    def _check_assignment(self, node, is_deletion=False):
+        error = None
+        type_ = node.type
+        if type_ == 'lambdef':
+            error = 'lambda'
+        elif type_ == 'atom':
+            first, second = node.children[:2]
+            error = _get_comprehension_type(node)
+            if error is None:
+                if second.type in ('dictorsetmaker', 'string'):
+                    error = 'literal'
+                elif first in ('(', '['):
+                    if second.type == 'yield_expr':
+                        error = 'yield expression'
+                    elif second.type == 'testlist_comp':
+                        # This is not a comprehension, they were handled
+                        # further above.
+                        for child in second.children[::2]:
+                            self._check_assignment(child, is_deletion)
+                    else:  # Everything handled, must be useless brackets.
+                        self._check_assignment(second, is_deletion)
+        elif type_ == 'keyword':
+            error = 'keyword'
+        elif type_ == 'operator':
+            if node.value == '...':
+                error = 'Ellipsis'
+        elif type_ == 'comparison':
+            error = 'comparison'
+        elif type_ in ('string', 'number'):
+            error = 'literal'
+        elif type_ == 'yield_expr':
+            # This one seems to be a slightly different warning in Python.
+            message = 'assignment to yield expression not possible'
+            self.add_issue(node, message=message)
+        elif type_ == 'test':
+            error = 'conditional expression'
+        elif type_ in ('atom_expr', 'power'):
+            if node.children[0] == 'await':
+                error = 'await expression'
+            elif node.children[-2] == '**':
+                error = 'operator'
+            else:
+                # Has a trailer
+                trailer = node.children[-1]
+                assert trailer.type == 'trailer'
+                if trailer.children[0] == '(':
+                    error = 'function call'
+        elif type_ in ('testlist_star_expr', 'exprlist', 'testlist'):
+            for child in node.children[::2]:
+                self._check_assignment(child, is_deletion)
+        elif ('expr' in type_ and type_ != 'star_expr' # is a substring
+              or '_test' in type_
+              or type_ in ('term', 'factor')):
+            error = 'operator'
+
+        if error is not None:
+            message = "can't %s %s" % ("delete" if is_deletion else "assign to", error)
+            self.add_issue(node, message=message)
+
+
+@ErrorFinder.register_rule(type='comp_for')
+class _CompForRule(_CheckAssignmentRule):
+    message = "asynchronous comprehension outside of an asynchronous function"
+
+    def is_issue(self, node):
+        # Some of the nodes here are already used, so no else if
+        expr_list = node.children[1 + int(node.children[0] == 'async')]
+        if expr_list.type != 'expr_list':  # Already handled.
+            self._check_assignment(expr_list)
+
+        return node.children[0] == 'async' \
+            and not self._normalizer.context.is_async_funcdef()
+
+
+@ErrorFinder.register_rule(type='expr_stmt')
+class _ExprStmtRule(_CheckAssignmentRule):
+    message = "illegal expression for augmented assignment"
+
+    def is_issue(self, node):
+        for before_equal in node.children[:-2:2]:
+            self._check_assignment(before_equal)
+
+        augassign = node.children[1]
+        if augassign != '=' and augassign.type != 'annassign':  # Is augassign.
+            return node.children[0].type in ('testlist_star_expr', 'atom', 'testlist')
+
+
+@ErrorFinder.register_rule(type='with_item')
+class _WithItemRule(_CheckAssignmentRule):
+    def is_issue(self, with_item):
+        self._check_assignment(with_item.children[2])
+
+
+@ErrorFinder.register_rule(type='del_stmt')
+class _DelStmtRule(_CheckAssignmentRule):
+    def is_issue(self, del_stmt):
+        child = del_stmt.children[1]
+
+        if child.type != 'expr_list':  # Already handled.
+            self._check_assignment(child, is_deletion=True)
+
+
+@ErrorFinder.register_rule(type='expr_list')
+class _ExprListRule(_CheckAssignmentRule):
+    def is_issue(self, expr_list):
+        for expr in expr_list.children[::2]:
+            self._check_assignment(expr)
+
+
+@ErrorFinder.register_rule(type='for_stmt')
+class _ForStmtRule(_CheckAssignmentRule):
+    def is_issue(self, for_stmt):
+        # Some of the nodes here are already used, so no else if
+        expr_list = for_stmt.children[1]
+        if expr_list.type != 'expr_list':  # Already handled.
+            self._check_assignment(expr_list)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/fstring.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/fstring.py
new file mode 100644
index 0000000..a8fe7b4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/fstring.py
@@ -0,0 +1,211 @@
+import re
+
+from itertools import count
+from parso.utils import PythonVersionInfo
+from parso.utils import split_lines
+from parso.python.tokenize import Token
+from parso import parser
+from parso.tree import TypedLeaf, ErrorNode, ErrorLeaf
+
+version36 = PythonVersionInfo(3, 6)
+
+
+class TokenNamespace:
+    _c = count()
+    LBRACE = next(_c)
+    RBRACE = next(_c)
+    ENDMARKER = next(_c)
+    COLON = next(_c)
+    CONVERSION = next(_c)
+    PYTHON_EXPR = next(_c)
+    EXCLAMATION_MARK = next(_c)
+    UNTERMINATED_STRING = next(_c)
+
+    token_map = dict((v, k) for k, v in locals().items() if not k.startswith('_'))
+
+    @classmethod
+    def generate_token_id(cls, string):
+        if string == '{':
+            return cls.LBRACE
+        elif string == '}':
+            return cls.RBRACE
+        elif string == '!':
+            return cls.EXCLAMATION_MARK
+        elif string == ':':
+            return cls.COLON
+        return getattr(cls, string)
+
+
+GRAMMAR = """
+fstring: expression* ENDMARKER
+format_spec: ':' expression*
+expression: '{' PYTHON_EXPR [ '!' CONVERSION ] [ format_spec ] '}'
+"""
+
+_prefix = r'((?:[^{}]+)*)'
+_expr = _prefix + r'(\{|\}|$)'
+_in_expr = r'([^{}\[\]:"\'!]*)(.?)'
+# There's only one conversion character allowed. But the rules have to be
+# checked later anyway, so allow more here. This makes error recovery nicer.
+_conversion = r'([^={}:]*)(.?)'
+
+_compiled_expr = re.compile(_expr)
+_compiled_in_expr = re.compile(_in_expr)
+_compiled_conversion = re.compile(_conversion)
+
+
+def tokenize(code, start_pos=(1, 0)):
+    def add_to_pos(string):
+        lines = split_lines(string)
+        l = len(lines[-1])
+        if len(lines) > 1:
+            start_pos[0] += len(lines) - 1
+            start_pos[1] = l
+        else:
+            start_pos[1] += l
+
+    def tok(value, type=None, prefix=''):
+        if type is None:
+            type = TokenNamespace.generate_token_id(value)
+
+        add_to_pos(prefix)
+        token = Token(type, value, tuple(start_pos), prefix)
+        add_to_pos(value)
+        return token
+
+    start = 0
+    recursion_level = 0
+    added_prefix = ''
+    start_pos = list(start_pos)
+    while True:
+        match = _compiled_expr.match(code, start)
+        prefix = added_prefix + match.group(1)
+        found = match.group(2)
+        start = match.end()
+        if not found:
+            # We're at the end.
+            break
+
+        if found == '}':
+            if recursion_level == 0 and len(code) > start  and code[start] == '}':
+                # This is a }} escape.
+                added_prefix = prefix + '}}'
+                start += 1
+                continue
+
+            recursion_level = max(0, recursion_level - 1)
+            yield tok(found, prefix=prefix)
+            added_prefix = ''
+        else:
+            assert found == '{'
+            if recursion_level == 0 and len(code) > start and code[start] == '{':
+                # This is a {{ escape.
+                added_prefix = prefix + '{{'
+                start += 1
+                continue
+
+            recursion_level += 1
+            yield tok(found, prefix=prefix)
+            added_prefix = ''
+
+            expression = ''
+            squared_count = 0
+            curly_count = 0
+            while True:
+                expr_match = _compiled_in_expr.match(code, start)
+                expression += expr_match.group(1)
+                found = expr_match.group(2)
+                start = expr_match.end()
+
+                if found == '{':
+                    curly_count += 1
+                    expression += found
+                elif found == '}' and curly_count > 0:
+                    curly_count -= 1
+                    expression += found
+                elif found == '[':
+                    squared_count += 1
+                    expression += found
+                elif found == ']':
+                    # Use a max function here, because the Python code might
+                    # just have syntax errors.
+                    squared_count = max(0, squared_count - 1)
+                    expression += found
+                elif found == ':' and (squared_count or curly_count):
+                    expression += found
+                elif found in ('"', "'"):
+                    search = found
+                    if len(code) > start + 1 and  \
+                            code[start] == found == code[start+1]:
+                        search *= 3
+                        start += 2
+
+                    index = code.find(search, start)
+                    if index == -1:
+                        yield tok(expression, type=TokenNamespace.PYTHON_EXPR)
+                        yield tok(
+                            found + code[start:],
+                            type=TokenNamespace.UNTERMINATED_STRING,
+                        )
+                        start = len(code)
+                        break
+                    expression += found + code[start:index+1]
+                    start = index + 1
+                elif found == '!' and len(code) > start and code[start] == '=':
+                    # This is a python `!=` and not a conversion.
+                    expression += found
+                else:
+                    yield tok(expression, type=TokenNamespace.PYTHON_EXPR)
+                    if found:
+                        yield tok(found)
+                    break
+
+            if found == '!':
+                conversion_match = _compiled_conversion.match(code, start)
+                found = conversion_match.group(2)
+                start = conversion_match.end()
+                yield tok(conversion_match.group(1), type=TokenNamespace.CONVERSION)
+                if found:
+                    yield tok(found)
+            if found == '}':
+                recursion_level -= 1
+
+            # We don't need to handle everything after ':', because that is
+            # basically new tokens.
+
+    yield tok('', type=TokenNamespace.ENDMARKER, prefix=prefix)
+
+
+class Parser(parser.BaseParser):
+    def parse(self, tokens):
+        node = super(Parser, self).parse(tokens)
+        if isinstance(node, self.default_leaf):  # Is an endmarker.
+            # If there's no curly braces we get back a non-module. We always
+            # want an fstring.
+            node = self.default_node('fstring', [node])
+
+        return node
+
+    def convert_leaf(self, pgen_grammar, type, value, prefix, start_pos):
+        # TODO this is so ugly.
+        leaf_type = TokenNamespace.token_map[type].lower()
+        return TypedLeaf(leaf_type, value, start_pos, prefix)
+
+    def error_recovery(self, pgen_grammar, stack, arcs, typ, value, start_pos, prefix,
+                       add_token_callback):
+        if not self._error_recovery:
+            return super(Parser, self).error_recovery(
+                pgen_grammar, stack, arcs, typ, value, start_pos, prefix,
+                add_token_callback
+            )
+
+        token_type = TokenNamespace.token_map[typ].lower()
+        if len(stack) == 1:
+            error_leaf = ErrorLeaf(token_type, value, start_pos, prefix)
+            stack[0][2][1].append(error_leaf)
+        else:
+            dfa, state, (type_, nodes) = stack[1]
+            stack[0][2][1].append(ErrorNode(nodes))
+            stack[1:] = []
+
+            add_token_callback(typ, value, start_pos, prefix)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar26.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar26.txt
new file mode 100644
index 0000000..b972a41
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar26.txt
@@ -0,0 +1,158 @@
+# 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"
+
+# Commands for Kees Blom's railroad program
+#diagram:token NAME
+#diagram:token NUMBER
+#diagram:token STRING
+#diagram:token NEWLINE
+#diagram:token ENDMARKER
+#diagram:token INDENT
+#diagram:output\input python.bla
+#diagram:token DEDENT
+#diagram:output\textwidth 20.04cm\oddsidemargin  0.0cm\evensidemargin 0.0cm
+#diagram:rules
+
+# 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() and input() functions.
+# NB: compound_stmt in single_input is followed by extra NEWLINE!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+eval_input: testlist NEWLINE* ENDMARKER
+
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef)
+funcdef: 'def' NAME parameters ':' suite
+parameters: '(' [varargslist] ')'
+varargslist: ((fpdef ['=' test] ',')*
+              ('*' NAME [',' '**' NAME] | '**' NAME) |
+              fpdef ['=' test] (',' fpdef ['=' test])* [','])
+fpdef: NAME | '(' fplist ')'
+fplist: fpdef (',' fpdef)* [',']
+
+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 (augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist))*)
+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
+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 ':' suite
+# Dave: Python2.6 actually defines a little bit of a different label called
+#       'with_var'. However in 2.7+ this is the default. Apply it for
+#       consistency reasons.
+with_item: test ['as' expr]
+# NB compile.c makes sure that the default except clause is last
+except_clause: 'except' [test [('as' | ',') test]]
+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'
+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] ')' |
+       '[' [listmaker] ']' |
+       '{' [dictorsetmaker] '}' |
+       '`' testlist1 '`' |
+       NAME | NUMBER | STRING+)
+listmaker: test ( list_for | (',' test)* [','] )
+# Dave: Renamed testlist_gexpr to testlist_comp, because in 2.7+ this is the
+#       default. It's more consistent like this.
+testlist_comp: test ( gen_for | (',' test)* [','] )
+lambdef: 'lambda' [varargslist] ':' test
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: expr (',' expr)* [',']
+testlist: test (',' test)* [',']
+# Dave: Rename from dictmaker to dictorsetmaker, because this is more
+#       consistent with the following grammars.
+dictorsetmaker: test ':' test (',' test ':' test)* [',']
+
+classdef: 'class' NAME ['(' [testlist] ')'] ':' suite
+
+arglist: (argument ',')* (argument [',']
+                         |'*' test (',' argument)* [',' '**' test] 
+                         |'**' test)
+argument: test [gen_for] | test '=' test  # Really [keyword '='] test
+
+list_iter: list_for | list_if
+list_for: 'for' exprlist 'in' testlist_safe [list_iter]
+list_if: 'if' old_test [list_iter]
+
+gen_iter: gen_for | gen_if
+gen_for: 'for' exprlist 'in' or_test [gen_iter]
+gen_if: 'if' old_test [gen_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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar27.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar27.txt
new file mode 100644
index 0000000..4c3f33d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar27.txt
@@ -0,0 +1,142 @@
+# 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() and input() functions.
+# NB: compound_stmt in single_input is followed by extra NEWLINE!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+eval_input: testlist NEWLINE* ENDMARKER
+
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef)
+funcdef: 'def' NAME parameters ':' suite
+parameters: '(' [varargslist] ')'
+varargslist: ((fpdef ['=' test] ',')*
+              ('*' NAME [',' '**' NAME] | '**' NAME) |
+              fpdef ['=' test] (',' fpdef ['=' test])* [','])
+fpdef: NAME | '(' fplist ')'
+fplist: fpdef (',' fpdef)* [',']
+
+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 (augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist))*)
+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
+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]
+# NB compile.c makes sure that the default except clause is last
+except_clause: 'except' [test [('as' | ',') test]]
+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'
+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] ')' |
+       '[' [listmaker] ']' |
+       '{' [dictorsetmaker] '}' |
+       '`' testlist1 '`' |
+       NAME | NUMBER | STRING+)
+listmaker: test ( list_for | (',' test)* [','] )
+testlist_comp: test ( comp_for | (',' test)* [','] )
+lambdef: 'lambda' [varargslist] ':' test
+trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
+subscriptlist: subscript (',' subscript)* [',']
+subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
+sliceop: ':' [test]
+exprlist: expr (',' expr)* [',']
+testlist: test (',' test)* [',']
+dictorsetmaker: ( (test ':' test (comp_for | (',' test ':' test)* [','])) |
+                  (test (comp_for | (',' test)* [','])) )
+
+classdef: 'class' NAME ['(' [testlist] ')'] ':' 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
+
+list_iter: list_for | list_if
+list_for: 'for' exprlist 'in' testlist_safe [list_iter]
+list_if: 'if' old_test [list_iter]
+
+comp_iter: comp_for | comp_if
+comp_for: 'for' exprlist 'in' or_test [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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar33.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar33.txt
new file mode 100644
index 0000000..d7aaffd
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar33.txt
@@ -0,0 +1,133 @@
+# 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!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+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]]
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar34.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar34.txt
new file mode 100644
index 0000000..05c3181
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar34.txt
@@ -0,0 +1,133 @@
+# 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!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+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]]
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar35.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar35.txt
new file mode 100644
index 0000000..c38217f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar35.txt
@@ -0,0 +1,152 @@
+# 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!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+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]]
+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) arguments 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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar36.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar36.txt
new file mode 100644
index 0000000..e76147e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar36.txt
@@ -0,0 +1,150 @@
+# Grammar for Python
+
+# 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!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+eval_input: testlist NEWLINE* ENDMARKER
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef | async_funcdef)
+
+# NOTE: Francisco Souza/Reinoud Elhorst, using ASYNC/'await' keywords instead of
+# 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 (annassign | augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist_star_expr))*)
+annassign: ':' test ['=' test]
+testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+            '<<=' | '>>=' | '**=' | '//=')
+# For normal and annotated 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]]
+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) arguments 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: ['async'] '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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar37.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar37.txt
new file mode 100644
index 0000000..e76147e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/grammar37.txt
@@ -0,0 +1,150 @@
+# Grammar for Python
+
+# 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!
+single_input: NEWLINE | simple_stmt | compound_stmt NEWLINE
+file_input: (NEWLINE | stmt)* ENDMARKER
+eval_input: testlist NEWLINE* ENDMARKER
+decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE
+decorators: decorator+
+decorated: decorators (classdef | funcdef | async_funcdef)
+
+# NOTE: Francisco Souza/Reinoud Elhorst, using ASYNC/'await' keywords instead of
+# 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 (annassign | augassign (yield_expr|testlist) |
+                     ('=' (yield_expr|testlist_star_expr))*)
+annassign: ':' test ['=' test]
+testlist_star_expr: (test|star_expr) (',' (test|star_expr))* [',']
+augassign: ('+=' | '-=' | '*=' | '@=' | '/=' | '%=' | '&=' | '|=' | '^=' |
+            '<<=' | '>>=' | '**=' | '//=')
+# For normal and annotated 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]]
+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) arguments 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: ['async'] '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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/issue_list.txt b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/issue_list.txt
new file mode 100644
index 0000000..e5e2c9d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/issue_list.txt
@@ -0,0 +1,176 @@
+A list of syntax/indentation errors I've encountered in CPython.
+
+# Python/compile.c
+    "'continue' not properly in loop"
+    "'continue' not supported inside 'finally' clause"  # Until loop
+    "default 'except:' must be last"
+    "from __future__ imports must occur at the beginning of the file"
+    "'return' outside function"
+    "'return' with value in async generator"
+    "'break' outside loop"
+    "two starred expressions in assignment"
+    "asynchronous comprehension outside of an asynchronous function"
+    "'yield' outside function"  # For both yield and yield from
+    "'yield from' inside async function"
+    "'await' outside function"
+    "'await' outside async function"
+    "starred assignment target must be in a list or tuple"
+    "can't use starred expression here"
+    "too many statically nested blocks"  # Max. 20
+    # This is one of the few places in the cpython code base that I really
+    # don't understand. It feels a bit hacky if you look at the implementation
+    # of UNPACK_EX.
+    "too many expressions in star-unpacking assignment"
+
+    # Just ignore this one, newer versions will not be affected anymore and
+    # it's a limit of 2^16 - 1.
+    "too many annotations" # Only python 3.0 - 3.5, 3.6 is not affected.
+
+# Python/ast.c
+    # used with_item exprlist expr_stmt
+    "can't %s %s" % ("assign to" or "delete",
+            "lambda"
+            "function call"  # foo()
+            "generator expression"
+            "list comprehension"
+            "set comprehension"
+            "dict comprehension"
+            "keyword"
+            "Ellipsis"
+            "comparison"
+        Dict: Set: Num: Str: Bytes: JoinedStr: FormattedValue:
+            "literal"
+        BoolOp: BinOp: UnaryOp:
+            "operator"
+        Yield: YieldFrom:
+            "yield expression"
+        Await:
+            "await expression"
+        IfExp:
+            "conditional expression"
+    "assignment to keyword"  # (keywords + __debug__)  # None = 2
+    "named arguments must follow bare *"  # def foo(*): pass
+    "non-default argument follows default argument" # def f(x=3, y): pass
+    "iterable unpacking cannot be used in comprehension"  # [*[] for a in [1]]
+    "dict unpacking cannot be used in dict comprehension"  # {**{} for a in [1]}
+    "Generator expression must be parenthesized if not sole argument"  # foo(x for x in [], b)
+    "positional argument follows keyword argument unpacking" # f(**x, y) >= 3.5
+    "positional argument follows keyword argument"  # f(x=2, y) >= 3.5
+    "iterable argument unpacking follows keyword argument unpacking" # foo(**kwargs, *args)
+    "lambda cannot contain assignment"  # f(lambda: 1=1)
+    "keyword can't be an expression" # f(+x=1)
+    "keyword argument repeated"  # f(x=1, x=2)
+    "illegal expression for augmented assignment"  # x, y += 1
+    "only single target (not list) can be annotated" # [x, y]: int
+    "only single target (not tuple) can be annotated" # x, y: str
+    "illegal target for annotation" # True: 1`
+    "trailing comma not allowed without surrounding parentheses" # from foo import a,
+    "bytes can only contain ASCII literal characters." # b'ä'  # prob. only python 3
+    "cannot mix bytes and nonbytes literals" # 's' b''
+    "assignment to yield expression not possible"  # x = yield 1 = 3
+
+    "f-string: empty expression not allowed"  # f'{}'
+    "f-string: single '}' is not allowed"  # f'}'
+    "f-string: expressions nested too deeply"  # f'{1:{5:{3}}}'
+    "f-string expression part cannot include a backslash"  # f'{"\"}' or f'{"\\"}'
+    "f-string expression part cannot include '#'"  # f'{#}'
+    "f-string: unterminated string"  # f'{"}'
+    "f-string: mismatched '(', '{', or '['"
+    "f-string: invalid conversion character: expected 's', 'r', or 'a'" # f'{1!b}'
+    "f-string: unexpected end of string"  # Doesn't really happen?!
+    "f-string: expecting '}'"  # f'{'
+    "(unicode error) unknown error
+    "(value error) unknown error
+    "(unicode error) MESSAGE
+        MESSAGES = {
+            "\\ at end of string"
+            "truncated \\xXX escape"
+            "truncated \\uXXXX escape"
+            "truncated \\UXXXXXXXX escape"
+            "illegal Unicode character"       # '\Uffffffff'
+            "malformed \\N character escape"  # '\N{}'
+            "unknown Unicode character name"  # '\N{foo}'
+        }
+    "(value error) MESSAGE  # bytes
+        MESSAGES = {
+            "Trailing \\ in string"
+            "invalid \\x escape at position %d"
+        }
+
+    "invalid escape sequence \\%c"  # Only happens when used in `python -W error`
+    "unexpected node"  # Probably irrelevant
+    "Unexpected node-type in from-import"  # Irrelevant, doesn't happen.
+    "malformed 'try' statement"  # Irrelevant, doesn't happen.
+
+# Python/symtable.c
+    "duplicate argument '%U' in function definition"
+    "name '%U' is assigned to before global declaration"
+    "name '%U' is assigned to before nonlocal declaration"
+    "name '%U' is used prior to global declaration"
+    "name '%U' is used prior to nonlocal declaration"
+    "annotated name '%U' can't be global"
+    "annotated name '%U' can't be nonlocal"
+    "import * only allowed at module level"
+
+    "name '%U' is parameter and global",
+    "name '%U' is nonlocal and global",
+    "name '%U' is parameter and nonlocal",
+
+    "nonlocal declaration not allowed at module level");
+    "no binding for nonlocal '%U' found",
+    # RecursionError. Not handled. For all human written code, this is probably
+    # not an issue. eval("()"*x) with x>=2998 for example fails, but that's
+    # more than 2000 executions on one line.
+    "maximum recursion depth exceeded during compilation");
+
+# Python/future.c
+    "not a chance"
+    "future feature %.100s is not defined"
+    "from __future__ imports must occur at the beginning of the file"  # Also in compile.c
+
+# Parser/tokenizer.c
+    # All the following issues seem to be irrelevant for parso, because the
+    # encoding stuff is done before it reaches the tokenizer. It's already
+    # unicode at that point.
+    "encoding problem: %s"
+    "encoding problem: %s with BOM"
+    "Non-UTF-8 code starting with '\\x%.2x' in file %U on line %i, but no encoding declared; see http://python.org/dev/peps/pep-0263/ for details"
+
+# Parser/pythonrun.c
+    E_SYNTAX: "invalid syntax"
+    E_LINECONT: "unexpected character after line continuation character"
+    E_IDENTIFIER: "invalid character in identifier"
+    # Also just use 'invalid syntax'. Happens mostly with stuff like `(`. This
+    # message doesn't really help the user, because it only appears very
+    # randomly, e.g. `(or` wouldn't yield this error.
+    E_EOF: "unexpected EOF while parsing"
+    # Even in 3.6 this is implemented kind of shaky. Not implemented, I think
+    # cPython needs to fix this one first.
+    # e.g. `ast.parse('def x():\n\t if 1:\n \t \tpass')` works :/
+    E_TABSPACE: "inconsistent use of tabs and spaces in indentation"
+    # Ignored, just shown as "invalid syntax". The error has mostly to do with
+    # numbers like 0b2 everywhere or 1.6_ in Python3.6.
+    E_TOKEN: "invalid token"
+    E_EOFS: "EOF while scanning triple-quoted string literal"
+    E_EOLS: "EOL while scanning string literal"
+
+    # IndentationError
+    E_DEDENT: "unindent does not match any outer indentation level"
+    E_TOODEEP: "too many levels of indentation"  # 100 levels
+    E_SYNTAX: "expected an indented block"
+              "unexpected indent"
+              # I don't think this actually ever happens.
+              "unexpected unindent"
+
+
+    # Irrelevant for parso for now.
+    E_OVERFLOW: "expression too long"
+    E_DECODE: "unknown decode error"
+    E_BADSINGLE: "multiple statements found while compiling a single statement"
+
+
+Version specific:
+Python 3.5:
+    'yield' inside async function
+Python 3.3/3.4:
+    can use starred expression only as assignment target
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/parser.py
new file mode 100644
index 0000000..1897f53
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/parser.py
@@ -0,0 +1,261 @@
+from parso.python import tree
+from parso.python.token import (DEDENT, INDENT, ENDMARKER, NEWLINE, NUMBER,
+                                STRING, tok_name, NAME)
+from parso.parser import BaseParser
+from parso.pgen2.parse import token_to_ilabel
+
+
+class Parser(BaseParser):
+    """
+    This class is used to parse a Python file, it then divides them into a
+    class structure of different scopes.
+
+    :param pgen_grammar: The grammar object of pgen2. Loaded by load_grammar.
+    """
+
+    node_map = {
+        'expr_stmt': tree.ExprStmt,
+        'classdef': tree.Class,
+        'funcdef': tree.Function,
+        'file_input': tree.Module,
+        'import_name': tree.ImportName,
+        'import_from': tree.ImportFrom,
+        'break_stmt': tree.KeywordStatement,
+        'continue_stmt': tree.KeywordStatement,
+        'return_stmt': tree.ReturnStmt,
+        'raise_stmt': tree.KeywordStatement,
+        'yield_expr': tree.YieldExpr,
+        'del_stmt': tree.KeywordStatement,
+        'pass_stmt': tree.KeywordStatement,
+        'global_stmt': tree.GlobalStmt,
+        'nonlocal_stmt': tree.KeywordStatement,
+        'print_stmt': tree.KeywordStatement,
+        'assert_stmt': tree.AssertStmt,
+        'if_stmt': tree.IfStmt,
+        'with_stmt': tree.WithStmt,
+        'for_stmt': tree.ForStmt,
+        'while_stmt': tree.WhileStmt,
+        'try_stmt': tree.TryStmt,
+        'comp_for': tree.CompFor,
+        # Not sure if this is the best idea, but IMO it's the easiest way to
+        # avoid extreme amounts of work around the subtle difference of 2/3
+        # grammar in list comoprehensions.
+        'list_for': tree.CompFor,
+        # Same here. This just exists in Python 2.6.
+        'gen_for': tree.CompFor,
+        'decorator': tree.Decorator,
+        'lambdef': tree.Lambda,
+        'old_lambdef': tree.Lambda,
+        'lambdef_nocond': tree.Lambda,
+    }
+    default_node = tree.PythonNode
+
+    def __init__(self, pgen_grammar, error_recovery=True, start_symbol='file_input'):
+        super(Parser, self).__init__(pgen_grammar, start_symbol, error_recovery=error_recovery)
+
+        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:
+
+    def parse(self, tokens):
+        if self._error_recovery:
+            if self._start_symbol != 'file_input':
+                raise NotImplementedError
+
+            tokens = self._recovery_tokenize(tokens)
+
+        node = super(Parser, self).parse(tokens)
+
+        if self._start_symbol == 'file_input' != node.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:
+            node = self.convert_node(
+                self._pgen_grammar,
+                self._pgen_grammar.symbol2number['file_input'],
+                [node]
+            )
+
+        return node
+
+    def convert_node(self, pgen_grammar, type, children):
+        """
+        Convert raw node information to a PythonBaseNode 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.
+        """
+        # TODO REMOVE symbol, we don't want type here.
+        symbol = pgen_grammar.number2symbol[type]
+        try:
+            return self.node_map[symbol](children)
+        except KeyError:
+            if symbol == 'suite':
+                # We don't want the INDENT/DEDENT in our parser tree. Those
+                # leaves are just cancer. They are virtual leaves and not real
+                # ones and therefore have pseudo start/end positions and no
+                # prefixes. Just ignore them.
+                children = [children[0]] + children[2:-1]
+            elif symbol == 'list_if':
+                # Make transitioning from 2 to 3 easier.
+                symbol = 'comp_if'
+            elif symbol == 'listmaker':
+                # Same as list_if above.
+                symbol = 'testlist_comp'
+            return self.default_node(symbol, children)
+
+    def convert_leaf(self, pgen_grammar, type, value, prefix, start_pos):
+        # print('leaf', repr(value), token.tok_name[type])
+        if type == NAME:
+            if value in pgen_grammar.keywords:
+                return tree.Keyword(value, start_pos, prefix)
+            else:
+                return tree.Name(value, start_pos, prefix)
+        elif type == STRING:
+            return tree.String(value, start_pos, prefix)
+        elif type == NUMBER:
+            return tree.Number(value, start_pos, prefix)
+        elif type == NEWLINE:
+            return tree.Newline(value, start_pos, prefix)
+        elif type == ENDMARKER:
+            return tree.EndMarker(value, start_pos, prefix)
+        else:
+            return tree.Operator(value, start_pos, prefix)
+
+    def error_recovery(self, pgen_grammar, stack, arcs, typ, value, start_pos, prefix,
+                       add_token_callback):
+        def get_symbol_and_nodes(stack):
+            for dfa, state, (type_, nodes) in stack:
+                symbol = pgen_grammar.number2symbol[type_]
+                yield symbol, nodes
+
+        tos_nodes = stack.get_tos_nodes()
+        if tos_nodes:
+            last_leaf = tos_nodes[-1].get_last_leaf()
+        else:
+            last_leaf = None
+
+        if self._start_symbol == 'file_input' and \
+                (typ == ENDMARKER or typ == DEDENT and '\n' not in last_leaf.value):
+            def reduce_stack(states, newstate):
+                # reduce
+                state = newstate
+                while states[state] == [(0, state)]:
+                    self.pgen_parser._pop()
+
+                    dfa, state, (type_, nodes) = stack[-1]
+                    states, first = dfa
+
+
+            # In Python statements need to end with a newline. But since it's
+            # possible (and valid in Python ) that there's no newline at the
+            # end of a file, we have to recover even if the user doesn't want
+            # error recovery.
+            #print('x', pprint.pprint(stack))
+            ilabel = token_to_ilabel(pgen_grammar, NEWLINE, value)
+
+            dfa, state, (type_, nodes) = stack[-1]
+            symbol = pgen_grammar.number2symbol[type_]
+            states, first = dfa
+            arcs = states[state]
+            # Look for a state with this label
+            for i, newstate in arcs:
+                if ilabel == i:
+                    if symbol == 'simple_stmt':
+                        # This is basically shifting
+                        stack[-1] = (dfa, newstate, (type_, nodes))
+
+                        reduce_stack(states, newstate)
+                        add_token_callback(typ, value, start_pos, prefix)
+                        return
+                    # Check if we're at the right point
+                    #for symbol, nodes in get_symbol_and_nodes(stack):
+                    #        self.pgen_parser._pop()
+
+                            #break
+                    break
+            #symbol = pgen_grammar.number2symbol[type_]
+
+        if not self._error_recovery:
+            return super(Parser, self).error_recovery(
+                pgen_grammar, stack, arcs, typ, value, start_pos, prefix,
+                add_token_callback)
+
+        def current_suite(stack):
+            # For now just discard everything that is not a suite or
+            # file_input, if we detect an error.
+            for index, (symbol, nodes) in reversed(list(enumerate(get_symbol_and_nodes(stack)))):
+                # `suite` can sometimes be only simple_stmt, not stmt.
+                if symbol == 'file_input':
+                    break
+                elif symbol == 'suite' and len(nodes) > 1:
+                    # suites without an indent in them get discarded.
+                    break
+            return index, symbol, nodes
+
+        index, symbol, nodes = current_suite(stack)
+
+        # print('err', token.tok_name[typ], repr(value), start_pos, len(stack), index)
+        if self._stack_removal(pgen_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)
+
+            error_leaf = tree.PythonErrorLeaf(tok_name[typ].lower(), value, start_pos, prefix)
+            stack[-1][2][1].append(error_leaf)
+
+        if symbol == 'suite':
+            dfa, state, node = stack[-1]
+            states, first = dfa
+            arcs = states[state]
+            intended_label = pgen_grammar.symbol2label['stmt']
+            # Introduce a proper state transition. We're basically allowing
+            # there to be no valid statements inside a suite.
+            if [x[0] for x in arcs] == [intended_label]:
+                new_state = arcs[0][1]
+                stack[-1] = dfa, new_state, node
+
+    def _stack_removal(self, pgen_grammar, stack, arcs, start_index, value, start_pos):
+        failed_stack = False
+        found = False
+        all_nodes = []
+        for dfa, state, (type_, nodes) in stack[start_index:]:
+            if nodes:
+                found = True
+            if found:
+                failed_stack = True
+                all_nodes += nodes
+        if failed_stack:
+            stack[start_index - 1][2][1].append(tree.PythonErrorNode(all_nodes))
+
+        stack[start_index:] = []
+        return failed_stack
+
+    def _recovery_tokenize(self, tokens):
+        for typ, value, start_pos, prefix in tokens:
+            # print(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
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/pep8.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/pep8.py
new file mode 100644
index 0000000..59fe452
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/pep8.py
@@ -0,0 +1,727 @@
+import re
+from contextlib import contextmanager
+
+from parso.python.errors import ErrorFinder, ErrorFinderConfig
+from parso.normalizer import Rule
+from parso.python.tree import search_ancestor, Flow, Scope
+
+
+_IMPORT_TYPES = ('import_name', 'import_from')
+_SUITE_INTRODUCERS = ('classdef', 'funcdef', 'if_stmt', 'while_stmt',
+                      'for_stmt', 'try_stmt', 'with_stmt')
+_NON_STAR_TYPES = ('term', 'import_from', 'power')
+_OPENING_BRACKETS = '(', '[', '{'
+_CLOSING_BRACKETS = ')', ']', '}'
+_FACTOR = '+', '-', '~'
+_ALLOW_SPACE = '*', '+', '-', '**', '/', '//', '@'
+_BITWISE_OPERATOR = '<<', '>>', '|', '&', '^'
+_NEEDS_SPACE = ('=', '%', '->',
+                '<', '>', '==', '>=', '<=', '<>', '!=',
+                '+=', '-=', '*=', '@=', '/=', '%=', '&=', '|=', '^=', '<<=',
+                '>>=', '**=', '//=')
+_NEEDS_SPACE += _BITWISE_OPERATOR
+_IMPLICIT_INDENTATION_TYPES = ('dictorsetmaker', 'argument')
+_POSSIBLE_SLICE_PARENTS = ('subscript', 'subscriptlist', 'sliceop')
+
+
+class IndentationTypes(object):
+    VERTICAL_BRACKET = object()
+    HANGING_BRACKET = object()
+    BACKSLASH = object()
+    SUITE = object()
+    IMPLICIT = object()
+
+
+class IndentationNode(object):
+    type = IndentationTypes.SUITE
+
+    def __init__(self, config, indentation, parent=None):
+        self.bracket_indentation = self.indentation = indentation
+        self.parent = parent
+
+    def __repr__(self):
+        return '<%s>' % self.__class__.__name__
+
+    def get_latest_suite_node(self):
+        n = self
+        while n is not None:
+            if n.type == IndentationTypes.SUITE:
+                return n
+
+            n = n.parent
+
+
+class BracketNode(IndentationNode):
+    def __init__(self, config, leaf, parent, in_suite_introducer=False):
+        self.leaf = leaf
+
+        # Figure out here what the indentation is. For chained brackets
+        # we can basically use the previous indentation.
+        previous_leaf = leaf
+        n = parent
+        if n.type == IndentationTypes.IMPLICIT:
+            n = n.parent
+        while True:
+            if hasattr(n, 'leaf') and previous_leaf.line != n.leaf.line:
+                break
+
+            previous_leaf = previous_leaf.get_previous_leaf()
+            if not isinstance(n, BracketNode) or previous_leaf != n.leaf:
+                break
+            n = n.parent
+        parent_indentation = n.indentation
+
+
+        next_leaf = leaf.get_next_leaf()
+        if '\n' in next_leaf.prefix:
+            # This implies code like:
+            # foobarbaz(
+            #     a,
+            #     b,
+            # )
+            self.bracket_indentation = parent_indentation \
+                + config.closing_bracket_hanging_indentation
+            self.indentation = parent_indentation + config.indentation
+            self.type = IndentationTypes.HANGING_BRACKET
+        else:
+            # Implies code like:
+            # foobarbaz(
+            #           a,
+            #           b,
+            #           )
+            expected_end_indent = leaf.end_pos[1]
+            if '\t' in config.indentation:
+                self.indentation = None
+            else:
+                self.indentation =  ' ' * expected_end_indent
+            self.bracket_indentation = self.indentation
+            self.type = IndentationTypes.VERTICAL_BRACKET
+
+        if in_suite_introducer and parent.type == IndentationTypes.SUITE \
+                and self.indentation == parent_indentation + config.indentation:
+            self.indentation += config.indentation
+            # The closing bracket should have the same indentation.
+            self.bracket_indentation = self.indentation
+        self.parent = parent
+
+
+class ImplicitNode(BracketNode):
+    """
+    Implicit indentation after keyword arguments, default arguments,
+    annotations and dict values.
+    """
+    def __init__(self, config, leaf, parent):
+        super(ImplicitNode, self).__init__(config, leaf, parent)
+        self.type = IndentationTypes.IMPLICIT
+
+        next_leaf = leaf.get_next_leaf()
+        if leaf == ':' and '\n' not in next_leaf.prefix:
+            self.indentation += ' '
+
+
+class BackslashNode(IndentationNode):
+    type = IndentationTypes.BACKSLASH
+
+    def __init__(self, config, parent_indentation, containing_leaf, spacing, parent=None):
+        expr_stmt = search_ancestor(containing_leaf, 'expr_stmt')
+        if expr_stmt is not None:
+            equals = expr_stmt.children[-2]
+
+            if '\t' in config.indentation:
+                # TODO unite with the code of BracketNode
+                self.indentation = None
+            else:
+                # If the backslash follows the equals, use normal indentation
+                # otherwise it should align with the equals.
+                if equals.end_pos == spacing.start_pos:
+                    self.indentation = parent_indentation + config.indentation
+                else:
+                    # +1 because there is a space.
+                    self.indentation =  ' ' * (equals.end_pos[1] + 1)
+        else:
+            self.indentation = parent_indentation + config.indentation
+        self.bracket_indentation = self.indentation
+        self.parent = parent
+
+
+def _is_magic_name(name):
+    return name.value.startswith('__') and name.value.endswith('__')
+
+
+class PEP8Normalizer(ErrorFinder):
+    def __init__(self, *args, **kwargs):
+        super(PEP8Normalizer, self).__init__(*args, **kwargs)
+        self._previous_part = None
+        self._previous_leaf = None
+        self._on_newline = True
+        self._newline_count = 0
+        self._wanted_newline_count = None
+        self._max_new_lines_in_prefix = 0
+        self._new_statement = True
+        self._implicit_indentation_possible = False
+        # The top of stack of the indentation nodes.
+        self._indentation_tos = self._last_indentation_tos = \
+            IndentationNode(self._config, indentation='')
+        self._in_suite_introducer = False
+
+        if ' ' in self._config.indentation:
+            self._indentation_type = 'spaces'
+            self._wrong_indentation_char = '\t'
+        else:
+            self._indentation_type = 'tabs'
+            self._wrong_indentation_char = ' '
+
+    @contextmanager
+    def visit_node(self, node):
+        with super(PEP8Normalizer, self).visit_node(node):
+            with self._visit_node(node):
+                yield
+
+    @contextmanager
+    def _visit_node(self, node):
+        typ = node.type
+
+        if typ in 'import_name':
+            names = node.get_defined_names()
+            if len(names) > 1:
+                for name in names[:1]:
+                    self.add_issue(name, 401, 'Multiple imports on one line')
+        elif typ == 'lambdef':
+            expr_stmt = node.parent
+            # Check if it's simply defining a single name, not something like
+            # foo.bar or x[1], where using a lambda could make more sense.
+            if expr_stmt.type == 'expr_stmt' and any(n.type == 'name' for n in expr_stmt.children[:-2:2]):
+                self.add_issue(node, 731, 'Do not assign a lambda expression, use a def')
+        elif typ == 'try_stmt':
+            for child in node.children:
+                # Here we can simply check if it's an except, because otherwise
+                # it would be an except_clause.
+                if child.type == 'keyword' and child.value == 'except':
+                    self.add_issue(child, 722, 'Do not use bare except, specify exception instead')
+        elif typ == 'comparison':
+            for child in node.children:
+                if child.type not in ('atom_expr', 'power'):
+                    continue
+                if len(child.children) > 2:
+                    continue
+                trailer = child.children[1]
+                atom = child.children[0]
+                if trailer.type == 'trailer' and atom.type == 'name' \
+                        and atom.value == 'type':
+                    self.add_issue(node, 721, "Do not compare types, use 'isinstance()")
+                    break
+        elif typ == 'file_input':
+            endmarker = node.children[-1]
+            prev = endmarker.get_previous_leaf()
+            prefix = endmarker.prefix
+            if (not prefix.endswith('\n') and (
+                    prefix or prev is None or prev.value != '\n')):
+                self.add_issue(endmarker, 292, "No newline at end of file")
+
+        if typ in _IMPORT_TYPES:
+            simple_stmt = node.parent
+            module = simple_stmt.parent
+            #if module.type == 'simple_stmt':
+            if module.type == 'file_input':
+                index = module.children.index(simple_stmt)
+                for child in module.children[:index]:
+                    children = [child]
+                    if child.type == 'simple_stmt':
+                        # Remove the newline.
+                        children = child.children[:-1]
+
+                    found_docstring = False
+                    for c in children:
+                        if c.type == 'string' and not found_docstring:
+                            continue
+                        found_docstring = True
+
+                        if c.type == 'expr_stmt' and \
+                                all(_is_magic_name(n) for n in c.get_defined_names()):
+                            continue
+
+                        if c.type in _IMPORT_TYPES or isinstance(c, Flow):
+                            continue
+
+                        self.add_issue(node, 402, 'Module level import not at top of file')
+                        break
+                    else:
+                        continue
+                    break
+
+        implicit_indentation_possible = typ in _IMPLICIT_INDENTATION_TYPES
+        in_introducer = typ in _SUITE_INTRODUCERS
+        if in_introducer:
+            self._in_suite_introducer = True
+        elif typ == 'suite':
+            if self._indentation_tos.type == IndentationTypes.BACKSLASH:
+                self._indentation_tos = self._indentation_tos.parent
+
+            self._indentation_tos = IndentationNode(
+                self._config,
+                self._indentation_tos.indentation + self._config.indentation,
+                parent=self._indentation_tos
+            )
+        elif implicit_indentation_possible:
+            self._implicit_indentation_possible = True
+        yield
+        if typ == 'suite':
+            assert self._indentation_tos.type == IndentationTypes.SUITE
+            self._indentation_tos = self._indentation_tos.parent
+            # If we dedent, no lines are needed anymore.
+            self._wanted_newline_count = None
+        elif implicit_indentation_possible:
+            self._implicit_indentation_possible = False
+            if self._indentation_tos.type == IndentationTypes.IMPLICIT:
+                self._indentation_tos = self._indentation_tos.parent
+        elif in_introducer:
+            self._in_suite_introducer = False
+            if typ in ('classdef', 'funcdef'):
+                self._wanted_newline_count = self._get_wanted_blank_lines_count()
+
+    def _check_tabs_spaces(self, spacing):
+        if self._wrong_indentation_char in spacing.value:
+            self.add_issue(spacing, 101, 'Indentation contains ' + self._indentation_type)
+            return True
+        return False
+
+    def _get_wanted_blank_lines_count(self):
+        suite_node = self._indentation_tos.get_latest_suite_node()
+        return int(suite_node.parent is None) + 1
+
+    def _reset_newlines(self, spacing, leaf, is_comment=False):
+        self._max_new_lines_in_prefix = \
+            max(self._max_new_lines_in_prefix, self._newline_count)
+
+        wanted = self._wanted_newline_count
+        if wanted is not None:
+            # Need to substract one
+            blank_lines = self._newline_count - 1
+            if wanted > blank_lines and leaf.type != 'endmarker':
+                # In case of a comment we don't need to add the issue, yet.
+                if not is_comment:
+                    # TODO end_pos wrong.
+                    code = 302 if wanted == 2 else 301
+                    message = "expected %s blank line, found %s" \
+                        % (wanted, blank_lines)
+                    self.add_issue(spacing, code, message)
+                    self._wanted_newline_count = None
+            else:
+                self._wanted_newline_count = None
+
+        if not is_comment:
+            wanted = self._get_wanted_blank_lines_count()
+            actual = self._max_new_lines_in_prefix - 1
+
+            val = leaf.value
+            needs_lines = (
+                val == '@' and leaf.parent.type == 'decorator'
+                or (
+                    val == 'class'
+                    or val == 'async' and leaf.get_next_leaf() == 'def'
+                    or val == 'def' and self._previous_leaf != 'async'
+                ) and leaf.parent.parent.type != 'decorated'
+            )
+            if needs_lines and actual < wanted:
+                func_or_cls = leaf.parent
+                suite = func_or_cls.parent
+                if suite.type == 'decorated':
+                    suite = suite.parent
+
+                # The first leaf of a file or a suite should not need blank
+                # lines.
+                if suite.children[int(suite.type == 'suite')] != func_or_cls:
+                    code = 302 if wanted == 2 else 301
+                    message = "expected %s blank line, found %s" \
+                        % (wanted, actual)
+                    self.add_issue(spacing, code, message)
+
+            self._max_new_lines_in_prefix = 0
+
+        self._newline_count = 0
+
+    def visit_leaf(self, leaf):
+        super(PEP8Normalizer, self).visit_leaf(leaf)
+        for part in leaf._split_prefix():
+            if part.type == 'spacing':
+                # This part is used for the part call after for.
+                break
+            self._visit_part(part, part.create_spacing_part(), leaf)
+
+        self._analyse_non_prefix(leaf)
+        self._visit_part(leaf, part, leaf)
+
+        # Cleanup
+        self._last_indentation_tos = self._indentation_tos
+
+        self._new_statement = leaf.type == 'newline'
+
+        # TODO does this work? with brackets and stuff?
+        if leaf.type == 'newline' and \
+                self._indentation_tos.type == IndentationTypes.BACKSLASH:
+            self._indentation_tos = self._indentation_tos.parent
+
+        if leaf.value == ':' and leaf.parent.type in _SUITE_INTRODUCERS:
+            self._in_suite_introducer = False
+        elif leaf.value == 'elif':
+            self._in_suite_introducer = True
+
+        if not self._new_statement:
+            self._reset_newlines(part, leaf)
+            self._max_blank_lines = 0
+
+        self._previous_leaf = leaf
+
+        return leaf.value
+
+    def _visit_part(self, part, spacing, leaf):
+        value = part.value
+        type_ = part.type
+        if type_ == 'error_leaf':
+            return
+
+        if value == ',' and part.parent.type == 'dictorsetmaker':
+            self._indentation_tos = self._indentation_tos.parent
+
+        node = self._indentation_tos
+
+        if type_ == 'comment':
+            if value.startswith('##'):
+                # Whole blocks of # should not raise an error.
+                if value.lstrip('#'):
+                    self.add_issue(part, 266, "Too many leading '#' for block comment.")
+            elif self._on_newline:
+                if not re.match('#:? ', value) and not value == '#' \
+                        and not (value.startswith('#!') and part.start_pos == (1, 0)):
+                    self.add_issue(part, 265, "Block comment should start with '# '")
+            else:
+                if not re.match('#:? [^ ]', value):
+                    self.add_issue(part, 262, "Inline comment should start with '# '")
+
+            self._reset_newlines(spacing, leaf, is_comment=True)
+        elif type_ == 'newline':
+            if self._newline_count > self._get_wanted_blank_lines_count():
+                self.add_issue(part, 303, "Too many blank lines (%s)" % self._newline_count)
+            elif leaf in ('def', 'class') \
+                    and leaf.parent.parent.type == 'decorated':
+                self.add_issue(part, 304, "Blank lines found after function decorator")
+
+
+            self._newline_count += 1
+
+        if type_ == 'backslash':
+            # TODO is this enough checking? What about ==?
+            if node.type != IndentationTypes.BACKSLASH:
+                if node.type != IndentationTypes.SUITE:
+                    self.add_issue(part, 502, 'The backslash is redundant between brackets')
+                else:
+                    indentation = node.indentation
+                    if self._in_suite_introducer and node.type == IndentationTypes.SUITE:
+                        indentation += self._config.indentation
+
+                    self._indentation_tos = BackslashNode(
+                        self._config,
+                        indentation,
+                        part,
+                        spacing,
+                        parent=self._indentation_tos
+                    )
+        elif self._on_newline:
+            indentation = spacing.value
+            if node.type == IndentationTypes.BACKSLASH \
+                    and self._previous_part.type == 'newline':
+                self._indentation_tos = self._indentation_tos.parent
+
+            if not self._check_tabs_spaces(spacing):
+                should_be_indentation = node.indentation
+                if type_ == 'comment':
+                    # Comments can be dedented. So we have to care for that.
+                    n = self._last_indentation_tos
+                    while True:
+                        if len(indentation) > len(n.indentation):
+                            break
+
+                        should_be_indentation = n.indentation
+
+                        self._last_indentation_tos = n
+                        if n == node:
+                            break
+                        n = n.parent
+
+                if self._new_statement:
+                    if type_ == 'newline':
+                        if indentation:
+                            self.add_issue(spacing, 291, 'Trailing whitespace')
+                    elif indentation != should_be_indentation:
+                        s = '%s %s' % (len(self._config.indentation), self._indentation_type)
+                        self.add_issue(part, 111, 'Indentation is not a multiple of ' + s)
+                else:
+                    if value in '])}':
+                        should_be_indentation = node.bracket_indentation
+                    else:
+                        should_be_indentation = node.indentation
+                    if self._in_suite_introducer and indentation == \
+                                node.get_latest_suite_node().indentation \
+                                + self._config.indentation:
+                            self.add_issue(part, 129, "Line with same indent as next logical block")
+                    elif indentation != should_be_indentation:
+                        if not self._check_tabs_spaces(spacing) and part.value != '\n':
+                            if value in '])}':
+                                if node.type == IndentationTypes.VERTICAL_BRACKET:
+                                    self.add_issue(part, 124, "Closing bracket does not match visual indentation")
+                                else:
+                                    self.add_issue(part, 123, "Losing bracket does not match indentation of opening bracket's line")
+                            else:
+                                if len(indentation) < len(should_be_indentation):
+                                    if node.type == IndentationTypes.VERTICAL_BRACKET:
+                                        self.add_issue(part, 128, 'Continuation line under-indented for visual indent')
+                                    elif node.type == IndentationTypes.BACKSLASH:
+                                        self.add_issue(part, 122, 'Continuation line missing indentation or outdented')
+                                    elif node.type == IndentationTypes.IMPLICIT:
+                                        self.add_issue(part, 135, 'xxx')
+                                    else:
+                                        self.add_issue(part, 121, 'Continuation line under-indented for hanging indent')
+                                else:
+                                    if node.type == IndentationTypes.VERTICAL_BRACKET:
+                                        self.add_issue(part, 127, 'Continuation line over-indented for visual indent')
+                                    elif node.type == IndentationTypes.IMPLICIT:
+                                        self.add_issue(part, 136, 'xxx')
+                                    else:
+                                        self.add_issue(part, 126, 'Continuation line over-indented for hanging indent')
+        else:
+            self._check_spacing(part, spacing)
+
+        self._check_line_length(part, spacing)
+        # -------------------------------
+        # Finalizing. Updating the state.
+        # -------------------------------
+        if value and value in '()[]{}' and type_ != 'error_leaf' \
+                and part.parent.type != 'error_node':
+            if value in _OPENING_BRACKETS:
+                self._indentation_tos = BracketNode(
+                    self._config, part,
+                    parent=self._indentation_tos,
+                    in_suite_introducer=self._in_suite_introducer
+                )
+            else:
+                assert node.type != IndentationTypes.IMPLICIT
+                self._indentation_tos = self._indentation_tos.parent
+        elif value in ('=', ':') and self._implicit_indentation_possible \
+                and part.parent.type in _IMPLICIT_INDENTATION_TYPES:
+            indentation = node.indentation
+            self._indentation_tos = ImplicitNode(
+                self._config, part, parent=self._indentation_tos
+            )
+
+        self._on_newline = type_ in ('newline', 'backslash', 'bom')
+
+        self._previous_part = part
+        self._previous_spacing = spacing
+
+    def _check_line_length(self, part, spacing):
+        if part.type == 'backslash':
+            last_column = part.start_pos[1] + 1
+        else:
+            last_column = part.end_pos[1]
+        if last_column > self._config.max_characters \
+                and spacing.start_pos[1] <= self._config.max_characters :
+            # Special case for long URLs in multi-line docstrings or comments,
+            # but still report the error when the 72 first chars are whitespaces.
+            report = True
+            if part.type == 'comment':
+                splitted = part.value[1:].split()
+                if len(splitted) == 1 \
+                        and (part.end_pos[1] - len(splitted[0])) < 72:
+                    report = False
+            if report:
+                self.add_issue(
+                    part,
+                    501,
+                    'Line too long (%s > %s characters)' %
+                        (last_column, self._config.max_characters),
+                )
+
+    def _check_spacing(self, part, spacing):
+        def add_if_spaces(*args):
+            if spaces:
+                return self.add_issue(*args)
+
+        def add_not_spaces(*args):
+            if not spaces:
+                return self.add_issue(*args)
+
+        spaces = spacing.value
+        prev = self._previous_part
+        if prev is not None and prev.type == 'error_leaf' or part.type == 'error_leaf':
+            return
+
+        type_ = part.type
+        if '\t' in spaces:
+            self.add_issue(spacing, 223, 'Used tab to separate tokens')
+        elif type_ == 'comment':
+            if len(spaces) < self._config.spaces_before_comment:
+                self.add_issue(spacing, 261, 'At least two spaces before inline comment')
+        elif type_ == 'newline':
+            add_if_spaces(spacing, 291, 'Trailing whitespace')
+        elif len(spaces) > 1:
+            self.add_issue(spacing, 221, 'Multiple spaces used')
+        else:
+            if prev in _OPENING_BRACKETS:
+                message = "Whitespace after '%s'" % part.value
+                add_if_spaces(spacing, 201, message)
+            elif part in _CLOSING_BRACKETS:
+                message = "Whitespace before '%s'" % part.value
+                add_if_spaces(spacing, 202, message)
+            elif part in (',', ';') or part == ':' \
+                    and part.parent.type not in  _POSSIBLE_SLICE_PARENTS:
+                message = "Whitespace before '%s'" % part.value
+                add_if_spaces(spacing, 203, message)
+            elif prev == ':' and prev.parent.type in _POSSIBLE_SLICE_PARENTS:
+                pass # TODO
+            elif prev in (',', ';', ':'):
+                add_not_spaces(spacing, 231, "missing whitespace after '%s'")
+            elif part == ':':  # Is a subscript
+                # TODO
+                pass
+            elif part in ('*', '**') and part.parent.type not in _NON_STAR_TYPES \
+                    or prev in ('*', '**') \
+                    and prev.parent.type not in _NON_STAR_TYPES:
+                # TODO
+                pass
+            elif prev in _FACTOR and prev.parent.type == 'factor':
+                pass
+            elif prev == '@' and prev.parent.type == 'decorator':
+                pass  # TODO should probably raise an error if there's a space here
+            elif part in _NEEDS_SPACE or prev in _NEEDS_SPACE:
+                if part == '=' and part.parent.type in ('argument', 'param') \
+                        or prev == '=' and prev.parent.type in ('argument', 'param'):
+                    if part == '=':
+                        param = part.parent
+                    else:
+                        param = prev.parent
+                    if param.type == 'param' and param.annotation:
+                        add_not_spaces(spacing, 252, 'Expected spaces around annotation equals')
+                    else:
+                        add_if_spaces(spacing, 251, 'Unexpected spaces around keyword / parameter equals')
+                elif part in _BITWISE_OPERATOR or prev in _BITWISE_OPERATOR:
+                    add_not_spaces(spacing, 227, 'Missing whitespace around bitwise or shift operator')
+                elif part == '%' or prev == '%':
+                    add_not_spaces(spacing, 228, 'Missing whitespace around modulo operator')
+                else:
+                    message_225 = 'Missing whitespace between tokens'
+                    add_not_spaces(spacing, 225, message_225)
+            elif type_ == 'keyword' or prev.type == 'keyword':
+                add_not_spaces(spacing, 275, 'Missing whitespace around keyword')
+            else:
+                prev_spacing = self._previous_spacing
+                if prev in _ALLOW_SPACE and spaces != prev_spacing.value \
+                        and '\n' not in self._previous_leaf.prefix:
+                    message = "Whitespace before operator doesn't match with whitespace after"
+                    self.add_issue(spacing, 229, message)
+
+                if spaces and part not in _ALLOW_SPACE and prev not in _ALLOW_SPACE:
+                    message_225 = 'Missing whitespace between tokens'
+                    #print('xy', spacing)
+                    #self.add_issue(spacing, 225, message_225)
+                    # TODO why only brackets?
+                    if part in _OPENING_BRACKETS:
+                        message = "Whitespace before '%s'" % part.value
+                        add_if_spaces(spacing, 211, message)
+
+    def _analyse_non_prefix(self, leaf):
+        typ = leaf.type
+        if typ == 'name' and leaf.value in ('l', 'O', 'I'):
+            if leaf.is_definition():
+                message = "Do not define %s named 'l', 'O', or 'I' one line"
+                if leaf.parent.type == 'class' and leaf.parent.name == leaf:
+                    self.add_issue(leaf, 742, message % 'classes')
+                elif leaf.parent.type == 'function' and leaf.parent.name == leaf:
+                    self.add_issue(leaf, 743, message % 'function')
+                else:
+                    self.add_issuadd_issue(741, message % 'variables', leaf)
+        elif leaf.value == ':':
+            if isinstance(leaf.parent, (Flow, Scope)) and leaf.parent.type != 'lambdef':
+                next_leaf = leaf.get_next_leaf()
+                if next_leaf.type != 'newline':
+                    if leaf.parent.type == 'funcdef':
+                        self.add_issue(next_leaf, 704, 'Multiple statements on one line (def)')
+                    else:
+                        self.add_issue(next_leaf, 701, 'Multiple statements on one line (colon)')
+        elif leaf.value == ';':
+            if leaf.get_next_leaf().type in ('newline', 'endmarker'):
+                self.add_issue(leaf, 703, 'Statement ends with a semicolon')
+            else:
+                self.add_issue(leaf, 702, 'Multiple statements on one line (semicolon)')
+        elif leaf.value in ('==', '!='):
+            comparison = leaf.parent
+            index = comparison.children.index(leaf)
+            left = comparison.children[index - 1]
+            right = comparison.children[index + 1]
+            for node in left, right:
+                if node.type == 'keyword' or node.type == 'name':
+                    if node.value == 'None':
+                        message = "comparison to None should be 'if cond is None:'"
+                        self.add_issue(leaf, 711, message)
+                        break
+                    elif node.value in ('True', 'False'):
+                        message = "comparison to False/True should be 'if cond is True:' or 'if cond:'"
+                        self.add_issue(leaf, 712, message)
+                        break
+        elif leaf.value in ('in', 'is'):
+            comparison = leaf.parent
+            if comparison.type == 'comparison' and comparison.parent.type == 'not_test':
+                if leaf.value == 'in':
+                    self.add_issue(leaf, 713, "test for membership should be 'not in'")
+                else:
+                    self.add_issue(leaf, 714, "test for object identity should be 'is not'")
+        elif typ == 'string':
+            # Checking multiline strings
+            for i, line in enumerate(leaf.value.splitlines()[1:]):
+                indentation = re.match('[ \t]*', line).group(0)
+                start_pos = leaf.line + i, len(indentation)
+                # TODO check multiline indentation.
+        elif typ == 'endmarker':
+            if self._newline_count >= 2:
+                self.add_issue(leaf, 391, 'Blank line at end of file')
+
+    def add_issue(self, node, code, message):
+        if self._previous_leaf is not None:
+            if search_ancestor(self._previous_leaf, 'error_node') is not None:
+                return
+            if self._previous_leaf.type == 'error_leaf':
+                return
+        if search_ancestor(node, 'error_node') is not None:
+            return
+        if code in (901, 903):
+            # 901 and 903 are raised by the ErrorFinder.
+            super(PEP8Normalizer, self).add_issue(node, code, message)
+        else:
+            # Skip ErrorFinder here, because it has custom behavior.
+            super(ErrorFinder, self).add_issue(node, code, message)
+
+
+class PEP8NormalizerConfig(ErrorFinderConfig):
+    normalizer_class = PEP8Normalizer
+    """
+    Normalizing to PEP8. Not really implemented, yet.
+    """
+    def __init__(self, indentation=' ' * 4, hanging_indentation=None,
+                 max_characters=79, spaces_before_comment=2):
+        self.indentation = indentation
+        if hanging_indentation is None:
+            hanging_indentation = indentation
+        self.hanging_indentation = hanging_indentation
+        self.closing_bracket_hanging_indentation = ''
+        self.break_after_binary = False
+        self.max_characters = max_characters
+        self.spaces_before_comment = spaces_before_comment
+
+
+# TODO this is not yet ready.
+#@PEP8Normalizer.register_rule(type='endmarker')
+class BlankLineAtEnd(Rule):
+    code = 392
+    message = 'Blank line at end of file'
+
+    def is_issue(self, leaf):
+        return self._newline_count >= 2
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/prefix.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/prefix.py
new file mode 100644
index 0000000..b7f1e1b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/prefix.py
@@ -0,0 +1,97 @@
+import re
+from codecs import BOM_UTF8
+
+from parso.python.tokenize import group
+
+unicode_bom = BOM_UTF8.decode('utf-8')
+
+
+class PrefixPart(object):
+    def __init__(self, leaf, typ, value, spacing='', start_pos=None):
+        assert start_pos is not None
+        self.parent = leaf
+        self.type = typ
+        self.value = value
+        self.spacing = spacing
+        self.start_pos = start_pos
+
+    @property
+    def end_pos(self):
+        if self.value.endswith('\n'):
+            return self.start_pos[0] + 1, 0
+        if self.value == unicode_bom:
+            # The bom doesn't have a length at the start of a Python file.
+            return self.start_pos
+        return self.start_pos[0], self.start_pos[1] + len(self.value)
+
+    def create_spacing_part(self):
+        column = self.start_pos[1] - len(self.spacing)
+        return PrefixPart(
+            self.parent, 'spacing', self.spacing,
+            start_pos=(self.start_pos[0], column)
+        )
+
+    def __repr__(self):
+        return '%s(%s, %s, %s)' % (
+            self.__class__.__name__,
+            self.type,
+            repr(self.value),
+            self.start_pos
+        )
+
+
+_comment = r'#[^\n\r\f]*'
+_backslash = r'\\\r?\n'
+_newline = r'\r?\n'
+_form_feed = r'\f'
+_only_spacing = '$'
+_spacing = r'[ \t]*'
+_bom = unicode_bom
+
+_regex = group(
+    _comment, _backslash, _newline, _form_feed, _only_spacing, _bom,
+    capture=True
+)
+_regex = re.compile(group(_spacing, capture=True) + _regex)
+
+
+_types = {
+    '#': 'comment',
+    '\\': 'backslash',
+    '\f': 'formfeed',
+    '\n': 'newline',
+    '\r': 'newline',
+    unicode_bom: 'bom'
+}
+
+
+def split_prefix(leaf, start_pos):
+    line, column = start_pos
+    start = 0
+    value = spacing = ''
+    bom = False
+    while start != len(leaf.prefix):
+        match =_regex.match(leaf.prefix, start)
+        spacing = match.group(1)
+        value = match.group(2)
+        if not value:
+            break
+        type_ = _types[value[0]]
+        yield PrefixPart(
+            leaf, type_, value, spacing,
+            start_pos=(line, column + start - int(bom) + len(spacing))
+        )
+        if type_ == 'bom':
+            bom = True
+
+        start = match.end(0)
+        if value.endswith('\n'):
+            line += 1
+            column = -start
+
+    if value:
+        spacing = ''
+    yield PrefixPart(
+        leaf, 'spacing', spacing,
+        start_pos=(line, column + start)
+    )
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/token.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/token.py
new file mode 100644
index 0000000..fb590a5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/token.py
@@ -0,0 +1,104 @@
+from __future__ import absolute_import
+from itertools import count
+from token import *
+
+from parso._compatibility import py_version
+
+
+_counter = count(N_TOKENS)
+# Never want to see this thing again.
+del N_TOKENS
+
+COMMENT = next(_counter)
+tok_name[COMMENT] = 'COMMENT'
+
+NL = next(_counter)
+tok_name[NL] = 'NL'
+
+# Sets the attributes that don't exist in these tok_name versions.
+if py_version >= 30:
+    BACKQUOTE = next(_counter)
+    tok_name[BACKQUOTE] = 'BACKQUOTE'
+else:
+    RARROW = next(_counter)
+    tok_name[RARROW] = 'RARROW'
+    ELLIPSIS = next(_counter)
+    tok_name[ELLIPSIS] = 'ELLIPSIS'
+
+if py_version < 35:
+    ATEQUAL = next(_counter)
+    tok_name[ATEQUAL] = 'ATEQUAL'
+
+ERROR_DEDENT = next(_counter)
+tok_name[ERROR_DEDENT] = 'ERROR_DEDENT'
+
+
+# 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]
+
+
+def generate_token_id(string):
+    """
+    Uses a token in the grammar (e.g. `'+'` or `'and'`returns the corresponding
+    ID for it. The strings are part of the grammar file.
+    """
+    try:
+        return opmap[string]
+    except KeyError:
+        pass
+    return globals()[string]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tokenize.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tokenize.py
new file mode 100644
index 0000000..ecd2437
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tokenize.py
@@ -0,0 +1,420 @@
+# -*- 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. To make it possible to do error recovery the
+    tokenizer needed to be rewritten.
+
+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 sys
+import string
+import re
+from collections import namedtuple
+import itertools as _itertools
+from codecs import BOM_UTF8
+
+from parso.python.token import (tok_name, ENDMARKER, STRING, NUMBER, opmap,
+                                NAME, ERRORTOKEN, NEWLINE, INDENT, DEDENT,
+                                ERROR_DEDENT)
+from parso._compatibility import py_version
+from parso.utils import split_lines
+
+
+TokenCollection = namedtuple(
+    'TokenCollection',
+    'pseudo_token single_quoted triple_quoted endpats always_break_tokens',
+)
+
+BOM_UTF8_STRING = BOM_UTF8.decode('utf-8')
+
+_token_collection_cache = {}
+
+if py_version >= 30:
+    # 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
+
+
+def group(*choices, **kwargs):
+    capture = kwargs.pop('capture', False)  # Python 2, arrghhhhh :(
+    assert not kwargs
+
+    start = '('
+    if not capture:
+        start += '?:'
+    return start + '|'.join(choices) + ')'
+
+
+def any(*choices):
+    return group(*choices) + '*'
+
+
+def maybe(*choices):
+    return group(*choices) + '?'
+
+
+# Return the empty string, plus all of the valid string prefixes.
+def _all_string_prefixes(version_info):
+    def different_case_versions(prefix):
+        for s in _itertools.product(*[(c, c.upper()) for c in prefix]):
+            yield ''.join(s)
+    # The valid string prefixes. Only contain the lower case versions,
+    #  and don't contain any permuations (include 'fr', but not
+    #  'rf'). The various permutations will be generated.
+    _valid_string_prefixes = ['b', 'r', 'u']
+    if version_info >= (3, 0):
+        _valid_string_prefixes.append('br')
+
+    if version_info >= (3, 6):
+        _valid_string_prefixes += ['f', 'fr']
+
+    # if we add binary f-strings, add: ['fb', 'fbr']
+    result = set([''])
+    for prefix in _valid_string_prefixes:
+        for t in _itertools.permutations(prefix):
+            # create a list with upper and lower versions of each
+            #  character
+            result.update(different_case_versions(t))
+    if version_info <= (2, 7):
+        # In Python 2 the order cannot just be random.
+        result.update(different_case_versions('ur'))
+        result.update(different_case_versions('br'))
+    return result
+
+
+def _compile(expr):
+    return re.compile(expr, re.UNICODE)
+
+
+def _get_token_collection(version_info):
+    try:
+        return _token_collection_cache[tuple(version_info)]
+    except KeyError:
+        _token_collection_cache[tuple(version_info)] = result = \
+            _create_token_collection(version_info)
+        return result
+
+
+def _create_token_collection(version_info):
+    # 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+'
+
+    if version_info >= (3, 6):
+        Hexnumber = r'0[xX](?:_?[0-9a-fA-F])+'
+        Binnumber = r'0[bB](?:_?[01])+'
+        Octnumber = r'0[oO](?:_?[0-7])+'
+        Decnumber = r'(?:0(?:_?0)*|[1-9](?:_?[0-9])*)'
+        Intnumber = group(Hexnumber, Binnumber, Octnumber, Decnumber)
+        Exponent = r'[eE][-+]?[0-9](?:_?[0-9])*'
+        Pointfloat = group(r'[0-9](?:_?[0-9])*\.(?:[0-9](?:_?[0-9])*)?',
+                           r'\.[0-9](?:_?[0-9])*') + maybe(Exponent)
+        Expfloat = r'[0-9](?:_?[0-9])*' + Exponent
+        Floatnumber = group(Pointfloat, Expfloat)
+        Imagnumber = group(r'[0-9](?:_?[0-9])*[jJ]', Floatnumber + r'[jJ]')
+    else:
+        Hexnumber = r'0[xX][0-9a-fA-F]+'
+        Binnumber = r'0[bB][01]+'
+        if version_info >= (3, 0):
+            Octnumber = r'0[oO][0-7]+'
+        else:
+            Octnumber = '0[oO]?[0-7]+'
+        Decnumber = r'(?:0+|[1-9][0-9]*)'
+        Intnumber = group(Hexnumber, Binnumber, Octnumber, Decnumber)
+        Exponent = r'[eE][-+]?[0-9]+'
+        Pointfloat = group(r'[0-9]+\.[0-9]*', r'\.[0-9]+') + maybe(Exponent)
+        Expfloat = r'[0-9]+' + Exponent
+        Floatnumber = group(Pointfloat, Expfloat)
+        Imagnumber = group(r'[0-9]+[jJ]', Floatnumber + r'[jJ]')
+    Number = group(Imagnumber, Floatnumber, Intnumber)
+
+    # Note that since _all_string_prefixes includes the empty string,
+    #  StringPrefix can be the empty string (making it optional).
+    possible_prefixes = _all_string_prefixes(version_info)
+    StringPrefix = group(*possible_prefixes)
+
+    # 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(StringPrefix + "'''", StringPrefix + '"""')
+
+    # 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_args = [r'\r?\n', r'[:;.,@]']
+    if version_info >= (3, 0):
+        special_args.insert(0, r'\.\.\.')
+    Special = group(*special_args)
+
+    Funny = group(Operator, Bracket, Special)
+
+    # First (or only) line of ' or " string.
+    ContStr = group(StringPrefix + r"'[^\n'\\]*(?:\\.[^\n'\\]*)*" +
+                    group("'", r'\\\r?\n'),
+                    StringPrefix + r'"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
+                    group('"', r'\\\r?\n'))
+    PseudoExtras = group(r'\\\r?\n|\Z', Comment, Triple)
+    PseudoToken = group(Whitespace, capture=True) + \
+        group(PseudoExtras, Number, Funny, ContStr, Name, capture=True)
+
+    # For a given string prefix plus quotes, endpats maps it to a regex
+    #  to match the remainder of that string. _prefix can be empty, for
+    #  a normal single or triple quoted string (with no prefix).
+    endpats = {}
+    for _prefix in possible_prefixes:
+        endpats[_prefix + "'"] = _compile(Single)
+        endpats[_prefix + '"'] = _compile(Double)
+        endpats[_prefix + "'''"] = _compile(Single3)
+        endpats[_prefix + '"""'] = _compile(Double3)
+
+    # A set of all of the single and triple quoted string prefixes,
+    #  including the opening quotes.
+    single_quoted = set()
+    triple_quoted = set()
+    for t in possible_prefixes:
+        for p in (t + '"', t + "'"):
+            single_quoted.add(p)
+        for p in (t + '"""', t + "'''"):
+            triple_quoted.add(p)
+
+    ALWAYS_BREAK_TOKENS = (';', 'import', 'class', 'def', 'try', 'except',
+                           'finally', 'while', 'with', 'return')
+    pseudo_token_compiled = _compile(PseudoToken)
+    return TokenCollection(
+        pseudo_token_compiled, single_quoted, triple_quoted, endpats,
+        ALWAYS_BREAK_TOKENS
+    )
+
+
+class Token(namedtuple('Token', ['type', 'string', 'start_pos', 'prefix'])):
+    @property
+    def end_pos(self):
+        lines = split_lines(self.string)
+        if len(lines) > 1:
+            return self.start_pos[0] + len(lines) - 1, 0
+        else:
+            return self.start_pos[0], self.start_pos[1] + len(self.string)
+
+
+class PythonToken(Token):
+    def _get_type_name(self, exact=True):
+        return tok_name[self.type]
+
+    def __repr__(self):
+        return ('TokenInfo(type=%s, string=%r, start=%r, prefix=%r)' %
+                self._replace(type=self._get_type_name()))
+
+
+def tokenize(code, version_info, start_pos=(1, 0)):
+    """Generate tokens from a the source code (string)."""
+    lines = split_lines(code, keepends=True)
+    return tokenize_lines(lines, version_info, start_pos=start_pos)
+
+
+def tokenize_lines(lines, version_info, start_pos=(1, 0)):
+    """
+    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.
+    """
+    pseudo_token, single_quoted, triple_quoted, endpats, always_break_tokens, = \
+        _get_token_collection(version_info)
+    paren_level = 0  # count parentheses
+    indents = [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 = ''
+    first = True
+    lnum = start_pos[0] - 1
+    for line in lines:  # loop over lines in stream
+        lnum += 1
+        pos = 0
+        max = len(line)
+        if first:
+            if line.startswith(BOM_UTF8_STRING):
+                additional_prefix = BOM_UTF8_STRING
+                line = line[1:]
+                max = len(line)
+
+            # Fake that the part before was already parsed.
+            line = '^' * start_pos[1] + line
+            pos = start_pos[1]
+            max += start_pos[1]
+
+            first = False
+
+        if contstr:                                         # continued string
+            endmatch = endprog.match(line)
+            if endmatch:
+                pos = endmatch.end(0)
+                yield PythonToken(STRING, contstr + line[:pos], contstr_start, prefix)
+                contstr = ''
+                contline = None
+            else:
+                contstr = contstr + line
+                contline = contline + line
+                continue
+
+        while pos < max:
+            pseudomatch = pseudo_token.match(line, pos)
+            if not pseudomatch:                             # scan for tokens
+                txt = line[pos:]
+                if txt.endswith('\n'):
+                    new_line = True
+                yield PythonToken(ERRORTOKEN, txt, (lnum, pos), additional_prefix)
+                additional_prefix = ''
+                break
+
+            prefix = additional_prefix + pseudomatch.group(1)
+            additional_prefix = ''
+            start, pos = pseudomatch.span(2)
+            spos = (lnum, start)
+            token = pseudomatch.group(2)
+            if token == '':
+                assert prefix
+                additional_prefix = prefix
+                # This means that we have a line with whitespace/comments at
+                # the end, which just results in an endmarker.
+                break
+            initial = token[0]
+
+            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 PythonToken(INDENT, '', spos, '')
+                        indents.append(start)
+                    while start < indents[-1]:
+                        if start > indents[-2]:
+                            yield PythonToken(ERROR_DEDENT, '', (lnum, 0), '')
+                            break
+                        yield PythonToken(DEDENT, '', spos, '')
+                        indents.pop()
+
+            if (initial in numchars or                      # ordinary number
+                    (initial == '.' and token != '.' and token != '...')):
+                yield PythonToken(NUMBER, token, spos, prefix)
+            elif initial in '\r\n':
+                if not new_line and paren_level == 0:
+                    yield PythonToken(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 = endpats[token]
+                endmatch = endprog.match(line, pos)
+                if endmatch:                                # all on one line
+                    pos = endmatch.end(0)
+                    token = line[start:pos]
+                    yield PythonToken(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 = (endpats.get(initial) or endpats.get(token[1])
+                               or endpats.get(token[2]))
+                    contstr = line[start:]
+                    contline = line
+                    break
+                else:                                       # ordinary string
+                    yield PythonToken(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 PythonToken(DEDENT, '', spos, '')
+                        else:
+                            indents.append(indent)
+                            break
+                yield PythonToken(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.
+                    typ = opmap[token]
+                except KeyError:
+                    typ = ERRORTOKEN
+                yield PythonToken(typ, token, spos, prefix)
+
+    if contstr:
+        yield PythonToken(ERRORTOKEN, contstr, contstr_start, prefix)
+        if contstr.endswith('\n'):
+            new_line = True
+
+    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 PythonToken(DEDENT, '', end_pos, '')
+    yield PythonToken(ENDMARKER, '', end_pos, additional_prefix)
+
+
+if __name__ == "__main__":
+    if len(sys.argv) >= 2:
+        path = sys.argv[1]
+        with open(path) as f:
+            code = f.read()
+    else:
+        code = sys.stdin.read()
+
+    from parso.utils import python_bytes_to_unicode, parse_version_string
+
+    if isinstance(code, bytes):
+        code = python_bytes_to_unicode(code)
+
+    for token in tokenize(code, parse_version_string()):
+        print(token)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tree.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tree.py
new file mode 100644
index 0000000..583e2a2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/python/tree.py
@@ -0,0 +1,1149 @@
+"""
+This is the syntax tree for Python syntaxes (2 & 3).  The classes represent
+syntax elements like functions and imports.
+
+All of the nodes can be traced back to the `Python grammar file
+<https://docs.python.org/3/reference/grammar.html>`_. If you want to know how
+a tree is structured, just analyse that file (for each Python version it's a
+bit different).
+
+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 :py:meth:`parso.tree.NodeOrLeaf.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 want to refactor a parser tree.
+
+>>> from parso import parse
+>>> parser = parse('import os')
+>>> module = parser.get_root_node()
+>>> module
+<Module: @1-1>
+
+Any subclasses of :class:`Scope`, including :class:`Module` has an attribute
+:attr:`iter_imports <Scope.iter_imports>`:
+
+>>> list(module.iter_imports())
+[<ImportName: import os@1,0>]
+
+Changes to the Python Grammar
+-----------------------------
+
+A few things have changed when looking at Python grammar files:
+
+- :class:`Param` does not exist in Python grammar files. It is essentially a
+  part of a ``parameters`` node.  |parso| splits it up to make it easier to
+  analyse parameters. However this just makes it easier to deal with the syntax
+  tree, it doesn't actually change the valid syntax.
+- A few nodes like `lambdef` and `lambdef_nocond` have been merged in the
+  syntax tree to make it easier to do deal with them.
+
+Parser Tree Classes
+-------------------
+"""
+
+import re
+
+from parso._compatibility import utf8_repr, unicode
+from parso.tree import Node, BaseNode, Leaf, ErrorNode, ErrorLeaf, \
+    search_ancestor
+from parso.python.prefix import split_prefix
+
+_FLOW_CONTAINERS = set(['if_stmt', 'while_stmt', 'for_stmt', 'try_stmt',
+                        'with_stmt', 'async_stmt', 'suite'])
+_RETURN_STMT_CONTAINERS = set(['suite', 'simple_stmt']) | _FLOW_CONTAINERS
+_FUNC_CONTAINERS = set(['suite', 'simple_stmt', 'decorated']) | _FLOW_CONTAINERS
+_GET_DEFINITION_TYPES = set([
+    'expr_stmt', 'comp_for', 'with_stmt', 'for_stmt', 'import_name',
+    'import_from', 'param'
+])
+_IMPORTS = set(['import_name', 'import_from'])
+
+
+
+class DocstringMixin(object):
+    __slots__ = ()
+
+    def get_doc_node(self):
+        """
+        Returns the string leaf of a docstring. e.g. ``r'''foo'''``.
+        """
+        if self.type == 'file_input':
+            node = self.children[0]
+        elif self.type in ('funcdef', 'classdef'):
+            node = self.children[self.children.index(':') + 1]
+            if node.type == 'suite':  # Normally a suite
+                node = node.children[1]  # -> NEWLINE stmt
+        else:  # ExprStmt
+            simple_stmt = self.parent
+            c = simple_stmt.parent.children
+            index = c.index(simple_stmt)
+            if not index:
+                return None
+            node = c[index - 1]
+
+        if node.type == 'simple_stmt':
+            node = node.children[0]
+        if node.type == 'string':
+            return node
+        return None
+
+
+class PythonMixin(object):
+    """
+    Some Python specific utitilies.
+    """
+    __slots__ = ()
+
+    def get_name_of_position(self, position):
+        """
+        Given a (line, column) tuple, returns a :class`Name` or ``None`` if
+        there is no name at that position.
+        """
+        for c in self.children:
+            if isinstance(c, Leaf):
+                if c.type == 'name' and c.start_pos <= position <= c.end_pos:
+                    return c
+            else:
+                result = c.get_name_of_position(position)
+                if result is not None:
+                    return result
+        return None
+
+
+class PythonLeaf(PythonMixin, Leaf):
+    __slots__ = ()
+
+    def _split_prefix(self):
+        return split_prefix(self, self.get_start_pos_of_prefix())
+
+    def get_start_pos_of_prefix(self):
+        """
+        Basically calls :py:meth:`parso.tree.NodeOrLeaf.get_start_pos_of_prefix`.
+        """
+        # TODO it is really ugly that we have to override it. Maybe change
+        #   indent error leafs somehow? No idea how, though.
+        previous_leaf = self.get_previous_leaf()
+        if previous_leaf is not None and previous_leaf.type == 'error_leaf' \
+                and previous_leaf.original_type in ('indent', 'error_dedent'):
+            previous_leaf = previous_leaf.get_previous_leaf()
+
+        if previous_leaf is None:
+            return self.line - self.prefix.count('\n'), 0  # It's the first leaf.
+        return previous_leaf.end_pos
+
+
+
+class _LeafWithoutNewlines(PythonLeaf):
+    """
+    Simply here to optimize performance.
+    """
+    __slots__ = ()
+
+    @property
+    def end_pos(self):
+        return self.line, self.column + len(self.value)
+
+
+# Python base classes
+class PythonBaseNode(PythonMixin, BaseNode):
+    __slots__ = ()
+
+
+class PythonNode(PythonMixin, Node):
+    __slots__ = ()
+
+
+class PythonErrorNode(PythonMixin, ErrorNode):
+    __slots__ = ()
+
+
+class PythonErrorLeaf(ErrorLeaf, PythonLeaf):
+    __slots__ = ()
+
+
+class EndMarker(_LeafWithoutNewlines):
+    __slots__ = ()
+    type = 'endmarker'
+
+
+class Newline(PythonLeaf):
+    """Contains NEWLINE and ENDMARKER tokens."""
+    __slots__ = ()
+    type = 'newline'
+
+    @utf8_repr
+    def __repr__(self):
+        return "<%s: %s>" % (type(self).__name__, repr(self.value))
+
+
+class Name(_LeafWithoutNewlines):
+    """
+    A string. Sometimes it is important to know if the string belongs to a name
+    or not.
+    """
+    type = 'name'
+    __slots__ = ()
+
+    def __repr__(self):
+        return "<%s: %s@%s,%s>" % (type(self).__name__, self.value,
+                                   self.line, self.column)
+
+    def is_definition(self):
+        """
+        Returns True if the name is being defined.
+        """
+        return self.get_definition() is not None
+
+    def get_definition(self, import_name_always=False):
+        """
+        Returns None if there's on definition for a name.
+
+        :param import_name_alway: Specifies if an import name is always a
+            definition. Normally foo in `from foo import bar` is not a
+            definition.
+        """
+        node = self.parent
+        type_ = node.type
+        if type_ in ('power', 'atom_expr'):
+            # In `self.x = 3` self is not a definition, but x is.
+            return None
+
+        if type_ in ('funcdef', 'classdef'):
+            if self == node.name:
+                return node
+            return None
+
+        if type_ == 'except_clause':
+            # TODO in Python 2 this doesn't work correctly. See grammar file.
+            #      I think we'll just let it be. Python 2 will be gone in a few
+            #      years.
+            if self.get_previous_sibling() == 'as':
+                return node.parent  # The try_stmt.
+            return None
+
+        while node is not None:
+            if node.type == 'suite':
+                return None
+            if node.type in _GET_DEFINITION_TYPES:
+                if self in node.get_defined_names():
+                    return node
+                if import_name_always and node.type in _IMPORTS:
+                    return node
+                return None
+            node = node.parent
+        return None
+
+
+
+class Literal(PythonLeaf):
+    __slots__ = ()
+
+
+class Number(Literal):
+    type = 'number'
+    __slots__ = ()
+
+
+class String(Literal):
+    type = 'string'
+    __slots__ = ()
+
+    @property
+    def string_prefix(self):
+        return re.match('\w*(?=[\'"])', self.value).group(0)
+
+    def _get_payload(self):
+        match = re.search(
+            r'''('{3}|"{3}|'|")(.*)$''',
+            self.value,
+            flags=re.DOTALL
+        )
+        return match.group(2)[:-len(match.group(1))]
+
+
+class _StringComparisonMixin(object):
+    def __eq__(self, other):
+        """
+        Make comparisons with strings easy.
+        Improves the readability of the parser.
+        """
+        if isinstance(other, (str, unicode)):
+            return self.value == other
+
+        return self is other
+
+    def __ne__(self, other):
+        """Python 2 compatibility."""
+        return not self.__eq__(other)
+
+    def __hash__(self):
+        return hash(self.value)
+
+
+class Operator(_LeafWithoutNewlines, _StringComparisonMixin):
+    type = 'operator'
+    __slots__ = ()
+
+
+class Keyword(_LeafWithoutNewlines, _StringComparisonMixin):
+    type = 'keyword'
+    __slots__ = ()
+
+
+class Scope(PythonBaseNode, DocstringMixin):
+    """
+    Super class for the parser tree, which represents the state of a python
+    text file.
+    A Scope is either a function, class or lambda.
+    """
+    __slots__ = ()
+
+    def __init__(self, children):
+        super(Scope, self).__init__(children)
+
+    def iter_funcdefs(self):
+        """
+        Returns a generator of `funcdef` nodes.
+        """
+        return self._search_in_scope('funcdef')
+
+    def iter_classdefs(self):
+        """
+        Returns a generator of `classdef` nodes.
+        """
+        return self._search_in_scope('classdef')
+
+    def iter_imports(self):
+        """
+        Returns a generator of `import_name` and `import_from` nodes.
+        """
+        return self._search_in_scope('import_name', 'import_from')
+
+    def _search_in_scope(self, *names):
+        def scan(children):
+            for element in children:
+                if element.type in names:
+                    yield element
+                if element.type in _FUNC_CONTAINERS:
+                    for e in scan(element.children):
+                        yield e
+
+        return scan(self.children)
+
+    def get_suite(self):
+        """
+        Returns the part that is executed by the function.
+        """
+        return self.children[-1]
+
+    def __repr__(self):
+        try:
+            name = self.name.value
+        except AttributeError:
+            name = ''
+
+        return "<%s: %s@%s-%s>" % (type(self).__name__, name,
+                                   self.start_pos[0], self.end_pos[0])
+
+
+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__ = ('_used_names',)
+    type = 'file_input'
+
+    def __init__(self, children):
+        super(Module, self).__init__(children)
+        self._used_names = None
+
+    def _iter_future_import_names(self):
+        """
+        :return: A list of future import names.
+        :rtype: list of str
+        """
+        # In Python it's not allowed to use future imports after the first
+        # actual (non-future) statement. However this is not a linter here,
+        # just return all future imports. If people want to scan for issues
+        # they should use the API.
+        for imp in self.iter_imports():
+            if imp.type == 'import_from' and imp.level == 0:
+                for path in imp.get_paths():
+                    names = [name.value for name in path]
+                    if len(names) == 2 and names[0] == '__future__':
+                        yield names[1]
+
+    def _has_explicit_absolute_import(self):
+        """
+        Checks if imports in this module are explicitly absolute, i.e. there
+        is a ``__future__`` import.
+        Currently not public, might be in the future.
+        :return bool:
+        """
+        for name in self._iter_future_import_names():
+            if name == 'absolute_import':
+                return True
+        return False
+
+    def get_used_names(self):
+        """
+        Returns all the :class:`Name` leafs that exist in this module. This
+        includes both definitions and references of names.
+        """
+        if self._used_names is None:
+            # Don't directly use self._used_names to eliminate a lookup.
+            dct = {}
+
+            def recurse(node):
+                try:
+                    children = node.children
+                except AttributeError:
+                    if node.type == 'name':
+                        arr = dct.setdefault(node.value, [])
+                        arr.append(node)
+                else:
+                    for child in children:
+                        recurse(child)
+
+            recurse(self)
+            self._used_names = dct
+        return self._used_names
+
+
+class Decorator(PythonBaseNode):
+    type = 'decorator'
+    __slots__ = ()
+
+
+class ClassOrFunc(Scope):
+    __slots__ = ()
+
+    @property
+    def name(self):
+        """
+        Returns the `Name` leaf that defines the function or class name.
+        """
+        return self.children[1]
+
+    def get_decorators(self):
+        """
+        :rtype: list of :class:`Decorator`
+        """
+        decorated = self.parent
+        if decorated.type == 'decorated':
+            if decorated.children[0].type == '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.
+    """
+    type = 'classdef'
+    __slots__ = ()
+
+    def __init__(self, children):
+        super(Class, self).__init__(children)
+
+    def get_super_arglist(self):
+        """
+        Returns the `arglist` node that defines the super classes. It returns
+        None if there are no arguments.
+        """
+        if self.children[2] != '(':  # Has no parentheses
+            return None
+        else:
+            if self.children[3] == ')':  # Empty parentheses
+                return None
+            else:
+                return self.children[3]
+
+
+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 == 'fpdef' and node.children[0] == '('
+
+    try:
+        first = argslist_list[0]
+    except IndexError:
+        return []
+
+    if first.type in ('name', 'fpdef'):
+        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`.
+        if first.type == 'tfpdef':
+            children = [first]
+        else:
+            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 param_children[0] == '*' and param_children[1] == ',' \
+                            or check_python2_nested_param(param_children[0]):
+                        for p in param_children:
+                            p.parent = parent
+                        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. or 5. <Operator: :>
+        4. or 6. Node() representing function body
+        3. -> (if annotation is also present)
+        4. annotation (if present)
+    """
+    type = 'funcdef'
+
+    def __init__(self, children):
+        super(Function, self).__init__(children)
+        parameters = self.children[2]  # After `def foo`
+        parameters.children[1:-1] = _create_params(parameters, parameters.children[1:-1])
+
+    def _get_param_nodes(self):
+        return self.children[2].children
+
+    def get_params(self):
+        """
+        Returns a list of `Param()`.
+        """
+        return [p for p in self._get_param_nodes() if p.type == 'param']
+
+    @property
+    def name(self):
+        return self.children[1]  # First token after `def`
+
+    def iter_yield_exprs(self):
+        """
+        Returns a generator of `yield_expr`.
+        """
+        def scan(children):
+            for element in children:
+                if element.type in ('classdef', 'funcdef', 'lambdef'):
+                    continue
+
+                try:
+                    nested_children = element.children
+                except AttributeError:
+                    if element.value == 'yield':
+                        if element.parent.type == 'yield_expr':
+                            yield element.parent
+                        else:
+                            yield element
+                else:
+                    for result in scan(nested_children):
+                        yield result
+
+        return scan(self.children)
+
+    def iter_return_stmts(self):
+        """
+        Returns a generator of `return_stmt`.
+        """
+        def scan(children):
+            for element in children:
+                if element.type == 'return_stmt' \
+                        or element.type == 'keyword' and element.value == 'return':
+                    yield element
+                if element.type in _RETURN_STMT_CONTAINERS:
+                    for e in scan(element.children):
+                        yield e
+
+        return scan(self.children)
+
+    def is_generator(self):
+        """
+        :return bool: Checks if a function is a generator or not.
+        """
+        return next(self.iter_yield_exprs(), None) is not None
+
+    @property
+    def annotation(self):
+        """
+        Returns the test node after `->` or `None` if there is no annotation.
+        """
+        try:
+            if self.children[3] == "->":
+                return self.children[4]
+            assert self.children[3] == ":"
+            return None
+        except IndexError:
+            return None
+
+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 = 'lambdef'
+    __slots__ = ()
+
+    def __init__(self, children):
+        # We don't want to call the Function constructor, call its parent.
+        super(Function, self).__init__(children)
+        # Everything between `lambda` and the `:` operator is a parameter.
+        self.children[1:-2] = _create_params(self, self.children[1:-2])
+
+    @property
+    def name(self):
+        """
+        Raises an AttributeError. Lambdas don't have a defined name.
+        """
+        raise AttributeError("lambda is not named.")
+
+    def _get_param_nodes(self):
+        return self.children[1:-2]
+
+    @property
+    def annotation(self):
+        """
+        Returns `None`, lambdas don't have annotations.
+        """
+        return None
+
+    def __repr__(self):
+        return "<%s@%s>" % (self.__class__.__name__, self.start_pos)
+
+
+class Flow(PythonBaseNode):
+    __slots__ = ()
+
+
+class IfStmt(Flow):
+    type = 'if_stmt'
+    __slots__ = ()
+
+    def get_test_nodes(self):
+        """
+        E.g. returns all the `test` nodes that are named as x, below:
+
+            if x:
+                pass
+            elif x:
+                pass
+        """
+        for i, c in enumerate(self.children):
+            if c in ('elif', 'if'):
+                yield self.children[i + 1]
+
+    def get_corresponding_test_node(self, node):
+        """
+        Searches for the branch in which the node is and returns the
+        corresponding test node (see function above). However if the node is in
+        the test node itself and not in the suite return None.
+        """
+        start_pos = node.start_pos
+        for check_node in reversed(list(self.get_test_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 is_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_testlist(self):
+        """
+        Returns the input node ``y`` from: ``for x in y:``.
+        """
+        return self.children[3]
+
+    def get_defined_names(self):
+        return _defined_names(self.children[1])
+
+
+class TryStmt(Flow):
+    type = 'try_stmt'
+    __slots__ = ()
+
+    def get_except_clause_tests(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
+
+
+class WithStmt(Flow):
+    type = 'with_stmt'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        """
+        Returns the a list of `Name` that the with statement defines. The
+        defined names are set after `as`.
+        """
+        names = []
+        for with_item in self.children[1:-2:2]:
+            # Check with items for 'as' names.
+            if with_item.type == 'with_item':
+                names += _defined_names(with_item.children[2])
+        return names
+
+    def get_test_node_from_name(self, name):
+        node = name.parent
+        if node.type != 'with_item':
+            raise ValueError('The name is not actually part of a with statement.')
+        return node.children[0]
+
+
+class Import(PythonBaseNode):
+    __slots__ = ()
+
+    def get_path_for_name(self, name):
+        """
+        The path is the list of names that leads to the searched name.
+
+        :return list of 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.get_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] == '*'
+
+
+class ImportFrom(Import):
+    type = 'import_from'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        """
+        Returns the a list of `Name` that the import defines. The
+        defined names are set after `import` or in case an alias - `as` - is
+        present that name is returned.
+        """
+        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 n.type == '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 last.type == '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 get_paths(self):
+        """
+        The import paths defined in an import statement. Typically an array
+        like this: ``[<Name: datetime>, <Name: date>]``.
+
+        :return list of list of Name:
+        """
+        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):
+        """
+        Returns the a list of `Name` that the import defines. The defined names
+        is always the first name after `import` or in case an alias - `as` - is
+        present that name is returned.
+        """
+        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 get_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 dotted_as_names.type == 'dotted_as_names':
+            as_names = dotted_as_names.children[::2]
+        else:
+            as_names = [dotted_as_names]
+
+        for as_name in as_names:
+            if as_name.type == '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 bool([1 for path, alias in self._dotted_as_names()
+                    if alias is None and len(path) > 1])
+
+    def _aliases(self):
+        """
+        :return list of Name: Returns all the alias
+        """
+        return dict((alias, path[-1]) for path, alias in self._dotted_as_names()
+                    if alias is not None)
+
+
+class KeywordStatement(PythonBaseNode):
+    """
+    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
+
+
+class AssertStmt(KeywordStatement):
+    __slots__ = ()
+
+    @property
+    def assertion(self):
+        return self.children[1]
+
+
+class GlobalStmt(KeywordStatement):
+    __slots__ = ()
+
+    def get_global_names(self):
+        return self.children[1::2]
+
+
+class ReturnStmt(KeywordStatement):
+    __slots__ = ()
+
+
+class YieldExpr(PythonBaseNode):
+    type = 'yield_expr'
+    __slots__ = ()
+
+
+def _defined_names(current):
+    """
+    A helper function to find the defined names in statements, for loops and
+    list comprehensions.
+    """
+    names = []
+    if current.type in ('testlist_star_expr', 'testlist_comp', 'exprlist', 'testlist'):
+        for child in current.children[::2]:
+            names += _defined_names(child)
+    elif current.type in ('atom', 'star_expr'):
+        names += _defined_names(current.children[1])
+    elif current.type in ('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(PythonBaseNode, DocstringMixin):
+    type = 'expr_stmt'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        """
+        Returns a list of `Name` defined before the `=` sign.
+        """
+        names = []
+        if self.children[1].type == 'annassign':
+            names = _defined_names(self.children[0])
+        return [
+            name
+            for i in range(0, len(self.children) - 2, 2)
+            if '=' in self.children[i + 1].value
+            for name in _defined_names(self.children[i])
+        ] + names
+
+    def get_rhs(self):
+        """Returns the right-hand-side of the equals."""
+        return self.children[-1]
+
+    def yield_operators(self):
+        """
+        Returns a generator of `+=`, `=`, etc. or None if there is no operation.
+        """
+        first = self.children[1]
+        if first.type == 'annassign':
+            if len(first.children) <= 2:
+                return  # No operator is available, it's just PEP 484.
+
+            first = first.children[2]
+        yield first
+
+        for operator in self.children[3::2]:
+            yield operator
+
+
+class Param(PythonBaseNode):
+    """
+    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 star_count(self):
+        """
+        Is `0` in case of `foo`, `1` in case of `*foo` or `2` in case of
+        `**foo`.
+        """
+        first = self.children[0]
+        if first in ('*', '**'):
+            return len(first.value)
+        return 0
+
+    @property
+    def default(self):
+        """
+        The default is the test node that appears after the `=`. Is `None` in
+        case no default is present.
+        """
+        has_comma = self.children[-1] == ','
+        try:
+            if self.children[-2 - int(has_comma)] == '=':
+                return self.children[-1 - int(has_comma)]
+        except IndexError:
+            return None
+
+    @property
+    def annotation(self):
+        """
+        The default is the test node that appears after `->`. Is `None` in case
+        no annotation is present.
+        """
+        tfpdef = self._tfpdef()
+        if tfpdef.type == 'tfpdef':
+            assert tfpdef.children[1] == ":"
+            assert len(tfpdef.children) == 3
+            annotation = tfpdef.children[2]
+            return annotation
+        else:
+            return None
+
+    def _tfpdef(self):
+        """
+        tfpdef: see e.g. grammar36.txt.
+        """
+        offset = int(self.children[0] in ('*', '**'))
+        return self.children[offset]
+
+    @property
+    def name(self):
+        """
+        The `Name` leaf of the param.
+        """
+        if self._tfpdef().type == 'tfpdef':
+            return self._tfpdef().children[0]
+        else:
+            return self._tfpdef()
+
+    def get_defined_names(self):
+        return [self.name]
+
+    @property
+    def position_index(self):
+        """
+        Property for the positional index of a paramter.
+        """
+        index = self.parent.children.index(self)
+        try:
+            keyword_only_index = self.parent.children.index('*')
+            if index > keyword_only_index:
+                # Skip the ` *, `
+                index -= 2
+        except ValueError:
+            pass
+        return index - 1
+
+    def get_parent_function(self):
+        """
+        Returns the function/lambda of a parameter.
+        """
+        return search_ancestor(self, 'funcdef', 'lambdef')
+
+    def get_code(self, include_prefix=True, include_comma=True):
+        """
+        Like all the other get_code functions, but includes the param
+        `include_comma`.
+
+        :param include_comma bool: If enabled includes the comma in the string output.
+        """
+        if include_comma:
+            return super(Param, self).get_code(include_prefix)
+
+        children = self.children
+        if children[-1] == ',':
+            children = children[:-1]
+        return self._get_code_for_children(
+            children,
+            include_prefix=include_prefix
+        )
+
+    def __repr__(self):
+        default = '' if self.default is None else '=%s' % self.default.get_code()
+        return '<%s: %s>' % (type(self).__name__, str(self._tfpdef()) + default)
+
+
+class CompFor(PythonBaseNode):
+    type = 'comp_for'
+    __slots__ = ()
+
+    def get_defined_names(self):
+        """
+        Returns the a list of `Name` that the comprehension defines.
+        """
+        return _defined_names(self.children[1])
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/tree.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/tree.py
new file mode 100644
index 0000000..b098402
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/tree.py
@@ -0,0 +1,356 @@
+from abc import abstractmethod, abstractproperty
+from parso._compatibility import utf8_repr, encoding, py_version
+
+
+def search_ancestor(node, *node_types):
+    """
+    Recursively looks at the parents of a node and returns the first found node
+    that matches node_types. Returns ``None`` if no matching node is found.
+
+    :param node: The ancestors of this node will be checked.
+    :param node_types: type names that are searched for.
+    :type node_types: tuple of str
+    """
+    while True:
+        node = node.parent
+        if node is None or node.type in node_types:
+            return node
+
+
+class NodeOrLeaf(object):
+    """
+    The base class for nodes and leaves.
+    """
+    __slots__ = ()
+    type = None
+    '''
+    The type is a string that typically matches the types of the grammar file.
+    '''
+
+    def get_root_node(self):
+        """
+        Returns the root node of a parser tree. The returned node doesn't have
+        a parent node like all the other nodes/leaves.
+        """
+        scope = self
+        while scope.parent is not None:
+            scope = scope.parent
+        return scope
+
+    def get_next_sibling(self):
+        """
+        Returns the node immediately following this node in this parent's
+        children list. If this node 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):
+        """
+        Returns the node immediately preceding this node in this parent's
+        children list. If this node does not have a previous sibling, it is
+        None.
+        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.
+        Returns `None` if this is the first element in the parser tree.
+        """
+        node = self
+        while True:
+            c = node.parent.children
+            i = c.index(node)
+            if i == 0:
+                node = node.parent
+                if node.parent is None:
+                    return None
+            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 next leaf in the parser tree.
+        Returns None if this is the last element in the parser tree.
+        """
+        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:
+                    return None
+            else:
+                node = c[i + 1]
+                break
+
+        while True:
+            try:
+                node = node.children[0]
+            except AttributeError:  # A Leaf doesn't have children.
+                return node
+
+    @abstractproperty
+    def start_pos(self):
+        """
+        Returns the starting position of the prefix as a tuple, e.g. `(3, 4)`.
+
+        :return tuple of int: (line, column)
+        """
+
+    @abstractproperty
+    def end_pos(self):
+        """
+        Returns the end position of the prefix as a tuple, e.g. `(3, 4)`.
+
+        :return tuple of int: (line, column)
+        """
+
+    @abstractmethod
+    def get_start_pos_of_prefix(self):
+        """
+        Returns the start_pos of the prefix. This means basically it returns
+        the end_pos of the last prefix. The `get_start_pos_of_prefix()` of the
+        prefix `+` in `2 + 1` would be `(1, 1)`, while the start_pos is
+        `(1, 2)`.
+
+        :return tuple of int: (line, column)
+        """
+
+    @abstractmethod
+    def get_first_leaf(self):
+        """
+        Returns the first leaf of a node or itself if this is a leaf.
+        """
+
+    @abstractmethod
+    def get_last_leaf(self):
+        """
+        Returns the last leaf of a node or itself if this is a leaf.
+        """
+
+    @abstractmethod
+    def get_code(self, include_prefix=True):
+        """
+        Returns the code that was input the input for the parser for this node.
+
+        :param include_prefix: Removes the prefix (whitespace and comments) of
+            e.g. a statement.
+        """
+
+
+class Leaf(NodeOrLeaf):
+    '''
+    Leafs are basically tokens with a better API. Leafs exactly know where they
+    were defined and what text preceeds them.
+    '''
+    __slots__ = ('value', 'parent', 'line', 'column', 'prefix')
+
+    def __init__(self, value, start_pos, prefix=''):
+        self.value = value
+        '''
+        :py:func:`str` The value of the current token.
+        '''
+        self.start_pos = start_pos
+        self.prefix = prefix
+        '''
+        :py:func:`str` Typically a mixture of whitespace and comments. Stuff
+        that is syntactically irrelevant for the syntax tree.
+        '''
+        self.parent = None
+        '''
+        The parent :class:`BaseNode` of this leaf.
+        '''
+
+    @property
+    def start_pos(self):
+        return self.line, self.column
+
+    @start_pos.setter
+    def start_pos(self, value):
+        self.line = value[0]
+        self.column = value[1]
+
+    def get_start_pos_of_prefix(self):
+        previous_leaf = self.get_previous_leaf()
+        if previous_leaf is None:
+            return self.line - self.prefix.count('\n'), 0  # It's the first leaf.
+        return previous_leaf.end_pos
+
+    def get_first_leaf(self):
+        return self
+
+    def get_last_leaf(self):
+        return self
+
+    def get_code(self, include_prefix=True):
+        if include_prefix:
+            return self.prefix + self.value
+        else:
+            return self.value
+
+    @property
+    def end_pos(self):
+        lines = self.value.split('\n')
+        end_pos_line = self.line + len(lines) - 1
+        # Check for multiline token
+        if self.line == end_pos_line:
+            end_pos_column = self.column + len(lines[-1])
+        else:
+            end_pos_column = len(lines[-1])
+        return end_pos_line, end_pos_column
+
+    @utf8_repr
+    def __repr__(self):
+        value = self.value
+        if not value:
+            value = self.type
+        return "<%s: %s>" % (type(self).__name__, value)
+
+
+class TypedLeaf(Leaf):
+    __slots__ = ('type',)
+    def __init__(self, type, value, start_pos, prefix=''):
+        super(TypedLeaf, self).__init__(value, start_pos, prefix)
+        self.type = type
+
+
+class BaseNode(NodeOrLeaf):
+    """
+    The super class for all nodes.
+    A node has children, a type and possibly a parent node.
+    """
+    __slots__ = ('children', 'parent')
+    type = None
+
+    def __init__(self, children):
+        for c in children:
+            c.parent = self
+        self.children = children
+        """
+        A list of :class:`NodeOrLeaf` child nodes.
+        """
+        self.parent = None
+        '''
+        The parent :class:`BaseNode` of this leaf.
+        None if this is the root node.
+        '''
+
+    @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_for_children(self, children, include_prefix):
+        if include_prefix:
+            return "".join(c.get_code() for c in children)
+        else:
+            first = children[0].get_code(include_prefix=False)
+            return first + "".join(c.get_code() for c in children[1:])
+
+    def get_code(self, include_prefix=True):
+        return self._get_code_for_children(self.children, include_prefix)
+
+    def get_leaf_for_position(self, position, include_prefixes=False):
+        def binary_search(lower, upper):
+            if lower == upper:
+                element = self.children[lower]
+                if not include_prefixes and position < element.start_pos:
+                    # We're on a prefix.
+                    return None
+                # In case we have prefixes, a leaf always matches
+                try:
+                    return element.get_leaf_for_position(position, include_prefixes)
+                except AttributeError:
+                    return element
+
+
+            index = int((lower + upper) / 2)
+            element = self.children[index]
+            if position <= element.end_pos:
+                return binary_search(lower, index)
+            else:
+                return binary_search(index + 1, upper)
+
+        if not ((1, 0) <= position <= self.children[-1].end_pos):
+            raise ValueError('Please provide a position that exists within this node.')
+        return binary_search(0, len(self.children) - 1)
+
+    def get_first_leaf(self):
+        return self.children[0].get_first_leaf()
+
+    def get_last_leaf(self):
+        return self.children[-1].get_last_leaf()
+
+    @utf8_repr
+    def __repr__(self):
+        code = self.get_code().replace('\n', ' ').strip()
+        if not py_version >= 30:
+            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',)
+
+    def __init__(self, type, children):
+        super(Node, self).__init__(children)
+        self.type = type
+
+    def __repr__(self):
+        return "%s(%s, %r)" % (self.__class__.__name__, self.type, self.children)
+
+
+class ErrorNode(BaseNode):
+    """
+    A node that containes valid nodes/leaves that we're follow by a token that
+    was invalid. This basically means that the leaf after this node is where
+    Python would mark a syntax error.
+    """
+    __slots__ = ()
+    type = 'error_node'
+
+
+class ErrorLeaf(Leaf):
+    """
+    A leaf that is either completely invalid in a language (like `$` in Python)
+    or is invalid at that position. Like the star in `1 +* 1`.
+    """
+    __slots__ = ('original_type',)
+    type = 'error_leaf'
+
+    def __init__(self, original_type, value, start_pos, prefix=''):
+        super(ErrorLeaf, self).__init__(value, start_pos, prefix)
+        self.original_type = original_type
+
+    def __repr__(self):
+        return "<%s: %s:%s, %s>" % \
+            (type(self).__name__, self.original_type, repr(self.value), self.start_pos)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/utils.py
new file mode 100644
index 0000000..a4801b9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/parso/utils.py
@@ -0,0 +1,156 @@
+from collections import namedtuple
+import re
+import sys
+from ast import literal_eval
+
+from parso._compatibility import unicode, total_ordering
+
+
+Version = namedtuple('Version', 'major, minor, micro')
+
+
+def split_lines(string, keepends=False):
+    r"""
+    Intended for Python code. In contrast to Python's :py:meth:`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.
+
+    In Python 2.7 form feeds are used as normal characters when using
+    str.splitlines. However in Python 3 somewhere there was a decision to split
+    also on form feeds.
+    """
+    if keepends:
+        lst = string.splitlines(True)
+
+        # We have to merge lines that were broken by form feed characters.
+        merge = []
+        for i, line in enumerate(lst):
+            if line.endswith('\f'):
+                merge.append(i)
+
+        for index in reversed(merge):
+            try:
+                lst[index] = lst[index] + lst[index + 1]
+                del lst[index + 1]
+            except IndexError:
+                # index + 1 can be empty and therefore there's no need to
+                # merge.
+                pass
+
+        # The stdlib's implementation of the end is inconsistent when calling
+        # it with/without keepends. One time there's an empty string in the
+        # end, one time there's none.
+        if string.endswith('\n') or string == '':
+            lst.append('')
+        return lst
+    else:
+        return re.split('\n|\r\n', string)
+
+
+def python_bytes_to_unicode(source, encoding='utf-8', errors='strict'):
+    """
+    Checks for unicode BOMs and PEP 263 encoding declarations. Then returns a
+    unicode object like in :py:meth:`bytes.decode`.
+
+    :param encoding: See :py:meth:`bytes.decode` documentation.
+    :param errors: See :py:meth:`bytes.decode` documentation. ``errors`` can be
+        ``'strict'``, ``'replace'`` or ``'ignore'``.
+    """
+    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 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
+    return unicode(source, encoding, errors)
+
+
+def version_info():
+    """
+    Returns a namedtuple of parso's version, similar to Python's
+    ``sys.version_info``.
+    """
+    from parso import __version__
+    tupl = re.findall(r'[a-z]+|\d+', __version__)
+    return Version(*[x if i == 3 else int(x) for i, x in enumerate(tupl)])
+
+
+def _parse_version(version):
+    match = re.match(r'(\d+)(?:\.(\d)(?:\.\d+)?)?$', version)
+    if match is None:
+        raise ValueError('The given version is not in the right format. '
+                         'Use something like "3.2" or "3".')
+
+    major = int(match.group(1))
+    minor = match.group(2)
+    if minor is None:
+        # Use the latest Python in case it's not exactly defined, because the
+        # grammars are typically backwards compatible?
+        if major == 2:
+            minor = "7"
+        elif major == 3:
+            minor = "6"
+        else:
+            raise NotImplementedError("Sorry, no support yet for those fancy new/old versions.")
+    minor = int(minor)
+    return PythonVersionInfo(major, minor)
+
+
+@total_ordering
+class PythonVersionInfo(namedtuple('Version', 'major, minor')):
+    def __gt__(self, other):
+        if isinstance(other, tuple):
+            if len(other) != 2:
+                raise ValueError("Can only compare to tuples of length 2.")
+            return (self.major, self.minor) > other
+        super(PythonVersionInfo, self).__gt__(other)
+
+        return (self.major, self.minor)
+
+    def __eq__(self, other):
+        if isinstance(other, tuple):
+            if len(other) != 2:
+                raise ValueError("Can only compare to tuples of length 2.")
+            return (self.major, self.minor) == other
+        super(PythonVersionInfo, self).__eq__(other)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+
+def parse_version_string(version=None):
+    """
+    Checks for a valid version number (e.g. `3.2` or `2.7.1` or `3`) and
+    returns a corresponding version info that is always two characters long in
+    decimal.
+    """
+    if version is None:
+        version = '%s.%s' % sys.version_info[:2]
+    if not isinstance(version, (unicode, str)):
+        raise TypeError("version must be a string like 3.2.")
+
+    return _parse_version(version)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/pytest.ini b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/pytest.ini
new file mode 100644
index 0000000..6cb23bf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/pytest.ini
@@ -0,0 +1,10 @@
+[pytest]
+addopts = --doctest-modules
+
+# Ignore broken files inblackbox test directories
+norecursedirs = .* docs scripts normalizer_issue_files build
+
+# 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_parso_cache
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/scripts/diff_parser_profile.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/scripts/diff_parser_profile.py
new file mode 100755
index 0000000..a152a3e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/scripts/diff_parser_profile.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+"""
+Profile a piece of Python code with ``cProfile`` that uses the diff parser.
+
+Usage:
+  profile.py <file> [-d] [-s <sort>]
+  profile.py -h | --help
+
+Options:
+  -h --help     Show this screen.
+  -d --debug    Enable Jedi internal debugging.
+  -s <sort>     Sort the profile results, e.g. cumtime, name [default: time].
+"""
+
+import cProfile
+
+from docopt import docopt
+from jedi.parser.python import load_grammar
+from jedi.parser.diff import DiffParser
+from jedi.parser.python import ParserWithRecovery
+from jedi._compatibility import u
+from jedi.common import splitlines
+import jedi
+
+
+def run(parser, lines):
+    diff_parser = DiffParser(parser)
+    diff_parser.update(lines)
+    # Make sure used_names is loaded
+    parser.module.used_names
+
+
+def main(args):
+    if args['--debug']:
+        jedi.set_debug_function(notices=True)
+
+    with open(args['<file>']) as f:
+        code = f.read()
+    grammar = load_grammar()
+    parser = ParserWithRecovery(grammar, u(code))
+    # Make sure used_names is loaded
+    parser.module.used_names
+
+    code =  code + '\na\n'  # Add something so the diff parser needs to run.
+    lines = splitlines(code, keepends=True)
+    cProfile.runctx('run(parser, lines)', globals(), locals(), sort=args['-s'])
+
+if __name__ == '__main__':
+    args = docopt(__doc__)
+    main(args)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.cfg b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.cfg
new file mode 100644
index 0000000..3c6e79c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.cfg
@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal=1
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.py
new file mode 100755
index 0000000..3eef0e4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/setup.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python
+
+from __future__ import with_statement
+
+from setuptools import setup, find_packages
+
+import parso
+
+
+__AUTHOR__ = 'David Halter'
+__AUTHOR_EMAIL__ = 'davidhalter88@gmail.com'
+
+readme = open('README.rst').read() + '\n\n' + open('CHANGELOG.rst').read()
+
+setup(name='parso',
+      version=parso.__version__,
+      description='A Python Parser',
+      author=__AUTHOR__,
+      author_email=__AUTHOR_EMAIL__,
+      include_package_data=True,
+      maintainer=__AUTHOR__,
+      maintainer_email=__AUTHOR_EMAIL__,
+      url='https://github.com/davidhalter/parso',
+      license='MIT',
+      keywords='python parser parsing',
+      long_description=readme,
+      packages=find_packages(exclude=['test']),
+      package_data={'parso': ['python/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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/__init__.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/failing_examples.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/failing_examples.py
new file mode 100644
index 0000000..4227679
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/failing_examples.py
@@ -0,0 +1,313 @@
+# -*- coding: utf-8 -*-
+import sys
+from textwrap import dedent
+
+
+def indent(code):
+    lines = code.splitlines(True)
+    return ''.join([' ' * 2 + line for line in lines])
+
+
+def build_nested(code, depth, base='def f():\n'):
+    if depth == 0:
+        return code
+
+    new_code = base + indent(code)
+    return build_nested(new_code, depth - 1, base=base)
+
+
+FAILING_EXAMPLES = [
+    '1 +',
+    '?',
+    # Python/compile.c
+    dedent('''\
+        for a in [1]:
+            try:
+                pass
+            finally:
+                continue
+        '''), # 'continue' not supported inside 'finally' clause"
+    'continue',
+    'break',
+    'return',
+    'yield',
+
+    # SyntaxError from Python/ast.c
+    'f(x for x in bar, 1)',
+    'from foo import a,',
+    'from __future__ import whatever',
+    'from __future__ import braces',
+    'from .__future__ import whatever',
+    'def f(x=3, y): pass',
+    'lambda x=3, y: x',
+    '__debug__ = 1',
+    'with x() as __debug__: pass',
+    # Mostly 3.6 relevant
+    '[]: int',
+    '[a, b]: int',
+    '(): int',
+    '(()): int',
+    '((())): int',
+    '{}: int',
+    'True: int',
+    '(a, b): int',
+    '*star,: int',
+    'a, b: int = 3',
+    'foo(+a=3)',
+    'f(lambda: 1=1)',
+    'f(x=1, x=2)',
+    'f(**x, y)',
+    'f(x=2, y)',
+    'f(**x, *y)',
+    'f(**x, y=3, z)',
+    'a, b += 3',
+    '(a, b) += 3',
+    '[a, b] += 3',
+    # All assignment tests
+    'lambda a: 1 = 1',
+    '[x for x in y] = 1',
+    '{x for x in y} = 1',
+    '{x:x for x in y} = 1',
+    '(x for x in y) = 1',
+    'None = 1',
+    '... = 1',
+    'a == b = 1',
+    '{a, b} = 1',
+    '{a: b} = 1',
+    '1 = 1',
+    '"" = 1',
+    'b"" = 1',
+    'b"" = 1',
+    '"" "" = 1',
+    '1 | 1 = 3',
+    '1**1 = 3',
+    '~ 1 = 3',
+    'not 1 = 3',
+    '1 and 1 = 3',
+    'def foo(): (yield 1) = 3',
+    'def foo(): x = yield 1 = 3',
+    'async def foo(): await x = 3',
+    '(a if a else a) = a',
+    'a, 1 = x',
+    'foo() = 1',
+    # Cases without the equals but other assignments.
+    'with x as foo(): pass',
+    'del bar, 1',
+    'for x, 1 in []: pass',
+    'for (not 1) in []: pass',
+    '[x for 1 in y]',
+    '[x for a, 3 in y]',
+    '(x for 1 in y)',
+    '{x for 1 in y}',
+    '{x:x for 1 in y}',
+    # Unicode/Bytes issues.
+    r'u"\x"',
+    r'u"\"',
+    r'u"\u"',
+    r'u"""\U"""',
+    r'u"\Uffffffff"',
+    r"u'''\N{}'''",
+    r"u'\N{foo}'",
+    r'b"\x"',
+    r'b"\"',
+    '*a, *b = 3, 3',
+    'async def foo(): yield from []',
+    'yield from []',
+    '*a = 3',
+    'del *a, b',
+    'def x(*): pass',
+    '(%s *d) = x' % ('a,' * 256),
+    '{**{} for a in [1]}',
+
+    # Parser/tokenize.c
+    r'"""',
+    r'"',
+    r"'''",
+    r"'",
+    r"\blub",
+    # IndentationError: too many levels of indentation
+    build_nested('pass', 100),
+
+    # SyntaxErrors from Python/symtable.c
+    'def f(x, x): pass',
+    'nonlocal a',
+
+    # IndentationError
+    ' foo',
+    'def x():\n    1\n 2',
+    'def x():\n 1\n  2',
+    'if 1:\nfoo',
+    'if 1: blubb\nif 1:\npass\nTrue and False',
+
+    # f-strings
+    'f"{}"',
+    'f"{\\}"',
+    'f"{\'\\\'}"',
+    'f"{#}"',
+    "f'{1!b}'",
+    "f'{1:{5:{3}}}'",
+    "f'{'",
+    "f'{'",
+    "f'}'",
+    "f'{\"}'",
+    "f'{\"}'",
+    # Now nested parsing
+    "f'{continue}'",
+    "f'{1;1}'",
+    "f'{a=3}'",
+    "f'{b\"\" \"\"}'",
+]
+
+GLOBAL_NONLOCAL_ERROR = [
+    dedent('''
+        def glob():
+            x = 3
+            x.z
+            global x'''),
+    dedent('''
+        def glob():
+            x = 3
+            global x'''),
+    dedent('''
+        def glob():
+            x
+            global x'''),
+    dedent('''
+        def glob():
+            x = 3
+            x.z
+            nonlocal x'''),
+    dedent('''
+        def glob():
+            x = 3
+            nonlocal x'''),
+    dedent('''
+        def glob():
+            x
+            nonlocal x'''),
+    # Annotation issues
+    dedent('''
+        def glob():
+            x[0]: foo
+            global x'''),
+    dedent('''
+        def glob():
+            x.a: foo
+            global x'''),
+    dedent('''
+        def glob():
+            x: foo
+            global x'''),
+    dedent('''
+        def glob():
+            x: foo = 5
+            global x'''),
+    dedent('''
+        def glob():
+            x: foo = 5
+            x
+            global x'''),
+    dedent('''
+        def glob():
+            global x
+            x: foo = 3
+        '''),
+    # global/nonlocal + param
+    dedent('''
+        def glob(x):
+            global x
+        '''),
+    dedent('''
+        def glob(x):
+            nonlocal x
+        '''),
+    dedent('''
+        def x():
+            a =3
+            def z():
+                nonlocal a
+                a = 3
+                nonlocal a
+        '''),
+    dedent('''
+        def x():
+            a = 4
+            def y():
+                global a
+                nonlocal a
+        '''),
+    # Missing binding of nonlocal
+    dedent('''
+        def x():
+            nonlocal a
+        '''),
+    dedent('''
+        def x():
+            def y():
+                nonlocal a
+        '''),
+    dedent('''
+        def x():
+            a = 4
+            def y():
+                global a
+                print(a)
+                def z():
+                    nonlocal a
+        '''),
+]
+
+if sys.version_info >= (3, 6):
+    FAILING_EXAMPLES += GLOBAL_NONLOCAL_ERROR
+    FAILING_EXAMPLES += [
+        # Raises multiple errors in previous versions.
+        'async def foo():\n def nofoo():[x async for x in []]',
+    ]
+if sys.version_info >= (3, 5):
+    FAILING_EXAMPLES += [
+        # Raises different errors so just ignore them for now.
+        '[*[] for a in [1]]',
+        # Raises multiple errors in previous versions.
+        'async def bla():\n def x():  await bla()',
+    ]
+if sys.version_info >= (3, 4):
+    # Before that del None works like del list, it gives a NameError.
+    FAILING_EXAMPLES.append('del None')
+if sys.version_info >= (3,):
+    FAILING_EXAMPLES += [
+        # Unfortunately assigning to False and True do not raise an error in
+        # 2.x.
+        '(True,) = x',
+        '([False], a) = x',
+        # A symtable error that raises only a SyntaxWarning in Python 2.
+        'def x(): from math import *',
+        # unicode chars in bytes are allowed in python 2
+        'b"ä"',
+        # combining strings and unicode is allowed in Python 2.
+        '"s" b""',
+    ]
+if sys.version_info >= (2, 7):
+    # This is something that raises a different error in 2.6 than in the other
+    # versions. Just skip it for 2.6.
+    FAILING_EXAMPLES.append('[a, 1] += 3')
+
+if sys.version_info[:2] == (3, 5):
+    # yields are not allowed in 3.5 async functions. Therefore test them
+    # separately, here.
+    FAILING_EXAMPLES += [
+        'async def foo():\n yield x',
+        'async def foo():\n yield x',
+    ]
+else:
+    FAILING_EXAMPLES += [
+        'async def foo():\n yield x\n return 1',
+        'async def foo():\n yield x\n return 1',
+    ]
+
+
+if sys.version_info[:2] <= (3, 4):
+    # Python > 3.4 this is valid code.
+    FAILING_EXAMPLES += [
+        'a = *[1], 2',
+        '(*[1], 2)',
+    ]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E10.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E10.py
new file mode 100644
index 0000000..38d7a19
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E10.py
@@ -0,0 +1,51 @@
+for a in 'abc':
+    for b in 'xyz':
+        hello(a)  # indented with 8 spaces
+        #: E903:0
+	hello(b)  # indented with 1 tab
+if True:
+    #: E101:0
+	pass
+
+#: E122+1
+change_2_log = \
+"""Change 2 by slamb@testclient on 2006/04/13 21:46:23
+
+	creation
+"""
+
+p4change = {
+    2: change_2_log,
+}
+
+
+class TestP4Poller(unittest.TestCase):
+    def setUp(self):
+        self.setUpGetProcessOutput()
+        return self.setUpChangeSource()
+
+    def tearDown(self):
+        pass
+
+
+#
+if True:
+    #: E101:0 E101+1:0
+	foo(1,
+	    2)
+
+
+def test_keys(self):
+    """areas.json - All regions are accounted for."""
+    expected = set([
+        #: E101:0
+	u'Norrbotten',
+        #: E101:0
+	u'V\xe4sterbotten',
+    ])
+
+
+if True:
+    hello("""
+	tab at start of this line
+""")
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E101.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E101.py
new file mode 100644
index 0000000..cc24719
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E101.py
@@ -0,0 +1,137 @@
+# Used to be the file for W191
+
+#: E101+1
+if False:
+	print  # indented with 1 tab
+
+#: E101+1
+y = x == 2 \
+	or x == 3
+#: E101+5
+if (
+        x == (
+            3
+        ) or
+        y == 4):
+	pass
+#: E101+3
+if x == 2 \
+        or y > 1 \
+        or x == 3:
+	pass
+#: E101+3
+if x == 2 \
+        or y > 1 \
+        or x == 3:
+	pass
+
+#: E101+1
+if (foo == bar and baz == frop):
+	pass
+#: E101+1
+if (foo == bar and baz == frop):
+	pass
+
+#: E101+2 E101+3
+if start[1] > end_col and not (
+        over_indent == 4 and indent_next):
+	assert (0, "E121 continuation line over-"
+	        "indented for visual indent")
+
+
+#: E101+3
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+	hello(var_one)
+
+
+#: E101+2
+if ((row < 0 or self.moduleCount <= row or
+     col < 0 or self.moduleCount <= col)):
+	raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
+#: E101+1 E101+2 E101+3 E101+4 E101+5 E101+6
+if bar:
+	assert (
+	    start, 'E121 lines starting with a '
+	    'closing bracket should be indented '
+	    "to match that of the opening "
+	    "bracket's line"
+	)
+
+# you want vertical alignment, so use a parens
+#: E101+3
+if ((foo.bar("baz") and
+     foo.bar("frop")
+     )):
+	hello("yes")
+#: E101+3
+# also ok, but starting to look like LISP
+if ((foo.bar("baz") and
+     foo.bar("frop"))):
+	hello("yes")
+#: E101+1
+if (a == 2 or b == "abc def ghi" "jkl mno"):
+	assert True
+#: E101+2
+if (a == 2 or b == """abc def ghi
+jkl mno"""):
+	assert True
+#: E101+1 E101+2
+if length > options.max_line_length:
+	assert options.max_line_length, \
+	    "E501 line too long (%d characters)" % length
+
+
+#: E101+1 E101+2
+if os.path.exists(os.path.join(path, PEP8_BIN)):
+	cmd = ([os.path.join(path, PEP8_BIN)] +
+	       self._pep8_options(targetfile))
+# TODO Tabs in docstrings shouldn't be there, use \t.
+'''
+	multiline string with tab in it'''
+# Same here.
+'''multiline string
+	with tabs
+   and spaces
+'''
+# Okay
+'''sometimes, you just need to go nuts in a multiline string
+	and allow all sorts of crap
+  like mixed tabs and spaces
+      
+or trailing whitespace  
+or long long long long long long long long long long long long long long long long long lines
+'''  # noqa
+# Okay
+'''this one
+	will get no warning
+even though the noqa comment is not immediately after the string
+''' + foo  # noqa
+
+#: E101+2
+if foo is None and bar is "frop" and \
+        blah == 'yeah':
+	blah = 'yeahnah'
+
+
+#: E101+1 E101+2 E101+3
+if True:
+	foo(
+		1,
+		2)
+
+
+#: E101+1 E101+2 E101+3 E101+4 E101+5
+def test_keys(self):
+	"""areas.json - All regions are accounted for."""
+	expected = set([
+		u'Norrbotten',
+		u'V\xe4sterbotten',
+	])
+
+
+#: E101+1
+x = [
+	'abc'
+]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E11.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E11.py
new file mode 100644
index 0000000..9b97f39
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E11.py
@@ -0,0 +1,60 @@
+if x > 2:
+    #: E111:2
+  hello(x)
+if True:
+    #: E111:5
+     print
+    #: E111:6
+      # 
+    #: E111:2
+  # what
+    # Comment is fine
+# Comment is also fine
+
+if False:
+    pass
+print
+print
+#: E903:0
+    print
+mimetype = 'application/x-directory'
+#: E111:5
+     # 'httpd/unix-directory'
+create_date = False
+
+
+def start(self):
+    # foo
+    #: E111:8
+        # bar
+    if True:  # Hello
+        self.master.start()  # Comment
+        # try:
+        #: E111:12
+            # self.master.start()
+        # except MasterExit:
+        #: E111:12
+            # self.shutdown()
+        # finally:
+        #: E111:12
+            # sys.exit()
+    # Dedent to the first level
+    #: E111:6
+      # error
+# Dedent to the base level
+#: E111:2
+  # Also wrongly indented.
+# Indent is correct.
+
+
+def start(self):  # Correct comment
+    if True:
+        #: E111:0
+#       try:
+        #: E111:0
+#           self.master.start()
+        #: E111:0
+#       except MasterExit:
+        #: E111:0
+#           self.shutdown()
+        self.master.start()  # comment
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_first.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_first.py
new file mode 100644
index 0000000..8dc65a5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_first.py
@@ -0,0 +1,78 @@
+abc = "E121", (
+    #: E121:2
+  "dent")
+abc = "E122", (
+    #: E121:0
+"dent")
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+    #: E123
+    ]
+abc = "E124", ("visual",
+               "indent_two"
+               #: E124:14
+              )
+abc = "E124", ("visual",
+               "indent_five"
+               #: E124:0
+)
+a = (123,
+     #: E124:0
+)
+#: E129+1:4
+if (row < 0 or self.moduleCount <= row or
+    col < 0 or self.moduleCount <= col):
+    raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
+
+abc = "E126", (
+    #: E126:12
+            "dent")
+abc = "E126", (
+    #: E126:8
+        "dent")
+abc = "E127", ("over-",
+               #: E127:18
+                  "over-indent")
+abc = "E128", ("visual",
+               #: E128:4
+    "hanging")
+abc = "E128", ("under-",
+               #: E128:14
+              "under-indent")
+
+
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+    #: E123:5
+     ]
+result = {
+    #: E121:3
+   'key1': 'value',
+    #: E121:3
+   'key2': 'value',
+}
+rv.update(dict.fromkeys((
+              'qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+              'reasonComment_de', 'reasonComment_it'),
+                        #: E128:10
+          '?'),
+          "foo")
+
+abricot = 3 + \
+          4 + \
+          5 + 6
+abc = "hello", (
+
+    "there",
+    #: E126:5
+     # "john",
+    "dude")
+part = set_mimetype((
+    a.get('mime_type', 'text')),
+                    'default')
+part = set_mimetype((
+    a.get('mime_type', 'text')),
+                    #: E127:21
+                     'default')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_first.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_first.py
new file mode 100644
index 0000000..fc3b5f9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_first.py
@@ -0,0 +1,356 @@
+# The issue numbers described in this file are part of the pycodestyle tracker
+# and not of parso.
+# Originally there were no issues in here, I (dave) added the ones that were
+# necessary and IMO useful.
+if (
+        x == (
+            3
+        ) or
+        y == 4):
+    pass
+
+y = x == 2 \
+    or x == 3
+
+#: E129+1:4
+if x == 2 \
+    or y > 1 \
+        or x == 3:
+    pass
+
+if x == 2 \
+        or y > 1 \
+        or x == 3:
+    pass
+
+
+if (foo == bar and
+        baz == frop):
+    pass
+
+#: E129+1:4 E129+2:4 E123+3
+if (
+    foo == bar and
+    baz == frop
+):
+    pass
+
+if (
+        foo == bar and
+        baz == frop
+        #: E129:4 
+    ):
+    pass
+
+a = (
+)
+
+a = (123,
+     )
+
+
+if start[1] > end_col and not (
+        over_indent == 4 and indent_next):
+    assert (0, "E121 continuation line over-"
+            "indented for visual indent")
+
+
+abc = "OK", ("visual",
+             "indent")
+
+abc = "Okay", ("visual",
+               "indent_three"
+               )
+
+abc = "a-ok", (
+    "there",
+    "dude",
+)
+
+abc = "hello", (
+    "there",
+    "dude")
+
+abc = "hello", (
+
+    "there",
+    # "john",
+    "dude")
+
+abc = "hello", (
+    "there", "dude")
+
+abc = "hello", (
+    "there", "dude",
+)
+
+# Aligned with opening delimiter
+foo = long_function_name(var_one, var_two,
+                         var_three, var_four)
+
+# Extra indentation is not necessary.
+foo = long_function_name(
+    var_one, var_two,
+    var_three, var_four)
+
+
+arm = 'AAA'    \
+      'BBB'    \
+      'CCC'
+
+bbb = 'AAA'    \
+      'BBB'    \
+      'CCC'
+
+cc = ('AAA'
+      'BBB'
+      'CCC')
+
+cc = {'text': 'AAA'
+              'BBB'
+              'CCC'}
+
+cc = dict(text='AAA'
+               'BBB')
+
+sat = 'AAA'    \
+      'BBB'    \
+      'iii'    \
+      'CCC'
+
+abricot = (3 +
+           4 +
+           5 + 6)
+
+#: E122+1:4
+abricot = 3 + \
+    4 + \
+          5 + 6
+
+part = [-1, 2, 3,
+        4, 5, 6]
+
+#: E128+1:8
+part = [-1, (2, 3,
+        4, 5, 6), 7,
+        8, 9, 0]
+
+fnct(1, 2, 3,
+     4, 5, 6)
+
+fnct(1, 2, 3,
+     4, 5, 6,
+     7, 8, 9,
+     10, 11)
+
+
+def long_function_name(
+        var_one, var_two, var_three,
+        var_four):
+    hello(var_one)
+
+
+if ((row < 0 or self.moduleCount <= row or
+     col < 0 or self.moduleCount <= col)):
+    raise Exception("%s,%s - %s" % (row, col, self.moduleCount))
+
+
+result = {
+    'foo': [
+        'bar', {
+            'baz': 'frop',
+        }
+    ]
+}
+
+
+foo = my.func({
+    "foo": "bar",
+}, "baz")
+
+
+fooff(aaaa,
+      cca(
+          vvv,
+          dadd
+      ), fff,
+      ggg)
+
+fooff(aaaa,
+      abbb,
+      cca(
+          vvv,
+          aaa,
+          dadd),
+      "visual indentation is not a multiple of four",)
+
+if bar:
+    assert (
+        start, 'E121 lines starting with a '
+        'closing bracket should be indented '
+        "to match that of the opening "
+        "bracket's line"
+    )
+
+# you want vertical alignment, so use a parens
+if ((foo.bar("baz") and
+     foo.bar("frop")
+     )):
+    hello("yes")
+
+# also ok, but starting to look like LISP
+if ((foo.bar("baz") and
+     foo.bar("frop"))):
+    hello("yes")
+
+#: E129+1:4 E127+2:9
+if (a == 2 or
+    b == "abc def ghi"
+         "jkl mno"):
+    assert True
+
+#: E129+1:4
+if (a == 2 or
+    b == """abc def ghi
+jkl mno"""):
+    assert True
+
+if length > options.max_line_length:
+    assert options.max_line_length, \
+        "E501 line too long (%d characters)" % length
+
+
+# blub
+
+
+asd = 'l.{line}\t{pos}\t{name}\t{text}'.format(
+    line=token[2][0],
+    pos=pos,
+    name=tokenize.tok_name[token[0]],
+    text=repr(token[1]),
+)
+
+#: E121+1:6 E121+2:6
+hello('%-7d %s per second (%d total)' % (
+      options.counters[key] / elapsed, key,
+      options.counters[key]))
+
+
+if os.path.exists(os.path.join(path, PEP8_BIN)):
+    cmd = ([os.path.join(path, PEP8_BIN)] +
+           self._pep8_options(targetfile))
+
+
+fixed = (re.sub(r'\t+', ' ', target[c::-1], 1)[::-1] +
+         target[c + 1:])
+
+fixed = (
+    re.sub(r'\t+', ' ', target[c::-1], 1)[::-1] +
+    target[c + 1:]
+)
+
+
+if foo is None and bar is "frop" and \
+        blah == 'yeah':
+    blah = 'yeahnah'
+
+
+"""This is a multi-line
+   docstring."""
+
+
+if blah:
+    # is this actually readable?  :)
+    multiline_literal = """
+while True:
+    if True:
+        1
+""".lstrip()
+    multiline_literal = (
+        """
+while True:
+    if True:
+        1
+""".lstrip()
+    )
+    multiline_literal = (
+        """
+while True:
+    if True:
+        1
+"""
+        .lstrip()
+    )
+
+
+if blah:
+    multiline_visual = ("""
+while True:
+    if True:
+        1
+"""
+                        .lstrip())
+
+
+rv = {'aaa': 42}
+rv.update(dict.fromkeys((
+              #: E121:4 E121+1:4
+    'qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+    'reasonComment_de', 'reasonComment_it'), '?'))
+
+rv.update(dict.fromkeys(('qualif_nr', 'reasonComment_en',
+                         'reasonComment_fr', 'reasonComment_de',
+                         'reasonComment_it'), '?'))
+
+#: E128+1:10
+rv.update(dict.fromkeys(('qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+          'reasonComment_de', 'reasonComment_it'), '?'))
+
+
+rv.update(dict.fromkeys(
+              ('qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+               'reasonComment_de', 'reasonComment_it'), '?'
+          ), "foo", context={
+              'alpha': 4, 'beta': 53242234, 'gamma': 17,
+          })
+
+
+rv.update(
+    dict.fromkeys((
+        'qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+        'reasonComment_de', 'reasonComment_it'), '?'),
+    "foo",
+    context={
+        'alpha': 4, 'beta': 53242234, 'gamma': 17,
+    },
+)
+
+
+event_obj.write(cursor, user_id, {
+                    'user': user,
+                    'summary': text,
+                    'data': data,
+                })
+
+event_obj.write(cursor, user_id, {
+                    'user': user,
+                    'summary': text,
+                    'data': {'aaa': 1, 'bbb': 2},
+                })
+
+event_obj.write(cursor, user_id, {
+                    'user': user,
+                    'summary': text,
+                    'data': {
+                        'aaa': 1,
+                        'bbb': 2},
+                })
+
+event_obj.write(cursor, user_id, {
+                    'user': user,
+                    'summary': text,
+                    'data': {'timestamp': now, 'content': {
+                                 'aaa': 1,
+                                 'bbb': 2
+                             }},
+                })
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_second.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_second.py
new file mode 100644
index 0000000..e7c18e0
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_not_second.py
@@ -0,0 +1,294 @@
+
+def qualify_by_address(
+        self, cr, uid, ids, context=None,
+        params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)):
+    """ This gets called by the web server """
+
+
+def qualify_by_address(self, cr, uid, ids, context=None,
+                       params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)):
+    """ This gets called by the web server """
+
+
+_ipv4_re = re.compile('^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.'
+                      '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.'
+                      '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.'
+                      '(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$')
+
+
+fct("""
+    AAA """ + status_2_string)
+
+
+if context:
+    msg = """\
+action: GET-CONFIG
+payload:
+    ip_address: "%(ip)s"
+    username: "%(username)s"
+""" % context
+
+
+if context:
+    msg = """\
+action: \
+GET-CONFIG
+""" % context
+
+
+if context:
+    #: E122+2:0
+    msg = """\
+action: """\
+"""GET-CONFIG
+""" % context
+
+
+def unicode2html(s):
+    """Convert the characters &<>'" in string s to HTML-safe sequences.
+    Convert newline to <br> too."""
+    #: E127+1:28
+    return unicode((s or '').replace('&', '&amp;')
+                            .replace('\n', '<br>\n'))
+
+
+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('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE,
+                  help="exclude files or directories which match these "
+                       "comma separated patterns (default: %s)" %
+                       DEFAULT_EXCLUDE)
+
+add_option('--count',
+           #: E135+1
+           help="print total number of errors "
+           "to standard error total is not null")
+
+add_option('--count',
+           #: E135+2:11
+           help="print total number of errors "
+                "to standard error "
+           "total is not null")
+
+
+help = ("print total number of errors " +
+        "to standard error")
+
+help = "print total number of errors " \
+       "to standard error"
+
+help = u"print total number of errors " \
+       u"to standard error"
+
+help = b"print total number of errors " \
+       b"to standard error"
+
+#: E122+1:5
+help = br"print total number of errors " \
+     br"to standard error"
+
+d = dict('foo', help="exclude files or directories which match these "
+                     #: E135:9
+         "comma separated patterns (default: %s)" % DEFAULT_EXCLUDE)
+
+d = dict('foo', help=u"exclude files or directories which match these "
+                     u"comma separated patterns (default: %s)"
+                     % DEFAULT_EXCLUDE)
+
+#: E135+1:9 E135+2:9
+d = dict('foo', help=b"exclude files or directories which match these "
+         b"comma separated patterns (default: %s)"
+         % DEFAULT_EXCLUDE)
+
+d = dict('foo', help=br"exclude files or directories which match these "
+                     br"comma separated patterns (default: %s)" %
+                     DEFAULT_EXCLUDE)
+
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s)" %
+              DEFAULT_EXCLUDE)
+
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s, %s)" %
+              (DEFAULT_EXCLUDE, DEFAULT_IGNORE)
+         )
+
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s, %s)" %
+              # who knows what might happen here?
+              (DEFAULT_EXCLUDE, DEFAULT_IGNORE)
+         )
+
+# parens used to allow the indenting.
+troublefree_hash = {
+    "hash": "value",
+    "long": ("the quick brown fox jumps over the lazy dog before doing a "
+             "somersault"),
+    "long key that tends to happen more when you're indented": (
+        "stringwithalongtoken you don't want to break"
+    ),
+}
+
+# another accepted form
+troublefree_hash = {
+    "hash": "value",
+    "long": "the quick brown fox jumps over the lazy dog before doing "
+            "a somersault",
+    ("long key that tends to happen more "
+     "when you're indented"): "stringwithalongtoken you don't want to break",
+}
+# confusing but accepted... don't do that
+troublesome_hash = {
+    "hash": "value",
+    "long": "the quick brown fox jumps over the lazy dog before doing a "
+            #: E135:4
+    "somersault",
+    "longer":
+        "the quick brown fox jumps over the lazy dog before doing a "
+        "somersaulty",
+    "long key that tends to happen more "
+    "when you're indented": "stringwithalongtoken you don't want to break",
+}
+
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s)" %
+              DEFAULT_EXCLUDE
+         )
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s)" % DEFAULT_EXCLUDE,
+         foobar="this clearly should work, because it is at "
+                "the right indent level",
+         )
+
+rv.update(dict.fromkeys(
+              ('qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+               'reasonComment_de', 'reasonComment_it'),
+              '?'), "foo",
+          context={'alpha': 4, 'beta': 53242234, 'gamma': 17})
+
+
+def f():
+    try:
+        if not Debug:
+            hello('''
+If you would like to see debugging output,
+try: %s -d5
+''' % sys.argv[0])
+
+
+# The try statement above was not finished.
+#: E901
+d = {  # comment
+    1: 2
+}
+
+# issue 138 (we won't allow this in parso)
+#: E126+2:9
+[
+    12,  # this is a multi-line inline
+         # comment
+]
+# issue 151
+#: E122+1:3
+if a > b and \
+   c > d:
+    moo_like_a_cow()
+
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+]
+
+my_list = [1, 2, 3,
+           4, 5, 6,
+           ]
+
+result = some_function_that_takes_arguments(
+    'a', 'b', 'c',
+    'd', 'e', 'f',
+)
+
+result = some_function_that_takes_arguments('a', 'b', 'c',
+                                            'd', 'e', 'f',
+                                            )
+
+# issue 203
+dica = {
+    ('abc'
+     'def'): (
+        'abc'),
+}
+
+(abcdef[0]
+ [1]) = (
+    'abc')
+
+('abc'
+ 'def') == (
+    'abc')
+
+# issue 214
+bar(
+    1).zap(
+    2)
+
+bar(
+    1).zap(
+    2)
+
+if True:
+
+    def example_issue254():
+        return [node.copy(
+                    (
+                        replacement
+                        # First, look at all the node's current children.
+                        for child in node.children
+                        # Replace them.
+                        for replacement in replace(child)
+                    ),
+                    dict(name=token.undefined)
+                )]
+
+
+def valid_example():
+    return [node.copy(properties=dict(
+                          (key, val if val is not None else token.undefined)
+                          for key, val in node.items()
+                      ))]
+
+
+foo([
+    'bug'
+])
+
+# issue 144, finally!
+some_hash = {
+    "long key that tends to happen more when you're indented":
+        "stringwithalongtoken you don't want to break",
+}
+
+{
+    1:
+        999999 if True
+        else 0,
+}
+
+
+abc = dedent(
+    '''
+        mkdir -p ./{build}/
+        mv ./build/ ./{build}/%(revision)s/
+    '''.format(
+        build='build',
+        # more stuff
+    )
+)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_second.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_second.py
new file mode 100644
index 0000000..5488ea4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_second.py
@@ -0,0 +1,195 @@
+if True:
+    result = some_function_that_takes_arguments(
+        'a', 'b', 'c',
+        'd', 'e', 'f',
+        #: E123:0
+)
+#: E122+1
+if some_very_very_very_long_variable_name or var \
+or another_very_long_variable_name:
+    raise Exception()
+#: E122+1
+if some_very_very_very_long_variable_name or var[0] \
+or another_very_long_variable_name:
+    raise Exception()
+if True:
+    #: E122+1
+    if some_very_very_very_long_variable_name or var \
+    or another_very_long_variable_name:
+        raise Exception()
+if True:
+    #: E122+1
+    if some_very_very_very_long_variable_name or var[0] \
+    or another_very_long_variable_name:
+        raise Exception()
+
+#: E901+1:8
+dictionary = [
+    "is": {
+        # Might be a E122:4, but is not because the code is invalid Python.
+    "nested": yes(),
+    },
+]
+setup('',
+      scripts=[''],
+      classifiers=[
+          #: E121:6
+      'Development Status :: 4 - Beta',
+          'Environment :: Console',
+          'Intended Audience :: Developers',
+      ])
+
+
+#: E123+2:4 E291:15
+abc = "E123", (   
+    "bad", "hanging", "close"
+    )
+
+result = {
+    'foo': [
+        'bar', {
+            'baz': 'frop',
+            #: E123
+            }
+        #: E123
+        ]
+    #: E123
+    }
+result = some_function_that_takes_arguments(
+    'a', 'b', 'c',
+    'd', 'e', 'f',
+    #: E123
+    )
+my_list = [1, 2, 3,
+           4, 5, 6,
+           #: E124:0
+]
+my_list = [1, 2, 3,
+           4, 5, 6,
+           #: E124:19
+                   ]
+#: E124+2
+result = some_function_that_takes_arguments('a', 'b', 'c',
+                                            'd', 'e', 'f',
+)
+fooff(aaaa,
+      cca(
+          vvv,
+          dadd
+      ), fff,
+      #: E124:0
+)
+fooff(aaaa,
+      ccaaa(
+          vvv,
+          dadd
+      ),
+      fff,
+      #: E124:0
+)
+d = dict('foo',
+         help="exclude files or directories which match these "
+              "comma separated patterns (default: %s)" % DEFAULT_EXCLUDE
+         #: E124:14
+              )
+
+if line_removed:
+    self.event(cr, uid,
+               #: E128:8
+        name="Removing the option for contract",
+               #: E128:8
+        description="contract line has been removed",
+               #: E124:8
+        )
+
+#: E129+1:4
+if foo is None and bar is "frop" and \
+    blah == 'yeah':
+    blah = 'yeahnah'
+
+
+#: E129+1:4 E129+2:4
+def long_function_name(
+    var_one, var_two, var_three,
+    var_four):
+    hello(var_one)
+
+
+def qualify_by_address(
+        #: E129:4 E129+1:4
+    self, cr, uid, ids, context=None,
+    params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)):
+    """ This gets called by the web server """
+
+
+#: E129+1:4 E129+2:4
+if (a == 2 or
+    b == "abc def ghi"
+    "jkl mno"):
+    True
+
+my_list = [
+    1, 2, 3,
+    4, 5, 6,
+    #: E123:8
+        ]
+
+abris = 3 + \
+        4 + \
+        5 + 6
+
+fixed = re.sub(r'\t+', ' ', target[c::-1], 1)[::-1] + \
+        target[c + 1:]
+
+rv.update(dict.fromkeys((
+              'qualif_nr', 'reasonComment_en', 'reasonComment_fr',
+              #: E121:12
+            'reasonComment_de', 'reasonComment_it'),
+                        '?'),
+          #: E128:4
+    "foo")
+#: E126+1:8
+eat_a_dict_a_day({
+        "foo": "bar",
+})
+#: E129+1:4
+if (
+    x == (
+            3
+            #: E129:4
+    ) or
+        y == 4):
+    pass
+#: E129+1:4 E121+2:8 E129+3:4
+if (
+    x == (
+        3
+    ) or
+        x == (
+            # This one has correct indentation.
+            3
+            #: E129:4
+    ) or
+        y == 4):
+    pass
+troublesome_hash = {
+    "hash": "value",
+    #: E135+1:8
+    "long": "the quick brown fox jumps over the lazy dog before doing a "
+        "somersault",
+}
+
+# Arguments on first line forbidden when not using vertical alignment
+#: E128+1:4
+foo = long_function_name(var_one, var_two,
+    var_three, var_four)
+
+#: E128+1:4
+hello('l.%s\t%s\t%s\t%r' %
+    (token[2][0], pos, tokenize.tok_name[token[0]], token[1]))
+
+
+def qualify_by_address(self, cr, uid, ids, context=None,
+                       #: E128:8
+        params_to_check=frozenset(QUALIF_BY_ADDRESS_PARAM)):
+    """ This gets called by the web server """
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_third.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_third.py
new file mode 100644
index 0000000..26697fe
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E12_third.py
@@ -0,0 +1,116 @@
+#: E128+1
+foo(1, 2, 3,
+4, 5, 6)
+#: E128+1:1
+foo(1, 2, 3,
+ 4, 5, 6)
+#: E128+1:2
+foo(1, 2, 3,
+  4, 5, 6)
+#: E128+1:3
+foo(1, 2, 3,
+   4, 5, 6)
+foo(1, 2, 3,
+    4, 5, 6)
+#: E127+1:5
+foo(1, 2, 3,
+     4, 5, 6)
+#: E127+1:6
+foo(1, 2, 3,
+      4, 5, 6)
+#: E127+1:7
+foo(1, 2, 3,
+       4, 5, 6)
+#: E127+1:8
+foo(1, 2, 3,
+        4, 5, 6)
+#: E127+1:9
+foo(1, 2, 3,
+         4, 5, 6)
+#: E127+1:10
+foo(1, 2, 3,
+          4, 5, 6)
+#: E127+1:11
+foo(1, 2, 3,
+           4, 5, 6)
+#: E127+1:12
+foo(1, 2, 3,
+            4, 5, 6)
+#: E127+1:13
+foo(1, 2, 3,
+             4, 5, 6)
+if line_removed:
+    #: E128+1:14 E128+2:14
+    self.event(cr, uid,
+              name="Removing the option for contract",
+              description="contract line has been removed",
+               )
+
+if line_removed:
+    self.event(cr, uid,
+               #: E127:16
+                name="Removing the option for contract",
+               #: E127:16
+                description="contract line has been removed",
+               #: E124:16
+                )
+rv.update(d=('a', 'b', 'c'),
+          #: E127:13
+             e=42)
+
+#: E135+2:17
+rv.update(d=('a' + 'b', 'c'),
+          e=42, f=42
+                 + 42)
+rv.update(d=('a' + 'b', 'c'),
+          e=42, f=42
+                  + 42)
+#: E127+1:26
+input1 = {'a': {'calc': 1 + 2}, 'b': 1
+                          + 42}
+#: E128+2:17
+rv.update(d=('a' + 'b', 'c'),
+          e=42, f=(42
+                 + 42))
+
+if True:
+    def example_issue254():
+        #: 
+        return [node.copy(
+                    (
+                        #: E121:16 E121+3:20
+                replacement
+                        # First, look at all the node's current children.
+                        for child in node.children
+                    for replacement in replace(child)
+                    ),
+                    dict(name=token.undefined)
+                )]
+# TODO multiline docstring are currently not handled. E125+1:4?
+if ("""
+    """):
+    pass
+
+# TODO same
+for foo in """
+    abc
+    123
+    """.strip().split():
+    hello(foo)
+abc = dedent(
+    '''
+        mkdir -p ./{build}/
+        mv ./build/ ./{build}/%(revision)s/
+    '''.format(
+        #: E121:4 E121+1:4 E123+2:0
+    build='build',
+    # more stuff
+)
+)
+#: E701+1: E122+1
+if True:\
+hello(True)
+
+#: E128+1
+foobar(a
+, end=' ')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E20.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E20.py
new file mode 100644
index 0000000..44986fa
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E20.py
@@ -0,0 +1,52 @@
+#: E201:5
+spam( ham[1], {eggs: 2})
+#: E201:9
+spam(ham[ 1], {eggs: 2})
+#: E201:14
+spam(ham[1], { eggs: 2})
+
+# Okay
+spam(ham[1], {eggs: 2})
+
+
+#: E202:22
+spam(ham[1], {eggs: 2} )
+#: E202:21
+spam(ham[1], {eggs: 2 })
+#: E202:10
+spam(ham[1 ], {eggs: 2})
+# Okay
+spam(ham[1], {eggs: 2})
+
+result = func(
+    arg1='some value',
+    arg2='another value',
+)
+
+result = func(
+    arg1='some value',
+    arg2='another value'
+)
+
+result = [
+    item for item in items
+    if item > 5
+]
+
+#: E203:9
+if x == 4 :
+    foo(x, y)
+    x, y = y, x
+if x == 4:
+    #: E203:12 E702:13
+    a = x, y ; x, y = y, x
+if x == 4:
+    foo(x, y)
+    #: E203:12
+    x, y = y , x
+# Okay
+if x == 4:
+    foo(x, y)
+    x, y = y, x
+a[b1, :1] == 3
+b = a[:, b1]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E21.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E21.py
new file mode 100644
index 0000000..f65616e
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E21.py
@@ -0,0 +1,16 @@
+#: E211:4
+spam (1)
+#: E211:4 E211:19
+dict ['key'] = list [index]
+#: E211:11
+dict['key'] ['subkey'] = list[index]
+# Okay
+spam(1)
+dict['key'] = list[index]
+
+
+# This is not prohibited by PEP8, but avoid it.
+# Dave: I think this is extremely stupid. Use the same convention everywhere.
+#: E211:9
+class Foo (Bar, Baz):
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E22.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E22.py
new file mode 100644
index 0000000..82ff6a4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E22.py
@@ -0,0 +1,156 @@
+a = 12 + 3
+#: E221:5 E229:8
+b = 4  + 5
+#: E221:1
+x             = 1
+#: E221:1
+y             = 2
+long_variable = 3
+#: E221:4
+x[0]          = 1
+#: E221:4
+x[1]          = 2
+long_variable = 3
+#: E221:8 E229:19
+x = f(x)          + 1
+y = long_variable + 2
+#: E221:8 E229:19
+z = x[0]          + 3
+#: E221+2:13
+text = """
+    bar
+    foo %s"""  % rofl
+# Okay
+x = 1
+y = 2
+long_variable = 3
+
+
+#: E221:7
+a = a +  1
+b = b + 10
+#: E221:3
+x =            -1
+#: E221:3
+y =            -2
+long_variable = 3
+#: E221:6
+x[0] =          1
+#: E221:6
+x[1] =          2
+long_variable = 3
+
+
+#: E223+1:1
+foobart = 4
+a	= 3  # aligned with tab
+
+
+#: E223:4
+a +=	1
+b += 1000
+
+
+#: E225:12
+submitted +=1
+#: E225:9
+submitted+= 1
+#: E225:3
+c =-1
+#: E229:7
+x = x /2 - 1
+#: E229:11
+c = alpha -4
+#: E229:10
+c = alpha- 4
+#: E229:8
+z = x **y
+#: E229:14
+z = (x + 1) **y
+#: E229:13
+z = (x + 1)** y
+#: E227:14
+_1kB = _1MB >>10
+#: E227:11
+_1kB = _1MB>> 10
+#: E225:1 E225:2 E229:4
+i=i+ 1
+#: E225:1 E225:2 E229:5
+i=i +1
+#: E225:1 E225:2
+i=i+1
+#: E225:3
+i =i+1
+#: E225:1
+i= i+1
+#: E229:8
+c = (a +b)*(a - b)
+#: E229:7
+c = (a+ b)*(a - b)
+
+z = 2//30
+c = (a+b) * (a-b)
+x = x*2 - 1
+x = x/2 - 1
+# TODO whitespace should be the other way around according to pep8.
+x = x / 2-1
+
+hypot2 = x*x + y*y
+c = (a + b)*(a - b)
+
+
+def halves(n):
+    return (i//2 for i in range(n))
+
+
+#: E227:11 E227:13
+_1kB = _1MB>>10
+#: E227:11 E227:13
+_1MB = _1kB<<10
+#: E227:5 E227:6
+a = b|c
+#: E227:5 E227:6
+b = c&a
+#: E227:5 E227:6
+c = b^a
+#: E228:5 E228:6
+a = b%c
+#: E228:9 E228:10
+msg = fmt%(errno, errmsg)
+#: E228:25 E228:26
+msg = "Error %d occurred"%errno
+
+#: E228:7
+a = b %c
+a = b % c
+
+# Okay
+i = i + 1
+submitted += 1
+x = x * 2 - 1
+hypot2 = x * x + y * y
+c = (a + b) * (a - b)
+_1MiB = 2 ** 20
+_1TiB = 2**30
+foo(bar, key='word', *args, **kwargs)
+baz(**kwargs)
+negative = -1
+spam(-1)
+-negative
+func1(lambda *args, **kw: (args, kw))
+func2(lambda a, b=h[:], c=0: (a, b, c))
+if not -5 < x < +5:
+    #: E227:12
+    print >>sys.stderr, "x is out of range."
+print >> sys.stdout, "x is an integer."
+x = x / 2 - 1
+
+
+def squares(n):
+    return (i**2 for i in range(n))
+
+
+ENG_PREFIXES = {
+    -6: "\u03bc",  # Greek letter mu
+    -3: "m",
+}
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E23.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E23.py
new file mode 100644
index 0000000..47f1447
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E23.py
@@ -0,0 +1,16 @@
+#: E231:7
+a = (1,2)
+#: E231:5
+a[b1,:]
+#: E231:10
+a = [{'a':''}]
+# Okay
+a = (4,)
+#: E202:7
+b = (5, )
+c = {'text': text[5:]}
+
+result = {
+    'key1': 'value',
+    'key2': 'value',
+}
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E25.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E25.py
new file mode 100644
index 0000000..8cf5314
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E25.py
@@ -0,0 +1,36 @@
+#: E251:11 E251:13
+def foo(bar = False):
+    '''Test function with an error in declaration'''
+    pass
+
+
+#: E251:8
+foo(bar= True)
+#: E251:7
+foo(bar =True)
+#: E251:7 E251:9
+foo(bar = True)
+#: E251:13
+y = bar(root= "sdasd")
+parser.add_argument('--long-option',
+                    #: E135+1:20
+                    default=
+                    "/rather/long/filesystem/path/here/blah/blah/blah")
+parser.add_argument('--long-option',
+                    default=
+                        "/rather/long/filesystem")
+# TODO this looks so stupid.
+parser.add_argument('--long-option', default
+                    ="/rather/long/filesystem/path/here/blah/blah/blah")
+#: E251+2:7 E251+2:9
+foo(True,
+    baz=(1, 2),
+    biz = 'foo'
+    )
+# Okay
+foo(bar=(1 == 1))
+foo(bar=(1 != 1))
+foo(bar=(1 >= 1))
+foo(bar=(1 <= 1))
+(options, args) = parser.parse_args()
+d[type(None)] = _deepcopy_atomic
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E26.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E26.py
new file mode 100644
index 0000000..4774852
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E26.py
@@ -0,0 +1,78 @@
+#: E261:4
+pass # an inline comment
+#: E261:4
+pass# an inline comment
+
+# Okay
+pass  # an inline comment
+pass   # an inline comment
+#: E262:11
+x = x + 1  #Increment x
+#: E262:11
+x = x + 1  #  Increment x
+#: E262:11
+x = y + 1  #:  Increment x
+#: E265
+#Block comment
+a = 1
+#: E265+1
+m = 42
+#! This is important
+mx = 42 - 42
+
+# Comment without anything is not an issue.
+#
+# However if there are comments at the end without anything it obviously
+# doesn't make too much sense.
+#: E262:9
+foo = 1  #
+
+
+#: E266+2:4 E266+5:4
+def how_it_feel(r):
+
+    ### This is a variable ###
+    a = 42
+
+    ### Of course it is unused
+    return
+
+
+#: E266 E266+1
+##if DEBUG:
+##    logging.error()
+#: E266
+######################################### 
+
+# Not at the beginning of a file
+#: E265
+#!/usr/bin/env python
+
+# Okay
+
+pass  # an inline comment
+x = x + 1   # Increment x
+y = y + 1   #: Increment x
+
+# Block comment
+a = 1
+
+# Block comment1
+
+# Block comment2
+aaa = 1
+
+
+# example of docstring (not parsed)
+def oof():
+    """
+    #foo not parsed
+    """
+
+    ###########################################################################
+    #                               A SEPARATOR                               #
+    ###########################################################################
+
+    # ####################################################################### #
+    # ########################## another separator ########################## #
+    # ####################################################################### #
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E27.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E27.py
new file mode 100644
index 0000000..9149f0a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E27.py
@@ -0,0 +1,49 @@
+# Okay
+from u import (a, b)
+from v import c, d
+#: E221:13
+from w import  (e, f)
+#: E275:13
+from w import(e, f)
+#: E275:29
+from importable.module import(e, f)
+try:
+    #: E275:33
+    from importable.module import(e, f)
+except ImportError:
+    pass
+# Okay
+True and False
+#: E221:8
+True and  False
+#: E221:4
+True  and False
+#: E221:2
+if   1:
+    pass
+# Syntax Error, no indentation
+#: E903+1
+if   1:
+pass
+#: E223:8
+True and		False
+#: E223:4 E223:9
+True		and	False
+#: E221:5
+a and  b
+#: E221:5
+1 and  b
+#: E221:5
+a and  2
+#: E221:1 E221:6
+1  and  b
+#: E221:1 E221:6
+a  and  2
+#: E221:4
+this  and False
+#: E223:5
+a and	b
+#: E223:1
+a		and b
+#: E223:4 E223:9
+this		and	False
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E29.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E29.py
new file mode 100644
index 0000000..cebbb7b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E29.py
@@ -0,0 +1,15 @@
+# Okay
+# 情
+#: W291:5
+print 
+
+
+#: W291+1
+class Foo(object):
+    
+    bang = 12
+
+
+#: W291+1:34
+'''multiline
+string with trailing whitespace'''   
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30.py
new file mode 100644
index 0000000..31e241c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30.py
@@ -0,0 +1,177 @@
+#: E301+4
+class X:
+
+    def a():
+        pass
+    def b():
+        pass
+
+
+#: E301+5
+class X:
+
+    def a():
+        pass
+    # comment
+    def b():
+        pass
+
+
+# -*- coding: utf-8 -*-
+def a():
+    pass
+
+
+#: E302+1:0
+"""Main module."""
+def _main():
+    pass
+
+
+#: E302+1:0
+foo = 1
+def get_sys_path():
+    return sys.path
+
+
+#: E302+3:0
+def a():
+    pass
+
+def b():
+    pass
+
+
+#: E302+5:0
+def a():
+    pass
+
+# comment
+
+def b():
+    pass
+
+
+#: E303+3:0
+print
+
+
+
+#: E303+3:0 E303+4:0
+print
+
+
+
+
+print
+#: E303+3:0
+print
+
+
+
+# comment
+
+print
+
+
+#: E303+3 E303+6
+def a():
+    print
+
+
+    # comment
+
+
+    # another comment
+
+    print
+
+
+#: E302+2
+a = 3
+#: E304+1
+@decorator
+
+def function():
+    pass
+
+
+#: E303+3
+# something
+
+
+
+"""This class docstring comes on line 5.
+It gives error E303: too many blank lines (3)
+"""
+
+
+#: E302+6
+def a():
+    print
+
+    # comment
+
+    # another comment
+a()
+
+
+#: E302+7
+def a():
+    print
+
+    # comment
+
+    # another comment
+
+try:
+    a()
+except Exception:
+    pass
+
+
+#: E302+4
+def a():
+    print
+
+# Two spaces before comments, too.
+if a():
+    a()
+
+
+#: E301+2
+def a():
+    x = 1
+    def b():
+        pass
+
+
+#: E301+2 E301+4
+def a():
+    x = 2
+    def b():
+        x = 1
+        def c():
+            pass
+
+
+#: E301+2 E301+4 E301+5
+def a():
+    x = 1
+    class C:
+        pass
+    x = 2
+    def b():
+        pass
+
+
+#: E302+7
+# Example from https://github.com/PyCQA/pycodestyle/issues/400
+foo = 2
+
+
+def main():
+    blah, blah
+
+if __name__ == '__main__':
+    main()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30not.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30not.py
new file mode 100644
index 0000000..c0c005c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E30not.py
@@ -0,0 +1,175 @@
+# Okay
+class X:
+    pass
+# Okay
+
+
+def foo():
+    pass
+
+
+# Okay
+# -*- coding: utf-8 -*-
+class X:
+    pass
+
+
+# Okay
+# -*- coding: utf-8 -*-
+def foo():
+    pass
+
+
+# Okay
+class X:
+
+    def a():
+        pass
+
+    # comment
+    def b():
+        pass
+
+    # This is a
+    # ... multi-line comment
+
+    def c():
+        pass
+
+
+# This is a
+# ... multi-line comment
+
+@some_decorator
+class Y:
+
+    def a():
+        pass
+
+    # comment
+
+    def b():
+        pass
+
+    @property
+    def c():
+        pass
+
+
+try:
+    from nonexistent import Bar
+except ImportError:
+    class Bar(object):
+        """This is a Bar replacement"""
+
+
+def with_feature(f):
+    """Some decorator"""
+    wrapper = f
+    if has_this_feature(f):
+        def wrapper(*args):
+            call_feature(args[0])
+            return f(*args)
+    return wrapper
+
+
+try:
+    next
+except NameError:
+    def next(iterator, default):
+        for item in iterator:
+            return item
+        return default
+
+
+def a():
+    pass
+
+
+class Foo():
+    """Class Foo"""
+
+    def b():
+
+        pass
+
+
+# comment
+def c():
+    pass
+
+
+# comment
+
+
+def d():
+    pass
+
+# This is a
+# ... multi-line comment
+
+# And this one is
+# ... a second paragraph
+# ... which spans on 3 lines
+
+
+# Function `e` is below
+# NOTE: Hey this is a testcase
+
+def e():
+    pass
+
+
+def a():
+    print
+
+    # comment
+
+    print
+
+    print
+
+# Comment 1
+
+# Comment 2
+
+
+# Comment 3
+
+def b():
+
+    pass
+
+
+# Okay
+def foo():
+    pass
+
+
+def bar():
+    pass
+
+
+class Foo(object):
+    pass
+
+
+class Bar(object):
+    pass
+
+
+if __name__ == '__main__':
+    foo()
+# Okay
+classification_errors = None
+# Okay
+defined_properly = True
+# Okay
+defaults = {}
+defaults.update({})
+
+
+# Okay
+def foo(x):
+    classification = x
+    definitely = not classification
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E40.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E40.py
new file mode 100644
index 0000000..93a2ccf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E40.py
@@ -0,0 +1,39 @@
+#: E401:7
+import os, sys
+# Okay
+import os
+import sys
+
+from subprocess import Popen, PIPE
+
+from myclass import MyClass
+from foo.bar.yourclass import YourClass
+
+import myclass
+import foo.bar.yourclass
+# All Okay from here until the definition of VERSION
+__all__ = ['abc']
+
+import foo
+__version__ = "42"
+
+import foo
+__author__ = "Simon Gomizelj"
+
+import foo
+try:
+    import foo
+except ImportError:
+    pass
+else:
+    hello('imported foo')
+finally:
+    hello('made attempt to import foo')
+
+import bar
+VERSION = '1.2.3'
+
+#: E402
+import foo
+#: E402
+import foo
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E50.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E50.py
new file mode 100644
index 0000000..67fd558
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E50.py
@@ -0,0 +1,126 @@
+#: E501:4
+a = '12345678901234567890123456789012345678901234567890123456789012345678901234567890'
+#: E501:80
+a = '1234567890123456789012345678901234567890123456789012345678901234567890' or \
+    6
+#: E501+1:80
+a = 7 or \
+    '1234567890123456789012345678901234567890123456789012345678901234567890' or \
+    6
+#: E501+1:80 E501+2:80
+a = 7 or \
+    '1234567890123456789012345678901234567890123456789012345678901234567890' or \
+    '1234567890123456789012345678901234567890123456789012345678901234567890' or \
+    6
+#: E501:78
+a = '1234567890123456789012345678901234567890123456789012345678901234567890'  # \
+#: E502:78
+a = ('123456789012345678901234567890123456789012345678901234567890123456789'  \
+     '01234567890')
+#: E502+1:11
+a = ('AAA  \
+      BBB' \
+     'CCC')
+#: E502:38
+if (foo is None and bar is "e000" and \
+        blah == 'yeah'):
+    blah = 'yeahnah'
+#
+# Okay
+a = ('AAA'
+     'BBB')
+
+a = ('AAA  \
+      BBB'
+     'CCC')
+
+a = 'AAA'    \
+    'BBB'    \
+    'CCC'
+
+a = ('AAA\
+BBBBBBBBB\
+CCCCCCCCC\
+DDDDDDDDD')
+#
+# Okay
+if aaa:
+    pass
+elif bbb or \
+        ccc:
+    pass
+
+ddd = \
+    ccc
+
+('\
+    ' + ' \
+')
+('''
+    ''' + ' \
+')
+#: E501:67 E225:21 E225:22
+very_long_identifiers=and_terrible_whitespace_habits(are_no_excuse+for_long_lines)
+#
+# TODO Long multiline strings are not handled. E501?
+'''multiline string
+with a long long long long long long long long long long long long long long long long line
+'''
+#: E501
+'''same thing, but this time without a terminal newline in the string
+long long long long long long long long long long long long long long long long line'''
+#
+# issue 224 (unavoidable long lines in docstrings)
+# Okay
+"""
+I'm some great documentation.  Because I'm some great documentation, I'm
+going to give you a reference to some valuable information about some API
+that I'm calling:
+
+    http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
+"""
+#: E501
+"""
+longnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaces"""
+
+
+# Regression test for #622
+def foo():
+    """Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis pulvinar vitae
+    """
+
+
+# Okay
+"""
+This
+                                                                       almost_empty_line
+"""
+
+"""
+This
+                                                                        almost_empty_line
+"""
+# A basic comment
+#: E501
+# with a long long long long long long long long long long long long long long long long line
+
+#
+# Okay
+# I'm some great comment.  Because I'm so great, I'm going to give you a
+# reference to some valuable information about some API that I'm calling:
+#
+#     http://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
+
+x = 3
+
+# longnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaceslongnospaces
+
+#
+# Okay
+# This
+#                                                                      almost_empty_line
+
+#
+#: E501+1
+# This
+#                                                                       almost_empty_line
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E70.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E70.py
new file mode 100644
index 0000000..be11fb1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E70.py
@@ -0,0 +1,25 @@
+#: E701:6
+if a: a = False
+#: E701:41
+if not header or header[:6] != 'bytes=': pass
+#: E702:9
+a = False; b = True
+#: E702:16 E402
+import bdist_egg; bdist_egg.write_safety_flag(cmd.egg_info, safe)
+#: E703:12 E402
+import shlex;
+#: E702:8 E703:22
+del a[:]; a.append(42);
+
+
+#: E704:10
+def f(x): return 2
+
+
+#: E704:10
+def f(x): return 2 * x
+
+
+while all is round:
+    #: E704:14
+    def f(x): return 2 * x
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E71.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E71.py
new file mode 100644
index 0000000..109dcd6
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E71.py
@@ -0,0 +1,93 @@
+#: E711:7
+if res == None:
+    pass
+#: E711:7
+if res != None:
+    pass
+#: E711:8
+if None == res:
+    pass
+#: E711:8
+if None != res:
+    pass
+#: E711:10
+if res[1] == None:
+    pass
+#: E711:10
+if res[1] != None:
+    pass
+#: E711:8
+if None != res[1]:
+    pass
+#: E711:8
+if None == res[1]:
+    pass
+
+#
+#: E712:7
+if res == True:
+    pass
+#: E712:7
+if res != False:
+    pass
+#: E712:8
+if True != res:
+    pass
+#: E712:9
+if False == res:
+    pass
+#: E712:10
+if res[1] == True:
+    pass
+#: E712:10
+if res[1] != False:
+    pass
+
+if x is False:
+    pass
+
+#
+#: E713:9
+if not X in Y:
+    pass
+#: E713:11
+if not X.B in Y:
+    pass
+#: E713:9
+if not X in Y and Z == "zero":
+    pass
+#: E713:24
+if X == "zero" or not Y in Z:
+    pass
+
+#
+#: E714:9
+if not X is Y:
+    pass
+#: E714:11
+if not X.B is Y:
+    pass
+
+#
+# Okay
+if x not in y:
+    pass
+
+if not (X in Y or X is Z):
+    pass
+
+if not (X in Y):
+    pass
+
+if x is not y:
+    pass
+
+if TrueElement.get_element(True) == TrueElement.get_element(False):
+    pass
+
+if (True) == TrueElement or x == TrueElement:
+    pass
+
+assert (not foo) in bar
+assert {'x': not foo} in bar
+assert [42, not foo] in bar
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E72.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E72.py
new file mode 100644
index 0000000..2e9ef91
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E72.py
@@ -0,0 +1,79 @@
+#: E721:3
+if type(res) == type(42):
+    pass
+#: E721:3
+if type(res) != type(""):
+    pass
+
+import types
+
+if res == types.IntType:
+    pass
+
+import types
+
+#: E721:3
+if type(res) is not types.ListType:
+    pass
+#: E721:7 E721:35
+assert type(res) == type(False) or type(res) == type(None)
+#: E721:7
+assert type(res) == type([])
+#: E721:7
+assert type(res) == type(())
+#: E721:7
+assert type(res) == type((0,))
+#: E721:7
+assert type(res) == type((0))
+#: E721:7
+assert type(res) != type((1,))
+#: E721:7
+assert type(res) is type((1,))
+#: E721:7
+assert type(res) is not type((1,))
+
+# Okay
+#: E402
+import types
+
+if isinstance(res, int):
+    pass
+if isinstance(res, str):
+    pass
+if isinstance(res, types.MethodType):
+    pass
+
+#: E721:3 E721:25
+if type(a) != type(b) or type(a) == type(ccc):
+    pass
+#: E721
+type(a) != type(b)
+#: E721
+1 != type(b)
+#: E721
+type(b) != 1
+1 != 1
+
+try:
+    pass
+#: E722
+except:
+    pass
+try:
+    pass
+except Exception:
+    pass
+#: E722
+except:
+    pass
+# Okay
+fake_code = """"
+try:
+    do_something()
+except:
+    pass
+"""
+try:
+    pass
+except Exception:
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E73.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E73.py
new file mode 100644
index 0000000..77e2e90
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/E73.py
@@ -0,0 +1,16 @@
+#: E731:4
+f = lambda x: 2 * x
+while False:
+    #: E731:10
+    foo = lambda y, z: 2 * x
+# Okay
+f = object()
+f.method = lambda: 'Method'
+
+f = {}
+f['a'] = lambda x: x ** 2
+
+f = []
+f.append(lambda x: x ** 2)
+
+lambda: 'no-op'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/LICENSE b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/LICENSE
new file mode 100644
index 0000000..142a508
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/LICENSE
@@ -0,0 +1,29 @@
+Copyright © 2006-2009 Johann C. Rocholl <johann@rocholl.net>
+Copyright © 2009-2014 Florent Xicluna <florent.xicluna@gmail.com>
+Copyright © 2014-2016 Ian Lee <IanLee1521@gmail.com>
+Copyright © 2017-???? Dave Halter <davidhalter88@gmail.com>
+
+Dave: The files in this folder were ported from pydocstyle and some
+modifications where made.
+
+Licensed under the terms of the Expat License
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation files
+(the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of the Software,
+and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax.py
new file mode 100644
index 0000000..9ac0a6d
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax.py
@@ -0,0 +1,53 @@
+"""
+Some syntax errors are a bit complicated and need exact checking. Here we
+gather some of the potentially dangerous ones.
+"""
+
+from __future__ import division
+
+# With a dot it's not a future import anymore.
+from .__future__ import absolute_import
+
+'' ''
+''r''u''
+b'' BR''
+
+for x in [1]:
+    try:
+        continue  # Only the other continue and pass is an error.
+    finally:
+        #: E901
+        continue
+
+
+for x in [1]:
+    break
+    continue
+
+try:
+    pass
+except ZeroDivisionError:
+    pass
+    #: E722:0
+except:
+    pass
+
+try:
+    pass
+    #: E722:0 E901:0
+except:
+    pass
+except ZeroDivisionError:
+    pass
+
+
+r'\n'
+r'\x'
+b'\n'
+
+
+a = 3
+
+
+def x(b=a):
+    global a
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python2.py
new file mode 100644
index 0000000..81736bc
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python2.py
@@ -0,0 +1,2 @@
+'s' b''
+u's' b'ä'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.4.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.4.py
new file mode 100644
index 0000000..1759575
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.4.py
@@ -0,0 +1,3 @@
+*foo, a = (1,)
+*foo[0], a = (1,)
+*[], a = (1,)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.5.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.5.py
new file mode 100644
index 0000000..cc0385b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.5.py
@@ -0,0 +1,23 @@
+"""
+Mostly allowed syntax in Python 3.5.
+"""
+
+
+async def foo():
+    await bar()
+    #: E901
+    yield from []
+    return
+    #: E901
+    return ''
+
+
+# With decorator it's a different statement.
+@bla
+async def foo():
+    await bar()
+    #: E901
+    yield from []
+    return
+    #: E901
+    return ''
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.6.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.6.py
new file mode 100644
index 0000000..1bbe071
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/allowed_syntax_python3.6.py
@@ -0,0 +1,45 @@
+foo: int = 4
+(foo): int = 3
+((foo)): int = 3
+foo.bar: int
+foo[3]: int
+
+
+def glob():
+    global x
+    y: foo = x
+
+
+def c():
+    a = 3
+
+    def d():
+        class X():
+            nonlocal a
+
+
+def x():
+    a = 3
+
+    def y():
+        nonlocal a
+
+
+def x():
+    def y():
+        nonlocal a
+
+    a = 3
+
+
+def x():
+    a = 3
+
+    def y():
+        class z():
+            nonlocal a
+
+
+a = *args, *args
+error[(*args, *args)] = 3
+*args, *args
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/latin-1.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/latin-1.py
new file mode 100644
index 0000000..8328cfb
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/latin-1.py
@@ -0,0 +1,6 @@
+# -*- coding: latin-1 -*-
+# Test non-UTF8 encoding
+latin1 = ('��������������������������������'
+          '������������������������������')
+
+c = ("w�")
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python2.7.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python2.7.py
new file mode 100644
index 0000000..5d10739
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python2.7.py
@@ -0,0 +1,14 @@
+import sys
+
+print 1, 2 >> sys.stdout
+
+
+foo = ur'This is not possible in Python 3.'
+
+# This is actually printing a tuple.
+#: E275:5
+print(1, 2)
+
+# True and False are not keywords in Python 2 and therefore there's no need for
+# a space.
+norman = True+False
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python3.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python3.py
new file mode 100644
index 0000000..566e903
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/python3.py
@@ -0,0 +1,90 @@
+#!/usr/bin/env python3
+from typing import ClassVar, List
+
+print(1, 2)
+
+
+# Annotated function (Issue #29)
+def foo(x: int) -> int:
+    return x + 1
+
+
+# Annotated variables #575
+CONST: int = 42
+
+
+class Class:
+    cls_var: ClassVar[str]
+
+    def m(self):
+        xs: List[int] = []
+
+
+# True and False are keywords in Python 3 and therefore need a space.
+#: E275:13 E275:14
+norman = True+False
+
+
+#: E302+3:0
+def a():
+    pass
+
+async def b():
+    pass
+
+
+# Okay
+async def add(a: int = 0, b: int = 0) -> int:
+    return a + b
+
+
+# Previously E251 four times
+#: E221:5
+async  def add(a: int = 0, b: int = 0) -> int:
+    return a + b
+
+
+# Previously just E272+1:5 E272+4:5
+#: E302+3 E221:5 E221+3:5
+async  def x():
+    pass
+
+async  def x(y: int = 1):
+    pass
+
+
+#: E704:16
+async def f(x): return 2
+
+
+a[b1, :] == a[b1, ...]
+
+
+# Annotated Function Definitions
+# Okay
+def munge(input: AnyStr, sep: AnyStr = None, limit=1000,
+          extra: Union[str, dict] = None) -> AnyStr:
+    pass
+
+
+#: E225:24 E225:26
+def x(b: tuple = (1, 2))->int:
+    return a + b
+
+
+#: E252:11 E252:12 E231:8
+def b(a:int=1):
+    pass
+
+
+if alpha[:-i]:
+    *a, b = (1, 2, 3)
+
+
+# Named only arguments
+def foo(*, asdf):
+    pass
+
+
+def foo2(bar, *, asdf=2):
+    pass
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8-bom.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8-bom.py
new file mode 100644
index 0000000..9c065c9
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8-bom.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+hello = 'こんにちわ'
+
+# EOF
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8.py
new file mode 100644
index 0000000..73ea9a2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/normalizer_issue_files/utf-8.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+# Some random text with multi-byte characters (utf-8 encoded)
+#
+# Εδώ μάτσο κειμένων τη, τρόπο πιθανό διευθυντές ώρα μη. Νέων απλό παράγει ροή
+# κι, το επί δεδομένη καθορίζουν. Πάντως ζητήσεις περιβάλλοντος ένα με, τη
+# ξέχασε αρπάζεις φαινόμενο όλη. Τρέξει εσφαλμένη χρησιμοποίησέ νέα τι. Θα όρο
+# πετάνε φακέλους, άρα με διακοπής λαμβάνουν εφαμοργής. Λες κι μειώσει
+# καθυστερεί.
+
+# 79 narrow chars
+# 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 [79]
+
+# 78 narrow chars (Na) + 1 wide char (W)
+# 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8情
+
+# 3 narrow chars (Na) + 40 wide chars (W)
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+
+# 3 narrow chars (Na) + 76 wide chars (W)
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+
+#
+# 80 narrow chars (Na)
+#: E501
+# 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6  [80]
+#
+# 78 narrow chars (Na) + 2 wide char (W)
+#: E501
+# 01 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8情情
+#
+# 3 narrow chars (Na) + 77 wide chars (W)
+#: E501
+# 情 情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情情
+#
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_absolute_import.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_absolute_import.py
new file mode 100644
index 0000000..c959ea5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_absolute_import.py
@@ -0,0 +1,29 @@
+"""
+Tests ``from __future__ import absolute_import`` (only important for
+Python 2.X)
+"""
+from parso import parse
+
+
+def test_explicit_absolute_imports():
+    """
+    Detect modules with ``from __future__ import absolute_import``.
+    """
+    module = parse("from __future__ import absolute_import")
+    assert module._has_explicit_absolute_import()
+
+
+def test_no_explicit_absolute_imports():
+    """
+     Detect modules without ``from __future__ import absolute_import``.
+    """
+    assert not parse("1")._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 = "from __future__ import absolute_import\nimport xyzzy"
+    assert parse(src)._has_explicit_absolute_import()
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_cache.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_cache.py
new file mode 100644
index 0000000..a7cd70c
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_cache.py
@@ -0,0 +1,87 @@
+"""
+Test all things related to the ``jedi.cache`` module.
+"""
+
+from os import unlink
+
+import pytest
+
+from parso.cache import _NodeCacheItem, save_module, load_module, \
+    _get_hashed_path, parser_cache, _load_from_file_system, _save_to_file_system
+from parso import load_grammar
+from parso import cache
+
+
+@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(cache, '_default_cache_path', str(tmpdir))
+
+
+def test_modulepickling_change_cache_dir(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 = _NodeCacheItem('bla', [])
+    item_2 = _NodeCacheItem('bla', [])
+    path_1 = 'fake path 1'
+    path_2 = 'fake path 2'
+
+    hashed_grammar = load_grammar()._hashed
+    _save_to_file_system(hashed_grammar, path_1, item_1, cache_path=dir_1)
+    parser_cache.clear()
+    cached = load_stored_item(hashed_grammar, path_1, item_1, cache_path=dir_1)
+    assert cached == item_1.node
+
+    _save_to_file_system(hashed_grammar, path_2, item_2, cache_path=dir_2)
+    cached = load_stored_item(hashed_grammar, path_1, item_1, cache_path=dir_2)
+    assert cached is None
+
+
+def load_stored_item(hashed_grammar, path, item, cache_path):
+    """Load `item` stored at `path` in `cache`."""
+    item = _load_from_file_system(hashed_grammar, path, item.change_time - 1, cache_path)
+    return item
+
+
+@pytest.mark.usefixtures("isolated_jedi_cache")
+def test_modulepickling_simulate_deleted_cache(tmpdir):
+    """
+    Tests loading from a cache file after it is deleted.
+    According to macOS `dev docs`__,
+
+        Note that the system may delete the Caches/ directory to free up disk
+        space, so your app must be able to re-create or download these files as
+        needed.
+
+    It is possible that other supported platforms treat cache files the same
+    way.
+
+    __ https://developer.apple.com/library/content/documentation/FileManagement/Conceptual/FileSystemProgrammingGuide/FileSystemOverview/FileSystemOverview.html
+    """
+    grammar = load_grammar()
+    module = 'fake parser'
+
+    # Create the file
+    path = tmpdir.dirname + '/some_path'
+    with open(path, 'w'):
+        pass
+
+    save_module(grammar._hashed, path, module, [])
+    assert load_module(grammar._hashed, path) == module
+
+    unlink(_get_hashed_path(grammar._hashed, path))
+    parser_cache.clear()
+
+    cached2 = load_module(grammar._hashed, path)
+    assert cached2 is None
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_diff_parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_diff_parser.py
new file mode 100644
index 0000000..3b60e4a
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_diff_parser.py
@@ -0,0 +1,486 @@
+from textwrap import dedent
+import logging
+
+import pytest
+
+from parso.utils import split_lines
+from parso import cache
+from parso import load_grammar
+from parso.python.diff import DiffParser
+from parso import parse
+
+
+def test_simple():
+    """
+    The diff parser reuses modules. So check for that.
+    """
+    grammar = load_grammar()
+    module_a = grammar.parse('a', diff_cache=True)
+    assert grammar.parse('b', diff_cache=True) == module_a
+
+
+def _check_error_leaves_nodes(node):
+    if node.type in ('error_leaf', 'error_node'):
+        return True
+
+    try:
+        children = node.children
+    except AttributeError:
+        pass
+    else:
+        for child in children:
+            if _check_error_leaves_nodes(child):
+                return True
+    return False
+
+
+def _assert_valid_graph(node):
+    """
+    Checks if the parent/children relationship is correct.
+    """
+    try:
+        children = node.children
+    except AttributeError:
+        return
+
+    for child in children:
+        assert child.parent == node
+        _assert_valid_graph(child)
+
+
+class Differ(object):
+    grammar = load_grammar()
+
+    def initialize(self, code):
+        logging.debug('differ: initialize')
+        try:
+            del cache.parser_cache[self.grammar._hashed][None]
+        except KeyError:
+            pass
+
+        self.lines = split_lines(code, keepends=True)
+        self.module = parse(code, diff_cache=True, cache=True)
+        return self.module
+
+    def parse(self, code, copies=0, parsers=0, expect_error_leaves=False):
+        logging.debug('differ: parse copies=%s parsers=%s', copies, parsers)
+        lines = split_lines(code, keepends=True)
+        diff_parser = DiffParser(
+            self.grammar._pgen_grammar,
+            self.grammar._tokenizer,
+            self.module,
+        )
+        new_module = diff_parser.update(self.lines, lines)
+        self.lines = lines
+        assert code == new_module.get_code()
+        assert diff_parser._copy_count == copies
+        #assert diff_parser._parser_count == parsers
+
+        assert expect_error_leaves == _check_error_leaves_nodes(new_module)
+        _assert_valid_graph(new_module)
+        return new_module
+
+
+@pytest.fixture()
+def differ():
+    return Differ()
+
+
+def test_change_and_undo(differ):
+    func_before = 'def func():\n    pass\n'
+    # Parse the function and a.
+    differ.initialize(func_before + 'a')
+    # Parse just b.
+    differ.parse(func_before + 'b', copies=1, parsers=1)
+    # b has changed to a again, so parse that.
+    differ.parse(func_before + 'a', copies=1, parsers=1)
+    # Same as before parsers should not be used. Just a simple copy.
+    differ.parse(func_before + 'a', copies=1)
+
+    # Now that we have a newline at the end, everything is easier in Python
+    # syntax, we can parse once and then get a copy.
+    differ.parse(func_before + 'a\n', copies=1, parsers=1)
+    differ.parse(func_before + 'a\n', copies=1)
+
+    # Getting rid of an old parser: Still no parsers used.
+    differ.parse('a\n', copies=1)
+    # Now the file has completely changed and we need to parse.
+    differ.parse('b\n', parsers=1)
+    # And again.
+    differ.parse('a\n', parsers=1)
+
+
+def test_positions(differ):
+    func_before = 'class A:\n pass\n'
+    m = differ.initialize(func_before + 'a')
+    assert m.start_pos == (1, 0)
+    assert m.end_pos == (3, 1)
+
+    m = differ.parse('a', copies=1)
+    assert m.start_pos == (1, 0)
+    assert m.end_pos == (1, 1)
+
+    m = differ.parse('a\n\n', parsers=1)
+    assert m.end_pos == (3, 0)
+    m = differ.parse('a\n\n ', copies=1, parsers=1)
+    assert m.end_pos == (3, 1)
+    m = differ.parse('a ', parsers=1)
+    assert m.end_pos == (1, 2)
+
+
+def test_if_simple(differ):
+    src = dedent('''\
+    if 1:
+        a = 3
+    ''')
+    else_ = "else:\n    a = ''\n"
+
+    differ.initialize(src + 'a')
+    differ.parse(src + else_ + "a", copies=0, parsers=1)
+
+    differ.parse(else_, parsers=1, expect_error_leaves=True)
+    differ.parse(src + else_, parsers=1)
+
+
+def test_func_with_for_and_comment(differ):
+    # 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""")
+    differ.initialize(src)
+    differ.parse('a\n' + src, copies=1, parsers=2)
+
+
+def test_one_statement_func(differ):
+    src = dedent("""\
+    first
+    def func(): a
+    """)
+    differ.initialize(src + 'second')
+    differ.parse(src + 'def second():\n a', parsers=1, copies=1)
+
+
+def test_for_on_one_line(differ):
+    src = dedent("""\
+    foo = 1
+    for x in foo: pass
+
+    def hi():
+        pass
+    """)
+    differ.initialize(src)
+
+    src = dedent("""\
+    def hi():
+        for x in foo: pass
+        pass
+
+    pass
+    """)
+    differ.parse(src, parsers=2)
+
+    src = dedent("""\
+    def hi():
+        for x in foo: pass
+        pass
+
+        def nested():
+            pass
+    """)
+    # The second parser is for parsing the `def nested()` which is an `equal`
+    # operation in the SequenceMatcher.
+    differ.parse(src, parsers=1, copies=1)
+
+
+def test_open_parentheses(differ):
+    func = 'def func():\n a\n'
+    code = 'isinstance(\n\n' + func
+    new_code = 'isinstance(\n' + func
+    differ.initialize(code)
+
+    differ.parse(new_code, parsers=1, expect_error_leaves=True)
+
+    new_code = 'a = 1\n' + new_code
+    differ.parse(new_code, copies=1, parsers=1, expect_error_leaves=True)
+
+    func += 'def other_func():\n pass\n'
+    differ.initialize('isinstance(\n' + func)
+    # Cannot copy all, because the prefix of the function is once a newline and
+    # once not.
+    differ.parse('isinstance()\n' + func, parsers=2, copies=1)
+
+
+def test_open_parentheses_at_end(differ):
+    code = "a['"
+    differ.initialize(code)
+    differ.parse(code, parsers=1, expect_error_leaves=True)
+
+def test_backslash(differ):
+    src = dedent(r"""
+    a = 1\
+        if 1 else 2
+    def x():
+        pass
+    """)
+    differ.initialize(src)
+
+    src = dedent(r"""
+    def x():
+        a = 1\
+    if 1 else 2
+        def y():
+            pass
+    """)
+    differ.parse(src, parsers=2)
+
+    src = dedent(r"""
+    def first():
+        if foo \
+                and bar \
+                or baz:
+            pass
+    def second():
+        pass
+    """)
+    differ.parse(src, parsers=1)
+
+
+def test_full_copy(differ):
+    code = 'def foo(bar, baz):\n pass\n bar'
+    differ.initialize(code)
+    differ.parse(code, copies=1, parsers=1)
+
+
+def test_wrong_whitespace(differ):
+    code = '''
+    hello
+    '''
+    differ.initialize(code)
+    differ.parse(code + 'bar\n    ', parsers=1)
+
+    code += """abc(\npass\n    """
+    differ.parse(code, parsers=1, copies=1, expect_error_leaves=True)
+
+
+def test_issues_with_error_leaves(differ):
+    code = dedent('''
+    def ints():
+        str..
+        str
+    ''')
+    code2 = dedent('''
+    def ints():
+        str.
+        str
+    ''')
+    differ.initialize(code)
+    differ.parse(code2, parsers=1, copies=1, expect_error_leaves=True)
+
+
+def test_unfinished_nodes(differ):
+    code = dedent('''
+    class a():
+        def __init__(self, a):
+            self.a =  a
+        def p(self):
+    a(1)
+    ''')
+    code2 = dedent('''
+    class a():
+        def __init__(self, a):
+            self.a =  a
+        def p(self):
+            self
+    a(1)
+    ''')
+    differ.initialize(code)
+    differ.parse(code2, parsers=1, copies=2)
+
+
+def test_nested_if_and_scopes(differ):
+    code = dedent('''
+    class a():
+        if 1:
+            def b():
+                2
+    ''')
+    code2 = code + '    else:\n        3'
+    differ.initialize(code)
+    differ.parse(code2, parsers=1, copies=0)
+
+
+def test_word_before_def(differ):
+    code1 = 'blub def x():\n'
+    code2 = code1 + ' s'
+    differ.initialize(code1)
+    differ.parse(code2, parsers=1, copies=0, expect_error_leaves=True)
+
+
+def test_classes_with_error_leaves(differ):
+    code1 = dedent('''
+        class X():
+            def x(self):
+                blablabla
+                assert 3
+                self.
+
+        class Y():
+            pass
+    ''')
+    code2 = dedent('''
+        class X():
+            def x(self):
+                blablabla
+                assert 3
+                str(
+
+        class Y():
+            pass
+    ''')
+
+    differ.initialize(code1)
+    differ.parse(code2, parsers=2, copies=1, expect_error_leaves=True)
+
+
+def test_totally_wrong_whitespace(differ):
+    code1 = '''
+        class X():
+            raise n
+
+        class Y():
+            pass
+    '''
+    code2 = '''
+        class X():
+            raise n
+            str(
+
+        class Y():
+            pass
+    '''
+
+    differ.initialize(code1)
+    differ.parse(code2, parsers=3, copies=0, expect_error_leaves=True)
+
+
+def test_node_insertion(differ):
+    code1 = dedent('''
+        class X():
+            def y(self):
+                a = 1
+                b = 2
+
+                c = 3
+                d = 4
+    ''')
+    code2 = dedent('''
+        class X():
+            def y(self):
+                a = 1
+                b = 2
+                str
+
+                c = 3
+                d = 4
+    ''')
+
+    differ.initialize(code1)
+    differ.parse(code2, parsers=1, copies=2)
+
+
+def test_whitespace_at_end(differ):
+    code = dedent('str\n\n')
+
+    differ.initialize(code)
+    differ.parse(code + '\n', parsers=1, copies=1)
+
+
+def test_endless_while_loop(differ):
+    """
+    This was a bug in Jedi #878.
+    """
+    code = '#dead'
+    differ.initialize(code)
+    module = differ.parse(code, parsers=1)
+    assert module.end_pos == (1, 5)
+
+    code = '#dead\n'
+    differ.initialize(code)
+    module = differ.parse(code + '\n', parsers=1)
+    assert module.end_pos == (3, 0)
+
+
+def test_in_class_movements(differ):
+    code1 = dedent("""\
+        class PlaybookExecutor:
+            p
+            b
+            def run(self):
+                1
+                try:
+                    x
+                except:
+                    pass
+    """)
+    code2 = dedent("""\
+        class PlaybookExecutor:
+            b
+            def run(self):
+                1
+                try:
+                    x
+                except:
+                    pass
+    """)
+
+    differ.initialize(code1)
+    differ.parse(code2, parsers=2, copies=1)
+
+
+def test_in_parentheses_newlines(differ):
+    code1 = dedent("""
+    x = str(
+        True)
+
+    a = 1
+
+    def foo():
+        pass
+
+    b = 2""")
+
+    code2 = dedent("""
+    x = str(True)
+
+    a = 1
+
+    def foo():
+        pass
+
+    b = 2""")
+
+
+def test_indentation_issue(differ):
+    code1 = dedent("""
+        import module
+    """)
+
+    code2 = dedent("""
+        class L1:
+            class L2:
+                class L3:
+                    def f(): pass
+                def f(): pass
+            def f(): pass
+        def f(): pass
+    """)
+
+    differ.initialize(code1)
+    differ.parse(code2, parsers=2)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_file_python_errors.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_file_python_errors.py
new file mode 100644
index 0000000..7083dfe
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_file_python_errors.py
@@ -0,0 +1,23 @@
+import os
+
+import parso
+
+
+def get_python_files(path):
+    for dir_path, dir_names, file_names in os.walk(path):
+        for file_name in file_names:
+            if file_name.endswith('.py'):
+                yield os.path.join(dir_path, file_name)
+
+
+def test_on_itself(each_version):
+    """
+    There are obviously no syntax erros in the Python code of parso. However
+    parso should output the same for all versions.
+    """
+    grammar = parso.load_grammar(version=each_version)
+    path = os.path.dirname(os.path.dirname(__file__)) + '/parso'
+    for file in get_python_files(path):
+        tree = grammar.parse(path=file)
+        errors = list(grammar.iter_errors(tree))
+        assert not errors
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_fstring.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_fstring.py
new file mode 100644
index 0000000..936d7fb
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_fstring.py
@@ -0,0 +1,75 @@
+import pytest
+
+from parso import load_grammar, ParserSyntaxError
+from parso.python.fstring import tokenize
+
+
+@pytest.fixture
+def grammar():
+    return load_grammar(language="python-f-string")
+
+
+@pytest.mark.parametrize(
+    'code', [
+        '{1}',
+        '',
+        '{1!a}',
+        '{1!a:1}',
+        '{1:1}',
+        '{1:1.{32}}',
+        '{1::>4}',
+        '{foo} {bar}',
+
+        # Escapes
+        '{{}}',
+        '{{{1}}}',
+        '{{{1}',
+        '1{{2{{3',
+        '}}',
+        '{:}}}',
+
+        # Invalid, but will be checked, later.
+        '{}',
+        '{1:}',
+        '{:}',
+        '{:1}',
+        '{!:}',
+        '{!}',
+        '{!a}',
+        '{1:{}}',
+        '{1:{:}}',
+    ]
+)
+def test_valid(code, grammar):
+    fstring = grammar.parse(code, error_recovery=False)
+    assert fstring.type == 'fstring'
+    assert fstring.get_code() == code
+
+
+@pytest.mark.parametrize(
+    'code', [
+        '}',
+        '{',
+        '{1!{a}}',
+        '{!{a}}',
+    ]
+)
+def test_invalid(code, grammar):
+    with pytest.raises(ParserSyntaxError):
+        grammar.parse(code, error_recovery=False)
+
+    # It should work with error recovery.
+    #grammar.parse(code, error_recovery=True)
+
+
+@pytest.mark.parametrize(
+    ('code', 'start_pos', 'positions'), [
+        # 2 times 2, 5 because python expr and endmarker.
+        ('}{', (2, 3), [(2, 3), (2, 4), (2, 5), (2, 5)]),
+        (' :{ 1 : } ', (1, 0), [(1, 2), (1, 3), (1, 6), (1, 8), (1, 10)]),
+        ('\n{\nfoo\n }', (2, 1), [(3, 0), (3, 1), (5, 1), (5, 2)]),
+    ]
+)
+def test_tokenize_start_pos(code, start_pos, positions):
+    tokens = tokenize(code, start_pos)
+    assert positions == [p.start_pos for p in tokens]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_get_code.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_get_code.py
new file mode 100644
index 0000000..51e6401
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_get_code.py
@@ -0,0 +1,119 @@
+import difflib
+
+import pytest
+
+from parso import parse
+
+code_basic_features = '''
+"""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
+
+
+def test_basic_parsing():
+    """Validate the parsing features"""
+
+    m = parse(code_basic_features)
+    diff_code_assert(
+        code_basic_features,
+        m.get_code()
+    )
+
+
+def test_operators():
+    src = '5  * 3'
+    module = parse(src)
+    diff_code_assert(src, module.get_code())
+
+
+def test_get_code():
+    """Use the same code that the parser also generates, to compare"""
+    s = '''"""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 parse(s).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 = parse(source)
+        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))
+
+
+@pytest.mark.parametrize(('code', 'types'), [
+    ('\r', ['error_leaf', 'endmarker']),
+    ('\n\r', ['error_leaf', 'endmarker'])
+])
+def test_carriage_return_at_end(code, types):
+    """
+    By adding an artificial newline this creates weird side effects for
+    \r at the end of files that would normally be error leafs.
+    """
+    tree = parse(code)
+    assert tree.get_code() == code
+    assert [c.type for c in tree.children] == types
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_grammar.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_grammar.py
new file mode 100644
index 0000000..60a249b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_grammar.py
@@ -0,0 +1,8 @@
+import parso
+
+import pytest
+
+
+def test_non_unicode():
+    with pytest.raises(UnicodeDecodeError):
+        parso.parse(b'\xe4')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_load_grammar.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_load_grammar.py
new file mode 100644
index 0000000..70dd807
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_load_grammar.py
@@ -0,0 +1,31 @@
+import pytest
+from parso.grammar import load_grammar
+from parso import utils
+
+
+def test_load_inexisting_grammar():
+    # This version shouldn't be out for a while, but if we ever do, wow!
+    with pytest.raises(NotImplementedError):
+        load_grammar(version='15.8')
+    # The same is true for very old grammars (even though this is probably not
+    # going to be an issue.
+    with pytest.raises(NotImplementedError):
+        load_grammar(version='1.5')
+
+
+@pytest.mark.parametrize(('string', 'result'), [
+    ('2', (2, 7)), ('3', (3, 6)), ('1.1', (1, 1)), ('1.1.1', (1, 1)), ('300.1.31', (300, 1))
+])
+def test_parse_version(string, result):
+    assert utils._parse_version(string) == result
+
+
+@pytest.mark.parametrize('string', ['1.', 'a', '#', '1.3.4.5', '1.12'])
+def test_invalid_grammar_version(string):
+    with pytest.raises(ValueError):
+        load_grammar(version=string)
+
+
+def test_grammar_int_version():
+    with pytest.raises(TypeError):
+        load_grammar(version=3.2)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_normalizer_issues_files.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_normalizer_issues_files.py
new file mode 100644
index 0000000..7f692d1
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_normalizer_issues_files.py
@@ -0,0 +1,70 @@
+"""
+To easily verify if our normalizer raises the right error codes, just use the
+tests of pydocstyle.
+"""
+
+import difflib
+import re
+
+import parso
+from parso._compatibility import total_ordering
+from parso.utils import python_bytes_to_unicode
+
+
+@total_ordering
+class WantedIssue(object):
+    def __init__(self, code, line, column):
+        self.code = code
+        self._line = line
+        self._column = column
+
+    def __eq__(self, other):
+        return self.code == other.code and self.start_pos == other.start_pos
+
+    def __lt__(self, other):
+        return self.start_pos < other.start_pos or self.code < other.code
+
+    def __hash__(self):
+        return hash(str(self.code) + str(self._line) + str(self._column))
+
+    @property
+    def start_pos(self):
+        return self._line, self._column
+
+
+def collect_errors(code):
+    for line_nr, line in enumerate(code.splitlines(), 1):
+        match = re.match(r'(\s*)#: (.*)$', line)
+        if match is not None:
+            codes = match.group(2)
+            for code in codes.split():
+                code, _, add_indent = code.partition(':')
+                column = int(add_indent or len(match.group(1)))
+
+                code, _, add_line = code.partition('+')
+                l = line_nr + 1 + int(add_line or 0)
+
+                yield WantedIssue(code[1:], l, column)
+
+
+def test_normalizer_issue(normalizer_issue_case):
+    def sort(issues):
+        issues = sorted(issues, key=lambda i: (i.start_pos, i.code))
+        return ["(%s, %s): %s" % (i.start_pos[0], i.start_pos[1], i.code)
+                for i in issues]
+
+    with open(normalizer_issue_case.path, 'rb') as f:
+        code = python_bytes_to_unicode(f.read())
+
+    desired = sort(collect_errors(code))
+
+    grammar = parso.load_grammar(version=normalizer_issue_case.python_version)
+    module = grammar.parse(code)
+    issues = grammar._get_normalizer_issues(module)
+    actual = sort(issues)
+
+    diff = '\n'.join(difflib.ndiff(desired, actual))
+    # To make the pytest -v diff a bit prettier, stop pytest to rewrite assert
+    # statements by executing the comparison earlier.
+    _bool = desired == actual
+    assert _bool, '\n' + diff
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_old_fast_parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_old_fast_parser.py
new file mode 100644
index 0000000..7e12a03
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_old_fast_parser.py
@@ -0,0 +1,210 @@
+"""
+These tests test the cases that the old fast parser tested with the normal
+parser.
+
+The old fast parser doesn't exist anymore and was replaced with a diff parser.
+However the tests might still be relevant for the parser.
+"""
+
+from textwrap import dedent
+
+from parso._compatibility import u
+from parso import parse
+
+
+def test_carriage_return_splitting():
+    source = u(dedent('''
+
+
+
+        "string"
+
+        class Foo():
+            pass
+        '''))
+    source = source.replace('\n', '\r\n')
+    module = parse(source)
+    assert [n.value for lst in module.get_used_names().values() for n in lst] == ['Foo']
+
+
+def check_p(src, number_parsers_used, number_of_splits=None, number_of_misses=0):
+    if number_of_splits is None:
+        number_of_splits = number_parsers_used
+
+    module_node = parse(src)
+
+    assert src == module_node.get_code()
+    return module_node
+
+
+def test_for():
+    src = dedent("""\
+    for a in [1,2]:
+        a
+
+    for a1 in 1,"":
+        a1
+    """)
+    check_p(src, 1)
+
+
+def test_class_with_class_var():
+    src = dedent("""\
+    class SuperClass:
+        class_super = 3
+        def __init__(self):
+            self.foo = 4
+    pass
+    """)
+    check_p(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_p(src, 1)
+
+
+def test_decorator():
+    src = dedent("""\
+    class Decorator():
+        @memoize
+        def dec(self, a):
+            return a
+    """)
+    check_p(src, 2)
+
+
+def test_nested_funcs():
+    src = dedent("""\
+    def memoize(func):
+        def wrapper(*args, **kwargs):
+            return func(*args, **kwargs)
+        return wrapper
+    """)
+    check_p(src, 3)
+
+
+def test_multi_line_params():
+    src = dedent("""\
+    def x(a,
+          b):
+        pass
+
+    foo = 1
+    """)
+    check_p(src, 2)
+
+
+def test_class_func_if():
+    src = dedent("""\
+    class Class:
+        def func(self):
+            if 1:
+                a
+            else:
+                b
+
+    pass
+    """)
+    check_p(src, 3)
+
+
+def test_multi_line_for():
+    src = dedent("""\
+    for x in [1,
+              2]:
+        pass
+
+    pass
+    """)
+    check_p(src, 1)
+
+
+def test_wrong_indentation():
+    src = dedent("""\
+    def func():
+        a
+         b
+        a
+    """)
+    #check_p(src, 1)
+
+    src = dedent("""\
+    def complex():
+        def nested():
+            a
+             b
+            a
+
+        def other():
+            pass
+    """)
+    check_p(src, 3)
+
+
+def test_strange_parentheses():
+    src = dedent("""
+    class X():
+        a = (1
+    if 1 else 2)
+        def x():
+            pass
+    """)
+    check_p(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_p(src, 3, 2, 1)
+
+
+def test_additional_indent():
+    source = dedent('''\
+    int(
+      def x():
+          pass
+    ''')
+
+    check_p(source, 2)
+
+
+def test_round_trip():
+    code = dedent('''
+    def x():
+        """hahaha"""
+    func''')
+
+    assert parse(code).get_code() == code
+
+
+def test_parentheses_in_string():
+    code = dedent('''
+    def x():
+        '('
+
+    import abc
+
+    abc.''')
+    check_p(code, 2, 1, 1)
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_param_splitting.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_param_splitting.py
new file mode 100644
index 0000000..ab47dca
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/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 parso import parse
+
+
+def assert_params(param_string, version=None, **wanted_dct):
+    source = dedent('''
+    def x(%s):
+        pass
+    ''') % param_string
+
+    module = parse(source, version=version)
+    funcdef = next(module.iter_funcdefs())
+    dct = dict((p.name.value, p.default and p.default.get_code())
+               for p in funcdef.get_params())
+    assert dct == wanted_dct
+    assert module.get_code() == source
+
+
+def test_split_params_with_separation_star():
+    assert_params(u'x, y=1, *, z=3', x=None, y='1', z='3', version='3.5')
+    assert_params(u'*, x', x=None, version='3.5')
+    assert_params(u'*', version='3.5')
+
+
+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/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser.py
new file mode 100644
index 0000000..aa17b65
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser.py
@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+from textwrap import dedent
+
+import pytest
+
+from parso._compatibility import u
+from parso import parse
+from parso.python import tree
+from parso.utils import split_lines
+
+
+def test_basic_parsing(each_version):
+    def compare(string):
+        """Generates the AST object and then regenerates the code."""
+        assert parse(string, version=each_version).get_code() == string
+
+    compare('\na #pass\n')
+    compare('wblabla* 1\t\n')
+    compare('def x(a, b:3): pass\n')
+    compare('assert foo\n')
+
+
+def test_subscope_names(each_version):
+    def get_sub(source):
+        return parse(source, version=each_version).children[0]
+
+    name = get_sub('class Foo: pass').name
+    assert name.start_pos == (1, len('class '))
+    assert name.end_pos == (1, len('class Foo'))
+    assert name.value == 'Foo'
+
+    name = get_sub('def foo(): pass').name
+    assert name.start_pos == (1, len('def '))
+    assert name.end_pos == (1, len('def foo'))
+    assert name.value == 'foo'
+
+
+def test_import_names(each_version):
+    def get_import(source):
+        return next(parse(source, version=each_version).iter_imports())
+
+    imp = get_import('import math\n')
+    names = imp.get_defined_names()
+    assert len(names) == 1
+    assert names[0].value == '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_end_pos(each_version):
+    s = dedent('''
+               x = ['a', 'b', 'c']
+               def func():
+                   y = None
+               ''')
+    parser = parse(s, version=each_version)
+    scope = next(parser.iter_funcdefs())
+    assert scope.start_pos == (3, 0)
+    assert scope.end_pos == (5, 0)
+
+
+def test_carriage_return_statements(each_version):
+    source = dedent('''
+        foo = 'ns1!'
+
+        # this is a namespace package
+    ''')
+    source = source.replace('\n', '\r\n')
+    stmt = parse(source, version=each_version).children[0]
+    assert '#' not in stmt.get_code()
+
+
+def test_incomplete_list_comprehension(each_version):
+    """ 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.
+    children = parse('(1 for def', version=each_version).children
+    assert [c.type for c in children] == \
+        ['error_node', 'error_node', 'endmarker']
+
+
+def test_newline_positions(each_version):
+    endmarker = parse('a\n', version=each_version).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(each_version):
+    """
+    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 = 'def x():\n .'
+    m = parse(s, version=each_version)
+    func = m.children[0]
+    assert func.type == 'funcdef'
+    assert func.end_pos == (2, 2)
+    assert m.end_pos == (2, 2)
+
+
+def test_param_splitting(each_version):
+    """
+    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.
+        m = parse(src, version=each_version)
+        if each_version.startswith('2'):
+            # 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.
+            func = next(m.iter_funcdefs())
+            assert [param.name.value for param in func.get_params()] == result
+        else:
+            assert not list(m.iter_funcdefs())
+
+    check('def x(a, (b, c)):\n pass', ['a'])
+    check('def x((b, c)):\n pass', [])
+
+
+def test_unicode_string():
+    s = tree.String(None, u('bö'), (0, 0))
+    assert repr(s)  # Should not raise an Error!
+
+
+def test_backslash_dos_style(each_version):
+    assert parse('\\\r\n', version=each_version)
+
+
+def test_started_lambda_stmt(each_version):
+    m = parse(u'lambda a, b: a i', version=each_version)
+    assert m.children[0].type == 'error_node'
+
+
+def test_python2_octal(each_version):
+    module = parse('0660', version=each_version)
+    first = module.children[0]
+    if each_version.startswith('2'):
+        assert first.type == 'number'
+    else:
+        assert first.type == 'error_node'
+
+
+@pytest.mark.parametrize('code', ['foo "', 'foo """\n', 'foo """\nbar'])
+def test_open_string_literal(each_version, code):
+    """
+    Testing mostly if removing the last newline works.
+    """
+    lines = split_lines(code, keepends=True)
+    end_pos = (len(lines), len(lines[-1]))
+    module = parse(code, version=each_version)
+    assert module.get_code() == code
+    assert module.end_pos == end_pos == module.children[1].end_pos
+
+
+def test_too_many_params():
+    with pytest.raises(TypeError):
+        parse('asdf', hello=3)
+
+
+def test_dedent_at_end(each_version):
+    code = dedent('''
+        for foobar in [1]:
+            foobar''')
+    module = parse(code, version=each_version)
+    assert module.get_code() == code
+    suite = module.children[0].children[-1]
+    foobar = suite.children[-1]
+    assert foobar.type == 'name'
+
+
+def test_no_error_nodes(each_version):
+    def check(node):
+        assert node.type not in ('error_leaf', 'error_node')
+
+        try:
+            children = node.children
+        except AttributeError:
+            pass
+        else:
+            for child in children:
+                check(child)
+
+    check(parse("if foo:\n bar", version=each_version))
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser_tree.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser_tree.py
new file mode 100644
index 0000000..a39ea74
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_parser_tree.py
@@ -0,0 +1,151 @@
+# -*- coding: utf-8    # This file contains Unicode characters.
+
+from textwrap import dedent
+
+import pytest
+
+from parso import parse
+from parso.python import tree
+
+
+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 = parse(dedent(request.param[0]), version='3.5')
+        request.keywords['expected'] = request.param[1]
+        child = parsed.children[0]
+        if child.type == 'simple_stmt':
+            child = child.children[0]
+        return child
+
+    @pytest.fixture()
+    def expected(self, request, node):
+        return request.keywords['expected']
+
+    def test_name(self, node, expected):
+        if node.type != 'lambdef':
+            assert isinstance(node.name, tree.Name)
+            assert node.name.value == expected['name']
+
+    def test_params(self, node, expected):
+        assert isinstance(node.get_params(), list)
+        assert all(isinstance(x, tree.Param) for x in node.get_params())
+        assert [str(x.name.value) for x in node.get_params()] == [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):
+        assert node.is_generator() == expected.get('yields', False)
+
+    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_end_pos_line(each_version):
+    # jedi issue #150
+    s = "x()\nx( )\nx(  )\nx (  )\n"
+
+    module = parse(s, version=each_version)
+    for i, simple_stmt in enumerate(module.children[:-1]):
+        expr_stmt = simple_stmt.children[0]
+        assert expr_stmt.end_pos == (i + 1, i + 3)
+
+
+def test_default_param(each_version):
+    func = parse('def x(foo=42): pass', version=each_version).children[0]
+    param, = func.get_params()
+    assert param.default.value == '42'
+    assert param.annotation is None
+    assert not param.star_count
+
+
+def test_annotation_param(each_py3_version):
+    func = parse('def x(foo: 3): pass', version=each_py3_version).children[0]
+    param, = func.get_params()
+    assert param.default is None
+    assert param.annotation.value == '3'
+    assert not param.star_count
+
+
+def test_annotation_params(each_py3_version):
+    func = parse('def x(foo: 3, bar: 4): pass', version=each_py3_version).children[0]
+    param1, param2 = func.get_params()
+
+    assert param1.default is None
+    assert param1.annotation.value == '3'
+    assert not param1.star_count
+
+    assert param2.default is None
+    assert param2.annotation.value == '4'
+    assert not param2.star_count
+
+
+def test_default_and_annotation_param(each_py3_version):
+    func = parse('def x(foo:3=42): pass', version=each_py3_version).children[0]
+    param, = func.get_params()
+    assert param.default.value == '42'
+    assert param.annotation.value == '3'
+    assert not param.star_count
+
+
+def test_ellipsis_py2(each_py2_version):
+    module = parse('[0][...]', version=each_py2_version, error_recovery=False)
+    expr = module.children[0]
+    trailer = expr.children[-1]
+    subscript = trailer.children[1]
+    assert subscript.type == 'subscript'
+    assert [leaf.value for leaf in subscript.children] == ['.', '.', '.']
+
+
+def get_yield_exprs(code, version):
+    return list(parse(code, version=version).children[0].iter_yield_exprs())
+
+
+def get_return_stmts(code):
+    return list(parse(code).children[0].iter_return_stmts())
+
+
+def test_yields(each_version):
+    y, = get_yield_exprs('def x(): yield', each_version)
+    assert y.value == 'yield'
+    assert y.type == 'keyword'
+
+    y, = get_yield_exprs('def x(): (yield 1)', each_version)
+    assert y.type == 'yield_expr'
+
+    y, = get_yield_exprs('def x(): [1, (yield)]', each_version)
+    assert y.type == 'keyword'
+
+
+def test_yield_from():
+    y, = get_yield_exprs('def x(): (yield from 1)', '3.3')
+    assert y.type == 'yield_expr'
+
+
+def test_returns():
+    r, = get_return_stmts('def x(): return')
+    assert r.value == 'return'
+    assert r.type == 'keyword'
+
+    r, = get_return_stmts('def x(): return 1')
+    assert r.type == 'return_stmt'
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pep8.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pep8.py
new file mode 100644
index 0000000..44c11f4
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pep8.py
@@ -0,0 +1,39 @@
+import parso
+
+
+def issues(code):
+    grammar = parso.load_grammar()
+    module = parso.parse(code)
+    return grammar._get_normalizer_issues(module)
+
+
+def test_eof_newline():
+    def assert_issue(code):
+        found = issues(code)
+        assert len(found) == 1
+        issue, = found
+        assert issue.code == 292
+
+    assert not issues('asdf = 1\n')
+    assert_issue('asdf = 1')
+    assert_issue('asdf = 1\n# foo')
+    assert_issue('# foobar')
+    assert_issue('')
+    assert_issue('foo = 1  # comment')
+
+
+def test_eof_blankline():
+    def assert_issue(code):
+        found = issues(code)
+        assert len(found) == 1
+        issue, = found
+        assert issue.code == 391
+
+    assert_issue('asdf = 1\n\n')
+    assert_issue('# foobar\n\n')
+    assert_issue('\n\n')
+
+def test_shebang():
+    assert not issues('#!\n')
+    assert not issues('#!/foo\n')
+    assert not issues('#! python\n')
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pgen2.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pgen2.py
new file mode 100644
index 0000000..8c6e90f
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_pgen2.py
@@ -0,0 +1,272 @@
+"""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
+
+import pytest
+
+from parso import load_grammar
+from parso import ParserSyntaxError
+
+
+def _parse(code, version=None):
+    code = dedent(code) + "\n\n"
+    grammar = load_grammar(version=version)
+    return grammar.parse(code, error_recovery=False)
+
+
+def _invalid_syntax(code, version=None, **kwargs):
+    with pytest.raises(ParserSyntaxError):
+        module = _parse(code, version=version, **kwargs)
+        # For debugging
+        print(module.children)
+
+
+def test_formfeed(each_py2_version):
+    s = u"""print 1\n\x0Cprint 2\n"""
+    t = _parse(s, each_py2_version)
+    assert t.children[0].children[0].type == 'print_stmt'
+    assert t.children[1].children[0].type == 'print_stmt'
+    s = u"""1\n\x0C\x0C2\n"""
+    t = _parse(s, each_py2_version)
+
+
+def test_matrix_multiplication_operator(works_ge_py35):
+    works_ge_py35.parse("a @ b")
+    works_ge_py35.parse("a @= b")
+
+
+def test_yield_from(works_ge_py3, each_version):
+    works_ge_py3.parse("yield from x")
+    works_ge_py3.parse("(yield from x) + y")
+    _invalid_syntax("yield from", each_version)
+
+
+def test_await_expr(works_ge_py35):
+    works_ge_py35.parse("""async def foo():
+                         await x
+                  """)
+
+    works_ge_py35.parse("""async def foo():
+
+        def foo(): pass
+
+        def foo(): pass
+
+        await x
+    """)
+
+    works_ge_py35.parse("""async def foo(): return await a""")
+
+    works_ge_py35.parse("""def foo():
+        def foo(): pass
+        async def foo(): await x
+    """)
+
+
+@pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+@pytest.mark.xfail(reason="acting like python 3.7")
+def test_async_var():
+    _parse("""async = 1""", "3.5")
+    _parse("""await = 1""", "3.5")
+    _parse("""def async(): pass""", "3.5")
+
+
+def test_async_for(works_ge_py35):
+    works_ge_py35.parse("async def foo():\n async for a in b: pass")
+
+
+def test_async_with(works_ge_py35):
+    works_ge_py35.parse("async def foo():\n async with a: pass")
+
+    @pytest.mark.skipif('sys.version_info[:2] < (3, 5)')
+    @pytest.mark.xfail(reason="acting like python 3.7")
+    def test_async_with_invalid():
+        _invalid_syntax("""def foo():
+                                   async with a: pass""", version="3.5")
+
+
+def test_raise_3x_style_1(each_version):
+    _parse("raise", each_version)
+
+
+def test_raise_2x_style_2(works_in_py2):
+    works_in_py2.parse("raise E, V")
+
+def test_raise_2x_style_3(works_in_py2):
+    works_in_py2.parse("raise E, V, T")
+
+def test_raise_2x_style_invalid_1(each_version):
+    _invalid_syntax("raise E, V, T, Z", version=each_version)
+
+def test_raise_3x_style(works_ge_py3):
+    works_ge_py3.parse("raise E1 from E2")
+
+def test_raise_3x_style_invalid_1(each_version):
+    _invalid_syntax("raise E, V from E1", each_version)
+
+def test_raise_3x_style_invalid_2(each_version):
+    _invalid_syntax("raise E from E1, E2", each_version)
+
+def test_raise_3x_style_invalid_3(each_version):
+    _invalid_syntax("raise from E1, E2", each_version)
+
+def test_raise_3x_style_invalid_4(each_version):
+    _invalid_syntax("raise E from", each_version)
+
+
+# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testFuncdef
+def test_annotation_1(works_ge_py3):
+    works_ge_py3.parse("""def f(x) -> list: pass""")
+
+def test_annotation_2(works_ge_py3):
+    works_ge_py3.parse("""def f(x:int): pass""")
+
+def test_annotation_3(works_ge_py3):
+    works_ge_py3.parse("""def f(*x:str): pass""")
+
+def test_annotation_4(works_ge_py3):
+    works_ge_py3.parse("""def f(**x:float): pass""")
+
+def test_annotation_5(works_ge_py3):
+    works_ge_py3.parse("""def f(x, y:1+2): pass""")
+
+def test_annotation_6(each_py3_version):
+    _invalid_syntax("""def f(a, (b:1, c:2, d)): pass""", each_py3_version)
+
+def test_annotation_7(each_py3_version):
+    _invalid_syntax("""def f(a, (b:1, c:2, d), e:3=4, f=5, *g:6): pass""", each_py3_version)
+
+def test_annotation_8(each_py3_version):
+    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"""
+    _invalid_syntax(s, each_py3_version)
+
+
+def test_except_new(each_version):
+    s = dedent("""
+        try:
+            x
+        except E as N:
+            y""")
+    _parse(s, each_version)
+
+def test_except_old(works_in_py2):
+    s = dedent("""
+        try:
+            x
+        except E, N:
+            y""")
+    works_in_py2.parse(s)
+
+
+# Adapted from Python 3's Lib/test/test_grammar.py:GrammarTests.testAtoms
+def test_set_literal_1(works_ge_py27):
+    works_ge_py27.parse("""x = {'one'}""")
+
+def test_set_literal_2(works_ge_py27):
+    works_ge_py27.parse("""x = {'one', 1,}""")
+
+def test_set_literal_3(works_ge_py27):
+    works_ge_py27.parse("""x = {'one', 'two', 'three'}""")
+
+def test_set_literal_4(works_ge_py27):
+    works_ge_py27.parse("""x = {2, 3, 4,}""")
+
+
+def test_new_octal_notation(each_version):
+    _parse("""0o7777777777777""", each_version)
+    _invalid_syntax("""0o7324528887""", each_version)
+
+
+def test_old_octal_notation(works_in_py2):
+    works_in_py2.parse("07")
+
+
+def test_new_binary_notation(each_version):
+    _parse("""0b101010""", each_version)
+    _invalid_syntax("""0b0101021""", each_version)
+
+
+def test_class_new_syntax(works_ge_py3):
+    works_ge_py3.parse("class B(t=7): pass")
+    works_ge_py3.parse("class B(t, *args): pass")
+    works_ge_py3.parse("class B(t, **kwargs): pass")
+    works_ge_py3.parse("class B(t, *args, **kwargs): pass")
+    works_ge_py3.parse("class B(t, y=9, *args, **kwargs): pass")
+
+
+def test_parser_idempotency_extended_unpacking(works_ge_py3):
+    """A cut-down version of pytree_idempotency.py."""
+    works_ge_py3.parse("a, *b, c = x\n")
+    works_ge_py3.parse("[*a, b] = x\n")
+    works_ge_py3.parse("(z, *y, w) = m\n")
+    works_ge_py3.parse("for *z, m in d: pass\n")
+
+
+def test_multiline_bytes_literals(each_version):
+    """
+    It's not possible to get the same result when using \xaa in Python 2/3,
+    because it's treated differently.
+    """
+    s = u"""
+        md5test(b"\xaa" * 80,
+                (b"Test Using Larger Than Block-Size Key "
+                 b"and Larger Than One Block-Size Data"),
+                "6f630fad67cda0ee1fb1f562db3aa53e")
+        """
+    _parse(s, each_version)
+
+
+def test_multiline_bytes_tripquote_literals(each_version):
+    s = '''
+        b"""
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN">
+        """
+        '''
+    _parse(s, each_version)
+
+
+def test_ellipsis(works_ge_py3, each_version):
+    works_ge_py3.parse("...")
+    _parse("[0][...]", version=each_version)
+
+
+def test_dict_unpacking(works_ge_py35):
+    works_ge_py35.parse("{**dict(a=3), foo:2}")
+
+
+def test_multiline_str_literals(each_version):
+    s = u"""
+        md5test("\xaa" * 80,
+                ("Test Using Larger Than Block-Size Key "
+                 "and Larger Than One Block-Size Data"),
+                "6f630fad67cda0ee1fb1f562db3aa53e")
+        """
+    _parse(s, each_version)
+
+
+def test_py2_backticks(works_in_py2):
+    works_in_py2.parse("`1`")
+
+
+def test_py2_string_prefixes(works_in_py2):
+    works_in_py2.parse("ur'1'")
+    works_in_py2.parse("Ur'1'")
+    works_in_py2.parse("UR'1'")
+    _invalid_syntax("ru'1'", works_in_py2.version)
+
+
+def py_br(each_version):
+    _parse('br""', each_version)
+
+
+def test_py3_rb(works_ge_py3):
+    works_ge_py3.parse("rb'1'")
+    works_ge_py3.parse("RB'1'")
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_prefix.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_prefix.py
new file mode 100644
index 0000000..0c79958
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_prefix.py
@@ -0,0 +1,79 @@
+try:
+    from itertools import zip_longest
+except ImportError:
+    # Python 2
+    from itertools import izip_longest as zip_longest
+
+from codecs import BOM_UTF8
+
+import pytest
+
+import parso
+
+unicode_bom = BOM_UTF8.decode('utf-8')
+
+
+@pytest.mark.parametrize(('string', 'tokens'), [
+    ('', ['']),
+    ('#', ['#', '']),
+    (' # ', ['# ', '']),
+    (' # \n', ['# ', '\n', '']),
+    (' # \f\n', ['# ', '\f', '\n', '']),
+    ('  \n', ['\n', '']),
+    ('  \n ', ['\n', ' ']),
+    (' \f ', ['\f', ' ']),
+    (' \f ', ['\f', ' ']),
+    (' \r\n', ['\r\n', '']),
+    ('\\\n', ['\\\n', '']),
+    ('\\\r\n', ['\\\r\n', '']),
+    ('\t\t\n\t', ['\n', '\t']),
+])
+def test_simple_prefix_splitting(string, tokens):
+    tree = parso.parse(string)
+    leaf = tree.children[0]
+    assert leaf.type == 'endmarker'
+
+    parsed_tokens = list(leaf._split_prefix())
+    start_pos = (1, 0)
+    for pt, expected in zip_longest(parsed_tokens, tokens):
+        assert pt.value == expected
+
+        # Calculate the estimated end_pos
+        if expected.endswith('\n'):
+            end_pos = start_pos[0] + 1, 0
+        else:
+            end_pos = start_pos[0], start_pos[1] + len(expected) + len(pt.spacing)
+
+        #assert start_pos == pt.start_pos
+        assert end_pos == pt.end_pos
+        start_pos = end_pos
+
+
+@pytest.mark.parametrize(('string', 'types'), [
+    ('# ', ['comment', 'spacing']),
+    ('\r\n', ['newline', 'spacing']),
+    ('\f', ['formfeed', 'spacing']),
+    ('\\\n', ['backslash', 'spacing']),
+    (' \t', ['spacing']),
+    (' \t ', ['spacing']),
+    (unicode_bom + ' # ', ['bom', 'comment', 'spacing']),
+])
+def test_prefix_splitting_types(string, types):
+    tree = parso.parse(string)
+    leaf = tree.children[0]
+    assert leaf.type == 'endmarker'
+    parsed_tokens = list(leaf._split_prefix())
+    assert [t.type for t in parsed_tokens] == types
+
+
+def test_utf8_bom():
+    tree = parso.parse(unicode_bom + 'a = 1')
+    expr_stmt = tree.children[0]
+    assert expr_stmt.start_pos == (1, 0)
+
+    tree = parso.parse(unicode_bom + '\n')
+    endmarker = tree.children[0]
+    parts = list(endmarker._split_prefix())
+    assert [p.type for p in parts] == ['bom', 'newline', 'spacing']
+    assert [p.start_pos for p in parts] == [(1, 0), (1, 0), (2, 0)]
+    assert [p.end_pos for p in parts] == [(1, 0), (2, 0), (2, 0)]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_python_errors.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_python_errors.py
new file mode 100644
index 0000000..b724a41
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_python_errors.py
@@ -0,0 +1,262 @@
+"""
+Testing if parso finds syntax errors and indentation errors.
+"""
+import sys
+import warnings
+
+import pytest
+
+import parso
+from parso._compatibility import is_pypy
+from .failing_examples import FAILING_EXAMPLES, indent, build_nested
+
+
+if is_pypy:
+    # The errors in PyPy might be different. Just skip the module for now.
+    pytestmark = pytest.mark.skip()
+
+
+def _get_error_list(code, version=None):
+    grammar = parso.load_grammar(version=version)
+    tree = grammar.parse(code)
+    return list(grammar.iter_errors(tree))
+
+
+def assert_comparison(code, error_code, positions):
+    errors = [(error.start_pos, error.code) for error in _get_error_list(code)]
+    assert [(pos, error_code) for pos in positions] == errors
+
+
+@pytest.mark.parametrize('code', FAILING_EXAMPLES)
+def test_python_exception_matches(code):
+    wanted, line_nr = _get_actual_exception(code)
+
+    errors = _get_error_list(code)
+    actual = None
+    if errors:
+        error, = errors
+        actual = error.message
+    assert actual in wanted
+    # Somehow in Python3.3 the SyntaxError().lineno is sometimes None
+    assert line_nr is None or line_nr == error.start_pos[0]
+
+
+@pytest.mark.parametrize(
+    ('code', 'positions'), [
+        ('1 +', [(1, 3)]),
+        ('1 +\n', [(1, 3)]),
+        ('1 +\n2 +', [(1, 3), (2, 3)]),
+        ('x + 2', []),
+        ('[\n', [(2, 0)]),
+        ('[\ndef x(): pass', [(2, 0)]),
+        ('[\nif 1: pass', [(2, 0)]),
+        ('1+?', [(1, 2)]),
+        ('?', [(1, 0)]),
+        ('??', [(1, 0)]),
+        ('? ?', [(1, 0)]),
+        ('?\n?', [(1, 0), (2, 0)]),
+        ('? * ?', [(1, 0)]),
+        ('1 + * * 2', [(1, 4)]),
+        ('?\n1\n?', [(1, 0), (3, 0)]),
+    ]
+)
+def test_syntax_errors(code, positions):
+    assert_comparison(code, 901, positions)
+
+
+@pytest.mark.parametrize(
+    ('code', 'positions'), [
+        (' 1', [(1, 0)]),
+        ('def x():\n    1\n 2', [(3, 0)]),
+        ('def x():\n 1\n  2', [(3, 0)]),
+        ('def x():\n1', [(2, 0)]),
+    ]
+)
+def test_indentation_errors(code, positions):
+    assert_comparison(code, 903, positions)
+
+
+def _get_actual_exception(code):
+    with warnings.catch_warnings():
+        # We don't care about warnings where locals/globals misbehave here.
+        # It's as simple as either an error or not.
+        warnings.filterwarnings('ignore', category=SyntaxWarning)
+        try:
+            compile(code, '<unknown>', 'exec')
+        except (SyntaxError, IndentationError) as e:
+            wanted = e.__class__.__name__ + ': ' + e.msg
+            line_nr = e.lineno
+        except ValueError as e:
+            # The ValueError comes from byte literals in Python 2 like '\x'
+            # that are oddly enough not SyntaxErrors.
+            wanted = 'SyntaxError: (value error) ' + str(e)
+            line_nr = None
+        else:
+            assert False, "The piece of code should raise an exception."
+
+    # SyntaxError
+    # Python 2.6 has a bit different error messages here, so skip it.
+    if sys.version_info[:2] == (2, 6) and wanted == 'SyntaxError: unexpected EOF while parsing':
+        wanted = 'SyntaxError: invalid syntax'
+
+    if wanted == 'SyntaxError: non-keyword arg after keyword arg':
+        # The python 3.5+ way, a bit nicer.
+        wanted = 'SyntaxError: positional argument follows keyword argument'
+    elif wanted == 'SyntaxError: assignment to keyword':
+        return [wanted, "SyntaxError: can't assign to keyword"], line_nr
+    elif wanted == 'SyntaxError: assignment to None':
+        # Python 2.6 does has a slightly different error.
+        wanted = 'SyntaxError: cannot assign to None'
+    elif wanted == 'SyntaxError: can not assign to __debug__':
+        # Python 2.6 does has a slightly different error.
+        wanted = 'SyntaxError: cannot assign to __debug__'
+    elif wanted == 'SyntaxError: can use starred expression only as assignment target':
+        # Python 3.4/3.4 have a bit of a different warning than 3.5/3.6 in
+        # certain places. But in others this error makes sense.
+        return [wanted, "SyntaxError: can't use starred expression here"], line_nr
+    return [wanted], line_nr
+
+
+def test_default_except_error_postition():
+    # For this error the position seemed to be one line off, but that doesn't
+    # really matter.
+    code = 'try: pass\nexcept: pass\nexcept X: pass'
+    wanted, line_nr = _get_actual_exception(code)
+    error, = _get_error_list(code)
+    assert error.message in wanted
+    assert line_nr != error.start_pos[0]
+    # I think this is the better position.
+    assert error.start_pos[0] == 2
+
+
+def test_statically_nested_blocks():
+    def build(code, depth):
+        if depth == 0:
+            return code
+
+        new_code = 'if 1:\n' + indent(code)
+        return build(new_code, depth - 1)
+
+    def get_error(depth, add_func=False):
+        code = build('foo', depth)
+        if add_func:
+            code = 'def bar():\n' + indent(code)
+        errors = _get_error_list(code)
+        if errors:
+            assert errors[0].message == 'SyntaxError: too many statically nested blocks'
+            return errors[0]
+        return None
+
+    assert get_error(19) is None
+    assert get_error(19, add_func=True) is None
+
+    assert get_error(20)
+    assert get_error(20, add_func=True)
+
+
+def test_future_import_first():
+    def is_issue(code, *args):
+        code = code % args
+        return bool(_get_error_list(code))
+
+    i1 = 'from __future__ import division'
+    i2 = 'from __future__ import absolute_import'
+    assert not is_issue(i1)
+    assert not is_issue(i1 + ';' + i2)
+    assert not is_issue(i1 + '\n' + i2)
+    assert not is_issue('"";' + i1)
+    assert not is_issue('"";' + i1)
+    assert not is_issue('""\n' + i1)
+    assert not is_issue('""\n%s\n%s', i1, i2)
+    assert not is_issue('""\n%s;%s', i1, i2)
+    assert not is_issue('"";%s;%s ', i1, i2)
+    assert not is_issue('"";%s\n%s ', i1, i2)
+    assert is_issue('1;' + i1)
+    assert is_issue('1\n' + i1)
+    assert is_issue('"";1\n' + i1)
+    assert is_issue('""\n%s\nfrom x import a\n%s', i1, i2)
+    assert is_issue('%s\n""\n%s', i1, i2)
+
+
+def test_named_argument_issues(works_not_in_py):
+    message = works_not_in_py.get_error_message('def foo(*, **dict): pass')
+    message = works_not_in_py.get_error_message('def foo(*): pass')
+    if works_not_in_py.version.startswith('2'):
+        assert message == 'SyntaxError: invalid syntax'
+    else:
+        assert message == 'SyntaxError: named arguments must follow bare *'
+
+    works_not_in_py.assert_no_error_in_passing('def foo(*, name): pass')
+    works_not_in_py.assert_no_error_in_passing('def foo(bar, *, name=1): pass')
+    works_not_in_py.assert_no_error_in_passing('def foo(bar, *, name=1, **dct): pass')
+
+
+def test_escape_decode_literals(each_version):
+    """
+    We are using internal functions to assure that unicode/bytes escaping is
+    without syntax errors. Here we make a bit of quality assurance that this
+    works through versions, because the internal function might change over
+    time.
+    """
+    def get_msg(end, to=1):
+        base = "SyntaxError: (unicode error) 'unicodeescape' " \
+               "codec can't decode bytes in position 0-%s: " % to
+        return base + end
+
+    def get_msgs(escape):
+        return (get_msg('end of string in escape sequence'),
+                get_msg(r"truncated %s escape" % escape))
+
+    error, = _get_error_list(r'u"\x"', version=each_version)
+    assert error.message in get_msgs(r'\xXX')
+
+    error, = _get_error_list(r'u"\u"', version=each_version)
+    assert error.message in get_msgs(r'\uXXXX')
+
+    error, = _get_error_list(r'u"\U"', version=each_version)
+    assert error.message in get_msgs(r'\UXXXXXXXX')
+
+    error, = _get_error_list(r'u"\N{}"', version=each_version)
+    assert error.message == get_msg(r'malformed \N character escape', to=2)
+
+    error, = _get_error_list(r'u"\N{foo}"', version=each_version)
+    assert error.message == get_msg(r'unknown Unicode character name', to=6)
+
+    # Finally bytes.
+    error, = _get_error_list(r'b"\x"', version=each_version)
+    wanted = r'SyntaxError: (value error) invalid \x escape'
+    if sys.version_info >= (3, 0):
+        # The positioning information is only available in Python 3.
+        wanted += ' at position 0'
+    assert error.message == wanted
+
+
+def test_too_many_levels_of_indentation():
+    assert not _get_error_list(build_nested('pass', 99))
+    assert _get_error_list(build_nested('pass', 100))
+    base = 'def x():\n if x:\n'
+    assert not _get_error_list(build_nested('pass', 49, base=base))
+    assert _get_error_list(build_nested('pass', 50, base=base))
+
+
+@pytest.mark.parametrize(
+    'code', [
+        "f'{*args,}'",
+    ]
+)
+def test_valid_fstrings(code):
+    assert not _get_error_list(code, version='3.6')
+
+
+@pytest.mark.parametrize(
+    ('code', 'message'), [
+        ("f'{1+}'", ('invalid syntax')),
+    ]
+)
+def test_invalid_fstrings(code, message):
+    """
+    Some fstring errors are handled differntly in 3.6 and other versions.
+    Therefore check specifically for these errors here.
+    """
+    error, = _get_error_list(code, version='3.6')
+    assert message in error.message
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_tokenize.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_tokenize.py
new file mode 100644
index 0000000..bd62d95
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_tokenize.py
@@ -0,0 +1,226 @@
+# -*- coding: utf-8    # This file contains Unicode characters.
+
+from textwrap import dedent
+
+import pytest
+
+from parso._compatibility import py_version
+from parso.utils import split_lines, parse_version_string
+from parso.python.token import (
+    NAME, NEWLINE, STRING, INDENT, DEDENT, ERRORTOKEN, ENDMARKER, ERROR_DEDENT)
+from parso.python import tokenize
+from parso import parse
+from parso.python.tokenize import PythonToken
+
+
+def _get_token_list(string):
+    # Load the current version.
+    version_info = parse_version_string()
+    return list(tokenize.tokenize(string, version_info))
+
+
+def test_end_pos_one_line():
+    parsed = parse(dedent('''
+    def testit():
+        a = "huhu"
+    '''))
+    simple_stmt = next(parsed.iter_funcdefs()).get_suite().children[-1]
+    string = simple_stmt.children[0].get_rhs()
+    assert string.end_pos == (3, 14)
+
+
+def test_end_pos_multi_line():
+    parsed = parse(dedent('''
+    def testit():
+        a = """huhu
+    asdfasdf""" + "h"
+    '''))
+    expr_stmt = next(parsed.iter_funcdefs()).get_suite().children[1].children[0]
+    string_leaf = expr_stmt.get_rhs().children[0]
+    assert string_leaf.end_pos == (4, 11)
+
+
+def test_simple_no_whitespace():
+    # Test a simple one line string, no preceding whitespace
+    simple_docstring = '"""simple one line docstring"""'
+    token_list = _get_token_list(simple_docstring)
+    _, value, _, prefix = token_list[0]
+    assert prefix == ''
+    assert value == '"""simple one line docstring"""'
+
+
+def test_simple_with_whitespace():
+    # Test a simple one line string with preceding whitespace and newline
+    simple_docstring = '  """simple one line docstring""" \r\n'
+    token_list = _get_token_list(simple_docstring)
+    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():
+    # Test function definition whitespace identification
+    fundef = dedent('''
+    def test_whitespace(*args, **kwargs):
+        x = 1
+        if x > 0:
+            print(True)
+    ''')
+    token_list = _get_token_list(fundef)
+    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_tokenize_multiline_I():
+    # Make sure multiline string having newlines have the end marker on the
+    # next line
+    fundef = '''""""\n'''
+    token_list = _get_token_list(fundef)
+    assert token_list == [PythonToken(ERRORTOKEN, '""""\n', (1, 0), ''),
+                          PythonToken(ENDMARKER ,       '', (2, 0), '')]
+
+
+def test_tokenize_multiline_II():
+    # Make sure multiline string having no newlines have the end marker on
+    # same line
+    fundef = '''""""'''
+    token_list = _get_token_list(fundef)
+    assert token_list == [PythonToken(ERRORTOKEN, '""""', (1, 0), ''),
+                          PythonToken(ENDMARKER,      '', (1, 4), '')]
+
+
+def test_tokenize_multiline_III():
+    # Make sure multiline string having newlines have the end marker on the
+    # next line even if several newline
+    fundef = '''""""\n\n'''
+    token_list = _get_token_list(fundef)
+    assert token_list == [PythonToken(ERRORTOKEN, '""""\n\n', (1, 0), ''),
+                          PythonToken(ENDMARKER,          '', (3, 0), '')]
+
+
+def test_identifier_contains_unicode():
+    fundef = dedent('''
+    def 我あφ():
+        pass
+    ''')
+    token_list = _get_token_list(fundef)
+    unicode_token = token_list[1]
+    if py_version >= 30:
+        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] == tokenize.ERRORTOKEN
+
+
+def test_quoted_strings():
+    string_tokens = [
+        'u"test"',
+        'u"""test"""',
+        'U"""test"""',
+        "u'''test'''",
+        "U'''test'''",
+    ]
+
+    for s in string_tokens:
+        module = parse('''a = %s\n''' % s)
+        simple_stmt = 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
+
+
+def test_ur_literals():
+    """
+    Decided to parse `u''` literals regardless of Python version. This makes
+    probably sense:
+
+    - Python 3+ doesn't support it, but it doesn't hurt
+      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, is_literal=True):
+        token_list = _get_token_list(literal)
+        typ, result_literal, _, _ = token_list[0]
+        if is_literal:
+            assert typ == STRING
+            assert result_literal == literal
+        else:
+            assert typ == NAME
+
+    check('u""')
+    check('ur""', is_literal=not py_version >= 30)
+    check('Ur""', is_literal=not py_version >= 30)
+    check('UR""', is_literal=not py_version >= 30)
+    check('bR""')
+    # Starting with Python 3.3 this ordering is also possible.
+    if py_version >= 33:
+        check('Rb""')
+    # Starting with Python 3.6 format strings where introduced.
+    check('fr""', is_literal=py_version >= 36)
+    check('rF""', is_literal=py_version >= 36)
+    check('f""', is_literal=py_version >= 36)
+    check('F""', is_literal=py_version >= 36)
+
+
+def test_error_literal():
+    error_token, endmarker = _get_token_list('"\n')
+    assert error_token.type == tokenize.ERRORTOKEN
+    assert endmarker.prefix == ''
+    assert error_token.string == '"\n'
+    assert endmarker.type == tokenize.ENDMARKER
+    assert endmarker.prefix == ''
+
+    bracket, error_token, endmarker = _get_token_list('( """')
+    assert error_token.type == tokenize.ERRORTOKEN
+    assert error_token.prefix == ' '
+    assert error_token.string == '"""'
+    assert endmarker.type == tokenize.ENDMARKER
+    assert endmarker.prefix == ''
+
+
+def test_endmarker_end_pos():
+    def check(code):
+        tokens = _get_token_list(code)
+        lines = split_lines(code)
+        assert tokens[-1].end_pos == (len(lines), len(lines[-1]))
+
+    check('#c')
+    check('#c\n')
+    check('a\n')
+    check('a')
+    check(r'a\\n')
+    check('a\\')
+
+
+@pytest.mark.parametrize(
+    ('code', 'types'), [
+        (' foo', [INDENT, NAME, DEDENT]),
+        ('  foo\n bar', [INDENT, NAME, NEWLINE, ERROR_DEDENT, NAME, DEDENT]),
+        ('  foo\n bar \n baz', [INDENT, NAME, NEWLINE, ERROR_DEDENT, NAME,
+                                NEWLINE, ERROR_DEDENT, NAME, DEDENT]),
+        (' foo\nbar', [INDENT, NAME, NEWLINE, DEDENT, NAME]),
+    ]
+)
+def test_indentation(code, types):
+    actual_types = [t.type for t in _get_token_list(code)]
+    assert actual_types == types + [ENDMARKER]
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_utils.py b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_utils.py
new file mode 100644
index 0000000..4425bd2
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/test/test_utils.py
@@ -0,0 +1,44 @@
+from codecs import BOM_UTF8
+
+from parso.utils import split_lines, python_bytes_to_unicode
+import parso
+
+
+def test_split_lines_no_keepends():
+    assert split_lines('asd\r\n') == ['asd', '']
+    assert split_lines('asd\r\n\f') == ['asd', '\f']
+    assert split_lines('\fasd\r\n') == ['\fasd', '']
+    assert split_lines('') == ['']
+    assert split_lines('\n') == ['', '']
+
+
+def test_split_lines_keepends():
+    assert split_lines('asd\r\n', keepends=True) == ['asd\r\n', '']
+    assert split_lines('asd\r\n\f', keepends=True) == ['asd\r\n', '\f']
+    assert split_lines('\fasd\r\n', keepends=True) == ['\fasd\r\n', '']
+    assert split_lines('', keepends=True) == ['']
+    assert split_lines('\n', keepends=True) == ['\n', '']
+
+
+def test_python_bytes_to_unicode_unicode_text():
+    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 = python_bytes_to_unicode(source)
+    expected = source.decode('utf-8')
+    assert actual == expected
+
+
+def test_utf8_bom():
+    unicode_bom = BOM_UTF8.decode('utf-8')
+
+    module = parso.parse(unicode_bom)
+    endmarker = module.children[0]
+    assert endmarker.type == 'endmarker'
+    assert unicode_bom == endmarker.prefix
+
+    module = parso.parse(unicode_bom + 'foo = 1')
+    expr_stmt = module.children[0]
+    assert expr_stmt.type == 'expr_stmt'
+    assert unicode_bom == expr_stmt.get_first_leaf().prefix
diff --git a/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/tox.ini b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/tox.ini
new file mode 100644
index 0000000..6d3d5bf
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/rplugin/python3/deoplete/vendored/parso/tox.ini
@@ -0,0 +1,20 @@
+[tox]
+envlist = py26, py27, py33, py34, py35, py36, py37
+[testenv]
+deps =
+    pytest>=3.0.7
+# For --lf and --ff.
+    pytest-cache
+setenv =
+# https://github.com/tomchristie/django-rest-framework/issues/1957
+# tox corrupts __pycache__, solution from here:
+    PYTHONDONTWRITEBYTECODE=1
+commands =
+    py.test {posargs:parso test}
+[testenv:cov]
+deps =
+    coverage
+    {[testenv]deps}
+commands =
+    coverage run --source parso -m py.test
+    coverage report
diff --git a/vim/plugins/deoplete-jedi/setup.cfg b/vim/plugins/deoplete-jedi/setup.cfg
new file mode 100644
index 0000000..40891c5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/setup.cfg
@@ -0,0 +1,18 @@
+[flake8]
+exclude = .svn,CVS,.bzr,.hg,.git,__pycache__,tests/*,rplugin/python3/deoplete/vendored
+filename = *.py
+ignore =
+    # E226: missing whitespace around arithmetic operator
+    E226,
+    # E305: expected 2 blank lines after class or function definition, found 0
+    E305,
+    # E402: module level import not at top of file
+    E402,
+    # H301: one import per line
+    H301,
+    # H304: No relative imports
+    H304,
+    # H306: imports not in alphabetical order - conflicts with isort ordering
+    H306
+max-line-length = 99
+max-complexity = 20
diff --git a/vim/plugins/deoplete-jedi/tests/README.md b/vim/plugins/deoplete-jedi/tests/README.md
new file mode 100644
index 0000000..0ee5640
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/README.md
@@ -0,0 +1,20 @@
+# For deoplete-jedi test files
+
+```bash
+$ nvim -u ./tests/jedi-deoplete.vim tests/test-jedi.py
+```
+
+in nvim,
+
+```vim
+:UpdateRemotePlugins
+:quit
+```
+
+again,
+
+```bash
+$ nvim -u ./tests/jedi-deoplete.vim tests/test-jedi.py
+```
+
+test it.
diff --git a/vim/plugins/deoplete-jedi/tests/jedi-deoplete-conflict.vim b/vim/plugins/deoplete-jedi/tests/jedi-deoplete-conflict.vim
new file mode 100644
index 0000000..0959b79
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/jedi-deoplete-conflict.vim
@@ -0,0 +1,31 @@
+" Tiny init.vim for deoplete-jedi
+
+" NeoBundle
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/deoplete-jedi
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/neco-syntax
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/neoinclude.vim
+
+" vim-plug
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/deoplete-jedi
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/neco-syntax
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/neoinclude.vim
+
+set completeopt+=noinsert,noselect
+set completeopt-=preview
+
+hi Pmenu    gui=NONE    guifg=#c5c8c6 guibg=#373b41
+hi PmenuSel gui=reverse guifg=#c5c8c6 guibg=#373b41
+
+let g:deoplete#enable_at_startup = 1
+let g:deoplete#auto_completion_start_length = 1
+
+" let g:deoplete#ignore_sources = {}
+" let g:deoplete#ignore_sources.python = ['omni']
+" let g:deoplete#ignore_sources.python += ['buffer']
+" let g:deoplete#ignore_sources.python += ['tag']
+" let g:deoplete#ignore_sources.python += ['ns']
+" let g:deoplete#ignore_sources.python += ['member']
+
+filetype plugin indent on
diff --git a/vim/plugins/deoplete-jedi/tests/jedi-deoplete.vim b/vim/plugins/deoplete-jedi/tests/jedi-deoplete.vim
new file mode 100644
index 0000000..f666cd8
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/jedi-deoplete.vim
@@ -0,0 +1,21 @@
+" Tiny init.vim for deoplete-jedi
+
+" NeoBundle
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/deoplete-jedi
+
+" vim-plug
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/deoplete-jedi
+set completeopt+=noinsert,noselect
+set completeopt-=preview
+
+hi Pmenu    gui=NONE    guifg=#c5c8c6 guibg=#373b41
+hi PmenuSel gui=reverse guifg=#c5c8c6 guibg=#373b41
+
+let g:deoplete#enable_at_startup = 1
+let g:deoplete#auto_completion_start_length = 1
+" let g:deoplete#ignore_sources = {}
+" let g:deoplete#ignore_sources.python = ['omni']
+
+filetype plugin indent on
diff --git a/vim/plugins/deoplete-jedi/tests/jedi-omnifunc.vim b/vim/plugins/deoplete-jedi/tests/jedi-omnifunc.vim
new file mode 100644
index 0000000..fdd1496
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/jedi-omnifunc.vim
@@ -0,0 +1,29 @@
+" Tiny init.vim for jedi-vim omnifunc
+
+" NeoBundle
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/bundle/jedi-vim
+
+" vim-plug
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/deoplete.nvim
+set runtimepath+=$XDG_CONFIG_HOME/nvim/plugged/jedi-vim
+
+set completeopt+=noinsert,noselect
+set completeopt-=preview
+
+hi Pmenu    gui=NONE    guifg=#c5c8c6 guibg=#373b41
+hi PmenuSel gui=reverse guifg=#c5c8c6 guibg=#373b41
+
+let g:deoplete#enable_at_startup = 1
+let g:deoplete#auto_completion_start_length = 1
+set omnifunc=jedi#completions
+let g:jedi#auto_initialization = 1
+let g:jedi#auto_vim_configuration = 0
+let g:jedi#popup_select_first = 0
+let g:jedi#completions_enabled = 0
+let g:jedi#force_py_version = 3
+let g:jedi#smart_auto_mappings = 0
+let g:jedi#show_call_signatures = 0
+let g:jedi#max_doc_height = 100
+
+filetype plugin indent on
diff --git a/vim/plugins/deoplete-jedi/tests/requirements.txt b/vim/plugins/deoplete-jedi/tests/requirements.txt
new file mode 100644
index 0000000..1d3dca3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/requirements.txt
@@ -0,0 +1,3 @@
+flake8>=2.5.4
+flake8-import-order>=0.6.1
+hacking>=0.10.2
diff --git a/vim/plugins/deoplete-jedi/tests/sphinx-3000.py b/vim/plugins/deoplete-jedi/tests/sphinx-3000.py
new file mode 100644
index 0000000..00e824b
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/sphinx-3000.py
@@ -0,0 +1,3002 @@
+# -*- coding: utf-8 -*-
+"""
+    sphinx.builders
+    ~~~~~~~~~~~~~~~
+
+    Builder superclass for all builders.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+import os
+import osutil
+from os import path
+
+try:
+    import multiprocessing
+    import threading
+except ImportError:
+    multiprocessing = threading = None
+
+from docutils import nodes
+
+from sphinx.util import i18n, path_stabilize
+from sphinx.util.osutil import SEP, relative_uri
+from sphinx.util.i18n import find_catalog
+from sphinx.util.console import bold, darkgreen
+from sphinx.util.parallel import ParallelTasks, SerialTasks, make_chunks, \
+    parallel_available
+
+# side effect: registers roles and directives
+from sphinx import roles       # noqa
+from sphinx import directives  # noqa
+
+
+class Builder(object):
+    """
+    Builds target formats from the reST sources.
+    """
+
+    # builder's name, for the -b command line options
+    name = ''
+    # builder's output format, or '' if no document output is produced
+    format = ''
+    # doctree versioning method
+    versioning_method = 'none'
+    versioning_compare = False
+    # allow parallel write_doc() calls
+    allow_parallel = False
+
+    def __init__(self, app):
+        self.env = app.env
+        self.env.set_versioning_method(self.versioning_method,
+                                       self.versioning_compare)
+        self.srcdir = app.srcdir
+        self.confdir = app.confdir
+        self.outdir = app.outdir
+        self.doctreedir = app.doctreedir
+        if not path.isdir(self.doctreedir):
+            os.makedirs(self.doctreedir)
+
+        self.app = app
+        self.warn = app.warn
+        self.info = app.info
+        self.config = app.config
+        self.tags = app.tags
+        self.tags.add(self.format)
+        self.tags.add(self.name)
+        self.tags.add("format_%s" % self.format)
+        self.tags.add("builder_%s" % self.name)
+        # compatibility aliases
+        self.status_iterator = app.status_iterator
+        self.old_status_iterator = app.old_status_iterator
+
+        # images that need to be copied over (source -> dest)
+        self.images = {}
+        # basename of images directory
+        self.imagedir = ""
+        # relative path to image directory from current docname (used at writing docs)
+        self.imgpath = ""
+
+        # these get set later
+        self.parallel_ok = False
+        self.finish_tasks = None
+
+        # load default translator class
+        self.translator_class = app._translators.get(self.name)
+
+        self.init()
+
+    # helper methods
+    def init(self):
+        """Load necessary templates and perform initialization.  The default
+        implementation does nothing.
+        """
+        pass
+
+    def create_template_bridge(self):
+        """Return the template bridge configured."""
+        if self.config.template_bridge:
+            self.templates = self.app.import_object(
+                self.config.template_bridge, 'template_bridge setting')()
+        else:
+            from sphinx.jinja2glue import BuiltinTemplateLoader
+            self.templates = BuiltinTemplateLoader()
+
+    def get_target_uri(self, docname, typ=None):
+        """Return the target URI for a document name.
+
+        *typ* can be used to qualify the link characteristic for individual
+        builders.
+        """
+        raise NotImplementedError
+
+    def get_relative_uri(self, from_, to, typ=None):
+        """Return a relative URI between two source filenames.
+
+        May raise environment.NoUri if there's no way to return a sensible URI.
+        """
+        return relative_uri(self.get_target_uri(from_),
+                            self.get_target_uri(to, typ))
+
+    def get_outdated_docs(self):
+        """Return an iterable of output files that are outdated, or a string
+        describing what an update build will build.
+
+        If the builder does not output individual files corresponding to
+        source files, return a string here.  If it does, return an iterable
+        of those files that need to be written.
+        """
+        raise NotImplementedError
+
+    supported_image_types = []
+
+    def post_process_images(self, doctree):
+        """Pick the best candidate for all image URIs."""
+        for node in doctree.traverse(nodes.image):
+            if '?' in node['candidates']:
+                # don't rewrite nonlocal image URIs
+                continue
+            if '*' not in node['candidates']:
+                for imgtype in self.supported_image_types:
+                    candidate = node['candidates'].get(imgtype, None)
+                    if candidate:
+                        break
+                else:
+                    self.warn(
+                        'no matching candidate for image URI %r' % node['uri'],
+                        '%s:%s' % (node.source, getattr(node, 'line', '')))
+                    continue
+                node['uri'] = candidate
+            else:
+                candidate = node['uri']
+            if candidate not in self.env.images:
+                # non-existing URI; let it alone
+                continue
+            self.images[candidate] = self.env.images[candidate][1]
+
+    # compile po methods
+
+    def compile_catalogs(self, catalogs, message):
+        if not self.config.gettext_auto_build:
+            return
+
+        def cat2relpath(cat):
+            return path.relpath(cat.mo_path, self.env.srcdir).replace(path.sep, SEP)
+
+        self.info(bold('building [mo]: ') + message)
+        for catalog in self.app.status_iterator(
+                catalogs, 'writing output... ', darkgreen, len(catalogs),
+                cat2relpath):
+            catalog.write_mo(self.config.language)
+
+    def compile_all_catalogs(self):
+        catalogs = i18n.find_catalog_source_files(
+            [path.join(self.srcdir, x) for x in self.config.locale_dirs],
+            self.config.language,
+            charset=self.config.source_encoding,
+            gettext_compact=self.config.gettext_compact,
+            force_all=True)
+        message = 'all of %d po files' % len(catalogs)
+        self.compile_catalogs(catalogs, message)
+
+    def compile_specific_catalogs(self, specified_files):
+        def to_domain(fpath):
+            docname, _ = path.splitext(path_stabilize(fpath))
+            dom = find_catalog(docname, self.config.gettext_compact)
+            return dom
+
+        specified_domains = set(map(to_domain, specified_files))
+        catalogs = i18n.find_catalog_source_files(
+            [path.join(self.srcdir, x) for x in self.config.locale_dirs],
+            self.config.language,
+            domains=list(specified_domains),
+            charset=self.config.source_encoding,
+            gettext_compact=self.config.gettext_compact)
+        message = 'targets for %d po files that are specified' % len(catalogs)
+        self.compile_catalogs(catalogs, message)
+
+    def compile_update_catalogs(self):
+        catalogs = i18n.find_catalog_source_files(
+            [path.join(self.srcdir, x) for x in self.config.locale_dirs],
+            self.config.language,
+            charset=self.config.source_encoding,
+            gettext_compact=self.config.gettext_compact)
+        message = 'targets for %d po files that are out of date' % len(catalogs)
+        self.compile_catalogs(catalogs, message)
+
+    # build methods
+
+    def build_all(self):
+        """Build all source files."""
+        self.build(None, summary='all source files', method='all')
+
+    def build_specific(self, filenames):
+        """Only rebuild as much as needed for changes in the *filenames*."""
+        # bring the filenames to the canonical format, that is,
+        # relative to the source directory and without source_suffix.
+        dirlen = len(self.srcdir) + 1
+        to_write = []
+        suffixes = tuple(self.config.source_suffix)
+        for filename in filenames:
+            filename = path.normpath(path.abspath(filename))
+            if not filename.startswith(self.srcdir):
+                self.warn('file %r given on command line is not under the '
+                          'source directory, ignoring' % filename)
+                continue
+            if not (path.isfile(filename) or
+                    any(path.isfile(filename + suffix) for suffix in suffixes)):
+                self.warn('file %r given on command line does not exist, '
+                          'ignoring' % filename)
+                continue
+            filename = filename[dirlen:]
+            for suffix in suffixes:
+                if filename.endswith(suffix):
+                    filename = filename[:-len(suffix)]
+                    break
+            filename = filename.replace(path.sep, SEP)
+            to_write.append(filename)
+        self.build(to_write, method='specific',
+                   summary='%d source files given on command '
+                   'line' % len(to_write))
+
+    def build_update(self):
+        """Only rebuild what was changed or added since last build."""
+        to_build = self.get_outdated_docs()
+        if isinstance(to_build, str):
+            self.build(['__all__'], to_build)
+        else:
+            to_build = list(to_build)
+            self.build(to_build,
+                       summary='targets for %d source files that are '
+                       'out of date' % len(to_build))
+
+    def build(self, docnames, summary=None, method='update'):
+        """Main build method.
+
+        First updates the environment, and then calls :meth:`write`.
+        """
+        if summary:
+            self.info(bold('building [%s]' % self.name) + ': ' + summary)
+
+        # while reading, collect all warnings from docutils
+        warnings = []
+        self.env.set_warnfunc(lambda *args: warnings.append(args))
+        updated_docnames = set(self.env.update(self.config, self.srcdir,
+                                               self.doctreedir, self.app))
+        self.env.set_warnfunc(self.warn)
+        for warning in warnings:
+            self.warn(*warning)
+
+        doccount = len(updated_docnames)
+        self.info(bold('looking for now-outdated files... '), nonl=1)
+        for docname in self.env.check_dependents(updated_docnames):
+            updated_docnames.add(docname)
+        outdated = len(updated_docnames) - doccount
+        if outdated:
+            self.info('%d found' % outdated)
+        else:
+            self.info('none found')
+
+        if updated_docnames:
+            # save the environment
+            from sphinx.application import ENV_PICKLE_FILENAME
+            self.info(bold('pickling environment... '), nonl=True)
+            self.env.topickle(path.join(self.doctreedir, ENV_PICKLE_FILENAME))
+            self.info('done')
+
+            # global actions
+            self.info(bold('checking consistency... '), nonl=True)
+            self.env.check_consistency()
+            self.info('done')
+        else:
+            if method == 'update' and not docnames:
+                self.info(bold('no targets are out of date.'))
+                return
+
+        # filter "docnames" (list of outdated files) by the updated
+        # found_docs of the environment; this will remove docs that
+        # have since been removed
+        if docnames and docnames != ['__all__']:
+            docnames = set(docnames) & self.env.found_docs
+
+        # determine if we can write in parallel
+        self.parallel_ok = False
+        if parallel_available and self.app.parallel > 1 and self.allow_parallel:
+            self.parallel_ok = True
+            for extname, md in self.app._extension_metadata.items():
+                par_ok = md.get('parallel_write_safe', True)
+                if not par_ok:
+                    self.app.warn('the %s extension is not safe for parallel '
+                                  'writing, doing serial write' % extname)
+                    self.parallel_ok = False
+                    break
+
+        #  create a task executor to use for misc. "finish-up" tasks
+        # if self.parallel_ok:
+        #     self.finish_tasks = ParallelTasks(self.app.parallel)
+        # else:
+        # for now, just execute them serially
+        self.finish_tasks = SerialTasks()
+
+        # write all "normal" documents (or everything for some builders)
+        self.write(docnames, list(updated_docnames), method)
+
+        # finish (write static files etc.)
+        self.finish()
+
+        # wait for all tasks
+        self.finish_tasks.join()
+
+    def write(self, build_docnames, updated_docnames, method='update'):
+        if build_docnames is None or build_docnames == ['__all__']:
+            # build_all
+            build_docnames = self.env.found_docs
+        if method == 'update':
+            # build updated ones as well
+            docnames = set(build_docnames) | set(updated_docnames)
+        else:
+            docnames = set(build_docnames)
+        self.app.debug('docnames to write: %s', ', '.join(sorted(docnames)))
+
+        # add all toctree-containing files that may have changed
+        for docname in list(docnames):
+            for tocdocname in self.env.files_to_rebuild.get(docname, []):
+                if tocdocname in self.env.found_docs:
+                    docnames.add(tocdocname)
+        docnames.add(self.config.master_doc)
+
+        self.info(bold('preparing documents... '), nonl=True)
+        self.prepare_writing(docnames)
+        self.info('done')
+
+        warnings = []
+        self.env.set_warnfunc(lambda *args: warnings.append(args))
+        if self.parallel_ok:
+            # number of subprocesses is parallel-1 because the main process
+            # is busy loading doctrees and doing write_doc_serialized()
+            self._write_parallel(sorted(docnames), warnings,
+                                 nproc=self.app.parallel - 1)
+        else:
+            self._write_serial(sorted(docnames), warnings)
+        self.env.set_warnfunc(self.warn)
+
+    def _write_serial(self, docnames, warnings):
+        for docname in self.app.status_iterator(
+                docnames, 'writing output... ', darkgreen, len(docnames)):
+            doctree = self.env.get_and_resolve_doctree(docname, self)
+            self.write_doc_serialized(docname, doctree)
+            self.write_doc(docname, doctree)
+        for warning in warnings:
+            self.warn(*warning)
+
+    def _write_parallel(self, docnames, warnings, nproc):
+        def write_process(docs):
+            local_warnings = []
+            self.env.set_warnfunc(lambda *args: local_warnings.append(args))
+            for docname, doctree in docs:
+                self.write_doc(docname, doctree)
+            return local_warnings
+
+        def add_warnings(docs, wlist):
+            warnings.extend(wlist)
+
+        # warm up caches/compile templates using the first document
+        firstname, docnames = docnames[0], docnames[1:]
+        doctree = self.env.get_and_resolve_doctree(firstname, self)
+        self.write_doc_serialized(firstname, doctree)
+        self.write_doc(firstname, doctree)
+
+        tasks = ParallelTasks(nproc)
+        chunks = make_chunks(docnames, nproc)
+
+        for chunk in self.app.status_iterator(
+                chunks, 'writing output... ', darkgreen, len(chunks)):
+            arg = []
+            for i, docname in enumerate(chunk):
+                doctree = self.env.get_and_resolve_doctree(docname, self)
+                self.write_doc_serialized(docname, doctree)
+                arg.append((docname, doctree))
+            tasks.add_task(write_process, arg, add_warnings)
+
+        # make sure all threads have finished
+        self.info(bold('waiting for workers...'))
+        tasks.join()
+
+        for warning in warnings:
+            self.warn(*warning)
+
+    def prepare_writing(self, docnames):
+        """A place where you can add logic before :meth:`write_doc` is run"""
+        raise NotImplementedError
+
+    def write_doc(self, docname, doctree):
+        """Where you actually write something to the filesystem."""
+        raise NotImplementedError
+
+    def write_doc_serialized(self, docname, doctree):
+        """Handle parts of write_doc that must be called in the main process
+        if parallel build is active.
+        """
+        pass
+
+    def finish(self):
+        """Finish the building process.
+
+        The default implementation does nothing.
+        """
+        pass
+
+    def cleanup(self):
+        """Cleanup any resources.
+
+        The default implementation does nothing.
+        """
+        pass
+
+    def get_builder_config(self, option, default):
+        """Return a builder specific option.
+
+        This method allows customization of common builder settings by
+        inserting the name of the current builder in the option key.
+        If the key does not exist, use default as builder name.
+        """
+        # At the moment, only XXX_use_index is looked up this way.
+        # Every new builder variant must be registered in Config.config_values.
+        try:
+            optname = '%s_%s' % (self.name, option)
+            return getattr(self.config, optname)
+        except AttributeError:
+            optname = '%s_%s' % (default, option)
+            return getattr(self.config, optname)
+
+BUILTIN_BUILDERS = {
+    'html':       ('html', 'StandaloneHTMLBuilder'),
+    'dirhtml':    ('html', 'DirectoryHTMLBuilder'),
+    'singlehtml': ('html', 'SingleFileHTMLBuilder'),
+    'pickle':     ('html', 'PickleHTMLBuilder'),
+    'json':       ('html', 'JSONHTMLBuilder'),
+    'web':        ('html', 'PickleHTMLBuilder'),
+    'htmlhelp':   ('htmlhelp', 'HTMLHelpBuilder'),
+    'devhelp':    ('devhelp', 'DevhelpBuilder'),
+    'qthelp':     ('qthelp', 'QtHelpBuilder'),
+    'applehelp':  ('applehelp', 'AppleHelpBuilder'),
+    'epub':       ('epub', 'EpubBuilder'),
+    'latex':      ('latex', 'LaTeXBuilder'),
+    'text':       ('text', 'TextBuilder'),
+    'man':        ('manpage', 'ManualPageBuilder'),
+    'texinfo':    ('texinfo', 'TexinfoBuilder'),
+    'changes':    ('changes', 'ChangesBuilder'),
+    'linkcheck':  ('linkcheck', 'CheckExternalLinksBuilder'),
+    'websupport': ('websupport', 'WebSupportBuilder'),
+    'gettext':    ('gettext', 'MessageCatalogBuilder'),
+    'xml':        ('xml', 'XMLBuilder'),
+    'pseudoxml':  ('xml', 'PseudoXMLBuilder'),
+}
+# -*- coding: utf-8 -*-
+"""
+    sphinx.__main__
+    ~~~~~~~~~~~~~~~
+
+    The Sphinx documentation toolchain.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+import sys
+from sphinx import main
+
+sys.exit(main(sys.argv))
+# -*- coding: utf-8 -*-
+"""
+    sphinx.addnodes
+    ~~~~~~~~~~~~~~~
+
+    Additional docutils nodes.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+from docutils import nodes
+
+
+class toctree(nodes.General, nodes.Element):
+    """Node for inserting a "TOC tree"."""
+
+
+# domain-specific object descriptions (class, function etc.)
+
+class desc(nodes.Admonition, nodes.Element):
+    """Node for object descriptions.
+
+    This node is similar to a "definition list" with one definition.  It
+    contains one or more ``desc_signature`` and a ``desc_content``.
+    """
+
+
+class desc_signature(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for object signatures.
+
+    The "term" part of the custom Sphinx definition list.
+    """
+
+
+# nodes to use within a desc_signature
+
+class desc_addname(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for additional name parts (module name, class name)."""
+# compatibility alias
+desc_classname = desc_addname
+
+
+class desc_type(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for return types or object type names."""
+
+
+class desc_returns(desc_type):
+    """Node for a "returns" annotation (a la -> in Python)."""
+    def astext(self):
+        return ' -> ' + nodes.TextElement.astext(self)
+
+
+class desc_name(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for the main object name."""
+
+
+class desc_parameterlist(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for a general parameter list."""
+    child_text_separator = ', '
+
+
+class desc_parameter(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for a single parameter."""
+
+
+class desc_optional(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for marking optional parts of the parameter list."""
+    child_text_separator = ', '
+
+    def astext(self):
+        return '[' + nodes.TextElement.astext(self) + ']'
+
+
+class desc_annotation(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for signature annotations (not Python 3-style annotations)."""
+
+
+class desc_content(nodes.General, nodes.Element):
+    """Node for object description content.
+
+    This is the "definition" part of the custom Sphinx definition list.
+    """
+
+
+# new admonition-like constructs
+
+class versionmodified(nodes.Admonition, nodes.TextElement):
+    """Node for version change entries.
+
+    Currently used for "versionadded", "versionchanged" and "deprecated"
+    directives.
+    """
+
+
+class seealso(nodes.Admonition, nodes.Element):
+    """Custom "see also" admonition."""
+
+
+class productionlist(nodes.Admonition, nodes.Element):
+    """Node for grammar production lists.
+
+    Contains ``production`` nodes.
+    """
+
+
+class production(nodes.Part, nodes.Inline, nodes.TextElement):
+    """Node for a single grammar production rule."""
+
+
+# other directive-level nodes
+
+class index(nodes.Invisible, nodes.Inline, nodes.TextElement):
+    """Node for index entries.
+
+    This node is created by the ``index`` directive and has one attribute,
+    ``entries``.  Its value is a list of 4-tuples of ``(entrytype, entryname,
+    target, ignored)``.
+
+    *entrytype* is one of "single", "pair", "double", "triple".
+    """
+
+
+class centered(nodes.Part, nodes.TextElement):
+    """Deprecated."""
+
+
+class acks(nodes.Element):
+    """Special node for "acks" lists."""
+
+
+class hlist(nodes.Element):
+    """Node for "horizontal lists", i.e. lists that should be compressed to
+    take up less vertical space.
+    """
+
+
+class hlistcol(nodes.Element):
+    """Node for one column in a horizontal list."""
+
+
+class compact_paragraph(nodes.paragraph):
+    """Node for a compact paragraph (which never makes a <p> node)."""
+
+
+class glossary(nodes.Element):
+    """Node to insert a glossary."""
+
+
+class only(nodes.Element):
+    """Node for "only" directives (conditional inclusion based on tags)."""
+
+
+# meta-information nodes
+
+class start_of_file(nodes.Element):
+    """Node to mark start of a new file, used in the LaTeX builder only."""
+
+
+class highlightlang(nodes.Element):
+    """Inserted to set the highlight language and line number options for
+    subsequent code blocks.
+    """
+
+
+class tabular_col_spec(nodes.Element):
+    """Node for specifying tabular columns, used for LaTeX output."""
+
+
+class meta(nodes.Special, nodes.PreBibliographic, nodes.Element):
+    """Node for meta directive -- same as docutils' standard meta node,
+    but pickleable.
+    """
+
+
+# inline nodes
+
+class pending_xref(nodes.Inline, nodes.Element):
+    """Node for cross-references that cannot be resolved without complete
+    information about all documents.
+
+    These nodes are resolved before writing output, in
+    BuildEnvironment.resolve_references.
+    """
+
+
+class number_reference(nodes.reference):
+    """Node for number references, similar to pending_xref."""
+
+
+class download_reference(nodes.reference):
+    """Node for download references, similar to pending_xref."""
+
+
+class literal_emphasis(nodes.emphasis):
+    """Node that behaves like `emphasis`, but further text processors are not
+    applied (e.g. smartypants for HTML output).
+    """
+
+
+class literal_strong(nodes.strong):
+    """Node that behaves like `strong`, but further text processors are not
+    applied (e.g. smartypants for HTML output).
+    """
+
+
+class abbreviation(nodes.Inline, nodes.TextElement):
+    """Node for abbreviations with explanations."""
+
+
+class termsep(nodes.Structural, nodes.Element):
+    """Separates two terms within a <term> node."""
+
+
+# make the new nodes known to docutils; needed because the HTML writer will
+# choke at some point if these are not added
+nodes._add_node_class_names(k for k in globals().keys()
+                            if k != 'nodes' and k[0] != '_')
+# -*- coding: utf-8 -*-
+"""
+    sphinx.apidoc
+    ~~~~~~~~~~~~~
+
+    Parses a directory tree looking for Python modules and packages and creates
+    ReST files appropriately to create code documentation with Sphinx.  It also
+    creates a modules index (named modules.<suffix>).
+
+    This is derived from the "sphinx-autopackage" script, which is:
+    Copyright 2008 Société des arts technologiques (SAT),
+    http://www.sat.qc.ca/
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+# automodule options
+if 'SPHINX_APIDOC_OPTIONS' in os.environ:
+    OPTIONS = os.environ['SPHINX_APIDOC_OPTIONS'].split(',')
+else:
+    OPTIONS = [
+        'members',
+        'undoc-members',
+        # 'inherited-members', # disabled because there's a bug in sphinx
+        'show-inheritance',
+    ]
+
+INITPY = '__init__.py'
+PY_SUFFIXES = set(['.py', '.pyx'])
+
+
+def makename(package, module):
+    """Join package and module with a dot."""
+    # Both package and module can be None/empty.
+    if package:
+        name = package
+        if module:
+            name += '.' + module
+    else:
+        name = module
+    return name
+
+
+def write_file(name, text, opts):
+    """Write the output file for module/package <name>."""
+    fname = path.join(opts.destdir, '%s.%s' % (name, opts.suffix))
+    if opts.dryrun:
+        print('Would create file %s.' % fname)
+        return
+    if not opts.force and path.isfile(fname):
+        print('File %s already exists, skipping.' % fname)
+    else:
+        print('Creating file %s.' % fname)
+        f = open(fname, 'w')
+        try:
+            f.write(text)
+        finally:
+            f.close()
+
+
+def format_heading(level, text):
+    """Create a heading of <level> [1, 2 or 3 supported]."""
+    underlining = ['=', '-', '~', ][level - 1] * len(text)
+    return '%s\n%s\n\n' % (text, underlining)
+
+
+def format_directive(module, package=None):
+    """Create the automodule directive and add the options."""
+    directive = '.. automodule:: %s\n' % makename(package, module)
+    for option in OPTIONS:
+        directive += '    :%s:\n' % option
+    return directive
+
+
+def create_module_file(package, module, opts):
+    """Build the text of the file and write the file."""
+    if not opts.noheadings:
+        text = format_heading(1, '%s module' % module)
+    else:
+        text = ''
+    # text += format_heading(2, ':mod:`%s` Module' % module)
+    text += format_directive(module, package)
+    write_file(makename(package, module), text, opts)
+
+
+def create_package_file(root, master_package, subroot, py_files, opts, subs):
+    """Build the text of the file and write the file."""
+    text = format_heading(1, '%s package' % makename(master_package, subroot))
+
+    if opts.modulefirst:
+        text += format_directive(subroot, master_package)
+        text += '\n'
+
+    # build a list of directories that are szvpackages (contain an INITPY file)
+    subs = [sub for sub in subs if path.isfile(path.join(root, sub, INITPY))]
+    # if there are some package directories, add a TOC for theses subpackages
+    if subs:
+        text += format_heading(2, 'Subpackages')
+        text += '.. toctree::\n\n'
+        for sub in subs:
+            text += '    %s.%s\n' % (makename(master_package, subroot), sub)
+        text += '\n'
+
+    submods = [path.splitext(sub)[0] for sub in py_files
+               if not shall_skip(path.join(root, sub), opts) and
+               sub != INITPY]
+    if submods:
+        text += format_heading(2, 'Submodules')
+        if opts.separatemodules:
+            text += '.. toctree::\n\n'
+            for submod in submods:
+                modfile = makename(master_package, makename(subroot, submod))
+                text += '   %s\n' % modfile
+
+                # generate separate file for this module
+                if not opts.noheadings:
+                    filetext = format_heading(1, '%s module' % modfile)
+                else:
+                    filetext = ''
+                filetext += format_directive(makename(subroot, submod),
+                                             master_package)
+                write_file(modfile, filetext, opts)
+        else:
+            for submod in submods:
+                modfile = makename(master_package, makename(subroot, submod))
+                if not opts.noheadings:
+                    text += format_heading(2, '%s module' % modfile)
+                text += format_directive(makename(subroot, submod),
+                                         master_package)
+                text += '\n'
+        text += '\n'
+
+    if not opts.modulefirst:
+        text += format_heading(2, 'Module contents')
+        text += format_directive(subroot, master_package)
+
+    write_file(makename(master_package, subroot), text, opts)
+
+
+def create_modules_toc_file(modules, opts, name='modules'):
+    """Create the module's index."""
+    text = format_heading(1, '%s' % opts.header)
+    text += '.. toctree::\n'
+    text += '   :maxdepth: %s\n\n' % opts.maxdepth
+
+    modules.sort()
+    prev_module = ''
+    for module in modules:
+        # look if the module is a subpackage and, if yes, ignore it
+        if module.startswith(prev_module + '.'):
+            continue
+        prev_module = module
+        text += '   %s\n' % module
+
+    write_file(name, text, opts)
+
+
+def shall_skip(module, opts):
+    """Check if we want to skip this module."""
+    # skip it if there is nothing (or just \n or \r\n) in the file
+    if path.getsize(module) <= 2:
+        return True
+    # skip if it has a "private" name and this is selected
+    filename = path.basename(module)
+    if filename != '__init__.py' and filename.startswith('_') and \
+       not opts.includeprivate:
+        return True
+    return False
+
+
+def recurse_tree(rootpath, excludes, opts):
+    """
+    Look for every file in the directory tree and create the corresponding
+    ReST files.
+    """
+    # check if the base directory is a package and get its name
+    if INITPY in os.listdir(rootpath):
+        root_package = rootpath.split(path.sep)[-1]
+    else:
+        # otherwise, the base is a directory with packages
+        root_package = None
+
+    toplevels = []
+    followlinks = getattr(opts, 'followlinks', False)
+    includeprivate = getattr(opts, 'includeprivate', False)
+    for root, subs, files in walk(rootpath, followlinks=followlinks):
+        # document only Python module files (that aren't excluded)
+        py_files = sorted(f for f in files
+                          if path.splitext(f)[1] in PY_SUFFIXES and
+                          not is_excluded(path.join(root, f), excludes))
+        is_pkg = INITPY in py_files
+        if is_pkg:
+            py_files.remove(INITPY)
+            py_files.insert(0, INITPY)
+        elif root != rootpath:
+            # only accept non-package at toplevel
+            del subs[:]
+            continue
+        # remove hidden ('.') and private ('_') directories, as well as
+        # excluded dirs
+        if includeprivate:
+            exclude_prefixes = ('.',)
+        else:
+            exclude_prefixes = ('.', '_')
+        subs[:] = sorted(sub for sub in subs if not sub.startswith(exclude_prefixes) and
+                         not is_excluded(path.join(root, sub), excludes))
+
+        if is_pkg:
+            # we are in a package with something to document
+            if subs or len(py_files) > 1 or not \
+               shall_skip(path.join(root, INITPY), opts):
+                subpackage = root[len(rootpath):].lstrip(path.sep).\
+                    replace(path.sep, '.')
+                create_package_file(root, root_package, subpackage,
+                                    py_files, opts, subs)
+                toplevels.append(makename(root_package, subpackage))
+        else:
+            # if we are at the root level, we don't require it to be a package
+            assert root == rootpath and root_package is None
+            for py_file in py_files:
+                if not shall_skip(path.join(rootpath, py_file), opts):
+                    module = path.splitext(py_file)[0]
+                    create_module_file(root_package, module, opts)
+                    toplevels.append(module)
+
+    return toplevels
+
+
+def normalize_excludes(rootpath, excludes):
+    """Normalize the excluded directory list."""
+    return [path.abspath(exclude) for exclude in excludes]
+
+
+def is_excluded(root, excludes):
+    """Check if the directory is in the exclude list.
+
+    Note: by having trailing slashes, we avoid common prefix issues, like
+          e.g. an exlude "foo" also accidentally excluding "foobar".
+    """
+    for exclude in excludes:
+        if root == exclude:
+            return True
+    return False
+
+
+def main(argv=sys.argv):
+    """Parse and check the command line arguments."""
+    parser = optparse.OptionParser(
+        usage="""\
+usage: %prog [options] -o <output_path> <module_path> [exclude_path, ...]
+
+Look recursively in <module_path> for Python modules and packages and create
+one reST file with automodule directives per package in the <output_path>.
+
+The <exclude_path>s can be files and/or directories that will be excluded
+from generation.
+
+Note: By default this script will not overwrite already created files.""")
+
+    parser.add_option('-o', '--output-dir', action='store', dest='destdir',
+                      help='Directory to place all output', default='')
+    parser.add_option('-d', '--maxdepth', action='store', dest='maxdepth',
+                      help='Maximum depth of submodules to show in the TOC '
+                      '(default: 4)', type='int', default=4)
+    parser.add_option('-f', '--force', action='store_true', dest='force',
+                      help='Overwrite existing files')
+    parser.add_option('-l', '--follow-links', action='store_true',
+                      dest='followlinks', default=False,
+                      help='Follow symbolic links. Powerful when combined '
+                      'with collective.recipe.omelette.')
+    parser.add_option('-n', '--dry-run', action='store_true', dest='dryrun',
+                      help='Run the script without creating files')
+    parser.add_option('-e', '--separate', action='store_true',
+                      dest='separatemodules',
+                      help='Put documentation for each module on its own page')
+    parser.add_option('-P', '--private', action='store_true',
+                      dest='includeprivate',
+                      help='Include "_private" modules')
+    parser.add_option('-T', '--no-toc', action='store_true', dest='notoc',
+                      help='Don\'t create a table of contents file')
+    parser.add_option('-E', '--no-headings', action='store_true',
+                      dest='noheadings',
+                      help='Don\'t create headings for the module/package '
+                           'packages (e.g. when the docstrings already contain '
+                           'them)')
+    parser.add_option('-M', '--module-first', action='store_true',
+                      dest='modulefirst',
+                      help='Put module documentation before submodule '
+                      'documentation')
+    parser.add_option('-s', '--suffix', action='store', dest='suffix',
+                      help='file suffix (default: rst)', default='rst')
+    parser.add_option('-F', '--full', action='store_true', dest='full',
+                      help='Generate a full project with sphinx-quickstart')
+    parser.add_option('-H', '--doc-project', action='store', dest='header',
+                      help='Project name (default: root module name)')
+    parser.add_option('-A', '--doc-author', action='store', dest='author',
+                      type='str',
+                      help='Project author(s), used when --full is given')
+    parser.add_option('-V', '--doc-version', action='store', dest='version',
+                      help='Project version, used when --full is given')
+    parser.add_option('-R', '--doc-release', action='store', dest='release',
+                      help='Project release, used when --full is given, '
+                      'defaults to --doc-version')
+    parser.add_option('--version', action='store_true', dest='show_version',
+                      help='Show version information and exit')
+
+    (opts, args) = parser.parse_args(argv[1:])
+
+    if opts.show_version:
+        print('Sphinx (sphinx-apidoc) %s' % __display_version__)
+        return 0
+
+    if not args:
+        parser.error('A package path is required.')
+
+    rootpath, excludes = args[0], args[1:]
+    if not opts.destdir:
+        parser.error('An output directory is required.')
+    if opts.header is None:
+        opts.header = path.abspath(rootpath).split(path.sep)[-1]
+    if opts.suffix.startswith('.'):
+        opts.suffix = opts.suffix[1:]
+    if not path.isdir(rootpath):
+        print('%s is not a directory.' % rootpath, file=sys.stderr)
+        sys.exit(1)
+    if not path.isdir(opts.destdir):
+        if not opts.dryrun:
+            os.makedirs(opts.destdir)
+    rootpath = path.abspath(rootpath)
+    excludes = normalize_excludes(rootpath, excludes)
+    modules = recurse_tree(rootpath, excludes, opts)
+    if opts.full:
+        from sphinx import quickstart as qs
+        modules.sort()
+        prev_module = ''
+        text = ''
+        for module in modules:
+            if module.startswith(prev_module + '.'):
+                continue
+            prev_module = module
+            text += '   %s\n' % module
+        d = dict(
+            path = opts.destdir,
+            sep  = False,
+            dot  = '_',
+            project = opts.header,
+            author = opts.author or 'Author',
+            version = opts.version or '',
+            release = opts.release or opts.version or '',
+            suffix = '.' + opts.suffix,
+            master = 'index',
+            epub = True,
+            ext_autodoc = True,
+            ext_viewcode = True,
+            ext_todo = True,
+            makefile = True,
+            batchfile = True,
+            mastertocmaxdepth = opts.maxdepth,
+            mastertoctree = text,
+            language = 'en',
+        )
+        if not opts.dryrun:
+            qs.generate(d, silent=True, overwrite=opts.force)
+    elif not opts.notoc:
+        create_modules_toc_file(modules, opts)
+# -*- coding: utf-8 -*-
+"""
+    sphinx.builders.applehelp
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    Build Apple help books.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+# Use plistlib.dump in 3.4 and above
+try:
+    write_plist = plistlib.dump
+except AttributeError:
+    write_plist = plistlib.writePlist
+
+
+# False access page (used because helpd expects strict XHTML)
+access_page_template = '''\
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"\
+ "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>%(title)s</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta name="robots" content="noindex" />
+    <meta http-equiv="refresh" content="0;url=%(toc)s" />
+  </head>
+  <body>
+  </body>
+</html>
+'''
+
+
+class AppleHelpIndexerFailed(SphinxError):
+    category = 'Help indexer failed'
+
+
+class AppleHelpCodeSigningFailed(SphinxError):
+    category = 'Code signing failed'
+
+
+class AppleHelpBuilder(StandaloneHTMLBuilder):
+    """
+    Builder that outputs an Apple help book.  Requires Mac OS X as it relies
+    on the ``hiutil`` command line tool.
+    """
+    name = 'applehelp'
+
+    # don't copy the reST source
+    copysource = False
+    supported_image_types = ['image/png', 'image/gif', 'image/jpeg',
+                             'image/tiff', 'image/jp2', 'image/svg+xml']
+
+    # don't add links
+    add_permalinks = False
+
+    # this is an embedded HTML format
+    embedded = True
+
+    # don't generate the search index or include the search page
+    search = False
+
+    def init(self):
+        super(AppleHelpBuilder, self).init()
+        # the output files for HTML help must be .html only
+        self.out_suffix = '.html'
+
+        if self.config.applehelp_bundle_id is None:
+            raise SphinxError('You must set applehelp_bundle_id before '
+                              'building Apple Help output')
+
+        self.bundle_path = path.join(self.outdir,
+                                     self.config.applehelp_bundle_name +
+                                     '.help')
+        self.outdir = path.join(self.bundle_path,
+                                'Contents',
+                                'Resources',
+                                self.config.applehelp_locale + '.lproj')
+
+    def handle_finish(self):
+        super(AppleHelpBuilder, self).handle_finish()
+
+        self.finish_tasks.add_task(self.copy_localized_files)
+        self.finish_tasks.add_task(self.build_helpbook)
+
+    def copy_localized_files(self):
+        source_dir = path.join(self.confdir,
+                               self.config.applehelp_locale + '.lproj')
+        target_dir = self.outdir
+
+        if path.isdir(source_dir):
+            self.info(bold('copying localized files... '), nonl=True)
+
+            ctx = self.globalcontext.copy()
+            matchers = compile_matchers(self.config.exclude_patterns)
+            copy_static_entry(source_dir, target_dir, self, ctx,
+                              exclude_matchers=matchers)
+
+            self.info('done')
+
+    def build_helpbook(self):
+        contents_dir = path.join(self.bundle_path, 'Contents')
+        resources_dir = path.join(contents_dir, 'Resources')
+        language_dir = path.join(resources_dir,
+                                 self.config.applehelp_locale + '.lproj')
+
+        for d in [contents_dir, resources_dir, language_dir]:
+            ensuredir(d)
+
+        # Construct the Info.plist file
+        toc = self.config.master_doc + self.out_suffix
+
+        info_plist = {
+            'CFBundleDevelopmentRegion': self.config.applehelp_dev_region,
+            'CFBundleIdentifier': self.config.applehelp_bundle_id,
+            'CFBundleInfoDictionaryVersion': '6.0',
+            'CFBundlePackageType': 'BNDL',
+            'CFBundleShortVersionString': self.config.release,
+            'CFBundleSignature': 'hbwr',
+            'CFBundleVersion': self.config.applehelp_bundle_version,
+            'HPDBookAccessPath': '_access.html',
+            'HPDBookIndexPath': 'search.helpindex',
+            'HPDBookTitle': self.config.applehelp_title,
+            'HPDBookType': '3',
+            'HPDBookUsesExternalViewer': False,
+        }
+
+        if self.config.applehelp_icon is not None:
+            info_plist['HPDBookIconPath'] \
+                = path.basename(self.config.applehelp_icon)
+
+        if self.config.applehelp_kb_url is not None:
+            info_plist['HPDBookKBProduct'] = self.config.applehelp_kb_product
+            info_plist['HPDBookKBURL'] = self.config.applehelp_kb_url
+
+        if self.config.applehelp_remote_url is not None:
+            info_plist['HPDBookRemoteURL'] = self.config.applehelp_remote_url
+
+        self.info(bold('writing Info.plist... '), nonl=True)
+        with open(path.join(contents_dir, 'Info.plist'), 'wb') as f:
+            write_plist(info_plist, f)
+        self.info('done')
+
+        # Copy the icon, if one is supplied
+        if self.config.applehelp_icon:
+            self.info(bold('copying icon... '), nonl=True)
+
+            try:
+                copyfile(path.join(self.srcdir, self.config.applehelp_icon),
+                         path.join(resources_dir, info_plist['HPDBookIconPath']))
+
+                self.info('done')
+            except Exception as err:
+                self.warn('cannot copy icon file %r: %s' %
+                          (path.join(self.srcdir, self.config.applehelp_icon),
+                           err))
+                del info_plist['HPDBookIconPath']
+
+        # Build the access page
+        self.info(bold('building access page...'), nonl=True)
+        f = codecs.open(path.join(language_dir, '_access.html'), 'w')
+        try:
+            f.write(access_page_template % {
+                'toc': htmlescape(toc, quote=True),
+                'title': htmlescape(self.config.applehelp_title)
+            })
+        finally:
+            f.close()
+        self.info('done')
+
+        # Generate the help index
+        self.info(bold('generating help index... '), nonl=True)
+
+        args = [
+            self.config.applehelp_indexer_path,
+            '-Cf',
+            path.join(language_dir, 'search.helpindex'),
+            language_dir
+        ]
+
+        if self.config.applehelp_index_anchors is not None:
+            args.append('-a')
+
+        if self.config.applehelp_min_term_length is not None:
+            args += ['-m', '%s' % self.config.applehelp_min_term_length]
+
+        if self.config.applehelp_stopwords is not None:
+            args += ['-s', self.config.applehelp_stopwords]
+
+        if self.config.applehelp_locale is not None:
+            args += ['-l', self.config.applehelp_locale]
+
+        if self.config.applehelp_disable_external_tools:
+            self.info('skipping')
+
+            self.warn('you will need to index this help book with:\n  %s'
+                      % (' '.join([pipes.quote(arg) for arg in args])))
+        else:
+            p = subprocess.Popen(args,
+                                 stdout=subprocess.PIPE,
+                                 stderr=subprocess.STDOUT)
+
+            output = p.communicate()[0]
+
+            if p.returncode != 0:
+                raise AppleHelpIndexerFailed(output)
+            else:
+                self.info('done')
+
+        # If we've been asked to, sign the bundle
+        if self.config.applehelp_codesign_identity:
+            self.info(bold('signing help book... '), nonl=True)
+
+            args = [
+                self.config.applehelp_codesign_path,
+                '-s', self.config.applehelp_codesign_identity,
+                '-f'
+            ]
+
+            args += self.config.applehelp_codesign_flags
+
+            args.append(self.bundle_path)
+
+            if self.config.applehelp_disable_external_tools:
+                self.info('skipping')
+
+                self.warn('you will need to sign this help book with:\n  %s'
+                          % (' '.join([pipes.quote(arg) for arg in args])))
+            else:
+                p = subprocess.Popen(args,
+                                     stdout=subprocess.PIPE,
+                                     stderr=subprocess.STDOUT)
+
+                output = p.communicate()[0]
+
+                if p.returncode != 0:
+                    raise AppleHelpCodeSigningFailed(output)
+                else:
+                    self.info('done')
+# -*- coding: utf-8 -*-
+"""
+    sphinx.application
+    ~~~~~~~~~~~~~~~~~~
+
+    Sphinx application object.
+
+    Gracefully adapted from the TextPress system by Armin.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+if hasattr(sys, 'intern'):
+    intern = sys.intern
+
+# List of all known core events. Maps name to arguments description.
+events = {
+    'builder-inited': '',
+    'env-get-outdated': 'env, added, changed, removed',
+    'env-purge-doc': 'env, docname',
+    'env-before-read-docs': 'env, docnames',
+    'source-read': 'docname, source text',
+    'doctree-read': 'the doctree before being pickled',
+    'env-merge-info': 'env, read docnames, other env instance',
+    'missing-reference': 'env, node, contnode',
+    'doctree-resolved': 'doctree, docname',
+    'env-updated': 'env',
+    'html-collect-pages': 'builder',
+    'html-page-context': 'pagename, context, doctree or None',
+    'build-finished': 'exception',
+}
+
+CONFIG_FILENAME = 'conf.py'
+ENV_PICKLE_FILENAME = 'environment.pickle'
+
+
+class Sphinx(object):
+
+    def __init__(self, srcdir, confdir, outdir, doctreedir, buildername,
+                 confoverrides=None, status=sys.stdout, warning=sys.stderr,
+                 freshenv=False, warningiserror=False, tags=None, verbosity=0,
+                 parallel=0):
+        self.verbosity = verbosity
+        self.next_listener_id = 0
+        self._extensions = {}
+        self._extension_metadata = {}
+        self._listeners = {}
+        self.domains = BUILTIN_DOMAINS.copy()
+        self.buildername = buildername
+        self.builderclasses = BUILTIN_BUILDERS.copy()
+        self.builder = None
+        self.env = None
+
+        self.srcdir = srcdir
+        self.confdir = confdir
+        self.outdir = outdir
+        self.doctreedir = doctreedir
+
+        self.parallel = parallel
+
+        if status is None:
+            self._status = cStringIO()
+            self.quiet = True
+        else:
+            self._status = status
+            self.quiet = False
+
+        if warning is None:
+            self._warning = cStringIO()
+        else:
+            self._warning = warning
+        self._warncount = 0
+        self.warningiserror = warningiserror
+
+        self._events = events.copy()
+        self._translators = {}
+
+        # keep last few messages for traceback
+        self.messagelog = deque(maxlen=10)
+
+        # say hello to the world
+        self.info(bold('Running Sphinx v%s' % sphinx.__display_version__))
+
+        # status code for command-line application
+        self.statuscode = 0
+
+        if not path.isdir(outdir):
+            self.info('making output directory...')
+            os.makedirs(outdir)
+
+        # read config
+        self.tags = Tags(tags)
+        self.config = Config(confdir, CONFIG_FILENAME,
+                             confoverrides or {}, self.tags)
+        self.config.check_unicode(self.warn)
+        # defer checking types until i18n has been initialized
+
+        # set confdir to srcdir if -C given (!= no confdir); a few pieces
+        # of code expect a confdir to be set
+        if self.confdir is None:
+            self.confdir = self.srcdir
+
+        # extension loading support for alabaster theme
+        # self.config.html_theme is not set from conf.py at here
+        # for now, sphinx always load a 'alabaster' extension.
+        if 'alabaster' not in self.config.extensions:
+            self.config.extensions.append('alabaster')
+
+        # load all user-given extension modules
+        for extension in self.config.extensions:
+            self.setup_extension(extension)
+        # the config file itself can be an extension
+        if self.config.setup:
+            # py31 doesn't have 'callable' function for below check
+            if hasattr(self.config.setup, '__call__'):
+                self.config.setup(self)
+            else:
+                raise ConfigError(
+                    "'setup' that is specified in the conf.py has not been " +
+                    "callable. Please provide a callable `setup` function " +
+                    "in order to behave as a sphinx extension conf.py itself."
+                )
+
+        # now that we know all config values, collect them from conf.py
+        self.config.init_values(self.warn)
+
+        # check the Sphinx version if requested
+        if self.config.needs_sphinx and \
+           self.config.needs_sphinx > sphinx.__display_version__[:3]:
+            raise VersionRequirementError(
+                'This project needs at least Sphinx v%s and therefore cannot '
+                'be built with this version.' % self.config.needs_sphinx)
+
+        # check extension versions if requested
+        if self.config.needs_extensions:
+            for extname, needs_ver in self.config.needs_extensions.items():
+                if extname not in self._extensions:
+                    self.warn('needs_extensions config value specifies a '
+                              'version requirement for extension %s, but it is '
+                              'not loaded' % extname)
+                    continue
+                has_ver = self._extension_metadata[extname]['version']
+                if has_ver == 'unknown version' or needs_ver > has_ver:
+                    raise VersionRequirementError(
+                        'This project needs the extension %s at least in '
+                        'version %s and therefore cannot be built with the '
+                        'loaded version (%s).' % (extname, needs_ver, has_ver))
+
+        # set up translation infrastructure
+        self._init_i18n()
+        # check all configuration values for permissible types
+        self.config.check_types(self.warn)
+        # set up the build environment
+        self._init_env(freshenv)
+        # set up the builder
+        self._init_builder(self.buildername)
+
+    def _init_i18n(self):
+        """Load translated strings from the configured localedirs if enabled in
+        the configuration.
+        """
+        if self.config.language is not None:
+            self.info(bold('loading translations [%s]... ' %
+                           self.config.language), nonl=True)
+            locale_dirs = [None, path.join(package_dir, 'locale')] + \
+                [path.join(self.srcdir, x) for x in self.config.locale_dirs]
+        else:
+            locale_dirs = []
+        self.translator, has_translation = locale.init(locale_dirs,
+                                                       self.config.language,
+                                                       charset=self.config.source_encoding)
+        if self.config.language is not None:
+            if has_translation or self.config.language == 'en':
+                # "en" never needs to be translated
+                self.info('done')
+            else:
+                self.info('not available for built-in messages')
+
+    def _init_env(self, freshenv):
+        if freshenv:
+            self.env = BuildEnvironment(self.srcdir, self.doctreedir,
+                                        self.config)
+            self.env.find_files(self.config)
+            for domain in self.domains.keys():
+                self.env.domains[domain] = self.domains[domain](self.env)
+        else:
+            try:
+                self.info(bold('loading pickled environment... '), nonl=True)
+                self.env = BuildEnvironment.frompickle(
+                    self.config, path.join(self.doctreedir, ENV_PICKLE_FILENAME))
+                self.env.domains = {}
+                for domain in self.domains.keys():
+                    # this can raise if the data version doesn't fit
+                    self.env.domains[domain] = self.domains[domain](self.env)
+                self.info('done')
+            except Exception as err:
+                if isinstance(err, IOError) and err.errno == ENOENT:
+                    self.info('not yet created')
+                else:
+                    self.info('failed: %s' % err)
+                return self._init_env(freshenv=True)
+
+        self.env.set_warnfunc(self.warn)
+
+    def _init_builder(self, buildername):
+        if buildername is None:
+            print('No builder selected, using default: html', file=self._status)
+            buildername = 'html'
+        if buildername not in self.builderclasses:
+            raise SphinxError('Builder name %s not registered' % buildername)
+
+        builderclass = self.builderclasses[buildername]
+        if isinstance(builderclass, tuple):
+            # builtin builder
+            mod, cls = builderclass
+            builderclass = getattr(
+                __import__('sphinx.builders.' + mod, None, None, [cls]), cls)
+        self.builder = builderclass(self)
+        self.emit('builder-inited')
+
+    # ---- main "build" method -------------------------------------------------
+
+    def build(self, force_all=False, filenames=None):
+        try:
+            if force_all:
+                self.builder.compile_all_catalogs()
+                self.builder.build_all()
+            elif filenames:
+                self.builder.compile_specific_catalogs(filenames)
+                self.builder.build_specific(filenames)
+            else:
+                self.builder.compile_update_catalogs()
+                self.builder.build_update()
+
+            status = (self.statuscode == 0 and
+                      'succeeded' or 'finished with problems')
+            if self._warncount:
+                self.info(bold('build %s, %s warning%s.' %
+                               (status, self._warncount,
+                                self._warncount != 1 and 's' or '')))
+            else:
+                self.info(bold('build %s.' % status))
+        except Exception as err:
+            # delete the saved env to force a fresh build next time
+            envfile = path.join(self.doctreedir, ENV_PICKLE_FILENAME)
+            if path.isfile(envfile):
+                os.unlink(envfile)
+            self.emit('build-finished', err)
+            raise
+        else:
+            self.emit('build-finished', None)
+        self.builder.cleanup()
+
+    # ---- logging handling ----------------------------------------------------
+
+    def _log(self, message, wfile, nonl=False):
+        try:
+            wfile.write(message)
+        except UnicodeEncodeError:
+            encoding = getattr(wfile, 'encoding', 'ascii') or 'ascii'
+            wfile.write(message.encode(encoding, 'replace'))
+        if not nonl:
+            wfile.write('\n')
+        if hasattr(wfile, 'flush'):
+            wfile.flush()
+        self.messagelog.append(message)
+
+    def warn(self, message, location=None, prefix='WARNING: '):
+        """Emit a warning.
+
+        If *location* is given, it should either be a tuple of (docname, lineno)
+        or a string describing the location of the warning as well as possible.
+
+        *prefix* usually should not be changed.
+
+        .. note::
+
+           For warnings emitted during parsing, you should use
+           :meth:`.BuildEnvironment.warn` since that will collect all
+           warnings during parsing for later output.
+        """
+        if isinstance(location, tuple):
+            docname, lineno = location
+            if docname:
+                location = '%s:%s' % (self.env.doc2path(docname), lineno or '')
+            else:
+                location = None
+        warntext = location and '%s: %s%s\n' % (location, prefix, message) or \
+            '%s%s\n' % (prefix, message)
+        if self.warningiserror:
+            raise SphinxWarning(warntext)
+        self._warncount += 1
+        self._log(warntext, self._warning, True)
+
+    def info(self, message='', nonl=False):
+        """Emit an informational message.
+
+        If *nonl* is true, don't emit a newline at the end (which implies that
+        more info output will follow soon.)
+        """
+        self._log(message, self._status, nonl)
+
+    def verbose(self, message, *args, **kwargs):
+        """Emit a verbose informational message.
+
+        The message will only be emitted for verbosity levels >= 1 (i.e. at
+        least one ``-v`` option was given).
+
+        The message can contain %-style interpolation placeholders, which is
+        formatted with either the ``*args`` or ``**kwargs`` when output.
+        """
+        if self.verbosity < 1:
+            return
+        if args or kwargs:
+            message = message % (args or kwargs)
+        self._log(message, self._status)
+
+    def debug(self, message, *args, **kwargs):
+        """Emit a debug-level informational message.
+
+        The message will only be emitted for verbosity levels >= 2 (i.e. at
+        least two ``-v`` options were given).
+
+        The message can contain %-style interpolation placeholders, which is
+        formatted with either the ``*args`` or ``**kwargs`` when output.
+        """
+        if self.verbosity < 2:
+            return
+        if args or kwargs:
+            message = message % (args or kwargs)
+        self._log(darkgray(message), self._status)
+
+    def debug2(self, message, *args, **kwargs):
+        """Emit a lowlevel debug-level informational message.
+
+        The message will only be emitted for verbosity level 3 (i.e. three
+        ``-v`` options were given).
+
+        The message can contain %-style interpolation placeholders, which is
+        formatted with either the ``*args`` or ``**kwargs`` when output.
+        """
+        if self.verbosity < 3:
+            return
+        if args or kwargs:
+            message = message % (args or kwargs)
+        self._log(lightgray(message), self._status)
+
+    def _display_chunk(chunk):
+        if isinstance(chunk, (list, tuple)):
+            if len(chunk) == 1:
+                return text_type(chunk[0])
+            return '%s .. %s' % (chunk[0], chunk[-1])
+        return text_type(chunk)
+
+    def old_status_iterator(self, iterable, summary, colorfunc=darkgreen,
+                            stringify_func=_display_chunk):
+        l = 0
+        for item in iterable:
+            if l == 0:
+                self.info(bold(summary), nonl=1)
+                l = 1
+            self.info(colorfunc(stringify_func(item)) + ' ', nonl=1)
+            yield item
+        if l == 1:
+            self.info()
+
+    # new version with progress info
+    def status_iterator(self, iterable, summary, colorfunc=darkgreen, length=0,
+                        stringify_func=_display_chunk):
+        if length == 0:
+            for item in self.old_status_iterator(iterable, summary, colorfunc,
+                                                 stringify_func):
+                yield item
+            return
+        l = 0
+        summary = bold(summary)
+        for item in iterable:
+            l += 1
+            s = '%s[%3d%%] %s' % (summary, 100*l/length,
+                                  colorfunc(stringify_func(item)))
+            if self.verbosity:
+                s += '\n'
+            else:
+                s = term_width_line(s)
+            self.info(s, nonl=1)
+            yield item
+        if l > 0:
+            self.info()
+
+    # ---- general extensibility interface -------------------------------------
+
+    def setup_extension(self, extension):
+        """Import and setup a Sphinx extension module. No-op if called twice."""
+        self.debug('[app] setting up extension: %r', extension)
+        if extension in self._extensions:
+            return
+        try:
+            mod = __import__(extension, None, None, ['setup'])
+        except ImportError as err:
+            self.verbose('Original exception:\n' + traceback.format_exc())
+            raise ExtensionError('Could not import extension %s' % extension,
+                                 err)
+        if not hasattr(mod, 'setup'):
+            self.warn('extension %r has no setup() function; is it really '
+                      'a Sphinx extension module?' % extension)
+            ext_meta = None
+        else:
+            try:
+                ext_meta = mod.setup(self)
+            except VersionRequirementError as err:
+                # add the extension name to the version required
+                raise VersionRequirementError(
+                    'The %s extension used by this project needs at least '
+                    'Sphinx v%s; it therefore cannot be built with this '
+                    'version.' % (extension, err))
+        if ext_meta is None:
+            ext_meta = {}
+            # special-case for compatibility
+            if extension == 'rst2pdf.pdfbuilder':
+                ext_meta = {'parallel_read_safe': True}
+        try:
+            if not ext_meta.get('version'):
+                ext_meta['version'] = 'unknown version'
+        except Exception:
+            self.warn('extension %r returned an unsupported object from '
+                      'its setup() function; it should return None or a '
+                      'metadata dictionary' % extension)
+            ext_meta = {'version': 'unknown version'}
+        self._extensions[extension] = mod
+        self._extension_metadata[extension] = ext_meta
+
+    def require_sphinx(self, version):
+        # check the Sphinx version if requested
+        if version > sphinx.__display_version__[:3]:
+            raise VersionRequirementError(version)
+
+    def import_object(self, objname, source=None):
+        """Import an object from a 'module.name' string."""
+        return import_object(objname, source=None)
+
+    # event interface
+
+    def _validate_event(self, event):
+        event = intern(event)
+        if event not in self._events:
+            raise ExtensionError('Unknown event name: %s' % event)
+
+    def connect(self, event, callback):
+        self._validate_event(event)
+        listener_id = self.next_listener_id
+        if event not in self._listeners:
+            self._listeners[event] = {listener_id: callback}
+        else:
+            self._listeners[event][listener_id] = callback
+        self.next_listener_id += 1
+        self.debug('[app] connecting event %r: %r [id=%s]',
+                   event, callback, listener_id)
+        return listener_id
+
+    def disconnect(self, listener_id):
+        self.debug('[app] disconnecting event: [id=%s]', listener_id)
+        for event in itervalues(self._listeners):
+            event.pop(listener_id, None)
+
+    def emit(self, event, *args):
+        try:
+            self.debug2('[app] emitting event: %r%s', event, repr(args)[:100])
+        except Exception:
+            # not every object likes to be repr()'d (think
+            # random stuff coming via autodoc)
+            pass
+        results = []
+        if event in self._listeners:
+            for _, callback in iteritems(self._listeners[event]):
+                results.append(callback(self, *args))
+        return results
+
+    def emit_firstresult(self, event, *args):
+        for result in self.emit(event, *args):
+            if result is not None:
+                return result
+        return None
+
+    # registering addon parts
+
+    def add_builder(self, builder):
+        self.debug('[app] adding builder: %r', builder)
+        if not hasattr(builder, 'name'):
+            raise ExtensionError('Builder class %s has no "name" attribute'
+                                 % builder)
+        if builder.name in self.builderclasses:
+            if isinstance(self.builderclasses[builder.name], tuple):
+                raise ExtensionError('Builder %r is a builtin builder' %
+                                     builder.name)
+            else:
+                raise ExtensionError(
+                    'Builder %r already exists (in module %s)' % (
+                        builder.name, self.builderclasses[builder.name].__module__))
+        self.builderclasses[builder.name] = builder
+
+    def add_config_value(self, name, default, rebuild):
+        self.debug('[app] adding config value: %r', (name, default, rebuild))
+        if name in self.config.values:
+            raise ExtensionError('Config value %r already present' % name)
+        if rebuild in (False, True):
+            rebuild = rebuild and 'env' or ''
+        self.config.values[name] = (default, rebuild)
+
+    def add_event(self, name):
+        self.debug('[app] adding event: %r', name)
+        if name in self._events:
+            raise ExtensionError('Event %r already present' % name)
+        self._events[name] = ''
+
+    def set_translator(self, name, translator_class):
+        self.info(bold('A Translator for the %s builder is changed.' % name))
+        self._translators[name] = translator_class
+
+    def add_node(self, node, **kwds):
+        self.debug('[app] adding node: %r', (node, kwds))
+        nodes._add_node_class_names([node.__name__])
+        for key, val in iteritems(kwds):
+            try:
+                visit, depart = val
+            except ValueError:
+                raise ExtensionError('Value for key %r must be a '
+                                     '(visit, depart) function tuple' % key)
+            translator = self._translators.get(key)
+            if translator is not None:
+                pass
+            elif key == 'html':
+                from sphinx.writers.html import HTMLTranslator as translator
+            elif key == 'latex':
+                from sphinx.writers.latex import LaTeXTranslator as translator
+            elif key == 'text':
+                from sphinx.writers.text import TextTranslator as translator
+            elif key == 'man':
+                from sphinx.writers.manpage import ManualPageTranslator \
+                    as translator
+            elif key == 'texinfo':
+                from sphinx.writers.texinfo import TexinfoTranslator \
+                    as translator
+            else:
+                # ignore invalid keys for compatibility
+                continue
+            setattr(translator, 'visit_'+node.__name__, visit)
+            if depart:
+                setattr(translator, 'depart_'+node.__name__, depart)
+
+    def _directive_helper(self, obj, content=None, arguments=None, **options):
+        if isinstance(obj, (types.FunctionType, types.MethodType)):
+            obj.content = content
+            obj.arguments = arguments or (0, 0, False)
+            obj.options = options
+            return convert_directive_function(obj)
+        else:
+            if content or arguments or options:
+                raise ExtensionError('when adding directive classes, no '
+                                     'additional arguments may be given')
+            return obj
+
+    def add_directive(self, name, obj, content=None, arguments=None, **options):
+        self.debug('[app] adding directive: %r',
+                   (name, obj, content, arguments, options))
+        directives.register_directive(
+            name, self._directive_helper(obj, content, arguments, **options))
+
+    def add_role(self, name, role):
+        self.debug('[app] adding role: %r', (name, role))
+        roles.register_local_role(name, role)
+
+    def add_generic_role(self, name, nodeclass):
+        # don't use roles.register_generic_role because it uses
+        # register_canonical_role
+        self.debug('[app] adding generic role: %r', (name, nodeclass))
+        role = roles.GenericRole(name, nodeclass)
+        roles.register_local_role(name, role)
+
+    def add_domain(self, domain):
+        self.debug('[app] adding domain: %r', domain)
+        if domain.name in self.domains:
+            raise ExtensionError('domain %s already registered' % domain.name)
+        self.domains[domain.name] = domain
+
+    def override_domain(self, domain):
+        self.debug('[app] overriding domain: %r', domain)
+        if domain.name not in self.domains:
+            raise ExtensionError('domain %s not yet registered' % domain.name)
+        if not issubclass(domain, self.domains[domain.name]):
+            raise ExtensionError('new domain not a subclass of registered %s '
+                                 'domain' % domain.name)
+        self.domains[domain.name] = domain
+
+    def add_directive_to_domain(self, domain, name, obj,
+                                content=None, arguments=None, **options):
+        self.debug('[app] adding directive to domain: %r',
+                   (domain, name, obj, content, arguments, options))
+        if domain not in self.domains:
+            raise ExtensionError('domain %s not yet registered' % domain)
+        self.domains[domain].directives[name] = \
+            self._directive_helper(obj, content, arguments, **options)
+
+    def add_role_to_domain(self, domain, name, role):
+        self.debug('[app] adding role to domain: %r', (domain, name, role))
+        if domain not in self.domains:
+            raise ExtensionError('domain %s not yet registered' % domain)
+        self.domains[domain].roles[name] = role
+
+    def add_index_to_domain(self, domain, index):
+        self.debug('[app] adding index to domain: %r', (domain, index))
+        if domain not in self.domains:
+            raise ExtensionError('domain %s not yet registered' % domain)
+        self.domains[domain].indices.append(index)
+
+    def add_object_type(self, directivename, rolename, indextemplate='',
+                        parse_node=None, ref_nodeclass=None, objname='',
+                        doc_field_types=[]):
+        self.debug('[app] adding object type: %r',
+                   (directivename, rolename, indextemplate, parse_node,
+                    ref_nodeclass, objname, doc_field_types))
+        StandardDomain.object_types[directivename] = \
+            ObjType(objname or directivename, rolename)
+        # create a subclass of GenericObject as the new directive
+        new_directive = type(directivename, (GenericObject, object),
+                             {'indextemplate': indextemplate,
+                              'parse_node': staticmethod(parse_node),
+                              'doc_field_types': doc_field_types})
+        StandardDomain.directives[directivename] = new_directive
+        # XXX support more options?
+        StandardDomain.roles[rolename] = XRefRole(innernodeclass=ref_nodeclass)
+
+    # backwards compatible alias
+    add_description_unit = add_object_type
+
+    def add_crossref_type(self, directivename, rolename, indextemplate='',
+                          ref_nodeclass=None, objname=''):
+        self.debug('[app] adding crossref type: %r',
+                   (directivename, rolename, indextemplate, ref_nodeclass,
+                    objname))
+        StandardDomain.object_types[directivename] = \
+            ObjType(objname or directivename, rolename)
+        # create a subclass of Target as the new directive
+        new_directive = type(directivename, (Target, object),
+                             {'indextemplate': indextemplate})
+        StandardDomain.directives[directivename] = new_directive
+        # XXX support more options?
+        StandardDomain.roles[rolename] = XRefRole(innernodeclass=ref_nodeclass)
+
+    def add_transform(self, transform):
+        self.debug('[app] adding transform: %r', transform)
+        SphinxStandaloneReader.transforms.append(transform)
+
+    def add_javascript(self, filename):
+        self.debug('[app] adding javascript: %r', filename)
+        from sphinx.builders.html import StandaloneHTMLBuilder
+        if '://' in filename:
+            StandaloneHTMLBuilder.script_files.append(filename)
+        else:
+            StandaloneHTMLBuilder.script_files.append(
+                posixpath.join('_static', filename))
+
+    def add_stylesheet(self, filename):
+        self.debug('[app] adding stylesheet: %r', filename)
+        from sphinx.builders.html import StandaloneHTMLBuilder
+        if '://' in filename:
+            StandaloneHTMLBuilder.css_files.append(filename)
+        else:
+            StandaloneHTMLBuilder.css_files.append(
+                posixpath.join('_static', filename))
+
+    def add_latex_package(self, packagename, options=None):
+        self.debug('[app] adding latex package: %r', packagename)
+        from sphinx.builders.latex import LaTeXBuilder
+        LaTeXBuilder.usepackages.append((packagename, options))
+
+    def add_lexer(self, alias, lexer):
+        self.debug('[app] adding lexer: %r', (alias, lexer))
+        from sphinx.highlighting import lexers
+        if lexers is None:
+            return
+        lexers[alias] = lexer
+
+    def add_autodocumenter(self, cls):
+        self.debug('[app] adding autodocumenter: %r', cls)
+        from sphinx.ext import autodoc
+        autodoc.add_documenter(cls)
+        self.add_directive('auto' + cls.objtype, autodoc.AutoDirective)
+
+    def add_autodoc_attrgetter(self, type, getter):
+        self.debug('[app] adding autodoc attrgetter: %r', (type, getter))
+        from sphinx.ext import autodoc
+        autodoc.AutoDirective._special_attrgetters[type] = getter
+
+    def add_search_language(self, cls):
+        self.debug('[app] adding search language: %r', cls)
+        from sphinx.search import languages, SearchLanguage
+        assert issubclass(cls, SearchLanguage)
+        languages[cls.lang] = cls
+
+
+class TemplateBridge(object):
+    """
+    This class defines the interface for a "template bridge", that is, a class
+    that renders templates given a template name and a context.
+    """
+
+    def init(self, builder, theme=None, dirs=None):
+        """Called by the builder to initialize the template system.
+
+        *builder* is the builder object; you'll probably want to look at the
+        value of ``builder.config.templates_path``.
+
+        *theme* is a :class:`sphinx.theming.Theme` object or None; in the latter
+        case, *dirs* can be list of fixed directories to look for templates.
+        """
+        raise NotImplementedError('must be implemented in subclasses')
+
+    def newest_template_mtime(self):
+        """Called by the builder to determine if output files are outdated
+        because of template changes.  Return the mtime of the newest template
+        file that was changed.  The default implementation returns ``0``.
+        """
+        return 0
+
+    def render(self, template, context):
+        """Called by the builder to render a template given as a filename with
+        a specified context (a Python dictionary).
+        """
+        raise NotImplementedError('must be implemented in subclasses')
+
+    def render_string(self, template, context):
+        """Called by the builder to render a template given as a string with a
+        specified context (a Python dictionary).
+        """
+        raise NotImplementedError('must be implemented in subclasses')
+# -*- coding: utf-8 -*-
+"""
+    sphinx.ext.autodoc
+    ~~~~~~~~~~~~~~~~~~
+
+    Automatically insert docstrings for functions, classes or whole modules into
+    the doctree, thus avoiding duplication between docstrings and documentation
+    for those who like elaborate docstrings.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+"""
+
+
+#: extended signature RE: with explicit module name separated by ::
+py_ext_sig_re = re.compile(
+    r'''^ ([\w.]+::)?            # explicit module name
+          ([\w.]+\.)?            # module and/or class name(s)
+          (\w+)  \s*             # thing name
+          (?: \((.*)\)           # optional: arguments
+           (?:\s* -> \s* (.*))?  #           return annotation
+          )? $                   # and nothing more
+          ''', re.VERBOSE)
+
+
+class DefDict(dict):
+    """A dict that returns a default on nonexisting keys."""
+    def __init__(self, default):
+        dict.__init__(self)
+        self.default = default
+
+    def __getitem__(self, key):
+        try:
+            return dict.__getitem__(self, key)
+        except KeyError:
+            return self.default
+
+    def __bool__(self):
+        # docutils check "if option_spec"
+        return True
+    __nonzero__ = __bool__  # for python2 compatibility
+
+
+def identity(x):
+    return x
+
+
+class Options(dict):
+    """A dict/attribute hybrid that returns None on nonexisting keys."""
+    def __getattr__(self, name):
+        try:
+            return self[name.replace('_', '-')]
+        except KeyError:
+            return None
+
+
+class _MockModule(object):
+    """Used by autodoc_mock_imports."""
+    def __init__(self, *args, **kwargs):
+        pass
+
+    def __call__(self, *args, **kwargs):
+        return _MockModule()
+
+    @classmethod
+    def __getattr__(cls, name):
+        if name in ('__file__', '__path__'):
+            return '/dev/null'
+        elif name[0] == name[0].upper():
+            # Not very good, we assume Uppercase names are classes...
+            mocktype = type(name, (), {})
+            mocktype.__module__ = __name__
+            return mocktype
+        else:
+            return _MockModule()
+
+
+def mock_import(modname):
+    if '.' in modname:
+        pkg, _n, mods = modname.rpartition('.')
+        mock_import(pkg)
+    mod = _MockModule()
+    sys.modules[modname] = mod
+    return mod
+
+
+ALL = object()
+INSTANCEATTR = object()
+
+
+def members_option(arg):
+    """Used to convert the :members: option to auto directives."""
+    if arg is None:
+        return ALL
+    return [x.strip() for x in arg.split(',')]
+
+
+def members_set_option(arg):
+    """Used to convert the :members: option to auto directives."""
+    if arg is None:
+        return ALL
+    return set(x.strip() for x in arg.split(','))
+
+SUPPRESS = object()
+
+
+def annotation_option(arg):
+    if arg is None:
+        # suppress showing the representation of the object
+        return SUPPRESS
+    else:
+        return arg
+
+
+def bool_option(arg):
+    """Used to convert flag options to auto directives.  (Instead of
+    directives.flag(), which returns None).
+    """
+    return True
+
+
+class AutodocReporter(object):
+    """
+    A reporter replacement that assigns the correct source name
+    and line number to a system message, as recorded in a ViewList.
+    """
+    def __init__(self, viewlist, reporter):
+        self.viewlist = viewlist
+        self.reporter = reporter
+
+    def __getattr__(self, name):
+        return getattr(self.reporter, name)
+
+    def system_message(self, level, message, *children, **kwargs):
+        if 'line' in kwargs and 'source' not in kwargs:
+            try:
+                source, line = self.viewlist.items[kwargs['line']]
+            except IndexError:
+                pass
+            else:
+                kwargs['source'] = source
+                kwargs['line'] = line
+        return self.reporter.system_message(level, message,
+                                            *children, **kwargs)
+
+    def debug(self, *args, **kwargs):
+        if self.reporter.debug_flag:
+            return self.system_message(0, *args, **kwargs)
+
+    def info(self, *args, **kwargs):
+        return self.system_message(1, *args, **kwargs)
+
+    def warning(self, *args, **kwargs):
+        return self.system_message(2, *args, **kwargs)
+
+    def error(self, *args, **kwargs):
+        return self.system_message(3, *args, **kwargs)
+
+    def severe(self, *args, **kwargs):
+        return self.system_message(4, *args, **kwargs)
+
+
+# Some useful event listener factories for autodoc-process-docstring.
+
+def cut_lines(pre, post=0, what=None):
+    """Return a listener that removes the first *pre* and last *post*
+    lines of every docstring.  If *what* is a sequence of strings,
+    only docstrings of a type in *what* will be processed.
+
+    Use like this (e.g. in the ``setup()`` function of :file:`conf.py`)::
+
+       from sphinx.ext.autodoc import cut_lines
+       app.connect('autodoc-process-docstring', cut_lines(4, what=['module']))
+
+    This can (and should) be used in place of :confval:`automodule_skip_lines`.
+    """
+    def process(app, what_, name, obj, options, lines):
+        if what and what_ not in what:
+            return
+        del lines[:pre]
+        if post:
+            # remove one trailing blank line.
+            if lines and not lines[-1]:
+                lines.pop(-1)
+            del lines[-post:]
+        # make sure there is a blank line at the end
+        if lines and lines[-1]:
+            lines.append('')
+    return process
+
+
+def between(marker, what=None, keepempty=False, exclude=False):
+    """Return a listener that either keeps, or if *exclude* is True excludes,
+    lines between lines that match the *marker* regular expression.  If no line
+    matches, the resulting docstring would be empty, so no change will be made
+    unless *keepempty* is true.
+
+    If *what* is a sequence of strings, only docstrings of a type in *what* will
+    be processed.
+    """
+    marker_re = re.compile(marker)
+
+    def process(app, what_, name, obj, options, lines):
+        if what and what_ not in what:
+            return
+        deleted = 0
+        delete = not exclude
+        orig_lines = lines[:]
+        for i, line in enumerate(orig_lines):
+            if delete:
+                lines.pop(i - deleted)
+                deleted += 1
+            if marker_re.match(line):
+                delete = not delete
+                if delete:
+                    lines.pop(i - deleted)
+                    deleted += 1
+        if not lines and not keepempty:
+            lines[:] = orig_lines
+        # make sure there is a blank line at the end
+        if lines and lines[-1]:
+            lines.append('')
+    return process
+
+
+def formatargspec(*argspec):
+    return inspect.formatargspec(*argspec,
+                                 formatvalue=lambda x: '=' + object_description(x))
+
+
+class Documenter(object):
+    """
+    A Documenter knows how to autodocument a single object type.  When
+    registered with the AutoDirective, it will be used to document objects
+    of that type when needed by autodoc.
+
+    Its *objtype* attribute selects what auto directive it is assigned to
+    (the directive name is 'auto' + objtype), and what directive it generates
+    by default, though that can be overridden by an attribute called
+    *directivetype*.
+
+    A Documenter has an *option_spec* that works like a docutils directive's;
+    in fact, it will be used to parse an auto directive's options that matches
+    the documenter.
+    """
+    #: name by which the directive is called (auto...) and the default
+    #: generated directive name
+    objtype = 'object'
+    #: indentation by which to indent the directive content
+    content_indent = u'   '
+    #: priority if multiple documenters return True from can_document_member
+    priority = 0
+    #: order if autodoc_member_order is set to 'groupwise'
+    member_order = 0
+    #: true if the generated content may contain titles
+    titles_allowed = False
+
+    option_spec = {'noindex': bool_option}
+
+    @staticmethod
+    def get_attr(obj, name, *defargs):
+        """getattr() override for types such as Zope interfaces."""
+        for typ, func in iteritems(AutoDirective._special_attrgetters):
+            if isinstance(obj, typ):
+                return func(obj, name, *defargs)
+        return safe_getattr(obj, name, *defargs)
+
+    @classmethod
+    def can_document_member(cls, member, membername, isattr, parent):
+        """Called to see if a member can be documented by this documenter."""
+        raise NotImplementedError('must be implemented in subclasses')
+
+    def __init__(self, directive, name, indent=u''):
+        self.directive = directive
+        self.env = directive.env
+        self.options = directive.genopt
+        self.name = name
+        self.indent = indent
+        # the module and object path within the module, and the fully
+        # qualified name (all set after resolve_name succeeds)
+        self.modname = None
+        self.module = None
+        self.objpath = None
+        self.fullname = None
+        # extra signature items (arguments and return annotation,
+        # also set after resolve_name succeeds)
+        self.args = None
+        self.retann = None
+        # the object to document (set after import_object succeeds)
+        self.object = None
+        self.object_name = None
+        # the parent/owner of the object to document
+        self.parent = None
+        # the module analyzer to get at attribute docs, or None
+        self.analyzer = None
+
+    def add_line(self, line, source, *lineno):
+        """Append one line of generated reST to the output."""
+        self.directive.result.append(self.indent + line, source, *lineno)
+
+    def resolve_name(self, modname, parents, path, base):
+        """Resolve the module and name of the object to document given by the
+        arguments and the current module/class.
+
+        Must return a pair of the module name and a chain of attributes; for
+        example, it would return ``('zipfile', ['ZipFile', 'open'])`` for the
+        ``zipfile.ZipFile.open`` method.
+        """
+        raise NotImplementedError('must be implemented in subclasses')
+
+    def parse_name(self):
+        """Determine what module to import and what attribute to document.
+
+        Returns True and sets *self.modname*, *self.objpath*, *self.fullname*,
+        *self.args* and *self.retann* if parsing and resolving was successful.
+        """
+        # first, parse the definition -- auto directives for classes and
+        # functions can contain a signature which is then used instead of
+        # an autogenerated one
+        try:
+            explicit_modname, path, base, args, retann = \
+                py_ext_sig_re.match(self.name).groups()
+        except AttributeError:
+            self.directive.warn('invalid signature for auto%s (%r)' %
+                                (self.objtype, self.name))
+            return False
+
+        # support explicit module and class name separation via ::
+        if explicit_modname is not None:
+            modname = explicit_modname[:-2]
+            parents = path and path.rstrip('.').split('.') or []
+        else:
+            modname = None
+            parents = []
+
+        self.modname, self.objpath = \
+            self.resolve_name(modname, parents, path, base)
+
+        if not self.modname:
+            return False
+
+        self.args = args
+        self.retann = retann
+        self.fullname = (self.modname or '') + \
+                        (self.objpath and '.' + '.'.join(self.objpath) or '')
+        return True
+
+    def import_object(self):
+        """Import the object given by *self.modname* and *self.objpath* and set
+        it as *self.object*.
+
+        Returns True if successful, False if an error occurred.
+        """
+        dbg = self.env.app.debug
+        if self.objpath:
+            dbg('[autodoc] from %s import %s',
+                self.modname, '.'.join(self.objpath))
+        try:
+            dbg('[autodoc] import %s', self.modname)
+            for modname in self.env.config.autodoc_mock_imports:
+                dbg('[autodoc] adding a mock module %s!', self.modname)
+                mock_import(modname)
+            __import__(self.modname)
+            parent = None
+            obj = self.module = sys.modules[self.modname]
+            dbg('[autodoc] => %r', obj)
+            for part in self.objpath:
+                parent = obj
+                dbg('[autodoc] getattr(_, %r)', part)
+                obj = self.get_attr(obj, part)
+                dbg('[autodoc] => %r', obj)
+                self.object_name = part
+            self.parent = parent
+            self.object = obj
+            return True
+        # this used to only catch SyntaxError, ImportError and AttributeError,
+        # but importing modules with side effects can raise all kinds of errors
+        except (Exception, SystemExit) as e:
+            if self.objpath:
+                errmsg = 'autodoc: failed to import %s %r from module %r' % \
+                         (self.objtype, '.'.join(self.objpath), self.modname)
+            else:
+                errmsg = 'autodoc: failed to import %s %r' % \
+                         (self.objtype, self.fullname)
+            if isinstance(e, SystemExit):
+                errmsg += ('; the module executes module level statement ' +
+                           'and it might call sys.exit().')
+            else:
+                errmsg += '; the following exception was raised:\n%s' % \
+                          traceback.format_exc()
+            dbg(errmsg)
+            self.directive.warn(errmsg)
+            self.env.note_reread()
+            return False
+
+    def get_real_modname(self):
+        """Get the real module name of an object to document.
+
+        It can differ from the name of the module through which the object was
+        imported.
+        """
+        return self.get_attr(self.object, '__module__', None) or self.modname
+
+    def check_module(self):
+        """Check if *self.object* is really defined in the module given by
+        *self.modname*.
+        """
+        if self.options.imported_members:
+            return True
+
+        modname = self.get_attr(self.object, '__module__', None)
+        if modname and modname != self.modname:
+            return False
+        return True
+
+    def format_args(self):
+        """Format the argument signature of *self.object*.
+
+        Should return None if the object does not have a signature.
+        """
+        return None
+
+    def format_name(self):
+        """Format the name of *self.object*.
+
+        This normally should be something that can be parsed by the generated
+        directive, but doesn't need to be (Sphinx will display it unparsed
+        then).
+        """
+        # normally the name doesn't contain the module (except for module
+        # directives of course)
+        return '.'.join(self.objpath) or self.modname
+
+    def format_signature(self):
+        """Format the signature (arguments and return annotation) of the object.
+
+        Let the user process it via the ``autodoc-process-signature`` event.
+        """
+        if self.args is not None:
+            # signature given explicitly
+            args = "(%s)" % self.args
+        else:
+            # try to introspect the signature
+            try:
+                args = self.format_args()
+            except Exception as err:
+                self.directive.warn('error while formatting arguments for '
+                                    '%s: %s' % (self.fullname, err))
+                args = None
+
+        retann = self.retann
+
+        result = self.env.app.emit_firstresult(
+            'autodoc-process-signature', self.objtype, self.fullname,
+            self.object, self.options, args, retann)
+        if result:
+            args, retann = result
+
+        if args is not None:
+            return args + (retann and (' -> %s' % retann) or '')
+        else:
+            return ''
+
+    def add_directive_header(self, sig):
+        """Add the directive header and options to the generated content."""
+        domain = getattr(self, 'domain', 'py')
+        directive = getattr(self, 'directivetype', self.objtype)
+        name = self.format_name()
+        sourcename = self.get_sourcename()
+        self.add_line(u'.. %s:%s:: %s%s' % (domain, directive, name, sig),
+                      sourcename)
+        if self.options.noindex:
+            self.add_line(u'   :noindex:', sourcename)
+        if self.objpath:
+            # Be explicit about the module, this is necessary since .. class::
+            # etc. don't support a prepended module name
+            self.add_line(u'   :module: %s' % self.modname, sourcename)
+
+    def get_doc(self, encoding=None, ignore=1):
+        """Decode and return lines of the docstring(s) for the object."""
+        docstring = self.get_attr(self.object, '__doc__', None)
+        # make sure we have Unicode docstrings, then sanitize and split
+        # into lines
+        if isinstance(docstring, text_type):
+            return [prepare_docstring(docstring, ignore)]
+        elif isinstance(docstring, str):  # this will not trigger on Py3
+            return [prepare_docstring(force_decode(docstring, encoding),
+                                      ignore)]
+        # ... else it is something strange, let's ignore it
+        return []
+
+    def process_doc(self, docstrings):
+        """Let the user process the docstrings before adding them."""
+        for docstringlines in docstrings:
+            if self.env.app:
+                # let extensions preprocess docstrings
+                self.env.app.emit('autodoc-process-docstring',
+                                  self.objtype, self.fullname, self.object,
+                                  self.options, docstringlines)
+            for line in docstringlines:
+                yield line
+
+    def get_sourcename(self):
+        if self.analyzer:
+            # prevent encoding errors when the file name is non-ASCII
+            if not isinstance(self.analyzer.srcname, text_type):
+                filename = text_type(self.analyzer.srcname,
+                                     sys.getfilesystemencoding(), 'replace')
+            else:
+                filename = self.analyzer.srcname
+            return u'%s:docstring of %s' % (filename, self.fullname)
+        return u'docstring of %s' % self.fullname
+
+    def add_content(self, more_content, no_docstring=False):
+        """Add content from docstrings, attribute documentation and user."""
+        # set sourcename and add content from attribute documentation
+        sourcename = self.get_sourcename()
+        if self.analyzer:
+            attr_docs = self.analyzer.find_attr_docs()
+            if self.objpath:
+                key = ('.'.join(self.objpath[:-1]), self.objpath[-1])
+                if key in attr_docs:
+                    no_docstring = True
+                    docstrings = [attr_docs[key]]
+                    for i, line in enumerate(self.process_doc(docstrings)):
+                        self.add_line(line, sourcename, i)
+
+        # add content from docstrings
+        if not no_docstring:
+            encoding = self.analyzer and self.analyzer.encoding
+            docstrings = self.get_doc(encoding)
+            if not docstrings:
+                # append at least a dummy docstring, so that the event
+                # autodoc-process-docstring is fired and can add some
+                # content if desired
+                docstrings.append([])
+            for i, line in enumerate(self.process_doc(docstrings)):
+                self.add_line(line, sourcename, i)
+
+        # add additional content (e.g. from document), if present
+        if more_content:
+            for line, src in zip(more_content.data, more_content.items):
+                self.add_line(line, src[0], src[1])
+
+    def get_object_members(self, want_all):
+        """Return `(members_check_module, members)` where `members` is a
+        list of `(membername, member)` pairs of the members of *self.object*.
+
+        If *want_all* is True, return all members.  Else, only return those
+        members given by *self.options.members* (which may also be none).
+        """
+        analyzed_member_names = set()
+        if self.analyzer:
+            attr_docs = self.analyzer.find_attr_docs()
+            namespace = '.'.join(self.objpath)
+            for item in iteritems(attr_docs):
+                if item[0][0] == namespace:
+                    analyzed_member_names.add(item[0][1])
+        if not want_all:
+            if not self.options.members:
+                return False, []
+            # specific members given
+            members = []
+            for mname in self.options.members:
+                try:
+                    members.append((mname, self.get_attr(self.object, mname)))
+                except AttributeError:
+                    if mname not in analyzed_member_names:
+                        self.directive.warn('missing attribute %s in object %s'
+                                            % (mname, self.fullname))
+        elif self.options.inherited_members:
+            # safe_getmembers() uses dir() which pulls in members from all
+            # base classes
+            members = safe_getmembers(self.object, attr_getter=self.get_attr)
+        else:
+            # __dict__ contains only the members directly defined in
+            # the class (but get them via getattr anyway, to e.g. get
+            # unbound method objects instead of function objects);
+            # using keys() because apparently there are objects for which
+            # __dict__ changes while getting attributes
+            try:
+                obj_dict = self.get_attr(self.object, '__dict__')
+            except AttributeError:
+                members = []
+            else:
+                members = [(mname, self.get_attr(self.object, mname, None))
+                           for mname in obj_dict.keys()]
+        membernames = set(m[0] for m in members)
+        # add instance attributes from the analyzer
+        for aname in analyzed_member_names:
+            if aname not in membernames and \
+               (want_all or aname in self.options.members):
+                members.append((aname, INSTANCEATTR))
+        return False, sorted(members)
+
+    def filter_members(self, members, want_all):
+        """Filter the given member list.
+
+        Members are skipped if
+
+        - they are private (except if given explicitly or the private-members
+          option is set)
+        - they are special methods (except if given explicitly or the
+          special-members option is set)
+        - they are undocumented (except if the undoc-members option is set)
+
+        The user can override the skipping decision by connecting to the
+        ``autodoc-skip-member`` event.
+        """
+        ret = []
+
+        # search for members in source code too
+        namespace = '.'.join(self.objpath)  # will be empty for modules
+
+        if self.analyzer:
+            attr_docs = self.analyzer.find_attr_docs()
+        else:
+            attr_docs = {}
+
+        # process members and determine which to skip
+        for (membername, member) in members:
+            # if isattr is True, the member is documented as an attribute
+            isattr = False
+
+            doc = self.get_attr(member, '__doc__', None)
+            # if the member __doc__ is the same as self's __doc__, it's just
+            # inherited and therefore not the member's doc
+            cls = self.get_attr(member, '__class__', None)
+            if cls:
+                cls_doc = self.get_attr(cls, '__doc__', None)
+                if cls_doc == doc:
+                    doc = None
+            has_doc = bool(doc)
+
+            keep = False
+            if want_all and membername.startswith('__') and \
+                    membername.endswith('__') and len(membername) > 4:
+                # special __methods__
+                if self.options.special_members is ALL and \
+                        membername != '__doc__':
+                    keep = has_doc or self.options.undoc_members
+                elif self.options.special_members and \
+                    self.options.special_members is not ALL and \
+                        membername in self.options.special_members:
+                    keep = has_doc or self.options.undoc_members
+            elif want_all and membername.startswith('_'):
+                # ignore members whose name starts with _ by default
+                keep = self.options.private_members and \
+                    (has_doc or self.options.undoc_members)
+            elif (namespace, membername) in attr_docs:
+                # keep documented attributes
+                keep = True
+                isattr = True
+            else:
+                # ignore undocumented members if :undoc-members: is not given
+                keep = has_doc or self.options.undoc_members
+
+            # give the user a chance to decide whether this member
+            # should be skipped
+            if self.env.app:
+                # let extensions preprocess docstrings
+                skip_user = self.env.app.emit_firstresult(
+                    'autodoc-skip-member', self.objtype, membername, member,
+                    not keep, self.options)
+                if skip_user is not None:
+                    keep = not skip_user
+
+            if keep:
+                ret.append((membername, member, isattr))
+
+        return ret
+
+    def document_members(self, all_members=False):
+        """Generate reST for member documentation.
+
+        If *all_members* is True, do all members, else those given by
+        *self.options.members*.
+        """
+        # set current namespace for finding members
+        self.env.temp_data['autodoc:module'] = self.modname
+        if self.objpath:
+            self.env.temp_data['autodoc:class'] = self.objpath[0]
+
+        want_all = all_members or self.options.inherited_members or \
+            self.options.members is ALL
+        # find out which members are documentable
+        members_check_module, members = self.get_object_members(want_all)
+
+        # remove members given by exclude-members
+        if self.options.exclude_members:
+            members = [(membername, member) for (membername, member) in members
+                       if membername not in self.options.exclude_members]
+
+        # document non-skipped members
+        memberdocumenters = []
+        for (mname, member, isattr) in self.filter_members(members, want_all):
+            classes = [cls for cls in itervalues(AutoDirective._registry)
+                       if cls.can_document_member(member, mname, isattr, self)]
+            if not classes:
+                # don't know how to document this member
+                continue
+            # prefer the documenter with the highest priority
+            classes.sort(key=lambda cls: cls.priority)
+            # give explicitly separated module name, so that members
+            # of inner classes can be documented
+            full_mname = self.modname + '::' + \
+                '.'.join(self.objpath + [mname])
+            documenter = classes[-1](self.directive, full_mname, self.indent)
+            memberdocumenters.append((documenter, isattr))
+        member_order = self.options.member_order or \
+            self.env.config.autodoc_member_order
+        if member_order == 'groupwise':
+            # sort by group; relies on stable sort to keep items in the
+            # same group sorted alphabetically
+            memberdocumenters.sort(key=lambda e: e[0].member_order)
+        elif member_order == 'bysource' and self.analyzer:
+            # sort by source order, by virtue of the module analyzer
+            tagorder = self.analyzer.tagorder
+
+            def keyfunc(entry):
+                fullname = entry[0].name.split('::')[1]
+                return tagorder.get(fullname, len(tagorder))
+            memberdocumenters.sort(key=keyfunc)
+
+        for documenter, isattr in memberdocumenters:
+            documenter.generate(
+                all_members=True, real_modname=self.real_modname,
+                check_module=members_check_module and not isattr)
+
+        # reset current objects
+        self.env.temp_data['autodoc:module'] = None
+        self.env.temp_data['autodoc:class'] = None
+
+    def generate(self, more_content=None, real_modname=None,
+                 check_module=False, all_members=False):
+        """Generate reST for the object given by *self.name*, and possibly for
+        its members.
+
+        If *more_content* is given, include that content. If *real_modname* is
+        given, use that module name to find attribute docs. If *check_module* is
+        True, only generate if the object is defined in the module name it is
+        imported from. If *all_members* is True, document all members.
+        """
+        if not self.parse_name():
+            # need a module to import
+            self.directive.warn(
+                'don\'t know which module to import for autodocumenting '
+                '%r (try placing a "module" or "currentmodule" directive '
+                'in the document, or giving an explicit module name)'
+                % self.name)
+            return
+
+        # now, import the module and get object to document
+        if not self.import_object():
+            return
+
+        # If there is no real module defined, figure out which to use.
+        # The real module is used in the module analyzer to look up the module
+        # where the attribute documentation would actually be found in.
+        # This is used for situations where you have a module that collects the
+        # functions and classes of internal submodules.
+        self.real_modname = real_modname or self.get_real_modname()
+
+        # try to also get a source code analyzer for attribute docs
+        try:
+            self.analyzer = ModuleAnalyzer.for_module(self.real_modname)
+            # parse right now, to get PycodeErrors on parsing (results will
+            # be cached anyway)
+            self.analyzer.find_attr_docs()
+        except PycodeError as err:
+            self.env.app.debug('[autodoc] module analyzer failed: %s', err)
+            # no source file -- e.g. for builtin and C modules
+            self.analyzer = None
+            # at least add the module.__file__ as a dependency
+            if hasattr(self.module, '__file__') and self.module.__file__:
+                self.directive.filename_set.add(self.module.__file__)
+        else:
+            self.directive.filename_set.add(self.analyzer.srcname)
+
+        # check __module__ of object (for members not given explicitly)
+        if check_module:
+            if not self.check_module():
+                return
+
+        sourcename = self.get_sourcename()
+
+        # make sure that the result starts with an empty line.  This is
+        # necessary for some situations where another directive preprocesses
+        # reST and no starting newline is present
+        self.add_line(u'', sourcename)
+
+        # format the object's signature, if any
+        sig = self.format_signature()
+
+        # generate the directive header and options, if applicable
+        self.add_directive_header(sig)
+        self.add_line(u'', sourcename)
+
+        # e.g. the module directive doesn't have content
+        self.indent += self.content_indent
+
+        # add all content (from docstrings, attribute docs etc.)
+        self.add_content(more_content)
+
+        # document members, if possible
+        self.document_members(all_members)
+
+
+class ModuleDocumenter(Documenter):
+    """
+    Specialized Documenter subclass for modules.
+    """
+    objtype = 'module'
+    content_indent = u''
+    titles_allowed = True
+
+    option_spec = {
+        'members': members_option, 'undoc-members': bool_option,
+        'noindex': bool_option, 'inherited-members': bool_option,
+        'show-inheritance': bool_option, 'synopsis': identity,
+        'platform': identity, 'deprecated': bool_option,
+        'member-order': identity, 'exclude-members': members_set_option,
+        'private-members': bool_option, 'special-members': members_option,
+        'imported-members': bool_option,
+    }
+
+    @classmethod
+    def can_document_member(cls, member, membername, isattr, parent):
+        # don't document submodules automatically
+        return False
+
+    def resolve_name(self, modname, parents, path, base):
+        if modname is not None:
+            self.directive.warn('"::" in automodule name doesn\'t make sense')
+        return (path or '') + base, []
+
+    def parse_name(self):
+        ret = Documenter.parse_name(self)
+        if self.args or self.retann:
+            self.directive.warn('signature arguments or return annotation '
+                                'given for automodule %s' % self.fullname)
+        return ret
+
+    def add_directive_header(self, sig):
+        Documenter.add_directive_header(self, sig)
+
+        sourcename = self.get_sourcename()
+
+        # add some module-specific options
+        if self.options.synopsis:
+            self.add_line(
+                u'   :synopsis: ' + self.options.synopsis, sourcename)
+        if self.options.platform:
+            self.add_line(
+                u'   :platform: ' + self.options.platform, sourcename)
+        if self.options.deprecated:
+            self.add_line(u'   :deprecated:', sourcename)
+
+    def get_object_members(self, want_all):
+        if want_all:
+            if not hasattr(self.object, '__all__'):
+                # for implicit module members, check __module__ to avoid
+                # documenting imported objects
+                return True, safe_getmembers(self.object)
+            else:
+                memberlist = self.object.__all__
+                # Sometimes __all__ is broken...
+                if not isinstance(memberlist, (list, tuple)) or not \
+                   all(isinstance(entry, string_types) for entry in memberlist):
+                    self.directive.warn(
+                        '__all__ should be a list of strings, not %r '
+                        '(in module %s) -- ignoring __all__' %
+                        (memberlist, self.fullname))
+                    # fall back to all members
+                    return True, safe_getmembers(self.object)
+        else:
+            memberlist = self.options.members or []
+        ret = []
+        for mname in memberlist:
+            try:
+                ret.append((mname, safe_getattr(self.object, mname)))
+            except AttributeError:
+                self.directive.warn(
+                    'missing attribute mentioned in :members: or __all__: '
+                    'module %s, attribute %s' % (
+                        safe_getattr(self.object, '__name__', '???'), mname))
+        return False, ret
+
+
+class ModuleLevelDocumenter(Documenter):
+    """
+    Specialized Documenter subclass for objects on module level (functions,
+    classes, data/constants).
+    """
+    def resolve_name(self, modname, parents, path, base):
+        if modname is None:
+            if path:
+                modname = path.rstrip('.')
+            else:
+                # if documenting a toplevel object without explicit module,
+                # it can be contained in another auto directive ...
+                modname = self.env.temp_data.get('autodoc:module')
+                # ... or in the scope of a module directive
+                if not modname:
+                    modname = self.env.ref_context.get('py:module')
+                # ... else, it stays None, which means invalid
+        return modname, parents + [base]
+
+
+class ClassLevelDocumenter(Documenter):
+    """
+    Specialized Documenter subclass for objects on class level (methods,
+    attributes).
+    """
+    def resolve_name(self, modname, parents, path, base):
+        if modname is None:
+            if path:
+                mod_cls = path.rstrip('.')
+            else:
+                mod_cls = None
+                # if documenting a class-level object without path,
+                # there must be a current class, either from a parent
+                # auto directive ...
+                mod_cls = self.env.temp_data.get('autodoc:class')
+                # ... or from a class directive
+                if mod_cls is None:
+                    mod_cls = self.env.ref_context.get('py:class')
+                # ... if still None, there's no way to know
+                if mod_cls is None:
+                    return None, []
+            modname, cls = rpartition(mod_cls, '.')
+            parents = [cls]
+            # if the module name is still missing, get it like above
+            if not modname:
+                modname = self.env.temp_data.get('autodoc:module')
+            if not modname:
+                modname = self.env.ref_context.get('py:module')
+            # ... else, it stays None, which means invalid
+        return modname, parents + [base]
+
+
+class DocstringSignatureMixin(object):
+    """
+    Mixin for FunctionDocumenter and MethodDocumenter to provide the
+    feature of reading the signature from the docstring.
+    """
+
+    def _find_signature(self, encoding=None):
+        docstrings = self.get_doc(encoding)
+        self._new_docstrings = docstrings[:]
+        result = None
+
diff --git a/vim/plugins/deoplete-jedi/tests/test-jedi.py b/vim/plugins/deoplete-jedi/tests/test-jedi.py
new file mode 100644
index 0000000..21d5ee5
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/test-jedi.py
@@ -0,0 +1,3 @@
+import jedi
+
+jedi
diff --git a/vim/plugins/deoplete-jedi/tests/test.py b/vim/plugins/deoplete-jedi/tests/test.py
new file mode 100644
index 0000000..b8d0ae3
--- /dev/null
+++ b/vim/plugins/deoplete-jedi/tests/test.py
@@ -0,0 +1,41 @@
+import re
+import csv
+from time import localtime
+
+for test_string in ['555-1212', 'ILL-EGAL']:
+    if re.match(r'^\d{3}-\d{4}$', test_string):
+        print test_string, 'is a valid US local phone number'
+    else:
+        print test_string, 'rejected'
+
+# write stocks data as comma-separated values
+writer = csv.writer(open('stocks.csv', 'wb', buffering=0))
+writer.writerows([
+    ('GOOG', 'Google, Inc.', 505.24, 0.47, 0.09),
+    ('YHOO', 'Yahoo! Inc.', 27.38, 0.33, 1.22),
+    ('CNET', 'CNET Networks, Inc.', 8.62, -0.13, -1.49)
+])
+
+# read stocks data, print status messages
+stocks = csv.reader(open('stocks.csv', 'rb'))
+status_labels = {-1: 'down', 0: 'unchanged', 1: 'up'}
+for ticker, name, price, change, pct in stocks:
+    status = status_labels[cmp(float(change), 0.0)]
+    print '%s is %s (%s%%)' % (name, status, pct)
+
+activities = {8: 'Sleeping',
+              9: 'Commuting',
+              17: 'Working',
+              18: 'Commuting',
+              20: 'Eating',
+              22: 'Resting'}
+
+time_now = localtime()
+hour = time_now.tm_hour
+
+for activity_time in sorted(activities.keys()):
+    if hour < activity_time:
+        print activities[activity_time]
+        break
+else:
+    print 'Unknown, AFK or sleeping!'
diff --git a/vim/plugins/deoplete.nvim/.github/ISSUE_TEMPLATE.md b/vim/plugins/deoplete.nvim/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..7e14a88
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,47 @@
+**Warning:  I will close the issue without the minimal init.vim and the reproduction instructions.**
+
+# Problems summary
+
+
+## Expected
+
+
+## Environment Information
+
+ * deoplete version(SHA1):
+
+ * OS:
+
+ * neovim/Vim version:
+
+ * `:checkhealth` or `:CheckHealth` result(neovim only):
+
+## Provide a minimal init.vim/vimrc with less than 50 lines (Required!)
+
+```vim
+" Your minimal init.vim/vimrc
+set runtimepath+=~/path/to/deoplete.nvim/
+let g:deoplete#enable_at_startup = 1
+```
+
+
+## The reproduce ways from neovim/Vim starting (Required!)
+
+ 1. foo
+ 2. bar
+ 3. baz
+
+
+## Generate a logfile if appropriate
+
+ 1. export NVIM_PYTHON_LOG_FILE=/tmp/log
+ 2. export NVIM_PYTHON_LOG_LEVEL=DEBUG
+ 3. nvim -u minimal.vimrc
+ 4. some works
+ 5. cat /tmp/log_{PID}
+
+
+## Screen shot (if possible)
+
+
+## Upload the log file
diff --git a/vim/plugins/deoplete.nvim/.gitignore b/vim/plugins/deoplete.nvim/.gitignore
new file mode 100644
index 0000000..9c25c09
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/.gitignore
@@ -0,0 +1,6 @@
+*.py[cod]
+doc/tags
+vim-themis
+.cache
+.mypy_cache
+tags
diff --git a/vim/plugins/deoplete.nvim/.travis.yml b/vim/plugins/deoplete.nvim/.travis.yml
new file mode 100644
index 0000000..27c3e61
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/.travis.yml
@@ -0,0 +1,18 @@
+sudo: false
+dist: trusty
+
+language: python
+
+python:
+    - 3.5
+    - 3.6
+
+install:
+    # Install Neovim via Gist
+    # https://gist.github.com/lambdalisue/0f461f6a91743895394e63a9a1c65232
+    - curl -sL https://gist.githubusercontent.com/lambdalisue/0f461f6a91743895394e63a9a1c65232/raw/install_nvim_for_ci.sh | bash
+    - make install
+
+script:
+    - PATH="$HOME/neovim/bin:$PATH" make test
+    - make lint
diff --git a/vim/plugins/deoplete.nvim/LICENSE b/vim/plugins/deoplete.nvim/LICENSE
new file mode 100644
index 0000000..3a4b98e
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/LICENSE
@@ -0,0 +1,21 @@
+License: MIT license
+AUTHOR:  Shougo Matsushita <Shougo.Matsu at 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.
diff --git a/vim/plugins/deoplete.nvim/Makefile b/vim/plugins/deoplete.nvim/Makefile
new file mode 100644
index 0000000..ea0cff4
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/Makefile
@@ -0,0 +1,32 @@
+PATH := ./vim-themis/bin:$(PATH)
+export THEMIS_VIM  := nvim
+export THEMIS_ARGS := -e -s --headless
+export THEMIS_HOME := ./vim-themis
+
+
+install: vim-themis
+	pip install neovim --upgrade
+	pip install pytest --upgrade
+	pip install flake8 --upgrade
+	pip install mypy --upgrade
+	pip install vim-vint --upgrade
+
+lint:
+	vint --version
+	vint plugin
+	vint autoload
+	flake8 --version
+	flake8 rplugin/python3/deoplete
+	mypy --version
+	mypy --silent-imports rplugin/python3/deoplete
+
+test:
+	themis --version
+	themis test/autoload/*
+	pytest --version
+	pytest
+
+vim-themis:
+	git clone https://github.com/thinca/vim-themis vim-themis
+
+.PHONY: install lint test
diff --git a/vim/plugins/deoplete.nvim/README.md b/vim/plugins/deoplete.nvim/README.md
new file mode 100644
index 0000000..e481f79
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/README.md
@@ -0,0 +1,141 @@
+# deoplete.nvim
+
+> Dark powered asynchronous completion framework for neovim/Vim8
+
+[![Build Status](https://travis-ci.org/Shougo/deoplete.nvim.svg?branch=master)](https://travis-ci.org/Shougo/deoplete.nvim)
+[![Join the chat at https://gitter.im/Shougo/deoplete.nvim](https://badges.gitter.im/Shougo/deoplete.nvim.svg)](https://gitter.im/Shougo/deoplete.nvim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Doc](https://img.shields.io/badge/doc-%3Ah%20deoplete-orange.svg)](doc/deoplete.txt)
+
+Deoplete is the abbreviation of "dark powered neo-completion".  It
+provides an extensible and asynchronous completion framework for
+neovim/Vim8.
+
+deoplete will display completions via `complete()` by default.
+
+Here are some [completion sources](https://github.com/Shougo/deoplete.nvim/wiki/Completion-Sources) specifically made for deoplete.nvim.
+
+<!-- vim-markdown-toc GFM -->
+
+- [Install](#install)
+  - [Requirements](#requirements)
+- [Configuration](#configuration)
+- [Screenshots](#screenshots)
+
+<!-- vim-markdown-toc -->
+
+## Install
+
+**Note:** deoplete requires Neovim (0.2.0+ and of course, **latest** is
+recommended) or Vim8 with Python3 and timers enabled.  See
+[requirements](#requirements) if you aren't sure whether you have this.
+
+For vim-plug
+
+```viml
+if has('nvim')
+  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+else
+  Plug 'Shougo/deoplete.nvim'
+  Plug 'roxma/nvim-yarp'
+  Plug 'roxma/vim-hug-neovim-rpc'
+endif
+let g:deoplete#enable_at_startup = 1
+```
+
+For dein.vim
+
+```viml
+call dein#add('Shougo/deoplete.nvim')
+if !has('nvim')
+  call dein#add('roxma/nvim-yarp')
+  call dein#add('roxma/vim-hug-neovim-rpc')
+endif
+let g:deoplete#enable_at_startup = 1
+```
+
+For manual installation(not recommended)
+
+1. Extract the files and put them in your Neovim or .vim directory
+   (usually `$XDG_CONFIG_HOME/nvim/`).
+
+2. Write `call deoplete#enable()` or `let g:deoplete#enable_at_startup = 1` in
+   your `init.vim`
+
+### Requirements
+
+deoplete requires Neovim or Vim8 with `if_python3`.
+
+If `:echo has("python3")` returns `1`, then you have python 3 support; otherwise, see below.
+
+You can enable Python3 interface with pip:
+
+    pip3 install neovim
+
+Please install nvim-yarp and vim-hug-neovim-rpc for Vim8.
+
+- <https://github.com/roxma/nvim-yarp>
+- <https://github.com/roxma/vim-hug-neovim-rpc>
+
+**Note: Python3 must be enabled before updating remote plugins**
+
+If Deoplete was installed prior to Python support being added to Neovim,
+`:UpdateRemotePlugins` should be executed manually in order to enable
+auto-completion.
+
+**Note: deoplete needs neovim-python ver.0.2.4+.**
+
+You need update neovim-python module.
+
+    pip3 install --upgrade neovim
+
+If you want to read the Neovim-python/python3 interface install documentation,
+you should read `:help provider-python` and the Wiki.
+<https://github.com/zchee/deoplete-jedi/wiki/Setting-up-Python-for-Neovim>
+
+## Configuration
+
+```vim
+" Use deoplete.
+let g:deoplete#enable_at_startup = 1
+```
+
+## Screenshots
+
+Deoplete for JavaScript
+<https://www.youtube.com/watch?v=oanoPTpiSF4>
+
+![File Name Completion](https://cloud.githubusercontent.com/assets/7141867/11717027/a99cac54-9f73-11e5-91ce-bce9274692e4.png)
+
+![Omni Completion](https://cloud.githubusercontent.com/assets/7141867/11717030/ae809a28-9f73-11e5-8c12-79fe9c460401.png)
+
+![Neosnippets and neco-ghc integration](https://cloud.githubusercontent.com/assets/7141867/11717032/b4159c0e-9f73-11e5-91ee-404e6390366a.png)
+
+![deoplete + echodoc integration](https://github.com/archSeer/nvim-elixir/blob/master/autocomplete.gif)
+
+![deoplete + deoplete-go integration](https://camo.githubusercontent.com/cfdefba43971bd44d466ead357bb296e38d7f88c/68747470733a2f2f6d656469612e67697068792e636f6d2f6d656469612f6c344b6930316d30314939424f485745302f67697068792e676966)
+
+![deoplete + deoplete-typescript integration](https://github.com/mhartington/deoplete-typescript/blob/master/deoplete-tss.gif)
+
+![Python completion using deoplete-jedi](https://cloud.githubusercontent.com/assets/3712731/17458493/8e10d1c0-5c44-11e6-8bd9-964f45365962.gif)
+
+![C++ completion using clang_complete](https://cloud.githubusercontent.com/assets/3712731/17458501/cf88f89e-5c44-11e6-89a4-b4646aaa8021.gif)
+
+![Java completion using vim-javacomplete2](https://cloud.githubusercontent.com/assets/3712731/17458504/f075e76a-5c44-11e6-97d5-c5525f61c4a9.gif)
+
+![Vim Script completion using neco-vim](https://cloud.githubusercontent.com/assets/3712731/17461000/660e15be-5caf-11e6-8c02-eb9f9c169f3c.gif)
+
+![C# completion using deoplete-omnisharp](https://camo.githubusercontent.com/f429dc72f91b25619980dbb9d436065ba3fb0a44/68747470733a2f2f692e696d6775722e636f6d2f464e634c4441752e676966)
+
+![Register/Extract list completions](https://camo.githubusercontent.com/6a6df993ad0e05c014c72c8f8702447f9b34ad90/68747470733a2f2f692e696d6775722e636f6d2f5131663731744a2e676966)
+
+![FSharp completion using deopletefs](https://github.com/callmekohei/deoplete-fsharp/blob/master/pic/sample.gif)
+
+![Typescript](https://user-images.githubusercontent.com/29815830/36537450-bfbf4884-1802-11e8-8ad4-dd4a0dccfed3.png)
+
+![Javascript](https://user-images.githubusercontent.com/29815830/36537514-ef01ef7a-1802-11e8-944e-c33017dfbe2b.png)
+
+![Css, scss, sass](https://user-images.githubusercontent.com/29815830/36537545-1184f10a-1803-11e8-81a1-097222a58752.png)
+
+![Html](https://user-images.githubusercontent.com/29815830/36537602-40b19848-1803-11e8-8ac8-49b3b9ba2094.png)
+
+![My custom snippets](https://user-images.githubusercontent.com/29815830/36537646-6578262e-1803-11e8-9bff-64874a606150.png)
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete.vim b/vim/plugins/deoplete.nvim/autoload/deoplete.vim
new file mode 100644
index 0000000..34b7b5d
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete.vim
@@ -0,0 +1,71 @@
+"=============================================================================
+" FILE: deoplete.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! deoplete#initialize() abort
+  return deoplete#init#_initialize()
+endfunction
+function! deoplete#is_enabled() abort
+  call deoplete#initialize()
+  return deoplete#init#_is_enabled()
+endfunction
+function! deoplete#enable() abort
+  if deoplete#initialize()
+    return 1
+  endif
+  return deoplete#init#_enable()
+endfunction
+function! deoplete#disable() abort
+  return deoplete#init#_disable()
+endfunction
+function! deoplete#toggle() abort
+  return deoplete#is_enabled() ?
+        \ deoplete#init#_disable() : deoplete#init#_enable()
+endfunction
+
+function! deoplete#enable_logging(level, logfile) abort
+  let g:deoplete#_logging = {'level': a:level, 'logfile': a:logfile}
+  call deoplete#util#rpcnotify('deoplete_enable_logging', {})
+endfunction
+
+function! deoplete#send_event(event) abort
+  call deoplete#util#rpcnotify('deoplete_on_event',
+        \ deoplete#init#_context(a:event, []))
+endfunction
+
+function! deoplete#manual_complete(...) abort
+  if !deoplete#is_enabled()
+    return ''
+  endif
+
+  " Start complete.
+  return "\<C-r>=deoplete#mapping#_rpcrequest_wrapper("
+        \ . string(get(a:000, 0, [])) . ")\<CR>"
+endfunction
+function! deoplete#close_popup() abort
+  call deoplete#handler#_skip_next_completion()
+  return pumvisible() ? "\<C-y>" : ''
+endfunction
+function! deoplete#smart_close_popup() abort
+  call deoplete#handler#_skip_next_completion()
+  return pumvisible() ? "\<C-e>" : ''
+endfunction
+function! deoplete#cancel_popup() abort
+  return pumvisible() ? "\<C-e>" : ''
+endfunction
+function! deoplete#refresh() abort
+  if exists('g:deoplete#_context')
+    if get(g:deoplete#_context, 'event', '') ==# 'Manual'
+      let g:deoplete#_context.event = 'Refresh'
+    endif
+  endif
+  return pumvisible() ? "\<C-e>" : ''
+endfunction
+function! deoplete#undo_completion() abort
+  return deoplete#mapping#_undo_completion()
+endfunction
+function! deoplete#complete_common_string() abort
+  return deoplete#mapping#_complete_common_string()
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/custom.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/custom.vim
new file mode 100644
index 0000000..21aab10
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/custom.vim
@@ -0,0 +1,44 @@
+"=============================================================================
+" FILE: custom.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! deoplete#custom#init() abort
+  let s:custom = {}
+  let s:custom.source = {}
+  let s:custom.source._ = {}
+endfunction
+
+function! deoplete#custom#get() abort
+  if !exists('s:custom')
+    call deoplete#custom#init()
+  endif
+
+  return s:custom
+endfunction
+
+function! deoplete#custom#get_source_var(source_name) abort
+  let custom = deoplete#custom#get().source
+
+  if !has_key(custom, a:source_name)
+    let custom[a:source_name] = {}
+  endif
+
+  return custom[a:source_name]
+endfunction
+
+function! deoplete#custom#set(source_name, option_name, value) abort
+  return deoplete#custom#source(a:source_name, a:option_name, a:value)
+endfunction
+function! deoplete#custom#source(source_name, option_name, value) abort
+  let value = index([
+        \ 'filetypes', 'disabled_syntaxes',
+        \ 'matchers', 'sorters', 'converters'
+        \ ], a:option_name) < 0 ? a:value :
+        \ deoplete#util#convert2list(a:value)
+  for key in split(a:source_name, '\s*,\s*')
+    let custom_source = deoplete#custom#get_source_var(key)
+    let custom_source[a:option_name] = value
+  endfor
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/handler.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/handler.vim
new file mode 100644
index 0000000..da314c1
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/handler.vim
@@ -0,0 +1,286 @@
+"=============================================================================
+" FILE: handler.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! deoplete#handler#_init() abort
+  augroup deoplete
+    autocmd!
+    autocmd InsertLeave * call s:on_insert_leave()
+    autocmd CompleteDone * call s:on_complete_done()
+    autocmd InsertLeave * call s:completion_timer_stop()
+  augroup END
+
+  for event in ['InsertEnter', 'BufWritePost', 'DirChanged']
+    call s:define_on_event(event)
+  endfor
+
+  call s:define_completion_via_timer('TextChangedI')
+  if g:deoplete#enable_on_insert_enter
+    call s:define_completion_via_timer('InsertEnter')
+  endif
+  if g:deoplete#enable_refresh_always
+    call s:define_completion_via_timer('InsertCharPre')
+  endif
+
+  " Note: Vim 8 GUI is broken
+  " dummy timer call is needed before complete()
+  if !has('nvim') && has('gui_running')
+    let s:dummy_timer = timer_start(200, {timer -> 0}, {'repeat': -1})
+  endif
+
+  if deoplete#util#has_yarp()
+    " To fix "RuntimeError: Event loop is closed" issue
+    " Note: Workaround
+    autocmd deoplete VimLeavePre * call s:kill_yarp()
+  endif
+endfunction
+
+function! deoplete#handler#_do_complete() abort
+  let context = g:deoplete#_context
+  let event = get(context, 'event', '')
+  let modes = (event ==# 'InsertEnter') ? ['n', 'i'] : ['i']
+  if s:is_exiting() || index(modes, mode()) < 0
+    call s:completion_timer_stop()
+    return
+  endif
+
+  if empty(get(context, 'candidates', []))
+        \ || deoplete#util#get_input(context.event) !=# context.input
+    return
+  endif
+
+  let prev = g:deoplete#_prev_completion
+  let prev.event = context.event
+  let prev.candidates = context.candidates
+  let prev.complete_position = getpos('.')
+
+  if context.event ==# 'Manual'
+    let context.event = ''
+  elseif !exists('g:deoplete#_saved_completeopt')
+    call deoplete#mapping#_set_completeopt()
+  endif
+
+  if g:deoplete#complete_method ==# 'complete'
+    call feedkeys("\<Plug>_", 'i')
+  elseif g:deoplete#complete_method ==# 'completefunc'
+    let &l:completefunc = 'deoplete#mapping#_completefunc'
+    call feedkeys("\<C-x>\<C-u>", 'in')
+  elseif g:deoplete#complete_method ==# 'omnifunc'
+    let &l:omnifunc = 'deoplete#mapping#_completefunc'
+    call feedkeys("\<C-x>\<C-o>", 'in')
+  endif
+endfunction
+
+function! s:completion_timer_start(event) abort
+  if exists('s:completion_timer')
+    call s:completion_timer_stop()
+  endif
+
+  let delay = max([20, g:deoplete#auto_complete_delay])
+  let s:completion_timer = timer_start(
+        \ delay, {-> s:completion_begin(a:event)})
+endfunction
+function! s:completion_timer_stop() abort
+  if !exists('s:completion_timer')
+    return
+  endif
+
+  call timer_stop(s:completion_timer)
+  unlet s:completion_timer
+endfunction
+
+function! deoplete#handler#_async_timer_start() abort
+  if exists('s:async_timer')
+    call deoplete#handler#_async_timer_stop()
+  endif
+
+  let s:async_timer = { 'event': 'Async', 'changedtick': b:changedtick }
+  let s:async_timer.id = timer_start(
+        \ max([20, g:deoplete#auto_refresh_delay]),
+        \ function('s:completion_async'), {'repeat': -1})
+endfunction
+function! deoplete#handler#_async_timer_stop() abort
+  if exists('s:async_timer')
+    call timer_stop(s:async_timer.id)
+    unlet s:async_timer
+  endif
+endfunction
+function! s:completion_async(timer) abort
+  if mode() !=# 'i' || s:is_exiting()
+    call deoplete#handler#_async_timer_stop()
+    return
+  endif
+
+  call s:completion_begin(s:async_timer.event)
+endfunction
+
+function! s:completion_begin(event) abort
+  if s:is_skip(a:event)
+    call deoplete#mapping#_restore_completeopt()
+    let g:deoplete#_context.candidates = []
+    return
+  endif
+
+  let context = deoplete#init#_context(a:event, [])
+  if s:check_omnifunc(context)
+    return
+  endif
+
+  call deoplete#util#rpcnotify(
+        \ 'deoplete_auto_completion_begin', context)
+endfunction
+function! s:is_skip(event) abort
+  if s:is_skip_text(a:event)
+    return 1
+  endif
+
+  let disable_auto_complete =
+        \ deoplete#util#get_simple_buffer_config(
+        \   'b:deoplete_disable_auto_complete',
+        \   'g:deoplete#disable_auto_complete')
+
+  if &paste
+        \ || (a:event !=# 'Manual' && a:event !=# 'Async'
+        \     && disable_auto_complete)
+        \ || (&l:completefunc !=# '' && &l:buftype =~# 'nofile')
+        \ || (a:event !=# 'InsertEnter' && mode() !=# 'i')
+    return 1
+  endif
+
+  return 0
+endfunction
+function! s:is_skip_text(event) abort
+  let context = g:deoplete#_context
+  let input = deoplete#util#get_input(a:event)
+
+  if has_key(context, 'input')
+        \ && a:event !=# 'Manual'
+        \ && a:event !=# 'Async'
+        \ && input ==# context.input
+    return 1
+  endif
+
+  let displaywidth = strdisplaywidth(input) + 1
+  if &l:formatoptions =~# '[tca]' && &l:textwidth > 0
+        \     && displaywidth >= &l:textwidth
+    if &l:formatoptions =~# '[ta]'
+          \ || !empty(filter(deoplete#util#get_syn_names(),
+          \                  "v:val ==# 'Comment'"))
+      return 1
+    endif
+  endif
+
+  let skip_chars = deoplete#util#get_simple_buffer_config(
+        \   'b:deoplete_skip_chars', 'g:deoplete#skip_chars')
+
+  return (!pumvisible() && virtcol('.') != displaywidth)
+        \ || (a:event !=# 'Manual' && input !=# ''
+        \     && index(skip_chars, input[-1:]) >= 0)
+endfunction
+function! s:check_omnifunc(context) abort
+  let prev = g:deoplete#_prev_completion
+  let blacklist = ['LanguageClient#complete']
+  if prev.event ==# 'Manual'
+        \ || &l:omnifunc ==# ''
+        \ || index(blacklist, &l:omnifunc) >= 0
+        \ || prev.complete_position ==# getpos('.')
+    return
+  endif
+
+  for filetype in a:context.filetypes
+    for pattern in deoplete#util#convert2list(
+          \ deoplete#util#get_buffer_config(filetype,
+          \ 'b:deoplete_omni_patterns',
+          \ 'g:deoplete#omni_patterns',
+          \ 'g:deoplete#_omni_patterns'))
+      if pattern !=# '' && a:context.input =~# '\%('.pattern.'\)$'
+        let g:deoplete#_context.candidates = []
+
+        let prev.event = a:context.event
+        let prev.candidates = []
+        let prev.complete_position = getpos('.')
+
+        call deoplete#mapping#_set_completeopt()
+        call feedkeys("\<C-x>\<C-o>", 'in')
+        return 1
+      endif
+    endfor
+  endfor
+endfunction
+
+function! s:define_on_event(event) abort
+  if !exists('##' . a:event)
+    return
+  endif
+
+  execute 'autocmd deoplete' a:event
+        \ '* call deoplete#send_event('.string(a:event).')'
+endfunction
+function! s:define_completion_via_timer(event) abort
+  if !exists('##' . a:event)
+    return
+  endif
+
+  execute 'autocmd deoplete' a:event
+        \ '* call s:completion_timer_start('.string(a:event).')'
+endfunction
+
+function! s:on_insert_leave() abort
+  call deoplete#mapping#_restore_completeopt()
+  let g:deoplete#_context = {}
+  let g:deoplete#_prev_completion = {
+        \ 'complete_position': [],
+        \ 'candidates': [],
+        \ 'event': '',
+        \ }
+endfunction
+
+function! s:on_complete_done() abort
+  if get(v:completed_item, 'word', '') ==# ''
+    return
+  endif
+
+  let word = v:completed_item.word
+  if !has_key(g:deoplete#_rank, word)
+    let g:deoplete#_rank[word] = 1
+  else
+    let g:deoplete#_rank[word] += 1
+  endif
+endfunction
+
+function! deoplete#handler#_skip_next_completion() abort
+  if !exists('g:deoplete#_context')
+    return
+  endif
+
+  let input = deoplete#util#get_input('CompleteDone')
+  if input[-1:] !=# '/'
+    let g:deoplete#_context.input = input
+  endif
+endfunction
+
+function! s:is_exiting() abort
+  return exists('v:exiting') && v:exiting != v:null
+endfunction
+
+function! s:kill_yarp() abort
+  if g:deoplete#_yarp.job_is_dead
+    return
+  endif
+
+  let job = g:deoplete#_yarp.job
+  if !has('nvim') && !exists('g:yarp_jobstart')
+    " Get job object from vim-hug-neovim-rpc
+    let job = g:_neovim_rpc_jobs[job].job
+  endif
+
+  if has('nvim')
+    call jobstop(job)
+  else
+    call job_stop(job, 'kill')
+  endif
+
+  let g:deoplete#_yarp.job_is_dead = 1
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/init.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/init.vim
new file mode 100644
index 0000000..f9ca934
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/init.vim
@@ -0,0 +1,279 @@
+"=============================================================================
+" FILE: init.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+if !exists('s:is_enabled')
+  let s:is_enabled = 0
+endif
+
+let s:is_windows = ((has('win32') || has('win64')) ? v:true : v:false)
+
+function! deoplete#init#_is_enabled() abort
+  return s:is_enabled
+endfunction
+
+function! deoplete#init#_initialize() abort
+  if has('vim_starting')
+    augroup deoplete
+      autocmd!
+      autocmd VimEnter * call deoplete#enable()
+    augroup END
+    return 1
+  endif
+
+  if !deoplete#init#_check_channel()
+    return 1
+  endif
+
+  augroup deoplete
+    autocmd!
+  augroup END
+
+  call deoplete#init#_variables()
+
+  if deoplete#init#_channel()
+    return 1
+  endif
+
+  call deoplete#mapping#_init()
+endfunction
+function! deoplete#init#_channel() abort
+  let python3 = get(g:, 'python3_host_prog', 'python3')
+  if !executable(python3)
+    call deoplete#util#print_error(
+          \ string(python3) . ' is not executable.')
+    call deoplete#util#print_error(
+          \ 'You need to set g:python3_host_prog.')
+  endif
+
+  try
+    if deoplete#util#has_yarp()
+      let g:deoplete#_yarp = yarp#py3('deoplete')
+      call g:deoplete#_yarp.notify('deoplete_init')
+    else
+      " rplugin.vim may not be loaded on VimEnter
+      if !exists('g:loaded_remote_plugins')
+        runtime! plugin/rplugin.vim
+      endif
+
+      call _deoplete_init()
+    endif
+  catch
+    call deoplete#util#print_error(v:exception)
+    call deoplete#util#print_error(v:throwpoint)
+
+    if !has('python3')
+      call deoplete#util#print_error(
+            \ 'deoplete requires Python3 support("+python3").')
+    endif
+
+    if deoplete#util#has_yarp()
+      if !has('nvim') && !exists('*neovim_rpc#serveraddr')
+        call deoplete#util#print_error(
+              \ 'deoplete requires vim-hug-neovim-rpc plugin in Vim.')
+      endif
+
+      if !exists('*yarp#py3')
+        call deoplete#util#print_error(
+              \ 'deoplete requires nvim-yarp plugin.')
+      endif
+    else
+      call deoplete#util#print_error(
+          \ 'deoplete failed to load. '
+          \ .'Try the :UpdateRemotePlugins command and restart Neovim. '
+          \ .'See also :checkhealth.')
+    endif
+
+    return 1
+  endtry
+endfunction
+function! deoplete#init#_check_channel() abort
+  return !exists('g:deoplete#_initialized')
+endfunction
+function! deoplete#init#_enable() abort
+  call deoplete#handler#_init()
+  let s:is_enabled = 1
+endfunction
+function! deoplete#init#_disable() abort
+  augroup deoplete
+    autocmd!
+  augroup END
+  let s:is_enabled = 0
+endfunction
+
+function! deoplete#init#_variables() abort
+  let g:deoplete#_prev_completion = {
+        \ 'complete_position': [],
+        \ 'candidates': [],
+        \ 'event': '',
+        \ }
+  let g:deoplete#_context = {}
+  let g:deoplete#_rank = {}
+  if !exists('g:deoplete#_logging')
+    let g:deoplete#_logging = {}
+  endif
+  unlet! g:deoplete#_initialized
+  let g:deoplete#_serveraddr = has('nvim') ?
+        \ v:servername : neovim_rpc#serveraddr()
+  if g:deoplete#_serveraddr ==# ''
+    " Use NVIM_LISTEN_ADDRESS
+    let g:deoplete#_serveraddr = $NVIM_LISTEN_ADDRESS
+  endif
+
+  " User variables
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_at_startup', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_yarp', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#auto_complete_start_length', 2)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_ignore_case', &ignorecase)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_smart_case', &smartcase)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_camel_case', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_refresh_always', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_on_insert_enter', 1)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#disable_auto_complete', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#delimiters', ['/'])
+  call deoplete#util#set_default(
+        \ 'g:deoplete#max_list', 100)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#enable_profile', 0)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#auto_complete_delay', 50)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#auto_refresh_delay', 50)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#max_abbr_width', 80)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#max_menu_width', 40)
+  call deoplete#util#set_default(
+        \ 'g:deoplete#skip_chars', [])
+  call deoplete#util#set_default(
+        \ 'g:deoplete#complete_method', 'complete')
+  call deoplete#util#set_default(
+        \ 'g:deoplete#num_processes', s:is_windows ? 1 : 4)
+
+  call deoplete#util#set_default(
+        \ 'g:deoplete#keyword_patterns', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#_keyword_patterns', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#omni_patterns', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#_omni_patterns', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#sources', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#ignore_sources', {})
+
+  " Source variables
+  call deoplete#util#set_default(
+        \ 'g:deoplete#omni#input_patterns', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#omni#functions', {})
+  call deoplete#util#set_default(
+        \ 'g:deoplete#member#prefix_patterns', {})
+
+  " Initialize default keyword pattern.
+  call deoplete#util#set_pattern(
+        \ g:deoplete#_keyword_patterns,
+        \ '_',
+        \ '[a-zA-Z_]\k*')
+
+
+  " Initialize omni completion pattern.
+  " Note: HTML omni func use search().
+  call deoplete#util#set_pattern(
+        \ g:deoplete#_omni_patterns,
+        \ 'html,xhtml,xml', ['<', '</', '<[^>]*\s[[:alnum:]-]*'])
+endfunction
+
+function! deoplete#init#_context(event, sources) abort
+  let input = deoplete#util#get_input(a:event)
+
+  let [filetype, filetypes, same_filetypes] =
+        \ deoplete#util#get_context_filetype(input, a:event)
+
+  let sources = deoplete#util#convert2list(a:sources)
+  if a:event !=# 'Manual' && empty(sources)
+    " Use default sources
+    let sources = deoplete#util#get_buffer_config(
+          \ filetype,
+          \ 'b:deoplete_sources',
+          \ 'g:deoplete#sources',
+          \ '{}', [])
+  endif
+
+  let keyword_patterns = join(deoplete#util#convert2list(
+        \   deoplete#util#get_buffer_config(
+        \   filetype, 'b:deoplete_keyword_patterns',
+        \   'g:deoplete#keyword_patterns',
+        \   'g:deoplete#_keyword_patterns')), '|')
+
+  " Convert keyword pattern.
+  let pattern = deoplete#util#vimoption2python(
+        \ &l:iskeyword . (&l:lisp ? ',-' : ''))
+  let keyword_patterns = substitute(keyword_patterns,
+        \ '\\k', '\=pattern', 'g')
+
+  let event = (deoplete#util#get_prev_event() ==# 'Refresh') ?
+        \ 'Manual' : a:event
+
+  let width = winwidth(0) - col('.') + len(matchstr(input, '\w*$'))
+  let max_width = (width * 2 / 3)
+
+  if a:event ==# 'BufNew'
+    let bufnr = expand('<abuf>')
+  else
+    let bufnr = bufnr('%')
+  endif
+  let bufname = bufname(bufnr)
+  let bufpath = fnamemodify(bufname, ':p')
+  if !filereadable(bufpath) || getbufvar(bufnr, '&buftype') =~# 'nofile'
+    let bufpath = ''
+  endif
+
+  return {
+        \ 'changedtick': b:changedtick,
+        \ 'event': event,
+        \ 'input': input,
+        \ 'is_windows': s:is_windows,
+        \ 'next_input': deoplete#util#get_next_input(a:event),
+        \ 'complete_str': '',
+        \ 'encoding': &encoding,
+        \ 'position': getpos('.'),
+        \ 'filetype': filetype,
+        \ 'filetypes': filetypes,
+        \ 'same_filetypes': same_filetypes,
+        \ 'ignorecase': g:deoplete#enable_ignore_case,
+        \ 'smartcase': g:deoplete#enable_smart_case,
+        \ 'camelcase': g:deoplete#enable_camel_case,
+        \ 'delay': g:deoplete#auto_complete_delay,
+        \ 'sources': sources,
+        \ 'keyword_patterns': keyword_patterns,
+        \ 'max_abbr_width': max_width,
+        \ 'max_kind_width': max_width,
+        \ 'max_menu_width': max_width,
+        \ 'runtimepath': &runtimepath,
+        \ 'bufnr': bufnr,
+        \ 'bufname': bufname,
+        \ 'bufpath': bufpath,
+        \ 'cwd': getcwd(),
+        \ 'vars': filter(copy(g:),
+        \       "stridx(v:key, 'deoplete#') == 0
+        \        && v:key !=# 'deoplete#_yarp'"),
+        \ 'bufvars': filter(copy(b:), "stridx(v:key, 'deoplete_') == 0"),
+        \ 'custom': deoplete#custom#get(),
+        \ 'omni__omnifunc': &l:omnifunc,
+        \ 'dict__dictionary': &l:dictionary,
+        \ }
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/mapping.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/mapping.vim
new file mode 100644
index 0000000..d55d4c6
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/mapping.vim
@@ -0,0 +1,94 @@
+"=============================================================================
+" FILE: mapping.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! deoplete#mapping#_init() abort
+  inoremap <silent> <Plug>_
+        \ <C-r>=deoplete#mapping#_complete()<CR>
+endfunction
+
+function! deoplete#mapping#_completefunc(findstart, base) abort
+  if a:findstart
+    return g:deoplete#_context.complete_position
+  else
+    return g:deoplete#_context.candidates
+  endif
+endfunction
+function! deoplete#mapping#_complete() abort
+  call complete(g:deoplete#_context.complete_position + 1,
+        \ g:deoplete#_context.candidates)
+
+  return ''
+endfunction
+function! deoplete#mapping#_set_completeopt() abort
+  if exists('g:deoplete#_saved_completeopt')
+    return
+  endif
+  let g:deoplete#_saved_completeopt = &completeopt
+  set completeopt-=longest
+  set completeopt+=menuone
+  set completeopt-=menu
+  if &completeopt !~# 'noinsert\|noselect'
+    set completeopt+=noselect
+  endif
+endfunction
+function! deoplete#mapping#_restore_completeopt() abort
+  if exists('g:deoplete#_saved_completeopt')
+    let &completeopt = g:deoplete#_saved_completeopt
+    unlet g:deoplete#_saved_completeopt
+  endif
+endfunction
+function! deoplete#mapping#_rpcrequest_wrapper(sources) abort
+  return deoplete#util#rpcnotify(
+        \ 'deoplete_manual_completion_begin',
+        \ deoplete#init#_context('Manual', a:sources))
+endfunction
+function! deoplete#mapping#_undo_completion() abort
+  if !exists('v:completed_item') || empty(v:completed_item)
+    return ''
+  endif
+
+  let input = deoplete#util#get_input('')
+  if strridx(input, v:completed_item.word) !=
+        \ len(input) - len(v:completed_item.word)
+    return ''
+  endif
+
+  return deoplete#smart_close_popup() .
+        \  repeat("\<C-h>", strchars(v:completed_item.word))
+endfunction
+function! deoplete#mapping#_complete_common_string() abort
+  if !deoplete#is_enabled()
+    return ''
+  endif
+
+  " Get cursor word.
+  let complete_str = matchstr(deoplete#util#get_input(''), '\w*$')
+
+  if complete_str ==# '' || !has_key(g:deoplete#_context, 'candidates')
+    return ''
+  endif
+
+  let candidates = filter(copy(g:deoplete#_context.candidates),
+        \ 'stridx(tolower(v:val.word), tolower(complete_str)) == 0')
+
+  if empty(candidates)
+    return ''
+  endif
+
+  let common_str = candidates[0].word
+  for candidate in candidates[1:]
+    while stridx(tolower(candidate.word), tolower(common_str)) != 0
+      let common_str = common_str[: -2]
+    endwhile
+  endfor
+
+  if common_str ==# '' || complete_str ==? common_str
+    return ''
+  endif
+
+  return (pumvisible() ? "\<C-e>" : '')
+        \ . repeat("\<BS>", strchars(complete_str)) . common_str
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/mappings.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/mappings.vim
new file mode 100644
index 0000000..8f6d384
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/mappings.vim
@@ -0,0 +1,28 @@
+"=============================================================================
+" FILE: mappings.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+" For compatibility.
+
+function! deoplete#mappings#manual_complete(...) abort
+  return call('deoplete#manual_complete', a:000)
+endfunction
+
+function! deoplete#mappings#close_popup() abort
+  return deoplete#close_popup()
+endfunction
+function! deoplete#mappings#smart_close_popup() abort
+  return deoplete#smart_close_popup()
+endfunction
+function! deoplete#mappings#cancel_popup() abort
+  return deoplete#cancel_popup()
+endfunction
+function! deoplete#mappings#refresh() abort
+  return deoplete#refresh()
+endfunction
+
+function! deoplete#mappings#undo_completion() abort
+  return deoplete#undo_completion()
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/deoplete/util.vim b/vim/plugins/deoplete.nvim/autoload/deoplete/util.vim
new file mode 100644
index 0000000..07616e3
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/deoplete/util.vim
@@ -0,0 +1,261 @@
+"=============================================================================
+" FILE: util.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! deoplete#util#set_default(var, val, ...)  abort
+  if !exists(a:var) || type({a:var}) != type(a:val)
+    let alternate_var = get(a:000, 0, '')
+
+    let {a:var} = exists(alternate_var) ?
+          \ {alternate_var} : a:val
+  endif
+endfunction
+function! deoplete#util#set_pattern(variable, keys, pattern) abort
+  for key in split(a:keys, '\s*,\s*')
+    if !has_key(a:variable, key)
+      let a:variable[key] = a:pattern
+    endif
+  endfor
+endfunction
+function! deoplete#util#get_buffer_config(
+      \ filetype, buffer_var, user_var, default_var, ...) abort
+  let default_val = get(a:000, 0, '')
+
+  if exists(a:buffer_var)
+    return {a:buffer_var}
+  endif
+
+  let filetype = !has_key({a:user_var}, a:filetype)
+        \ && !has_key(eval(a:default_var), a:filetype) ? '_' : a:filetype
+
+  return get({a:user_var}, filetype,
+        \   get(eval(a:default_var), filetype, default_val))
+endfunction
+function! deoplete#util#get_simple_buffer_config(buffer_var, user_var) abort
+  return exists(a:buffer_var) ? {a:buffer_var} : {a:user_var}
+endfunction
+function! deoplete#util#print_error(string, ...) abort
+  let name = a:0 ? a:1 : 'deoplete'
+  echohl Error | echomsg printf('[%s] %s', name,
+        \ deoplete#util#string(a:string)) | echohl None
+endfunction
+function! deoplete#util#print_warning(string) abort
+  echohl WarningMsg | echomsg '[deoplete] '
+        \ . deoplete#util#string(a:string) | echohl None
+endfunction
+function! deoplete#util#print_debug(string) abort
+  echomsg '[deoplete] ' . deoplete#util#string(a:string)
+endfunction
+
+function! deoplete#util#convert2list(expr) abort
+  return type(a:expr) ==# v:t_list ? a:expr : [a:expr]
+endfunction
+function! deoplete#util#string(expr) abort
+  return type(a:expr) ==# v:t_string ? a:expr : string(a:expr)
+endfunction
+
+function! deoplete#util#get_input(event) abort
+  let mode = mode()
+  if a:event ==# 'InsertEnter'
+    let mode = 'i'
+  endif
+  let input = (mode ==# 'i' ? (col('.')-1) : col('.')) >= len(getline('.')) ?
+        \      getline('.') :
+        \      matchstr(getline('.'),
+        \         '^.*\%' . (mode ==# 'i' ? col('.') : col('.') - 1)
+        \         . 'c' . (mode ==# 'i' ? '' : '.'))
+
+  if input =~# '^.\{-}\ze\S\+$'
+    let complete_str = matchstr(input, '\S\+$')
+    let input = matchstr(input, '^.\{-}\ze\S\+$')
+  else
+    let complete_str = ''
+  endif
+
+  if a:event ==# 'InsertCharPre'
+    let complete_str .= v:char
+  endif
+
+  return input . complete_str
+endfunction
+function! deoplete#util#get_next_input(event) abort
+  return getline('.')[len(deoplete#util#get_input(a:event)) :]
+endfunction
+function! deoplete#util#get_prev_event() abort
+  return get(g:deoplete#_context, 'event', '')
+endfunction
+
+function! deoplete#util#vimoption2python(option) abort
+  return '[a-zA-Z' . s:vimoption2python(a:option) . ']'
+endfunction
+function! deoplete#util#vimoption2python_not(option) abort
+  return '[^a-zA-Z' . s:vimoption2python(a:option) . ']'
+endfunction
+function! s:vimoption2python(option) abort
+  let has_dash = 0
+  let patterns = []
+  for pattern in split(a:option, ',')
+    if pattern ==# ''
+      " ,
+      call add(patterns, ',')
+    elseif pattern ==# '\'
+      call add(patterns, '\\')
+    elseif pattern ==# '-'
+      let has_dash = 1
+    elseif pattern =~# '\d\+'
+      call add(patterns, substitute(pattern, '\d\+',
+            \ '\=nr2char(submatch(0))', 'g'))
+    else
+      call add(patterns, pattern)
+    endif
+  endfor
+
+  " Dash must be last.
+  if has_dash
+    call add(patterns, '-')
+  endif
+
+  return join(deoplete#util#uniq(patterns), '')
+endfunction
+
+function! deoplete#util#uniq(list) abort
+  let list = map(copy(a:list), '[v:val, v:val]')
+  let i = 0
+  let seen = {}
+  while i < len(list)
+    let key = string(list[i][1])
+    if has_key(seen, key)
+      call remove(list, i)
+    else
+      let seen[key] = 1
+      let i += 1
+    endif
+  endwhile
+  return map(list, 'v:val[0]')
+endfunction
+
+function! deoplete#util#get_syn_names() abort
+  if col('$') >= 200
+    return []
+  endif
+
+  let names = []
+  try
+    " Note: synstack() seems broken in concealed text.
+    for id in synstack(line('.'), (mode() ==# 'i' ? col('.')-1 : col('.')))
+      let name = synIDattr(id, 'name')
+      call add(names, name)
+      if synIDattr(synIDtrans(id), 'name') !=# name
+        call add(names, synIDattr(synIDtrans(id), 'name'))
+      endif
+    endfor
+  catch
+    " Ignore error
+  endtry
+  return names
+endfunction
+
+function! deoplete#util#neovim_version() abort
+  redir => v
+  silent version
+  redir END
+  return split(v, '\n')[0]
+endfunction
+
+function! deoplete#util#has_yarp() abort
+  return !has('nvim') || get(g:, 'deoplete#enable_yarp', 0)
+endfunction
+
+function! deoplete#util#get_context_filetype(input, event) abort
+  if !exists('s:context_filetype')
+    let s:context_filetype = {}
+
+    " Force context_filetype call.
+    try
+      call context_filetype#get_filetype()
+    catch
+      " Ignore error
+    endtry
+  endif
+
+  if empty(s:context_filetype)
+        \ || s:context_filetype.prev_filetype !=# &filetype
+        \ || s:context_filetype.line != line('.')
+        \ || s:context_filetype.bufnr != bufnr('%')
+        \ || (a:input =~# '\W$' &&
+        \     substitute(a:input, '\s\zs\s\+$', '', '') !=#
+        \     substitute(s:context_filetype.input, '\s\zs\s\+$', '', ''))
+        \ || (a:input =~# '\w$' &&
+        \     substitute(a:input, '\w\+$', '', '') !=#
+        \     substitute(s:context_filetype.input, '\w\+$', '', ''))
+        \ || a:event ==# 'InsertEnter'
+
+    let s:context_filetype.line = line('.')
+    let s:context_filetype.bufnr = bufnr('%')
+    let s:context_filetype.input = a:input
+    let s:context_filetype.prev_filetype = &filetype
+    let s:context_filetype.filetype =
+          \ (exists('*context_filetype#get_filetype') ?
+          \   context_filetype#get_filetype() :
+          \   (&filetype ==# '' ? 'nothing' : &filetype))
+    let s:context_filetype.filetypes =
+          \ exists('*context_filetype#get_filetypes') ?
+          \   context_filetype#get_filetypes() :
+          \   &filetype ==# '' ? ['nothing'] :
+          \                     deoplete#util#uniq([&filetype]
+          \                          + split(&filetype, '\.'))
+    let s:context_filetype.same_filetypes =
+          \ exists('*context_filetype#get_same_filetypes') ?
+          \   context_filetype#get_same_filetypes() : []
+  endif
+  return [ s:context_filetype.filetype,
+        \  s:context_filetype.filetypes, s:context_filetype.same_filetypes]
+endfunction
+
+function! deoplete#util#rpcnotify(event, context) abort
+  if deoplete#init#_check_channel()
+    return ''
+  endif
+  call s:notify(a:event, a:context)
+  return ''
+endfunction
+
+function! s:notify(event, context) abort
+  let a:context['rpc'] = a:event
+
+  if deoplete#util#has_yarp()
+    if g:deoplete#_yarp.job_is_dead
+      return
+    endif
+    call g:deoplete#_yarp.notify(a:event, a:context)
+  else
+    call rpcnotify(g:deoplete#_channel_id, a:event, a:context)
+  endif
+endfunction
+
+" Compare versions.  Return values is the distance between versions.  Each
+" version integer (from right to left) is an ascending power of 100.
+"
+" Example:
+" '0.1.10' is (1 * 100) + 10, or 110.
+" '1.2.3' is (1 * 10000) + (2 * 100) + 3, or 10203.
+"
+" Returns:
+" <0 if a < b
+" >0 if a > b
+" 0 if versions are equal.
+function! deoplete#util#versioncmp(a, b) abort
+  let a = map(split(a:a, '\.'), 'str2nr(v:val)')
+  let b = map(split(a:b, '\.'), 'str2nr(v:val)')
+  let l = min([len(a), len(b)])
+  let d = 0
+
+  " Only compare the parts that are common to both versions.
+  for i in range(l)
+    let d += (a[i] - b[i]) * pow(100, l - i - 1)
+  endfor
+
+  return d
+endfunction
diff --git a/vim/plugins/deoplete.nvim/autoload/health/deoplete.vim b/vim/plugins/deoplete.nvim/autoload/health/deoplete.vim
new file mode 100644
index 0000000..a6e356d
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/autoload/health/deoplete.vim
@@ -0,0 +1,70 @@
+"=============================================================================
+" FILE: deoplete.vim
+" AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+"         TJ DeVries <devries.timothyj at gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! s:check_neovim() abort
+  if has('nvim')
+    call health#report_ok('has("nvim") was successful')
+  else
+    call health#report_error('has("nvim") was not successful',
+          \ 'Deoplete only works for neovim!')
+  endif
+endfunction
+
+function! s:check_t_list() abort
+  if exists('v:t_list')
+    call health#report_ok('exists("v:t_list") was successful')
+  else
+    call health#report_error('exists("v:t_list") was not successful',
+          \ 'Deoplete requires neovim 0.2.0+!')
+  endif
+endfunction
+
+function! s:check_timers() abort
+  if has('timers')
+    call health#report_ok('has("timers") was successful')
+  else
+    call health#report_error('has("timers") was not successful',
+          \ 'Deoplete requires timers support("+timers").')
+  endif
+endfunction
+
+function! s:check_required_python_for_deoplete() abort
+  if has('python3')
+    call health#report_ok('has("python3") was successful')
+  else
+    call health#report_error('has("python3") was not successful', [
+          \ 'Please install the python3 package for neovim.',
+          \ 'A good guide can be found here: ' .
+          \ 'https://github.com/tweekmonster/nvim-python-doctor/'
+          \ . 'wiki/Advanced:-Using-pyenv'
+          \ ]
+          \ )
+  endif
+endfunction
+
+function! s:still_have_issues() abort
+  let indentation = '        '
+  call health#report_info("If you're still having problems, " .
+        \ "try the following commands:\n" .
+        \ indentation . "$ export NVIM_PYTHON_LOG_FILE=/tmp/log\n" .
+        \ indentation . "$ export NVIM_PYTHON_LOG_LEVEL=DEBUG\n" .
+        \ indentation . "$ nvim\n" .
+        \ indentation . "$ cat /tmp/log_{PID}\n" .
+        \ indentation . ' and then create an issue on github'
+        \ )
+endfunction
+
+function! health#deoplete#check() abort
+  call health#report_start('deoplete.nvim')
+
+  call s:check_neovim()
+  call s:check_t_list()
+  call s:check_timers()
+  call s:check_required_python_for_deoplete()
+
+  call s:still_have_issues()
+endfunction
diff --git a/vim/plugins/deoplete.nvim/doc/deoplete.txt b/vim/plugins/deoplete.nvim/doc/deoplete.txt
new file mode 100644
index 0000000..2b8bfdc
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/doc/deoplete.txt
@@ -0,0 +1,1654 @@
+*deoplete.txt*	Dark powered asynchronous completion framework for neovim/Vim8.
+
+Version: 4.0
+Author: Shougo <Shougo.Matsu at gmail.com>
+License: MIT license
+
+CONTENTS						*deoplete-contents*
+
+Introduction		|deoplete-introduction|
+Install			|deoplete-install|
+Interface		|deoplete-interface|
+  Variables		  |deoplete-variables|
+  Key mappings		  |deoplete-key-mappings|
+  Functions		  |deoplete-functions|
+Examples		|deoplete-examples|
+Sources			|deoplete-sources|
+Create source		|deoplete-create-source|
+  Source attributes       |deoplete-source-attributes|
+  Candidate attributes    |deoplete-candidate-attributes|
+Create filter		|deoplete-create-filter|
+FILTERS			|deoplete-filters|
+External sources	|deoplete-external-sources|
+External plugins	|deoplete-external-plugins|
+FAQ			|deoplete-faq|
+Compatibility		|deoplete-compatibility|
+
+==============================================================================
+INTRODUCTION					*deoplete-introduction*
+
+*deoplete* is the abbreviation of "dark powered neo-completion".  It
+provides asynchronous keyword completion system in the
+current buffer.
+
+Note: deoplete may consume more memory than other plugins do.
+
+Improvements in deoplete in comparison to |neocomplete|:
+
+1. Real asynchronous completion behavior like |YouCompleteMe| by default.
+2. Uses Python3 to implement sources.
+3. Removes legacy interface.
+4. Requires |+python3|.
+
+==============================================================================
+INSTALL							*deoplete-install*
+
+Note: deoplete requires Neovim(0.2.0+) or Vim8(latest is recommended) with
+Python3 and |+timers| enabled.
+
+Please install nvim-yarp plugin for Vim8.
+https://github.com/roxma/nvim-yarp
+
+Please install vim-hug-neovim-rpc plugin for Vim8.
+https://github.com/roxma/vim-hug-neovim-rpc
+
+1. Extract the files and put them in your Neovim or .vim directory
+   (usually `$XDG_CONFIG_HOME/nvim/`).
+2. Call |deoplete#enable()| or set "let g:deoplete#enable_at_startup = 1" in
+   your `init.vim`
+3. Execute the ":UpdateRemotePlugins" if Neovim.
+
+If ":echo has('python3')" returns `1`, then you're done; otherwise, see below.
+
+You can enable Python3 interface with pip: >
+
+    pip3 install neovim
+
+Note: deoplete needs neovim-python ver.0.2.4+.
+You need update neovim-python module.
+>
+    pip3 install --upgrade neovim
+<
+If you want to read for Neovim-python/python3 interface install documentation,
+you should read |provider-python| and the Wiki.
+https://github.com/zchee/deoplete-jedi/wiki/Setting-up-Python-for-Neovim
+
+You can check the Python3 installation by using the |:checkhealth| command.
+
+==============================================================================
+INTERFACE						*deoplete-interface*
+
+------------------------------------------------------------------------------
+VARIABLES	 					*deoplete-variables*
+
+						*g:deoplete#enable_at_startup*
+g:deoplete#enable_at_startup
+		Deoplete gets started automatically when Neovim starts if
+		this value is 1.
+
+		With the default value 0, you cannot use deoplete
+		unless you start it manually.
+
+						*g:deoplete#enable_yarp*
+g:deoplete#enable_yarp
+		Use nvim-yarp library instead of neovim remote plugin feature.
+		Note: nvim-yarp plugin is needed.
+		https://github.com/roxma/nvim-yarp
+
+		Default value: 0
+
+						*g:deoplete#complete_method*
+g:deoplete#complete_method
+		If it is "complete", deoplete use |complete()|.
+
+		If it is "completefunc", deoplete use |i_CTRL-X_CTRL-U|.
+		Note: It changes current 'completefunc' value.
+
+		If it is "omnifunc", deoplete use |i_CTRL-X_CTRL-O|.
+		Note: It changes current 'omnifunc' value.
+
+		Default value: "complete"
+
+					*g:deoplete#enable_ignore_case*
+g:deoplete#enable_ignore_case
+		When deoplete looks for candidate completion, this
+		variable controls whether deoplete ignores the upper-
+		and lowercase.  If it is 1, deoplete ignores case.
+
+		Default value: same with your 'ignorecase' value
+
+						*g:deoplete#enable_smart_case*
+g:deoplete#enable_smart_case
+		When a capital letter is included in input, deoplete does
+		not ignore the upper- and lowercase.
+
+		Default value: same with your 'smartcase' value
+
+						*g:deoplete#enable_camel_case*
+g:deoplete#enable_camel_case
+		When a capital letter is matched with the uppercase, but a
+		lower letter is matched with the upper- and lowercase.
+		Ex: "foB" is matched with "FooBar" not "foobar".
+		Note: This feature is only available in
+		|deoplete-filter-matcher_fuzzy| or
+		|deoplete-filter-matcher_full_fuzzy|.
+
+		Default value: 0
+
+					*g:deoplete#enable_refresh_always*
+g:deoplete#enable_refresh_always
+		Deoplete refreshes the candidates automatically if this value
+		is 1.
+		Note: It increases the screen flicker.
+
+		Default value: 0
+
+					*g:deoplete#enable_on_insert_enter*
+g:deoplete#enable_on_insert_enter
+		Deoplete enables the auto completion on |InsertEnter| autocmd
+		if this value is 1.
+
+		Default value: 1
+
+				*g:deoplete#auto_complete_start_length*
+g:deoplete#auto_complete_start_length
+		This variable controls the number of the input completion
+		at the time of key input automatically.
+		Note: It is the deprecated option.  You should change
+		|deoplete-source-attribute-min_pattern_length|.
+
+		Default: 2
+
+					*g:deoplete#disable_auto_complete*
+g:deoplete#disable_auto_complete
+		It controls whether you invalidate automatic completion.  If
+		it is 1, automatic completion becomes invalid, but can use the
+		manual completion by |deoplete#manual_complete()|.
+
+		Default value: 0
+
+					*b:deoplete_disable_auto_complete*
+b:deoplete_disable_auto_complete
+		Buffer local variable of |g:deoplete#disable_auto_complete|.
+
+						*g:deoplete#enable_profile*
+g:deoplete#enable_profile
+		It enables deoplete profile mode.
+		If it is 1, deoplete will print the time information to
+		|deoplete#enable_logging()| logfile.
+		Must be set in init.vim before to start the Neovim.
+		Does not support command line.
+
+		Default value: 0
+
+						*g:deoplete#delimiters*
+g:deoplete#delimiters
+		Delimiters list.  It is used in
+		|deoplete-filter-converter_auto_delimiter|.
+
+		Default value: ['/']
+
+							*g:deoplete#max_list*
+g:deoplete#max_list
+		If the list of candidates exceeds the limit, not all
+		candidates will show up.
+
+		Default value: 100
+
+						*g:deoplete#num_processes*
+g:deoplete#num_processes
+		The number of processes used for the deoplete parallel
+		feature.  If it is less than equal 1, this feature is
+		disabled.
+
+		Default value: 1 (Windows) or 4 (Others)
+
+						*g:deoplete#max_abbr_width*
+g:deoplete#max_abbr_width
+		If the candidate abbr length exceeds the length it will be cut
+		down.  If it is less than equal 0, this feature will be
+		disabled.
+
+		Default value: 80
+
+						*g:deoplete#max_menu_width*
+g:deoplete#max_menu_width
+		If the candidate menu length exceeds the length it will be cut
+		down.  If it is less than equal 0, this feature will be
+		disabled.
+
+		Default value: 40
+
+					*g:deoplete#auto_complete_delay*
+g:deoplete#auto_complete_delay
+		Delay the completion after input in milliseconds.
+		Requires |+timers| (Neovim 0.1.5)
+
+		Default value: 50
+
+					*g:deoplete#auto_refresh_delay*
+g:deoplete#auto_refresh_delay
+		Delay the refresh when asynchronous.
+
+		Default value: 50
+
+					*g:deoplete#skip_chars*
+g:deoplete#skip_chars
+		The list of skip characters in the auto completion.
+
+		Default value: []
+
+					*b:deoplete_skip_chars*
+b:deoplete_skip_chars
+		Buffer local variable of |g:deoplete#skip_chars|.
+
+						*g:deoplete#keyword_patterns*
+g:deoplete#keyword_patterns
+		This dictionary records keyword patterns to buffer completion.
+		This is appointed in regular expression string or list every
+		file type.
+		Note: It is Python3 regexp.  But "\k" is converted to
+		'iskeyword' pattern.
+>
+		let g:deoplete#keyword_patterns = {}
+		let g:deoplete#keyword_patterns.tex = '\\?[a-zA-Z_]\w*'
+<
+		Default value: in g:deoplete#_keyword_patterns
+
+						*b:deoplete_keyword_patterns*
+b:deoplete_keyword_patterns
+		Buffer local variable of |g:deoplete#keyword_patterns|.
+
+						*g:deoplete#omni_patterns*
+g:deoplete#omni_patterns
+		This dictionary records keyword patterns to Omni completion.
+		This is appointed in regular expression string or list every
+		file type.
+		If this pattern is not defined or empty pattern, deoplete
+		does not call 'omnifunc'.
+		Note: If it is a set, deoplete will call 'omnifunc'
+		directly.  So almost deoplete features are disabled.
+		Note: It is Vim regexp.
+>
+		let g:deoplete#omni_patterns = {}
+		let g:deoplete#omni_patterns.java = '[^. *\t]\.\w*'
+<
+		Default value: in g:deoplete#_omni_patterns
+
+						*b:deoplete_omni_patterns*
+b:deoplete_omni_patterns
+		Buffer local variable of |g:deoplete#omni_patterns|.
+
+							*g:deoplete#sources*
+g:deoplete#sources
+		It is a dictionary to decide use source names.  The key is
+		filetype and the value is source names list.  If the key is
+		"_", the value will be used for default filetypes.  For
+		example, you can load some sources in C++ filetype.
+		If the value is [], it will load all sources.
+
+		Default value: {}
+>
+		" Examples:
+		let g:deoplete#sources = {}
+		let g:deoplete#sources._ = ['buffer']
+		let g:deoplete#sources.cpp = ['buffer', 'tag']
+
+<							*b:deoplete_sources*
+b:deoplete_sources
+		Buffer local variable of |g:deoplete#sources|.
+		It must be the source names list.
+>
+		" Examples:
+		" In cmdwin, only use buffer source.
+		autocmd CmdwinEnter * let b:deoplete_sources = ['buffer']
+
+<						*g:deoplete#ignore_sources*
+g:deoplete#ignore_sources
+		It is a dictionary to decide ignore source names.
+		The key is filetype and the value is source names list.
+		Default value: {}
+
+						*b:deoplete_ignore_sources*
+b:deoplete_ignore_sources
+		Buffer local variable of |g:deoplete#ignore_sources|.
+		It must be the source names list.
+
+					*g:deoplete#member#prefix_patterns*
+g:deoplete#member#prefix_patterns
+		This dictionary records prefix patterns to member completion.
+		This is appointed in regular expression string or list every
+		file type.
+		If this pattern is not defined or empty pattern, deoplete
+		does not complete member candidates.
+		Note: It is Python3 regexp.
+
+		Default value: defined in member.py
+
+					*b:deoplete_member_prefix_patterns*
+b:deoplete_member_prefix_patterns
+		Buffer local variable of |g:deoplete#member#prefix_patterns|.
+
+					*g:deoplete#omni#input_patterns*
+g:deoplete#omni#input_patterns
+		This dictionary records keyword patterns to Omni completion.
+		This is appointed in regular expression string or list every
+		file type.
+		If this pattern is not defined or empty pattern, deoplete
+		does not call 'omnifunc'.
+		Note: Some omnifuncs which moves the cursor is not worked.
+		For example, htmlcomplete, phpcomplete, etc...
+		Note: It is Python3 regexp.
+>
+		let g:deoplete#omni#input_patterns = {}
+		let g:deoplete#omni#input_patterns.ruby =
+		\ ['[^. *\t]\.\w*', '[a-zA-Z_]\w*::']
+		let g:deoplete#omni#input_patterns.java = '[^. *\t]\.\w*'
+		let g:deoplete#omni#input_patterns.php =
+		\ '\w+|[^. \t]->\w*|\w+::\w*'
+<
+		Default value: defined in omni.py.
+
+					*b:deoplete_omni_input_patterns*
+b:deoplete_omni_input_patterns
+		Buffer local variable of |g:deoplete#omni#input_patterns|.
+
+						*g:deoplete#omni#functions*
+g:deoplete#omni#functions
+		It defines a dictionary for omni completion with deoplete:
+		- `keys` consist of filetypes;
+		- `values` consist of either a string containing a single
+		  omnifunc or a list with omnifuncs to be used for each
+		  filetype.
+		In case there is no omnifunc setting for the current filetype
+		in the dictionary, deoplete will use the 'omnifunc' setting.
+>
+		let g:deoplete#omni#functions = {}
+		let g:deoplete#omni#functions.ruby = 'rubycomplete#Complete'
+		let g:deoplete#omni#functions.javascript = [
+		  \ 'tern#Complete',
+		  \ 'jspc#omni'
+		  \]
+<
+		Note: It supports context filetype feature instead of
+		'omnifunc'.  You can call the omnifunc in the embedded
+		language.
+		Note: For omnifunctions to work with deoplete, it's necessary
+		to setup the g:deoplete#omni#input_patterns setting.
+
+						*b:deoplete_omni_functions*
+b:deoplete_omni_functions
+		Buffer local variable of |g:deoplete#omni#functions|.
+
+					*g:deoplete#file#enable_buffer_path*
+g:deoplete#file#enable_buffer_path
+		If it is 1, file source complete the files from the buffer
+		path instead of the current directory.
+
+		Default value: 0
+
+					*g:deoplete#tag#cache_limit_size*
+g:deoplete#tag#cache_limit_size
+		It sets file size to make a cache of a file in
+		tag source.  If a tag file is bigger than this size,
+		deoplete does not make the tag file cache.
+
+		Default value: 500000
+
+				*g:deoplete#buffer#require_same_filetype*
+g:deoplete#buffer#require_same_filetype
+		If it is zero, deoplete collects keywords from buffers of any
+		filetype
+
+		Default value: 1
+
+------------------------------------------------------------------------------
+FUNCTIONS 						*deoplete-functions*
+
+						*deoplete#initialize()*
+deoplete#initialize()
+		Initialize deoplete and sources.
+		Note: You should call it in |VimEnter| autocmd.
+		User customization for deoplete must be set before
+		initialization of deoplete.
+
+							*deoplete#enable()*
+deoplete#enable()
+		Enable deoplete auto completion.
+		Note: It changes the global state.
+		Note: It does not work in lazy loading.  You should use
+		|g:deoplete#enable_at_startup| instead.
+
+							*deoplete#disable()*
+deoplete#disable()
+		Disable deoplete auto completion.
+		Note: It changes the global state.
+
+							*deoplete#toggle()*
+deoplete#toggle()
+		Toggle deoplete auto completion.
+		Note: It changes the global state.
+
+						*deoplete#custom#set()*
+deoplete#custom#set({source-name}, {option-name}, {value})
+		It is the deprecated option.
+		Please use |deoplete#custom#source()| instead.
+
+						*deoplete#custom#source()*
+deoplete#custom#source({source-name}, {option-name}, {value})
+		Set {source-name} source specialized {option-name}
+		to {value}. You may specify multiple sources with
+		separating "," in {source-name}.
+		If {source-name} is "_", sources default option will be
+		change.
+		Note: You must call it before using deoplete.
+>
+		" Examples:
+
+		" Use head matcher instead of fuzzy matcher
+		call deoplete#custom#source('_',
+		\ 'matchers', ['matcher_head'])
+
+		" Use auto delimiter feature
+		call deoplete#custom#source('_', 'converters',
+		\ ['converter_auto_delimiter', 'remove_overlap'])
+
+		call deoplete#custom#source('buffer',
+		\ 'min_pattern_length', 9999)
+
+		" Change the source rank
+		call deoplete#custom#source('buffer', 'rank', 9999)
+
+		" Enable buffer source in C/C++ files only.
+		call deoplete#custom#source('buffer',
+		\ 'filetypes', ['c', 'cpp'])
+
+		" Disable the candidates in Comment/String syntaxes.
+		call deoplete#custom#source('_',
+		\ 'disabled_syntaxes', ['Comment', 'String'])
+
+		" Change the truncate width.
+		call deoplete#custom#source('javacomplete2',
+		\ 'max_abbr_width', 20)
+		call deoplete#custom#source('javacomplete2',
+		\ 'max_menu_width', 80)
+
+		" Disable the truncate feature.
+		call deoplete#custom#source('javacomplete2',
+		\ 'max_abbr_width', 0)
+		call deoplete#custom#source('javacomplete2',
+		\ 'max_menu_width', 0)
+
+		" Change the source mark.
+		call deoplete#custom#source('buffer', 'mark', '*')
+		" Disable the source mark.
+		call deoplete#custom#source('omni', 'mark', '')
+
+		" Enable jedi source debug messages
+		" let g:deoplete#enable_profile = 1
+		" call deoplete#enable_logging('DEBUG', 'deoplete.log')
+		" call deoplete#custom#source('jedi', 'is_debug_enabled', 1)
+<
+						*deoplete#enable_logging()*
+deoplete#enable_logging({level}, {logfile})
+		Enable logging for debugging purposes.
+		Set {level} to "DEBUG", "INFO", "WARNING", "ERROR", or
+		"CRITICAL".
+		{logfile} is the file where log messages are written.
+		Messages are appended to this file.  Each log session will
+		start with "--- Deoplete Log Start ---".
+		Note: You must enable
+		|deoplete-source-attribute-is_debug_enabled| to debug the
+		sources.
+
+						*deoplete#send_event()*
+deoplete#send_event({event})
+		Call |deoplete-source-attribute-on_event| manually.
+		{event} is event name.
+
+------------------------------------------------------------------------------
+KEY MAPPINGS 					*deoplete-key-mappings*
+
+					*deoplete#manual_complete()*
+deoplete#manual_complete([{sources}])
+		It calls the completion of deoplete.  You can use it with
+		custom completion setups.
+		You can provide a list of {sources}: It can be the name of a
+		source or a list of sources name.
+		Note: It blocks your neovim.
+		Note: It must be in |map-<expr>|.
+
+		If you want to trigger deoplete manually, see also
+		|g:deoplete#disable_auto_complete|, which should be 1 then
+		typically.
+>
+		inoremap <silent><expr> <TAB>
+		\ pumvisible() ? "\<C-n>" :
+		\ <SID>check_back_space() ? "\<TAB>" :
+		\ deoplete#mappings#manual_complete()
+		function! s:check_back_space() abort "{{{
+		let col = col('.') - 1
+		return !col || getline('.')[col - 1]  =~ '\s'
+		endfunction"}}}
+<
+				*deoplete#smart_close_popup()*
+deoplete#smart_close_popup()
+		Insert candidate and re-generate popup menu for deoplete.
+		Note: It must be in |map-<expr>|.
+>
+		inoremap <expr><C-h>
+		\ deoplete#smart_close_popup()."\<C-h>"
+		inoremap <expr><BS>
+		\ deoplete#smart_close_popup()."\<C-h>"
+<
+		Note: This mapping is conflicted with |SuperTab| or |endwise|
+		plugins.
+		Note: This key mapping is for <C-h> or <BS> keymappings.
+
+					*deoplete#close_popup()*
+deoplete#close_popup()
+		Insert candidate and close popup menu for deoplete.
+		Note: It must be in |map-<expr>|.
+
+					*deoplete#undo_completion()*
+deoplete#undo_completion()
+		Undo inputted candidate.
+		Note: It must be in |map-<expr>|.
+>
+		inoremap <expr><C-g>     deoplete#undo_completion()
+<
+					*deoplete#refresh()*
+deoplete#refresh()
+		Refresh the candidates.
+		Note: It must be in |map-<expr>|.
+>
+		inoremap <expr><C-l>     deoplete#refresh()
+<
+					*deoplete#complete_common_string()*
+deoplete#complete_common_string()
+		complete common string in candidates.  It will be convenient
+		when candidates have long common string.
+		Note: It must be in |map-<expr>|.
+
+==============================================================================
+EXAMPLES						*deoplete-examples*
+>
+	" Use deoplete.
+	let g:deoplete#enable_at_startup = 1
+	" Use smartcase.
+	let g:deoplete#enable_smart_case = 1
+
+	" <C-h>, <BS>: close popup and delete backword char.
+	inoremap <expr><C-h> deoplete#smart_close_popup()."\<C-h>"
+	inoremap <expr><BS>  deoplete#smart_close_popup()."\<C-h>"
+
+	" <CR>: close popup and save indent.
+	inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
+	function! s:my_cr_function() abort
+	  return deoplete#close_popup() . "\<CR>"
+	endfunction
+<
+==============================================================================
+SOURCES							*deoplete-sources*
+
+buffer						*deoplete-source-buffer*
+		It collects keywords from current buffer and the current
+		tabpage windows buffers and the opened buffers which have same
+		'filetype'.
+
+		Note: It does not collect keywords from not loaded buffer.
+		For example, if you open file by "nvim A B".  A is already
+		loaded, but B is not loaded.  So buffer source cannot collect
+		the keywords in B until you switch to buffer B.
+
+		Note: It takes time to get the candidates in the first time if
+		you want to edit the large files(like Vim 22000 lines eval.c).
+
+		rank: 100
+
+member						*deoplete-source-member*
+		It collects members from current buffer.
+
+		rank: 100
+
+tag							*deoplete-source-tag*
+		It collects keywords from |ctags| files.
+		Note: It only supports UTF-8 encoding tag file.
+
+		rank: 100
+
+file							*deoplete-source-file*
+		This source collects keywords from local files. Specifically,
+		it completes file and directory names and paths, e.g.
+		/usr/lib/share.
+
+		rank: 150
+
+omni							*deoplete-source-omni*
+		This source collects keywords from 'omnifunc'.
+		Note: It is not asynchronous.
+
+		rank: 500
+
+dictionary					*deoplete-source-dictionary*
+		This source collects |g:deoplete#keyword_patterns| keywords
+		from 'dictionary'. Note: it uses buffer-local 'dictionary'
+		set up.
+
+		rank: 100
+>
+		" Examples:
+		" Sample configuration for dictionary source with multiple
+		" dictionary files.
+		setlocal dictionary+=/usr/share/dict/words
+		setlocal dictionary+=/usr/share/dict/american-english
+		" Remove this if you'd like to use fuzzy search
+		call deoplete#custom#source(
+		\ 'dictionary', 'matchers', ['matcher_head'])
+		" If dictionary is already sorted, no need to sort it again.
+		call deoplete#custom#source(
+		\ 'dictionary', 'sorters', [])
+		" Do not complete too short words
+		call deoplete#custom#source(
+		\ 'dictionary', 'min_pattern_length', 4)
+<
+around						    *deoplete-source-around*
+		This source collects candidates around the cursor, so inside
+		current buffer only. Plus, it searches keywords in |:changes|
+		command output. Therefore, this source is about to provide the
+		words that are in sight or the ones you've just typed somewhere
+		else.
+
+		Legend: You can see where the words came from. Next to the
+		source mark [~] these suffixes are used:
+		    A - above the cursor
+		    B - below the cursor
+		    C - in changes
+
+		rank: 300
+
+==============================================================================
+FILTERS							*deoplete-filters*
+
+					*deoplete-filter-matcher_default*
+Default matchers: ['matcher_fuzzy']
+
+	You can change it by |deoplete#custom#source()|.
+
+					*deoplete-filter-sorter_default*
+Default sorters: ['sorter_rank'].
+
+	You can change it by |deoplete#custom#source()|.
+
+					*deoplete-filter-converter_default*
+Default converters: ['converter_remove_overlap', 'converter_truncate_abbr',
+                     'converter_truncate_menu'].
+
+	You can change it by |deoplete#custom#source()|.
+
+						*deoplete-filter-matcher_head*
+matcher_head	Head matching matcher.
+
+					*deoplete-filter-matcher_fuzzy*
+matcher_fuzzy	Fuzzy matching matcher.
+
+					*deoplete-filter-matcher_full_fuzzy*
+matcher_full_fuzzy
+		Full fuzzy matching matcher.
+		It accepts partial fuzzy matches like YouCompleteMe.
+
+					*deoplete-filter-matcher_length*
+matcher_length
+		Length matching matcher.
+		It removes candidates shorter than or equal to the user input.
+
+					*deoplete-filter-matcher_cpsm*
+matcher_cpsm
+		A matcher which filters the candidates using cpsm.
+		It is like |deoplete-filter-matcher_full_fuzzy| but faster.
+		It also sorts the candidates using cpsm.
+		Note: cpsm plugin build/install is needed in 'runtimepath'.
+		https://github.com/nixprime/cpsm
+		Note: You must use Python3 support enabled cpsm. >
+			$ PY3=ON ./install.sh
+<
+		Configuration example: >
+>
+		call deoplete#custom#source('_', 'matchers', ['matcher_cpsm'])
+		call deoplete#custom#source('_', 'sorters', [])
+<
+						*deoplete-filter-sorter_rank*
+sorter_rank	Matched rank order sorter.  The higher the head matched word
+		or already selected.
+
+						*deoplete-filter-sorter_word*
+sorter_word	Word order sorter.
+
+				*deoplete-filter-converter_remove_overlap*
+converter_remove_overlap
+		It removes overlapped text in a candidate's word.
+
+				*deoplete-filter-converter_auto_delimiter*
+converter_auto_delimiter
+		It adds |g:deoplete#delimiters| characters in a candidate's
+		word.
+
+				*deoplete-filter-converter_auto_paren*
+converter_auto_paren
+		It adds parentheses character in a candidate's word.
+		It is useful if you use |neopairs| or |neosnippet|
+		plugins.
+
+				*deoplete-filter-converter_remove_paren*
+converter_remove_paren
+		It removes parentheses character in a candidate's word.
+
+				*deoplete-filter-converter_truncate_abbr*
+converter_truncate_abbr
+		It truncates a candidate's abbr by the current window width.
+
+				*deoplete-filter-converter_truncate_menu*
+converter_truncate_menu
+		It truncates a candidate's menu by the current window width.
+
+==============================================================================
+CREATE SOURCE					*deoplete-create-source*
+
+To create source, you should read default sources implementation in
+rplugin/python3/deoplete/source/*.py.
+
+The files are automatically loaded and deoplete creates new Source class
+object.
+Source class must extend Base class in ".base".
+
+Note: The sources must be created by Python3 language.
+
+Note: If you call Vim functions in your source, it is not asynchronous.
+
+------------------------------------------------------------------------------
+SOURCE ATTRIBUTES				*deoplete-source-attributes*
+
+					*deoplete-source-attribute-__init__*
+__init__	(Function)
+		Source constructor.  It is always called in initializing.  It
+		must call super() constructor.  This function takes {self} and
+		{vim} as its parameters.
+
+					*deoplete-source-attribute-name*
+name		(String)			(Required)
+		The name of a source.
+
+					*deoplete-source-attribute-mark*
+mark		(String)			(Optional)
+		The mark of a source.
+
+					*deoplete-source-attribute-description*
+description	(String)			(Optional)
+		The description of a source.
+
+					*deoplete-source-attribute-filetypes*
+filetypes	(List[str])			(Optional)
+		Available filetype list.
+
+		If you omit it, this source available in all filetypes.
+
+					*deoplete-source-attribute-rank*
+rank		(Integer)			(Optional)
+		Source priority.  Higher values imply higher priority.
+		If you omit it, it is set 100.
+		Note: It is high priority than match position.
+
+				*deoplete-source-attribute-min_pattern_length*
+min_pattern_length
+		(Integer)			(Optional)
+		Required pattern length for completion.
+
+		If you omit it, it is set "2" value.
+
+				*deoplete-source-attribute-max_pattern_length*
+max_pattern_length
+		(Integer)			(Optional)
+		Ignored pattern length for completion.
+		It is useful to edit BASE64 files.
+
+		If you omit it, it is set "80" value.
+
+				*deoplete-source-attribute-max_abbr_width*
+max_abbr_width
+		(Integer)			(Optional)
+		If the candidate abbr length exceeds the length it will be cut
+		down.
+		It it is less than or equal 0, it will be disabled.
+
+		If you omit it, it is set |g:deoplete#max_abbr_width| value.
+
+				*deoplete-source-attribute-max_kind_width*
+max_kind_width
+		(Integer)			(Optional)
+		If the candidate kind length exceeds the length it will be cut
+		down.
+		It it is less than or equal 0, it will be disabled.
+
+		If you omit it, it is set |g:deoplete#max_menu_width| value.
+
+				*deoplete-source-attribute-max_menu_width*
+max_menu_width
+		(Integer)			(Optional)
+		If the candidate menu length exceeds the length it will be cut
+		down.
+		It it is less than or equal 0, it will be disabled.
+
+		If you omit it, it is set |g:deoplete#max_menu_width| value.
+
+				*deoplete-source-attribute-input_pattern*
+input_pattern
+		(String)			(Optional)
+		If it is matched, deoplete ignores
+		|deoplete-source-attribute-min_pattern_length|.
+		It is useful for omni function sources.
+		Note: If the source set the attribute, it must define
+		|deoplete-source-attribute-get_complete_position| attribute.
+		Note: It is Python3 regexp.
+
+		If you omit it, this feature is ignored.
+
+					*deoplete-source-attribute-is_bytepos*
+is_bytepos
+		(Bool)				(Optional)
+		If it is True,
+		|deoplete-source-attribute-get_complete_position|
+		returns byteposition instead of character position.
+		The default is False.
+		It is useful for Vim script to create sources.
+		Because Vim script string uses byte position.  Python string
+		uses character position.
+
+					*deoplete-source-attribute-is_silent*
+is_silent
+		(Bool)				(Optional)
+		If it is True, the source messages are disabled.
+
+					*deoplete-source-attribute-is_volatile*
+is_volatile
+		(Bool)				(Optional)
+		If it is True, the source depends on the user input. It means
+		that if this flag is set to False, deoplete will cache
+		gather_candidates results and will not call gather_candidates
+		on each input change. Only on_post_filter method will be
+		called on each input change (if implemented).
+
+		Default value: False
+
+				*deoplete-source-attribute-is_debug_enabled*
+is_debug_enabled
+		(Bool)				(Optional)
+		If it is True, the debug log feature is enabled in the source.
+
+					*deoplete-source-attribute-matchers*
+matchers	(List[str])			(Optional)
+		Source default matchers list.
+
+		If you omit it, |deoplete-filter-matcher_default| is used.
+
+					*deoplete-source-attribute-sorters*
+sorters		(List[str])			(Optional)
+		Source default sorters list.
+
+		If you omit it, |deoplete-filter-sorter_default| is
+		used.
+
+					*deoplete-source-attribute-converters*
+converters	(List[str])			(Optional)
+		Source default converters list.
+
+		If you omit it, |deoplete-filter-converter_default| is used.
+
+				*deoplete-source-attribute-disabled_syntaxes*
+disabled_syntaxes
+		(List[str])			(Optional)
+		Source disabled syntaxes list.
+
+		If you omit it, this feature is ignored.
+
+					*deoplete-source-attribute-events*
+events		(List[str])			(Optional)
+		List of events for which |deoplete-source-attribute-on_event|
+		should get called.
+
+		It defaults to `None`, which means that `on_event` gets
+		called for all events.
+
+			*deoplete-source-attribute-get_complete_position*
+get_complete_position
+		(Function)			(Optional)
+		It is called to get complete position.
+		It takes {self} and {context} as its parameter and returns
+		complete position in current line.
+		Here, {context} is the context information when the source is
+		called(|deoplete-notation-{context}|).
+		If you omit it, deoplete will use the position using
+		|g:deoplete#keyword_patterns|.
+
+		Note: |deoplete-source-attribute-is_bytepos| is True, it must
+		return byte position.
+
+				*deoplete-source-attribute-gather_candidates*
+gather_candidates
+		(Function)			(Required)
+		It is called to gather candidates.
+		It takes {self} and {context} as its parameter and returns a
+		list of {candidate}.
+		If the error is occurred, it must return None.
+		{candidate} must be String or Dictionary contains
+		|deoplete-candidate-attributes|.
+		Here, {context} is the context information when the source is
+		called(|deoplete-notation-{context}|).
+		Note: The source must not filter the candidates by user input.
+		It is |deoplete-filters| work.  If the source filter the
+		candidates, user cannot filter the candidates by fuzzy match.
+
+				*deoplete-source-attribute-on_post_filter*
+on_post_filter
+		(Function)			(Optional)
+		It is called after the candidates are filtered.
+		It takes {self} and {context} as its parameter and returns a
+		list of {candidate}.
+
+					*deoplete-source-attribute-on_event*
+on_event	(Function)			(Optional)
+		Called for |InsertEnter|, |BufWritePost|, |DirChanged|
+		autocommands, through |deoplete#send_event()|, and when
+		deoplete gets initialized ("Init" event).
+		It is useful to make cache.
+		It takes {self} and {context} as its parameter.
+
+		" Examples:
+		def on_event(self, context):
+		    if context['event'] == 'Init':
+			pass
+		    elif context['event'] == 'BufWritePost':
+			# BufWritePost
+			pass
+		    else:
+			pass
+
+					*deoplete-source-attribute-on_init*
+on_init		(Function)			(Optional)
+		It will be called before the source attribute is called.
+		It takes {self} and {context} as its parameter.
+		It should be used to initialize the internal variables.
+
+						*deoplete-source-attribute-__*
+__{name}	(Unspecified)			(Optional)
+		Additional source information.
+		Note: Recommend sources save variables instead of
+		global variables.
+
+{context}					*deoplete-notation-{context}*
+		A dictionary to give context information.
+		The followings are the primary information.
+
+		input			(String)
+			The input string of current line.
+
+		complete_position	(Integer)
+			The complete position of current source.
+
+			" Example:
+			pattern : r'fruits\.'
+
+				  01234567
+			input   : fruits.
+
+			complete_position : 7
+
+		complete_str		(String)
+			The complete string of current source.
+
+		candidates		(List[dict])
+			The current candidates.
+
+		filetype		(String)
+			Current 'filetype'.
+
+		filetypes		(List[str])
+			It contains current 'filetype' and same
+			filetypes and composite filetypes.
+
+		is_refresh		(Bool)
+			If the input is changed, it will be "True".
+
+		is_async		(Bool)
+			If the gather is asynchronous, the source must set
+			it to "True". A typical strategy for an asynchronous
+			gather_candidates method to use this flag is to
+			set is_async flag to True while results are being
+			produced in the background (optionally, returning them
+			as they become ready). Once background processing
+			has completed, is_async flag should be set to False
+			indicating that this is the last portion of the
+			candidates.
+
+	The below is the example of async deoplete source.
+	If "context['is_async']" is True, the gather_candidates is called
+	repeatedly.
+>
+	from .base import Base
+
+	class Source(Base):
+	    def __init__(self, vim):
+	        super().__init__(vim)
+	        self.name = 'async'
+	        self.mark = '[async]'
+	        self.rank = 1000
+	        self._count = 0
+
+	    def gather_candidates(self, context):
+	        self._count += 1
+	        context['is_async'] = self._count < 10
+	        return [context['input'] + str(self._count)]
+<
+
+------------------------------------------------------------------------------
+CANDIDATE ATTRIBUTES			*deoplete-candidate-attributes*
+
+					*deoplete-candidate-attribute-name*
+word		(String)			(Required)
+		The completion word of a candidate. It is used for matching
+		inputs.
+
+					*deoplete-candidate-attribute-abbr*
+abbr		(String)			(Optional)
+		The abbreviation of a candidate. It is displayed in popup
+		window.
+
+					*deoplete-candidate-attribute-kind*
+kind		(String)			(Optional)
+		The kind of a candidate. It is displayed in popup window.
+
+					*deoplete-candidate-attribute-menu*
+menu		(String)			(Optional)
+		The menu information of a candidate. It is displayed in popup
+		window.
+
+					*deoplete-candidate-attribute-info*
+info		(String)			(Optional)
+		The preview information of a candidate. If 'completeopt'
+		contains "preview", it will be displayed in |preview-window|.
+
+					*deoplete-candidate-attribute-dup*
+dup		(Integer)			(Optional)
+		If it is non zero, the item will be displayed in the popup
+		menu when an item with the same word is already present.
+
+==============================================================================
+CREATE FILTER					*deoplete-create-filter*
+
+To create filter, you should read default filters implementation in
+rplugin/python3/deoplete/filter/*.py.
+
+The files are automatically loaded and deoplete creates new Filter class object.
+Filter class must extend Base class in ".base".
+
+Note: The filters must be created by Python3 language.
+
+------------------------------------------------------------------------------
+FILTER ATTRIBUTES				*deoplete-filter-attributes*
+
+					*deoplete-filter-attribute-__init__*
+__init__	(Function)
+		Source constructor.  It will be called in initializing.  It
+		must call Base constructor.  This function takes {self} and
+		{vim} as its parameters.
+
+					*deoplete-filter-attribute-name*
+name		(String)			(Required)
+		The name of a source.
+
+					*deoplete-filter-attribute-filter*
+filter
+		(Function)			(Required)
+		It is called to filter candidates.
+		It takes {self} and {context} as its parameter and returns a
+		list of {candidate}.
+		{candidate} must be Dictionary contains
+		|deoplete-candidate-attributes|.
+		Here, {context} is the context information when the source is
+		called(|deoplete-notation-{context}|).
+
+==============================================================================
+EXTERNAL SOURCES				*deoplete-external-sources*
+
+neco-vim: "vim" source for Vim script
+https://github.com/Shougo/neco-vim
+
+neosnippet: "neosnippet" source
+https://github.com/Shougo/neosnippet.vim
+
+neoinclude: "include" and "file/include" sources
+https://github.com/Shougo/neoinclude.vim
+
+neco-syntax: "syntax" source
+https://github.com/Shougo/neco-syntax
+
+vimshell: "vimshell" source for vimshell
+https://github.com/Shougo/vimshell.vim
+
+neco-ghc: "ghc" source for Haskell
+https://github.com/eagletmt/neco-ghc
+
+neco-look: "look" source to suggest words from sorted dictionary
+https://github.com/ujihisa/neco-look
+
+vim-racer: "racer" source for Rust
+https://github.com/racer-rust/vim-racer
+
+UltiSnips source: "ultisnips" source for UltiSnips
+https://github.com/SirVer/ultisnips
+
+clang-complete: "clang_complete" source for C/C++/Objective-C
+https://github.com/Rip-Rip/clang_complete
+
+deoplete-go: "go" source for Go
+https://github.com/zchee/deoplete-go
+
+elixir.nvim: "elixir" source for Elixir
+https://github.com/awetzel/elixir.nvim
+
+deoplete-jedi: "jedi" source for Python
+https://github.com/zchee/deoplete-jedi
+
+perlomni.vim: "PerlOmni" source for Perl
+https://github.com/c9s/perlomni.vim
+
+nvim-typescript: "typescript" source for typescript
+https://github.com/mhartington/nvim-typescript
+
+deoplete-clang: "clang" source for C/C++/ObjC
+https://github.com/zchee/deoplete-clang
+
+deoplete-clang2: "clang2" source for C/C++/ObjC
+It is faster than deoplete-clang
+https://github.com/tweekmonster/deoplete-clang2
+
+async-clj-omni: "async_clj" source for Clojure
+https://github.com/SevereOverfl0w/async-clj-omni
+
+deoplete-ternjs: "ternjs" source for JavaScript
+https://github.com/carlitux/deoplete-ternjs
+
+deoplete-swift: "swift" source for Swift
+https://github.com/landaire/deoplete-swift
+
+neovim-intellij-complete-deoplete: "intellij" source for Intellij IDE
+https://github.com/vhakulinen/neovim-intellij-complete-deoplete
+
+tmux-complete: "tmuxcomplete" source for tmux panes
+https://github.com/wellle/tmux-complete.vim
+
+deoplete-github: "github" source for "gitcommit" filetype
+https://github.com/SevereOverfl0w/deoplete-github
+
+deoplete-flow: "flow" source for JavaScript
+https://github.com/steelsojka/deoplete-flow
+
+deoplete-d: "d" source for D language
+https://github.com/landaire/deoplete-d
+
+deoplete-rtags: "rtags" source for "c", "cpp", "objc" and "objcpp" filetypes
+https://github.com/LuXuryPro/deoplete-rtags
+
+deoplete-solargraph "solargraph" source for Ruby language
+https://github.com/uplus/deoplete-solargraph
+
+deoplete-padawan: "padawan" source for padawan.php
+https://github.com/pbogut/deoplete-padawan
+
+webcomplete.vim: "webcomplete" source for browser opened pages
+https://github.com/thalesmello/webcomplete.vim
+
+deoplete-julia: "julia" source for Julia
+https://github.com/JuliaEditorSupport/deoplete-julia
+
+acid.nvim: "acid" source for Clojure
+https://github.com/hkupty/acid.nvim
+
+deoplete-omnisharp: "cs" source for C#
+https://github.com/Robzz/deoplete-omnisharp/
+
+deoplete-omnisharp: Improved version of deoplete-omnisharp
+https://github.com/dimixar/deoplete-omnisharp/
+
+deoplete-omnisharp: Embeded omnisharp server version of deoplete-omnisharp
+https://github.com/cyansprite/deoplete-omnisharp
+
+deoplete-hack: "hack" source for Hack and PHP
+https://github.com/zefei/deoplete-hack
+
+deoplete-laravel-plugin: "laravel-plugin" source for "php" and "blade"
+filetypes
+https://github.com/rafaelndev/deoplete-laravel-plugin
+
+deoplete-zsh: "zsh" source for Zsh
+https://github.com/zchee/deoplete-zsh
+
+deoplete-fish: "fish" source for fish shell
+https://github.com/ponko2/deoplete-fish
+
+deoplete-fsharp: "fsharp" source for F#
+https://github.com/callmekohei/deoplete-fsharp
+
+autocomplete-flow: "flow" source for JavaScript
+https://github.com/wokalski/autocomplete-flow
+
+deoplete-asm: "asm" source for Assembly Language
+https://github.com/zchee/deoplete-asm
+
+deoplete-abook: "abook" source for abook contacts
+https://github.com/fszymanski/deoplete-abook
+
+deoplete-emoji: "emoji" source for emoji codes
+https://github.com/fszymanski/deoplete-emoji
+
+LanguageClient-neovim: use Language Server Protocol(LSP) for sources
+https://github.com/autozimu/LanguageClient-neovim
+
+==============================================================================
+EXTERNAL PLUGINS				*deoplete-external-plugins*
+
+These are my recommended plugins for deoplete.
+
+context_filetype.vim:
+It adds the context filetype feature.
+https://github.com/Shougo/context_filetype.vim
+
+neopairs.vim:
+It inserts the parentheses pairs automatically.
+https://github.com/Shougo/neopairs.vim
+
+echodoc.vim:
+It prints the documentation you have completed.
+https://github.com/Shougo/echodoc.vim
+
+neoinclude.vim:
+You can completes the candidates from the included files and included path.
+https://github.com/Shougo/neoinclude.vim
+
+FastFold:
+Speed up the updating folds when you use auto completion plugins.
+https://github.com/Konfekt/FastFold
+
+						*deoplete-external-omnifuncs*
+
+These are my recommended omnifuncs for deoplete.
+
+phpcomplete: PHP omnifunc
+https://github.com/shawncplus/phpcomplete.vim
+
+phpcd.vim: another PHP omnifunc. Faster.
+https://github.com/php-vim/phpcd.vim
+
+==============================================================================
+FREQUENTLY ASKED QUESTIONS (FAQ)			*deoplete-faq*
+
+							*deoplete-faq-trouble*
+1. Troubleshooting~
+
+Q: deoplete does not work.
+
+A: 1. Please update neovim to the latest version.
+
+   2. Please update neovim python3 module to the latest version. >
+
+       $ sudo pip3 install neovim --upgrade
+<
+   3. Please execute ":UpdateRemotePlugins" command manually if Neovim.
+
+   4. Please install nvim-yarp plugin for Vim8.
+   https://github.com/roxma/nvim-yarp
+
+   5. Please install vim-hug-neovim-rpc plugin for Vim8.
+   https://github.com/roxma/vim-hug-neovim-rpc
+
+   6. Please check if Python3 interface works. You can check it by the command
+       `:echo has('python3')` .
+
+   https://github.com/neovim/neovim/wiki/Troubleshooting#python-support-isnt-working
+
+   7. You can test |g:deoplete#enable_yarp| option for neovim.
+
+   8. Please enable debug mode from command line and upload the log file. >
+
+       $ export NVIM_PYTHON_LOG_FILE=/tmp/log
+       $ export NVIM_PYTHON_LOG_LEVEL=DEBUG
+       $ neovim
+       ... Use deoplete
+       $ cat /tmp/log_{PID}
+
+Q: deoplete is slow.
+
+A: Please change |g:deoplete#auto_complete_delay| value. It is a huge delay
+   value intentionally. And some sources are slow. You should check which one
+   is slow and consider disabling them.
+
+Q: Deoplete popup is not displayed immediately.
+
+A: Deoplete is initialized asynchronously. So it is a feature.
+
+Q: Neovim startup is slow when |g:deoplete#enable_at_startup| is enabled.
+
+A: If it is enabled, Neovim will enable and load deoplete in startup. It
+   may be slow. You should use lazy load feature in plugin manager or use
+   |:autocmd| to call |deoplete#enable()|. >
+
+       " Enable deoplete when InsertEnter.
+       let g:deoplete#enable_at_startup = 0
+       autocmd InsertEnter * call deoplete#enable()
+<
+  And you should set |g:python3_host_prog| variable. It reduces almost 20ms
+  startuptime.
+
+Q: |deoplete-source-tag| does not work.
+   https://github.com/Shougo/deoplete.nvim/issues/309
+
+A: Please increase |g:deoplete#tag#cache_limit_size| value.
+
+Q: deoplete cannot complete filename after "=".
+
+A: 'isfname' contains "=".  You should remove it. >
+
+       set isfname-==
+
+Q: Deoplete does not work with vim-multiple-cursors.
+
+A: You must disable deoplete when using vim-multiple-cursors. >
+
+       function g:Multiple_cursors_before()
+         let g:deoplete#disable_auto_complete = 1
+       endfunction
+       function g:Multiple_cursors_after()
+         let g:deoplete#disable_auto_complete = 0
+       endfunction
+
+Q: I want to debug the sources.
+
+A: Please enable logging feature like this. >
+
+       let g:deoplete#enable_profile = 1
+       call deoplete#enable_logging('DEBUG', 'deoplete.log')
+       call deoplete#custom#source('jedi', 'is_debug_enabled', 1)
+
+Q: "Channel id must be a positive integer" error.
+https://github.com/Shougo/deoplete.nvim/issues/406
+
+A: Your neovim or neovim-python module is too old.
+Please update them to the latest version.
+
+Q: "Broken pipe" error.
+https://github.com/Shougo/deoplete.nvim/issues/653
+
+A: Please test dp_main.py.
+https://github.com/Shougo/deoplete.nvim/issues/635#issuecomment-363331278
+
+Please test neovim-python module.
+https://github.com/neovim/python-client#usage-through-the-python-repl
+
+Note: You can disable parallel feature by |g:deoplete#num_processes|.  It is
+workaround.
+
+Q: "[deoplete] neovim-python 0.2.4+ is required." error
+https://github.com/Shougo/deoplete.nvim/issues/694
+
+A: You must upgrade neovim-python client. >
+
+       $ pip3 install neovim --upgrade
+
+							*deoplete-faq-config*
+2. Configuration~
+
+Q: I want to silence the |ins-completion-menu| messages in the command line
+   such as "-- XXX completion (YYY)", "match 1 of 2", "The only match",
+   "Pattern not found", "Back at original", etc.
+
+A: You can disable the messages through the 'shortmess' option. >
+
+       if has("patch-7.4.314")
+         set shortmess+=c
+       endif
+
+Q: I want to use the auto select feature like |neocomplete|.
+
+A: You can use it by the 'completeopt' option. >
+
+       set completeopt+=noinsert
+
+Q: How do I select one of the responses from the pop up? I assume this is
+   really obvious, but I have not figured it out.
+
+A: Please press <C-y> on the candidate.
+
+Q: I want to close the preview window after completion is done.
+
+A: >
+        autocmd CompleteDone * silent! pclose!
+<
+   Note: It conflicts with iabbr.
+   https://github.com/Shougo/deoplete.nvim/issues/234
+
+Q: I want to disable the preview window feature.
+   https://github.com/Shougo/deoplete.nvim/issues/298
+
+A: >
+       set completeopt-=preview
+
+Q: I want to look selected function's arguments in deoplete. But I don't
+   like preview window feature.
+
+A: You can do it by |echodoc|.
+   http://github.com/Shougo/echodoc.vim
+
+Q: When I press enter, neovim closes the popup instead of inserting new line.
+
+A: It is Vim/neovim's default behavior (feature.)  If you want to insert the
+   new line, you should map <CR>. >
+
+       inoremap <silent> <CR> <C-r>=<SID>my_cr_function()<CR>
+       function! s:my_cr_function() abort
+         return deoplete#close_popup() . "\<CR>"
+       endfunction
+
+Q: I don't want to see the typed word in the completion menu.
+
+A: You should add |deoplete-filter-matcher_length| to the matchers. >
+
+        call deoplete#custom#source('_', 'matchers', ['matcher_fuzzy',
+        \ 'matcher_length'])
+<
+   Note: Replace `'_'` with a specific source such as `'around'` if
+         you want to keep seeing certain sources, e.g. snippets.
+
+Q: How can I change the order of sources?
+
+A: Change the rank of the sources as following, here illustrated for
+   UltiSnips >
+
+        call deoplete#custom#source('ultisnips', 'rank', 1000)
+
+Q: How can I sort all entries alphabetically?
+
+A: >
+        call deoplete#custom#source('_', 'sorters', ['sorter_word'])
+
+Q: I want to use head matcher instead of fuzzy matcher.
+
+A: You can achieve this by following >
+
+       call deoplete#custom#source('_', 'matchers', ['matcher_head'])
+
+Q: I want to disable the buffer source.
+
+A: You can use |g:deoplete#ignore_sources|. >
+
+       let g:deoplete#ignore_sources = {}
+       let g:deoplete#ignore_sources._ = ['buffer']
+
+Q: How to prevent auto bracket completion?
+   https://github.com/Shougo/deoplete.nvim/issues/150
+
+A: >
+        call deoplete#custom#source('_', 'converters',
+        \ ['converter_remove_paren'])
+
+Q: The candidates are filtered by first character.
+   https://github.com/Shougo/deoplete.nvim/issues/288
+
+A: >
+        call deoplete#custom#source('_', 'matchers', ['matcher_full_fuzzy'])
+
+Q: I want to use the syntax files as a completion source
+
+A: Please install |neco-syntax| plugin.
+   https://github.com/Shougo/neco-syntax
+
+Q: I want to complete the candidates from other files.
+   https://github.com/Shougo/deoplete.nvim/issues/133
+
+A: You must install |context_filetype| plugin.
+   https://github.com/Shougo/context_filetype.vim
+   And you must set |g:context_filetype#same_filetypes| variable.
+
+Q: What is the difference of |g:deoplete#omni_patterns| and
+   |g:deoplete#omni#input_patterns| ?
+
+A: |g:deoplete#omni_patterns| offers:
+    - can call all omni functions
+    - called by Vim
+    - Vim regexp
+
+   |g:deoplete#omni#input_patterns| offers:
+    - cannot call some omni functions
+    - can use deoplete features
+    - called by deoplete
+    - Python3 regexp
+
+   You should use |g:deoplete#omni#input_patterns| if possible.
+
+Q: Is there a way to control the colors used for popup menu using highlight
+   groups?
+
+A: Like this:
+>
+	highlight Pmenu ctermbg=8 guibg=#606060
+	highlight PmenuSel ctermbg=1 guifg=#dddd00 guibg=#1f82cd
+	highlight PmenuSbar ctermbg=0 guibg=#d6d6d6
+<
+Q: What does each part of a line on the pop up mean?  For example I see:
+   Bree pops up Breed [~] A. What do [~] and A stand for?
+
+A: It is the source mark. [~] is from around source.  A is from
+   |deoplete-source-around|.
+
+						    *deoplete-faq-ft-specific*
+3. Filetype Specific Questions~
+
+Q: I want to disable the auto completion for certain filetypes.
+
+A: Please use |b:deoplete_disable_auto_complete|. >
+
+       autocmd FileType tex let b:deoplete_disable_auto_complete = 1
+
+Q: I want to use C/C++ omni completion with deoplete.
+
+A: You can use |clang_complete| or |deoplete-clang|.
+
+   https://github.com/Rip-Rip/clang_complete
+   https://github.com/zchee/deoplete-clang
+
+   For clang_complete configuration is below. >
+
+       let g:clang_complete_auto = 0
+       let g:clang_auto_select = 0
+       let g:clang_omnicppcomplete_compliance = 0
+       let g:clang_make_default_keymappings = 0
+       "let g:clang_use_library = 1
+<
+   Currently |clang_complete| supports the original deoplete source.
+   It is better than using omni source.
+
+Q: I want to use jedi-vim omni completion with deoplete.
+
+A: You should install deoplete-jedi instead of jedi-vim.
+   https://github.com/zchee/deoplete-jedi
+
+Q: I want to use Java script omnifunc.
+
+A: Please set |g:deoplete#omni#input_patterns| manually. >
+
+       let g:deoplete#omni#input_patterns = {}
+       let g:deoplete#omni#input_patterns.javascript = '[^. *\t]\.\w*'
+
+Q: I want to use "vim-lua-ftplugin".
+   https://github.com/xolox/vim-lua-ftplugin
+
+A: Please set the config as below.  >
+
+       let g:lua_check_syntax = 0
+       let g:lua_complete_omni = 1
+       let g:lua_complete_dynamic = 0
+       let g:lua_define_completion_mappings = 0
+
+       let g:deoplete#omni#functions.lua = 'xolox#lua#omnifunc'
+       "let g:deoplete#omni#functions.lua = 'xolox#lua#completefunc'
+
+Q: I want to complete AAA using deoplete.
+
+A: You can create the source for it. Why don't create the source if you need?
+
+							*deoplete-faq-general*
+4. General Questions~
+
+Q: How to donate money to you?
+
+A: I don't get the donation, but if you want to donate, please support neovim
+project.  My plugins depends on neovim development.
+
+https://salt.bountysource.com/teams/neovim
+
+Q: What means "dark powered"?
+
+A: I think text editor is everything in the world. I want to do everything in
+   Vim(neovim) like Emacs. It is not allowed by |design-not| in Vim. It is not
+   the light way to use Vim. So I have defined it as the dark way. I am the
+   dark Vimmer. My plugins are dark powered.
+
+Q: Is deoplete faster than neocomplete?
+
+A: No. Deoplete is an asynchronous completion plugin. But it does not mean
+   that it is faster than neocomplete. It can skip the completion if you input
+   the characters too fast. I think it is great than the speed. You should use
+   faster machine for deoplete.
+
+Q: Is deoplete better than completor.vim?
+
+A: Please see
+   https://www.reddit.com/r/vim/comments/573e3d/completorvim_async_completion_framework_made_ease/
+
+Q: Are there any plans to support GotoDefinition feature like YouCompleteMe?
+
+A: https://github.com/zchee/deoplete-jedi/issues/35
+
+==============================================================================
+COMPATIBILITY					*deoplete-compatibility*
+
+2018.03.18
+* limit attribute in source is removed.
+* neovim-python 0.2.4+ is needed for asyncio feature.
+
+2017.12.04
+* "debug_enabled" is deprecated.  Please use "is_debug_enabled" instead.
+
+2017.07.22
+* "deoplete#custom#set()" is deprecated.
+
+==============================================================================
+vim:tw=78:ts=8:ft=help:norl:noet:fen:noet:
diff --git a/vim/plugins/deoplete.nvim/plugin/deoplete.vim b/vim/plugins/deoplete.nvim/plugin/deoplete.vim
new file mode 100644
index 0000000..be75831
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/plugin/deoplete.vim
@@ -0,0 +1,15 @@
+"=============================================================================
+" FILE: deoplete.vim
+" AUTHOR:  Shougo Matsushita <Shougo.Matsu at gmail.com>
+" License: MIT license
+"=============================================================================
+
+if exists('g:loaded_deoplete')
+  finish
+endif
+let g:loaded_deoplete = 1
+
+" Global options definition.
+if get(g:, 'deoplete#enable_at_startup', 0)
+  call deoplete#enable()
+endif
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/__init__.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/__init__.py
new file mode 100644
index 0000000..7f21f03
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/__init__.py
@@ -0,0 +1,64 @@
+# ============================================================================
+# FILE: __init__.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from importlib import find_loader
+from deoplete.deoplete import Deoplete
+
+
+if find_loader('yarp'):
+    import vim
+else:
+    import neovim
+    vim = neovim
+
+if 'neovim' in locals() and hasattr(neovim, 'plugin'):
+    # Neovim only
+
+    @neovim.plugin
+    class DeopleteHandlers(object):
+
+        def __init__(self, vim):
+            self._vim = vim
+
+        @neovim.function('_deoplete_init', sync=False)
+        def init_channel(self, args):
+            self._deoplete = Deoplete(self._vim)
+
+        @neovim.rpc_export('deoplete_enable_logging')
+        def enable_logging(self, context):
+            self._deoplete.enable_logging()
+
+        @neovim.rpc_export('deoplete_auto_completion_begin')
+        def auto_completion_begin(self, context):
+            self._deoplete.completion_begin(context)
+
+        @neovim.rpc_export('deoplete_manual_completion_begin')
+        def manual_completion_begin(self, context):
+            self._deoplete.completion_begin(context)
+
+        @neovim.rpc_export('deoplete_on_event')
+        def on_event(self, context):
+            self._deoplete.on_event(context)
+
+
+if find_loader('yarp'):
+
+    global_deoplete = Deoplete(vim)
+
+    def deoplete_init():
+        pass
+
+    def deoplete_enable_logging(context):
+        global_deoplete.enable_logging()
+
+    def deoplete_auto_completion_begin(context):
+        global_deoplete.completion_begin(context)
+
+    def deoplete_manual_completion_begin(context):
+        global_deoplete.completion_begin(context)
+
+    def deoplete_on_event(context):
+        global_deoplete.on_event(context)
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/child.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/child.py
new file mode 100644
index 0000000..cc7ef07
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/child.py
@@ -0,0 +1,472 @@
+# ============================================================================
+# FILE: child.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import copy
+import os.path
+import re
+import sys
+import time
+import msgpack
+
+from collections import defaultdict
+
+import deoplete.source  # noqa
+import deoplete.filter  # noqa
+
+from deoplete import logger
+from deoplete.exceptions import SourceInitError
+from deoplete.util import (bytepos2charpos, charpos2bytepos, error, error_tb,
+                           import_plugin,
+                           get_buffer_config, get_custom,
+                           get_syn_names, convert2candidates, uniq_list_dict)
+
+
+class Child(logger.LoggingMixin):
+
+    def __init__(self, vim):
+        self.name = 'child'
+
+        self._vim = vim
+        self._filters = {}
+        self._sources = {}
+        self._custom = []
+        self._profile_flag = None
+        self._profile_start_time = 0
+        self._loaded_sources = {}
+        self._loaded_filters = {}
+        self._source_errors = defaultdict(int)
+        self._prev_results = {}
+        self._unpacker = msgpack.Unpacker(
+            encoding='utf-8',
+            unicode_errors='surrogateescape')
+        self._packer = msgpack.Packer(
+            use_bin_type=True,
+            encoding='utf-8',
+            unicode_errors='surrogateescape')
+        self._ignore_sources = []
+
+    def main_loop(self, stdout):
+        while True:
+            feed = sys.stdin.buffer.raw.read(102400)
+            if feed is None:
+                continue
+            if feed == b'':
+                # EOF
+                return
+
+            self._unpacker.feed(feed)
+            self.debug('_read: %d bytes', len(feed))
+
+            for child_in in self._unpacker:
+                name = child_in['name']
+                args = child_in['args']
+                queue_id = child_in['queue_id']
+                self.debug('main_loop: %s begin', name)
+
+                ret = self.main(name, args, queue_id)
+                if ret:
+                    self._write(stdout, ret)
+
+                self.debug('main_loop: end')
+
+    def main(self, name, args, queue_id):
+        ret = None
+        if name == 'enable_logging':
+            self._enable_logging()
+        elif name == 'add_source':
+            self._add_source(args[0])
+        elif name == 'add_filter':
+            self._add_filter(args[0])
+        elif name == 'set_source_attributes':
+            self._set_source_attributes(args[0])
+        elif name == 'set_custom':
+            self._set_custom(args[0])
+        elif name == 'on_event':
+            self._on_event(args[0])
+        elif name == 'merge_results':
+            ret = self._merge_results(args[0], queue_id)
+        return ret
+
+    def _write(self, stdout, expr):
+        stdout.buffer.write(self._packer.pack(expr))
+        stdout.flush()
+
+    def _enable_logging(self):
+        logging = self._vim.vars['deoplete#_logging']
+        logger.setup(self._vim, logging['level'], logging['logfile'])
+        self.is_debug_enabled = True
+
+    def _add_source(self, path):
+        source = None
+        try:
+            Source = import_plugin(path, 'source', 'Source')
+            if not Source:
+                return
+
+            source = Source(self._vim)
+            name = os.path.splitext(os.path.basename(path))[0]
+            source.name = getattr(source, 'name', name)
+            source.path = path
+            if source.name in self._loaded_sources:
+                # Duplicated name
+                error_tb(self._vim, 'Duplicated source: %s' % source.name)
+                error_tb(self._vim, 'path: "%s" "%s"' %
+                         (path, self._loaded_sources[source.name]))
+                source = None
+        except Exception:
+            error_tb(self._vim, 'Could not load source: %s' % path)
+        finally:
+            if source:
+                self._loaded_sources[source.name] = path
+                self._sources[source.name] = source
+                self.debug('Loaded Source: %s (%s)', source.name, path)
+
+    def _add_filter(self, path):
+        f = None
+        try:
+            Filter = import_plugin(path, 'filter', 'Filter')
+            if not Filter:
+                return
+
+            f = Filter(self._vim)
+            name = os.path.splitext(os.path.basename(path))[0]
+            f.name = getattr(f, 'name', name)
+            f.path = path
+            if f.name in self._loaded_filters:
+                # Duplicated name
+                error_tb(self._vim, 'duplicated filter: %s' % f.name)
+                error_tb(self._vim, 'path: "%s" "%s"' %
+                         (path, self._loaded_filters[f.name]))
+                f = None
+        except Exception:
+            # Exception occurred when loading a filter.  Log stack trace.
+            error_tb(self._vim, 'Could not load filter: %s' % path)
+        finally:
+            if f:
+                self._loaded_filters[f.name] = path
+                self._filters[f.name] = f
+                self.debug('Loaded Filter: %s (%s)', f.name, path)
+
+    def _merge_results(self, context, queue_id):
+        self.debug('merged_results: begin')
+        results = self._gather_results(context)
+
+        merged_results = []
+        for result in [x for x in results
+                       if not self._is_skip(x['context'], x['source'])]:
+            if self._update_result(result, context['input']):
+                rank = get_custom(self._custom,
+                                  result['source'].name, 'rank',
+                                  result['source'].rank)
+                dup = bool(result['source'].filetypes)
+                candidates = result['candidates']
+                # Note: cannot use set() for dict
+                if dup:
+                    # Remove duplicates
+                    candidates = uniq_list_dict(candidates)
+                merged_results.append({
+                    'complete_position': result['complete_position'],
+                    'mark': result['source'].mark,
+                    'dup': dup,
+                    'candidates': candidates,
+                    'source_name': result['source'].name,
+                    'rank': rank,
+                })
+
+        is_async = len([x for x in results if x['is_async']]) > 0
+
+        self.debug('merged_results: end')
+        return {
+            'queue_id': queue_id,
+            'is_async': is_async,
+            'merged_results': merged_results,
+        }
+
+    def _gather_results(self, context):
+        results = []
+
+        for source in [x[1] for x in self._itersource(context)]:
+            try:
+                if source.disabled_syntaxes and 'syntax_names' not in context:
+                    context['syntax_names'] = get_syn_names(self._vim)
+                ctx = copy.deepcopy(context)
+
+                charpos = source.get_complete_position(ctx)
+                if charpos >= 0 and source.is_bytepos:
+                    charpos = bytepos2charpos(
+                        ctx['encoding'], ctx['input'], charpos)
+
+                ctx['char_position'] = charpos
+                ctx['complete_position'] = charpos2bytepos(
+                    ctx['encoding'], ctx['input'], charpos)
+                ctx['complete_str'] = ctx['input'][ctx['char_position']:]
+
+                if charpos < 0 or self._is_skip(ctx, source):
+                    if source.name in self._prev_results:
+                        self._prev_results.pop(source.name)
+                    # Skip
+                    continue
+
+                if (source.name in self._prev_results and
+                        self._use_previous_result(
+                            context, self._prev_results[source.name],
+                            source.is_volatile)):
+                    results.append(self._prev_results[source.name])
+                    continue
+
+                ctx['is_async'] = False
+                ctx['is_refresh'] = True
+                ctx['max_abbr_width'] = min(source.max_abbr_width,
+                                            ctx['max_abbr_width'])
+                ctx['max_kind_width'] = min(source.max_kind_width,
+                                            ctx['max_kind_width'])
+                ctx['max_menu_width'] = min(source.max_menu_width,
+                                            ctx['max_menu_width'])
+                if ctx['max_abbr_width'] > 0:
+                    ctx['max_abbr_width'] = max(20, ctx['max_abbr_width'])
+                if ctx['max_kind_width'] > 0:
+                    ctx['max_kind_width'] = max(10, ctx['max_kind_width'])
+                if ctx['max_menu_width'] > 0:
+                    ctx['max_menu_width'] = max(10, ctx['max_menu_width'])
+
+                # Gathering
+                self._profile_start(ctx, source.name)
+                ctx['candidates'] = source.gather_candidates(ctx)
+                self._profile_end(source.name)
+
+                if ctx['candidates'] is None:
+                    continue
+
+                ctx['candidates'] = convert2candidates(ctx['candidates'])
+
+                result = {
+                    'name': source.name,
+                    'source': source,
+                    'context': ctx,
+                    'is_async': ctx['is_async'],
+                    'prev_linenr': ctx['position'][1],
+                    'prev_input': ctx['input'],
+                    'input': ctx['input'],
+                    'complete_position': ctx['complete_position'],
+                    'candidates': ctx['candidates'],
+                }
+                self._prev_results[source.name] = result
+                results.append(result)
+            except Exception:
+                self._source_errors[source.name] += 1
+                if source.is_silent:
+                    continue
+                if self._source_errors[source.name] > 2:
+                    error(self._vim, 'Too many errors from "%s". '
+                          'This source is disabled until Neovim '
+                          'is restarted.' % source.name)
+                    self._ignore_sources.append(source.name)
+                    continue
+                error_tb(self._vim, 'Errors from: %s' % source.name)
+
+        return results
+
+    def _gather_async_results(self, result, source):
+        try:
+            context = result['context']
+            context['is_refresh'] = False
+            async_candidates = source.gather_candidates(context)
+            result['is_async'] = context['is_async']
+            if async_candidates is None:
+                return
+            context['candidates'] += convert2candidates(async_candidates)
+        except Exception:
+            self._source_errors[source.name] += 1
+            if source.is_silent:
+                return
+            if self._source_errors[source.name] > 2:
+                error(self._vim, 'Too many errors from "%s". '
+                      'This source is disabled until Neovim '
+                      'is restarted.' % source.name)
+                self._ignore_sources.append(source.name)
+            else:
+                error_tb(self._vim, 'Errors from: %s' % source.name)
+
+    def _process_filter(self, f, context):
+        try:
+            self._profile_start(context, f.name)
+            if (isinstance(context['candidates'], dict) and
+                    'sorted_candidates' in context['candidates']):
+                context_candidates = []
+                context['is_sorted'] = True
+                for candidates in context['candidates']['sorted_candidates']:
+                    context['candidates'] = candidates
+                    context_candidates += f.filter(context)
+                context['candidates'] = context_candidates
+            else:
+                context['candidates'] = f.filter(context)
+            self._profile_end(f.name)
+        except Exception:
+            error_tb(self._vim, 'Errors from: %s' % f)
+
+    def _update_result(self, result, context_input):
+        source = result['source']
+
+        # Gather async results
+        if result['is_async']:
+            self._gather_async_results(result, source)
+
+        if not result['candidates']:
+            return None
+
+        # Source context
+        ctx = copy.deepcopy(result['context'])
+
+        ctx['input'] = context_input
+        ctx['complete_str'] = context_input[ctx['char_position']:]
+        ctx['is_sorted'] = False
+
+        # Set ignorecase
+        case = ctx['smartcase'] or ctx['camelcase']
+        if case and re.search(r'[A-Z]', ctx['complete_str']):
+            ctx['ignorecase'] = 0
+        ignorecase = ctx['ignorecase']
+
+        # Filtering
+        for f in [self._filters[x] for x
+                  in source.matchers + source.sorters + source.converters
+                  if x in self._filters]:
+            self._process_filter(f, ctx)
+
+        ctx['ignorecase'] = ignorecase
+
+        # On post filter
+        if hasattr(source, 'on_post_filter'):
+            ctx['candidates'] = source.on_post_filter(ctx)
+
+        result['candidates'] = ctx['candidates']
+        return result if result['candidates'] else None
+
+    def _itersource(self, context):
+        filetypes = context['filetypes']
+        ignore_sources = set(self._ignore_sources)
+        for ft in filetypes:
+            ignore_sources.update(
+                get_buffer_config(context, ft,
+                                  'deoplete_ignore_sources',
+                                  'deoplete#ignore_sources',
+                                  {}))
+
+        for source_name, source in self._sources.items():
+            if source.filetypes is None or source_name in ignore_sources:
+                continue
+            if context['sources'] and source_name not in context['sources']:
+                continue
+            if source.filetypes and not any(x in filetypes
+                                            for x in source.filetypes):
+                continue
+            if not source.is_initialized and hasattr(source, 'on_init'):
+                self.debug('on_init Source: %s', source.name)
+                try:
+                    source.on_init(context)
+                except Exception as exc:
+                    if isinstance(exc, SourceInitError):
+                        error(self._vim,
+                              'Error when loading source {}: {}. '
+                              'Ignoring.'.format(source_name, exc))
+                    else:
+                        error_tb(self._vim,
+                                 'Error when loading source {}: {}. '
+                                 'Ignoring.'.format(source_name, exc))
+                    self._ignore_sources.append(source_name)
+                    continue
+                else:
+                    source.is_initialized = True
+            yield source_name, source
+
+    def _profile_start(self, context, name):
+        if self._profile_flag is 0 or not self.is_debug_enabled:
+            return
+
+        if not self._profile_flag:
+            self._profile_flag = context['vars']['deoplete#enable_profile']
+            if self._profile_flag:
+                return self._profile_start(context, name)
+        elif self._profile_flag:
+            self.debug('Profile Start: {0}'.format(name))
+            self._profile_start_time = time.clock()
+
+    def _profile_end(self, name):
+        if self._profile_start_time:
+            self.debug('Profile End  : {0:<25} time={1:2.10f}'.format(
+                name, time.clock() - self._profile_start_time))
+
+    def _use_previous_result(self, context, result, is_volatile):
+        if context['position'][1] != result['prev_linenr']:
+            return False
+        if is_volatile:
+            return context['input'] == result['prev_input']
+        else:
+            return (re.sub(r'\w*$', '', context['input']) ==
+                    re.sub(r'\w*$', '', result['prev_input']) and
+                    context['input'].find(result['prev_input']) == 0)
+
+    def _is_skip(self, context, source):
+        if 'syntax_names' in context and source.disabled_syntaxes:
+            p = re.compile('(' + '|'.join(source.disabled_syntaxes) + ')$')
+            if next(filter(p.search, context['syntax_names']), None):
+                return True
+        if (source.input_pattern != '' and
+                re.search('(' + source.input_pattern + ')$',
+                          context['input'])):
+            return False
+        if context['event'] == 'Manual':
+            return False
+        return not (source.min_pattern_length <=
+                    len(context['complete_str']) <= source.max_pattern_length)
+
+    def _set_source_attributes(self, context):
+        """Set source attributes from the context.
+
+        Each item in `attrs` is the attribute name.  If the default value is in
+        context['vars'] under a different name, use a tuple.
+        """
+        attrs = (
+            'filetypes',
+            'disabled_syntaxes',
+            'input_pattern',
+            ('min_pattern_length', 'deoplete#auto_complete_start_length'),
+            'max_pattern_length',
+            ('max_abbr_width', 'deoplete#max_abbr_width'),
+            ('max_kind_width', 'deoplete#max_menu_width'),
+            ('max_menu_width', 'deoplete#max_menu_width'),
+            'matchers',
+            'sorters',
+            'converters',
+            'mark',
+            'is_debug_enabled',
+            'is_silent',
+        )
+
+        for name, source in self._sources.items():
+            for attr in attrs:
+                if isinstance(attr, tuple):
+                    default_val = context['vars'][attr[1]]
+                    attr = attr[0]
+                else:
+                    default_val = None
+                source_attr = getattr(source, attr, default_val)
+                setattr(source, attr, get_custom(context['custom'],
+                                                 name, attr, source_attr))
+
+    def _set_custom(self, custom):
+        self._custom = custom
+
+    def _on_event(self, context):
+        for source_name, source in self._itersource(context):
+            if source.events is None or context['event'] in source.events:
+                self.debug('on_event: Source: %s', source_name)
+                try:
+                    source.on_event(context)
+                except Exception as exc:
+                    error_tb(self._vim, 'Exception during {}.on_event '
+                             'for event {!r}: {}'.format(
+                                 source_name, context['event'], exc))
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/deoplete.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/deoplete.py
new file mode 100644
index 0000000..9af1b6e
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/deoplete.py
@@ -0,0 +1,212 @@
+# ============================================================================
+# FILE: deoplete.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from deoplete import logger
+from deoplete.parent import Parent
+from deoplete.util import (error_tb, find_rplugins, error)
+
+
+class Deoplete(logger.LoggingMixin):
+
+    def __init__(self, vim):
+        self.name = 'core'
+
+        self._vim = vim
+        self._runtimepath = ''
+        self._custom = []
+        self._loaded_paths = set()
+        self._prev_merged_results = {}
+        self._prev_pos = []
+
+        self._parents = []
+        self._parent_count = 0
+        self._max_parents = max(
+            [1, self._vim.vars['deoplete#num_processes']])
+
+        if self._max_parents > 1 and not hasattr(self._vim, 'loop'):
+            error(self._vim, 'neovim-python 0.2.4+ is required.')
+            return
+
+        # Enable logging before "Init" for more information, and e.g.
+        # deoplete-jedi picks up the log filename from deoplete's handler in
+        # its on_init.
+        if self._vim.vars['deoplete#_logging']:
+            self.enable_logging()
+
+        # Init context
+        context = self._vim.call('deoplete#init#_context', 'Init', [])
+        context['rpc'] = 'deoplete_on_event'
+
+        # Init processes
+        for n in range(0, self._max_parents):
+            self._parents.append(Parent(vim, context))
+        if self._vim.vars['deoplete#_logging']:
+            for parent in self._parents:
+                parent.enable_logging()
+
+        # on_init() call
+        self.on_event(context)
+
+        if hasattr(self._vim, 'channel_id'):
+            self._vim.vars['deoplete#_channel_id'] = self._vim.channel_id
+        self._vim.vars['deoplete#_initialized'] = True
+
+    def enable_logging(self):
+        logging = self._vim.vars['deoplete#_logging']
+        logger.setup(self._vim, logging['level'], logging['logfile'])
+        self.is_debug_enabled = True
+
+    def completion_begin(self, context):
+        self.debug('completion_begin: %s', context['input'])
+
+        self.check_recache(context)
+
+        try:
+            is_async, position, candidates = self.merge_results(context)
+        except Exception:
+            error_tb(self._vim, 'Error while gathering completions')
+
+            is_async = False
+            position = -1
+            candidates = []
+
+        if is_async:
+            self._vim.call('deoplete#handler#_async_timer_start')
+        else:
+            self._vim.call('deoplete#handler#_async_timer_stop')
+
+        if not candidates and ('deoplete#_saved_completeopt'
+                               in context['vars']):
+            self._vim.call('deoplete#mapping#_restore_completeopt')
+
+        # Async update is skipped if same.
+        prev_completion = context['vars']['deoplete#_prev_completion']
+        prev_candidates = prev_completion['candidates']
+        prev_pos = prev_completion['complete_position']
+        if (context['event'] == 'Async' and
+                prev_pos == self._vim.call('getpos', '.') and
+                prev_candidates and candidates == prev_candidates):
+            return
+
+        # error(self._vim, candidates)
+        self._vim.vars['deoplete#_context'] = {
+            'complete_position': position,
+            'candidates': candidates,
+            'event': context['event'],
+            'input': context['input'],
+            'is_async': is_async,
+        }
+        self._vim.call('deoplete#handler#_do_complete')
+
+        self.debug('completion_end: %s', context['input'])
+
+    def merge_results(self, context):
+        use_prev = context['position'] == self._prev_pos
+        if not use_prev:
+            self._prev_merged_results = {}
+
+        is_async = False
+        merged_results = []
+        for cnt, parent in enumerate(self._parents):
+            if use_prev and cnt in self._prev_merged_results:
+                # Use previous result
+                merged_results += self._prev_merged_results[cnt]
+            else:
+                result = parent.merge_results(context)
+                is_async = is_async or result[0]
+                if not result[0]:
+                    self._prev_merged_results[cnt] = result[1]
+                merged_results += result[1]
+        self._prev_pos = context['position']
+
+        if not merged_results:
+            return (is_async, -1, [])
+
+        complete_position = min([x['complete_position']
+                                 for x in merged_results])
+
+        all_candidates = []
+        for result in sorted(merged_results,
+                             key=lambda x: x['rank'], reverse=True):
+            candidates = result['candidates']
+            prefix = context['input'][
+                complete_position:result['complete_position']]
+
+            mark = result['mark'] + ' '
+            for candidate in candidates:
+                # Add prefix
+                candidate['word'] = prefix + candidate['word']
+
+                # Set default menu and icase
+                candidate['icase'] = 1
+                if (mark != ' ' and
+                        candidate.get('menu', '').find(mark) != 0):
+                    candidate['menu'] = mark + candidate.get('menu', '')
+                if result['dup']:
+                    candidate['dup'] = 1
+
+            all_candidates += candidates
+
+        # self.debug(candidates)
+        max_list = context['vars']['deoplete#max_list']
+        if max_list > 0:
+            all_candidates = all_candidates[: max_list]
+
+        return (is_async, complete_position, all_candidates)
+
+    def load_sources(self, context):
+        # Load sources from runtimepath
+        for path in find_rplugins(context, 'source'):
+            if path in self._loaded_paths:
+                continue
+            self._loaded_paths.add(path)
+
+            self._parents[self._parent_count].add_source(path)
+            self.debug('Process %d: %s', self._parent_count, path)
+
+            self._parent_count += 1
+            self._parent_count %= self._max_parents
+
+        self.set_source_attributes(context)
+        self.set_custom(context)
+
+    def load_filters(self, context):
+        # Load filters from runtimepath
+        for path in find_rplugins(context, 'filter'):
+            if path in self._loaded_paths:
+                continue
+            self._loaded_paths.add(path)
+
+            for parent in self._parents:
+                parent.add_filter(path)
+
+    def set_source_attributes(self, context):
+        for parent in self._parents:
+            parent.set_source_attributes(context)
+
+    def set_custom(self, context):
+        self._custom = context['custom']
+        for parent in self._parents:
+            parent.set_custom(self._custom)
+
+    def check_recache(self, context):
+        if context['runtimepath'] != self._runtimepath:
+            self._runtimepath = context['runtimepath']
+            self.load_sources(context)
+            self.load_filters(context)
+
+            if context['rpc'] != 'deoplete_on_event':
+                self.on_event(context)
+        elif context['custom'] != self._custom:
+            self.set_source_attributes(context)
+            self.set_custom(context)
+
+    def on_event(self, context):
+        self.debug('on_event: %s', context['event'])
+        self.check_recache(context)
+
+        for parent in self._parents:
+            parent.on_event(context)
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/dp_main.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/dp_main.py
new file mode 100644
index 0000000..b855661
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/dp_main.py
@@ -0,0 +1,58 @@
+# ============================================================================
+# FILE: dp_main.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import sys
+import io
+
+from neovim import attach
+
+
+def attach_vim(serveraddr):
+    if len(serveraddr.split(':')) == 2:
+        serveraddr, port = serveraddr.split(':')
+        port = int(port)
+        vim = attach('tcp', address=serveraddr, port=port)
+    else:
+        vim = attach('socket', path=serveraddr)
+
+    # sync path
+    for path in vim.call(
+            'globpath', vim.options['runtimepath'],
+            'rplugin/python3', 1).split('\n'):
+        sys.path.append(path)
+    # Remove current path
+    del sys.path[0]
+
+    return vim
+
+
+class RedirectStream(io.IOBase):
+    def __init__(self, handler):
+        self.handler = handler
+
+    def write(self, line):
+        self.handler(line)
+
+    def writelines(self, lines):
+        self.handler('\n'.join(lines))
+
+
+def main(serveraddr):
+    vim = attach_vim(serveraddr)
+    from deoplete.child import Child
+    from deoplete.util import error_tb
+    stdout = sys.stdout
+    sys.stdout = RedirectStream(lambda data: vim.out_write(data))
+    sys.stderr = RedirectStream(lambda data: vim.err_write(data))
+    try:
+        child = Child(vim)
+        child.main_loop(stdout)
+    except Exception:
+        error_tb(vim, 'Error in child')
+
+
+if __name__ == '__main__':
+    main(sys.argv[1])
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/exceptions.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/exceptions.py
new file mode 100644
index 0000000..0cf96fa
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/exceptions.py
@@ -0,0 +1,6 @@
+class SourceInitError(Exception):
+    """Error during source initialization.
+
+    This can be used to have a clearer message, where not traceback gets
+    displayed.
+    """
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/base.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/base.py
new file mode 100644
index 0000000..8de16bc
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/base.py
@@ -0,0 +1,20 @@
+# ============================================================================
+# FILE: base.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from abc import abstractmethod
+from deoplete.logger import LoggingMixin
+
+
+class Base(LoggingMixin):
+
+    def __init__(self, vim):
+        self.vim = vim
+        self.name = 'base'
+        self.description = ''
+
+    @abstractmethod
+    def filter(self, context):
+        pass
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_delimiter.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_delimiter.py
new file mode 100644
index 0000000..b1be74e
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_delimiter.py
@@ -0,0 +1,32 @@
+# ============================================================================
+# FILE: converter_auto_delimiter.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_auto_delimiter'
+        self.description = 'auto delimiter converter'
+
+    def filter(self, context):
+        delimiters = context['vars']['deoplete#delimiters']
+        for candidate, delimiter in [
+                [x, last_find(x['abbr'], delimiters)]
+                for x in context['candidates']
+                if 'abbr' in x and x['abbr'] and
+                not last_find(x['word'], delimiters) and
+                last_find(x['abbr'], delimiters)]:
+            candidate['word'] += delimiter
+        return context['candidates']
+
+
+def last_find(s, needles):
+    for needle in needles:
+        if len(s) >= len(needle) and s[-len(needle):] == needle:
+            return needle
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_paren.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_paren.py
new file mode 100644
index 0000000..e280877
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_auto_paren.py
@@ -0,0 +1,27 @@
+# ============================================================================
+# FILE: converter_auto_paren.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_auto_paren'
+        self.description = 'auto add parentheses converter'
+
+    def filter(self, context):
+        p1 = re.compile('\(\)?$')
+        p2 = re.compile('\(.*\)')
+        for candidate in [
+                x for x in context['candidates']
+                if not p1.search(x['word']) and
+                (('abbr' in x and p2.search(x['abbr'])) or
+                 ('info' in x and p2.search(x['info'])))]:
+            candidate['word'] += '('
+        return context['candidates']
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_overlap.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_overlap.py
new file mode 100644
index 0000000..ac74643
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_overlap.py
@@ -0,0 +1,39 @@
+# ============================================================================
+# FILE: converter_remove_overlap.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_remove_overlap'
+        self.description = 'remove overlap converter'
+
+    def filter(self, context):
+        if not context['next_input']:
+            return context['candidates']
+        m = re.match('\S+', context['next_input'])
+        if not m:
+            return context['candidates']
+        next = m.group(0)
+        for [overlap, candidate] in [
+                [x, y] for x, y
+                in [[overlap_length(x['word'], next), x]
+                    for x in context['candidates']] if x > 0]:
+            if 'abbr' not in candidate:
+                candidate['abbr'] = candidate['word']
+            candidate['word'] = candidate['word'][: -overlap]
+        return context['candidates']
+
+
+def overlap_length(left, right):
+    pos = len(right)
+    while pos > 0 and not left.endswith(right[: pos]):
+        pos -= 1
+    return pos
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_paren.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_paren.py
new file mode 100644
index 0000000..bdec073
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_remove_paren.py
@@ -0,0 +1,23 @@
+# ============================================================================
+# FILE: converter_remove_paren.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_remove_paren'
+        self.description = 'remove parentheses converter'
+
+    def filter(self, context):
+        p = re.compile('\(\)?$')
+        for candidate in [x for x in context['candidates']
+                          if p.search(x['word'])]:
+            candidate['word'] = re.sub('\(\)?$', '', candidate['word'])
+        return context['candidates']
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_abbr.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_abbr.py
new file mode 100644
index 0000000..8628870
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_abbr.py
@@ -0,0 +1,28 @@
+# ============================================================================
+# FILE: converter_truncate_abbr.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+from deoplete.util import truncate_skipping
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_truncate_abbr'
+        self.description = 'truncate abbr converter'
+
+    def filter(self, context):
+        max_width = context['max_abbr_width']
+        if max_width <= 0:
+            return context['candidates']
+
+        footer_width = max_width / 3
+        for candidate in context['candidates']:
+            candidate['abbr'] = truncate_skipping(
+                candidate.get('abbr', candidate['word']),
+                max_width, '..', footer_width)
+        return context['candidates']
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_kind.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_kind.py
new file mode 100644
index 0000000..c5c6253
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_kind.py
@@ -0,0 +1,29 @@
+# ============================================================================
+# FILE: converter_truncate_kind.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+from deoplete.util import truncate_skipping
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_truncate_kind'
+        self.description = 'truncate kind converter'
+
+    def filter(self, context):
+        max_width = context['max_kind_width']
+        if not context['candidates'] or 'kind' not in context[
+                'candidates'][0] or max_width <= 0:
+            return context['candidates']
+
+        footer_width = max_width / 3
+        for candidate in context['candidates']:
+            candidate['kind'] = truncate_skipping(
+                candidate.get('kind', ''),
+                max_width, '..', footer_width)
+        return context['candidates']
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_menu.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_menu.py
new file mode 100644
index 0000000..a422b50
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/converter_truncate_menu.py
@@ -0,0 +1,29 @@
+# ============================================================================
+# FILE: converter_truncate_menu.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+from deoplete.util import truncate_skipping
+
+
+class Filter(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'converter_truncate_menu'
+        self.description = 'truncate menu converter'
+
+    def filter(self, context):
+        max_width = context['max_menu_width']
+        if not context['candidates'] or 'menu' not in context[
+                'candidates'][0] or max_width <= 0:
+            return context['candidates']
+
+        footer_width = max_width / 3
+        for candidate in context['candidates']:
+            candidate['menu'] = truncate_skipping(
+                candidate.get('menu', ''),
+                max_width, '..', footer_width)
+        return context['candidates']
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_cpsm.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_cpsm.py
new file mode 100644
index 0000000..04172cc
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_cpsm.py
@@ -0,0 +1,54 @@
+# ============================================================================
+# FILE: matcher_cpsm.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+import sys
+import os
+from deoplete.util import error, globruntime
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'matcher_cpsm'
+        self.description = 'cpsm matcher'
+
+        self._initialized = False
+        self._disabled = False
+
+    def filter(self, context):
+        if not context['candidates'] or not context[
+                'input'] or self._disabled:
+            return context['candidates']
+
+        if not self._initialized:
+            # cpsm installation check
+            ext = '.pyd' if context['is_windows'] else '.so'
+            if globruntime(context['runtimepath'], 'bin/cpsm_py' + ext):
+                # Add path
+                sys.path.append(os.path.dirname(
+                    globruntime(context['runtimepath'],
+                                'bin/cpsm_py' + ext)[0]))
+                self._initialized = True
+            else:
+                error(self.vim, 'matcher_cpsm: bin/cpsm_py' + ext +
+                      ' is not found in your runtimepath.')
+                error(self.vim, 'matcher_cpsm: You must install/build' +
+                      ' Python3 support enabled cpsm.')
+                self._disabled = True
+                return []
+
+        cpsm_result = self._get_cpsm_result(
+            context['candidates'], context['complete_str'])
+        return [x for x in context['candidates']
+                if x['word'] in sorted(cpsm_result, key=cpsm_result.index)]
+
+    def _get_cpsm_result(self, candidates, pattern):
+        import cpsm_py
+        return cpsm_py.ctrlp_match((d['word'] for d in candidates),
+                                   pattern, limit=1000, ispath=False)[0]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_full_fuzzy.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_full_fuzzy.py
new file mode 100644
index 0000000..1c7a4df
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_full_fuzzy.py
@@ -0,0 +1,30 @@
+# ============================================================================
+# FILE: matcher_full_fuzzy.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+from deoplete.util import fuzzy_escape
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'matcher_full_fuzzy'
+        self.description = 'full fuzzy matcher'
+
+    def filter(self, context):
+        complete_str = context['complete_str']
+        if context['ignorecase']:
+            complete_str = complete_str.lower()
+        p = re.compile(fuzzy_escape(complete_str, context['camelcase']))
+        if context['ignorecase']:
+            return [x for x in context['candidates']
+                    if p.search(x['word'].lower())]
+        else:
+            return [x for x in context['candidates']
+                    if p.search(x['word'])]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_fuzzy.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_fuzzy.py
new file mode 100644
index 0000000..ddb3665
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_fuzzy.py
@@ -0,0 +1,41 @@
+# ============================================================================
+# FILE: matcher_fuzzy.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+from deoplete.util import (
+    fuzzy_escape, binary_search_begin, binary_search_end)
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'matcher_fuzzy'
+        self.description = 'fuzzy matcher'
+
+    def filter(self, context):
+        complete_str = context['complete_str']
+        if context['ignorecase']:
+            complete_str = complete_str.lower()
+
+        if context['is_sorted']:
+            begin = binary_search_begin(
+                context['candidates'], complete_str[0])
+            end = binary_search_end(
+                context['candidates'], complete_str[0])
+            if begin < 0 or end < 0:
+                return []
+            candidates = context['candidates'][begin:end+1]
+        else:
+            candidates = context['candidates']
+
+        p = re.compile(fuzzy_escape(complete_str, context['camelcase']))
+        if context['ignorecase']:
+            return [x for x in candidates if p.match(x['word'].lower())]
+        else:
+            return [x for x in candidates if p.match(x['word'])]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_head.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_head.py
new file mode 100644
index 0000000..6f3ba70
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_head.py
@@ -0,0 +1,43 @@
+# ============================================================================
+# FILE: matcher_head.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+from deoplete.util import binary_search_begin, binary_search_end
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'matcher_head'
+        self.description = 'head matcher'
+
+    def filter(self, context):
+        complete_str = context['complete_str']
+        if context['ignorecase']:
+            complete_str = complete_str.lower()
+
+        if context['is_sorted']:
+            begin = binary_search_begin(
+                context['candidates'], complete_str)
+            end = binary_search_end(
+                context['candidates'], complete_str)
+            if begin < 0 or end < 0:
+                return []
+            candidates = context['candidates'][begin:end+1]
+
+            if context['ignorecase']:
+                return candidates
+        else:
+            candidates = context['candidates']
+
+        if context['ignorecase']:
+            return [x for x in context['candidates']
+                    if x['word'].lower().startswith(complete_str)]
+        else:
+            return [x for x in context['candidates']
+                    if x['word'].startswith(complete_str)]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_length.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_length.py
new file mode 100644
index 0000000..a5e82af
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/matcher_length.py
@@ -0,0 +1,21 @@
+# ============================================================================
+# FILE: matcher_length.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'matcher_length'
+        self.description = 'length matcher'
+
+    def filter(self, context):
+        input_len = len(context['complete_str'])
+        return [x for x in context['candidates']
+                if len(x['word']) > input_len]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_rank.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_rank.py
new file mode 100644
index 0000000..d28ae00
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_rank.py
@@ -0,0 +1,26 @@
+# ============================================================================
+# FILE: sorter_rank.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'sorter_rank'
+        self.description = 'rank sorter'
+
+    def filter(self, context):
+        rank = context['vars']['deoplete#_rank']
+        complete_str = context['complete_str'].lower()
+        input_len = len(complete_str)
+        return sorted(context['candidates'],
+                      key=lambda x: -1 * rank[x['word']]
+                      if x['word'] in rank
+                      else abs(x['word'].lower().find(
+                          complete_str, 0, input_len)))
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_word.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_word.py
new file mode 100644
index 0000000..92c13dd
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/filter/sorter_word.py
@@ -0,0 +1,20 @@
+# ============================================================================
+# FILE: sorter_word.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+
+class Filter(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'sorter_word'
+        self.description = 'word sorter'
+
+    def filter(self, context):
+        return sorted(context['candidates'],
+                      key=lambda x: x['word'])
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/logger.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/logger.py
new file mode 100644
index 0000000..6a5718c
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/logger.py
@@ -0,0 +1,153 @@
+# ============================================================================
+# FILE: logger.py
+# AUTHOR: Tommy Allen <tommy at esdf.io>
+# License: MIT license
+# ============================================================================
+import sys
+import time
+import logging
+
+from functools import wraps
+from collections import defaultdict
+
+log_format = '%(asctime)s %(levelname)-8s [%(process)d] (%(name)s) %(message)s'
+log_message_cooldown = 0.5
+
+root = logging.getLogger('deoplete')
+root.propagate = False
+init = False
+
+
+def getLogger(name):
+    """Get a logger that is a child of the 'root' logger.
+    """
+    return root.getChild(name)
+
+
+def setup(vim, level, output_file=None):
+    """Setup logging for Deoplete
+    """
+    global init
+    if init:
+        return
+    init = True
+
+    if output_file:
+        formatter = logging.Formatter(log_format)
+        handler = logging.FileHandler(filename=output_file)
+        handler.setFormatter(formatter)
+        handler.addFilter(DeopleteLogFilter(vim))
+        root.addHandler(handler)
+
+        level = str(level).upper()
+        if level not in ('DEBUG', 'INFO', 'WARN', 'WARNING', 'ERROR',
+                         'CRITICAL', 'FATAL'):
+            level = 'DEBUG'
+        root.setLevel(getattr(logging, level))
+
+        try:
+            import pkg_resources
+
+            neovim_version = pkg_resources.get_distribution('neovim').version
+        except ImportError:
+            neovim_version = 'unknown'
+
+        log = getLogger('logging')
+        log.info('--- Deoplete Log Start ---')
+        log.info('%s, Python %s, neovim client %s',
+                 vim.call('deoplete#util#neovim_version'),
+                 '.'.join(map(str, sys.version_info[:3])),
+                 neovim_version)
+
+        if not vim.vars.get('deoplete#_logging_notified'):
+            vim.vars['deoplete#_logging_notified'] = 1
+            vim.call('deoplete#util#print_debug', 'Logging to %s' % (
+                output_file))
+
+
+def logmethod(func):
+    """Decorator for setting up the logger in LoggingMixin subclasses.
+
+    This does not guarantee that log messages will be generated.  If
+    `LoggingMixin.is_debug_enabled` is True, it will be propagated up to the
+    root 'deoplete' logger.
+    """
+    @wraps(func)
+    def wrapper(self, *args, **kwargs):
+        if not init or not self.is_debug_enabled:
+            return
+        if self._logger is None:
+            self._logger = getLogger(getattr(self, 'name', 'unknown'))
+        return func(self, *args, **kwargs)
+    return wrapper
+
+
+class LoggingMixin(object):
+    """Class that adds logging functions to a subclass.
+    """
+    is_debug_enabled = False
+    _logger = None  # type: logging.Logger
+
+    @logmethod
+    def debug(self, msg, *args, **kwargs):
+        self._logger.debug(msg, *args, **kwargs)
+
+    @logmethod
+    def info(self, msg, *args, **kwargs):
+        self._logger.info(msg, *args, **kwargs)
+
+    @logmethod
+    def warning(self, msg, *args, **kwargs):
+        self._logger.warning(msg, *args, **kwargs)
+    warn = warning
+
+    @logmethod
+    def error(self, msg, *args, **kwargs):
+        self._logger.error(msg, *args, **kwargs)
+
+    @logmethod
+    def exception(self, msg, *args, **kwargs):
+        # This will not produce a log message if there is no exception to log.
+        self._logger.exception(msg, *args, **kwargs)
+
+    @logmethod
+    def critical(self, msg, *args, **kwargs):
+        self._logger.critical(msg, *args, **kwargs)
+    fatal = critical
+
+
+class DeopleteLogFilter(logging.Filter):
+    def __init__(self, vim, name=''):
+        self.vim = vim
+        self.counter = defaultdict(int)
+        self.last_message_time = 0
+        self.last_message = None
+
+    def filter(self, record):
+        t = time.time()
+        elapsed = t - self.last_message_time
+        self.last_message_time = t
+
+        message = (record.levelno, record.name, record.msg, record.args)
+        if message == self.last_message and elapsed < log_message_cooldown:
+            # Ignore if the same message comes in too fast.
+            return False
+        self.last_message = message
+
+        if record.levelno >= logging.ERROR:
+            self.counter[record.name] += 1
+            if self.counter[record.name] <= 2:
+                # Only permit 2 errors in succession from a logging source to
+                # display errors inside of Neovim.  After this, it is no longer
+                # permitted to emit any more errors and should be addressed.
+                self.vim.call('deoplete#util#print_error', record.getMessage(),
+                              record.name)
+            if record.exc_info and record.stack_info:
+                # Add a penalty for messages that generate exceptions to avoid
+                # making the log harder to read with doubled stack traces.
+                self.counter[record.name] += 1
+        elif self.counter[record.name] < 2:
+            # If below the threshold for silencing a logging source, reset its
+            # counter.
+            self.counter[record.name] = 0
+        return True
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/parent.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/parent.py
new file mode 100644
index 0000000..046df33
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/parent.py
@@ -0,0 +1,137 @@
+# ============================================================================
+# FILE: parent.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import time
+import os
+import msgpack
+import subprocess
+from functools import partial
+from queue import Queue
+
+from deoplete import logger
+from deoplete.process import Process
+from deoplete.util import error_tb, error
+
+dp_main = os.path.join(os.path.dirname(__file__), 'dp_main.py')
+
+
+class Parent(logger.LoggingMixin):
+
+    def __init__(self, vim, context):
+        self.name = 'parent'
+
+        self._vim = vim
+        self._hnd = None
+        self._stdin = None
+        self._child = None
+        self._queue_id = ''
+        self._prev_pos = []
+        self._queue_in = Queue()
+        self._queue_out = Queue()
+        self._packer = msgpack.Packer(
+            use_bin_type=True,
+            encoding='utf-8',
+            unicode_errors='surrogateescape')
+        self._unpacker = msgpack.Unpacker(
+            encoding='utf-8',
+            unicode_errors='surrogateescape')
+        self._start_process(context)
+
+    def enable_logging(self):
+        self._put('enable_logging', [])
+        self.is_debug_enabled = True
+
+    def add_source(self, path):
+        self._put('add_source', [path])
+
+    def add_filter(self, path):
+        self._put('add_filter', [path])
+
+    def set_source_attributes(self, context):
+        self._put('set_source_attributes', [context])
+
+    def set_custom(self, custom):
+        self._put('set_custom', [custom])
+
+    def merge_results(self, context):
+        if self._child:
+            results = self._put('merge_results', [context])
+        else:
+            if context['position'] == self._prev_pos and self._queue_id:
+                # Use previous id
+                queue_id = self._queue_id
+            else:
+                queue_id = self._put('merge_results', [context])
+                if not queue_id:
+                    return (False, [])
+
+            get = self._get(queue_id)
+            if not get:
+                # Skip the next merge_results
+                self._queue_id = queue_id
+                self._prev_pos = context['position']
+                return (True, [])
+            self._queue_id = ''
+            results = get[0]
+        return (results['is_async'],
+                results['merged_results']) if results else (False, [])
+
+    def on_event(self, context):
+        self._put('on_event', [context])
+
+    def _start_process(self, context):
+        if self._vim.vars['deoplete#num_processes'] > 1:
+            # Parallel
+
+            startupinfo = None
+            if os.name == 'nt':
+                startupinfo = subprocess.STARTUPINFO()
+                startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+
+            self._hnd = self._vim.loop.create_task(
+                self._vim.loop.subprocess_exec(
+                    partial(Process, self),
+                    self._vim.vars.get('python3_host_prog', 'python3'),
+                    dp_main,
+                    self._vim.vars['deoplete#_serveraddr'],
+                    stderr=None, cwd=context['cwd'], startupinfo=startupinfo))
+        else:
+            # Serial
+            from deoplete.child import Child
+            self._child = Child(self._vim)
+
+    def _put(self, name, args):
+        queue_id = str(time.time())
+
+        if self._child:
+            return self._child.main(name, args, queue_id)
+
+        if not self._hnd:
+            return None
+
+        msg = self._packer.pack({
+            'name': name, 'args': args, 'queue_id': queue_id
+        })
+        self._queue_in.put(msg)
+
+        if self._stdin:
+            try:
+                while not self._queue_in.empty():
+                    self._stdin.write(self._queue_in.get_nowait())
+            except BrokenPipeError as e:
+                error_tb(self._vim, 'Crash in child process')
+                error(self._vim, 'stderr=' + str(self._proc.read_error()))
+                self._hnd = None
+        return queue_id
+
+    def _get(self, queue_id):
+        if not self._hnd:
+            return []
+
+        outs = []
+        while not self._queue_out.empty():
+            outs.append(self._queue_out.get_nowait())
+        return [x for x in outs if x['queue_id'] == queue_id]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/process.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/process.py
new file mode 100644
index 0000000..342f944
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/process.py
@@ -0,0 +1,26 @@
+# ============================================================================
+# FILE: process.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import asyncio
+
+
+class Process(asyncio.SubprocessProtocol):
+
+    def __init__(self, plugin):
+        self._plugin = plugin
+        self._vim = plugin._vim
+
+    def connection_made(self, transport):
+        self._plugin._stdin = transport.get_pipe_transport(0)
+
+    def pipe_data_received(self, fd, data):
+        unpacker = self._plugin._unpacker
+        unpacker.feed(data)
+        for child_out in unpacker:
+            self._plugin._queue_out.put(child_out)
+
+    def process_exited(self):
+        pass
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/around.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/around.py
new file mode 100644
index 0000000..7dd2550
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/around.py
@@ -0,0 +1,52 @@
+# ============================================================================
+# FILE: around.py
+# AUTHOR: Khalidov Oleg <brooth at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+
+from .base import Base
+from deoplete.util import parse_buffer_pattern, getlines
+
+LINES_ABOVE = 20
+LINES_BELOW = 20
+
+
+class Source(Base):
+    def __init__(self, vim):
+        super().__init__(vim)
+        self.name = 'around'
+        self.mark = '[~]'
+        self.rank = 300
+
+    def gather_candidates(self, context):
+        line = context['position'][1]
+        candidates = []
+
+        # lines above
+        words = parse_buffer_pattern(
+            reversed(getlines(self.vim, max([1, line - LINES_ABOVE]), line)),
+            context['keyword_patterns'])
+        candidates += [{'word': x, 'menu': 'A'} for x in words]
+
+        # grab ':changes' command output
+        p = re.compile(r'[\s\d]+')
+        lines = set()
+        for change_line in [x[p.search(x).span()[1]:] for x
+                            in self.vim.call(
+                                'execute', 'changes').split('\n')
+                            if p.search(x)]:
+            if change_line and change_line != '-invalid-':
+                lines.add(change_line)
+
+        words = parse_buffer_pattern(lines, context['keyword_patterns'])
+        candidates += [{'word': x, 'menu': 'C'} for x in words]
+
+        # lines below
+        words = parse_buffer_pattern(
+            getlines(self.vim, line, line + LINES_BELOW),
+            context['keyword_patterns'])
+        candidates += [{'word': x, 'menu': 'B'} for x in words]
+
+        return candidates
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/base.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/base.py
new file mode 100644
index 0000000..c6d43d5
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/base.py
@@ -0,0 +1,56 @@
+# ============================================================================
+# FILE: base.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from abc import abstractmethod
+from deoplete.logger import LoggingMixin
+from deoplete.util import debug, error_vim
+
+
+class Base(LoggingMixin):
+
+    def __init__(self, vim):
+        self.vim = vim
+        self.description = ''
+        self.mark = ''
+        self.max_pattern_length = 80
+        self.input_pattern = ''
+        self.matchers = ['matcher_fuzzy']
+        self.sorters = ['sorter_rank']
+        self.converters = [
+            'converter_remove_overlap',
+            'converter_truncate_abbr',
+            'converter_truncate_kind',
+            'converter_truncate_menu']
+        self.filetypes = []
+        self.debug_enabled = False
+        self.is_bytepos = False
+        self.is_initialized = False
+        self.is_volatile = False
+        self.is_silent = False
+        self.rank = 100
+        self.disabled_syntaxes = []
+        self.events = None
+
+    def get_complete_position(self, context):
+        m = re.search('(?:' + context['keyword_patterns'] + ')$',
+                      context['input'])
+        return m.start() if m else -1
+
+    def print(self, expr):
+        if not self.is_silent:
+            debug(self.vim, expr)
+
+    def print_error(self, expr):
+        if not self.is_silent:
+            error_vim(self.vim, expr)
+
+    @abstractmethod
+    def gather_candidates(self, context):
+        pass
+
+    def on_event(self, context):
+        pass
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/buffer.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/buffer.py
new file mode 100644
index 0000000..2083338
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/buffer.py
@@ -0,0 +1,63 @@
+# ============================================================================
+# FILE: buffer.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+from deoplete.util import parse_buffer_pattern, getlines
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'buffer'
+        self.mark = '[B]'
+        self.events = ['Init', 'InsertEnter', 'BufWritePost']
+
+        self._limit = 1000000
+        self._buffers = {}
+        self._max_lines = 5000
+
+    def on_event(self, context):
+        if (context['bufnr'] not in self._buffers
+                or context['event'] == 'BufWritePost'):
+            self._make_cache(context)
+
+    def gather_candidates(self, context):
+        self.on_event(context)
+
+        tab_bufnrs = self.vim.call('tabpagebuflist')
+        same_filetype = context['vars'].get(
+            'deoplete#buffer#require_same_filetype', True)
+        return {'sorted_candidates': [
+            x['candidates'] for x in self._buffers.values()
+            if not same_filetype or
+            x['filetype'] in context['filetypes'] or
+            x['filetype'] in context['same_filetypes'] or
+            x['bufnr'] in tab_bufnrs
+        ]}
+
+    def _make_cache(self, context):
+        # Bufsize check
+        size = self.vim.call('line2byte',
+                             self.vim.call('line', '$') + 1) - 1
+        if size > self._limit:
+            return
+
+        try:
+            self._buffers[context['bufnr']] = {
+                'bufnr': context['bufnr'],
+                'filetype': self.vim.eval('&l:filetype'),
+                'candidates': [
+                    {'word': x} for x in
+                    sorted(parse_buffer_pattern(getlines(self.vim),
+                                                context['keyword_patterns']),
+                           key=str.lower)
+                ]
+            }
+        except UnicodeDecodeError:
+            return []
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/dictionary.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/dictionary.py
new file mode 100644
index 0000000..4bf111c
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/dictionary.py
@@ -0,0 +1,51 @@
+# ============================================================================
+# FILE: dictionary.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from os.path import getmtime, exists
+from collections import namedtuple
+from .base import Base
+
+DictCacheItem = namedtuple('DictCacheItem', 'mtime candidates')
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'dictionary'
+        self.mark = '[D]'
+        self.events = ['Init', 'InsertEnter']
+
+        self._cache = {}
+
+    def on_event(self, context):
+        self._make_cache(context)
+
+    def gather_candidates(self, context):
+        self._make_cache(context)
+
+        candidates = []
+        for filename in [x for x in self._get_dictionaries(context)
+                         if x in self._cache]:
+            candidates.append(self._cache[filename].candidates)
+        return {'sorted_candidates': candidates}
+
+    def _make_cache(self, context):
+        for filename in self._get_dictionaries(context):
+            mtime = getmtime(filename)
+            if filename in self._cache and self._cache[
+                    filename].mtime == mtime:
+                continue
+            with open(filename, 'r', errors='replace') as f:
+                self._cache[filename] = DictCacheItem(
+                    mtime, [{'word': x} for x in sorted(
+                        [x.strip() for x in f], key=str.lower)]
+                )
+
+    def _get_dictionaries(self, context):
+        return [x for x in context['dict__dictionary'].split(',')
+                if exists(x)]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/file.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/file.py
new file mode 100644
index 0000000..514f4de
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/file.py
@@ -0,0 +1,86 @@
+# ============================================================================
+# FILE: file.py
+# AUTHOR: Felipe Morales <hel.sheep at gmail.com>
+#         Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import os
+import re
+from os.path import exists, dirname
+from .base import Base
+from deoplete.util import expand
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'file'
+        self.mark = '[F]'
+        self.min_pattern_length = 0
+        self.rank = 150
+        self.events = ['Init', 'InsertEnter']
+
+        self._isfname = ''
+
+    def on_init(self, context):
+        self._buffer_path = context['vars'].get(
+            'deoplete#file#enable_buffer_path', 0)
+
+    def on_event(self, context):
+        self._isfname = self.vim.call(
+            'deoplete#util#vimoption2python_not',
+            self.vim.options['isfname'])
+
+    def get_complete_position(self, context):
+        pos = context['input'].rfind('/')
+        return pos if pos < 0 else pos + 1
+
+    def gather_candidates(self, context):
+        if not self._isfname:
+            self.on_event(context)
+
+        p = self._longest_path_that_exists(context, context['input'])
+        if p in (None, []) or p == '/' or re.search('//+$', p):
+            return []
+        complete_str = self._substitute_path(context, dirname(p) + '/')
+        if not os.path.isdir(complete_str):
+            return []
+        hidden = context['complete_str'].find('.') == 0
+        contents = [[], []]
+        try:
+            for item in sorted(os.listdir(complete_str), key=str.lower):
+                if not hidden and item[0] == '.':
+                    continue
+                contents[not os.path.isdir(complete_str + item)].append(item)
+        except PermissionError:
+            pass
+
+        dirs, files = contents
+        return [{'word': x, 'abbr': x + '/'} for x in dirs
+                ] + [{'word': x} for x in files]
+
+    def _longest_path_that_exists(self, context, input_str):
+        input_str = re.sub(r'[^/]*$', '', input_str)
+        data = re.split(r'((?:%s+|(?:(?<![\w\s/\.])(?:~|\.{1,2})?/)+))' %
+                        self._isfname, input_str)
+        data = [''.join(data[i:]) for i in range(len(data))]
+        existing_paths = sorted(filter(lambda x: exists(
+            dirname(self._substitute_path(context, x))), data))
+        return existing_paths[-1] if existing_paths else None
+
+    def _substitute_path(self, context, path):
+        m = re.match(r'(\.{1,2})/+', path)
+        if m:
+            if self._buffer_path and context['bufpath']:
+                base = context['bufpath']
+            else:
+                base = os.path.join(context['cwd'], 'x')
+
+            for _ in m.group(1):
+                base = dirname(base)
+            return os.path.abspath(os.path.join(
+                base, path[len(m.group(0)):])) + '/'
+        return expand(path)
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/member.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/member.py
new file mode 100644
index 0000000..3794f1e
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/member.py
@@ -0,0 +1,62 @@
+# ============================================================================
+# FILE: member.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+import re
+from deoplete.util import (
+    get_buffer_config, convert2list,
+    parse_buffer_pattern, set_pattern, getlines)
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'member'
+        self.mark = '[M]'
+        self.min_pattern_length = 0
+
+        self._object_pattern = r'[a-zA-Z_]\w*(?:\(\)?)?'
+        self._prefix = ''
+
+        self._prefix_patterns = {}
+        set_pattern(self._prefix_patterns,
+                    '_', '\.')
+        set_pattern(self._prefix_patterns,
+                    'c,objc', ['\.', '->'])
+        set_pattern(self._prefix_patterns,
+                    'cpp,objcpp', ['\.', '->', '::'])
+        set_pattern(self._prefix_patterns,
+                    'perl,php', ['->'])
+        set_pattern(self._prefix_patterns,
+                    'ruby', ['\.', '::'])
+        set_pattern(self._prefix_patterns,
+                    'lua', ['\.', ':'])
+
+    def get_complete_position(self, context):
+        # Check member prefix pattern.
+        for prefix_pattern in convert2list(
+                get_buffer_config(context, context['filetype'],
+                                  'deoplete_member_prefix_patterns',
+                                  'deoplete#member#prefix_patterns',
+                                  self._prefix_patterns)):
+            m = re.search(self._object_pattern + prefix_pattern + r'\w*$',
+                          context['input'])
+            if m is None or prefix_pattern == '':
+                continue
+            self._prefix = re.sub(r'\w*$', '', m.group(0))
+            return re.search(r'\w*$', context['input']).start()
+        return -1
+
+    def gather_candidates(self, context):
+        return [{'word': x} for x in
+                parse_buffer_pattern(
+                    getlines(self.vim),
+                    r'(?<=' + re.escape(self._prefix) + r')\w+'
+                )
+                if x != context['complete_str']]
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/omni.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/omni.py
new file mode 100644
index 0000000..c3e1385
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/omni.py
@@ -0,0 +1,98 @@
+# ============================================================================
+# FILE: omni.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import re
+from .base import Base
+from deoplete.util import (
+    get_buffer_config, convert2list, set_pattern, convert2candidates)
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'omni'
+        self.mark = '[O]'
+        self.rank = 500
+        self.is_bytepos = True
+        self.min_pattern_length = 0
+
+        self._input_patterns = {}
+        set_pattern(self._input_patterns, 'css,less,scss,sass',
+                    [r'\w{2}', r'\w+[):;]?\s*\w*', r'[@!]'])
+        set_pattern(self._input_patterns, 'lua',
+                    [r'\w+[.:]\w*', r'require\s*\(?["'']\w*'])
+
+    def get_complete_position(self, context):
+        current_ft = self.vim.eval('&filetype')
+
+        for filetype in list(set([context['filetype']] +
+                                 context['filetype'].split('.'))):
+            pos = self._get_complete_position(context, current_ft, filetype)
+            if pos >= 0:
+                return pos
+        return -1
+
+    def _get_complete_position(self, context, current_ft, filetype):
+        for omnifunc in convert2list(
+                get_buffer_config(context, filetype,
+                                  'deoplete_omni_functions',
+                                  'deoplete#omni#functions',
+                                  {'_': ''})):
+            if omnifunc == '' and (filetype == current_ft or
+                                   filetype in ['css', 'javascript']):
+                omnifunc = context['omni__omnifunc']
+            if omnifunc == '':
+                continue
+            self._omnifunc = omnifunc
+            for input_pattern in convert2list(
+                    get_buffer_config(context, filetype,
+                                      'deoplete_omni_input_patterns',
+                                      'deoplete#omni#input_patterns',
+                                      self._input_patterns)):
+
+                m = re.search('(' + input_pattern + ')$', context['input'])
+                # self.debug(filetype)
+                # self.debug(input_pattern)
+                if input_pattern == '' or (context['event'] !=
+                                           'Manual' and m is None):
+                    continue
+
+                if filetype == current_ft and self._omnifunc in [
+                        'ccomplete#Complete',
+                        'htmlcomplete#CompleteTags',
+                        'LanguageClient#complete',
+                        'phpcomplete#CompletePHP']:
+                    # In the blacklist
+                    return -1
+                try:
+                    complete_pos = self.vim.call(self._omnifunc, 1, '')
+                except Exception as e:
+                    self.print_error('Error occurred calling omnifunction: ' +
+                                     self._omnifunc)
+                    return -1
+                return complete_pos
+        return -1
+
+    def gather_candidates(self, context):
+        try:
+            candidates = self.vim.call(self._omnifunc, 0, '')
+            if isinstance(candidates, dict):
+                candidates = candidates['words']
+            elif isinstance(candidates, int):
+                candidates = []
+        except Exception as e:
+            self.print_error('Error occurred calling omnifunction: ' +
+                             self._omnifunc)
+            candidates = []
+
+        candidates = convert2candidates(candidates)
+
+        for candidate in candidates:
+            candidate['dup'] = 1
+
+        return candidates
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/tag.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/tag.py
new file mode 100644
index 0000000..2ee8116
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/source/tag.py
@@ -0,0 +1,156 @@
+# ============================================================================
+# FILE: tag.py
+# AUTHOR: Felipe Morales <hel.sheep at gmail.com>
+#         Shougo Matsushita <Shougo.Matsu at gmail.com>
+#         Roxma <roxma at qq.com>
+# License: MIT license
+# ============================================================================
+
+from .base import Base
+
+import re
+import os
+from os.path import exists, getsize
+
+
+class Source(Base):
+
+    def __init__(self, vim):
+        super().__init__(vim)
+
+        self.name = 'tag'
+        self.mark = '[T]'
+
+    def on_init(self, context):
+        self._limit = context['vars'].get(
+            'deoplete#tag#cache_limit_size', 500000)
+
+    def gather_candidates(self, context):
+        candidates = []
+        for filename in self._get_tagfiles(context):
+            for line in binary_search_lines_by_prefix(
+                    context['complete_str'], filename):
+                candidate = self._make_candidate(line)
+                if candidate:
+                    candidates.append(candidate)
+        return candidates
+
+    def _make_candidate(self, line):
+        cols = line.strip().split('\t', 2)
+        if not cols or cols[0].startswith('!_'):
+            return {}
+
+        tagfield = {}
+        if ';"' in cols[-1]:
+            cols[-1], fields = cols[-1].split(';"', 1)
+            for pair in fields.split('\t'):
+                if ':' not in pair:
+                    tagfield['kind'] = pair
+                else:
+                    k, v = pair.split(':', 1)
+                    tagfield[k] = v
+
+        kind = tagfield.get('kind', '')
+        if kind == 'f':
+            i = cols[2].find('(')
+            if i != -1 and cols[2].find(')', i+1) != -1:
+                m = re.search(r'(\w+\(.*\))', cols[2])
+                if m:
+                    return {'word': cols[0], 'abbr': m.group(1), 'kind': kind}
+        return {'word': cols[0], 'kind': kind}
+
+    def _get_tagfiles(self, context):
+        include_files = self.vim.call(
+            'neoinclude#include#get_tag_files') if self.vim.call(
+                'exists', '*neoinclude#include#get_tag_files') else []
+        return [x for x in self.vim.call(
+                'map', self.vim.call('tagfiles') + include_files,
+                'fnamemodify(v:val, ":p")')
+                if exists(x) and getsize(x) < self._limit]
+
+
+def binary_search_lines_by_prefix(prefix, filename):
+
+    with open(filename, 'r', errors='ignore') as f:
+        # to properly keep bounds of this loop it's important to understand
+        # *exactly* what our variables mean.
+        #
+        # to make sure we process only full lines, we are going to always seek
+        # to file position (x - 1), then skip partial or full line found there.
+        # except for position 0 which we know belongs to full 1st line.
+
+        # each line (except 1st one) will have multiple corresponding seeking
+        # positions.
+        #
+        # we are interested in finding such a seeking position for the first
+        # line in the file that matches our prefix. (let's call it target)
+
+        # begin - guaranteed not to exceed our target position
+        # e.g. (begin <= target) at any time.
+        begin = 0
+
+        # end - guaranteed to be higher then at least one seeking position for
+        # the target. e.g. (target < end) at any time.
+        # Note that this means it can be below the actual target line
+        f.seek(0, os.SEEK_END)
+        end = f.tell()
+
+        while end > begin + 1:
+
+            # pos - current seeking position
+            pos = int((begin + end) / 2) - 1
+
+            if pos == 0:
+                f.seek(0, os.SEEK_SET)
+            else:
+                f.seek(pos - 1, os.SEEK_SET)
+                f.readline()  # skip partial line
+
+            line = f.readline()
+
+            l2 = f.tell()  # start of next line (or end of file)
+
+            if l2 == 1:
+                # this is a corner case of a single empty first line.
+                # we mast advance here or we'll have an endless loop
+                begin = 1
+                next
+
+            if line:
+                key = line[:len(prefix)]
+
+                if key < prefix:
+                    # we are strictly before the target line.
+                    # so it starts at least from l2
+                    begin = max(begin, l2)
+
+                elif key > prefix:
+                    # we are strictly past the target line.
+                    # our target seeking position is less than current pos
+                    end = pos
+                else:
+                    # current line is a possible target.  it's reachable from
+                    # current 'pos', so `target pos is <= current pos`, or
+                    # `target post < current post + 1`
+                    end = min(end, pos + 1)
+
+            else:
+                # we reached end of file. our current seeking position doesn't
+                # correspond to any line
+                end = min(end, pos)
+
+        # now we are at a *seeking position* for the target line. need to skip
+        # to the actual line
+        if begin == 0:
+            f.seek(0, os.SEEK_SET)
+        else:
+            f.seek(begin - 1, os.SEEK_SET)
+            f.readline()
+
+        while True:
+            line = f.readline()
+            if line.startswith(prefix):
+                yield line
+            else:
+                break
+        return
diff --git a/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/util.py b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/util.py
new file mode 100644
index 0000000..db21163
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/rplugin/python3/deoplete/util.py
@@ -0,0 +1,308 @@
+# ============================================================================
+# FILE: util.py
+# AUTHOR: Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+# ============================================================================
+
+import os
+import re
+import sys
+import glob
+import traceback
+import unicodedata
+
+from importlib.machinery import SourceFileLoader
+
+
+def get_buffer_config(context, filetype, buffer_var, user_var, default_var):
+    if buffer_var in context['bufvars']:
+        return context['bufvars'][buffer_var]
+
+    ft = filetype if (filetype in context['vars'][user_var] or
+                      filetype in default_var) else '_'
+    default = default_var.get(ft, '')
+    return context['vars'][user_var].get(ft, default)
+
+
+def get_simple_buffer_config(context, buffer_var, user_var):
+    return (context['bufvars'][buffer_var]
+            if buffer_var in context['bufvars']
+            else context['vars'][user_var])
+
+
+def set_pattern(variable, keys, pattern):
+    for key in keys.split(','):
+        variable[key] = pattern
+
+
+def set_list(vim, variable, keys, list):
+    return vim.call('deoplete#util#set_pattern', variable, keys, list)
+
+
+def set_default(vim, var, val):
+    return vim.call('deoplete#util#set_default', var, val)
+
+
+def convert2list(expr):
+    return (expr if isinstance(expr, list) else [expr])
+
+
+def convert2candidates(l):
+    return ([{'word': x} for x in l]
+            if l and isinstance(l, list) and isinstance(l[0], str) else l)
+
+
+def globruntime(runtimepath, path):
+    ret = []
+    for rtp in re.split(',', runtimepath):
+        ret += glob.glob(rtp + '/' + path)
+    return ret
+
+
+def find_rplugins(context, source):
+    """Search for base.py or *.py
+
+    Searches $VIMRUNTIME/*/rplugin/python3/deoplete/$source[s]/
+    """
+    rtp = context.get('runtimepath', '').split(',')
+    if not rtp:
+        return
+
+    sources = (
+        os.path.join('rplugin/python3/deoplete', source, 'base.py'),
+        os.path.join('rplugin/python3/deoplete', source, '*.py'),
+        os.path.join('rplugin/python3/deoplete', source + 's', '*.py'),
+        os.path.join('rplugin/python3/deoplete', source, '*', '*.py'),
+    )
+
+    for src in sources:
+        for path in rtp:
+            yield from glob.iglob(os.path.join(path, src))
+
+
+def import_plugin(path, source, classname):
+    """Import Deoplete plugin source class.
+
+    If the class exists, add its directory to sys.path.
+    """
+    name = os.path.splitext(os.path.basename(path))[0]
+    module_name = 'deoplete.%s.%s' % (source, name)
+
+    module = SourceFileLoader(module_name, path).load_module()
+    cls = getattr(module, classname, None)
+    if not cls:
+        return None
+
+    dirname = os.path.dirname(path)
+    if dirname not in sys.path:
+        sys.path.insert(0, dirname)
+    return cls
+
+
+def debug(vim, expr):
+    if hasattr(vim, 'out_write'):
+        string = (expr if isinstance(expr, str) else str(expr))
+        return vim.out_write('[deoplete] ' + string + '\n')
+    else:
+        vim.call('deoplete#util#print_debug', expr)
+
+
+def error(vim, expr):
+    if hasattr(vim, 'err_write'):
+        string = (expr if isinstance(expr, str) else str(expr))
+        return vim.err_write('[deoplete] ' + string + '\n')
+    else:
+        vim.call('deoplete#util#print_error', expr)
+
+
+def error_tb(vim, msg):
+    lines = traceback.format_exc().splitlines()
+    lines += ['%s.  Use :messages / see above for error details.' % msg]
+    if hasattr(vim, 'err_write'):
+        vim.err_write('[deoplete] %s\n' % '\n'.join(lines))
+    else:
+        for line in lines:
+            vim.call('deoplete#util#print_error', line)
+
+
+def error_vim(vim, msg):
+    throwpoint = vim.eval('v:throwpoint')
+    if throwpoint != '':
+        error(vim, 'v:throwpoint = ' + throwpoint)
+    exception = vim.eval('v:exception')
+    if exception != '':
+        error(vim, 'v:exception = ' + exception)
+    error_tb(vim, msg)
+
+
+def escape(expr):
+    return expr.replace("'", "''")
+
+
+def charpos2bytepos(encoding, input, pos):
+    return len(bytes(input[: pos], encoding, errors='replace'))
+
+
+def bytepos2charpos(encoding, input, pos):
+    return len(bytes(input, encoding, errors='replace')[: pos].decode(
+        encoding, errors='replace'))
+
+
+def get_custom(custom, source_name, key, default):
+    custom_source = custom['source']
+    if source_name not in custom_source:
+        return get_custom(custom, '_', key, default)
+    elif key in custom_source[source_name]:
+        return custom_source[source_name][key]
+    elif key in custom_source['_']:
+        return custom_source['_'][key]
+    else:
+        return default
+
+
+def get_syn_names(vim):
+    return vim.call('deoplete#util#get_syn_names')
+
+
+def parse_file_pattern(f, pattern):
+    p = re.compile(pattern)
+    ret = []
+    for l in f:
+        ret += p.findall(l)
+    return list(set(ret))
+
+
+def parse_buffer_pattern(b, pattern):
+    return list(set(re.compile(pattern).findall('\n'.join(b))))
+
+
+def fuzzy_escape(string, camelcase):
+    # Escape string for python regexp.
+    p = re.sub(r'([a-zA-Z0-9_])', r'\1.*', re.escape(string))
+    if camelcase and re.search(r'[A-Z]', string):
+        p = re.sub(r'([a-z])', (lambda pat:
+                                '['+pat.group(1)+pat.group(1).upper()+']'), p)
+    p = re.sub(r'([a-zA-Z0-9_])\.\*', r'\1[^\1]*', p)
+    return p
+
+
+def load_external_module(file, module):
+    current = os.path.dirname(os.path.abspath(file))
+    module_dir = os.path.join(os.path.dirname(current), module)
+    if module_dir not in sys.path:
+        sys.path.insert(0, module_dir)
+
+
+def truncate_skipping(string, max_width, footer, footer_len):
+    if not string:
+        return ''
+    if len(string) <= max_width/2:
+        return string
+    if strwidth(string) <= max_width:
+        return string
+
+    footer += string[
+            -len(truncate(string[::-1], footer_len)):]
+    return truncate(string, max_width - strwidth(footer)) + footer
+
+
+def truncate(string, max_width):
+    if len(string) <= max_width/2:
+        return string
+    if strwidth(string) <= max_width:
+        return string
+
+    width = 0
+    ret = ''
+    for c in string:
+        wc = charwidth(c)
+        if width + wc > max_width:
+            break
+        ret += c
+        width += wc
+    return ret
+
+
+def strwidth(string):
+    width = 0
+    for c in string:
+        width += charwidth(c)
+    return width
+
+
+def charwidth(c):
+    wc = unicodedata.east_asian_width(c)
+    return 2 if wc == 'F' or wc == 'W' else 1
+
+
+def expand(path):
+    return os.path.expanduser(os.path.expandvars(path))
+
+
+def getlines(vim, start=1, end='$'):
+    if end == '$':
+        end = len(vim.current.buffer)
+    max_len = min([end - start, 5000])
+    lines = []
+    current = start
+    while current <= end:
+        lines += vim.call('getline', current, current + max_len)
+        current += max_len + 1
+    return lines
+
+
+def binary_search_begin(l, prefix):
+    if not l:
+        return -1
+    if len(l) == 1:
+        return 0 if l[0]['word'].lower().startswith(prefix) else -1
+
+    s = 0
+    e = len(l)
+    prefix = prefix.lower()
+    while s < e:
+        index = int((s + e) / 2)
+        word = l[index]['word'].lower()
+        if word.startswith(prefix):
+            if (index - 1 < 0 or not
+                    l[index-1]['word'].lower().startswith(prefix)):
+                return index
+            e = index
+        elif prefix < word:
+            e = index
+        else:
+            s = index + 1
+    return -1
+
+
+def binary_search_end(l, prefix):
+    if not l:
+        return -1
+    if len(l) == 1:
+        return 0 if l[0]['word'].lower().startswith(prefix) else -1
+
+    s = 0
+    e = len(l)
+    prefix = prefix.lower()
+    while s < e:
+        index = int((s + e) / 2)
+        word = l[index]['word'].lower()
+        if word.startswith(prefix):
+            if ((index + 1) >= len(l) or not
+                    l[index+1]['word'].lower().startswith(prefix)):
+                return index
+            s = index + 1
+        elif prefix < word:
+            e = index
+        else:
+            s = index + 1
+    return -1
+
+
+def uniq_list_dict(l):
+    # Uniq list of dictionaries
+    ret = []
+    for d in l:
+        if d not in ret:
+            ret.append(d)
+    return ret
diff --git a/vim/plugins/deoplete.nvim/test/autoload/deoplete/custom.vim b/vim/plugins/deoplete.nvim/test/autoload/deoplete/custom.vim
new file mode 100644
index 0000000..83ee6bd
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/autoload/deoplete/custom.vim
@@ -0,0 +1,24 @@
+let s:suite = themis#suite('custom')
+let s:assert = themis#helper('assert')
+
+function! s:suite.custom() abort
+  call deoplete#custom#init()
+
+  call deoplete#custom#source('_',
+        \ 'matchers', ['matcher_head'])
+
+  call deoplete#custom#source('_', 'converters',
+        \ ['converter_auto_delimiter', 'remove_overlap'])
+
+  call s:assert.equals(
+        \ deoplete#custom#get().source,
+        \ {'_' : {
+        \  'matchers': ['matcher_head'],
+        \  'converters': ['converter_auto_delimiter', 'remove_overlap']}})
+
+  call deoplete#custom#init()
+
+  call deoplete#custom#source('buffer',
+        \ 'min_pattern_length', 9999)
+  call deoplete#custom#source('buffer', 'rank', 9999)
+endfunction
diff --git a/vim/plugins/deoplete.nvim/test/autoload/deoplete/util.vim b/vim/plugins/deoplete.nvim/test/autoload/deoplete/util.vim
new file mode 100644
index 0000000..e6ca889
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/autoload/deoplete/util.vim
@@ -0,0 +1,27 @@
+let s:suite = themis#suite('parser')
+let s:assert = themis#helper('assert')
+
+function! s:suite.vimoption2python() abort
+  call s:assert.equals(
+        \ deoplete#util#vimoption2python('@,48-57,_,\'), '[a-zA-Z@0-9_\\]')
+  call s:assert.equals(
+        \ deoplete#util#vimoption2python('@,-,48-57,_'), '[a-zA-Z@0-9_-]')
+  call s:assert.equals(
+        \ deoplete#util#vimoption2python('@,,,48-57,_'), '[a-zA-Z@,0-9_]')
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.10', '0.1.8'), 2)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.10', '0.1.10'), 0)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.10', '0.1.0010'), 0)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.1', '0.1.8'), -7)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.1000', '0.1.10'), 990)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('0.1.0001', '0.1.10'), -9)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('2.0.1', '1.3.5'), 9696)
+  call s:assert.equals(
+        \ deoplete#util#versioncmp('3.2.1', '0.0.0'), 30201)
+endfunction
diff --git a/vim/plugins/deoplete.nvim/test/conftest.py b/vim/plugins/deoplete.nvim/test/conftest.py
new file mode 100644
index 0000000..83e2163
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/conftest.py
@@ -0,0 +1,5 @@
+import os
+import sys
+
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+sys.path.insert(0, os.path.join(BASE_DIR, 'rplugin/python3'))
diff --git a/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_filter.py b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_filter.py
new file mode 100644
index 0000000..1541e55
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_filter.py
@@ -0,0 +1,35 @@
+import deoplete.util as util
+from deoplete.filter.converter_remove_overlap import overlap_length
+
+def test_fuzzy_escapse():
+    assert util.fuzzy_escape('foo', 0) == 'f[^f]*o[^o]*o[^o]*'
+    assert util.fuzzy_escape('foo', 1) == 'f[^f]*o[^o]*o[^o]*'
+    assert util.fuzzy_escape('Foo', 1) == 'F[^F]*[oO].*[oO].*'
+
+def test_overlap_length():
+    assert overlap_length('foo bar', 'bar baz') == 3
+    assert overlap_length('foobar', 'barbaz') == 3
+    assert overlap_length('foob', 'baz') == 1
+    assert overlap_length('foobar', 'foobar') == 6
+    assert overlap_length('тест', 'ст') == len('ст')
+
+def test_charwidth():
+    assert util.charwidth('f') == 1
+    assert util.charwidth('あ') == 2
+
+def test_strwidth():
+    assert util.strwidth('foo bar') == 7
+    assert util.strwidth('あいうえ') == 8
+    assert util.strwidth('fooあい') == 7
+
+def test_truncate():
+    assert util.truncate('foo bar', 3) == 'foo'
+    assert util.truncate('fooあい', 5) == 'fooあ'
+    assert util.truncate('あいうえ', 4) == 'あい'
+    assert util.truncate('fooあい', 4) == 'foo'
+
+def test_skipping():
+    assert util.truncate_skipping('foo bar', 3, '..', 3) == '..bar'
+    assert util.truncate_skipping('foo bar', 6, '..', 3) == 'f..bar'
+    assert util.truncate_skipping('fooあい', 5, '..', 3) == 'f..い'
+    assert util.truncate_skipping('あいうえ', 6, '..', 2) == 'あ..え'
diff --git a/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_full_fuzzy.py b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_full_fuzzy.py
new file mode 100644
index 0000000..129bdf5
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_full_fuzzy.py
@@ -0,0 +1,59 @@
+from deoplete.filter.matcher_full_fuzzy import Filter
+from test_matcher_fuzzy import _ctx
+
+
+def test_matcher_full_fuzzy():
+    f = Filter(None)
+
+    assert f.name == 'matcher_full_fuzzy'
+    assert f.description == 'full fuzzy matcher'
+
+    ctx = _ctx('')
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'aFoobar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    ctx = _ctx('FOBR')
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'aFoobar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    ctx = _ctx('foBr', ignorecase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    ctx = _ctx('fobr', camelcase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'aFoobar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    ctx = _ctx('fobr', ignorecase=False, camelcase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+    ]
diff --git a/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_fuzzy.py b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_fuzzy.py
new file mode 100644
index 0000000..8dd01c6
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_matcher_fuzzy.py
@@ -0,0 +1,67 @@
+from deoplete.filter.matcher_fuzzy import Filter
+
+
+def _ctx(complete_str, ignorecase=True, camelcase=True):
+    _candidates = [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'aFoobar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    return {
+        'complete_str' : complete_str,
+        'ignorecase'   : ignorecase,
+        'camelcase'    : camelcase,
+        'is_sorted'    : False,
+        'candidates'   : _candidates
+    }
+
+def test_matcher_fuzzy():
+    f = Filter(None)
+
+    assert f.name == 'matcher_fuzzy'
+    assert f.description == 'fuzzy matcher'
+
+    ctx = _ctx('')
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'afoobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'afooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'aFoobar' },
+        { 'word': 'FooBar' },
+        { 'word': 'aFooBar' },
+    ]
+
+    ctx = _ctx('FOBR')
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'FooBar' },
+    ]
+
+    ctx = _ctx('foBr', ignorecase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'fooBar' },
+        { 'word': 'FooBar' },
+    ]
+
+    ctx = _ctx('fobr', camelcase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+        { 'word': 'fooBar' },
+        { 'word': 'Foobar' },
+        { 'word': 'FooBar' },
+    ]
+
+    ctx = _ctx('fobr', ignorecase=False, camelcase=False)
+    assert f.filter(ctx) == [
+        { 'word': 'foobar' },
+    ]
diff --git a/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_util.py b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_util.py
new file mode 100644
index 0000000..9dd573f
--- /dev/null
+++ b/vim/plugins/deoplete.nvim/test/rplugin/python3/deoplete/test_util.py
@@ -0,0 +1,69 @@
+import deoplete.util as util
+
+
+def test_pos():
+    assert util.bytepos2charpos('utf-8', 'foo bar', 3) == 3
+    assert util.bytepos2charpos('utf-8', 'あああ', 3) == 1
+    assert util.charpos2bytepos('utf-8', 'foo bar', 3) == 3
+    assert util.charpos2bytepos('utf-8', 'あああ', 3) == 9
+
+
+def test_custom():
+    custom = {'source':{}}
+    custom['source'] = {'_': {'mark': ''}, 'java': {'converters': []}}
+    assert util.get_custom(custom, 'java', 'mark', 'foobar') == ''
+    assert util.get_custom(custom, 'java', 'converters', 'foobar') == []
+    assert util.get_custom(custom, 'foo', 'mark', 'foobar') == ''
+    assert util.get_custom(custom, 'foo', 'converters', 'foobar') == 'foobar'
+
+
+def test_globruntime():
+    assert util.globruntime('/usr', 'bin') == ['/usr/bin']
+
+
+def test_binary_search():
+    assert util.binary_search_begin([], '') == -1
+    assert util.binary_search_begin([{'word': 'abc'}], 'abc') == 0
+    assert util.binary_search_begin([
+        {'word': 'aaa'}, {'word': 'abc'},
+    ], 'abc') == 1
+    assert util.binary_search_begin([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'abc'},
+    ], 'abc') == 2
+    assert util.binary_search_begin([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'AbC'},
+    ], 'abc') == 2
+    assert util.binary_search_begin([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'abc'},
+    ], 'b') == -1
+    assert util.binary_search_begin([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'aac'}, {'word': 'abc'},
+    ], 'aa') == 1
+
+    assert util.binary_search_end([], '') == -1
+    assert util.binary_search_end([{'word': 'abc'}], 'abc') == 0
+    assert util.binary_search_end([
+        {'word': 'aaa'}, {'word': 'abc'},
+    ], 'abc') == 1
+    assert util.binary_search_end([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'abc'},
+    ], 'abc') == 2
+    assert util.binary_search_end([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'abc'},
+    ], 'b') == -1
+    assert util.binary_search_end([
+        {'word': 'a'}, {'word': 'aaa'}, {'word': 'aac'}, {'word': 'abc'},
+    ], 'aa') == 2
+
+
+def test_uniq_list_dict():
+    assert util.uniq_list_dict([
+        {'abbr': 'word', 'word': 'foobar'},
+        {'word': 'bar'},
+        {'word': 'foobar', 'abbr': 'word'},
+        {'word': 'baz'},
+    ]) == [
+        {'word': 'foobar', 'abbr': 'word'},
+        {'word': 'bar'},
+        {'word': 'baz'}
+    ]
diff --git a/vim/plugins/emmet-vim/.gitignore b/vim/plugins/emmet-vim/.gitignore
new file mode 100644
index 0000000..0a56e3f
--- /dev/null
+++ b/vim/plugins/emmet-vim/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/vim/plugins/emmet-vim/.gitmodules b/vim/plugins/emmet-vim/.gitmodules
new file mode 100644
index 0000000..2dc018d
--- /dev/null
+++ b/vim/plugins/emmet-vim/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "docs"]
+	path = docs
+	url = https://github.com/mattn/emmet-vim
+	branch = gh-pages
diff --git a/vim/plugins/emmet-vim/Makefile b/vim/plugins/emmet-vim/Makefile
new file mode 100644
index 0000000..1c06023
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/README.mkd b/vim/plugins/emmet-vim/README.mkd
new file mode 100644
index 0000000..8bb52b2
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/TODO b/vim/plugins/emmet-vim/TODO
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/emmet-vim/TUTORIAL b/vim/plugins/emmet-vim/TUTORIAL
new file mode 100644
index 0000000..7d4ba61
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet.vim b/vim/plugins/emmet-vim/autoload/emmet.vim
new file mode 100644
index 0000000..e344486
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang.vim b/vim/plugins/emmet-vim/autoload/emmet/lang.vim
new file mode 100644
index 0000000..0bc416f
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/css.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/css.vim
new file mode 100644
index 0000000..4fe359f
--- /dev/null
+++ b/vim/plugins/emmet-vim/autoload/emmet/lang/css.vim
@@ -0,0 +1,357 @@
+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\|vh\|vw\|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 =~# 'vh$'
+            let value .= v
+          elseif v =~# 'vw$'
+            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 vv = filter(sort(keys(snippets)), 'substitute(v:val, ":", "", "g") == snippet_name')
+          endif
+          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/emmet-vim/autoload/emmet/lang/elm.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/elm.vim
new file mode 100644
index 0000000..2acde53
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/haml.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/haml.vim
new file mode 100644
index 0000000..a3585c9
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/html.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/html.vim
new file mode 100644
index 0000000..d1b15f7
--- /dev/null
+++ b/vim/plugins/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 ? len(dfa) > 0 ? keys(dfa[0]) : [] : keys(dfa)
+            endif
+            if len(ks) == 0 && has_key(default_attributes, current.name . ':src')
+              let dfa = default_attributes[current.name . ':src']
+              let ks = type(dfa) == 3 ? len(dfa) > 0 ? keys(dfa[0]) : [] : keys(dfa)
+            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 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 || (child.multiplier == 1 && len(child.child) > 0 && stridx(','.settings.html.inline_elements.',', ','.current_name.',') == -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/emmet-vim/autoload/emmet/lang/jade.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/jade.vim
new file mode 100644
index 0000000..06454a0
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/less.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/less.vim
new file mode 100644
index 0000000..25308a0
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/sass.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/sass.vim
new file mode 100644
index 0000000..07677cf
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/scss.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/scss.vim
new file mode 100644
index 0000000..12a8aeb
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lang/slim.vim b/vim/plugins/emmet-vim/autoload/emmet/lang/slim.vim
new file mode 100644
index 0000000..d57bf1f
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lorem/en.vim b/vim/plugins/emmet-vim/autoload/emmet/lorem/en.vim
new file mode 100644
index 0000000..30713e4
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/lorem/ja.vim b/vim/plugins/emmet-vim/autoload/emmet/lorem/ja.vim
new file mode 100644
index 0000000..f99d8fa
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/autoload/emmet/util.vim b/vim/plugins/emmet-vim/autoload/emmet/util.vim
new file mode 100644
index 0000000..9a5b8d3
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/doc/emmet.txt b/vim/plugins/emmet-vim/doc/emmet.txt
new file mode 100644
index 0000000..ffa5e0a
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/doc/screenshot.gif b/vim/plugins/emmet-vim/doc/screenshot.gif
new file mode 100644
index 0000000..5330f63
Binary files /dev/null and b/vim/plugins/emmet-vim/doc/screenshot.gif differ
diff --git a/vim/plugins/emmet-vim/emmet.vim.vimup b/vim/plugins/emmet-vim/emmet.vim.vimup
new file mode 100644
index 0000000..3708229
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/plugin/emmet.vim b/vim/plugins/emmet-vim/plugin/emmet.vim
new file mode 100644
index 0000000..927a467
--- /dev/null
+++ b/vim/plugins/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/emmet-vim/unittest.vim b/vim/plugins/emmet-vim/unittest.vim
new file mode 100644
index 0000000..6236eb8
--- /dev/null
+++ b/vim/plugins/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>\n\t<b><i></i></b>\n</blockquote>\n<b></b>\n",
+        },
+        {
+          'query': "blockquote>b>i^^b",
+          'result': "<blockquote>\n\t<b><i></i></b>\n</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/indentline/.gitattributes b/vim/plugins/indentline/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/vim/plugins/indentline/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/vim/plugins/indentline/.gitignore b/vim/plugins/indentline/.gitignore
new file mode 100644
index 0000000..e9b9a75
--- /dev/null
+++ b/vim/plugins/indentline/.gitignore
@@ -0,0 +1,171 @@
+#################
+## Eclipse
+#################
+
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath
+
+
+#################
+## Visual Studio
+#################
+
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.sln.docstates
+
+# Build results
+[Dd]ebug/
+[Rr]elease/
+*_i.c
+*_p.c
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.vspscc
+.builds
+*.dotCover
+
+## TODO: If you have NuGet Package Restore enabled, uncomment this
+#packages/
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp
+
+# ReSharper is a .NET coding add-in
+_ReSharper*
+
+# Installshield output folder
+[Ee]xpress
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish
+
+# Others
+[Bb]in
+[Oo]bj
+sql
+TestResults
+*.Cache
+ClientBin
+stylecop.*
+~$*
+*.dbmdl
+Generated_Code #added for RIA/Silverlight projects
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+
+
+
+############
+## Windows
+############
+
+# Windows image file caches
+Thumbs.db
+
+# Folder config file
+Desktop.ini
+
+
+#############
+## Python
+#############
+
+*.py[co]
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+parts
+bin
+var
+sdist
+develop-eggs
+.installed.cfg
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Mac crap
+.DS_Store
+
+
+#############
+## Vim
+#############
+
+# Exclude auto generated vim doc tags.
+doc/tags
diff --git a/vim/plugins/indentline/LICENSE b/vim/plugins/indentline/LICENSE
new file mode 100644
index 0000000..438d512
--- /dev/null
+++ b/vim/plugins/indentline/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Yggdroot
+
+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/indentline/README.md b/vim/plugins/indentline/README.md
new file mode 100644
index 0000000..bf18dc9
--- /dev/null
+++ b/vim/plugins/indentline/README.md
@@ -0,0 +1,118 @@
+indentLine
+==========
+
+This plugin is used for displaying thin vertical lines at each indentation level for code indented with spaces. For code indented with tabs I think there is no need to support it, because you can use `:set list lcs=tab:\|\ (here is a space)`.
+
+## Requirements
+This plugin takes advantage of the newly provided `conceal` feature in Vim 7.3, so this plugin will not work with lower versions of Vim.
+
+## Installation
+To install the plugin just put the plugin files in your `~/.vim` (Linux) or `~/vimfiles` (Windows).
+
+If you use a plugin manager you can put the whole directory into your `~/.vim/bundle/` directory ([Pathogen][pathogen]) or add the line `Plugin 'Yggdroot/indentLine'` to your `.vimrc` ([Vundle][vundle]).
+
+## Customization
+To apply customization, apply the variable definitions to your `.vimrc` file.
+
+**Change Character Color**
+
+indentLine will overwrite 'conceal' color with grey by default. If you want to highlight conceal color with your colorscheme, disable by:
+```
+let g:indentLine_setColors = 0
+```
+
+Or you can customize conceal color by: 
+```
+" Vim
+let g:indentLine_color_term = 239
+
+" GVim
+let g:indentLine_color_gui = '#A4E57E'
+
+" none X terminal
+let g:indentLine_color_tty_light = 7 " (default: 4)
+let g:indentLine_color_dark = 1 " (default: 2)
+
+" Background (Vim, GVim)
+let g:indentLine_bgcolor_term = 202
+let g:indentLine_bgcolor_gui = '#FF5F00'
+```
+
+**Change Indent Char**
+
+Vim and GVim
+```
+let g:indentLine_char = 'c'
+```
+where `'c'` can be any ASCII character. You can also use one of `¦`, `┆`, `│`, `⎸`, or `▏` to display more beautiful lines. However, these characters will only work with files whose encoding is UTF-8.
+
+**Change Conceal Behaviour**
+
+This plugin enables the Vim `conceal` feature which automatically hides stretches of text based on syntax highlighting. This setting will apply to all syntax items.
+
+For example, users utilizing the built in json.vim syntax file will no longer see quotation marks in their JSON files.
+
+indentLine will overwrite your "concealcursor" and "conceallevel" with default value:
+
+```
+let g:indentLine_concealcursor = 'inc'
+let g:indentLine_conceallevel = 2
+```
+
+You can customize these settings, but the plugin will not function if `conceallevel` is not set to 1 or 2.
+
+If you want to keep your conceal setting, put this line to your vim dotfile:
+```
+let g:indentLine_setConceal = 0
+```
+
+See the [VIM Reference Manual](http://vimdoc.sourceforge.net/htmldoc/version7.html#new-conceal) for more information on the `conceal` feature.
+
+
+**Disable by default**
+```
+let g:indentLine_enabled = 0
+```
+
+### Commands
+`:IndentLinesToggle` toggles lines on and off.
+
+### Font patching
+If you find all the standard unicode and ASCII characters too obtrusive, you might consider patching your font with the [indentLine-dotted-guide.eps][glyph] glyph provided.  [FontForge][fontforge] makes the process amazingly simple:
+
+ 1. Download and install FontForge.
+ 2. Locate and open your terminal/gVim font.
+ 3. Open the font in FontForge, choose __Goto__ from the __View__ menu and select _Private Use Area_ from the drop down box.
+ 4. In the private use area, locate a blank spot for the glyph. Make a note of the code, e.g. `U+E0A3`.
+ 5. Double-click the selected code point to open the font drawing tool.
+ 6. From the __File__ menu, select __Import...__ and locate the _indentLine-dotted-guide.eps_ file.
+ 7. Once imported, choose __File__ -> __Generate Fonts__ and choose a location and file type for the new font.
+
+Once completed, your new font will contain the more subtle dotted guide and all you have to do is set that glyph to `g:indentLine_char` in your `.vimrc` file.
+
+[glyph]: glyph/indentLine-dotted-guide.eps
+[fontforge]: http://fontforge.github.io/
+
+## Self promotion
+If you think this script is helpful, follow the [GitHub repository][repository], and don't forget to vote for it on Vim.org! ([vimscript #4354][script]).
+
+[pathogen]: https://github.com/tpope/vim-pathogen
+[vundle]: https://github.com/gmarik/vundle
+[repository]: https://github.com/Yggdroot/indentLine
+[script]: http://www.vim.org/scripts/script.php?script_id=4354
+
+## Screenshots
+
+### Vertical bars
+![Screenshot](http://i.imgur.com/KVi0T.jpg)
+
+### Patched font
+![Screenshot](http://i.imgur.com/2ZA7oaZ.png)
+
+### Leading Spaces
+![Screenshot](http://i.imgur.com/tLYkb79.png)
+
+![Screenshot](http://i.imgur.com/07Atrrs.png)
+
+## License
+- MIT
diff --git a/vim/plugins/indentline/after/plugin/indentLine.vim b/vim/plugins/indentline/after/plugin/indentLine.vim
new file mode 100644
index 0000000..8941c06
--- /dev/null
+++ b/vim/plugins/indentline/after/plugin/indentLine.vim
@@ -0,0 +1,376 @@
+" Script Name: indentLine.vim
+" Author:      Yggdroot <archofortune@gmail.com>
+"
+" Description: To show the indention levels with thin vertical lines
+
+scriptencoding utf-8
+
+if !has("conceal") || exists("g:indentLine_loaded")
+    finish
+endif
+let g:indentLine_loaded = 1
+
+let g:indentLine_newVersion = get(g:,'indentLine_newVersion',v:version > 704 || v:version == 704 && has("patch792"))
+
+let g:indentLine_char = get(g:, 'indentLine_char', (&encoding ==# "utf-8" && &term isnot# "linux" ? '¦' : '|'))
+let g:indentLine_first_char = get(g:, 'indentLine_first_char', (&encoding ==# "utf-8" && &term isnot# "linux" ? '¦' : '|'))
+let g:indentLine_indentLevel = get(g:, 'indentLine_indentLevel', 20)
+let g:indentLine_enabled = get(g:, 'indentLine_enabled', 1)
+let g:indentLine_fileType = get(g:, 'indentLine_fileType', [])
+let g:indentLine_fileTypeExclude = get(g:, 'indentLine_fileTypeExclude', [])
+let g:indentLine_bufNameExclude = get(g:, 'indentLine_bufNameExclude', [])
+let g:indentLine_bufTypeExclude = get(g:, 'indentLine_bufTypeExclude', [])
+let g:indentLine_showFirstIndentLevel = get(g:, 'indentLine_showFirstIndentLevel', 0)
+let g:indentLine_maxLines = get(g:, 'indentLine_maxLines', 3000)
+let g:indentLine_setColors = get(g:, 'indentLine_setColors', 1)
+let g:indentLine_setConceal = get(g:, 'indentLine_setConceal', 1)
+let g:indentLine_faster = get(g:, 'indentLine_faster', 0)
+let g:indentLine_leadingSpaceChar = get(g:, 'indentLine_leadingSpaceChar', (&encoding ==# "utf-8" && &term isnot# "linux" ? '˰' : '.'))
+let g:indentLine_leadingSpaceEnabled = get(g:, 'indentLine_leadingSpaceEnabled', 0)
+let g:indentLine_mysyntaxfile = fnamemodify(expand("<sfile>"), ":p:h:h")."/syntax/indentLine.vim"
+
+"{{{1 function! s:InitColor()
+function! s:InitColor()
+    if !g:indentLine_setColors
+        return
+    endif
+
+    if !exists("g:indentLine_color_term")
+        if &background ==# "light"
+            let term_color = 249
+        else
+            let term_color = 239
+        endif
+    else
+        let term_color = g:indentLine_color_term
+    endif
+
+    if !exists("g:indentLine_bgcolor_term")
+        let term_bgcolor = "NONE"
+    else
+        let term_bgcolor = g:indentLine_bgcolor_term
+    endif
+
+    if !exists("g:indentLine_color_gui")
+        if &background ==# "light"
+            let gui_color = "Grey70"
+        else
+            let gui_color = "Grey30"
+        endif
+    else
+        let gui_color = g:indentLine_color_gui
+    endif
+
+    if !exists("g:indentLine_bgcolor_gui")
+        let gui_bgcolor = "NONE"
+    else
+        let gui_bgcolor = g:indentLine_bgcolor_gui
+    endif
+
+    execute "highlight Conceal cterm=NONE ctermfg=" . term_color . " ctermbg=" . term_bgcolor
+    execute "highlight Conceal gui=NONE guifg=" . gui_color .  " guibg=" . gui_bgcolor
+
+    if &term ==# "linux"
+        if &background ==# "light"
+            let tty_color = exists("g:indentLine_color_tty_light") ? g:indentLine_color_tty_light : 4
+        else
+            let tty_color = exists("g:indentLine_color_tty_dark") ? g:indentLine_color_tty_dark : 2
+        endif
+        execute "highlight Conceal cterm=bold ctermfg=" . tty_color .  " ctermbg=NONE"
+    endif
+endfunction
+
+"{{{1 function! s:SetConcealOption()
+function! s:SetConcealOption()
+    if !g:indentLine_setConceal
+        return
+    endif
+    if !exists("b:indentLine_ConcealOptionSet")
+        let b:indentLine_ConcealOptionSet = 1
+        let &l:concealcursor = exists("g:indentLine_concealcursor") ? g:indentLine_concealcursor : "inc"
+        let &l:conceallevel = exists("g:indentLine_conceallevel") ? g:indentLine_conceallevel : "2"
+    endif
+endfunction
+
+"{{{1 function! s:IndentLinesEnable()
+function! s:IndentLinesEnable()
+    if g:indentLine_newVersion
+        if &diff
+            return
+        endif
+
+        if exists("b:indentLine_enabled") && b:indentLine_enabled == 0
+            return
+        endif
+
+        if !exists("w:indentLine_indentLineId")
+            let w:indentLine_indentLineId = []
+        endif
+
+        call s:SetConcealOption()
+
+        if g:indentLine_showFirstIndentLevel
+            call add(w:indentLine_indentLineId, matchadd('Conceal', '^ ', 0, -1, {'conceal': g:indentLine_first_char}))
+        endif
+
+        let space = &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth
+        for i in range(space+1, space * g:indentLine_indentLevel + 1, space)
+            call add(w:indentLine_indentLineId, matchadd('Conceal', '^\s\+\zs\%'.i.'v ', 0, -1, {'conceal': g:indentLine_char}))
+        endfor
+
+        return
+    endif
+
+    if exists("b:indentLine_enabled") && b:indentLine_enabled
+        return
+    else
+        let b:indentLine_enabled = 1
+    endif
+
+    call s:SetConcealOption()
+
+    let g:mysyntaxfile = g:indentLine_mysyntaxfile
+
+    let space = &l:shiftwidth == 0 ? &l:tabstop : &l:shiftwidth
+
+    if g:indentLine_showFirstIndentLevel
+        execute 'syntax match IndentLine /^ / containedin=ALL conceal cchar=' . g:indentLine_first_char
+    endif
+
+    if g:indentLine_faster
+        execute 'syntax match IndentLineSpace /^\s\+/ containedin=ALL contains=IndentLine'
+        execute 'syntax match IndentLine / \{'.(space-1).'}\zs / contained conceal cchar=' . g:indentLine_char
+        execute 'syntax match IndentLine /\t\zs / contained conceal cchar=' . g:indentLine_char
+    else
+        let pattern = line('$') < g:indentLine_maxLines ? 'v' : 'c'
+        for i in range(space+1, space * g:indentLine_indentLevel + 1, space)
+            execute 'syntax match IndentLine /\%(^\s\+\)\@<=\%'.i.pattern.' / containedin=ALL conceal cchar=' . g:indentLine_char
+        endfor
+    endif
+endfunction
+
+"{{{1 function! s:IndentLinesDisable()
+function! s:IndentLinesDisable()
+    if g:indentLine_newVersion
+        if exists("w:indentLine_indentLineId") && ! empty(w:indentLine_indentLineId)
+            for id in w:indentLine_indentLineId
+                try
+                    call matchdelete(id)
+                catch /^Vim\%((\a\+)\)\=:E80[23]/
+                endtry
+            endfor
+            let w:indentLine_indentLineId = []
+        endif
+
+        return
+    endif
+
+    let b:indentLine_enabled = 0
+    try
+        syntax clear IndentLine
+        syntax clear IndentLineSpace
+    catch /^Vim\%((\a\+)\)\=:E28/	" catch error E28
+    endtry
+endfunction
+
+"{{{1 function! s:IndentLinesToggle()
+function! s:IndentLinesToggle()
+    if g:indentLine_newVersion
+        if exists("w:indentLine_indentLineId") && ! empty(w:indentLine_indentLineId)
+            let b:indentLine_enabled = 0
+            call s:IndentLinesDisable()
+        else
+            let b:indentLine_enabled = 1
+            call s:IndentLinesEnable()
+        endif
+
+        return
+    endif
+
+    if exists("b:indentLine_enabled") && b:indentLine_enabled
+        call s:IndentLinesDisable()
+    else
+        call s:IndentLinesEnable()
+    endif
+endfunction
+
+"{{{1 function! s:ResetWidth(...)
+function! s:ResetWidth(...)
+    if 0 < a:0
+        let &l:shiftwidth = a:1
+    endif
+
+    let b:indentLine_enabled = 1
+    call s:IndentLinesDisable()
+    call s:IndentLinesEnable()
+endfunction
+
+"{{{1 function! s:Filter()
+function! s:Filter()
+    if index(g:indentLine_fileTypeExclude, &filetype) != -1
+        return 0
+    endif
+
+    if index(g:indentLine_bufTypeExclude, &buftype) != -1
+        return 0
+    endif
+
+    if len(g:indentLine_fileType) != 0 && index(g:indentLine_fileType, &filetype) == -1
+        return 0
+    endif
+
+    for name in g:indentLine_bufNameExclude
+        if matchstr(bufname(''), name) == bufname('')
+            return 0
+        endif
+    endfor
+
+    return 1
+endfunction
+
+"{{{1 function! s:Disable()
+function! s:Disable()
+    if exists("b:indentLine_enabled") && b:indentLine_enabled
+        return
+    elseif exists("b:indentLine_leadingSpaceEnabled") && b:indentLine_leadingSpaceEnabled
+        return
+    elseif s:Filter() == 0
+        call s:IndentLinesDisable()
+        call s:LeadingSpaceDisable()
+    endif
+endfunction
+
+"{{{1 function! s:Setup()
+function! s:Setup()
+    if &filetype ==# ""
+        call s:InitColor()
+    endif
+
+    if s:Filter() && g:indentLine_enabled || exists("b:indentLine_enabled") && b:indentLine_enabled
+        call s:IndentLinesEnable()
+    endif
+
+    if s:Filter() && g:indentLine_leadingSpaceEnabled || exists("b:indentLine_leadingSpaceEnabled") && b:indentLine_leadingSpaceEnabled
+        call s:LeadingSpaceEnable()
+    endif
+endfunction
+
+"{{{1 function! s:LeadingSpaceEnable()
+function! s:LeadingSpaceEnable()
+    if g:indentLine_newVersion
+        if &diff
+            return
+        endif
+
+        if exists("b:indentLine_leadingSpaceEnabled") && b:indentLine_leadingSpaceEnabled == 0
+            return
+        endif
+
+        if !exists("w:indentLine_leadingSpaceId")
+            let w:indentLine_leadingSpaceId = []
+        endif
+
+        call s:SetConcealOption()
+
+        call add(w:indentLine_leadingSpaceId, matchadd('Conceal', '\%(^\s*\)\@<= ', 0, -1, {'conceal': g:indentLine_leadingSpaceChar}))
+
+        if exists("w:indentLine_indentLineId") && ! empty(w:indentLine_indentLineId)
+            call s:ResetWidth()
+        endif
+
+        return
+    endif
+
+    if g:indentLine_faster
+        echoerr 'LeadingSpace can not be shown when g:indentLine_faster == 1'
+        return
+    endif
+    let g:mysyntaxfile = g:indentLine_mysyntaxfile
+    let b:indentLine_leadingSpaceEnabled = 1
+    call s:SetConcealOption()
+    execute 'syntax match IndentLineLeadingSpace /\%(^\s*\)\@<= / containedin=ALLBUT,IndentLine conceal cchar=' . g:indentLine_leadingSpaceChar
+endfunction
+
+"{{{1 function! s:LeadingSpaceDisable()
+function! s:LeadingSpaceDisable()
+    if g:indentLine_newVersion
+        if exists("w:indentLine_leadingSpaceId") && ! empty(w:indentLine_leadingSpaceId)
+            for id in w:indentLine_leadingSpaceId
+                try
+                    call matchdelete(id)
+                catch /^Vim\%((\a\+)\)\=:E80[23]/
+                endtry
+            endfor
+            let w:indentLine_leadingSpaceId = []
+        endif
+
+        return
+    endif
+
+    let b:indentLine_leadingSpaceEnabled = 0
+    try
+        syntax clear IndentLineLeadingSpace
+    catch /^Vim\%((\a\+)\)\=:E28/   " catch error E28
+    endtry
+endfunction
+
+"{{{1 function! s:LeadingSpaceToggle()
+function! s:LeadingSpaceToggle()
+    if g:indentLine_newVersion
+        if exists("w:indentLine_leadingSpaceId") && ! empty(w:indentLine_leadingSpaceId)
+            let b:indentLine_leadingSpaceEnabled = 0
+            call s:LeadingSpaceDisable()
+        else
+            let b:indentLine_leadingSpaceEnabled = 1
+            call s:LeadingSpaceEnable()
+        endif
+
+        return
+    endif
+
+    if exists("b:indentLine_leadingSpaceEnabled") && b:indentLine_leadingSpaceEnabled
+        call s:LeadingSpaceDisable()
+    else
+        call s:LeadingSpaceEnable()
+    endif
+endfunction
+
+"{{{1 augroup indentLine
+augroup indentLine
+    autocmd!
+    if g:indentLine_newVersion
+        autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor()
+        if exists("##WinNew")
+            autocmd WinNew * call <SID>Setup()
+        endif
+        autocmd BufWinEnter * call <SID>IndentLinesDisable() | call <SID>LeadingSpaceDisable() | call <SID>Setup()
+        autocmd FileType * call <SID>Disable()
+    else
+        autocmd BufWinEnter * call <SID>Setup()
+        autocmd User * if exists("b:indentLine_enabled") || exists("b:indentLine_leadingSpaceEnabled") |
+                        \ call <SID>Setup() | endif
+        autocmd BufRead,BufNewFile,ColorScheme,Syntax * call <SID>InitColor()
+        autocmd BufUnload * let b:indentLine_enabled = 0 | let b:indentLine_leadingSpaceEnabled = 0
+        autocmd SourcePre $VIMRUNTIME/syntax/nosyntax.vim doautocmd indentLine BufUnload
+        autocmd FileChangedShellPost * doautocmd indentLine BufUnload | call <SID>Setup()
+    endif
+augroup END
+
+"{{{1 commands
+command! -nargs=? IndentLinesReset call <SID>ResetWidth(<f-args>)
+command! IndentLinesToggle call <SID>IndentLinesToggle()
+if g:indentLine_newVersion
+    command! IndentLinesEnable let b:indentLine_enabled = 1 | call <SID>IndentLinesEnable()
+    command! IndentLinesDisable let b:indentLine_enabled = 0 | call <SID>IndentLinesDisable()
+    command! LeadingSpaceEnable let b:indentLine_leadingSpaceEnabled = 1 | call <SID>LeadingSpaceEnable()
+    command! LeadingSpaceDisable let b:indentLine_leadingSpaceEnabled = 0 | call <SID>LeadingSpaceDisable()
+else
+    command! IndentLinesEnable call <SID>IndentLinesEnable()
+    command! IndentLinesDisable call <SID>IndentLinesDisable()
+    command! LeadingSpaceEnable call <SID>LeadingSpaceEnable()
+    command! LeadingSpaceDisable call <SID>LeadingSpaceDisable()
+endif
+command! LeadingSpaceToggle call <SID>LeadingSpaceToggle()
+
+" vim:et:ts=4:sw=4:fdm=marker:fmr={{{,}}}
+
diff --git a/vim/plugins/indentline/after/syntax/indentLine.vim b/vim/plugins/indentline/after/syntax/indentLine.vim
new file mode 100644
index 0000000..b1f20a0
--- /dev/null
+++ b/vim/plugins/indentline/after/syntax/indentLine.vim
@@ -0,0 +1,2 @@
+"this is the `mysyntaxfile`, will be sourced after sourcing synload.vim
+autocmd Syntax * doautocmd indentLine User
diff --git a/vim/plugins/indentline/doc/indentLine.txt b/vim/plugins/indentline/doc/indentLine.txt
new file mode 100644
index 0000000..bee22e0
--- /dev/null
+++ b/vim/plugins/indentline/doc/indentLine.txt
@@ -0,0 +1,200 @@
+*indentLine.txt*        Show vertical lines for indent with conceal feature
+
+CONTENTS                                        *indentLine-contents*
+Introduction                                    |indentLine-introduction|
+Config                                          |indentLine-config|
+Variables                                       |indentLine-variables|
+Commands                                        |indentLine-commands|
+FAQ                                             |indentLine-faq|
+Changelog                                       |indentLine-changelog|
+Credits                                         |indentLine-credits|
+==============================================================================
+INTRODUCTION                                    *indentLine-introduction*
+This plugin is used for displaying thin vertical lines at each indentation
+level for code indented with spaces. For code indented with tabs, I think
+there is no need to support it, using :set list lcs=tab:\|\ (here is a space)
+can achieve it.
+==============================================================================
+CONFIG                                          *indentLine-config*
+
+==============================================================================
+VARIABLES                                       *indentLine-variables*
+
+g:indentLine_loaded                             *g:loaded_indentLine*
+                Whether load indentLine plugin.
+                Default value is 0.
+
+g:indentLine_char                               *g:indentLine_char*
+                Specify a character to be used as indent line.
+                You also can use other characters:
+                  | ¦ ┆ │
+                Default value is "|".
+
+g:indentLine_setColors                          *g:indentLine_setColors*
+                By default, indentLine will overwrite 'conceal' color.
+                If you want to highlight conceal with your
+                colorscheme, set this value to 0.
+                Default value is 1.
+
+g:indentLine_first_char                         *g:indentLine_first_char*
+                Specify a character to be used as indent line
+                on the first level.
+                You also can use other characters:
+                  | ¦ ┆ │
+                Default value is "|".
+
+g:indentLine_color_term                         *g:indentLine_color_term*
+                Specify terminal vim indent line color.
+                e.g.  let g:indentLine_color_term = 239
+
+g:indentLine_bgcolor_term                       *g:indentLine_bgcolor_term*
+                Specify terminal vim indent line background color.
+                e.g.  let g:indentLine_bgcolor_term = 202
+
+
+g:indentLine_color_gui                          *g:indentLine_color_gui*
+                Specify GUI vim indent line color.
+                e.g.  let g:indentLine_color_gui = '#A4E57E'
+
+g:indentLine_bgcolor_gui                        *g:indentLine_bgcolor_gui*
+                Specify GUI vim indent line background color.
+                e.g.  let g:indentLine_color_gui = '#FF5F00'
+
+g:indentLine_color_tty_light                    *g:indentLine_color_tty_light*
+                Specify none X terminal vim indent line color in bg light.
+                default: 4
+                e.g.  let g:indentLine_color_tty_light = 7
+
+g:indentLine_color_tty_dark                     *g:indentLine_color_tty_dark*
+                Specify none X terminal vim indent line color in bg dark.
+                default: 2
+                e.g.  let g:indentLine_color_tty_dark = 1
+
+g:indentLine_indentLevel                        *g:indentLine_indentLevel*
+                Specify how much indent level do you want to use for
+                indentLine. Most program will not has bigger indent level than
+                10.
+                Default value is 10.
+
+g:indentLine_showFirstIndentLevel               *g:indentLine_showFirstIndentLevel*
+                Specify whether the first indent level should be shown.
+                This is useful if you use indentLine in combination with
+                |listchars| in order to show tabs.
+                Default value is 0.
+
+g:indentLine_enabled                            *g:indentLine_enabled*
+                Specify whether to enable indentLine plugin by default.
+                If value is not 0, the plugin is on by default, otherwise off.
+                Default value is 1.
+
+g:indentLine_fileType                           *g:indentLine_fileType*
+                This variable specify a list of file types.
+                When opening these types of files, the plugin is enabled by
+                default.
+                e.g. let g:indentLine_fileType = ['c', 'cpp']
+                Default value is [] which means all file types is supported.
+
+g:indentLine_fileTypeExclude                    *g:indentLine_fileTypeExclude*
+                This variable specify a list of file types.
+                When opening these types of files, the plugin is disabled by
+                default.
+                e.g. let g:indentLine_fileTypeExclude = ['text', 'sh']
+                Default value is [] which means no file types are excluded.
+
+g:indentLine_bufTypeExclude                    *g:indentLine_bufTypeExclude*
+                This variable specify a list of buffer types.
+                When opening these types of buffers, the plugin is disabled
+                by default.
+                e.g. let g:indentLine_bufTypeExclude = ['help', 'terminal']
+                Default value is [] which means no buffer type is excluded.
+
+g:indentLine_bufNameExclude                     *g:indentLine_bufNameExclude*
+                This variable specify a list of buffer names, which can be
+                regular expression. If the buffer's name fall into this list,
+                the indentLine won't display.
+                e.g. let g:indentLine_bufNameExclude = ['_.*', 'NERD_tree.*']
+                Default value is [].
+
+g:indentLine_maxLines                           *g:indentLine_maxLines*
+                This variable specify a number, when the number of buffer's
+                lines exceed it, the plugin try to use another pattern to make
+                the performance better.
+                Default value is 3000.
+
+g:indentLine_faster                             *g:indentLine_faster*
+                If you want the performance better, you can set the value as
+                1, default value is 0. But better performance may bring little
+                issue with it.
+
+g:indentLine_setConceal
+                The plugin will overwrite your "concealcursor" and
+                "conceallevel" by default. If you want to keep your setting,
+                set this value to 0.
+                Default value is 1.
+
+g:indentLine_concealcursor                    *g:indentLine_concealcursor*
+                This variable toggles cursor lines behavior. If variable
+                exists and is empty, that is, set to '', then the indentlines
+                will not show up in the cursorline. 
+                See *concealcursor*.
+                Default value is 'inc'.
+
+g:indentLine_conceallevel                    *g:indentLine_conceallevel*
+                This variable toggles the concealing behavior.
+                See *conceallevel*.
+                Default value is '2'.
+
+g:indentLine_leadingSpaceChar                   *g:indentLine_leadingSpaceChar*
+                Specify a character to show for leading spaces.
+                You also can use other characters:˽˰··
+                e.g. let g:indentLine_leadingSpaceChar = '·'
+
+g:indentLine_leadingSpaceEnabled                *g:indentLine_leadingSpaceEnabled*
+                Specify whether to show leading spaces by default.
+                Default value is 0.
+==============================================================================
+COMMANDS                                         *indentLine-commands*
+
+*IndentLinesReset* [number]
+                if 'shiftwidth' changes, using this command can redraw the
+                indentLines. number is optional, it means the width between
+                two indent level, if ommited, value of 'shiftwidth' is used.
+
+*IndentLinesToggle*
+                toggle the indent lines of the current buffer.
+
+*IndentLinesEnable*
+                enable the indent lines of the current buffer.
+
+*IndentLinesDisable*
+                disable the indent lines of the current buffer.
+
+*LeadingSpaceEnable*
+                enable the leading spaces of the current buffer.
+
+*LeadingSpaceDisable*
+                disable the leading spaces of the current buffer.
+
+*LeadingSpaceToggle*
+                toggle the leading spaces of the current buffer.
+==============================================================================
+FAQ                                              *indentLine-faq*
+
+Q. How can I make the indent line visuall similar to the line used in Sublime
+    Text 2?
+
+A. Use let g:indentLine_char = '┊'
+
+==============================================================================
+CHANGELOG                                        *indentLine-changelog*
+
+==============================================================================
+CREDITS                                          *indentLine-credits*
+
+Thanks to the following people for suggestions and patches:
+
+NagatoPain
+Salman Halim
+Christophe
+==============================================================================
+vim:tw=78:ts=8:ft=help:norl
diff --git a/vim/plugins/indentline/glyph/indentLine-dotted-guide.eps b/vim/plugins/indentline/glyph/indentLine-dotted-guide.eps
new file mode 100644
index 0000000..146309f
--- /dev/null
+++ b/vim/plugins/indentline/glyph/indentLine-dotted-guide.eps
@@ -0,0 +1,169 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%BoundingBox: 2.96296 -488.5 170.5 1988.5
+%%Pages: 0
+%%Title: uniE0A3 from DejaVuSansMonoForPowerline
+%%Creator: FontForge
+%%Author: Andy Earnshaw
+%%CreationDate: 22:53 1-8-2014
+%%EndComments
+%%BeginPreview: 5 74 4 74
+%013100
+%3EFE40
+%BFFFD0
+%DFFFE0
+%7FFF80
+%059600
+%000000
+%000000
+%000000
+%000000
+%048500
+%6FFF80
+%CFFFE0
+%CFFFD0
+%4EFE50
+%014100
+%000000
+%000000
+%000000
+%000000
+%19DA10
+%9FFFB0
+%DFFFE0
+%AFFFB0
+%1AEB20
+%000000
+%000000
+%000000
+%000000
+%013100
+%3EFE40
+%BFFFD0
+%DFFFE0
+%7FFF80
+%059600
+%000000
+%000000
+%000000
+%000000
+%048500
+%6FFF80
+%CFFFE0
+%CFFFD0
+%4EFF50
+%014100
+%000000
+%000000
+%000000
+%000000
+%19DA10
+%9FFFB0
+%DFFFE0
+%AFFFB0
+%1AEB20
+%000000
+%000000
+%000000
+%000000
+%013100
+%3EFE40
+%BFFFD0
+%DFFFE0
+%7FFF80
+%059600
+%000000
+%000000
+%000000
+%000000
+%048500
+%6FFF80
+%CFFFE0
+%CFFFD0
+%4EFF50
+%014100
+%%EndPreview
+%%EndProlog
+%%Page "uniE0A3" 1
+gsave newpath
+	3 -405 moveto
+	 3.66667 -381.667 12 -362 28 -346 curveto
+	 44 -330 63.6667 -321.833 87 -321.5 curveto
+	 110.333 -321.833 130 -330 146 -346 curveto
+	 162 -362 170.167 -381.667 170.5 -405 curveto
+	 170.167 -428.333 162 -448 146 -464 curveto
+	 130 -480 110.333 -488.167 87 -488.5 curveto
+	 63.6667 -488.167 44 -480 28 -464 curveto
+	 10.6667 -446.667 2.33333 -427 3 -405 curveto
+	closepath
+	3 255 moveto
+	 3.66667 278.333 12 298 28 314 curveto
+	 44 330 63.6667 338.167 87 338.5 curveto
+	 110.333 338.167 130 330 146 314 curveto
+	 162 298 170.167 278.333 170.5 255 curveto
+	 170.167 231.667 162 212 146 196 curveto
+	 130 180 110.333 171.833 87 171.5 curveto
+	 63.6667 171.833 44 180 28 196 curveto
+	 10.6667 213.333 2.33333 233 3 255 curveto
+	closepath
+	3 -75 moveto
+	 3.66667 -51.6667 12 -32 28 -16 curveto
+	 44 0 63.6667 8.16667 87 8.5 curveto
+	 110.333 8.16667 130 0 146 -16 curveto
+	 162 -32 170.167 -51.6667 170.5 -75 curveto
+	 170.167 -98.3333 162 -118 146 -134 curveto
+	 130 -150 110.333 -158.167 87 -158.5 curveto
+	 63.6667 -158.167 44 -150 28 -134 curveto
+	 10.6667 -116.667 2.33333 -97 3 -75 curveto
+	closepath
+	3 915 moveto
+	 3.66667 938.333 12 958 28 974 curveto
+	 44 990 63.6667 998.167 87 998.5 curveto
+	 110.333 998.167 130 990 146 974 curveto
+	 162 958 170.167 938.333 170.5 915 curveto
+	 170.167 891.667 162 872 146 856 curveto
+	 130 840 110.333 831.833 87 831.5 curveto
+	 63.6667 831.833 44 840 28 856 curveto
+	 10.6667 873.333 2.33333 893 3 915 curveto
+	closepath
+	3 585 moveto
+	 3.66667 608.333 12 628 28 644 curveto
+	 44 660 63.6667 668.167 87 668.5 curveto
+	 110.333 668.167 130 660 146 644 curveto
+	 162 628 170.167 608.333 170.5 585 curveto
+	 170.167 561.667 162 542 146 526 curveto
+	 130 510 110.333 501.833 87 501.5 curveto
+	 63.6667 501.833 44 510 28 526 curveto
+	 10.6667 543.333 2.33333 563 3 585 curveto
+	closepath
+	3 1575 moveto
+	 3.66667 1598.33 12 1618 28 1634 curveto
+	 44 1650 63.6667 1658.17 87 1658.5 curveto
+	 110.333 1658.17 130 1650 146 1634 curveto
+	 162 1618 170.167 1598.33 170.5 1575 curveto
+	 170.167 1551.67 162 1532 146 1516 curveto
+	 130 1500 110.333 1491.83 87 1491.5 curveto
+	 63.6667 1491.83 44 1500 28 1516 curveto
+	 10.6667 1533.33 2.33333 1553 3 1575 curveto
+	closepath
+	3 1245 moveto
+	 3.66667 1268.33 12 1288 28 1304 curveto
+	 44 1320 63.6667 1328.17 87 1328.5 curveto
+	 110.333 1328.17 130 1320 146 1304 curveto
+	 162 1288 170.167 1268.33 170.5 1245 curveto
+	 170.167 1221.67 162 1202 146 1186 curveto
+	 130 1170 110.333 1161.83 87 1161.5 curveto
+	 63.6667 1161.83 44 1170 28 1186 curveto
+	 10.6667 1203.33 2.33333 1223 3 1245 curveto
+	closepath
+	3 1905 moveto
+	 3.66667 1928.33 12 1948 28 1964 curveto
+	 44 1980 63.6667 1988.17 87 1988.5 curveto
+	 110.333 1988.17 130 1980 146 1964 curveto
+	 162 1948 170.167 1928.33 170.5 1905 curveto
+	 170.167 1881.67 162 1862 146 1846 curveto
+	 130 1830 110.333 1821.83 87 1821.5 curveto
+	 63.6667 1821.83 44 1830 28 1846 curveto
+	 10.6667 1863.33 2.33333 1883 3 1905 curveto
+	closepath
+fill grestore
+%%EOF
diff --git a/vim/plugins/javacomplete/README b/vim/plugins/javacomplete/README
new file mode 100644
index 0000000..572ddcb
--- /dev/null
+++ b/vim/plugins/javacomplete/README
@@ -0,0 +1,120 @@
+This is a mirror of http://www.vim.org/scripts/script.php?script_id=1785
+
+This is javacomplete, an omni-completion script of JAVA language for vim 7.
+
+It includes javacomplete.vim, java_parser.vim, Reflection.java, and 
+javacomplete.txt
+
+Features:
+- List members of a class, including (static) fields, (static) methods and ctors.
+- List classes or subpackages of a package.
+- Provide parameters information of a method, list all overload methods.
+- Complete an incomplete word.
+- Provide a complete JAVA parser written in Vim script language.
+- Use the JVM to obtain most information.
+- Use the embedded parser to obtain the class information from source files.
+- Tags generated by ctags can also be used.
+- JSP is supported, Builtin objects such as request, session can be recognized.
+  The classes and jar files in the WEB-INF will be appended automatically to classpath.
+
+
+Requirements:
+It works on all the platforms where
+- Vim version 7.0 and above
+- JDK version 1.1 and above
+existed 
+
+Input context:
+It recognize nearly all kinds of Primary Expressions (see langspec-3.0)
+except for "Primary.new Indentifier". Casting conversion is also supported.
+Samples of input contexts are as following:	('|' indicates cursor)
+    (1). after '.', list members of a class or a package
+    - package.|         subpackages and classes of a package
+    - Type.|                static members of the 'Type' class and "class"
+    - var.| or field.|     members of a variable or a field
+    - method().|         members of result of method()
+    - this.|                   members of the current class
+    - ClassName.this.|  members of the qualified class
+    - super.|               members of the super class
+    - array.|                members of an array object
+    - array[i].|             array access, return members of the element of array
+    - "String".|            String literal, return members of java.lang.String
+    - int.| or void.|       primitive type or pseudo-type, return "class"
+    - int[].|                   array type, return members of a array type and "class"
+    - java.lang.String[].|
+    - new int[].|           members of the new array instance
+    - new java.lang.String[i=1][].|
+    - new Type().|      members of the new class instance 
+    - Type.class.|      class literal, return members of java.lang.Class
+    - void.class.| or int.class.|
+    - ((Type)var).|         cast var as Type, return members of Type.
+    - (var.method()).|   same with "var.|"
+    - (new Class()).|    same with "new Class().|"
+
+   (2). after '(', list matching methods with parameters information.
+    - method(|)                 methods matched
+    - var.method(|)           methods matched
+    - new ClassName(|)  constructors matched
+    - this(|)                        constructors of current class matched
+    - super(|)                     constructors of super class matched
+    Any place between '(' and ')' will be supported soon.
+    Help information of javadoc is not supported yet.
+
+   (3). after an incomplete word, list all the matched beginning with it.
+    - var.ab|          subset of members of var beginning with `ab`
+    - ab|                list of all maybes
+
+   (4). import statement
+    - " import         java.util.|"
+    - " import         java.ut|"
+    - " import         ja|"
+    - " import         java.lang.Character.|"        e.g. "Subset"
+    - " import static java.lang.Math.|"        e.g. "PI, abs"
+
+   (5). package declaration
+    - " package         com.|"
+
+   The above are in simple expression.
+   (6). after compound expression:
+    - PrimaryExpr.var.|
+    - PrimaryExpr.method().|
+    - PrimaryExpr.method(|)
+    - PrimaryExpr.var.ab|
+    e.g.
+    - "java.lang        . System.in .|"
+    - "java.lang.System.getenv().|"
+    - "int.class.toString().|"
+    - "list.toArray().|"
+    - "new ZipFile(path).|"
+    - "new ZipFile(path).entries().|"
+
+   (7). Nested expression:
+    - "System.out.println( str.| )"
+    - "System.out.println(str.charAt(| )"
+    - "for (int i = 0; i < str.|; i++)"
+    - "for ( Object o : a.getCollect| )"
+
+
+Limitations:
+The embedded parser works a bit slower than expected.
+
+TODO:
+-  Improve performance of the embedded parser. Incremental parser.
+-  Add quick information using balloonexpr, ballooneval, balloondelay.
+-  Add javadoc
+-  Give a hint for class name conflict in different packages.
+-  Support parameter information for template
+-  Make it faster and more robust.
+
+Screenshots:
+members of a package, http://blog.chinaunix.net/photo/44758_070917101010.jpg
+members of a type, http://blog.chinaunix.net/photo/44758_070917101048.jpg
+local variable, http://blog.chinaunix.net/photo/44758_070917101134.jpg
+special reference super, http://blog.chinaunix.net/photo/44758_070917101158.jpg
+object of method result,  http://blog.chinaunix.net/photo/44758_070917101236.jpg
+
+FeedBack:
+Any problem, bug or suggest are welcome to send to fangread@yahoo.com.cn
+
+BTW, If you want to get more functions on writting java program besides code completion,
+you can try VJDE. http://www.vim.org/scripts/script.php?script_id=1213
diff --git a/vim/plugins/javacomplete/autoload/Reflection.java b/vim/plugins/javacomplete/autoload/Reflection.java
new file mode 100644
index 0000000..5452b0f
--- /dev/null
+++ b/vim/plugins/javacomplete/autoload/Reflection.java
@@ -0,0 +1,670 @@
+/**
+ * Reflection.java
+ *
+ * A utility class for javacomplete mainly for reading class or package information.
+ * Version:	0.77
+ * Maintainer:	cheng fang <fangread@yahoo.com.cn>
+ * Last Change:	2007-09-16
+ * Copyright:	Copyright (C) 2007 cheng fang. All rights reserved.
+ * License:	Vim License	(see vim's :help license)
+ * 
+ */
+
+import java.lang.reflect.*;
+import java.io.*;
+import java.util.*;
+import java.util.zip.*;
+
+class Reflection {
+    static final String VERSION	= "0.77";
+
+    static final int OPTION_FIELD		=  1;
+    static final int OPTION_METHOD		=  2;
+    static final int OPTION_STATIC_FIELD	=  4;
+    static final int OPTION_STATIC_METHOD	=  8;
+    static final int OPTION_CONSTRUCTOR		= 16;
+    static final int OPTION_STATIC		= 12;	// compound static
+    static final int OPTION_INSTANCE		= 15;	// compound instance
+    static final int OPTION_ALL			= 31;	// compound all
+    static final int OPTION_SUPER		= 32;
+    static final int OPTION_SAME_PACKAGE	= 64;
+
+    static final int STRATEGY_ALPHABETIC	= 128;
+    static final int STRATEGY_HIERARCHY		= 256;
+    static final int STRATEGY_DEFAULT		= 512;
+
+    static final int RETURN_ALL_PACKAGE_INFO	= 0x1000;
+
+    static final String KEY_NAME		= "'n':";	// "'name':";
+    static final String KEY_TYPE		= "'t':";	// "'type':";
+    static final String KEY_MODIFIER		= "'m':";	// "'modifier':";
+    static final String KEY_PARAMETERTYPES	= "'p':";	// "'parameterTypes':";
+    static final String KEY_RETURNTYPE		= "'r':";	// "'returnType':";
+    static final String KEY_DESCRIPTION		= "'d':";	// "'description':";
+    static final String KEY_DECLARING_CLASS	= "'c':";	// "'declaringclass':";
+
+    static final String NEWLINE = "";	// "\r\n"
+
+    static boolean debug_mode = false;
+
+    static Hashtable htClasspath = new Hashtable();
+
+    public static boolean existed(String fqn) {
+	boolean result = false;
+	try {
+	    Class.forName(fqn);
+	    result = true;
+	}
+	catch (Exception ex) {
+	}
+	return result;
+    }
+
+    public static String existedAndRead(String fqns) {
+	Hashtable mapPackages = new Hashtable();	// qualified name --> StringBuffer
+	Hashtable mapClasses = new Hashtable();		// qualified name --> StringBuffer
+
+	for (StringTokenizer st = new StringTokenizer(fqns, ","); st.hasMoreTokens(); ) {
+	    String fqn = st.nextToken();
+	    try {
+		Class clazz = Class.forName(fqn);
+		putClassInfo(mapClasses, clazz);
+	    }
+	    catch (Exception ex) {
+		String binaryName = fqn;
+		boolean found = false;
+		while (true) {
+		    try {
+			int lastDotPos = binaryName.lastIndexOf('.');
+			if (lastDotPos == -1)
+			    break;
+			binaryName = binaryName.substring(0, lastDotPos) + '$' + binaryName.substring(lastDotPos+1, binaryName.length());
+			Class clazz = Class.forName(binaryName);
+			putClassInfo(mapClasses, clazz);
+			found = true;
+			break;
+		    }
+		    catch (Exception e) {
+		    }
+		}
+		if (!found)
+		    putPackageInfo(mapPackages, fqn);
+	    }
+	}
+
+	if (mapPackages.size() > 0 || mapClasses.size() > 0) {
+	    StringBuffer sb = new StringBuffer(4096);
+	    sb.append("{");
+	    for (Enumeration e = mapPackages.keys(); e.hasMoreElements(); ) {
+		String s = (String)e.nextElement();
+		sb.append("'").append( s.replace('$', '.') ).append("':").append(mapPackages.get(s)).append(",");
+	    }
+	    for (Enumeration e = mapClasses.keys(); e.hasMoreElements(); ) {
+		String s = (String)e.nextElement();
+		sb.append("'").append( s.replace('$', '.') ).append("':").append(mapClasses.get(s)).append(",");
+	    }
+	    sb.append("}");
+	    return sb.toString();
+	}
+	else
+	    return "";
+    }
+
+    private static String getPackageList(String fqn) {
+	Hashtable mapPackages = new Hashtable();
+	putPackageInfo(mapPackages, fqn);
+	return mapPackages.size() > 0 ? mapPackages.get(fqn).toString() : "";
+    }
+
+    private static Hashtable collectClassPath() {
+	if (!htClasspath.isEmpty())
+	    return htClasspath;
+
+	// runtime classes
+	if ("Kaffe".equals(System.getProperty("java.vm.name"))) {
+	    addClasspathesFromDir(System.getProperty("java.home") + File.separator + "share" + File.separator + "kaffe" + File.separator);
+	}
+	else if ("GNU libgcj".equals(System.getProperty("java.vm.name"))) {
+	    if (new File(System.getProperty("sun.boot.class.path")).exists())
+		htClasspath.put(System.getProperty("sun.boot.class.path"), "");
+	}
+
+	if (System.getProperty("java.vendor").toLowerCase(Locale.US).indexOf("microsoft") >= 0) {
+	    // `*.ZIP` files in `Packages` directory
+	    addClasspathesFromDir(System.getProperty("java.home") + File.separator + "Packages" + File.separator);
+	}
+	else {
+	    // the following code works for several kinds of JDK
+	    // - JDK1.1:		classes.zip 
+	    // - JDK1.2+:		rt.jar 
+	    // - JDK1.4+ of Sun and Apple:	rt.jar + jce.jar + jsse.jar
+	    // - JDK1.4 of IBM		split rt.jar into core.jar, graphics.jar, server.jar
+	    // 				combined jce.jar and jsse.jar into security.jar
+	    // - JDK for MacOS X	split rt.jar into classes.jar, ui.jar in Classes directory
+	    addClasspathesFromDir(System.getProperty("java.home") + File.separator + "lib" + File.separator);
+	    addClasspathesFromDir(System.getProperty("java.home") + File.separator + "jre" + File.separator + "lib" + File.separator);
+	    addClasspathesFromDir(System.getProperty("java.home") + File.separator + ".."  + File.separator + "Classes" + File.separator);
+	}
+
+	// ext
+	String extdirs = System.getProperty("java.ext.dirs");
+	for (StringTokenizer st = new StringTokenizer(extdirs, File.pathSeparator); st.hasMoreTokens(); ) {
+	    addClasspathesFromDir(st.nextToken() + File.separator);
+	}
+
+	// user classpath
+	String classPath = System.getProperty("java.class.path");
+	StringTokenizer st = new StringTokenizer(classPath, File.pathSeparator);
+	while (st.hasMoreTokens()) {
+	    String path = st.nextToken();
+	    File f = new File(path);
+	    if (!f.exists())
+		continue;
+
+	    if (path.endsWith(".jar") || path.endsWith(".zip"))
+		htClasspath.put(f.toString(), "");
+	    else {
+		if (f.isDirectory())
+		    htClasspath.put(f.toString(), "");
+	    }
+	}
+
+	return htClasspath;
+    }
+
+    private static void addClasspathesFromDir(String dirpath) {
+	File dir = new File(dirpath);
+	if (dir.isDirectory()) {
+	    String[] items = dir.list();		// use list() instead of listFiles() since the latter are introduced in 1.2
+	    for (int i = 0; i < items.length; i++) {
+		File f = new File(dirpath + items[i]);
+		if (!f.exists())
+		    continue;
+
+		if (items[i].endsWith(".jar") || items[i].endsWith(".zip") || items[i].endsWith(".ZIP")) {
+		    htClasspath.put(f.toString(), "");
+		}
+		else if (items.equals("classes")) {
+		    if (f.isDirectory())
+			htClasspath.put(f.toString(), "");
+		}
+	    }
+	}
+    }
+	
+
+    /**
+     * If name is empty, put all loadable package info into map once.
+     */
+    private static void putPackageInfo(Hashtable map, String name) {
+	String prefix = name.replace('.', '/') + "/";
+	Hashtable subpackages = new Hashtable();
+	Hashtable classes = new Hashtable();
+	for (Enumeration e = collectClassPath().keys(); e.hasMoreElements(); ) {
+	    String path = (String)e.nextElement();
+	    if (path.endsWith(".jar") || path.endsWith(".zip"))
+		appendListFromJar(subpackages, classes, path, prefix);
+	    else
+		appendListFromFolder(subpackages, classes, path, prefix);
+	}
+
+	if (subpackages.size() > 0 || classes.size() > 0) {
+	    StringBuffer sb = new StringBuffer(1024);
+	    sb.append("{'tag':'PACKAGE','subpackages':[");
+	    for (Enumeration e = subpackages.keys(); e.hasMoreElements(); ) {
+		sb.append("'").append(e.nextElement()).append("',");
+	    }
+	    sb.append("],'classes':[");
+	    for (Enumeration e = classes.keys(); e.hasMoreElements(); ) {
+		sb.append("'").append(e.nextElement()).append("',");
+	    }
+	    sb.append("]}");
+	    map.put(name, sb.toString());
+	}
+    }
+
+    public static void appendListFromJar(Hashtable subpackages, Hashtable classes, String path, String prefix) {
+	try {
+	    for (Enumeration entries = new ZipFile(path).entries(); entries.hasMoreElements(); ) {
+		String entry = entries.nextElement().toString();
+		int len = entry.length();
+		if (entry.endsWith(".class") && entry.indexOf('$') == -1
+			&& entry.startsWith(prefix)) {
+		    int splitPos = entry.indexOf('/', prefix.length());
+		    String shortname = entry.substring(prefix.length(), splitPos == -1 ? entry.length()-6 : splitPos);
+		    if (splitPos == -1) {
+			if (!classes.containsKey(shortname))
+			    classes.put(shortname, ""); //classes.put(shortname, "{'tag':'CLASSDEF','name':'"+shortname+"'}");
+		    }
+		    else {
+			if (!subpackages.containsKey(shortname))
+			    subpackages.put(shortname, ""); //subpackages.put(shortname, "{'tag':'PACKAGE','name':'" +shortname+"'}");
+		    }
+		}
+	    }
+	}
+	catch (Throwable e) {
+	    //e.printStackTrace();
+	}
+    }
+
+    public static void appendListFromFolder(Hashtable subpackages, Hashtable classes, String path, String prefix) {
+	try {
+	    String fullPath = path + "/" + prefix;
+	    File file = new File(fullPath);
+	    if (file.isDirectory()) {
+		String[] descents = file.list();
+		for (int i = 0; i < descents.length; i++) {
+		    if (descents[i].indexOf('$') == -1) {
+			if (descents[i].endsWith(".class")) {
+			    String shortname = descents[i].substring(0, descents[i].length()-6);
+			    if (!classes.containsKey(shortname))
+				classes.put(shortname, "");
+			}
+			else if ((new File(fullPath + "/" + descents[i])).isDirectory()) {
+			    if (!subpackages.containsKey(descents[i]))
+				subpackages.put(descents[i], "");
+			}
+		    }
+		}
+	    }						
+	}
+	catch (Throwable e) {
+	}
+    }
+
+    private static int INDEX_PACKAGE = 0;
+    private static int INDEX_CLASS = 1;
+
+    // generate information of all packages in jar files.
+    public static String getPackageList() {
+	Hashtable map = new Hashtable();
+
+	for (Enumeration e = collectClassPath().keys(); e.hasMoreElements(); ) {
+	    String path = (String)e.nextElement();
+	    if (path.endsWith(".jar") || path.endsWith(".zip"))
+		appendListFromJar(path, map);
+	}
+
+	StringBuffer sb = new StringBuffer(4096);
+	sb.append("{");
+	//sb.append("'*':'").append( map.remove("") ).append("',");	// default package
+	for (Enumeration e = map.keys(); e.hasMoreElements(); ) {
+	    String s = (String)e.nextElement();
+	    StringBuffer[] sbs = (StringBuffer[])map.get(s);
+	    sb.append("'").append( s.replace('/', '.') ).append("':")
+	      .append("{'tag':'PACKAGE'");
+	    if (sbs[INDEX_PACKAGE].length() > 0)
+		sb.append(",'subpackages':[").append(sbs[INDEX_PACKAGE]).append("]");
+	    if (sbs[INDEX_CLASS].length() > 0)
+		sb.append(",'classes':[").append(sbs[INDEX_CLASS]).append("]");
+	    sb.append("},");
+	}
+	sb.append("}");
+	return sb.toString();
+
+    }
+
+    public static void appendListFromJar(String path, Hashtable map) {
+	try {
+	    for (Enumeration entries = new ZipFile(path).entries(); entries.hasMoreElements(); ) {
+		String entry = entries.nextElement().toString();
+		int len = entry.length();
+		if (entry.endsWith(".class") && entry.indexOf('$') == -1) {
+		    int slashpos = entry.lastIndexOf('/');
+		    String parent = entry.substring(0, slashpos);
+		    String child  = entry.substring(slashpos+1, len-6);
+		    putItem(map, parent, child, INDEX_CLASS);
+
+		    slashpos = parent.lastIndexOf('/');
+		    if (slashpos != -1) {
+			AddToParent(map, parent.substring(0, slashpos), parent.substring(slashpos+1));
+		    }
+		}
+	    }
+	}
+	catch (Throwable e) {
+	    //e.printStackTrace();
+	}
+    }
+
+    public static void putItem(Hashtable map, String parent, String child, int index) {
+	StringBuffer[] sbs = (StringBuffer[])map.get(parent);
+	if (sbs == null) {
+	    sbs = new StringBuffer[] {  new StringBuffer(256), 		// packages
+					new StringBuffer(256)		// classes
+				      };
+	}
+	if (sbs[index].toString().indexOf("'" + child + "',") == -1)
+	    sbs[index].append("'").append(child).append("',");
+	map.put(parent, sbs);
+    }
+
+    public static void AddToParent(Hashtable map, String parent, String child) {
+	putItem(map, parent, child, INDEX_PACKAGE);
+
+	int slashpos = parent.lastIndexOf('/');
+	if (slashpos != -1) {
+	    AddToParent(map, parent.substring(0, slashpos), parent.substring(slashpos+1));
+	}
+    }
+
+
+    public static String getClassInfo(String className) {
+	Hashtable mapClasses = new Hashtable();
+	try {
+	    Class clazz = Class.forName(className);
+	    putClassInfo(mapClasses, clazz);
+	}
+	catch (Exception ex) {
+	}
+
+	if (mapClasses.size() == 1) {
+	    return mapClasses.get(className).toString();	// return {...}
+	}
+	else if (mapClasses.size() > 1) {
+	    StringBuffer sb = new StringBuffer(4096);
+	    sb.append("[");
+	    for (Enumeration e = mapClasses.keys(); e.hasMoreElements(); ) {
+		String s = (String)e.nextElement();
+		sb.append(mapClasses.get(s)).append(",");
+	    }
+	    sb.append("]");
+	    return sb.toString();				// return [...]
+	}
+	else
+	    return "";
+    }
+
+    private static void putClassInfo(Hashtable map, Class clazz) {
+	if (map.containsKey(clazz.getName()))
+	    return ;
+
+	try {
+	    StringBuffer sb = new StringBuffer(1024);
+	    sb.append("{")
+	      .append("'tag':'CLASSDEF',").append(NEWLINE)
+	      .append("'flags':'").append(Integer.toString(clazz.getModifiers(), 2)).append("',").append(NEWLINE)
+	      .append("'name':'").append(clazz.getName().replace('$', '.')).append("',").append(NEWLINE)
+	      //.append("'package':'").append(clazz.getPackage().getName()).append("',").append(NEWLINE)	// no getPackage() in JDK1.1
+	      .append("'classpath':'1',").append(NEWLINE)
+	      .append("'fqn':'").append(clazz.getName().replace('$', '.')).append("',").append(NEWLINE);
+
+	    Class[] interfaces = clazz.getInterfaces();
+	    if (clazz.isInterface()) {
+		sb.append("'extends':[");
+	    } else {
+		Class superclass = clazz.getSuperclass();
+		if (superclass != null && !"java.lang.Object".equals(superclass.getName())) {
+		    sb.append("'extends':['").append(superclass.getName().replace('$', '.')).append("'],").append(NEWLINE);
+		    putClassInfo(map, superclass);	// !!
+		}
+		sb.append("'implements':[");
+	    }
+	    for (int i = 0, n = interfaces.length; i < n; i++) {
+	      sb.append("'").append(interfaces[i].getName().replace('$', '.')).append("',");
+	      putClassInfo(map, interfaces[i]);			// !!
+	    }
+	    sb.append("],").append(NEWLINE);;
+
+	    Constructor[] ctors = clazz.getConstructors();
+	    sb.append("'ctors':[");
+	    for (int i = 0, n = ctors.length; i < n; i++) {
+		Constructor ctor = ctors[i];
+		sb.append("{");
+		appendModifier(sb, ctor.getModifiers());
+		appendParameterTypes(sb, ctor.getParameterTypes());
+		sb.append(KEY_DESCRIPTION).append("'").append(ctors[i].toString()).append("'");
+		sb.append("},").append(NEWLINE);
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Field[] fields = clazz.getFields();
+	    //java.util.Arrays.sort(fields, comparator);
+	    sb.append("'fields':[");
+	    for (int i = 0, n = fields.length; i < n; i++) {
+		Field f = fields[i];
+		int modifier = f.getModifiers();
+		sb.append("{");
+		sb.append(KEY_NAME).append("'").append(f.getName()).append("',");
+		if (!f.getDeclaringClass().getName().equals(clazz.getName()))
+		    sb.append(KEY_DECLARING_CLASS).append("'").append(f.getDeclaringClass().getName()).append("',");
+		appendModifier(sb, modifier);
+		sb.append(KEY_TYPE).append("'").append(f.getType().getName()).append("'");
+		sb.append("},").append(NEWLINE);
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Method[] methods = clazz.getMethods();
+	    //java.util.Arrays.sort(methods, comparator);
+	    sb.append("'methods':[");
+	    for (int i = 0, n = methods.length; i < n; i++) {
+		Method m = methods[i];
+		int modifier = m.getModifiers();
+		sb.append("{");
+		sb.append(KEY_NAME).append("'").append(m.getName()).append("',");
+		if (!m.getDeclaringClass().getName().equals(clazz.getName()))
+		    sb.append(KEY_DECLARING_CLASS).append("'").append(m.getDeclaringClass().getName()).append("',");
+		appendModifier(sb, modifier);
+		sb.append(KEY_RETURNTYPE).append("'").append(m.getReturnType().getName()).append("',");
+		appendParameterTypes(sb, m.getParameterTypes());
+		sb.append(KEY_DESCRIPTION).append("'").append(m.toString()).append("'");
+		sb.append("},").append(NEWLINE);
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Class[] classes = clazz.getClasses();
+	    sb.append("'classes': [");
+	    for (int i = 0, n = classes.length; i < n; i++) {
+		Class c = classes[i];
+		sb.append("'").append(c.getName().replace('$', '.')).append("',");
+		putClassInfo(map, c);			// !!
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    appendDeclaredMembers(map, clazz, sb);
+
+	    sb.append("}");
+	    map.put(clazz.getName(), sb);
+	}
+	catch (Exception ex) {
+	    //ex.printStackTrace();
+	}
+    }
+
+    private static void appendDeclaredMembers(Hashtable map, Class clazz, StringBuffer sb) {
+	    Constructor[] ctors = clazz.getDeclaredConstructors();
+	    sb.append("'declared_ctors':[");
+	    for (int i = 0, n = ctors.length; i < n; i++) {
+		Constructor ctor = ctors[i];
+		if (!Modifier.isPublic(ctor.getModifiers())) {
+		    sb.append("{");
+		    appendModifier(sb, ctor.getModifiers());
+		    appendParameterTypes(sb, ctor.getParameterTypes());
+		    sb.append(KEY_DESCRIPTION).append("'").append(ctors[i].toString()).append("'");
+		    sb.append("},").append(NEWLINE);
+		}
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Field[] fields = clazz.getDeclaredFields();
+	    sb.append("'declared_fields':[");
+	    for (int i = 0, n = fields.length; i < n; i++) {
+		Field f = fields[i];
+		int modifier = f.getModifiers();
+		if (!Modifier.isPublic(modifier)) {
+		    sb.append("{");
+		    sb.append(KEY_NAME).append("'").append(f.getName()).append("',");
+		    if (!f.getDeclaringClass().getName().equals(clazz.getName()))
+			sb.append(KEY_DECLARING_CLASS).append("'").append(f.getDeclaringClass().getName()).append("',");
+		    appendModifier(sb, modifier);
+		    sb.append(KEY_TYPE).append("'").append(f.getType().getName()).append("'");
+		    sb.append("},").append(NEWLINE);
+		}
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Method[] methods = clazz.getDeclaredMethods();
+	    sb.append("'declared_methods':[");
+	    for (int i = 0, n = methods.length; i < n; i++) {
+		Method m = methods[i];
+		int modifier = m.getModifiers();
+		if (!Modifier.isPublic(modifier)) {
+		    sb.append("{");
+		    sb.append(KEY_NAME).append("'").append(m.getName()).append("',");
+		    if (!m.getDeclaringClass().getName().equals(clazz.getName()))
+			sb.append(KEY_DECLARING_CLASS).append("'").append(m.getDeclaringClass().getName()).append("',");
+		    appendModifier(sb, modifier);
+		    sb.append(KEY_RETURNTYPE).append("'").append(m.getReturnType().getName()).append("',");
+		    appendParameterTypes(sb, m.getParameterTypes());
+		    sb.append(KEY_DESCRIPTION).append("'").append(m.toString()).append("'");
+		    sb.append("},").append(NEWLINE);
+		}
+	    }
+	    sb.append("], ").append(NEWLINE);
+
+	    Class[] classes = clazz.getDeclaredClasses();
+	    sb.append("'declared_classes': [");
+	    for (int i = 0, n = classes.length; i < n; i++) {
+		Class c = classes[i];
+		if (!Modifier.isPublic(c.getModifiers())) {
+		    sb.append("'").append(c.getName().replace('$', '.')).append("',");
+		    putClassInfo(map, c);			// !!
+		}
+	    }
+	    sb.append("], ").append(NEWLINE);
+    }
+
+    private static void appendModifier(StringBuffer sb, int modifier) {
+	sb.append(KEY_MODIFIER).append("'").append(Integer.toString(modifier, 2)).append("', ");
+    }
+
+    private static void appendParameterTypes(StringBuffer sb, Class[] paramTypes) {
+	if (paramTypes.length == 0) return ;
+
+	sb.append(KEY_PARAMETERTYPES).append("[");
+	for (int j = 0; j < paramTypes.length; j++) {
+	    sb.append("'").append(paramTypes[j].getName()).append("',");
+	}
+	sb.append("],");
+    }
+
+    private static boolean isBlank(String str) {
+        int len;
+        if (str == null || (len = str.length()) == 0)
+            return true;
+        for (int i = 0; i < len; i++)
+            if ((Character.isWhitespace(str.charAt(i)) == false))
+                return false;
+        return true;
+    }
+
+    // test methods
+
+    static void debug(String s) {
+	if (debug_mode)
+	    System.out.println(s);
+    }
+    static void output(String s) {
+	if (!debug_mode)
+	    System.out.print(s);
+    }
+
+
+    private static void usage() {
+	System.out.println("Reflection for javacomplete (" + VERSION + ")");
+	System.out.println("  java [-classpath] Reflection [-c] [-d] [-e] [-h] [-v] [-p] [-s] name[,comma_separated_name_list]");
+	System.out.println("Options:");
+	System.out.println("  -a	list all members in alphabetic order");
+	System.out.println("  -c	list constructors");
+	System.out.println("  -C	return class info");
+	System.out.println("  -d	default strategy, i.e. instance fields, instance methods, static fields, static methods");
+	System.out.println("  -e	check class existed");
+	System.out.println("  -E	check class existed and read class information");
+	System.out.println("  -D	debug mode");
+	System.out.println("  -p	list package content");
+	System.out.println("  -P	print all package info in the Vim dictionary format");
+	System.out.println("  -s	list static fields and methods");
+	System.out.println("  -h	help");
+	System.out.println("  -v	version");
+    }
+
+    public static void main(String[] args) {
+	String className = null;
+	int option = 0x0;
+	boolean wholeClassInfo = false;
+	boolean onlyStatic = false;
+	boolean onlyConstructor = false;
+	boolean listPackageContent = false;
+	boolean checkExisted = false;
+	boolean checkExistedAndRead = false;
+	boolean allPackageInfo = false;
+
+	for (int i = 0, n = args.length; i < n && !isBlank(args[i]); i++) {
+	    //debug(args[i]);
+	    if (args[i].charAt(0) == '-') {
+		if (args[i].length() > 1) {
+		switch (args[i].charAt(1)) {
+		case 'a':
+		    break;
+		case 'c':	// request constructors
+		    option = option | OPTION_CONSTRUCTOR;
+		    onlyConstructor = true;
+		    break;
+		case 'C':	// class info
+		    wholeClassInfo = true;
+		    break;
+		case 'd':	// default strategy
+		    option = option | STRATEGY_DEFAULT;
+		    break;
+		case 'D':	// debug mode
+		    debug_mode = true;
+		    break;
+		case 'e':	// class existed
+		    checkExisted = true;
+		    break;
+		case 'E':	// check existed and read class information
+		    checkExistedAndRead = true;
+		    break;
+		case 'h':	// help
+		    usage();
+		    return ;
+		case 'v':	// version
+		    System.out.println("Reflection for javacomplete (" + VERSION + ")");
+		    break;
+		case 'p':
+		    listPackageContent = true;
+		    break;
+		case 'P':
+		    option = RETURN_ALL_PACKAGE_INFO;
+		    break;
+		case 's':	// request static members
+		    option = option | OPTION_STATIC_METHOD | OPTION_STATIC_FIELD;
+		    onlyStatic = true;
+		    break;
+		default:
+		}
+		}
+	    }
+	    else {
+		className = args[i];
+	    }
+	}
+	if (className == null && (option & RETURN_ALL_PACKAGE_INFO) != RETURN_ALL_PACKAGE_INFO) {
+	    return;
+	}
+	if (option == 0x0)
+	    option = OPTION_INSTANCE;
+
+	if (wholeClassInfo)
+	    output( getClassInfo(className) );
+	else if ((option & RETURN_ALL_PACKAGE_INFO) == RETURN_ALL_PACKAGE_INFO)
+	    output( getPackageList() );
+	else if (checkExistedAndRead)
+	    output( existedAndRead(className) );
+	else if (checkExisted)
+	    output( String.valueOf(existed(className)) );
+	else if (listPackageContent)
+	    output( getPackageList(className) );
+    }
+}
diff --git a/vim/plugins/javacomplete/autoload/java_parser.vim b/vim/plugins/javacomplete/autoload/java_parser.vim
new file mode 100644
index 0000000..5e1ec38
--- /dev/null
+++ b/vim/plugins/javacomplete/autoload/java_parser.vim
@@ -0,0 +1,3500 @@
+" Vim autoload script for a JAVA PARSER and more.
+" Language:	Java
+" Maintainer:	cheng fang <fangread@yahoo.com.cn>
+" Last Changed: 2007-09-16
+" Version:	0.67
+" Copyright:	Copyright (C) 2007 cheng fang.	All rights reserved.
+" License:	Vim License	(see vim's :help license)
+
+
+if exists("g:loaded_javaparser") || version < 700 || &cp
+  finish
+endif
+let g:loaded_javaparser = 'v0.67'
+
+
+" Constants used by scanner and parser					{{{1
+let s:EOI = ''
+
+let s:keywords = {'+': 'PLUS', '-': 'SUB', '!': 'BANG', '%': 'PERCENT', '^': 'CARET', '&': 'AMP', '*': 'STAR', '|': 'BAR', '~': 'TILDE', '/': 'SLASH', '>': 'GT', '<': 'LT', '?': 'QUES', ':': 'COLON', '=': 'EQ', '++': 'PLUSPLUS', '--': 'SUBSUB', '==': 'EQEQ', '<=': 'LTEQ', '>=': 'GTEQ', '!=': 'BANGEQ', '<<': 'LTLT', '>>': 'GTGT', '>>>': 'GTGTGT', '+=': 'PLUSEQ', '-=': 'SUBEQ', '*=': 'STAREQ', '/=': 'SLASHEQ', '&=': 'AMPEQ', '|=': 'BAREQ', '^=': 'CARETEQ', '%=': 'PERCENTEQ', '<<=': 'LTLTEQ', '>>=': 'GTGTEQ', '>>>=': 'GTGTGTEQ', '||': 'BARBAR', '&&': 'AMPAMP', 'abstract': 'ABSTRACT', 'assert': 'ASSERT', 'boolean': 'BOOLEAN', 'break': 'BREAK', 'byte': 'BYTE', 'case': 'CASE', 'catch': 'CATCH', 'char': 'CHAR', 'class': 'CLASS', 'const': 'CONST', 'continue': 'CONTINUE', 'default': 'DEFAULT', 'do': 'DO', 'double': 'DOUBLE', 'else': 'ELSE', 'extends': 'EXTENDS', 'final': 'FINAL', 'finally': 'FINALLY', 'float': 'FLOAT', 'for': 'FOR', 'goto': 'GOTO', 'if': 'IF', 'implements': 'IMPLEMENTS', 'import': 'IMPORT', 'instanceof': 'INSTANCEOF', 'int': 'INT', 'interface': 'INTERFACE', 'long': 'LONG', 'native': 'NATIVE', 'new': 'NEW', 'package': 'PACKAGE', 'private': 'PRIVATE', 'protected': 'PROTECTED', 'public': 'PUBLIC', 'return': 'RETURN', 'short': 'SHORT', 'static': 'STATIC', 'strictfp': 'STRICTFP', 'super': 'SUPER', 'switch': 'SWITCH', 'synchronized': 'SYNCHRONIZED', 'this': 'THIS', 'throw': 'THROW', 'throws': 'THROWS', 'transient': 'TRANSIENT', 'try': 'TRY', 'void': 'VOID', 'volatile': 'VOLATILE', 'while': 'WHILE', 'true': 'TRUE', 'false': 'FALSE', 'null': 'NULL', '(': 'LPAREN', ')': 'RPAREN', '{': 'LBRACE', '}': 'RBRACE', '[': 'LBRACKET', ']': 'RBRACKET', ';': 'SEMI', ',': 'COMMA', '.': 'DOT', 'enum': 'ENUM', '...': 'ELLIPSIS', '@': 'MONKEYS_AT'}
+
+let s:Flags = {'PUBLIC': 0x1, 'PRIVATE': 0x2, 'PROTECTED': 0x4, 'STATIC': 0x8, 'FINAL': 0x10, 'SYNCHRONIZED': 0x20, 'VOLATILE': 0x40, 'TRANSIENT': 0x80, 'NATIVE': 0x100, 'INTERFACE': 0x200, 'ABSTRACT': 0x400, 'STRICTFP': 0x800, 'SYNTHETIC': 0x1000, 'ANNOTATION': 0x2000, 'ENUM': 	0x4000, 'StandardFlags':0x0fff, 'ACC_SUPER': 0x20, 'ACC_BRIDGE': 0x40, 'ACC_VARARGS': 0x80, 'DEPRECATED': 0x20000, 'HASINIT': 0x40000, 'BLOCK': 0x100000, 'IPROXY': 0x200000, 'NOOUTERTHIS': 0x400000, 'EXISTS': 0x800000, 'COMPOUND': 0x1000000, 'CLASS_SEEN': 0x2000000, 'SOURCE_SEEN': 0x4000000, 'LOCKED': 0x8000000, 'UNATTRIBUTED': 0x10000000, 'ANONCONSTR': 0x20000000, 'ACYCLIC': 0x40000000, 'BRIDGE': 1.repeat('0', 31), 'PARAMETER': 1.repeat('0', 33), 'VARARGS': 1.repeat('0', 34), 'ACYCLIC_ANN': 1.repeat('0', 35), 'GENERATEDCONSTR': 1.repeat('0', 36), 'HYPOTHETICAL': 1.repeat('0', 37), 'PROPRIETARY': 1.repeat('0', 38)}
+
+let s:RE_ANYTHING_AND_NEWLINE	= '\(\(.\|\n\)*\)'
+let s:RE_LINE_COMMENT		= '//.*$'
+let s:RE_COMMENT_SP		= '/\*\*/'
+let s:RE_COMMENT		= ''
+let s:RE_BRACKETS		= '\(\s*\[\s*\]\)'
+
+let s:RE_IDENTIFIER		= '[a-zA-Z_$][a-zA-Z0-9_$]*'
+let s:RE_QUALID			= s:RE_IDENTIFIER. '\(\s*\.\s*' .s:RE_IDENTIFIER. '\)*'
+let s:RE_TYPE_NAME		= s:RE_QUALID
+let s:RE_REFERENCE_TYPE		= s:RE_QUALID . s:RE_BRACKETS . '*'		" TypeName	|| Type[]
+let s:RE_TYPE			= s:RE_REFERENCE_TYPE		" PrimitiveType || ReferenceType
+let s:RE_TYPE_VARIABLE		= s:RE_IDENTIFIER
+let s:RE_VAR_DECL_ID		= s:RE_IDENTIFIER . s:RE_BRACKETS . '*'
+
+let s:RE_TYPE_PARAMS		= ''
+
+let s:RE_THROWS			= 'throws\s\+' . s:RE_TYPE_NAME . '\(\s*,\s*' . s:RE_TYPE_NAME . '\)*'
+let s:RE_FORMAL_PARAM		= '\(final\s*\)\='. s:RE_TYPE . '\s\+' . s:RE_VAR_DECL_ID
+let s:RE_FORMAL_PARAM_LIST	= s:RE_FORMAL_PARAM . '\(\s*,\s*' . s:RE_FORMAL_PARAM . '\)*'
+let s:RE_FORMAL_PARAM2		= '^\s*\(final\s*\)\=\('. s:RE_TYPE . '\)\s\+\(' . s:RE_IDENTIFIER . '\)' . s:RE_BRACKETS . '*'
+
+let s:RE_MEMBER_MODS		= '\%(PUBLIC\|PROTECTED\|PRIVATE\|ABSTRACT\|STATIC\|FINAL\|TRANSIENT\|VOLATILE\|SYNCHRONIZED\|NATIVE\|STRICTFP\)'
+let s:RE_MEMBER_HEADER		= '\s*\(\%(' .s:RE_MEMBER_MODS. '\s\+\)\+\)\(' .s:RE_IDENTIFIER. '\%(\s*\.\s*' .s:RE_IDENTIFIER. '\)*\%(\s*\[\s*\]\)*\)\s\+\(' .s:RE_IDENTIFIER. '\)'
+
+" API								{{{1
+
+let s:PROTOTYPE = {'s:options': {}, 'b:buf': '', 'b:buflen': 0, 'b:lines': [], 'b:idxes': [0], 'b:bp': -1, 'b:ch': '', 'b:line': 0, 'b:col': 0, 'b:pos': 0, 'b:endPos': 0, 'b:prevEndPos': 0, 'b:errPos': -1, 'b:errorEndPos': -1, 'b:sbuf': '', 'b:name': '', 'b:token': '', 'b:docComment': '', 'b:radix': 0, 'b:unicodeConversionBp': -1, 'b:scanStrategy': 0, 'b:allowGenerics': 1, 'b:allowVarargs': 1, 'b:allowAsserts': 1, 'b:allowEnums': 1, 'b:allowForeach': 1, 'b:allowStaticImport': 1, 'b:allowAnnotations': 1, 'b:keepDocComments': 1, 'b:mode': 0, 'b:lastmode': 0, 'b:log': [], 'b:et_perf': '', 'b:et_nextToken_count': 0}
+
+" Function to initialize the parser
+" parameters:
+" - lines	List of code text
+" - options	A set of options
+fu! java_parser#InitParser(lines, ...)
+  let s:options = a:0 == 0 ? {} : a:1
+
+  " internal variables for scanning
+" let b:buf = ''		" The input buffer
+  let b:buflen = 0		" index of one past last character in buffer. also eofPos
+  let b:lines = a:lines		" The input buffer
+  let b:idxes = [0]		" Begin index of every lines
+  let b:bp = -1			" index of next character to be read.
+  let b:ch = ''			" The current character.
+  let b:line = 0		" The line number position of the current character.
+  let b:col = 0			" The column number position of the current character.
+  let b:pos = 0			" The token's position, 0-based offset from beginning of text.
+  let b:endPos = 0		" Character position just after the last character of the token.
+  let b:prevEndPos = 0		" The last character position of the previous token.
+  let b:errPos = -1		" The position where a lexical error occurred
+  let b:errorEndPos = -1	" 
+  let b:sbuf = ''		" A character buffer for literals.
+  let b:name = ''		" The name of an identifier or token:
+  let b:token = 0		" The token, set by s:nextToken().
+  let b:docComment = ''
+  let b:radix = 0		" The radix of a numeric literal token.
+  let b:unicodeConversionBp =-1 " The buffer index of the last converted unicode character
+
+  let b:scanStrategy = get(s:options, 'scanStrategy', -1)	" 0 - only class members when parse full file; 
+  							" 1 - keep statement as a whole string; 
+							" 2 - all 
+							" -1 - enable quick recognition of declarations in common form.
+
+  " language feature options.
+  let b:allowGenerics = get(s:options, 'allowGenerics', 1)
+  let b:allowVarargs = get(s:options, 'allowVarargs', 1)
+  let b:allowAsserts = get(s:options, 'allowAsserts', 1)
+  let b:allowEnums = get(s:options, 'allowEnums', 1)
+  let b:allowForeach = get(s:options, 'allowForeach', 1)
+  let b:allowStaticImport = get(s:options, 'allowStaticImport', 1)
+  let b:allowAnnotations = get(s:options, 'allowAnnotations', 1)
+  let b:keepDocComments = get(s:options, 'keepDocComments', 1)
+
+  let b:mode = 0		" The current mode.
+  let b:lastmode = 0		" The mode of the term that was parsed last.
+
+
+  let b:log = []
+
+  let b:et_perf = ''
+  let b:et_nextToken_count = 0
+
+"  let b:buf = join(a:lines, "\r")
+"  let b:buflen = strlen(b:buf)
+  for line in a:lines
+    let b:buflen += strlen(line) + 1
+    call add(b:idxes, b:buflen)
+  endfor
+  call add(b:lines, s:EOI)	" avoid 'list index out of range' error from lines[] in java_scanChar
+				"  if b:bp >= b:buflen
+				"    return s:EOI
+				"  endif
+
+  " initialize scanner
+  call s:scanChar()	" be ready for scanning
+  call s:nextToken()	" prime the pump
+endfu
+
+fu! java_parser#FreeParser()
+  for varname in keys(s:PROTOTYPE)
+    exe "if exists(" . string(varname) . ") | unlet " . varname . " | endif"
+  endfor
+endfu
+
+fu! java_parser#GetSnapshot()
+  let snapshot = {}
+  for varname in keys(s:PROTOTYPE)
+    exe "let snapshot[" . string(varname) . "] = " . varname
+  endfor
+  return snapshot
+endfu
+
+fu! java_parser#Restore(snapshot)
+  for key in keys(a:snapshot)
+    exe "let " . key . "=" . string(a:snapshot[key])
+  endfor
+endfu
+
+" move b:bp and b:pos to the specified position
+fu! java_parser#GotoPosition(pos)
+  let b:bp = a:pos-1
+  let b:pos = a:pos
+  let p = java_parser#DecodePos(b:bp)
+  let b:line = p.line
+  let b:col = p.col
+  call s:scanChar()
+  call s:nextToken()
+endfu
+
+fu! java_parser#compilationUnit()
+  return s:compilationUnit()
+endfu
+
+fu! java_parser#block()
+  return s:block()
+endfu
+
+fu! java_parser#statement()
+  return s:blockStatements()
+endfu
+
+fu! java_parser#expression()
+  return s:expression()
+endfu
+
+fu! java_parser#nextToken()
+  return s:nextToken()
+endfu
+
+
+" Tree									{{{1
+let s:TTree = {'tag': '', 'pos': 0}	" Root class for AST nodes.
+
+" Tree maker functions							{{{2
+fu! s:ClassDef(pos, mods, ...)
+  return {'tag': 'CLASSDEF', 'pos': a:pos, 'mods': a:mods, 'name': ''}
+endfu
+
+fu! s:VarDef(pos, mods, name, vartype)
+  return {'tag': 'VARDEF', 'pos': a:pos, 'mods': a:mods, 'name': a:name, 'vartype': a:vartype}
+endfu
+
+fu! s:Unary(pos, opcode, arg)
+  return {'tag': a:opcode, 'pos': a:pos, 'arg': a:arg}
+endfu
+
+fu! s:Binary(pos, opcode, lhs, rhs, ...)
+  return {'tag': a:opcode, 'pos': a:pos, 'lhs': a:lhs, 'rhs': a:rhs}
+endfu
+
+fu! s:TypeCast(pos, clazz, expr)
+  return {'tag': 'TYPECAST', 'pos': a:pos, 'clazz': a:clazz, 'expr': a:expr}
+endfu
+
+fu! s:Select(pos, selected, name)
+  return {'tag': 'SELECT', 'pos': a:pos, 'selected': a:selected, 'name': a:name}
+endfu
+
+fu! s:Ident(pos, name)
+  return {'tag': 'IDENT', 'pos': a:pos, 'name': a:name}
+endfu
+
+fu! s:TypeArray(pos, elementtype)
+  return {'tag': 'TYPEARRAY', 'pos': a:pos, 'elementtype': a:elementtype}
+endfu
+
+fu! s:Modifiers(pos, flags, annotations)
+  let noFlags = s:BitAnd(a:flags, s:Flags.StandardFlags) == 0
+  let mods = {'tag': 'MODIFIERS', 'flags': a:flags}
+  let mods.pos = noFlags && empty(a:annotations) ? -1 : a:pos
+  if !empty(a:annotations)
+    let mods.annotations = a:annotations
+  endif
+  return mods
+endfu
+
+
+" 				{{{2
+fu! java_parser#IsStatement(tree)
+  return has_key(a:tree, 'tag') && a:tree.tag =~# '^\(CLASSDEF\|VARDEF\|BLOCK\|IF\|DOLOOP\|WHILELOOP\|FORLOOP\|FOREACHLOOP\|SWITCH\|TRY\|EXEC\|LABELLED\|SYNCHRONIZED\|CASE\|BREAK\|RETURN\|SKIP\|THROW\|ASSERT\|CONTINUE\)$'
+endfu
+
+" Tree Helper						{{{1
+fu! java_parser#type2Str(type)
+  if type(a:type) == type("")
+    return a:type
+  endif
+
+  let t = a:type
+  if t.tag == 'IDENTIFIER'
+    return t.value
+  elseif t.tag == 'IDENT'
+    return t.name
+  elseif t.tag == 'TYPEIDENT'
+    return t.typetag
+  elseif t.tag == 'SELECT'
+    return java_parser#type2Str(t.selected) . '.' . t.name
+  elseif t.tag == 'TYPEARRAY'
+    return java_parser#type2Str(t.elementtype) . '[]'
+  elseif t.tag == 'TYPEAPPLY'
+    return t.clazz.name
+  elseif t.tag == 'TEMPLATE'
+    let s = t.clazz.value . '<'
+    for arg in t.arguments
+      let s .= arg.value
+    endfor
+    let s .= '>'
+    return s
+  endif
+endfu
+
+fu! s:vardef2Str(vardef)
+  return java_parser#type2Str(a:vardef.vartype) . ' ' . a:vardef.name
+endfu
+
+fu! s:method2Str(methoddef)
+  let m = a:methoddef
+  let desc = m.r . ' ' . m.n . '('
+  for item in m.params
+    let desc .= s:vardef2Str(item) . ','
+  endfor
+  let desc = substitute(desc, ',$', '', '')
+  let desc .= ')'
+  return desc
+endfu
+
+" Scanner								{{{1
+
+" nextToken()								{{{2
+fu! s:nextToken()
+  let b:prevEndPos = b:endPos
+  let b:et_nextToken_count += 1
+  let b:sbuf = ''
+  while 1
+    let b:pos = b:bp
+    if b:ch =~ '[ \t\r\n]'	"  - FF
+      " OAO optimized code: skip spaces
+      let b:col = match(b:lines[b:line], '[^ \t\r\n]\|$', b:col)
+      let b:bp = b:idxes[b:line] + b:col
+      call s:scanChar()
+      let b:endPos = b:bp
+      continue
+
+    elseif b:ch =~ '[a-zA-Z$_]'
+      " read a identifier
+      call s:scanIdent()
+      return
+
+    elseif b:ch == '0'
+      call s:scanChar()
+      " hex
+      if b:ch == 'x' || b:ch == 'X'
+	call s:scanChar()
+	if b:ch == '.'
+	  call s:scanHexFractionAndSuffix(0)
+	elseif s:isDigit(16)
+	  call s:scanNumber(16)
+	else
+	  call s:LexError("invalid.hex.number")
+	endif
+      " oct
+      else
+	let b:sbuf .= '0'
+	call s:scanNumber(8)
+      endif
+      return
+
+    elseif b:ch =~ '[1-9]'
+      " read number
+      call s:scanNumber(10)
+      return
+
+    elseif b:ch == '.'
+      call s:scanChar()
+      if b:ch =~ '[0-9]'
+	let b:sbuf .= '.'
+	call s:scanFractionAndSuffix()
+      " JAVA5 ELLIPSIS
+      elseif b:ch == '.'
+	let b:sbuf .= '..'
+	call s:scanChar()
+	if b:ch == '.'
+	  call s:scanChar()
+	  let b:sbuf .= '.'
+	  let b:token = 'ELLIPSIS'
+	else
+	  call s:LexError('malformed.fp.lit')
+	endif
+      else
+	let b:token = 'DOT'
+      endif
+      return
+
+    elseif b:ch =~ '[,;(){}[\]]'
+      let b:token = s:keywords[b:ch]
+      call s:scanChar()
+      return
+
+    elseif b:ch == '/'
+      let status = s:scanComment()
+      if status == 1
+	continue
+      elseif status == 2
+	return
+      elseif b:ch == '='
+	let b:name = '/='
+	let b:token = 'SLASHEQ'
+	call s:scanChar()
+      else
+	let b:name = '/'
+	let b:token = 'SLASH'
+      endif
+      return
+
+
+    elseif b:ch == "'"
+      call s:scanSingleQuote()
+      return
+
+    elseif b:ch == '"'
+      call s:scanDoubleQuote()
+      return
+
+    else
+      if s:IsSpecial(b:ch)
+	call s:scanOperator()
+      elseif b:ch =~ '[a-zA-Z_]'
+	call s:scanIdent()
+      elseif b:bp >= b:buflen 
+	let b:token = 'EOF'
+      else
+	call s:LexError("illegal.char '" . b:ch . "'")
+	call s:scanChar()
+      endif
+      return
+    endif
+  endwhile
+endfu
+
+" scanChar()	Read next character.					{{{2
+" one buf version 
+"fu! s:scanChar()
+"  let b:bp += 1
+"  if b:bp % 256 == 0
+"    let b:buf2 = strpart(b:buf, b:bp, 256)
+"  endif
+"  let b:ch = b:buf2[b:bp % 256]
+""  let b:ch = b:buf[b:bp]	" it will be extremely slow when buf is large
+"  "call s:Trace( "'" . b:ch . "'" )
+"
+"  if b:ch == "\r"
+"    let b:line += 1
+"    let b:col = 0
+"  elseif b:ch == "\n"
+"    if b:bp == 0 || b:buf[b:bp-1] == "\r"
+"      let b:line += 1
+"      let b:col = 0
+"    endif
+"  else
+"    let b:col += 1
+"  endif
+"endfu
+
+" Read next character.		multiple lines version 
+fu! s:scanChar()
+ let b:bp+=1
+ let b:ch=b:lines[b:line][b:col]
+ let b:col+=1
+ if b:ch==''
+   let b:ch="\r"
+   let b:line+=1
+   let b:col=0
+ endif
+
+ if b:ch == '\'
+   call s:convertUnicode()
+ endif
+endfu
+
+fu! java_parser#CharAt(line, col)
+  let ch=b:lines[a:line][a:col]
+  if ch == ''
+    let ch = "\r"
+  endif
+  return ch
+endfu
+
+fu! s:convertUnicode()
+  if b:ch == '\' && b:unicodeConversionBp != b:bp
+    "if java_parser#CharAt(b:bp+1) == 'u'
+      "call s:scanChar()
+    "endif
+  endif
+endfu
+
+" putChar() is substituted with 
+"	let b:sbuf .= '.'
+
+" scanIdent()								{{{2
+" OAO optimized code
+fu! s:scanIdent()
+  let col_old = b:col
+  let b:col = match(b:lines[b:line], '[^a-zA-Z0-9$_]\|$', b:col)
+  let b:name = strpart(b:lines[b:line], col_old-1, b:col-col_old+1)
+  let b:token = get(s:keywords, b:name, 'IDENTIFIER')
+  call s:Debug('name: "' . b:name . '" of token type ' . b:token )
+  let b:bp = b:idxes[b:line] + b:col
+  call s:scanChar()
+endfu
+
+" Standard implementation
+fu! s:scanIdent_old()
+  " do ... while ()
+  let b:sbuf .= b:ch
+  call s:scanChar()
+  if b:ch !~ '[a-zA-Z0-9$_]' || b:bp >= b:buflen
+    let b:name = b:sbuf
+    let b:token = has_key(s:keywords, b:name) ? s:keywords[b:name] : 'IDENTIFIER'
+    call s:Debug('name: "' . b:name . '" of token type ' . b:token )
+    return
+  endif
+
+  while (1)
+    let b:sbuf .= b:ch
+    call s:scanChar()
+    if b:ch !~ '[a-zA-Z0-9$_]' || b:bp >= b:buflen
+      let b:name = b:sbuf
+      let b:token = has_key(s:keywords, b:name) ? s:keywords[b:name] : 'IDENTIFIER'
+      call s:Debug('name: "' . b:name . '" of token type ' . b:token )
+      break
+    endif
+  endwhile
+endfu
+
+" digit()								{{{2
+" Convert an ASCII digit from its base (8, 10, or 16) to its value.
+" NOTE: This only implement isdigit() check
+fu! s:digit(base)
+  let c = b:ch
+  "let result = 
+endfu
+
+fu! s:isDigit(base)
+  if a:base == 8
+    return b:ch =~ '[0-7]'
+  elseif a:base == 16
+    return b:ch =~ '[0-9a-fA-F]'
+  elseif a:base == 10
+    return b:ch =~ '[0-9]'
+  endif
+endfu
+
+" scanNumber()								{{{2
+fu! s:scanNumber(radix)
+  let b:radix = a:radix
+  let digitRadix = a:radix <= 10 ? 10 : 16
+  let seendigit = 0
+  while s:isDigit(a:radix)
+    let seendigit = 1
+    let b:sbuf .= b:ch
+    call s:scanChar()
+  endwhile
+  if a:radix == 16 && b:ch == '.'
+    call s:scanHexFractionAndSuffix(seendigit)
+  elseif seendigit && a:radix == 16 && (b:ch == 'p' || b:ch == 'P')
+    call s:scanHexExponentAndSuffix()
+  elseif a:radix <= 10 && b:ch == '.'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+    call s:scanFractionAndSuffix()
+  elseif a:radix <= 10 && b:ch =~ '[eEfFdD]'
+    call s:scanFractionAndSuffix()
+  else
+    if b:ch == 'l' || b:ch == 'L'
+      call s:scanChar()
+      let b:token = 'LONGLITERAL'
+    else
+      let b:token = 'INTLITERAL'
+    endif
+  endif
+endfu
+
+fu! s:scanHexExponentAndSuffix()
+  if b:ch == 'p' || b:ch == 'P'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+    if b:ch == '+' || b:ch == '-'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+    endif
+
+    if '0' <= b:ch && b:ch <= '9'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+      while '0' <= b:ch && b:ch <= '9'
+	let b:sbuf .= b:ch
+	call s:scanChar()
+      endwhile
+
+      "if !b:allowHexFloats
+      "elseif !b:hexFloatsWork
+      "  call s:LexError("unsupported.cross.fp.lit")
+      "endif
+    else
+      call s:LexError("malformed.fp.lit")
+    endif
+  else
+    call s:LexError("malformed.fp.lit")
+  endif
+
+  if b:ch == 'f' || b:ch == 'F'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+    let b:token = 'FLOATLITERAL'
+  else
+    if b:ch == 'f' || b:ch == 'F'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+    endif
+    let b:token = 'DOUBLELITERAL'
+  endif
+endfu
+
+fu! s:scanFraction()
+  " scan fraction
+  while b:ch =~ '[0-9]'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+  endwhile
+
+  " floating point number
+  if b:ch == 'e' || b:ch == 'E'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+
+    if b:ch == '+' || b:ch == '-'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+    endif
+
+    if b:ch =~ '[0-9]'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+      while b:ch =~ '[0-9]'
+	let b:sbuf .= b:ch
+	call s:scanChar()
+      endwhile
+      return 
+    endif
+
+    call s:LexError("malformed.fp.lit")
+  endif
+endfu
+
+" Read fractional part and 'd' or 'f' suffix of floating point number.
+fu! s:scanFractionAndSuffix()
+  call s:scanFraction()
+  if b:ch == 'f' || b:ch == 'F'
+    let b:sbuf .= b:ch
+    call s:scanChar()
+    let b:token = 'FLOATLITERAL'
+  else
+    if b:ch == 'd' || b:ch == 'D'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+    endif
+    let b:token = 'DOUBLELITERAL'
+  endif
+endfu
+
+fu! s:scanHexFractionAndSuffix(seendigit)
+  let seendigit = a:seendigit
+  let b:radix = 16
+  if b:ch != '.' | echoerr "b:ch != '.'" | endif
+
+  let b:sbuf .= b:ch
+  call s:scanChar()
+  while s:isDigit(16)
+    let seendigit = 1
+    let b:sbuf .= b:ch
+    call s:scanChar()
+  endwhile
+
+  if !seendigit
+    call s:LexError("invalid.hex.number")
+  else
+    call s:scanHexExponentAndSuffix()
+  endif
+endfu
+
+" scanLitChar()								{{{2
+fu! s:scanLitChar()
+  if b:ch == '\'
+    call s:scanChar()
+    if b:ch =~ '[0-7]'
+      let leadch = b:ch
+      let oct = b:ch
+      call s:scanChar()
+      if b:ch =~ '[0-7]'
+	let oct = oct * 8 + b:ch
+	call s:scanChar()
+	if leadch <= '3' && '0' <= b:ch && b:ch <= '7'
+	  let oct = oct * 8 + b:ch
+	  call s:scanChar()
+	endif
+      endif
+      let b:sbuf .= oct
+
+    elseif b:ch == "'" || b:ch =~ '[btnfr"\\]'
+      let b:sbuf .= b:ch
+      call s:scanChar()
+
+    " unicode escape
+    elseif b:ch == 'u'
+      while b:ch =~ '[a-zA-Z0-9]'
+	call s:scanChar()
+      endwhile
+
+    else
+      call s:LexError("illegal.esc.char")
+    endif
+    
+  elseif b:bp < b:buflen
+    let b:sbuf .= b:ch
+    call s:scanChar()
+  endif
+endfu
+
+" scanOperator()								{{{2
+fu! s:scanOperator()
+  while 1
+    if !has_key(s:keywords, b:sbuf . b:ch)
+      break
+    endif
+
+    let b:sbuf .= b:ch
+    let b:token = get(s:keywords, b:sbuf, 'IDENTIFIER')
+    call s:Debug('sbuf: "' . b:sbuf . '" of token type ' . b:token )
+    call s:scanChar()
+    if !s:IsSpecial(b:ch)
+      break
+    endif
+  endwhile
+endfu
+
+" NOTE: add @ for JAVA5
+fu! s:IsSpecial(ch)
+  return a:ch =~ '[!%&*?+-:<=>^|~@]'
+endfu
+
+" scan comment							{{{2
+" return 0 - not comment, 1 - succeeded to scan comment, 2 - unclosed comment
+fu! s:scanComment()
+  call s:scanChar()
+  " line comment
+  if b:ch == '/'
+    let b:token = 'LINECOMMENT'
+    call s:Info('line comment')
+    call s:SkipLineComment()
+    let b:endPos = b:bp
+    return 1
+
+  " classic comment
+  " test cases: /**/, /***/, /*******/, /*** astatement; /***/, /*/
+  elseif b:ch == '*'
+    let b:token = 'BLOCKCOMMENT'
+    call s:Info('block comment')
+    call s:scanChar()
+    let time = reltime()
+    " javadoc
+    if b:ch == '*'
+      let b:docComment = s:scanDocComment()
+    " normal comment
+    else
+      call s:skipComment()
+    endif
+    let b:et_perf .= "\r" . 'comment ' . reltimestr(reltime(time))
+
+    if b:ch == '/'
+      call s:Info('end block comment')
+      call s:scanChar()
+      let b:endPos = b:bp
+      return 1
+    else
+      call s:LexError('unclosed.comment')
+      return 2
+    endif
+  endif
+  return 0
+endfu
+
+fu! s:SkipLineComment()
+  " OAO optimized code
+    let b:ch = "\r"
+    let b:line += 1
+    let b:col = 0
+    let b:bp = b:idxes[b:line] + b:col
+
+  " OLD 
+  "call s:scanChar()
+  "while (b:ch != "\r")
+  "  call s:scanChar()
+  "endwhile
+endfu
+
+fu! s:skipComment()
+  if b:ch == '*'
+    call s:scanChar()
+    if b:ch == '/'
+      return
+    else	" NOTE: go back
+      let b:ch = '*'
+      let b:bp -= 1
+      let b:col -= 1
+    endif 
+  endif
+
+  " OAO optimized code
+  if s:Stridx('*/') > -1
+    call s:scanChar()
+  endif
+
+"  " Standard implementation 
+"  while b:bp < b:buflen
+"    if b:ch == '*'
+"      call s:scanChar()
+"      if b:ch == '/'
+"        break
+"      endif
+"    else
+"      call s:scanChar()
+"    endif
+"  endwhile
+endfu
+
+fu! s:scanDocComment()
+  call s:Info('It is javadoc')
+  return s:skipComment()
+
+  " skip star '*'
+  while (b:bp < b:buflen && b:ch == '*')
+    call s:scanChar()
+  endwhile
+
+  if b:bp < b:buflen && b:ch == '/'
+    return ''
+  endif
+
+  let result = ''
+  while b:bp < b:buflen
+    if b:ch == '*'
+      call s:scanChar()
+      if b:ch == '/'
+	break
+      else
+	let result .= b:ch
+      endif
+    else
+      call s:scanChar()
+      let result .= b:ch
+    endif
+  endwhile
+
+  return result
+endfu
+
+" scan single quote							{{{2
+fu! s:scanSingleQuote()
+  call s:scanChar()
+  if (b:ch == "'")
+    call s:LexError("empty.char.lit")
+  else
+    if (b:ch =~ '[\r\n]')
+      call s:LexError("illegal.line.end.in.char.lit")
+    endif
+
+    call s:scanLitChar()
+    if b:ch == "'"
+      call s:scanChar()
+      let b:token = 'CHARLITERAL'
+    else
+      call s:LexError("unclosed.char.lit")
+    endif
+  endif
+endfu
+
+" scan double quote							{{{2
+" test cases:
+"	'a"";'
+"	'a"b,c";'
+"	'a"b,\"c";'
+"	'a"b,\\"c";'
+"	'a"b,\\\"c";'
+"	'a"b,\\\\"c";'
+"	'a"b,\\\"c;'	" NOTE: cannot handle
+fu! s:scanDoubleQuote()
+  if match(b:lines[b:line], '\\"', b:col) == -1
+    let idx = matchend(b:lines[b:line], '\(\\\(["\\''ntbrf]\)\|[^"]\)*"', b:col)
+    if idx != -1
+      let b:sbuf = strpart(b:lines[b:line], b:col, idx-b:col-1)
+      let b:col = idx-1	" back to the end 
+      let b:bp = b:idxes[b:line] + b:col
+      call s:scanChar()
+      let b:token = 'STRINGLITERAL'
+    else
+      call s:LexError("unclosed.str.lit")
+    endif
+    call s:scanChar()
+    return
+  endif
+
+
+  call s:scanChar()
+  while b:ch !~ '["\r\n]' && b:bp < b:buflen
+    call s:scanLitChar()
+  endwhile
+
+  if b:ch == '"'
+    let b:token = 'STRINGLITERAL'
+    call s:scanChar()
+  else
+    call s:LexError("unclosed.str.lit")
+  endif
+endfu
+
+" lex errors					{{{2
+fu! s:LexError(key, ...)
+  let pos = a:0 == 0 ? b:pos : a:1
+  let b:token = 'ERROR'
+  let b:errPos = pos
+  call s:Log(4, b:pos, '[lex error]:' . s:Pos2Str(pos) . ': ' . a:key)
+endfu
+
+" Scanner Helper							{{{1
+" gotoMatchEnd								{{{2
+fu! s:gotoMatchEnd(one, another, ...)
+  while b:bp < b:buflen
+    if b:ch == a:another
+      call s:scanChar()
+      if has_key(s:keywords, a:another)
+	let b:token = s:keywords[a:another]
+      else
+	echoerr '<strange>'
+      endif
+      break
+
+    elseif b:ch == a:one
+      call s:scanChar()
+      call s:gotoMatchEnd(a:one, a:another)
+
+    " skip commment
+    elseif b:ch == '/'
+      call s:scanComment()
+
+    " skip literal character
+    elseif b:ch == "'"
+      call s:scanSingleQuote()
+
+    " skip literal string
+    elseif b:ch == '"'
+      call s:scanDoubleQuote()
+
+    else
+      " OAO 
+      call s:Match('[' . a:one . a:another . '/"'']')
+      " OLD 
+      "call s:scanChar()
+    endif
+  endwhile
+
+  " For such situation: after accept one token, the next token is just the same.
+  let nextTokenIsLBRACE = a:0 == 0 ? 0 : a:1
+  if nextTokenIsLBRACE
+    call s:gotoMatchEnd(a:one, a:another)
+  endif
+
+  return b:bp
+endfu
+
+" gotoSemi								{{{2
+fu! s:gotoSemi()
+  while b:bp < b:buflen
+    if b:ch == ';'
+      let b:pos = b:bp
+      call s:scanChar()
+      let b:token = 'SEMI'
+      return
+
+    " skip commment
+    elseif b:ch == '/'
+      call s:scanComment()
+
+    " skip literal character
+    elseif b:ch == "'"
+      call s:scanSingleQuote()
+
+    " skip literal string
+    elseif b:ch == '"'
+      call s:scanDoubleQuote()
+
+    elseif b:ch == '{'
+      call s:scanChar()
+      call s:gotoMatchEnd('{', '}')
+
+    elseif b:ch == '('
+      call s:scanChar()
+      call s:gotoMatchEnd('(', ')')
+
+    elseif b:ch == '['
+      call s:scanChar()
+      call s:gotoMatchEnd('[', ']')
+
+    else
+      " OAO 
+      call s:Match('[;({[/"'']')
+      " OLD 
+      "call s:scanChar()
+    endif
+  endwhile
+endfu
+
+" s:Strpart(), s:Stridx(), s:Match()					{{{2
+fu! Strpart(start, len)
+  let startline = java_parser#DecodePos(a:start).line
+  let endline   = java_parser#DecodePos(a:start + a:len).line
+  let str = join(b:lines[startline:endline-1]) . b:lines[endline]
+  return strpart(str, a:start-b:idxes[startline], a:len)
+endfu
+
+fu! s:Stridx(needle)
+  let found = 0
+  while b:line < len(b:lines)-1
+    let idx = stridx(b:lines[b:line], a:needle, b:col)
+    if idx > -1
+      let found = 1
+      let b:col = idx
+      break
+    endif
+    let b:line += 1
+    let b:col = 0
+  endwhile
+
+  if found
+    let b:bp = b:idxes[b:line] + b:col
+    call s:scanChar()
+    return b:bp
+  else
+    let b:bp = b:buflen
+    let b:ch = s:EOI
+    return -1
+  endif
+endfu
+
+fu! s:Match(pat)
+  let bp_old = b:bp
+  let line_old = b:line
+  let col_old = b:col
+
+  let found = 0
+  while b:line < len(b:lines)-1
+    let idx = match(b:lines[b:line], a:pat, b:col)
+    if idx > -1
+      let found = 1
+      let b:col = idx
+      break
+    endif
+    let b:line += 1
+    let b:col = 0
+  endwhile
+
+  if found
+    let b:bp = b:idxes[b:line] + b:col-1
+    call s:scanChar()
+    return b:bp
+  else
+    let b:bp = bp_old
+    let b:line = line_old
+    let b:col = col_old
+    call s:scanChar()
+    return -1
+  endif
+endfu
+
+
+" conversion between position and (line, col)				{{{2
+fu! java_parser#MakePos(line, col)
+  return b:idxes[a:line] + a:col
+endfu
+
+fu! java_parser#DecodePos(pos)
+  let line = -1
+  for idx in b:idxes
+    if idx > a:pos
+      break
+    endif
+    let line += 1
+  endfor
+  let col = a:pos - b:idxes[line]
+  return {'line': line, 'col': col}
+endfu
+
+fu! s:Pos2Str(pos)
+  let o = java_parser#DecodePos(a:pos)
+  return '(' . (o.line+1) . ',' . (o.col+1) . ')'
+endfu
+
+" Bitwise operator emulators						{{{1
+" NOTE: For more than 32 bit number, use the string bits form.
+
+" bit operator ~
+fu! s:BitNot(v)
+  return s:Bits2Number( s:BitNot_binary(s:Number2Bits(a:v)) )
+endfu
+
+fu! s:BitNot_binary(v)
+  let v = substitute(a:v, '^0*\([01]\+\)', '\1', 'g')
+  let v = substitute(v, '1', '2', 'g')
+  let v = substitute(v, '0', '1', 'g')
+  let v = substitute(v, '2', '0', 'g')
+  return v
+endfu
+
+" bit operator &
+fu! s:BitAnd(n1, n2)
+  if a:n1 == 0 || a:n2 == 0	| return 0 | endif
+  if a:n1 == a:n2		| return 1 | endif
+  return s:Bits2Number( s:BitOperator_binary(s:Number2Bits(a:n1), s:Number2Bits(a:n2), 'n1[i] == "1" && n2[i] == "1"') )
+endfu
+
+" bit operator |
+fu! s:BitOr(n1, n2, ...)
+  if a:0 == 0
+    if a:n1 == 0
+      return a:n2
+    elseif a:n2 == 0
+      return a:n1
+    endif
+  endif
+  let result = s:BitOperator_binary(s:Number2Bits(a:n1), s:Number2Bits(a:n2), 'n1[i] == "1" || n2[i] == "1"')
+  for a in a:000
+      let result = s:BitOperator_binary(result, s:Number2Bits(a), 'n1[i] == "1" || n2[i] == "1"')
+  endfor
+  return s:Bits2Number( result )
+endfu
+
+" bit operator ^
+fu! s:BitXor(n1, n2)
+  if a:n1 == a:n2	| return 0 | endif
+  return s:Bits2Number( s:BitOperator_binary(s:Number2Bits(a:n1), s:Number2Bits(a:n2), 'n1[i] != n2[i]') )
+endfu
+
+fu! s:BitOperator_binary(n1, n2, comparator)
+  let n1 = a:n1
+  let n2 = a:n2
+
+  let len1 = len(n1)
+  let len2 = len(n2)
+  let len  = len1
+  if len1 > len2
+    let n2 = repeat('0', len1-len2) . n2
+  else
+    let len = len2
+    let n1 = repeat('0', len2-len1) . n1
+  endif
+
+  let i = 0
+  let bits = ''
+  while i < len
+    let bits .= eval(a:comparator) ? '1' : '0'
+    let i += 1
+  endwhile
+  return bits
+endfu
+
+" bit operator <<
+fu! s:BitMoveLeft()
+endfu
+
+" bit operator >>
+fu! s:BitMoveRight()
+endfu
+
+" helper function: convert a number to a string consisted of '0' or '1' indicating number
+fu! s:Number2Bits(n, ...)
+  if type(a:n) == type("") | return a:n | endif
+  if a:n == 0 | return '0' | endif
+
+  let n = a:n
+  let bits = ''
+  while n != 0
+    let bit = n % 2
+    "echo 'n: ' . n . ' bit: ' . bit
+    let bits = bit . bits
+    let n = (n-bit)/ 2
+  endwhile
+  if a:0 > 0
+    let bits = repeat(a:1 - len(bits)) . bits
+  endif
+  return bits
+endfu
+
+" helper function: convert a string consisted of '0' or '1' indicating number to a number
+" precondition: bits must not be empty string
+fu! s:Bits2Number(bits)
+  let len = len(a:bits)
+  let n = a:bits[0]
+  let i = 1
+  while i < len
+    let n = n * 2 + a:bits[i]
+    let i += 1
+  endwhile
+  return n
+endfu
+
+
+let s:modifier_keywords = ['strictfp', 'abstract', 'interface', 'native', 'transient', 'volatile', 'synchronized', 'final', 'static', 'protected', 'private', 'public']
+fu! s:String2Flags(str)
+  let mod = [0,0,0,0,0,0,0,0,0,0,0,0,]
+  for item in split(a:str, '\s\+')
+      if index(s:modifier_keywords, item) != -1
+	  let mod[index(s:modifier_keywords, item)] = '1'
+      endif
+  endfor
+  return join(mod[index(mod, '1'):], '')
+endfu
+
+" Log utilities							{{{1
+" level
+" 	5	off/fatal 
+" 	4	error 
+" 	3	warn
+" 	2	info
+" 	1	debug
+" 	0	trace
+fu! java_parser#SetLogLevel(level)
+  let b:loglevel = a:level
+endfu
+
+fu! java_parser#GetLogLevel()
+  return exists('b:loglevel') ? b:loglevel : 3
+endfu
+
+fu! java_parser#GetLogContent()
+  return b:log
+endfu
+
+fu! s:Trace(msg)
+  call s:Log(0, b:pos, a:msg)
+endfu
+
+fu! s:Debug(msg)
+  call s:Log(1, b:pos, a:msg)
+endfu
+
+fu! s:Info(msg)
+  call s:Log(2, b:pos, a:msg)
+endfu
+
+fu! s:Log(level, pos, key, ...)
+  if a:level >= java_parser#GetLogLevel()
+    echo a:key
+    call add(b:log, a:key)
+  endif
+endfu
+
+fu! s:ShowWatch(...)
+  let at = a:0 > 0 ? a:1 : ''
+  echo '-- b:bp ' . b:bp . string(java_parser#DecodePos(b:bp)) . ' b:ch "' . b:ch . '" b:name ' . b:name . ' b:token ' . b:token . ' b:pos ' .b:pos . ' endPos ' . b:endPos . ' prevEndPos ' . b:prevEndPos . ' errPos ' . b:errPos . ' errorEndPos ' . b:errorEndPos . at
+endfu
+
+fu! java_parser#Exe(cmd)
+  exe a:cmd
+endfu
+
+" Parser								{{{1
+" skip() Skip forward until a suitable stop token is found.		{{{2
+fu! s:skip(stopAtImport, stopAtMemberDecl, stopAtIdentifier, stopAtStatement)
+  while 1
+    if b:token == 'SEMI'
+      call s:nextToken()
+      return
+    elseif b:token =~# '^\(PUBLIC\|FINAL\|ABSTRACT\|MONKEYS_AT\|EOF\|CLASS\|INTERFACE\|ENUM\)$'
+      return
+    elseif b:token == 'IMPORT'
+      if a:stopAtImport
+	return
+      endif
+    elseif b:token =~# '^\(LBRACE\|RBRACE\|PRIVATE\|PROTECTED\|STATIC\|TRANSIENT\|NATIVE\|VOLATILE\|SYNCHRONIZED\|STRICTFP\|LT\|BYTE\|SHORT\|CHAR\|INT\|LONG\|FLOAT\|DOUBLE\|BOOLEAN\|VOID\)$'
+      if a:stopAtMemberDecl
+	return
+      endif
+    elseif b:token == 'IDENTIFIER'
+      if a:stopAtIdentifier
+	return
+      endif
+    elseif b:token =~# '^\(CASE\|DEFAULT\|IF\|FOR\|WHILE\|DO\|TRY\|SWITCH\|RETURN\|THROW\|BREAK\|CONTINUE\|ELSE\|FINALLY\|CATCH\)$'
+      if a:stopAtStatement
+	return
+      endif
+    endif
+    call s:nextToken()
+  endwhile
+endfu
+
+" syntax errors					{{{2
+fu! s:SyntaxError(key, ...)
+  let pos = a:0 == 0 ? b:pos : a:1
+  let errs = a:0 > 1 ? a:2 : []
+  call s:setErrorEndPos(pos)
+  call s:ReportSyntaxError(pos, a:key)
+  return {'tag': 'ERRONEOUS', 'pos': pos, 'errs': errs}
+endfu
+
+fu! s:ReportSyntaxError(pos, key, ...)
+  if a:pos > b:errPos || a:pos == -1
+    let key = a:key . (b:token == 'EOF' ? ' and premature.eof' : '')
+    call s:Log(4, a:pos, '[syntax error]' . s:Pos2Str(a:pos) . ': ' . key)
+  endif
+  let b:errPos = a:pos
+endfu
+
+" accept()								{{{2
+fu! s:accept(token_type)
+  "call s:Debug(b:token . ' == ' . a:token_type  . (b:token == a:token_type))
+  if b:token == a:token_type
+    call s:nextToken()
+  else
+    call s:setErrorEndPos(b:pos)
+    call s:ReportSyntaxError(b:prevEndPos, s:token2string(a:token_type) . " expected")
+    "call s:nextToken()
+  endif
+endfu
+
+fu! s:token2string(token)
+  if a:token =~# '^\(DOT\|COMMA\|SEMI\|LPAREN\|RPAREN\|LBRACKET\|RBRACKET\|LBRACE\|RBRACE\)$'
+    return "'" . a:token . "'"
+  endif
+  return a:token
+endfu
+
+
+" illegal()								{{{2
+fu! s:illegal(...)
+  call s:setErrorEndPos(b:pos)
+  return s:SyntaxError(s:modeAndEXPR() ? 'illegal.start.of.expr' : 'illegal.start.of.type', a:0 == 0 ? b:pos : a:1)
+endfu
+
+" setErrorEndPos()							{{{2
+fu! s:setErrorEndPos(errPos)
+  if a:errPos > b:errorEndPos
+    let b:errorEndPos = a:errPos
+  endif
+endfu
+
+" ident()								{{{2
+" Ident = IDENTIFIER
+fu! s:ident()
+  call s:Trace('s:ident ' . b:token)
+
+  if b:token == 'IDENTIFIER'
+    let name = b:name
+    call s:nextToken()
+    return name
+
+  elseif b:token == 'ASSERT'
+    if s:allowAsserts
+      call s:Log(4, b:pos, 'assert.as.identifier')
+      call s:nextToken()
+      return '<error>'
+    else
+      call s:Log(3, b:pos, 'assert.as.identifier')
+      let name = b:name
+      call s:nextToken()
+      return name
+    endif
+
+  elseif b:token == 'ENUM'
+    if b:allowEnums
+      call s:Log(4, b:pos, 'enum.as.identifier')
+      call s:nextToken()
+      return '<error>'
+    else
+      call s:Log(3, b:pos, 'enum.as.identifier')
+      let name = b:name
+      call s:nextToken()
+      return name
+    endif
+
+  else
+    call s:accept('IDENTIFIER')
+    return '<error>'
+  endif
+endfu
+
+" qualident()								{{{2
+" Qualident = Ident { DOT Ident }
+fu! s:qualident()
+  let t = s:Ident(b:pos, s:ident())
+  while b:token == 'DOT'
+    let pos = b:pos
+    call s:nextToken()
+    let t = s:Select(b:pos, t, s:ident())
+    "let t.name .= '.' . s:ident()		" FIXME
+  endwhile
+  return t
+endfu
+
+" literal()								{{{2
+" Literal = INTLITERAL | LONGLITERAL | FLOATLITERAL | DOUBLELITERAL | CHARLITERAL | STRINGLITERAL | TRUE | FALSE | NULL
+fu! s:literal(prefix)
+  let t = {'tag': 'LITERAL', 'pos': b:pos}
+  if b:token == 'INTLITERAL'
+    let t.typetag = 'INT'
+    let t.value = b:sbuf
+  elseif b:token == 'LONGLITERAL'
+    let t.typetag = 'LONG'
+    let t.value = b:sbuf
+  elseif b:token == 'FLOATLITERAL'
+    let t.typetag = 'FLOAT'
+    let t.value = b:sbuf
+  elseif b:token == 'DOUBLELITERAL'
+    let t.typetag = 'DOUBLE'
+    let t.value = b:sbuf
+  elseif b:token == 'CHARLITERAL'
+    let t.typetag = 'CHAR'
+    let t.value = b:sbuf
+  elseif b:token == 'STRINGLITERAL'
+    let t.typetag = 'CLASS'
+    let t.value = b:sbuf
+  elseif b:token == 'TRUE'
+    let t.typetag = 'BOOLEAN'
+    let t.value = 1
+  elseif b:token == 'FALSE'
+    let t.typetag = 'BOOLEAN'
+    let t.value = 0
+  elseif b:token == 'NULL'
+    let t.typetag = 'BOT'
+    let t.value = 'null'
+  else
+    echoerr 'can not reach here'
+  endif
+  call s:nextToken()
+  return t
+endfu
+
+" 									{{{2
+" terms, expression, type						{{{2
+" When terms are parsed, the mode determines which is expected:
+"     mode = EXPR        : an expression
+"     mode = TYPE        : a type
+"     mode = NOPARAMS    : no parameters allowed for type
+"     mode = TYPEARG     : type argument
+let s:EXPR = 1
+let s:TYPE = 2
+let s:NOPARAMS = 4
+let s:TYPEARG = 8
+let s:EXPR_OR_TYPE = 3
+let s:EXPR_OR_TYPE_OR_NOPARAMS = 7
+let s:TYPEARG_OR_NOPARAMS = 12
+
+fu! s:modeAndEXPR()
+  return b:mode % 2
+endfu
+
+fu! s:modeAndTYPE()
+  return s:BitAnd(b:mode, s:TYPE)
+endfu
+
+" terms can be either expressions or types. 
+fu! s:expression()
+  return s:term(s:EXPR)
+endfu
+
+fu! s:type()
+  return s:term(s:TYPE)
+endfu
+
+fu! s:typeList()
+  let ts = []
+  call add(ts, s:type())
+  while b:token == 'COMMA'
+    call s:nextToken()
+    call add(ts, s:type())
+  endwhile
+  return ts
+endfu
+
+" Expression = Expression1 [ExpressionRest]
+" ExpressionRest = [AssignmentOperator Expression1]
+" AssignmentOperator = "=" | "+=" | "-=" | "*=" | "/=" |  "&=" | "|=" | "^=" |
+"                      "%=" | "<<=" | ">>=" | ">>>="
+" Type = Type1
+" TypeNoParams = TypeNoParams1
+" StatementExpression = Expression
+" ConstantExpression = Expression
+fu! s:term(...)
+  let prevmode = b:mode
+  let b:mode = a:0 == 0 ? b:mode : a:1
+
+  let t = s:term1()
+  if s:modeAndEXPR() && b:token == 'EQ' || b:token =~# '^\(PLUSEQ\|SUBEQ\|STAREQ\|SLASHEQ\|AMPEQ\|BAREQ\|CARETEQ\|PERCENTEQ\|LTLTEQ\|GTGTEQ\|GTGTGTEQ\)$'
+    let t = s:termRest(t)
+  endif
+
+  let b:lastmode = b:mode
+  let b:mode = prevmode
+  return t
+endfu
+
+fu! s:termRest(t)
+  if b:token == 'EQ'
+    let pos = b:pos
+    call s:nextToken()
+    let b:mode = s:EXPR
+    return {'tag': 'ASSIGN', 'pos': pos, 'lhs': a:t, 'rhs': s:term()}
+
+  elseif b:token =~# '^\(PLUSEQ\|SUBEQ\|STAREQ\|SLASHEQ\|PERCENTEQ\|AMPEQ\|BAREQ\|CARETEQ\|LTLTEQ\|GTGTEQ\|GTGTGTEQ\)$'
+    let pos = b:pos
+    let token = b:token
+    call s:nextToken()
+    let b:mode = s:EXPR
+    return {'tag': s:optag(token), 'pos': pos, 'lhs': a:t, 'rhs': s:term()}
+
+  else
+    return a:t
+  endif
+endfu
+
+" Expression1   = Expression2 [Expression1Rest]
+"  Type1         = Type2
+"  TypeNoParams1 = TypeNoParams2
+fu! s:term1()
+  let t = s:term2()
+  if s:modeAndEXPR() && b:token == 'QUES'
+    let b:mode = s:EXPR
+    return s:term1Rest(t)
+  else
+    return t
+  endif
+endfu
+
+" Expression1Rest = ["?" Expression ":" Expression1]
+fu! s:term1Rest(t)
+  if b:token == 'QUES'
+    let t = {'tag': 'CONDEXPR', 'pos': b:pos, 'cond': a:t}
+    call s:nextToken()
+    let t.truepart = s:term()
+    call s:accept('COLON')
+    let t.falsepart = s:term1()
+    return t
+  else
+    return a:t
+  endif
+endfu
+
+" Expression2   = Expression3 [Expression2Rest]
+"  Type2         = Type3
+"  TypeNoParams2 = TypeNoParams3
+fu! s:term2()
+  let t = s:term3()
+  if s:modeAndEXPR()  && s:prec(b:token) >= s:opprecedences.orPrec
+    let b:mode = s:EXPR
+    return s:term2Rest(t, s:opprecedences.orPrec)
+  else
+    return t
+  endif
+endfu
+
+" Expression2Rest = {infixop Expression3}
+"" 		  | Expression3 instanceof Type
+" infixop         = "||"
+" 		  | "&&"
+"		  | "|"
+"		  | "^"
+"		  | "&"
+"		  | "==" | "!="
+"		  | "<" | ">" | "<=" | ">="
+"		  | "<<" | ">>" | ">>>"
+"		  | "+" | "-"
+"		  | "*" | "/" | "%"
+fu! s:term2Rest(t, minprec)
+  let odStack = [a:t]	" for expressions
+  let opStack = []	" for tokens
+  let top = 0
+  let startPos = b:pos
+  let topOp = 'ERROR'
+  while s:prec(b:token) >= a:minprec
+    call add(opStack, topOp)
+    let top += 1
+    let topOp = b:token
+    let pos = b:pos
+    call s:nextToken()
+    call add(odStack, topOp == 'INSTANCEOF' ? s:type() : s:term3())
+    while top > 0 && s:prec(topOp) >= s:prec(b:token)
+      let odStack[top-1] = s:makeOp(pos, topOp, odStack[top-1], odStack[top])
+      let top -= 1
+      let topOp = opStack[top]
+    endwhile
+  endwhile
+  "assert top == 0
+  let t = odStack[0]
+
+  if t.tag == 'PLUS'
+    let buf = s:foldStrings(t)
+    if buf != ''
+      let t = {'tag': 'LITERAL', 'pos': startPos, 'typetag': 'CLASS', 'value': t}
+    endif
+  endif
+  return t
+endfu
+
+fu! s:makeOp(pos, topOp, od1, od2)
+  if a:topOp == 'INSTANCEOF'
+    return {'tag': 'TYPETEST', 'pos': a:pos, 'expr': a:od1, 'clazz': a:od2}
+  else
+    return s:Binary(a:pos, s:optag(a:topOp), a:od1, a:od2)
+  endif
+endfu
+
+fu! s:foldStrings(tree)
+  let tree = a:tree
+  let buf = ''
+  while 1
+    if tree.tag  == 'LITERAL'
+      let lit = tree
+      if lit.typetag == 'CLASS'
+	let sbuf = lit.value
+	if buf != ''
+	  let sbuf .= buf
+	endif
+	return sbuf
+      endif
+    elseif tree.tag == 'PLUS'
+      let op = tree
+      if op.rhs.tag == 'LITERAL'
+	let lit = op.rhs
+	if lit.typetag == 'CLASS'
+	  let buf = lit.value . buf
+	  let tree = op.lhs
+	  continue
+	endif
+      endif
+    endif
+    return ''
+  endwhile
+endfu
+
+" Expression3    = PrefixOp Expression3					{{{2
+"                | "(" Expr | TypeNoParams ")" Expression3
+"                | Primary {Selector} {PostfixOp}
+" Primary        = "(" Expression ")"
+"                | Literal
+"                | [TypeArguments] THIS [Arguments]
+"                | [TypeArguments] SUPER SuperSuffix
+"                | NEW [TypeArguments] Creator
+"                | Ident { "." Ident }
+"                  [ "[" ( "]" BracketsOpt "." CLASS | Expression "]" )
+"                  | Arguments
+"                  | "." ( CLASS | THIS | [TypeArguments] SUPER Arguments | NEW [TypeArguments] InnerCreator )
+"                  ]
+"                | BasicType BracketsOpt "." CLASS
+" PrefixOp       = "++" | "--" | "!" | "~" | "+" | "-"
+" PostfixOp      = "++" | "--"
+" Type3          = Ident { "." Ident } [TypeArguments] {TypeSelector} BracketsOpt
+"                | BasicType
+" TypeNoParams3  = Ident { "." Ident } BracketsOpt
+" Selector       = "." [TypeArguments] Ident [Arguments]
+"                | "." THIS
+"                | "." [TypeArguments] SUPER SuperSuffix
+"                | "." NEW [TypeArguments] InnerCreator
+"                | "[" Expression "]"
+" TypeSelector   = "." Ident [TypeArguments]
+" SuperSuffix    = Arguments | "." Ident [Arguments]
+" NOTE: We need only type expression.
+fu! s:term3()
+  let pos = b:pos
+  let t = copy(s:TTree)
+
+  call s:Debug('term3() b:token is ' . b:token)
+  let typeArgs = s:typeArgumentsOpt(s:EXPR)
+
+  if b:token == 'QUES'
+    if s:modeAndTYPE() && s:BitAnd(b:mode, s:TYPEARG_OR_NOPARAMS) == s:TYPEARG
+      let b:mode = s:TYPE
+      return s:typeArgument()
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token =~# '^\(PLUSPLUS\|SUBSUB\|BANG\|TILDE\|PLUS\|SUB\)$'
+    if typeArgs == [] && s:modeAndEXPR()
+      let token = b:token
+      call s:nextToken()
+      let b:mode = s:EXPR
+      if token == 'SUB' && (b:token == 'INTLITERAL' || b:token == 'LONGLITERAL') && b:radix == 10
+	let b:mode = s:EXPR
+	let t = s:literal('-')
+      else
+	let t = s:term3()
+	return s:Unary(pos, s:unoptag(token), t)
+      endif
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token == 'LPAREN'
+    if typeArgs == [] && s:modeAndEXPR()
+      call s:nextToken()
+      let b:mode = s:EXPR_OR_TYPE_OR_NOPARAMS
+      let t = s:term3()
+      if s:modeAndEXPR() && b:token == 'LT'
+	let op = 'LT'
+	let pos1 = b:pos
+	call s:nextToken()
+	let b:mode = s:BitAnd(b:mode, s:EXPR_OR_TYPE)
+	let b:mode = s:BitOr(b:mode, s:TYPEARG)
+	let t1 = s:term3()
+	if s:modeAndTYPE() && (b:token == 'COMMA' || b:token == 'GT')
+	  let b:mode = s:TYPE
+	  let args = []
+	  call add(args, t1)
+	  while b:token == 'COMMA'
+	    call s:nextToken()
+	    call add(args, s:typeArgument())
+	  endwhile
+	  call s:accept('GT')
+	  let t = {'tag': 'TYPEAPPLY', 'pos': pos1, 'clazz': t, 'arguments': args}
+	  " checkGenerics
+	  let t = s:bracketsOpt(t)
+	elseif s:modeAndEXPR()
+	  let b:mode = s:EXPR
+	  let t = s:Binary(pos1, op, t, s:term2Rest(t1, s:opprecedences.shiftPrec))
+	  let t = s:termRest(s:term1Rest(s:term2Rest(t, s:opprecedences.orPrec)))
+	else
+	  call s:accept('GT')
+	endif
+      else
+	let t = s:termRest(s:term1Rest(s:term2Rest(t, s:opprecedences.orPrec)))
+      endif
+      call s:accept('RPAREN')
+      let b:lastmode = b:mode
+      let b:mode = s:EXPR
+      if s:BitAnd(b:lastmode, s:EXPR) == 0
+	return s:TypeCast(pos, t, s:term3())
+      elseif s:BitAnd(b:lastmode, s:TYPE) != 0
+	if b:token =~# '^\(BANG\|TILDE\|LPAREN\|THIS\|SUPER\|INTLITERAL\|LONGLITERAL\|FLOATLITERAL\|DOUBLELITERAL\|CHARLITERAL\|STRINGLITERAL\|TRUE\|FALSE\|NULL\|NEW\|IDENTIFIER\|ASSERT\|ENUM\|BYTE\|SHORT\|CHAR\|INT\|LONG\|FLOAT\|DOUBLE\|BOOLEAN\|VOID\)$'
+	  return s:TypeCast(pos, t, s:term3())
+	endif
+      endif
+    else
+      return s:illegal()
+    endif
+    let t = {'tag': 'PARENS', 'pos': pos, 'expr': t}
+
+  elseif b:token == 'THIS'
+    if s:modeAndEXPR()
+      let b:mode = s:EXPR
+      let t = s:Ident(pos, 'this')
+      call s:nextToken()
+      if typeArgs == []
+	let t = s:argumentsOpt([], t)
+      else
+	let t = s:arguments(typeArgs, t)
+      endif
+      let typeArgs = []
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token == 'SUPER'
+    if s:modeAndEXPR()
+      let b:mode = s:EXPR
+      let t = s:superSuffix(typeArgs, s:Ident(pos, 'super'))
+      let typeArgs = []
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token =~# '^\(INTLITERAL\|LONGLITERAL\|FLOATLITERAL\|DOUBLELITERAL\|CHARLITERAL\|STRINGLITERAL\|TRUE\|FALSE\|NULL\)$'
+    if typeArgs == [] && s:modeAndEXPR()
+      let b:mode = s:EXPR
+      let t = s:literal('')
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token == 'NEW'
+    if typeArgs != []
+      return s:illegal()
+    endif
+
+    if s:modeAndEXPR()
+      let b:mode = s:EXPR
+      call s:nextToken()
+      if b:token == 'LT'
+	let typeArgs = s:typeArguments()
+      endif
+      let t = s:creator(pos, typeArgs)
+      let typeArgs = []
+    else
+      return s:illegal()
+    endif
+
+  elseif b:token =~# '^\(IDENTIFIER\|ASSERT\|ENUM\)$'
+    if typeArgs != []
+      return s:illegal()
+    endif
+
+    let t = s:Ident(pos, s:ident())
+    while 1
+      if b:token == 'LBRACKET'
+	"let t.value = '['	" FIXME
+	call s:nextToken()
+	if b:token == 'RBRACKET'
+	  "let t.value .= ']'
+	  call s:nextToken()
+	  let t = s:bracketsSuffix(s:TypeArray(pos, s:bracketsOpt(t)))
+	else
+	  if s:modeAndEXPR()
+	    let b:mode = s:EXPR
+	    let t = {'tag': 'INDEXED', 'pos': pos, 'indexed': t, 'index': s:term()}
+	  endif
+	  call s:accept('RBRACKET')
+	  "let t.value .= ']'
+	endif
+	break
+
+      elseif b:token == 'LPAREN'
+	if s:modeAndEXPR()
+	  let b:mode = s:EXPR
+	  let t = s:arguments(typeArgs, t)
+	  let typeArgs = []
+	  "call s:accept('LPAREN')
+	  "call s:gotoMatchEnd('(', ')', b:token == 'LPAREN')
+	  "call s:accept('RPAREN')
+	endif
+	break
+
+      elseif b:token == 'DOT'
+	call s:nextToken()
+	let typeArgs = s:typeArgumentsOpt(s:EXPR)
+	if s:modeAndEXPR()
+	  if b:token == 'CLASS' || b:token == 'THIS' 
+	    if typeArgs != []
+	      return s:illegal()
+	    endif
+	    let b:mode = s:EXPR
+	    let t = s:Select(pos, t, b:token == 'CLASS' ? 'class' : 'this')
+	    call s:nextToken()
+	    break
+	  elseif b:token == 'SUPER'
+	    let b:mode = s:EXPR
+	    let t = s:Select(pos, t, 'super')
+	    let t = s:superSuffix(typeArgs, t)
+	    let typeArgs = []
+	    break
+	  elseif b:token == 'NEW'
+	    if typeArgs != []
+	      return s:illegal()
+	    endif
+	    let b:mode = s:EXPR
+	    let pos1 = b:pos
+	    call s:nextToken()
+	    if b:token == 'LT'
+	      let typeArgs = s:typeArguments()
+	    endif
+	    let t = s:innerCreator(pos1, typeArgs, t)
+	    let typeArgs = []
+	    break
+	  endif
+	endif
+	let t = s:Select(pos, t, s:ident())
+      else
+	break
+      endif
+    endwhile
+    if typeArgs != [] | call s:illegal() | endif
+    let t = s:typeArgumentsOpt2(t)
+
+  elseif b:token =~# '^\(BYTE\|SHORT\|CHAR\|INT\|LONG\|FLOAT\|DOUBLE\|BOOLEAN\)$'
+    if typeArgs != [] | call s:illegal() | endif
+    let t = s:bracketsSuffix(s:bracketsOpt(s:basicType()))
+
+  elseif b:token == 'VOID'
+    if typeArgs != [] | call s:illegal() | endif
+    if s:modeAndEXPR()
+      call s:nextToken()
+      if b:token == 'DOT'
+	let ti = {'tag': 'TYPEIDENT', 'pos': pos, 'typetag': 'void'}	" FIXME
+	let t = s:bracketsSuffix(ti)
+      else
+	return s:illegal(pos)
+      endif
+    else
+      return s:illegal()
+    endif
+
+  else
+    return s:illegal()
+  endif
+
+  if typeArgs != []
+    return s:illegal()
+  endif
+
+  while 1
+    let pos1 = b:pos
+    if b:token == 'LBRACKET'
+      call s:nextToken()
+      if s:modeAndEXPR()
+	let oldmode = b:mode
+	let b:mode = s:TYPE
+	if b:token == 'RBRACKET'
+	  call s:nextToken()
+	  let t = s:bracketsOpt(t)
+	  let t = s:TypeArray(pos1, t)
+	  return t
+	endif
+	let b:mode = oldmode
+      endif
+      if s:modeAndEXPR()
+	let b:mode = s:EXPR
+	let t = {'tag': 'INDEXED', 'pos': pos1, 'indexed': t, 'index': s:term()}
+      endif
+      call s:accept('RBRACKET')
+
+    elseif b:token == 'DOT'
+      call s:nextToken()
+      let typeArgs = s:typeArgumentsOpt(s:EXPR)
+      if b:token == 'SUPER' && s:modeAndEXPR()
+	let b:mode = s:EXPR
+	let t = s:Select(pos1, t, 'super')
+	call s:nextToken()
+	let t = s:arguments(typeArgs, t)
+	let typeArgs = []
+      elseif b:token == 'NEW' && s:modeAndEXPR()
+	if typeArgs != []
+	  return s:illegal()
+	endif
+	let b:mode = s:EXPR
+	let pos2 = b:pos
+	call s:nextToken()
+	if b:token == 'LT'
+	  let typeArgs = s:typeArguments()
+	endif
+	let t = s:innerCreator(pos2, typeArgs, t)
+	let typeArgs = []
+      else
+	let t = s:Select(pos1, t, s:ident())
+	let t = s:argumentsOpt(typeArgs, s:typeArgumentsOpt2(t))
+	let typeArgs = []
+      endif
+    else
+      break
+    endif
+  endwhile
+
+
+  while (b:token == 'PLUSPLUS' || b:token == 'SUBSUB') && s:modeAndEXPR()
+    let b:mode = s:EXPR
+    let t = s:Unary(b:pos, b:token == 'PLUSPLUS' ? 'POSTINC' : 'POSTDEC', t)
+    call s:nextToken()
+  endwhile
+  return t
+endfu
+
+fu! s:superSuffix(typeArgs, t)
+  let typeArgs = a:typeArgs
+  let t = a:t
+  call s:nextToken()
+  if b:token == 'LPAREN' || typeArgs != []
+    let t = s:arguments(typeArgs, t)
+  else
+    let pos = b:pos
+    call s:accept('DOT')
+    let typeArgs = b:token == 'LT' ? s:typeArguments() : []
+    let t = s:Select(pos, t, s:ident())
+    let t = s:argumentsOpt(typeArgs, t)
+  endif
+  return t
+endfu
+
+" BasicType = BYTE | SHORT | CHAR | INT | LONG | FLOAT | DOUBLE | BOOLEAN {{{2
+fu! s:basicType()
+  let t = {'tag': 'TYPEIDENT', 'pos': b:pos, 'typetag': s:typetag(b:token)}
+  call s:nextToken()
+  return t
+endfu
+
+" ArgumentsOpt = [ Arguments ]						{{{2
+fu! s:argumentsOpt(typeArgs, t)
+  if s:modeAndEXPR() && b:token == 'LPAREN' || a:typeArgs != []
+    let b:mode = s:EXPR
+    return s:arguments(a:typeArgs, a:t)
+  else
+    return a:t
+  endif
+endfu
+
+" Arguments = "(" [Expression { COMMA Expression }] ")"
+fu! s:arguments(...)
+  let pos = b:pos
+  let args = []
+  if b:token == 'LPAREN'
+    call s:nextToken()
+    if b:token != 'RPAREN'
+      call add(args, s:expression())
+      while b:token == 'COMMA'
+	call s:nextToken()
+	call add(args, s:expression())
+      endwhile
+    endif
+    call s:accept('RPAREN')
+  else
+    call s:SyntaxError(') expected')
+  endif
+
+  if a:0 == 0
+    return args
+  else
+    let typeArgs = a:1
+    let t = a:2
+    return {'tag': 'APPLY', 'pos': pos, 'typeargs': typeArgs, 'meth': t, 'args': args}
+  endif
+endfu
+
+" typeArgument generic type						{{{2
+fu! s:typeArgumentsOpt2(t)
+  if b:token == 'LT' && s:modeAndTYPE() && s:BitAnd(b:mode, s:NOPARAMS) == 0
+    let b:mode = s:TYPE
+    " checkGenerics()
+    return s:typeArguments(a:t)
+  else
+    return a:t
+  endif
+endfu
+
+fu! s:typeArgumentsOpt(...)
+  let useMode = a:0 == 0 ? s:TYPE : a:1
+
+  if b:token == 'LT'
+    " checkGenerics()
+    if s:BitAnd(b:mode, useMode) == 0 || s:BitAnd(b:mode, s:NOPARAMS) != 0
+      return s:illegal()
+    endif
+    let b:mode = useMode
+    return s:typeArguments()
+  endif
+  return []
+endfu
+
+" TypeArguments  = "<" TypeArgument {"," TypeArgument} ">"
+fu! s:typeArguments(...)
+  let pos = b:pos
+
+  let args = []
+  if b:token == 'LT'
+    call s:nextToken()
+    call add(args, s:modeAndEXPR() ? s:type() : s:typeArgument())
+    while b:token == 'COMMA'
+      call s:nextToken()
+      call add(args, s:modeAndEXPR() ? s:type() : s:typeArgument())
+    endwhile
+
+    if b:token == 'GTGTGTEQ'
+      let b:token = 'GTGTEQ'
+    elseif b:token == 'GTGTEQ'
+      let b:token = 'GTEQ'
+    elseif b:token == 'GTEQ'
+      let b:token = 'EQ'
+    elseif b:token == 'GTGTGT'
+      let b:token = 'GTGT'
+    elseif b:token == 'GTGT'
+      let b:token = 'GT'
+    else
+      call s:accept('GT')
+    endif
+  else
+    call s:SyntaxError("LT expected")
+  endif
+
+  if a:0 == 0
+    return args
+  else
+    return {'tag': 'TYPEAPPLY', 'pos': pos, 'clazz': a:1, 'arguments': args}
+  endif
+endfu
+
+" TypeArgument = Type
+"              | "?"
+"              | "?" EXTENDS Type {"&" Type}
+"              | "?" SUPER Type
+fu! s:typeArgument()
+  if b:token != 'QUES'
+    return s:type()
+  endif
+
+  call s:nextToken()
+  if b:token == 'EXTENDS'
+    call s:nextToken()
+    return s:type()
+  elseif b:token == 'SUPER'
+    call s:nextToken()
+    return s:type()
+  elseif b:token == 'IDENTIFIER'
+    let id = ident()
+  else
+  endif
+endfu
+
+
+" BracketsOpt = {"[" "]"}						{{{2
+fu! s:bracketsOpt(t)
+  let t = a:t
+  while b:token == 'LBRACKET'
+    let pos = b:pos
+    call s:nextToken()
+    let t = s:bracketsOptCont(t, pos)
+  endwhile
+  return t
+endfu
+
+fu! s:bracketsOptCont(t, pos)
+  let t = a:t
+  call s:accept('RBRACKET')
+  let t = s:bracketsOpt(t)
+  return s:TypeArray(a:pos, t)
+endfu
+
+" BracketsSuffixExpr = "." CLASS
+" BracketsSuffixType =
+fu! s:bracketsSuffix(t)
+  let t = a:t
+  if s:modeAndEXPR() && b:token == 'DOT'
+    let b:mode = s:EXPR
+    let pos = b:pos
+    call s:nextToken()
+    call s:accept('CLASS')
+    if b:pos == b:errorEndPos
+      let name = ''
+      if b:token == 'IDENTIFIER'
+	let name = b:name
+	call s:nextToken()
+      else
+	let name = '<error>'
+      endif
+      let t = {'tag': 'ERRONEOUS', 'pos': pos, 'errs': [s:Select(pos, t, name)]}
+    else
+      let t = s:Select(pos, t, 'class')
+    endif
+  elseif s:modeAndTYPE()
+    let b:mode = s:TYPE
+  else
+    call s:SyntaxError('dot.class.expected')
+  endif
+  return t
+endfu
+
+" creator						{{{2
+fu! s:creator(newpos, typeArgs)
+  if b:token =~# '^\(BYTE\|SHORT\|CHAR\|INT\|LONG\|FLOAT\|DOUBLE\|BOOLEAN\)$'
+    if a:typeArgs == []
+      return s:arrayCreatorRest(a:newpos, s:basicType())
+    endif
+  endif
+
+  let t = s:qualident()
+  let oldmode = b:mode
+  let b:mode = s:TYPE
+  if b:token == 'LT'
+    "checkGenerics
+    let t = s:typeArguments(t)
+  endif
+  let b:mode = oldmode
+
+  if b:token == 'LBRACKET'
+    return s:arrayCreatorRest(a:newpos, t)
+  elseif b:token == 'LPAREN'
+    return s:classCreatorRest(a:newpos, {}, a:typeArgs, t)
+  else
+    call s:ReportSyntaxError(b:pos, '( or [ expected')
+    let t = {'tag': 'NEWCLASS', 'encl': {}, 'typeargs': a:typeArgs, 'clazz': t, 'args': [], 'def': {}}
+    return {'tag': 'ERRONEOUS', 'pos': a:newpos, 'errs': [t]}
+  endif
+endfu
+
+fu! s:innerCreator(newpos, typeArgs, encl)
+  let t = s:Ident(b:pos, s:ident())
+  if b:token == 'LT'
+    " checkGenerics
+    let t = TypeArguments(t)
+  endif
+  return s:classCreatorRest(a:newpos, a:encl, a:typeArgs, t)
+endfu
+
+fu! s:arrayCreatorRest(newpos, elemtype)
+  let elemtype = a:elemtype
+  call s:accept('LBRACKET')
+  if b:token == 'RBRACKET'
+    call s:accept('RBRACKET')
+    let elemtype = s:bracketsOpt(elemtype)
+    if b:token == 'LBRACE'
+      return s:arrayInitializer(a:newpos, elemtype)
+    else
+      return s:SyntaxError('array.dimension.missing')
+    endif
+  else
+    let dims = [s:expression()]
+    call s:accept('RBRACKET')
+    while b:token == 'LBRACKET'
+      let pos = b:pos
+      call s:nextToken()
+      if b:token == 'RBRACKET'
+	let elemtype = s:bracketsOptCont(elemtype, pos)
+      else
+	call add(dims, s:expression())
+	call s:accept('RBRACKET')
+      endif
+    endwhile
+    return {'tag': 'NEWARRAY', 'pos': a:newpos, 'elemtype': elemtype, 'dims': dims, 'elems': {}}
+  endif
+endfu
+
+fu! s:classCreatorRest(newpos, encl, typeArgs, t)
+  let args = s:arguments()
+  let body = {}
+  if b:token == 'LBRACE'
+    let body = s:ClassDef(b:pos, {})
+    let body.defs = s:classOrInterfaceBody('', 0)
+    let body.endpos = b:pos
+  endif
+  return {'tag': 'NEWCLASS', 'encl': a:encl, 'typeargs': a:typeArgs, 'clazz': a:t, 'args': args, 'def': body}
+endfu
+
+" ArrayInitializer = "{" [VariableInitializer {"," VariableInitializer}] [","] "}" {{{2
+fu! s:arrayInitializer(newpos, t)
+  call s:accept('LBRACE')
+  let elems = []
+  if b:token == 'COMMA'
+    call s:nextToken()
+  elseif b:token != 'RBRACE'
+    call add(elems, s:variableInitializer())
+    while b:token == 'COMMA'
+      call s:nextToken()
+      if b:token == 'RBRACE'
+	break
+      endif
+      call add(elems, s:variableInitializer())
+    endwhile
+  endif
+  call s:accept('RBRACE')
+  return {'tag': 'NEWARRAY', 'pos': a:newpos, 'elemtype': a:t, 'dims': [], 'elems': elems}
+endfu
+
+" VariableInitializer = ArrayInitializer | Expression			{{{2
+fu! s:variableInitializer()
+  return b:token == 'LBRACE' ? s:arrayInitializer(b:pos, {}) : s:expression()
+endfu
+
+" ParExpression = "(" Expression ")"					{{{2
+fu! s:parExpression()
+  call s:accept('LPAREN')
+  let t = s:expression()
+  call s:accept('RPAREN')
+  return t
+endfu
+
+" 									{{{2
+" Block = "{" BlockStatements "}"					{{{2
+fu! s:block(...)
+  let t = {'tag': 'BLOCK', 'stats': []}
+  let t.pos	= a:0 > 0 ? a:1 : b:pos
+  let t.flags	= a:0 > 1 ? a:2 : 0
+
+  call s:accept('LBRACE')
+
+  " scan strategy: ignore statements?
+  if a:0 > 2 && a:3
+    if b:token !=# 'RBRACE'
+      let b:pos = s:gotoMatchEnd('{', '}', b:token == 'LBRACE')
+    endif
+    "let t.stats = Strpart(t.pos, t.endpos-t.pos-1)
+  else
+    let t.stats = s:blockStatements()
+    while b:token == 'CASE' || b:token == 'DEFAULT'
+      call s:SyntaxError("orphaned")
+      call s:switchBlockStatementGroups()
+    endwhile
+  endif
+
+  let t.endpos = b:pos
+  call s:accept('RBRACE')
+  return t
+endfu
+
+" BlockStatements = { BlockStatement }					{{{2
+" BlockStatement  = LocalVariableDeclarationStatement
+"                 | ClassOrInterfaceOrEnumDeclaration
+"                 | [Ident ":"] Statement
+" LocalVariableDeclarationStatement
+"                 = { FINAL | '@' Annotation } Type VariableDeclarators ";"
+fu! s:blockStatements()
+  let lastErrPos = -1
+  let stats = []
+  while 1
+    let pos = b:pos
+    if b:token =~# '^\(RBRACE\|CASE\|DEFAULT\|EOF\)$'
+      return stats
+    elseif b:token =~# '^\(LBRACE\|IF\|FOR\|WHILE\|DO\|TRY\|SWITCH\|SYNCHRONIZED\|RETURN\|THROW\|BREAK\|CONTINUE\|SEMI\|ELSE\|FINALLY\|CATCH\)$'
+      call add(stats, s:statement())
+    elseif b:token =~# '^\(MONKEYS_AT\|FINAL\)'
+      let dc = b:docComment
+      let mods = s:modifiersOpt()
+      if b:token =~# '^\(INTERFACE\|CLASS\|ENUM\)$'
+	call add(stats, s:classOrInterfaceOrEnumDeclaration(mods, dc))
+      else
+	let t = s:type()
+	let stats = stats + s:variableDeclarators(mods, t, [])
+	call s:accept('SEMI')
+      endif
+    elseif b:token =~# '^\(ABSTRACT\|STRICTFP\|CLASS\|INTERFACE\|ENUM\)$'
+      if b:token == 'ENUM'
+	call s:Log(4, b:pos, 'local.enum')
+      endif
+      call add(stats, s:classOrInterfaceOrEnumDeclaration(s:modifiersOpt(), b:docComment))
+    elseif b:token == 'ASSERT'
+      call add(stats, s:statement())
+    else
+      let name = b:name
+      let t = s:term(s:EXPR_OR_TYPE)
+      if b:token == 'COLON' && t.tag == 'IDENT'
+	call s:nextToken()
+	let stat = s:statement()
+	call add(stats, {'tag': 'LABELLED', 'pos': b:pos, 'label': name, 'body': stat})
+      elseif s:BitAnd(b:lastmode, s:TYPE) && b:token =~# '^\(IDENTIFIER\|ASSERT\|ENUM\)$'
+	let pos = b:pos
+	let mods = {}		" {'tag': 'MODIFIERS', 'pos': -1, 'flags': 0}
+	let stats = stats + s:variableDeclarators(mods, t, [])
+	call s:accept('SEMI')
+      else
+	call add(stats, {'tag': 'EXEC', 'pos': pos, 'expr': s:checkExprStat(t)})	" TODO
+	call s:accept('SEMI')
+      endif
+    endif
+    
+    if b:pos == lastErrPos
+      return stats
+    endif
+    if b:pos <= b:errorEndPos
+      call s:skip(0, 1, 1, 1)
+      let lastErrPos = b:pos
+    endif
+
+    " resetDeprecatedFlag()
+  endwhile
+endfu
+
+" Statement = Block							{{{2
+"    | IF ParExpression Statement [ELSE Statement]
+"    | FOR "(" ForInitOpt ";" [Expression] ";" ForUpdateOpt ")" Statement
+"    | FOR "(" FormalParameter : Expression ")" Statement
+"    | WHILE ParExpression Statement
+"    | DO Statement WHILE ParExpression ";"
+"    | TRY Block ( Catches | [Catches] FinallyPart )
+"    | SWITCH ParExpression "{" SwitchBlockStatementGroups "}"
+"    | SYNCHRONIZED ParExpression Block
+"    | RETURN [Expression] ";"
+"    | THROW Expression ";"
+"    | BREAK [Ident] ";"
+"    | CONTINUE [Ident] ";"
+"    | ASSERT Expression [ ":" Expression ] ";"
+"    | ";"
+"    | ExpressionStatement
+"    | Ident ":" Statement
+" called only by BlockStatements or self
+fu! s:statement()
+  let pos = b:pos
+  if b:token == 'LBRACE'
+    return s:block()
+  elseif b:token == 'IF'
+    call s:nextToken()
+    let t = {'tag': 'IF', 'pos': pos, 'cond': s:parExpression(), 'thenpart': s:statement()}
+    if b:token == 'ELSE'
+      call s:nextToken()
+      let t.elsepart = s:statement()
+    endif
+    let t.endpos = b:pos
+    return t
+
+  elseif b:token == 'FOR'
+    call s:nextToken()
+    call s:accept('LPAREN')
+    let inits = b:token == 'SEMI' ? [] : s:forInit()
+    " foreach
+    if len(inits) == 1 && inits[0].tag == 'VARDEF' && (!has_key(inits[0], 'init') || inits[0].init == {}) && b:token == 'COLON'
+      " checkForeach
+      let var = inits[0]
+      call s:accept('COLON')
+      let expr = s:expression()
+      call s:accept('RPAREN')
+      let body = s:statement()
+      return {'tag': 'FOREACHLOOP', 'pos': pos, 'endpos': b:pos, 'var': var, 'expr': expr, 'body': body}
+    else
+      call s:accept('SEMI')
+      let cond = b:token == 'SEMI' ? {} : s:expression()
+      call s:accept('SEMI')
+      let steps = b:token == 'RPAREN' ? [] : s:forUpdate()
+      call s:accept('RPAREN')
+      let body = s:statement()
+      return {'tag': 'FORLOOP', 'pos': pos, 'endpos': b:pos, 'init': inits, 'cond': cond, 'step': steps, 'body': body}
+    endif
+
+  elseif b:token == 'WHILE'
+    call s:nextToken()
+    let cond = s:parExpression()
+    let body = s:statement()
+    return {'tag': 'WHILELOOP', 'pos': pos, 'endpos': b:pos, 'cond': cond, 'body': body}
+
+  elseif b:token == 'DO'
+    call s:nextToken()
+    let body = s:statement()
+    call s:accept('WHILE')
+    let cond = s:parExpression()
+    let t = {'tag': 'DOLOOP', 'pos': pos, 'endpos': b:pos, 'cond': cond, 'body': body}
+    call s:accept('SEMI')
+    return t
+
+  elseif b:token == 'TRY'
+    call s:nextToken()
+    let body = s:block()
+    let catchers = []
+    let finalizer = {}
+    if b:token == 'CATCH' || b:token == 'FINALLY'
+      while b:token == 'CATCH'
+	call add(catchers, s:catchClause())
+      endwhile
+      if b:token == 'FINALLY'
+	call s:nextToken()
+	let finalizer = s:block()
+      endif
+    else
+      call s:Log(4, b:pos, 'try.without.catch.or.finally')
+    endif
+    return {'tag': 'TRY', 'pos': pos, 'endpos': b:pos, 'body': body, 'catchers': catchers, 'finalizer': finalizer}
+
+  elseif b:token == 'SWITCH'
+    call s:nextToken()
+    let selector = s:parExpression()
+    call s:accept('LBRACE')
+    let cases = s:switchBlockStatementGroups()
+    call s:accept('RBRACE')
+    return {'tag': 'SWITCH', 'pos': pos, 'endpos': b:pos, 'selector': selector, 'cases': cases}
+
+  elseif b:token == 'SYNCHRONIZED'
+    call s:nextToken()
+    let lock = s:parExpression()
+    let body = s:block()
+    return {'tag': 'SYNCHRONIZED', 'pos': pos, 'endpos': b:pos, 'lock': lock, 'cases': body}
+    
+  elseif b:token == 'RETURN'
+    call s:nextToken()
+    let result = b:token == 'SEMI' ? {} : s:expression()
+    call s:accept('SEMI')
+    return {'tag': 'RETURN', 'pos': pos, 'endpos': b:pos, 'expr': result}
+
+  elseif b:token == 'THROW'
+    call s:nextToken()
+    let exc = s:expression()
+    call s:accept('SEMI')
+    return {'tag': 'THROW', 'pos': pos, 'endpos': b:pos, 'expr': exc}
+
+  elseif b:token == 'BREAK' || b:token == 'CONTINUE'
+    let token = b:token
+    call s:nextToken()
+    let label = b:token =~# '^\(IDENTIFIER\|ASSERT\|ENUM\)$' ? s:ident() : ''
+    call s:accept('SEMI')
+    return {'tag': token, 'pos': pos, 'endpos': b:pos, 'label': label}
+
+  elseif b:token == 'SEMI'
+    call s:nextToken()
+    return {'tag': 'SKIP', 'pos': pos}
+
+  elseif b:token == 'ELSE'
+    return s:SyntaxError("else.without.if")
+  elseif b:token == 'FINALLY'
+    return s:SyntaxError("finally.without.try")
+  elseif b:token == 'CATCH'
+    return s:SyntaxError("catch.without.try")
+
+  elseif b:token == 'ASSERT'
+    "if b:allowAsserts && b:token == 'ASSERT'
+      call s:nextToken()
+      let t = {'tag': 'ASSERT', 'pos': pos, 'cond': s:expression()}
+      if b:token == 'COLON'
+	call s:nextToken()
+	let t.detail = s:expression()
+      endif
+      call s:accept('SEMI')
+      let t.endpos = b:pos
+      return t
+    "endif
+
+  else	" also ENUM
+    let name = b:name
+    let expr = s:expression()
+    if b:token == 'COLON' && expr.tag == 'IDENT'
+      call s:nextToken()
+      let stat = s:statement()
+      return {'tag': 'LABELLED', 'pos': pos, 'endpos': b:pos, 'label': name, 'body': stat}
+    else
+      let stat = {'tag': 'EXEC', 'pos': pos, 'endpos': b:pos, 'expr': s:checkExprStat(expr)}
+      call s:accept('SEMI')
+      return stat
+    endif
+  endif
+endfu
+
+" CatchClause	= CATCH "(" FormalParameter ")" Block
+fu! s:catchClause()
+  let pos = b:pos
+  call s:accept('CATCH')
+  call s:accept('LPAREN')
+  let formal = s:variableDeclaratorId(s:optFinalParameter(), s:qualident())
+  call s:accept('RPAREN')
+  let body = s:block()
+  return {'tag': 'CATCH', 'pos': pos, 'endpos': b:pos, 'param': formal, 'body': body}
+endfu
+
+" SwitchBlockStatementGroups = { SwitchBlockStatementGroup }
+" SwitchBlockStatementGroup = SwitchLabel BlockStatements
+" SwitchLabel = CASE ConstantExpression ":" | DEFAULT ":"
+fu! s:switchBlockStatementGroups()
+  let cases = []
+  while 1
+    let pos = b:pos
+    if b:token == 'CASE' || b:token == 'DEFAULT'
+      let token = b:token
+      call s:nextToken()
+      let pat = token == 'CASE' ? s:expression() : {}
+      call s:accept('COLON')
+      let stats = s:blockStatements()
+      call add(cases, {'tag': 'CASE', 'pos': pos, 'pat': pat, 'stats': stats})
+    elseif b:token == 'RBRACE' || b:token == 'EOF' 
+      return cases
+    else
+      call s:nextToken()
+      call s:SyntaxError('case.default.rbrace.expected')
+    endif
+  endwhile
+endfu
+
+" MoreStatementExpressions = { COMMA StatementExpression }
+fu! s:moreStatementExpressions(pos, first, stats)
+  call add(a:stats, {'tag': 'EXEC', 'pos': a:pos, 'expr': s:checkExprStat(a:first)})
+  while b:token == 'COMMA'
+    call s:nextToken()
+    let pos = b:pos
+    let t = s:expression()
+    call add(a:stats, {'tag': 'EXEC', 'pos': pos, 'expr': s:checkExprStat(t)})
+  endwhile
+  return a:stats
+endfu
+
+" ForInit = StatementExpression MoreStatementExpressions
+"          |  { FINAL | '@' Annotation } Type VariableDeclarators
+fu! s:forInit()
+  let stats = []
+  let pos = b:pos
+  if b:token == 'FINAL' || b:token == 'MONKEYS_AT'
+    return s:variableDeclarators(s:optFinal(0), s:type(), stats)
+  else
+    let t = s:term(s:EXPR_OR_TYPE)
+    if s:BitAnd(b:lastmode, s:TYPE) && b:token =~# '^\(IDENTIFIER\|ASSERT\|ENUM\)$'
+      return s:variableDeclarators(s:modifiersOpt(), t, stats)
+    else
+      return s:moreStatementExpressions(pos, t, stats)
+    endif
+  endif
+endfu
+
+" ForUpdate = StatementExpression MoreStatementExpressions
+fu! s:forUpdate()
+  return s:moreStatementExpressions(b:pos, s:expression(), [])
+endfu
+
+" ModifiersOpt = { Modifier }						{{{2
+"  Modifier = PUBLIC | PROTECTED | PRIVATE | STATIC | ABSTRACT | FINAL
+"		| NATIVE | SYNCHRONIZED | TRANSIENT | VOLATILE | "@"
+"		| "@" Annotation
+" NOTE: flags is a string, not a long number
+fu! s:modifiersOpt(...)
+  let partial = a:0 == 0 ? {} : a:1
+
+  let flags = partial == {} ? 0 : partial.flags
+  let annotations = partial == {} ? [] : partial.annotations
+  " TODO: deprecatedFlag
+
+  let pos = b:pos
+  let lastPos = -1
+  while 1
+    let flag = 0
+    if b:token =~# '^\(PUBLIC\|PROTECTED\|PRIVATE\|STATIC\|ABSTRACT\|FINAL\|NATIVE\|SYNCHRONIZED\|TRANSIENT\|VOLATILE\|STRICTFP\|MONKEYS_AT\)$'
+      let flag = b:token == 'MONKEYS_AT' ? s:Flags.ANNOTATION : get(s:Flags, b:token, 0)
+    else
+      break
+    endif
+    "if s:BitAnd(flags, flag) != 0
+    "  "log.error(S.pos(), "repeated.modifier")
+    "endif
+
+    let lastPos = b:pos
+    call s:nextToken()
+
+    if flag == s:Flags.ANNOTATION
+      "call s:checkAnnotations()
+      if b:token != 'INTERFACE'
+	let ann = s:annotation(lastPos)
+	if flags == 0 && annotations == []
+	  let pos = ann.pos
+	endif
+	call add(annotations, ann)
+	let lastPos = ann.pos
+	let flag = 0
+      endif
+    endif
+    let flags = s:BitOr(flags, flag)
+  endwhile
+
+  if b:token == 'ENUM'
+    let flags = s:BitOr(flags, s:Flags.ENUM)
+  elseif b:token == 'INTERFACE'
+    let flags = s:BitOr(flags, s:Flags.INTERFACE)
+  endif
+
+  if flags == 0 && empty(annotations)
+    let pos = -1
+  endif
+
+  return {'tag': 'MODIFIERS', 'pos': pos, 'flags': flags, 'annotations': annotations}
+endfu
+
+" Annotation = "@" Qualident [ "(" AnnotationFieldValues ")" ] 		{{{2
+fu! s:annotation(pos)
+  "call s:checkAnnotations()
+  let ident = s:qualident()
+  "let endPos = b:prevEndPos
+  let fieldValues = s:annotationFieldValuesOpt()
+
+  return {'tag': 'ANNOTATION', 'pos': a:pos, 'annotationType': ident, 'args': fieldValues}
+endfu
+
+fu! s:annotationFieldValuesOpt()
+  return b:token == 'LPAREN' ? s:annotationFieldValues() : []
+endfu
+
+" AnnotationFieldValues	= "(" [ AnnotationFieldValue { "," AnnotationFieldValue } ] ")"
+fu! s:annotationFieldValues()
+  let buf = []
+  call s:accept('LPAREN')
+  if b:token != 'RPAREN'
+    call add(buf, s:annotationFieldValue())
+    while b:token == 'COMMA'
+      call s:nextToken()
+      call add(buf, s:annotationFieldValue())
+    endwhile
+  endif
+  call s:accept('RPAREN')
+  return buf
+endfu
+
+" AnnotationFieldValue	= AnnotationValue | Identifier "=" AnnotationValue
+fu! s:annotationFieldValue()
+  call s:Trace('s:annotationFieldValue ' . b:token)
+  if b:token == 'IDENTIFIER'
+    let b:mode = s:EXPR
+    let t1 = s:term1()
+    if t1.tag == 'IDENT' && b:token == 'EQ'
+      let pos = b:pos
+      call s:accept('EQ')
+      return {'tag': 'ASSIGN', 'pos': pos, 'lhs': t1, 'rhs': s:annotationValue()}
+    else
+      return t1
+    endif
+  endif
+  return s:annotationValue()
+endfu
+
+" AnnotationValue = ConditionalExpression | Annotation 	| "{" [ AnnotationValue { "," AnnotationValue } ] "}"
+fu! s:annotationValue()
+  let pos = 0
+  if b:token == 'MONKEYS_AT'
+    let pos = b:bp
+    call s:nextToken()
+    return s:annotation(pos)
+  elseif b:token == 'LBRACE'
+    let pos = b:pos
+    call s:accept('LBRACE')
+    let buf = []
+    if b:token != 'RBRACE'
+      call add(buf, s:annotationValue())
+      while b:token == 'COMMA'
+	call s:nextToken()
+	if b:token == 'RPAREN'
+	  break
+	endif
+	call add(buf, s:annotationValue())
+      endwhile
+    endif
+    call s:accept('RBRACE')
+    return buf
+  else
+    let b:mode = s:EXPR
+    return s:term1()
+  endif
+endfu
+
+" AnnotationsOpt = { '@' Annotation }
+fu! s:annotationsOpt()
+  if b:token != 'MONKEYS_AT'
+    return []
+  endif
+
+  let buf = []
+  while b:token != 'MONKEYS_AT'
+    let pos = b:pos
+    call s:nextToken()
+    call add(buf, s:annotation(pos))
+  endwhile
+  return buf
+endfu
+
+" 									{{{2
+" CompilationUnit							{{{2
+" CompilationUnit = [ { "@" Annotation } PACKAGE Qualident ";"] {ImportDeclaration} {TypeDeclaration}
+fu! s:compilationUnit()
+  let unit = {'tag': 'TOPLEVEL', 'pos': b:pos}
+
+  let mods = {}
+  if b:token == 'MONKEYS_AT'
+    let mods = s:modifiersOpt()
+  endif
+
+  if b:token == 'PACKAGE'
+    if mods != {}
+      " checkNoMods(mods.flags)
+      let unit.packageAnnotations = mods.annotations
+      let mods = {}
+    endif
+    call s:nextToken()
+    let unit.pid = s:qualident()
+    let unit.package = java_parser#type2Str(unit.pid)
+    call s:accept('SEMI')
+  endif
+
+  let imports = []
+  let s:types = []
+  let checkForImports = 1
+  while b:token != 'EOF'
+    if b:pos <= b:errorEndPos
+      call s:skip(checkForImports, 0, 0, 0)
+      if b:token == 'EOF'
+	break
+      endif
+    endif
+    if checkForImports && mods == {} && b:token == 'IMPORT'
+      call add(imports, s:importDeclaration())
+    else
+      let def = s:typeDeclaration(mods)
+      "if (def instanceof JCExpressionStatement)
+      "  def = ((JCExpressionStatement)def).expr
+      "endif
+      call add(s:types, def)
+      if def.tag == 'CLASSDEF'
+        let checkForImports = 0
+      endif
+      let mods = {}
+    endif
+  endwhile
+  let unit.imports = imports
+  let unit.types = s:types
+  unlet s:types
+
+  return unit
+endfu
+
+" ImportDeclaration = IMPORT [ STATIC ] Ident { "." Ident } [ "." "*" ] ";"	{{{2
+" return fqn
+fu! s:importDeclaration()
+  " OAO: Usualy it is in one line.
+  if b:scanStrategy < 0
+  let idx = matchend(b:lines[b:line], '\(\s\+static\>\)\?\s\+\([_$a-zA-Z][_$a-zA-Z0-9_]*\)\(\s*\.\s*[_$a-zA-Z][_$a-zA-Z0-9_]*\)*\(\s*\.\s*\*\)\?;')
+  if idx != -1
+    let fqn = strpart(b:lines[b:line], b:col, idx-b:col-1)
+    let b:col = idx
+    let b:bp = b:idxes[b:line] + b:col
+    call s:nextToken()
+    return fqn
+  endif
+  endif
+
+
+  call s:Info('==import==')
+  let pos = b:pos
+  call s:nextToken()
+
+  let importStatic = 0
+  if b:token == 'STATIC'
+    " checkStaticImports()
+    let importStatic = 1
+    call s:nextToken()
+  endif
+
+  let pid = s:Ident(b:pos, s:ident())
+
+  " 
+  let pos1 = b:pos
+  call s:accept('DOT')
+  if b:token == 'STAR'
+    let pid = s:Select(pos1, pid, '*')
+    call s:nextToken()
+  else
+    let pid = s:Select(pos1, pid, s:ident())
+  endif
+  while b:token == 'DOT'
+    let pos1 = b:pos
+    call s:accept('DOT')
+    if b:token == 'STAR'
+      let pid = s:Select(pos1, pid, '*')
+      call s:nextToken()
+      break
+    else
+      let pid = s:Select(pos1, pid, s:ident())
+    endif
+  endwhile
+  let fqn = java_parser#type2Str(pid)
+  if b:token != 'SEMI'
+    let fqn .= '<SEMI expected>'
+  endif
+  call s:accept('SEMI')
+  "return {'tag': 'IMPORT', 'pos': b:pos, 'qualid': pid, 'staticImport': importStatic}
+  return fqn
+endfu
+
+" TypeDeclaration = ClassOrInterfaceOrEnumDeclaration | ";"	{{{2
+fu! s:typeDeclaration(mods)
+  let pos = b:pos
+  if a:mods == {} && b:token == 'SEMI'
+    call s:nextToken()
+    return {'tag': 'SKIP', 'pos': pos}
+  else
+    let dc = b:docComment
+    let mods = s:modifiersOpt(a:mods)
+    return s:classOrInterfaceOrEnumDeclaration(mods, dc)
+  endif
+endfu
+
+fu! s:classOrInterfaceOrEnumDeclaration(mods, dc)
+  call s:Info('== type ==')
+  if b:token == 'CLASS'
+    return s:classDeclaration(a:mods, a:dc)
+  elseif b:token == 'INTERFACE'
+    return s:interfaceDeclaration(a:mods, a:dc)
+  elseif b:token == 'ENUM'
+    "if !exists('b:allowEnums') || !b:allowEnums
+    "  call s:SyntaxError("enums.not.supported.in.source")
+    "endif
+    return s:enumDeclaration(a:mods, a:dc)
+  else
+    let pos = b:pos
+    let errs = []
+    if b:token == 'IDENTIFIER'
+      call add(errs, s:ident())
+      call s:setErrorEndPos(b:bp)
+    endif
+    return s:SyntaxError("class.or.intf.or.enum.expected", pos, errs)
+  endif
+endfu
+
+" ClassDeclaration = CLASS Ident TypeParametersOpt [EXTENDS Type] [IMPLEMENTS TypeList] ClassBody	{{{2
+fu! s:classDeclaration(mods, dc)
+  let type = s:ClassDef(b:pos, a:mods)
+
+  call s:accept('CLASS')
+  let type.name = s:ident()
+
+  let type.typarams = s:typeParametersOpt()
+
+  " extends
+  if b:token == 'EXTENDS'
+    call s:nextToken()
+    let type.extends = [s:type()]
+  endif
+
+  " implements
+  if b:token == 'IMPLEMENTS'
+    call s:nextToken()
+    let type.implements = s:typeList()
+  endif
+
+  let type.defs = s:classOrInterfaceBody(type.name, 0)
+  let type.endpos = b:pos
+  return type
+endfu
+
+" InterfaceDeclaration = INTERFACE Ident TypeParametersOpt [EXTENDS TypeList] InterfaceBody	{{{2
+fu! s:interfaceDeclaration(mods, dc)
+  let type = s:ClassDef(b:pos, a:mods)
+
+  call s:accept('INTERFACE')
+  let type.name = s:ident()
+
+  let type.typarams = s:typeParametersOpt()
+
+  " extends
+  if b:token == 'EXTENDS'
+    call s:nextToken()
+    let type.extends = s:typeList()
+  endif
+
+  let type.defs = s:classOrInterfaceBody(type.name, 1)
+  let type.endpos = b:pos
+  return type
+endfu
+
+" EnumDeclaration = ENUM Ident [IMPLEMENTS TypeList] EnumBody		{{{2
+fu! s:enumDeclaration(mods, dc)
+  let type = s:ClassDef(b:pos, a:mods)
+
+  call s:accept('ENUM')
+  let type.name = s:ident()
+
+  if b:token == 'IMPLEMENTS'
+    call s:nextToken()
+    let type.implements = s:typeList()
+  endif
+
+  let type.defs = s:enumBody(type.name)
+  let type.endpos = b:pos
+  return type
+endfu
+
+" EnumBody = "{" { EnumeratorDeclarationList } [","]
+" 		[ ";" {ClassBodyDeclaration} ] "}"
+fu! s:enumBody(enumName)
+  let defs = []
+  call s:accept('LBRACE')
+
+  if b:token == 'COMMA'
+    call s:nextToken()
+  elseif b:token != 'RBRACE' && b:token != 'SEMI'
+    call add(defs, s:enumeratorDeclaration(a:enumName))
+    while b:token == 'COMMA'
+      call s:nextToken()
+      if b:token == 'RBRACE' || b:token == 'SEMI'
+	break
+      endif
+      call add(defs, s:enumeratorDeclaration(a:enumName))
+    endwhile
+    if b:token != 'RBRACE' && b:token != 'SEMI'
+      call s:SyntaxError('comma.or.rbrace.or.semi. expected')
+      call s:nextToken()
+    endif
+  endif
+
+  if b:token == 'SEMI'
+    call s:nextToken()
+    while b:token != 'RBRACE' && b:token != 'EOF'
+      call add(defs, s:classOrInterfaceBodyDeclaration(a:enumName, 0))
+      if b:pos <= b:errorEndPos
+	call s:skip(0, 1, 1, 0)
+      endif
+    endwhile
+  endif
+
+  call s:accept('RBRACE')
+  return defs
+endfu
+
+" EnumeratorDeclaration = AnnotationsOpt [TypeArguments] IDENTIFIER [ Arguments ] [ "{" ClassBody "}" ]
+fu! s:enumeratorDeclaration(enumName)
+  let vardef = {'tag': 'VARDEF', 'pos': b:pos}
+
+  let dc = b:docComment
+  let flags = 16409		" s:BitOr(s:Flags.PUBLIC, s:Flags.STATIC, s:Flags.FINAL, s:Flags.ENUM)
+  " if b:deprecatedFlag
+  "   let flags = 147481	" s:BitOr(flags, s:Flags.DEPRECATED)
+  "   let b:deprecatedFlag = 1
+  " endif
+  let pos = b:pos
+  let annotations = s:annotationsOpt()
+  let vardef.mods = s:Modifiers(pos, flags, annotations)
+  let vardef.mods.pos = empty(annotations) ? -1 : pos
+  let vardef.m = s:Number2Bits(flags)
+
+  let typeArgs = s:typeArgumentsOpt()
+  let identPos = b:pos
+  let vardef.name = s:ident()
+  let vardef.n = vardef.name
+
+  let args = b:token == 'LPAREN' ? s:arguments() : []
+
+  " NOTE: It may be either a class body or a method body. I dont care, just record it
+  if b:token == 'LBRACE'
+    "call s:accept('LBRACE')
+    "if b:token !=# 'RBRACE'
+    "  call s:gotoMatchEnd('{', '}')
+    "endif
+    "call s:accept('RBRACE')
+
+    "let mods1 = s:Modifiers(-1, s:BitOr(s:Flags.ENUM, s:Flags.STATIC), [])
+    let defs = s:classOrInterfaceBody('', 0)
+    "let body = s:ClassDef(identPos, mods1)
+    "let body.defs = defs
+  endif
+  let vardef.endpos = b:bp
+
+  " TODO: create new class
+
+  return vardef
+endfu
+
+" classOrInterfaceBody						{{{2
+" ClassBody     = "{" {ClassBodyDeclaration} "}"
+" InterfaceBody = "{" {InterfaceBodyDeclaration} "}"
+fu! s:classOrInterfaceBody(classname, isInterface)
+  call s:Info('== type definition body ==')
+  call s:accept('LBRACE')
+
+  if b:pos <= b:errorEndPos
+    call s:skip(0, 1, 0, 0)
+    if b:token == 'LBRACE'
+      call s:nextToken()
+    endif
+  endif
+
+  let defs = []
+  while b:token != 'RBRACE' && b:token != 'EOF'
+    let defs += s:classOrInterfaceBodyDeclaration(a:classname, a:isInterface)
+
+    if b:pos <= b:errorEndPos
+      call s:skip(0, 1, 1, 0)
+    endif
+  endwhile
+  call s:accept('RBRACE')
+  return defs
+endfu
+
+" classOrInterfaceBodyDeclaration					{{{2
+" ClassBodyDeclaration =
+"     ";"
+"   | [STATIC] Block
+"   | ModifiersOpt
+"     ( Type Ident
+"       ( VariableDeclaratorsRest ";" | MethodDeclaratorRest )
+"     | VOID Ident MethodDeclaratorRest
+"     | TypeParameters (Type | VOID) Ident MethodDeclaratorRest
+"     | Ident ConstructorDeclaratorRest
+"     | TypeParameters Ident ConstructorDeclaratorRest
+"     | ClassOrInterfaceOrEnumDeclaration
+"     )
+" InterfaceBodyDeclaration =
+"     ";"
+"   | ModifiersOpt Type Ident
+"     ( ConstantDeclaratorsRest | InterfaceMethodDeclaratorRest ";" )
+fu! s:classOrInterfaceBodyDeclaration(classname, isInterface)
+  call s:Info('s:classOrInterfaceBodyDeclaration')
+  if b:token == 'SEMI'
+    call s:nextToken()
+    return [{'tag': 'BLOCK', 'pos': -1, 'endpos': -1, 'stats': []}]
+  else
+    if b:scanStrategy < 0
+      let result = s:classOrInterfaceBodyDeclaration_opt(a:classname, a:isInterface)
+      if !empty(result)
+	return result
+      endif
+    endif
+
+
+    let dc = b:docComment
+    let pos = b:bp
+    let mods = s:modifiersOpt()
+
+    if b:token =~# '^\(CLASS\|INTERFACE\|ENUM\)$'
+      return [s:classOrInterfaceOrEnumDeclaration(mods, dc)]
+
+    " [STATIC] block
+    elseif b:token == 'LBRACE' && !a:isInterface
+      return [s:block(pos, mods.flags, b:scanStrategy < 1)]
+
+    else
+      let typarams = s:typeParametersOpt()
+
+      let token = b:token
+      let name = b:name
+
+      let type = copy(s:TTree)
+      let isVoid = b:token == 'VOID'
+      if isVoid
+	let type = {'tag': 'TYPEIDENT', 'pos': pos, 'typetag': 'void'}	" FIXME
+	let type.value = ''
+	call s:nextToken()
+      else
+	let time = reltime()
+	let type = s:type()
+	let b:et_perf .= "\r" . reltimestr(reltime(time)) . ' s:type() '
+      endif
+
+
+      " ctor
+      if b:token == 'LPAREN' && !a:isInterface && type.tag == 'IDENT'
+	if a:isInterface || name != a:classname 
+	  call s:SyntaxError('invalid.meth.decl.ret.type.req')
+	endif
+	return [s:methodDeclaratorRest(pos, mods, type, name, typarams, a:isInterface, 1, dc)]
+      else
+	let name = s:ident()
+	" method
+	if b:token == 'LPAREN'
+	  return [s:methodDeclaratorRest(pos, mods, type, name, typarams, a:isInterface, isVoid, dc)]
+	" field
+	elseif !isVoid && len(typarams) == 0
+	  let defs = s:variableDeclaratorsRest(pos, mods, type, name, a:isInterface, dc, copy([]))
+	  call s:accept('SEMI')
+	  return defs
+	else
+	  call s:SyntaxError("LPAREN expected")
+	  return [{}]
+	endif
+      endif
+    endif
+  endif
+endfu
+
+" OAO: short way for common declaration of field or method, not for generic type yet.
+fu! s:classOrInterfaceBodyDeclaration_opt(classname, isInterface)
+    let str = b:lines[b:line]
+    let idx = matchend(str, s:RE_MEMBER_HEADER)
+    if idx != -1
+      let subs = split(substitute(strpart(str, 0, idx), s:RE_MEMBER_HEADER, '\1;\2;\3', ''), ';')
+      let name_ = subs[2]
+      let type_ = subs[1]
+      let flag_ = s:String2Flags(subs[0])
+
+"      if type_ =~# '^\(class\|interface\|enum\)$'
+"	 return [s:classOrInterfaceOrEnumDeclaration(mods, dc)]
+"      else
+	" methodDeclarator
+	let idx = matchend(str, '^\s*[,=;(]', idx)-1
+	if str[idx] == '('
+	  let methoddef = s:methodDeclaratorRest_opt(b:pos, flag_, type_, name_, [], a:isInterface, type_ == 'void', '', str, idx)
+	  if !empty(methoddef)
+	    return [methoddef]
+	  endif
+
+	" variableDeclarator
+	elseif str[idx] =~ '[=;]'
+	  let vardef = {'tag': 'VARDEF', 'pos': b:pos, 'name': name_, 'n': name_, 'vartype': type_, 't': type_, 'm': flag_}
+	  call s:gotoSemi()
+	  call s:accept('SEMI')
+	  let vardef.pos_end = b:pos
+	  return [vardef]
+
+	" variableDeclarators
+	elseif str[idx] == ','
+	  let ie = matchend(str, '^\(,\s*'. s:RE_IDENTIFIER .'\s*\)*;', idx)
+	  if ie != -1
+	    let vardef = {'tag': 'VARDEF', 'pos': b:pos, 'name': name_, 'n': name_, 'vartype': type_, 't': type_, 'm': flag_}
+	    let vars = [vardef]
+	    for item in split(substitute(strpart(str, idx+1, ie-idx-2), '\s', '', 'g'), ',')
+	      let vardef = copy(vardef)
+	      let vardef.name = item
+	      let vardef.n = item
+	      call add(vars, vardef)
+	    endfor
+	    let b:col = ie
+	    let b:bp = b:idxes[b:line] + b:col
+	    call s:nextToken()
+	    return vars
+	  endif
+	endif
+"      endif
+    endif
+
+    let RE_CTOR_HEADER = '^\s*\(\(public\|protected\|private\)\s\+\)\=\C' .a:classname. '\s*('
+    let ie = matchend(str, RE_CTOR_HEADER)
+    if ie != -1 && !a:isInterface
+      let flag_ = s:String2Flags(substitute(strpart(str, 0, ie), RE_CTOR_HEADER, '\1', ''))
+      let methoddef = s:methodDeclaratorRest_opt(b:pos, flag_, a:classname, a:classname, [], a:isInterface, 1, '', str, ie-1)
+      if !empty(methoddef)
+	return [methoddef]
+      endif
+    endif
+
+    let RE_METHOD_HEADER = '^\s*\(' .s:RE_IDENTIFIER. '\%(\s*\.\s*' .s:RE_IDENTIFIER. '\)*\%(\s*\[\s*\]\)\=\)\s\+\(' .s:RE_IDENTIFIER. '\)\s*('
+    let ie = matchend(str, RE_METHOD_HEADER)
+    if ie != -1
+      let subs = split(substitute(strpart(str, 0, ie), RE_METHOD_HEADER, '\1;\2', ''), ';')
+      let methoddef = s:methodDeclaratorRest_opt(b:pos, 0, subs[0], subs[1], [], a:isInterface, subs[0] == 'void', '', str, ie-1)
+      if !empty(methoddef)
+	return [methoddef]
+      endif
+    endif
+endfu
+
+
+" MethodDeclaratorRest =						{{{2
+"	FormalParameters BracketsOpt [Throws TypeList] ( MethodBody | [DEFAULT AnnotationValue] ";")
+" VoidMethodDeclaratorRest = FormalParameters [Throws TypeList] ( MethodBody | ";")
+" InterfaceMethodDeclaratorRest = FormalParameters BracketsOpt [THROWS TypeList] ";"
+" VoidInterfaceMethodDeclaratorRest = FormalParameters [THROWS TypeList] ";"
+" ConstructorDeclaratorRest = "(" FormalParameterListOpt ")" [THROWS TypeList] MethodBody
+fu! s:methodDeclaratorRest(pos, mods, type, name, typarams, isInterface, isVoid, dc)
+  let time = reltime()
+  let methoddef = {'tag': 'METHODDEF', 'pos': a:pos, 'name': a:name, 'mods': a:mods, 'restype': a:type, 'typarams': a:typarams}
+  let methoddef.n = a:name
+  let methoddef.m = s:Number2Bits(a:mods.flags)
+  let methoddef.r = java_parser#type2Str(a:type)
+
+  " parameters
+  let methoddef.params = s:formalParameters()
+
+  " BracketsOpt
+  if !a:isVoid
+    let methoddef.r = java_parser#type2Str(s:bracketsOpt(a:type))
+  endif
+
+
+  " throws
+  if b:token == 'THROWS'
+    call s:nextToken()
+
+    " thrown = qualidentList()
+    let ts = [s:qualident()]
+    while b:token == 'COMMA'
+      call s:nextToken()
+      call add(ts, s:qualident())
+    endwhile
+    let methoddef.throws = ts
+  endif
+
+  " method body
+  if b:token == 'LBRACE'
+    let methoddef.body = s:block(b:pos, 0, b:scanStrategy < 1)
+  else
+    if b:token == 'DEFAULT'
+      call s:accept('DEFAULT')
+      let methoddef.defaultValue = s:annotationValue()
+    endif
+    call s:accept('SEMI')
+
+    if b:pos <= b:errorEndPos
+      call s:skip(0, 1, 0, 0)
+      if b:token == 'LBRACE'
+	let methoddef.body = s:block(b:pos, 0, b:scanStrategy < 1)
+      endif
+    endif
+  endif
+
+  let methoddef.d = s:method2Str(methoddef)
+  let b:et_perf .= "\r" . reltimestr(reltime(time)) . ' methodrest() '
+  return methoddef
+endfu
+
+" method header declared in one line, 
+" NOTE: RE_FORMAL_PARAM_LIST do not recognize varargs and nested comments
+fu! s:methodDeclaratorRest_opt(pos, mods, type, name, typarams, isInterface, isVoid, dc, str, idx)
+  let str = a:str
+  let idx = a:idx
+
+  " params
+  let idxend = matchend(str, '^(\s*)', idx)	" no params
+  if idxend == -1
+    let idxend = matchend(str, '^(\s*' . s:RE_FORMAL_PARAM_LIST . '\s*)', idx)
+  endif
+  if idxend == -1
+    return
+  endif
+
+  let methoddef = {'tag': 'METHODDEF', 'pos': a:pos, 'name': a:name, 'n': a:name, 'm': a:mods, 'r': a:type}
+
+  " params
+  let methoddef.params = []
+  let s = strpart(str, idx+1, idxend-idx-2)
+  if s !~ '^\s*$'
+    for item in split(s, ',')
+      let subs = split(substitute(item, s:RE_FORMAL_PARAM2, '\2;\5', ''), ';')
+      let param = {'tag': 'VARDEF', 'pos': -1}
+      let param.name = subs[1]
+      let param.vartype = substitute(subs[0], ' ', '', 'g')
+      let param.m = s:Flags.PARAMETER
+      call add(methoddef.params, param)
+    endfor
+  endif
+
+  " throws
+  let idx2 = matchend(str, '^\s*' . s:RE_THROWS, idxend)
+  let idx = idx2 == -1 ? idxend : idx2
+  if idx2 != -1
+    "let throws = strpart(str, idxend, idx-idxend)
+  endif
+
+  " in interface
+  if a:isInterface
+    let idx = matchend(str, '^\s*;', idx)
+    if idx != -1
+      let b:token = 'SEMI'
+      let b:col = idx
+      let b:bp = b:idxes[b:line] + b:col
+      let b:pos = b:bp - 1
+      let methoddef.d = substitute(str, '^\s*\([^{]*\)\s*;\=$', '\1', '')
+      return methoddef
+    endif
+  endif
+
+  let idx = matchend(str, '^\s*{', idx)
+  if idx == -1
+    let idx = matchend(b:lines[b:line+1], '^\s*{')
+    if idx != -1
+      let b:line += 1
+    endif
+  endif
+  if idx != -1
+    let b:token = 'LBRACE'
+    let b:col = idx
+    let b:bp = b:idxes[b:line] + b:col
+    let b:pos = b:bp - 1
+    let methoddef.d = substitute(str, '^\s*\([^{]*\)\s*{\=$', '\1', '')
+    let methoddef.body = s:block(b:pos, 0, b:scanStrategy < 1)
+    return methoddef
+  endif
+endfu
+
+" VariableDeclarators = VariableDeclarator { "," VariableDeclarator }	{{{2
+fu! s:variableDeclarators(mods, type, vdefs)
+  return s:variableDeclaratorsRest(b:pos, a:mods, a:type, s:ident(), 0, '', a:vdefs)
+endfu
+
+" VariableDeclaratorsRest = VariableDeclaratorRest { "," VariableDeclarator }
+"  ConstantDeclaratorsRest = ConstantDeclaratorRest { "," ConstantDeclarator }
+fu! s:variableDeclaratorsRest(pos, mods, type, name, reqInit, dc, vdefs)
+  call add(a:vdefs, s:variableDeclaratorRest(a:pos, a:mods, a:type, a:name, a:reqInit, a:dc))
+  while b:token == 'COMMA'
+    call s:nextToken()
+    call add(a:vdefs, s:variableDeclarator(a:mods, a:type, a:reqInit, a:dc))
+  endwhile
+  return a:vdefs
+endfu
+
+" VariableDeclarator = Ident VariableDeclaratorRest
+" ConstantDeclarator = Ident ConstantDeclaratorRest
+fu! s:variableDeclarator(mods, type, reqInit, dc)
+  return s:variableDeclaratorRest(b:pos, a:mods, a:type, s:ident(), a:reqInit, a:dc)
+endfu
+
+" VariableDeclaratorRest = BracketsOpt ["=" VariableInitializer]	
+"  ConstantDeclaratorRest = BracketsOpt "=" VariableInitializer
+fu! s:variableDeclaratorRest(pos, mods, type, name, reqInit, dc)
+  let vardef = s:VarDef(a:pos, a:mods, a:name, s:bracketsOpt(a:type))
+  let vardef.n = vardef.name
+  let vardef.m = a:mods == {} ? '0' : s:Number2Bits(a:mods.flags)
+  let vardef.t = java_parser#type2Str(vardef.vartype)
+
+  if b:token == 'EQ'
+    call s:nextToken()
+    call s:Info('field init ' . b:token)
+    let vardef.init = s:variableInitializer()
+  elseif a:reqInit
+    echo '[syntax error]:' . s:token2string('EQ') . " expected"
+  endif
+
+  let vardef.endpos = b:pos
+  return vardef
+endfu
+
+fu! s:variableDeclaratorId(mods, type)
+  let vardef = s:VarDef(b:pos, a:mods, s:ident(), a:type)
+  if len(a:mods.flags) <= 34		" (a:mods.flags & s:Flags.VARARGS) == 0
+    let vardef.type = s:bracketsOpt(vardef.vartype)
+  endif
+  return vardef
+endfu
+
+" 									{{{2
+" TypeParametersOpt = ["<" TypeParameter {"," TypeParameter} ">"]	{{{2
+fu! s:typeParametersOpt()
+  if b:token == 'LT'
+    "call checkGenerics()
+    let typarams = []
+    call s:nextToken()
+    call add(typarams, s:typeParameter())
+    while b:token == 'COMMA'
+      call s:nextToken()
+      call add(typarams, s:typeParameter())
+    endwhile
+    call s:accept('GT')
+    return typarams
+  else
+    return []
+  endif
+endfu
+
+" TypeParameter = TypeVariable [TypeParameterBound]		{{{2
+" TypeParameterBound = EXTENDS Type {"&" Type}
+" TypeVariable = Ident
+fu! s:typeParameter()
+  let pos = b:pos
+  let name = s:ident()
+  let bounds = []
+  if b:token == 'EXTENDS'
+    call s:nextToken()
+    call add(bounds, s:type())
+    while b:token == 'AMP'
+      call s:nextToken()
+      call add(bounds, s:type())
+    endwhile
+  endif
+
+  return {'tag': 'TYPEPARAMETER', 'pos': pos, 'name': name, 'bounds': bounds}
+endfu
+
+" FormalParameters = "(" [ FormalParameterList ] ")"			{{{2
+" FormalParameterList = [ FormalParameterListNovarargs , ] LastFormalParameter
+" FormalParameterListNovarargs = [ FormalParameterListNovarargs , ] FormalParameter
+fu! s:formalParameters()
+  let params = []
+  let lastParam = {}
+  call s:accept('LPAREN')
+  if b:token != 'RPAREN'
+    let lastParam = s:formalParameter()
+    call add(params, lastParam)
+    while b:token == 'COMMA' && len(lastParam.mods.flags) <= 34		" (lastParam.mods.flags & s:Flags.VARARGS) == 0
+      call s:nextToken()
+      let lastParam = s:formalParameter()
+      call add(params, lastParam)
+    endwhile
+  endif
+  call s:accept('RPAREN')
+  return params
+endfu
+
+" FormalParameter = { FINAL | '@' Annotation } Type VariableDeclaratorId 	{{{2
+" LastFormalParameter = { FINAL | '@' Annotation } Type '...' Ident | FormalParameter
+fu! s:optFinal(flags)
+  let mods = s:modifiersOpt()
+  " checkNoMods(mods.flags & ~(Flags.FINAL | Flags.DEPRECATED))
+  let mods.flags = s:BitOr(mods.flags, a:flags)
+  return mods
+endfu
+
+" OAO: optional FINAL for parameter
+fu! s:optFinalParameter()
+  let mods = {'tag': 'MODIFIERS', 'pos': b:pos, 'flags': s:Flags.PARAMETER, 'annotations': []}
+  if b:token == 'FINAL'
+    let mods.flags = '1000000000000000000000000000010000'
+    call s:nextToken()
+  endif
+  return mods
+endfu
+
+fu! s:formalParameter()
+  let mods = s:optFinalParameter()
+  let type = s:type()
+
+  if b:token == 'ELLIPSIS'
+    " checkVarargs()
+    let mods.flags = '1' . mods.flags	" s:BitOr_binary(mods.flags, s:Flags.VARARGS)
+    let type = s:TypeArray(b:pos, type)
+    call s:nextToken()
+  endif
+
+  return s:variableDeclaratorId(mods, type)
+endfu
+
+" 									{{{2
+" auxiliary methods							{{{2
+let s:MapToken2Tag = {'BARBAR': 'OR', 'AMPAMP': 'AND', 'BAR': 'BITOR', 'BAREQ': 'BITOR_ASG', 'CARET': 'BITXOR', 'CARETEQ': 'BITXOR_ASG', 'AMP': 'BITAND', 'AMPEQ': 'BITAND_ASG', 'EQEQ': 'EQ', 'BANGEQ': 'NE', 'LT': 'LT', 'GT': 'GT', 'LTEQ': 'LE', 'GTEQ': 'GE', 'LTLT': 'SL', 'LTLTEQ': 'SL_ASG', 'GTGT': 'SR', 'GTGTEQ': 'SR_ASG', 'GTGTGT': 'USR', 'GTGTGTEQ': 'USR_ASG', 'PLUS': 'PLUS', 'PLUSEQ': 'PLUS_ASG', 'SUB': 'MINUS', 'SUBEQ': 'MINUS_ASG', 'STAR': 'MUL', 'STAREQ': 'MUL_ASG', 'SLASH': 'DIV', 'SLASHEQ': 'DIV_ASG', 'PERCENT': 'MOD', 'PERCENTEQ': 'MOD_ASG', 'INSTANCEOF': 'TYPETEST'}
+let s:opprecedences = {'notExpression': -1, 'noPrec': 0,       'assignPrec': 1, 'assignopPrec': 2, 'condPrec': 3, 'orPrec': 4, 'andPrec': 5, 'bitorPrec': 6, 'bitxorPrec': 7, 'bitandPrec': 8, 'eqPrec': 9, 'ordPrec': 10, 'shiftPrec': 11, 'addPrec': 12, 'mulPrec': 13, 'prefixPrec': 14, 'postfixPrec': 15, 'precCount': 16}
+
+fu! s:checkExprStat(t)
+  if a:t.tag =~# '^\(PREINC\|PREDEC\|POSTINC\|POSTDEC\|ASSIGN\|BITOR_ASG\|BITXOR_ASG\|BITAND_ASG\|SL_ASG\|SR_ASG\|USR_ASG\|PLUS_ASG\|MINUS_ASG\|MUL_ASG\|DIV_ASG\|MOD_ASG\|APPLY\|NEWCLASS\|ERRONEOUS\)$'
+    return a:t
+  else
+    call s:SyntaxError('not.stmt')
+    return {'tag': 'ERRONEOUS', 'pos': b:pos, 'errs': [a:t]}
+  endif
+endfu
+
+fu! s:prec(token)
+  let oc = s:optag(a:token)
+  return oc == -1 ? -1 : s:opPrec(oc)
+endfu
+
+fu! s:opPrec(tag)
+  if a:tag =~# '^\(POS\|NEG\|NOT\|COMPL\|PREINC\|PREDEC\)$'
+    return s:opprecedences.prefixPrec
+  elseif a:tag =~# '^\(POSTINC\|POSTDEC\|NULLCHK\)$'
+    return s:opprecedences.postfixPrec
+  elseif a:tag == 'ASSIGN'
+    return s:opprecedences.assignPrec
+  elseif a:tag =~# '^\(BITOR_ASG\|BITXOR_ASG\|BITAND_ASG\|SL_ASG\|SR_ASG\|USR_ASG\|PLUS_ASG\|MINUS_ASG\|MUL_ASG\|DIV_ASG\|MOD_ASG\)$'
+    return s:opprecedences.assignopPrec
+  elseif a:tag == 'OR'
+    return s:opprecedences.orPrec
+  elseif a:tag == 'AND'
+    return s:opprecedences.andPrec
+  elseif a:tag =~# '^\(EQ\|NE\)$'
+    return s:opprecedences.eqPrec
+  elseif a:tag =~# '^\(LT\|GT\|LE\|GE\)$'
+    return s:opprecedences.ordPrec
+  elseif a:tag == 'BITOR'
+    return s:opprecedences.bitorPrec
+  elseif a:tag == 'BITXOR'
+    return s:opprecedences.bitxorPrec
+  elseif a:tag == 'BITAND'
+    return s:opprecedences.bitandPrec
+  elseif a:tag =~# '^\(SL\|SR\|USR\)$'
+    return s:opprecedences.shiftPrec
+  elseif a:tag =~# '^\(PLUS\|MINUS\)$'
+    return s:opprecedences.addPrec
+  elseif a:tag =~# '^\(MUL\|DIV\|MOD\)$'
+    return s:opprecedences.mulPrec
+  elseif a:tag == 'TYPETEST'
+    return s:opprecedences.ordPrec
+  else
+    return -1
+  endif
+endfu
+
+fu! s:optag(token)
+  return get(s:MapToken2Tag, a:token, -1)
+endfu
+
+fu! s:unoptag(token)
+  if a:token == 'PLUS'
+    return 'POS'
+  elseif a:token == 'SUB'
+    return 'NEG'
+  elseif a:token == 'BANG'
+    return 'NOT'
+  elseif a:token == 'TILDE'
+    return 'COMPL'
+  elseif a:token == 'PLUSPLUS'
+    return 'PREINC'
+  elseif a:token == 'SUBSUB'
+    return 'PREDEC'
+  else
+    return -1
+  endif
+endfu
+
+fu! s:typetag(token)
+  if a:token =~# '\(BYTE\|CHAR\|SHORT\|INT\|LONG\|FLOAT\|DOUBLE\|BOOLEAN\)'
+    return tolower(a:token)
+  else
+    return -1
+  endif
+endfu
+
+"}}}1
+" vim:set fdm=marker sw=2 nowrap:
diff --git a/vim/plugins/javacomplete/autoload/javacomplete.vim b/vim/plugins/javacomplete/autoload/javacomplete.vim
new file mode 100644
index 0000000..ee55612
--- /dev/null
+++ b/vim/plugins/javacomplete/autoload/javacomplete.vim
@@ -0,0 +1,2932 @@
+" Vim completion script	- hit 80% complete tasks
+" Version:	0.77.1.2
+" Language:	Java
+" Maintainer:	cheng fang <fangread@yahoo.com.cn>
+" Last Change:	2011-01-30
+" Copyright:	Copyright (C) 2006-2007 cheng fang. All rights reserved.
+" License:	Vim License	(see vim's :help license)
+
+
+" constants							{{{1
+" input context type
+let s:CONTEXT_AFTER_DOT		= 1
+let s:CONTEXT_METHOD_PARAM	= 2
+let s:CONTEXT_IMPORT		= 3
+let s:CONTEXT_IMPORT_STATIC	= 4
+let s:CONTEXT_PACKAGE_DECL	= 6 
+let s:CONTEXT_NEED_TYPE		= 7 
+let s:CONTEXT_OTHER 		= 0
+
+
+let s:ARRAY_TYPE_MEMBERS = [
+\	{'kind': 'm',		'word': 'clone(',	'abbr': 'clone()',	'menu': 'Object clone()', },
+\	{'kind': 'm',		'word': 'equals(',	'abbr': 'equals()',	'menu': 'boolean equals(Object)', },
+\	{'kind': 'm',		'word': 'getClass(',	'abbr': 'getClass()',	'menu': 'Class Object.getClass()', },
+\	{'kind': 'm',		'word': 'hashCode(',	'abbr': 'hashCode()',	'menu': 'int hashCode()', },
+\	{'kind': 'f',		'word': 'length',				'menu': 'int'},
+\	{'kind': 'm',		'word': 'notify(',	'abbr': 'notify()',	'menu': 'void Object.notify()', },
+\	{'kind': 'm',		'word': 'notifyAll(',	'abbr': 'notifyAll()',	'menu': 'void Object.notifyAll()', },
+\	{'kind': 'm',		'word': 'toString(',	'abbr': 'toString()',	'menu': 'String toString()', },
+\	{'kind': 'm',		'word': 'wait(',	'abbr': 'wait()',	'menu': 'void Object.wait() throws InterruptedException', },
+\	{'kind': 'm', 'dup': 1, 'word': 'wait(',	'abbr': 'wait()',	'menu': 'void Object.wait(long timeout) throws InterruptedException', },
+\	{'kind': 'm', 'dup': 1, 'word': 'wait(',	'abbr': 'wait()',	'menu': 'void Object.wait(long timeout, int nanos) throws InterruptedException', }]
+
+let s:ARRAY_TYPE_INFO = {'tag': 'CLASSDEF', 'name': '[', 'ctors': [], 
+\     'fields': [{'n': 'length', 'm': '1', 't': 'int'}],
+\     'methods':[
+\	{'n': 'clone',	  'm': '1',		'r': 'Object',	'p': [],		'd': 'Object clone()'},
+\	{'n': 'equals',	  'm': '1',		'r': 'boolean',	'p': ['Object'],	'd': 'boolean Object.equals(Object obj)'},
+\	{'n': 'getClass', 'm': '100010001',	'r': 'Class',	'p': [],		'd': 'Class Object.getClass()'},
+\	{'n': 'hashCode', 'm': '100000001',	'r': 'int',	'p': [],		'd': 'int Object.hashCode()'},
+\	{'n': 'notify',	  'm': '100010001',	'r': 'void',	'p': [],		'd': 'void Object.notify()'},
+\	{'n': 'notifyAll','m': '100010001',	'r': 'void',	'p': [],		'd': 'void Object.notifyAll()'},
+\	{'n': 'toString', 'm': '1', 		'r': 'String',	'p': [],		'd': 'String Object.toString()'},
+\	{'n': 'wait',	  'm': '10001',		'r': 'void',	'p': [],		'd': 'void Object.wait() throws InterruptedException'},
+\	{'n': 'wait',	  'm': '100010001',	'r': 'void',	'p': ['long'],		'd': 'void Object.wait(long timeout) throws InterruptedException'},
+\	{'n': 'wait',	  'm': '10001',		'r': 'void',	'p': ['long','int'],	'd': 'void Object.wait(long timeout, int nanos) throws InterruptedException'},
+\    ]}
+
+let s:PRIMITIVE_TYPE_INFO = {'tag': 'CLASSDEF', 'name': '!', 'fields': [{'n': 'class','m': '1','t': 'Class'}]}
+
+let s:JSP_BUILTIN_OBJECTS = {'session':	'javax.servlet.http.HttpSession',
+\	'request':	'javax.servlet.http.HttpServletRequest',
+\	'response':	'javax.servlet.http.HttpServletResponse',
+\	'pageContext':	'javax.servlet.jsp.PageContext', 
+\	'application':	'javax.servlet.ServletContext',
+\	'config':	'javax.servlet.ServletConfig',
+\	'out':		'javax.servlet.jsp.JspWriter',
+\	'page':		'javax.servlet.jsp.HttpJspPage', }
+
+
+let s:PRIMITIVE_TYPES	= ['boolean', 'byte', 'char', 'int', 'short', 'long', 'float', 'double']
+let s:KEYWORDS_MODS	= ['public', 'private', 'protected', 'static', 'final', 'synchronized', 'volatile', 'transient', 'native', 'strictfp', 'abstract']
+let s:KEYWORDS_TYPE	= ['class', 'interface', 'enum']
+let s:KEYWORDS		= s:PRIMITIVE_TYPES + s:KEYWORDS_MODS + s:KEYWORDS_TYPE + ['super', 'this', 'void'] + ['assert', 'break', 'case', 'catch', 'const', 'continue', 'default', 'do', 'else', 'extends', 'finally', 'for', 'goto', 'if', 'implements', 'import', 'instanceof', 'interface', 'new', 'package', 'return', 'switch', 'throw', 'throws', 'try', 'while', 'true', 'false', 'null']
+
+let s:PATH_SEP	= ':'
+let s:FILE_SEP	= '/'
+if has("win32") || has("win64") || has("win16") || has("dos32") || has("dos16")
+  let s:PATH_SEP	= ';'
+  let s:FILE_SEP	= '\'
+endif
+
+let s:RE_BRACKETS	= '\%(\s*\[\s*\]\)'
+let s:RE_IDENTIFIER	= '[a-zA-Z_$][a-zA-Z0-9_$]*'
+let s:RE_QUALID		= s:RE_IDENTIFIER. '\%(\s*\.\s*' .s:RE_IDENTIFIER. '\)*'
+
+let s:RE_REFERENCE_TYPE	= s:RE_QUALID . s:RE_BRACKETS . '*'
+let s:RE_TYPE		= s:RE_REFERENCE_TYPE
+
+let s:RE_TYPE_ARGUMENT	= '\%(?\s\+\%(extends\|super\)\s\+\)\=' . s:RE_TYPE
+let s:RE_TYPE_ARGUMENTS	= '<' . s:RE_TYPE_ARGUMENT . '\%(\s*,\s*' . s:RE_TYPE_ARGUMENT . '\)*>'
+let s:RE_TYPE_WITH_ARGUMENTS_I	= s:RE_IDENTIFIER . '\s*' . s:RE_TYPE_ARGUMENTS
+let s:RE_TYPE_WITH_ARGUMENTS	= s:RE_TYPE_WITH_ARGUMENTS_I . '\%(\s*' . s:RE_TYPE_WITH_ARGUMENTS_I . '\)*'
+
+let s:RE_TYPE_MODS	= '\%(public\|protected\|private\|abstract\|static\|final\|strictfp\)'
+let s:RE_TYPE_DECL_HEAD	= '\(class\|interface\|enum\)[ \t\n\r]\+'
+let s:RE_TYPE_DECL	= '\<\C\(\%(' .s:RE_TYPE_MODS. '\s\+\)*\)' .s:RE_TYPE_DECL_HEAD. '\(' .s:RE_IDENTIFIER. '\)[< \t\n\r]'
+
+let s:RE_ARRAY_TYPE	= '^\s*\(' .s:RE_QUALID . '\)\(' . s:RE_BRACKETS . '\+\)\s*$'
+let s:RE_SELECT_OR_ACCESS	= '^\s*\(' . s:RE_IDENTIFIER . '\)\s*\(\[.*\]\)\=\s*$'
+let s:RE_ARRAY_ACCESS	= '^\s*\(' . s:RE_IDENTIFIER . '\)\s*\(\[.*\]\)\+\s*$'
+let s:RE_CASTING	= '^\s*(\(' .s:RE_QUALID. '\))\s*\(' . s:RE_IDENTIFIER . '\)\>'
+
+let s:RE_KEYWORDS	= '\<\%(' . join(s:KEYWORDS, '\|') . '\)\>'
+
+
+" local variables						{{{1
+let b:context_type = s:CONTEXT_OTHER
+"let b:statement = ''			" statement before cursor
+let b:dotexpr = ''			" expression ends with '.'
+let b:incomplete = ''			" incomplete word: 1. dotexpr.method(|) 2. new classname(|) 3. dotexpr.ab|, 4. ja|, 5. method(|
+let b:errormsg = ''
+
+" script variables						{{{1
+let s:cache = {}	" FQN -> member list, e.g. {'java.lang.StringBuffer': classinfo, 'java.util': packageinfo, '/dir/TopLevelClass.java': compilationUnit}
+let s:files = {}	" srouce file path -> properties, e.g. {filekey: {'unit': compilationUnit, 'changedtick': tick, }}
+let s:history = {}	" 
+
+
+" This function is used for the 'omnifunc' option.		{{{1
+function! javacomplete#Complete(findstart, base)
+  if a:findstart
+    let s:et_whole = reltime()
+    let start = col('.') - 1
+    let s:log = []
+
+    " reset enviroment
+    let b:dotexpr = ''
+    let b:incomplete = ''
+    let b:context_type = s:CONTEXT_OTHER
+
+    let statement = s:GetStatement()
+    call s:WatchVariant('statement: "' . statement . '"')
+
+    if statement =~ '[.0-9A-Za-z_]\s*$'
+      let valid = 1
+      if statement =~ '\.\s*$'
+	let valid = statement =~ '[")0-9A-Za-z_\]]\s*\.\s*$' && statement !~ '\<\H\w\+\.\s*$' && statement !~ '\<\(abstract\|assert\|break\|case\|catch\|const\|continue\|default\|do\|else\|enum\|extends\|final\|finally\|for\|goto\|if\|implements\|import\|instanceof\|interface\|native\|new\|package\|private\|protected\|public\|return\|static\|strictfp\|switch\|synchronized\|throw\|throws\|transient\|try\|volatile\|while\|true\|false\|null\)\.\s*$'
+      endif
+      if !valid
+	return -1
+      endif
+
+      let b:context_type = s:CONTEXT_AFTER_DOT
+
+      " import or package declaration
+      if statement =~# '^\s*\(import\|package\)\s\+'
+	let statement = substitute(statement, '\s\+\.', '.', 'g')
+	let statement = substitute(statement, '\.\s\+', '.', 'g')
+	if statement =~ '^\s*import\s\+'
+	  let b:context_type = statement =~# '\<static\s\+' ? s:CONTEXT_IMPORT_STATIC : s:CONTEXT_IMPORT
+	  let b:dotexpr = substitute(statement, '^\s*import\s\+\(static\s\+\)\?', '', '')
+	else
+	  let b:context_type = s:CONTEXT_PACKAGE_DECL
+	  let b:dotexpr = substitute(statement, '\s*package\s\+', '', '')
+	endif
+
+      " String literal
+      elseif statement =~  '"\s*\.\s*$'
+	let b:dotexpr = substitute(statement, '\s*\.\s*$', '\.', '')
+	return start - strlen(b:incomplete)
+
+      else
+	" type declaration		NOTE: not supported generic yet.
+	let idx_type = matchend(statement, '^\s*' . s:RE_TYPE_DECL)
+	if idx_type != -1
+	  let b:dotexpr = strpart(statement, idx_type)
+	  " return if not after extends or implements
+	  if b:dotexpr !~ '^\(extends\|implements\)\s\+'
+	    return -1
+	  endif
+	  let b:context_type = s:CONTEXT_NEED_TYPE
+	endif
+
+	let b:dotexpr = s:ExtractCleanExpr(statement)
+      endif
+
+      " all cases: " java.ut|" or " java.util.|" or "ja|"
+      let b:incomplete = strpart(b:dotexpr, strridx(b:dotexpr, '.')+1)
+      let b:dotexpr = strpart(b:dotexpr, 0, strridx(b:dotexpr, '.')+1)
+      return start - strlen(b:incomplete)
+
+
+    " method parameters, treat methodname or 'new' as an incomplete word
+    elseif statement =~ '(\s*$'
+      " TODO: Need to exclude method declaration?
+      let b:context_type = s:CONTEXT_METHOD_PARAM
+      let pos = strridx(statement, '(')
+      let s:padding = strpart(statement, pos+1)
+      let start = start - (len(statement) - pos)
+
+      let statement = substitute(statement, '\s*(\s*$', '', '')
+
+      " new ClassName?
+      let str = matchstr(statement, '\<new\s\+' . s:RE_QUALID . '$')
+      if str != ''
+	let str = substitute(str, '^new\s\+', '', '')
+	if !s:IsKeyword(str)
+	  let b:incomplete = '+'
+	  let b:dotexpr = str
+	  return start - len(b:dotexpr)
+	endif
+
+      " normal method invocations
+      else
+	let pos = match(statement, '\s*' . s:RE_IDENTIFIER . '$')
+	" case: "method(|)", "this(|)", "super(|)"
+	if pos == 0
+	  let statement = substitute(statement, '^\s*', '', '')
+	  " treat "this" or "super" as a type name.
+	  if statement == 'this' || statement == 'super' 
+	    let b:dotexpr = statement
+	    let b:incomplete = '+'
+	    return start - len(b:dotexpr)
+
+	  elseif !s:IsKeyword(statement)
+	    let b:incomplete = statement
+	    return start - strlen(b:incomplete)
+	  endif
+
+	" case: "expr.method(|)"
+	elseif statement[pos-1] == '.' && !s:IsKeyword(strpart(statement, pos))
+	  let b:dotexpr = s:ExtractCleanExpr(strpart(statement, 0, pos))
+	  let b:incomplete = strpart(statement, pos)
+	  return start - strlen(b:incomplete)
+	endif
+      endif
+    endif
+
+    return -1
+  endif
+
+
+  " Return list of matches.
+
+  call s:WatchVariant('b:context_type: "' . b:context_type . '"  b:incomplete: "' . b:incomplete . '"  b:dotexpr: "' . b:dotexpr . '"')
+  if b:dotexpr =~ '^\s*$' && b:incomplete =~ '^\s*$'
+    return []
+  endif
+
+
+  let result = []
+  if b:dotexpr !~ '^\s*$'
+    if b:context_type == s:CONTEXT_AFTER_DOT
+      let result = s:CompleteAfterDot(b:dotexpr)
+    elseif b:context_type == s:CONTEXT_IMPORT || b:context_type == s:CONTEXT_IMPORT_STATIC || b:context_type == s:CONTEXT_PACKAGE_DECL || b:context_type == s:CONTEXT_NEED_TYPE
+      let result = s:GetMembers(b:dotexpr[:-2])
+    elseif b:context_type == s:CONTEXT_METHOD_PARAM
+      if b:incomplete == '+'
+	let result = s:GetConstructorList(b:dotexpr)
+      else
+	let result = s:CompleteAfterDot(b:dotexpr)
+      endif
+    endif
+
+  " only incomplete word
+  elseif b:incomplete !~ '^\s*$'
+    " only need methods
+    if b:context_type == s:CONTEXT_METHOD_PARAM
+      let methods = s:SearchForName(b:incomplete, 0, 1)[1]
+      call extend(result, eval('[' . s:DoGetMethodList(methods) . ']'))
+
+    else
+      let result = s:CompleteAfterWord(b:incomplete)
+    endif
+
+    " then no filter needed
+    let b:incomplete = ''
+  endif
+
+
+  if len(result) > 0
+    " filter according to b:incomplete
+    if len(b:incomplete) > 0 && b:incomplete != '+'
+      let result = filter(result, "type(v:val) == type('') ? v:val =~ '^" . b:incomplete . "' : v:val['word'] =~ '^" . b:incomplete . "'")
+    endif
+
+    if exists('s:padding') && !empty(s:padding)
+	for item in result
+	  if type(item) == type("")
+	    let item .= s:padding
+	  else
+	   let item.word .= s:padding
+	  endif
+	endfor
+	unlet s:padding
+    endif
+
+    call s:Debug('finish completion' . reltimestr(reltime(s:et_whole)) . 's')
+    return result
+  endif
+
+  if strlen(b:errormsg) > 0
+    echoerr 'javacomplete error: ' . b:errormsg
+    let b:errormsg = ''
+  endif
+endfunction
+
+" Precondition:	incomplete must be a word without '.'.
+" return all the matched, variables, fields, methods, types, packages
+fu! s:CompleteAfterWord(incomplete)
+  " packages in jar files
+  if !exists('s:all_packages_in_jars_loaded')
+    call s:DoGetInfoByReflection('-', '-P')
+    let s:all_packages_in_jars_loaded = 1
+  endif
+
+  let pkgs = []
+  let types = []
+  for key in keys(s:cache)
+    if key =~# '^' . a:incomplete
+      if type(s:cache[key]) == type('') || get(s:cache[key], 'tag', '') == 'PACKAGE'
+	call add(pkgs, {'kind': 'P', 'word': key})
+
+      " filter out type info
+      elseif b:context_type != s:CONTEXT_PACKAGE_DECL && b:context_type != s:CONTEXT_IMPORT && b:context_type != s:CONTEXT_IMPORT_STATIC
+	call add(types, {'kind': 'C', 'word': key})
+      endif
+    endif
+  endfor
+
+  let pkgs += s:DoGetPackageInfoInDirs(a:incomplete, b:context_type == s:CONTEXT_PACKAGE_DECL, 1)
+
+
+  " add accessible types which name beginning with the incomplete in source files
+  " TODO: remove the inaccessible
+  if b:context_type != s:CONTEXT_PACKAGE_DECL
+    " single type import
+    for fqn in s:GetImports('imports_fqn')
+      let name = fqn[strridx(fqn, ".")+1:]
+      if name =~ '^' . a:incomplete
+	call add(types, {'kind': 'C', 'word': name})
+      endif
+    endfor
+
+    " current file
+    let lnum_old = line('.')
+    let col_old = col('.')
+    call cursor(1, 1)
+    while 1
+      let lnum = search('\<\C\(class\|interface\|enum\)[ \t\n\r]\+' . a:incomplete . '[a-zA-Z0-9_$]*[< \t\n\r]', 'W')
+      if lnum == 0
+	break
+      elseif s:InCommentOrLiteral(line('.'), col('.'))
+	continue
+      else
+	normal w
+	call add(types, {'kind': 'C', 'word': matchstr(getline(line('.'))[col('.')-1:], s:RE_IDENTIFIER)})
+      endif
+    endwhile
+    call cursor(lnum_old, col_old)
+
+    " other files
+    let filepatterns = ''
+    for dirpath in s:GetSourceDirs(expand('%:p'))
+      let filepatterns .= escape(dirpath, ' \') . '/*.java '
+    endfor
+    exe 'vimgrep /\s*' . s:RE_TYPE_DECL . '/jg ' . filepatterns
+    for item in getqflist()
+      if item.text !~ '^\s*\*\s\+'
+	let text = matchstr(s:Prune(item.text, -1), '\s*' . s:RE_TYPE_DECL)
+	if text != ''
+	  let subs = split(substitute(text, '\s*' . s:RE_TYPE_DECL, '\1;\2;\3', ''), ';', 1)
+	  if subs[2] =~# '^' . a:incomplete && (subs[0] =~ '\C\<public\>' || fnamemodify(bufname(item.bufnr), ':p:h') == expand('%:p:h'))
+	    call add(types, {'kind': 'C', 'word': subs[2]})
+	  endif
+	endif
+      endif
+    endfor
+  endif
+
+
+  let result = []
+
+  " add variables and members in source files
+  if b:context_type == s:CONTEXT_AFTER_DOT
+    let matches = s:SearchForName(a:incomplete, 0, 0)
+    let result += sort(eval('[' . s:DoGetFieldList(matches[2]) . ']'))
+    let result += sort(eval('[' . s:DoGetMethodList(matches[1]) . ']'))
+  endif
+  let result += sort(pkgs)
+  let result += sort(types)
+
+  return result
+endfu
+
+
+" Precondition:	expr must end with '.'
+" return members of the value of expression
+function! s:CompleteAfterDot(expr)
+  let items = s:ParseExpr(a:expr)		" TODO: return a dict containing more than items
+  if empty(items)
+    return []
+  endif
+
+
+  " 0. String literal
+  call s:Info('P0. "str".|')
+  if items[-1] =~  '"$'
+    return s:GetMemberList("java.lang.String")
+  endif
+
+
+  let ti = {}
+  let ii = 1		" item index
+  let itemkind = 0
+
+  "
+  " optimized process
+  "
+  " search the longest expr consisting of ident
+  let i = 1
+  let k = i
+  while i < len(items) && items[i] =~ '^\s*' . s:RE_IDENTIFIER . '\s*$'
+    let ident = substitute(items[i], '\s', '', 'g')
+    if ident == 'class' || ident == 'this' || ident == 'super'
+      let k = i
+    " return when found other keywords
+    elseif s:IsKeyword(ident)
+      return []
+    endif
+    let items[i] = substitute(items[i], '\s', '', 'g')
+    let i += 1
+  endwhile
+
+  if i > 1
+    " cases: "this.|", "super.|", "ClassName.this.|", "ClassName.super.|", "TypeName.class.|"
+    if items[k] ==# 'class' || items[k] ==# 'this' || items[k] ==# 'super'
+      call s:Info('O1. ' . items[k] . ' ' . join(items[:k-1], '.'))
+      let ti = s:DoGetClassInfo(items[k] == 'class' ? 'java.lang.Class' : join(items[:k-1], '.'))
+      if !empty(ti)
+	let itemkind = items[k] ==# 'this' ? 1 : items[k] ==# 'super' ? 2 : 0
+	let ii = k+1
+      else
+	return []
+      endif
+
+    " case: "java.io.File.|"
+    else
+      let fqn = join(items[:i-1], '.')
+      let srcpath = join(s:GetSourceDirs(expand('%:p'), s:GetPackageName()), ',')
+      call s:Info('O2. ' . fqn)
+      call s:DoGetTypeInfoForFQN([fqn], srcpath)
+      if get(get(s:cache, fqn, {}), 'tag', '') == 'CLASSDEF'
+	let ti = s:cache[fqn]
+	let itemkind = 11
+	let ii = i
+      endif
+    endif
+  endif
+
+
+  "
+  " first item
+  "
+  if empty(ti)
+    " cases:
+    " 1) "int.|", "void.|"	- primitive type or pseudo-type, return `class`
+    " 2) "this.|", "super.|"	- special reference
+    " 3) "var.|"		- variable or field
+    " 4) "String.|" 		- type imported or defined locally
+    " 5) "java.|"   		- package
+    if items[0] =~ '^\s*' . s:RE_IDENTIFIER . '\s*$'
+      let ident = substitute(items[0], '\s', '', 'g')
+
+      if s:IsKeyword(ident)
+	" 1)
+	call s:Info('F1. "' . ident . '.|"')
+	if ident ==# 'void' || s:IsBuiltinType(ident)
+	  let ti = s:PRIMITIVE_TYPE_INFO
+	  let itemkind = 11
+
+	" 2)
+	call s:Info('F2. "' . ident . '.|"')
+	elseif ident ==# 'this' || ident ==# 'super'
+	  let itemkind = ident ==# 'this' ? 1 : ident ==# 'super' ? 2 : 0
+	  let ti = s:DoGetClassInfo(ident)
+	endif
+
+      else
+	" 3)
+	let typename = s:GetDeclaredClassName(ident)
+	call s:Info('F3. "' . ident . '.|"  typename: "' . typename . '"')
+	if (typename != '')
+	  if typename[0] == '[' || typename[-1:] == ']'
+	    let ti = s:ARRAY_TYPE_INFO
+	  elseif typename != 'void' && !s:IsBuiltinType(typename)
+	    let ti = s:DoGetClassInfo(typename)
+	  endif
+
+	else
+	  " 4)
+	  call s:Info('F4. "TypeName.|"')
+	  let ti = s:DoGetClassInfo(ident)
+	  let itemkind = 11
+
+	  if get(ti, 'tag', '') != 'CLASSDEF'
+	    let ti = {}
+	  endif
+
+	  " 5)
+	  if empty(ti)
+	    call s:Info('F5. "package.|"')
+	    unlet ti
+	    let ti = s:GetMembers(ident)	" s:DoGetPackegInfo(ident)
+	    let itemkind = 20
+	  endif
+	endif
+      endif
+
+    " method invocation:	"method().|"	- "this.method().|"
+    elseif items[0] =~ '^\s*' . s:RE_IDENTIFIER . '\s*('
+      let ti = s:MethodInvocation(items[0], ti, itemkind)
+
+    " array type, return `class`: "int[] [].|", "java.lang.String[].|", "NestedClass[].|"
+    elseif items[0] =~# s:RE_ARRAY_TYPE
+      call s:Info('array type. "' . items[0] . '"')
+      let qid = substitute(items[0], s:RE_ARRAY_TYPE, '\1', '')
+      if s:IsBuiltinType(qid) || (!s:HasKeyword(qid) && !empty(s:DoGetClassInfo(qid)))
+	let ti = s:PRIMITIVE_TYPE_INFO
+	let itemkind = 11
+      endif
+
+    " class instance creation expr:	"new String().|", "new NonLoadableClass().|"
+    " array creation expr:	"new int[i=1] [val()].|", "new java.lang.String[].|"
+    elseif items[0] =~ '^\s*new\s\+'
+      call s:Info('creation expr. "' . items[0] . '"')
+      let subs = split(substitute(items[0], '^\s*new\s\+\(' .s:RE_QUALID. '\)\s*\([([]\)', '\1;\2', ''), ';')
+      if subs[1][0] == '['
+	let ti = s:ARRAY_TYPE_INFO
+      elseif subs[1][0] == '('
+	let ti = s:DoGetClassInfo(subs[0])
+	" exclude interfaces and abstract class.  TODO: exclude the inaccessible
+	if get(ti, 'flags', '')[-10:-10] || get(ti, 'flags', '')[-11:-11]
+	  echo 'cannot instantiate the type ' . subs[0]
+	  let ti = {}
+	  return []
+	endif
+      endif
+
+    " casting conversion:	"(Object)o.|"
+    elseif items[0] =~ s:RE_CASTING
+      call s:Info('Casting conversion. "' . items[0] . '"')
+      let subs = split(substitute(items[0], s:RE_CASTING, '\1;\2', ''), ';')
+      let ti = s:DoGetClassInfo(subs[0])
+
+    " array access:	"var[i][j].|"		Note: "var[i][]" is incorrect
+    elseif items[0] =~# s:RE_ARRAY_ACCESS
+      let subs = split(substitute(items[0], s:RE_ARRAY_ACCESS, '\1;\2', ''), ';')
+      if get(subs, 1, '') !~ s:RE_BRACKETS
+	let typename = s:GetDeclaredClassName(subs[0])
+	call s:Info('ArrayAccess. "' .items[0]. '.|"  typename: "' . typename . '"')
+	if (typename != '')
+	  let ti = s:ArrayAccess(typename, items[0])
+	endif
+      endif
+    endif
+  endif
+
+
+  "
+  " next items
+  "
+  while !empty(ti) && ii < len(items)
+    " method invocation:	"PrimaryExpr.method(parameters)[].|"
+    if items[ii] =~ '^\s*' . s:RE_IDENTIFIER . '\s*('
+      let ti = s:MethodInvocation(items[ii], ti, itemkind)
+      let itemkind = 0
+      let ii += 1
+      continue
+
+
+    " expression of selection, field access, array access
+    elseif items[ii] =~ s:RE_SELECT_OR_ACCESS
+      let subs = split(substitute(items[ii], s:RE_SELECT_OR_ACCESS, '\1;\2', ''), ';')
+      let ident = subs[0]
+      let brackets = get(subs, 1, '')
+
+      " package members
+      if itemkind/10 == 2 && empty(brackets) && !s:IsKeyword(ident)
+	let qn = join(items[:ii], '.')
+	if type(ti) == type([])
+	  let idx = s:Index(ti, ident, 'word')
+	  if idx >= 0
+	    if ti[idx].kind == 'P'
+	      unlet ti
+	      let ti = s:GetMembers(qn)
+	      let ii += 1
+	      continue
+	    elseif ti[idx].kind == 'C'
+	      unlet ti
+	      let ti = s:DoGetClassInfo(qn)
+	      let itemkind = 11
+	      let ii += 1
+	      continue
+	    endif
+	  endif
+	endif
+
+
+      " type members
+      elseif itemkind/10 == 1 && empty(brackets)
+	if ident ==# 'class' || ident ==# 'this' || ident ==# 'super'
+	  let ti = s:DoGetClassInfo(ident == 'class' ? 'java.lang.Class' : join(items[:ii-1], '.'))
+	  let itemkind = ident ==# 'this' ? 1 : ident ==# 'super' ? 2 : 0
+	  let ii += 1
+	  continue
+
+	elseif !s:IsKeyword(ident) && type(ti) == type({}) && get(ti, 'tag', '') == 'CLASSDEF'
+	  " accessible static field
+	  "let idx = s:Index(get(ti, 'fields', []), ident, 'n')
+	  "if idx >= 0 && s:IsStatic(ti.fields[idx].m)
+	  "  let ti = s:ArrayAccess(ti.fields[idx].t, items[ii])
+	  let members = s:SearchMember(ti, ident, 1, itemkind, 1, 0)
+	  if !empty(members[2])
+	    let ti = s:ArrayAccess(members[2][0].t, items[ii])
+	    let itemkind = 0
+	    let ii += 1
+	    continue
+	  endif
+
+	  " accessible nested type
+	  "if !empty(filter(copy(get(ti, 'classes', [])), 'strpart(v:val, strridx(v:val, ".")) ==# "' . ident . '"'))
+	  if !empty(members[0])
+	    let ti = s:DoGetClassInfo(join(items[:ii], '.'))
+	    let ii += 1
+	    continue
+	  endif
+	endif
+
+
+      " instance members
+      elseif itemkind/10 == 0 && !s:IsKeyword(ident)
+	if type(ti) == type({}) && get(ti, 'tag', '') == 'CLASSDEF'
+	  "let idx = s:Index(get(ti, 'fields', []), ident, 'n')
+	  "if idx >= 0
+	  "  let ti = s:ArrayAccess(ti.fields[idx].t, items[ii])
+	  let members = s:SearchMember(ti, ident, 1, itemkind, 1, 0)
+	  let itemkind = 0
+	  if !empty(members[2])
+	    let ti = s:ArrayAccess(members[2][0].t, items[ii])
+	    let ii += 1
+	    continue
+	  endif
+	endif
+      endif
+    endif
+
+    return []
+  endwhile
+
+
+  " type info or package info --> members
+  if !empty(ti)
+    if type(ti) == type({})
+      if get(ti, 'tag', '') == 'CLASSDEF'
+	if get(ti, 'name', '') == '!'
+	  return [{'kind': 'f', 'word': 'class', 'menu': 'Class'}]
+	elseif get(ti, 'name', '') == '['
+	  return s:ARRAY_TYPE_MEMBERS
+	elseif itemkind < 20
+	  return s:DoGetMemberList(ti, itemkind)
+	endif
+      elseif get(ti, 'tag', '') == 'PACKAGE'
+	" TODO: ti -> members, in addition to packages in dirs
+	return s:GetMembers( substitute(join(items, '.'), '\s', '', 'g') )
+      endif
+    elseif type(ti) == type([])
+      return ti
+    endif
+  endif
+
+  return []
+endfunction
+
+
+fu! s:MethodInvocation(expr, ti, itemkind)
+  let subs = split(substitute(a:expr, '\s*\(' . s:RE_IDENTIFIER . '\)\s*\((.*\)', '\1;\2', ''), ';')
+
+  " all methods matched
+  if empty(a:ti)
+    let methods = s:SearchForName(subs[0], 0, 1)[1]
+  elseif type(a:ti) == type({}) && get(a:ti, 'tag', '') == 'CLASSDEF'
+    let methods = s:SearchMember(a:ti, subs[0], 1, a:itemkind, 1, 0, a:itemkind == 2)[1]
+"    let methods = s:filter(get(a:ti, 'methods', []), 'item.n == "' . subs[0] . '"')
+"    if a:itemkind == 1 || a:itemkind == 2
+"      let methods += s:filter(get(a:ti, 'declared_methods', []), 'item.n == "' . subs[0] . '"')
+"    endif
+  else
+    let methods = []
+  endif
+
+  let method = s:DetermineMethod(methods, subs[1])
+  if !empty(method)
+    return s:ArrayAccess(method.r, a:expr)
+  endif
+  return {}
+endfu
+
+fu! s:ArrayAccess(arraytype, expr)
+  if a:expr =~ s:RE_BRACKETS	| return {} | endif
+  let typename = a:arraytype
+
+  let dims = 0
+  if typename[0] == '[' || typename[-1:] == ']' || a:expr[-1:] == ']'
+    let dims = s:CountDims(a:expr) - s:CountDims(typename)
+    if dims == 0
+      let typename = matchstr(typename, s:RE_IDENTIFIER)
+    elseif dims < 0
+      return s:ARRAY_TYPE_INFO
+    else
+      "echoerr 'dims exceeds'
+    endif
+  endif
+  if dims == 0
+    if typename != 'void' && !s:IsBuiltinType(typename)
+      return s:DoGetClassInfo(typename)
+    endif
+  endif
+  return {}
+endfu
+
+
+" Quick information						{{{1
+function! MyBalloonExpr()
+  if (searchdecl(v:beval_text, 1, 0) == 0)
+    return s:GetVariableDeclaration()
+  endif
+  return ''
+"  return 'Cursor is at line ' . v:beval_lnum .
+"	\', column ' . v:beval_col .
+"	\ ' of file ' .  bufname(v:beval_bufnr) .
+"	\ ' on word "' . v:beval_text . '"'
+endfunction
+"set bexpr=MyBalloonExpr()
+"set ballooneval
+
+" parameters information					{{{1
+fu! javacomplete#CompleteParamsInfo(findstart, base)
+  if a:findstart
+    return col('.') - 1
+  endif
+
+  
+  let mi = s:GetMethodInvocationExpr(s:GetStatement())
+  if empty(mi.method)
+    return []
+  endif
+
+  " TODO: how to determine overloaded functions
+  "let mi.params = s:EvalParams(mi.params)
+  if empty(mi.expr)
+    let methods = s:SearchForName(mi.method, 0, 1)[1]
+    let result = eval('[' . s:DoGetMethodList(methods) . ']')
+  elseif mi.method == '+'
+    let result = s:GetConstructorList(mi.expr)
+  else
+    let result = s:CompleteAfterDot(mi.expr)
+  endif
+
+  if !empty(result)
+    if !empty(mi.method) && mi.method != '+'
+      let result = filter(result, "type(v:val) == type('') ? v:val ==# '" . mi.method . "' : v:val['word'] ==# '" . mi.method . "('")
+    endif
+    return result
+  endif
+endfu
+
+" scanning and parsing							{{{1
+
+" Search back from the cursor position till meeting '{' or ';'.
+" '{' means statement start, ';' means end of a previous statement.
+" Return: statement before cursor
+" Note: It's the base for parsing. And It's OK for most cases.
+function! s:GetStatement()
+  if getline('.') =~ '^\s*\(import\|package\)\s\+'
+    return strpart(getline('.'), match(getline('.'), '\(import\|package\)'), col('.')-1)
+  endif
+
+  let lnum_old = line('.')
+  let col_old = col('.')
+
+  while 1
+    if search('[{};]\|<%\|<%!', 'bW') == 0
+      let lnum = 1
+      let col  = 1
+    else
+      if s:InCommentOrLiteral(line('.'), col('.'))
+	continue
+      endif
+
+      normal w
+      let lnum = line('.')
+      let col = col('.')
+    endif
+    break
+  endwhile
+
+  silent call cursor(lnum_old, col_old)
+  return s:MergeLines(lnum, col, lnum_old, col_old)
+endfunction
+
+fu! s:MergeLines(lnum, col, lnum_old, col_old)
+  let lnum = a:lnum
+  let col = a:col
+
+  let str = ''
+  if lnum < a:lnum_old
+    let str = s:Prune(strpart(getline(lnum), a:col-1))
+    let lnum += 1
+    while lnum < a:lnum_old
+      let str  .= s:Prune(getline(lnum))
+      let lnum += 1
+    endwhile
+    let col = 1
+  endif
+  let lastline = strpart(getline(a:lnum_old), col-1, a:col_old-col)
+  let str .= s:Prune(lastline, col)
+  let str = s:RemoveBlockComments(str)
+  " generic in JAVA 5+
+  while match(str, s:RE_TYPE_ARGUMENTS) != -1
+    let str = substitute(str, '\(' . s:RE_TYPE_ARGUMENTS . '\)', '\=repeat(" ", len(submatch(1)))', 'g')
+  endwhile
+  let str = substitute(str, '\s\s\+', ' ', 'g')
+  let str = substitute(str, '\([.()]\)[ \t]\+', '\1', 'g')
+  let str = substitute(str, '[ \t]\+\([.()]\)', '\1', 'g')
+  return s:Trim(str) . matchstr(lastline, '\s*$')
+endfu
+
+" Extract a clean expr, removing some non-necessary characters. 
+fu! s:ExtractCleanExpr(expr)
+  let cmd = substitute(a:expr, '[ \t\r\n]\+\([.()[\]]\)', '\1', 'g')
+  let cmd = substitute(cmd, '\([.()[\]]\)[ \t\r\n]\+', '\1', 'g')
+
+  let pos = strlen(cmd)-1 
+  while pos >= 0 && cmd[pos] =~ '[a-zA-Z0-9_.)\]]'
+    if cmd[pos] == ')'
+      let pos = s:SearchPairBackward(cmd, pos, '(', ')')
+    elseif cmd[pos] == ']'
+      let pos = s:SearchPairBackward(cmd, pos, '[', ']')
+    endif
+    let pos -= 1
+  endwhile
+
+  " try looking back for "new"
+  let idx = match(strpart(cmd, 0, pos+1), '\<new[ \t\r\n]*$')
+
+  return strpart(cmd, idx != -1 ? idx : pos+1)
+endfu
+
+fu! s:ParseExpr(expr)
+  let items = []
+  let s = 0
+  " recognize ClassInstanceCreationExpr as a whole
+  let e = matchend(a:expr, '^\s*new\s\+' . s:RE_QUALID . '\s*[([]')-1
+  if e < 0
+    let e = match(a:expr, '[.([]')
+  endif
+  let isparen = 0
+  while e >= 0
+    if a:expr[e] == '.'
+      let subexpr = strpart(a:expr, s, e-s)
+      call extend(items, isparen ? s:ProcessParentheses(subexpr) : [subexpr])
+      let isparen = 0
+      let s = e + 1
+    elseif a:expr[e] == '('
+      let e = s:GetMatchedIndexEx(a:expr, e, '(', ')')
+      let isparen = 1
+      if e < 0
+	break
+      else
+	let e = matchend(a:expr, '^\s*[.[]', e+1)-1
+	continue
+      endif
+    elseif a:expr[e] == '['
+      let e = s:GetMatchedIndexEx(a:expr, e, '[', ']')
+      if e < 0
+	break
+      else
+	let e = matchend(a:expr, '^\s*[.[]', e+1)-1
+	continue
+      endif
+    endif
+    let e = match(a:expr, '[.([]', s)
+  endwhile
+  let tail = strpart(a:expr, s)
+  if tail !~ '^\s*$'
+    call extend(items, isparen ? s:ProcessParentheses(tail) : [tail])
+  endif
+
+  return items
+endfu
+
+" Given optional argument, call s:ParseExpr() to parser the nonparentheses expr
+fu! s:ProcessParentheses(expr, ...)
+  let s = matchend(a:expr, '^\s*(')
+  if s != -1
+    let e = s:GetMatchedIndexEx(a:expr, s-1, '(', ')')
+    if e >= 0
+      let tail = strpart(a:expr, e+1)
+      if tail =~ '^\s*[\=$'
+	return s:ProcessParentheses(strpart(a:expr, s, e-s), 1)
+      elseif tail =~ '^\s*\w'
+	return [strpart(a:expr, 0, e+1) . 'obj.']
+      endif
+    endif
+
+  " multi-dot-expr except for new expr
+  elseif a:0 > 0 && stridx(a:expr, '.') != match(a:expr, '\.\s*$') && a:expr !~ '^\s*new\s\+'
+    return s:ParseExpr(a:expr)
+  endif
+  return [a:expr]
+endfu
+
+" return {'expr': , 'method': , 'params': }
+fu! s:GetMethodInvocationExpr(expr)
+  let idx = strlen(a:expr)-1 
+  while idx >= 0
+    if a:expr[idx] == '('
+      break
+    elseif a:expr[idx] == ')'
+      let idx = s:SearchPairBackward(a:expr, idx, '(', ')')
+    elseif a:expr[idx] == ']'
+      let idx = s:SearchPairBackward(a:expr, idx, '[', ']')
+    endif
+    let idx -= 1
+  endwhile
+
+  let mi = {'expr': strpart(a:expr, 0, idx+1), 'method': '', 'params': strpart(a:expr, idx+1)}
+  let idx = match(mi.expr, '\<new\s\+' . s:RE_QUALID . '\s*(\s*$')
+  if idx >= 0
+    let mi.method = '+'
+    let mi.expr = substitute(matchstr(strpart(mi.expr, idx+4), s:RE_QUALID), '\s', '', 'g')
+  else
+    let idx = match(mi.expr, '\<' . s:RE_IDENTIFIER . '\s*(\s*$')
+    if idx >= 0
+      let subs = s:SplitAt(mi.expr, idx-1)
+      let mi.method = substitute(subs[1], '\s*(\s*$', '', '')
+      let mi.expr = s:ExtractCleanExpr(subs[0])
+    endif
+  endif
+  return mi
+endfu
+
+" imports							{{{1
+function! s:GenerateImports()
+  let imports = []
+
+  let lnum_old = line('.')
+  let col_old = col('.')
+  call cursor(1, 1)
+
+  if &ft == 'jsp'
+    while 1
+      let lnum = search('\<import\s*=[''"]', 'W')
+      if (lnum == 0)
+	break
+      endif
+
+      let str = getline(lnum)
+      if str =~ '<%\s*@\s*page\>' || str =~ '<jsp:\s*directive.page\>'
+	let str = substitute(str, '.*import=[''"]\([a-zA-Z0-9_$.*, \t]\+\)[''"].*', '\1', '')
+	for item in split(str, ',')
+	  call add(imports, substitute(item, '\s', '', 'g'))
+	endfor
+      endif
+    endwhile
+  else
+    while 1
+      let lnum = search('\<import\>', 'W')
+      if (lnum == 0)
+	break
+      elseif !s:InComment(line("."), col(".")-1)
+	normal w
+	" TODO: search semicolon or import keyword, excluding comment
+	let stat = matchstr(getline(lnum)[col('.')-1:], '\(static\s\+\)\?\(' .s:RE_QUALID. '\%(\s*\.\s*\*\)\?\)\s*;')
+	if !empty(stat)
+	  call add(imports, stat[:-2])
+	endif
+      endif
+    endwhile
+  endif
+
+  call cursor(lnum_old, col_old)
+  return imports
+endfunction
+
+fu! s:GetImports(kind, ...)
+  let filekey = a:0 > 0 && !empty(a:1) ? a:1 : s:GetCurrentFileKey()
+  let props = get(s:files, filekey, {})
+  if !has_key(props, a:kind)
+    let props['imports']	= filekey == s:GetCurrentFileKey() ? s:GenerateImports() : props.unit.imports
+    let props['imports_static']	= []
+    let props['imports_fqn']	= []
+    let props['imports_star']	= ['java.lang.']
+    if &ft == 'jsp' || filekey =~ '\.jsp$'
+      let props.imports_star += ['javax.servlet.', 'javax.servlet.http.', 'javax.servlet.jsp.']
+    endif
+
+    for import in props.imports
+      let subs = split(substitute(import, '^\s*\(static\s\+\)\?\(' .s:RE_QUALID. '\%(\s*\.\s*\*\)\?\)\s*$', '\1;\2', ''), ';', 1)
+      let qid = substitute(subs[1] , '\s', '', 'g')
+      if !empty(subs[0])
+	call add(props.imports_static, qid)
+      elseif qid[-1:] == '*'
+	call add(props.imports_star, qid[:-2])
+      else
+	call add(props.imports_fqn, qid)
+      endif
+    endfor
+    let s:files[filekey] = props
+  endif
+  return get(props, a:kind, [])
+endfu
+
+" search for name in 
+" return the fqn matched
+fu! s:SearchSingleTypeImport(name, fqns)
+  let matches = s:filter(a:fqns, 'item =~# ''\<' . a:name . '$''')
+  if len(matches) == 1
+    return matches[0]
+  elseif !empty(matches)
+    echoerr 'Name "' . a:name . '" conflicts between ' . join(matches, ' and ')
+    return matches[0]
+  endif
+  return ''
+endfu
+
+" search for name in static imports, return list of members with the same name
+" return [types, methods, fields]
+fu! s:SearchStaticImports(name, fullmatch)
+  let result = [[], [], []]
+  let candidates = []		" list of the canonical name
+  for item in s:GetImports('imports_static')
+    if item[-1:] == '*'		" static import on demand
+      call add(candidates, item[:-3])
+    elseif item[strridx(item, '.')+1:] ==# a:name
+	\ || (!a:fullmatch && item[strridx(item, '.')+1:] =~ '^' . a:name)
+      call add(candidates, item[:strridx(item, '.')])
+    endif
+  endfor
+  if empty(candidates)
+    return result
+  endif
+
+
+  " read type info which are not in cache
+  let commalist = ''
+  for typename in candidates
+    if !has_key(s:cache, typename)
+      let commalist .= typename . ','
+    endif
+  endfor
+  if commalist != ''
+    let res = s:RunReflection('-E', commalist, 's:SearchStaticImports in Batch')
+    if res =~ "^{'"
+      let dict = eval(res)
+      for key in keys(dict)
+	let s:cache[key] = s:Sort(dict[key])
+      endfor
+    endif
+  endif
+
+  " search in all candidates
+  for typename in candidates
+    let ti = get(s:cache, typename, 0)
+    if type(ti) == type({}) && get(ti, 'tag', '') == 'CLASSDEF'
+      let members = s:SearchMember(ti, a:name, a:fullmatch, 12, 1, 0)
+      let result[1] += members[1]
+      let result[2] += members[2]
+      "let pattern = 'item.n ' . (a:fullmatch ? '==# ''' : '=~# ''^') . a:name . ''' && s:IsStatic(item.m)'
+      "let result[1] += s:filter(get(ti, 'methods', []), pattern)
+      "let result[2]  += s:filter(get(ti, 'fields', []),  pattern)
+    else
+      " TODO: mark the wrong import declaration.
+    endif
+  endfor
+  return result
+endfu
+
+
+" search decl							{{{1
+" Return: The declaration of identifier under the cursor
+" Note: The type of a variable must be imported or a fqn.
+function! s:GetVariableDeclaration()
+  let lnum_old = line('.')
+  let col_old = col('.')
+
+  silent call search('[^a-zA-Z0-9$_.,?<>[\] \t\r\n]', 'bW')	" call search('[{};(,]', 'b')
+  normal w
+  let lnum = line('.')
+  let col = col('.')
+  if (lnum == lnum_old && col == col_old)
+    return ''
+  endif
+
+"  silent call search('[;){]')
+"  let lnum_end = line('.')
+"  let col_end  = col('.')
+"  let declaration = ''
+"  while (lnum <= lnum_end)
+"    let declaration = declaration . getline(lnum)
+"    let lnum = lnum + 1
+"  endwhile
+"  let declaration = strpart(declaration, col-1)
+"  let declaration = substitute(declaration, '\.[ \t]\+', '.', 'g')
+
+  silent call cursor(lnum_old, col_old)
+  return s:MergeLines(lnum, col, lnum_old, col_old)
+endfunction
+
+function! s:FoundClassDeclaration(type)
+  let lnum_old = line('.')
+  let col_old = col('.')
+  call cursor(1, 1)
+  while 1
+    let lnum = search('\<\C\(class\|interface\|enum\)[ \t\n\r]\+' . a:type . '[< \t\n\r]', 'W')
+    if lnum == 0 || !s:InCommentOrLiteral(line('.'), col('.'))
+      break
+    endif
+  endwhile
+
+  " search mainly for the cases: " class /* block comment */ Ident"
+  "				 " class // comment \n Ident "
+  if lnum == 0
+    let found = 0
+    while !found
+      let lnum = search('\<\C\(class\|interface\|enum\)[ \t\n\r]\+', 'W')
+      if lnum == 0
+	break
+      elseif s:InCommentOrLiteral(line('.'), col('.'))
+	continue
+      else
+	normal w
+	" skip empty line
+	while getline(line('.'))[col('.')-1] == ''
+	  normal w
+	endwhile
+	let lnum = line('.')
+	let col = col('.')
+	while 1
+	  if match(getline(lnum)[col-1:], '^[ \t\n\r]*' . a:type . '[< \t\n\r]') >= 0
+	    let found = 1
+	  " meets comment
+	  elseif match(getline(lnum)[col-1:], '^[ \t\n\r]*\(//\|/\*\)') >= 0
+	    if getline(lnum)[col-1:col] == '//'
+	      normal $eb
+	    else
+	      let lnum = search('\*\/', 'W')
+	      if lnum == 0
+		break
+	      endif
+	      normal web
+	    endif
+	    let lnum = line('.')
+	    let col = col('.')
+	    continue
+	  endif
+	  break
+	endwhile
+      endif
+    endwhile
+  endif
+
+  silent call cursor(lnum_old, col_old)
+  return lnum
+endfu
+
+fu! s:FoundClassLocally(type)
+  " current path
+  if globpath(expand('%:p:h'), a:type . '.java') != ''
+    return 1
+  endif
+
+  " 
+  let srcpath = javacomplete#GetSourcePath(1)
+  let file = globpath(srcpath, substitute(fqn, '\.', '/', 'g') . '.java')
+  if file != ''
+    return 1
+  endif
+
+  return 0
+endfu
+
+" regexp samples:
+" echo search('\(\(public\|protected|private\)[ \t\n\r]\+\)\?\(\(static\)[ \t\n\r]\+\)\?\(\<class\>\|\<interface\>\)[ \t\n\r]\+HelloWorld[^a-zA-Z0-9_$]', 'W')
+" echo substitute(getline('.'), '.*\(\(public\|protected\|private\)[ \t\n\r]\+\)\?\(\(static\)[ \t\n\r]\+\)\?\(\<class\>\|\<interface\>\)\s\+\([a-zA-Z0-9_]\+\)\s\+\(\(implements\|extends\)\s\+\([^{]\+\)\)\?\s*{.*', '["\1", "\2", "\3", "\4", "\5", "\6", "\8", "\9"]', '')
+" code sample: 
+function! s:GetClassDeclarationOf(type)
+  call cursor(1, 1)
+  let decl = []
+
+  let lnum = search('\(\<class\>\|\<interface\>\)[ \t\n\r]\+' . a:type . '[^a-zA-Z0-9_$]', 'W')
+  if (lnum != 0)
+    " TODO: search back for optional 'public | private' and 'static'
+    " join lines till to '{'
+    let lnum_end = search('{')
+    if (lnum_end != 0)
+      let str = ''
+      while (lnum <= lnum_end)
+	let str = str . getline(lnum)
+	let lnum = lnum + 1
+      endwhile
+
+      exe "let decl = " . substitute(str, '.*\(\<class\>\|\<interface\>\)\s\+\([a-zA-Z0-9_]\+\)\s\+\(\(implements\|extends\)\s\+\([^{]\+\)\)\?\s*{.*', '["\1", "\2", "\4", "\5"]', '')
+    endif
+  endif
+
+  return decl
+endfunction
+
+" return list
+"    0	class | interface
+"    1	name
+"   [2	implements | extends ]
+"   [3	parent list ]
+function! s:GetThisClassDeclaration()
+  let lnum_old = line('.')
+  let col_old = col('.')
+
+  while (1)
+    call search('\(\<class\C\>\|\<interface\C\>\|\<enum\C\>\)[ \t\r\n]\+', 'bW')
+    if !s:InComment(line("."), col(".")-1)
+      if getline('.')[col('.')-2] !~ '\S'
+	break
+      endif
+    end
+  endwhile
+
+  " join lines till to '{'
+  let str = ''
+  let lnum = line('.')
+  call search('{')
+  let lnum_end = line('.')
+  while (lnum <= lnum_end)
+    let str = str . getline(lnum)
+    let lnum = lnum + 1
+  endwhile
+
+  
+  let declaration = substitute(str, '.*\(\<class\>\|\<interface\>\)\s\+\([a-zA-Z0-9_]\+\)\(\s\+\(implements\|extends\)\s\+\([^{]\+\)\)\?\s*{.*', '["\1", "\2", "\4", "\5"]', '')
+  call cursor(lnum_old, col_old)
+  if declaration !~ '^['
+    echoerr 'Some error occurs when recognizing this class:' . declaration
+    return ['', '']
+  endif
+  exe "let list = " . declaration
+  return list
+endfunction
+
+" searches for name of a var or a field and determines the meaning  {{{1
+
+" The standard search order of a variable or field is as follows:
+" 1. Local variables declared in the code block, for loop, or catch clause
+"    from current scope up to the most outer block, a method or an initialization block
+" 2. Parameters if the code is in a method or ctor
+" 3. Fields of the type
+" 4. Accessible inherited fields.
+" 5. If the type is a nested type,
+"    local variables of the enclosing block or fields of the enclosing class.
+"    Note that if the type is a static nested type, only static members of an enclosing block or class are searched
+"    Reapply this rule to the upper block and class enclosing the enclosing type recursively
+" 6. Accessible static fields imported.
+"    It is allowed that several fields with the same name.
+
+" The standard search order of a method is as follows:
+" 1. Methods of the type
+" 2. Accessible inherited methods.
+" 3. Methods of the enclosing class if the type is a nested type.
+" 4. Accessible static methods imported.
+"    It is allowed that several methods with the same name and signature.
+
+" first		return at once if found one.
+" fullmatch	1 - equal, 0 - match beginning
+" return [types, methods, fields, vars]
+fu! s:SearchForName(name, first, fullmatch)
+  let result = [[], [], [], []]
+  if s:IsKeyword(a:name)
+    return result
+  endif
+
+  " use java_parser.vim
+  if javacomplete#GetSearchdeclMethod() == 4
+    " declared in current file
+    let unit = javacomplete#parse()
+    let targetPos = java_parser#MakePos(line('.')-1, col('.')-1)
+    let trees = s:SearchNameInAST(unit, a:name, targetPos, a:fullmatch)
+    for tree in trees
+      if tree.tag == 'VARDEF'
+	call add(result[2], tree)
+      elseif tree.tag == 'METHODDEF'
+	call add(result[1], tree)
+      elseif tree.tag == 'CLASSDEF'
+	call add(result[0], tree.name)
+      endif
+    endfor
+
+    if a:first && result != [[], [], [], []]	| return result | endif
+
+    " Accessible inherited members
+    let type = get(s:SearchTypeAt(unit, targetPos), -1, {})
+    if !empty(type)
+      let members = s:SearchMember(type, a:name, a:fullmatch, 2, 1, 0, 1)
+      let result[0] += members[0]
+      let result[1] += members[1]
+      let result[2] += members[2]
+"      "let ti = s:AddInheritedClassInfo({}, type)
+"      if !empty(ti)
+"	let comparator = a:fullmatch ? "=~# '^" : "==# '"
+"	let result[0] += s:filter(get(ti, 'classes', []), 'item   ' . comparator . a:name . "'")
+"	let result[1] += s:filter(get(ti, 'methods', []), 'item.n ' . comparator . a:name . "'")
+"	let result[2] += s:filter(get(ti, 'fields', []),  'item.n ' . comparator . a:name . "'")
+"	if a:0 > 0
+"	  let result[1] += s:filter(get(ti, 'declared_methods', []), 'item.n ' . comparator . a:name . "'")
+"	  let result[2] += s:filter(get(ti, 'declared_fields', []),  'item.n ' . comparator . a:name . "'")
+"	endif
+"	if a:first && result != [[], [], [], []]	| return result | endif
+"      endif
+    endif
+
+    " static import
+    let si = s:SearchStaticImports(a:name, a:fullmatch)
+    let result[1] += si[1]
+    let result[2] += si[2]
+  endif
+  return result
+endfu
+
+" TODO: how to determine overloaded functions
+fu! s:DetermineMethod(methods, parameters)
+  return get(a:methods, 0, {})
+endfu
+
+" Parser.GetType() in insenvim
+function! s:GetDeclaredClassName(var)
+  let var = s:Trim(a:var)
+  call s:Trace('GetDeclaredClassName for "' . var . '"')
+  if var =~# '^\(this\|super\)$'
+    return var
+  endif
+
+
+  " Special handling for builtin objects in JSP
+  if &ft == 'jsp'
+    if get(s:JSP_BUILTIN_OBJECTS, a:var, '') != ''
+      return s:JSP_BUILTIN_OBJECTS[a:var]
+    endif
+  endif
+
+  " use java_parser.vim
+  if javacomplete#GetSearchdeclMethod() == 4
+    let variable = get(s:SearchForName(var, 1, 1)[2], -1, {})
+    return get(variable, 'tag', '') == 'VARDEF' ? java_parser#type2Str(variable.vartype) : get(variable, 't', '')
+  endif
+
+
+  let ic = &ignorecase
+  setlocal noignorecase
+
+  let searched = javacomplete#GetSearchdeclMethod() == 2 ? s:Searchdecl(var, 1, 0) : searchdecl(var, 1, 0)
+  if (searched == 0)
+    " code sample:
+    " String tmp; java.
+    " 	lang.  String str, value;
+    " for (int i = 0, j = 0; i < 10; i++) {
+    "   j = 0;
+    " }
+    let declaration = s:GetVariableDeclaration()
+    " Assume it a class member, and remove modifiers
+    let class = substitute(declaration, '^\(public\s\+\|protected\s\+\|private\s\+\|abstract\s\+\|static\s\+\|final\s\+\|native\s\+\)*', '', '')
+    let class = substitute(class, '\s*\([a-zA-Z0-9_.]\+\)\(\[\]\)\?\s\+.*', '\1\2', '')
+    let class = substitute(class, '\([a-zA-Z0-9_.]\)<.*', '\1', '')
+    call s:Info('class: "' . class . '" declaration: "' . declaration . '" for ' . a:var)
+    let &ignorecase = ic
+    if class != '' && class !=# a:var && class !=# 'import' && class !=# 'class'
+      return class
+    endif
+  endif
+
+  let &ignorecase = ic
+  call s:Trace('GetDeclaredClassName: cannot find')
+  return ''
+endfunction
+
+" using java_parser.vim					{{{1
+" javacomplete#parse()					{{{2
+fu! javacomplete#parse(...)
+  let filename = a:0 == 0 ? '%' : a:1
+
+  let changed = 0
+  if filename == '%'
+    let filename = s:GetCurrentFileKey()
+    let props = get(s:files, filename, {})
+    if get(props, 'changedtick', -1) != b:changedtick
+      let changed = 1
+      let props.changedtick = b:changedtick
+      let lines = getline('^', '$')
+    endif
+  else
+    let props = get(s:files, filename, {})
+    if get(props, 'modifiedtime', 0) != getftime(filename)
+      let changed = 1
+      let props.modifiedtime = getftime(filename)
+      let lines = readfile(filename)
+    endif
+  endif
+
+  if changed
+    call java_parser#InitParser(lines)
+    call java_parser#SetLogLevel(5)
+    let props.unit = java_parser#compilationUnit()
+
+    let package = has_key(props.unit, 'package') ? props.unit.package . '.' : ''
+    call s:UpdateFQN(props.unit, package)
+  endif
+  let s:files[filename] = props
+  return props.unit
+endfu
+
+" update fqn for toplevel types or nested types. 
+" not for local type or anonymous type
+fu! s:UpdateFQN(tree, qn)
+  if a:tree.tag == 'TOPLEVEL'
+    for def in a:tree.types
+      call s:UpdateFQN(def, a:qn)
+    endfor
+  elseif a:tree.tag == 'CLASSDEF'
+    let a:tree.fqn = a:qn . a:tree.name
+    for def in a:tree.defs
+      if def.tag == 'CLASSDEF'
+	call s:UpdateFQN(def, a:tree.fqn . '.')
+      endif
+    endfor
+  endif
+endfu
+
+" TreeVisitor						{{{2
+fu! s:visitTree(tree, param) dict
+  if type(a:tree) == type({})
+    exe get(self, get(a:tree, 'tag', ''), '')
+  elseif type(a:tree) == type([])
+    for tree in a:tree
+      call self.visit(tree, a:param)
+    endfor
+  endif
+endfu
+
+let s:TreeVisitor = {'visit': function('s:visitTree'),
+	\ 'TOPLEVEL'	: 'call self.visit(a:tree.types, a:param)',
+	\ 'BLOCK'	: 'let stats = a:tree.stats | if stats == [] | call java_parser#GotoPosition(a:tree.pos) | let stats = java_parser#block().stats | endif | call self.visit(stats, a:param)',
+	\ 'DOLOOP'	: 'call self.visit(a:tree.body, a:param) | call self.visit(a:tree.cond, a:param)',
+	\ 'WHILELOOP'	: 'call self.visit(a:tree.cond, a:param) | call self.visit(a:tree.body, a:param)',
+	\ 'FORLOOP'	: 'call self.visit(a:tree.init, a:param) | call self.visit(a:tree.cond, a:param) | call self.visit(a:tree.step, a:param) | call self.visit(a:tree.body, a:param)',
+	\ 'FOREACHLOOP'	: 'call self.visit(a:tree.var, a:param)  | call self.visit(a:tree.expr, a:param) | call self.visit(a:tree.body, a:param)',
+	\ 'LABELLED'	: 'call self.visit(a:tree.body, a:param)',
+	\ 'SWITCH'	: 'call self.visit(a:tree.selector, a:param) | call self.visit(a:tree.cases, a:param)',
+	\ 'CASE'	: 'call self.visit(a:tree.pat,  a:param) | call self.visit(a:tree.stats, a:param)',
+	\ 'SYNCHRONIZED': 'call self.visit(a:tree.lock, a:param) | call self.visit(a:tree.body, a:param)',
+	\ 'TRY'		: 'call self.visit(a:tree.body, a:param) | call self.visit(a:tree.catchers, a:param) | call self.visit(a:tree.finalizer, a:param) ',
+	\ 'CATCH'	: 'call self.visit(a:tree.param,a:param) | call self.visit(a:tree.body, a:param)',
+	\ 'CONDEXPR'	: 'call self.visit(a:tree.cond, a:param) | call self.visit(a:tree.truepart, a:param) | call self.visit(a:tree.falsepart, a:param)',
+	\ 'IF'		: 'call self.visit(a:tree.cond, a:param) | call self.visit(a:tree.thenpart, a:param) | if has_key(a:tree, "elsepart") | call self.visit(a:tree.elsepart, a:param) | endif',
+	\ 'EXEC'	: 'call self.visit(a:tree.expr, a:param)',
+	\ 'APPLY'	: 'call self.visit(a:tree.meth, a:param) | call self.visit(a:tree.args, a:param)',
+	\ 'NEWCLASS'	: 'call self.visit(a:tree.def, a:param)'
+	\}
+
+let s:TV_CMP_POS = 'a:tree.pos <= a:param.pos && a:param.pos <= get(a:tree, "endpos", -1)'
+let s:TV_CMP_POS_BODY = 'has_key(a:tree, "body") && a:tree.body.pos <= a:param.pos && a:param.pos <= get(a:tree.body, "endpos", -1)'
+
+" Return a stack of enclosing types (including local or anonymous classes).
+" Given the optional argument, return all (toplevel or static member) types besides enclosing types.
+fu! s:SearchTypeAt(tree, targetPos, ...)
+  let s:TreeVisitor.CLASSDEF	= 'if a:param.allNonLocal || ' . s:TV_CMP_POS . ' | call add(a:param.result, a:tree) | call self.visit(a:tree.defs, a:param) | endif'
+  let s:TreeVisitor.METHODDEF	= 'if ' . s:TV_CMP_POS_BODY . ' | call self.visit(a:tree.body, a:param) | endif'
+  let s:TreeVisitor.VARDEF	= 'if has_key(a:tree, "init") && !a:param.allNonLocal && ' . s:TV_CMP_POS . ' | call self.visit(a:tree.init, a:param) | endif'
+
+  let result = []
+  call s:TreeVisitor.visit(a:tree, {'result': result, 'pos': a:targetPos, 'allNonLocal': a:0 == 0 ? 0 : 1})
+  return result
+endfu
+
+" a:1		match beginning
+" return	a stack of matching name
+fu! s:SearchNameInAST(tree, name, targetPos, fullmatch)
+  let comparator = a:fullmatch ? '==#' : '=~# "^" .'
+  let cmd = 'if a:tree.name ' .comparator. ' a:param.name | call add(a:param.result, a:tree) | endif'
+  let s:TreeVisitor.CLASSDEF	= 'if ' . s:TV_CMP_POS . ' | ' . cmd . ' | call self.visit(a:tree.defs, a:param) | endif'
+  let s:TreeVisitor.METHODDEF	= cmd . ' | if ' . s:TV_CMP_POS_BODY . ' | call self.visit(a:tree.params, a:param) | call self.visit(a:tree.body, a:param) | endif'
+  let s:TreeVisitor.VARDEF	= cmd . ' | if has_key(a:tree, "init") && ' . s:TV_CMP_POS . ' | call self.visit(a:tree.init, a:param) | endif'
+
+  let result = []
+  call s:TreeVisitor.visit(a:tree, {'result': result, 'pos': a:targetPos, 'name': a:name})
+  "call s:Info(a:name . ' ' . string(result) . ' line: ' . line('.') . ' col: ' . col('.')) . ' ' . a:targetPos
+  return result
+endfu
+
+
+" javacomplete#Searchdecl				{{{2
+" TODO:
+fu! javacomplete#Searchdecl()
+  let var  = expand('<cword>')
+
+  let line = line('.')-1
+  let col  = col('.')-1
+
+
+  if var =~# '^\(this\|super\)$'
+    if &ft == 'jsp'
+      return ''
+    endif
+
+    let matchs = s:SearchTypeAt(javacomplete#parse(), java_parser#MakePos(line, col))
+
+    let stat = s:GetStatement()
+    for t in matchs
+      if stat =~ t.name
+	let coor = java_parser#DecodePos(t.pos)
+	return var . '(' . (coor.line+1) . ',' . (coor.col) . ') ' . getline(coor.line+1)
+      endif
+    endfor
+    if len(matchs) > 0
+      let coor = java_parser#DecodePos(matchs[len(matchs)-1].pos)
+      return var . '(' . (coor.line+1) . ',' . (coor.col) . ') ' . getline(coor.line+1)
+    endif
+    return ''
+  endif
+
+  " Type.this.
+  " new Type()
+  " new Type(param1, param2)
+  " this.field
+  " super.field
+
+  let s:log = []
+
+
+  " It may be an imported class.
+  let imports = []
+  for fqn in s:GetImports('imports_fqn')
+    if fqn =~# '\<' . var . '\>$'
+      call add(imports, fqn)
+    endif
+  endfor
+  if len(imports) > 1
+    echoerr 'Imports conflicts between ' . join(imports, ' and ')
+  endif
+
+
+  " Search in this buffer
+  let matchs = s:SearchNameInAST(javacomplete#parse(), var, java_parser#MakePos(line, col), 1)
+
+
+  let hint = var . ' '
+  if !empty(matchs)
+    let tree = matchs[len(matchs)-1]
+    let coor = java_parser#DecodePos(tree.pos)
+    let hint .=  '(' . (coor.line+1) . ',' . (coor.col) . ') '
+    let hint .= getline(coor.line+1)		"string(tree)
+  else
+    for fqn in imports
+      let ci = s:DoGetClassInfo(fqn)
+      if !empty(ci)
+	let hint .= ' ' . fqn
+      endif
+      " TODO: get javadoc
+    endfor
+
+  endif
+  return hint
+endfu
+
+
+" java							{{{1
+
+fu! s:IsBuiltinType(name)
+  return index(s:PRIMITIVE_TYPES, a:name) >= 0
+endfu
+
+fu! s:IsKeyword(name)
+  return index(s:KEYWORDS, a:name) >= 0
+endfu
+
+fu! s:HasKeyword(name)
+  return a:name =~# s:RE_KEYWORDS
+endfu
+
+fu! s:TailOfQN(qn)
+  return a:qn[strridx(a:qn, '.')+1:]
+endfu
+
+" options								{{{1
+" Methods to search declaration						{{{2
+"	1 - by builtin searchdecl()
+"	2 - by special Searchdecl()
+"	4 - by java_parser
+fu! javacomplete#GetSearchdeclMethod()
+  if &ft == 'jsp'
+    return 1
+  endif
+  return exists('s:searchdecl') ? s:searchdecl : 4
+endfu
+
+fu! javacomplete#SetSearchdeclMethod(method)
+  let s:searchdecl = a:method
+endfu
+
+" JDK1.1								{{{2
+fu! javacomplete#UseJDK11()
+  let s:isjdk11 = 1
+endfu
+
+" java compiler								{{{2
+fu! javacomplete#GetCompiler()
+  return exists('s:compiler') && s:compiler !~  '^\s*$' ? s:compiler : 'javac'
+endfu
+
+fu! javacomplete#SetCompiler(compiler)
+  let s:compiler = a:compiler
+endfu
+
+" jvm launcher								{{{2
+fu! javacomplete#GetJVMLauncher()
+  return exists('s:interpreter') && s:interpreter !~  '^\s*$' ? s:interpreter : 'java'
+endfu
+
+fu! javacomplete#SetJVMLauncher(interpreter)
+  if javacomplete#GetJVMLauncher() != a:interpreter
+    let s:cache = {}
+  endif
+  let s:interpreter = a:interpreter
+endfu
+
+" sourcepath								{{{2
+fu! javacomplete#AddSourcePath(s)
+  if !isdirectory(a:s)
+    echoerr 'invalid source path: ' . a:s
+    return
+  endif
+  let path = fnamemodify(a:s, ':p:h')
+  if !exists('s:sourcepath')
+    let s:sourcepath = [path]
+  elseif index(s:sourcepath, path) == -1
+    call add(s:sourcepath, path)
+  endif
+endfu
+
+fu! javacomplete#DelSourcePath(s)
+  if !exists('s:sourcepath') || !isdirectory(a:s)| return   | endif
+  let idx = index(s:sourcepath, a:s)
+  if idx != -1
+    call remove(s:sourcepath, idx)
+  endif
+endfu
+
+fu! javacomplete#SetSourcePath(s)
+  let paths = type(a:s) == type([]) ? a:s : split(a:s, javacomplete#GetClassPathSep())
+  let s:sourcepath = []
+  for path in paths
+    if isdirectory(path)
+      call add(s:sourcepath, fnamemodify(path, ':p:h'))
+    endif
+  endfor
+endfu
+
+" return the sourcepath. Given argument, add current path or default package root path
+" NOTE: Avoid path duplicate, otherwise globpath() will return duplicate result.
+fu! javacomplete#GetSourcePath(...)
+  return join(s:GetSourceDirs(a:0 > 0 && a:1 ? expand('%:p') : ''), s:PATH_SEP)
+endfu
+
+fu! s:GetSourceDirs(filepath, ...)
+  let dirs = exists('s:sourcepath') ? s:sourcepath : []
+
+  if !empty(a:filepath)
+    let filepath = fnamemodify(a:filepath, ':p:h')
+
+    " get source path according to file path and package name
+    let packageName = a:0 > 0 ? a:1 : s:GetPackageName()
+    if packageName != ''
+      let path = fnamemodify(substitute(filepath, packageName, '', 'g'), ':p:h')
+      if index(dirs, path) < 0
+	call add(dirs, path)
+      endif
+    endif
+
+    " Consider current path as a sourcepath
+    if index(dirs, filepath) < 0
+      call add(dirs, filepath)
+    endif
+  endif
+  return dirs
+endfu
+
+" classpath								{{{2
+fu! javacomplete#AddClassPath(s)
+  if !isdirectory(a:s)
+    echoerr 'invalid classpath: ' . a:s
+    return
+  endif
+
+  if !exists('s:classpath')
+    let s:classpath = [a:s]
+  elseif index(s:classpath, a:s) == -1
+    call add(s:classpath, a:s)
+  endif
+  let s:cache = {}
+endfu
+
+fu! javacomplete#DelClassPath(s)
+  if !exists('s:classpath') | return   | endif
+  let idx = index(s:classpath, a:s)
+  if idx != -1
+    call remove(s:classpath, idx)
+  endif
+endfu
+
+fu! javacomplete#SetClassPath(s)
+  if type(a:s) == type("")
+    let s:classpath = split(a:s, javacomplete#GetClassPathSep())
+  elseif type(a:s) == type([])
+    let s:classpath = a:s
+  endif
+  let s:cache = {}
+endfu
+
+fu! javacomplete#GetClassPathSep()
+  return s:PATH_SEP
+endfu
+
+fu! javacomplete#GetClassPath()
+  return exists('s:classpath') ? join(s:classpath, javacomplete#GetClassPathSep()) : ''
+endfu
+
+" s:GetClassPath()							{{{2
+fu! s:GetClassPath()
+  let path = s:GetJavaCompleteClassPath() . javacomplete#GetClassPathSep()
+
+  if &ft == 'jsp'
+    let path .= s:GetClassPathOfJsp()
+  endif
+
+  if exists('b:classpath') && b:classpath !~ '^\s*$'
+    return path . b:classpath
+  endif
+
+  if exists('s:classpath')
+    return path . javacomplete#GetClassPath()
+  endif
+
+  if exists('g:java_classpath') && g:java_classpath !~ '^\s*$'
+    return path . g:java_classpath
+  endif
+
+  return path . $CLASSPATH
+endfu
+
+fu! s:GetJavaCompleteClassPath()
+  " remove *.class from wildignore if it exists, so that globpath doesn't ignore Reflection.class
+  " vim versions >= 702 can add the 1 flag to globpath which ignores '*.class" in wildingore
+  let has_class = 0
+  if &wildignore =~# "*.class"
+    set wildignore-=*.class
+    let has_class = 1
+  endif
+
+  let classfile = globpath(&rtp, 'autoload/Reflection.class')
+  if classfile == ''
+    let classfile = globpath($HOME, 'Reflection.class')
+  endif
+  if classfile == ''
+    " try to find source file and compile to $HOME
+    let srcfile = globpath(&rtp, 'autoload/Reflection.java')
+    if srcfile != ''
+      exe '!' . javacomplete#GetCompiler() . ' -d "' . $HOME . '" "' . srcfile . '"'
+      let classfile = globpath($HOME, 'Reflection.class')
+      if classfile == ''
+        echo srcfile . ' can not be compiled. Please check it'
+      endif
+    else
+      echo 'No Reflection.class found in $HOME or any autoload directory of the &rtp. And no Reflection.java found in any autoload directory of the &rtp to compile.'
+    endif
+  endif
+
+  " add *.class to wildignore if it existed before
+  if has_class == 1
+    set wildignore+=*.class
+  endif
+
+  return fnamemodify(classfile, ':p:h')
+endfu
+
+fu! s:GetClassPathOfJsp()
+  if exists('b:classpath_jsp')
+    return b:classpath_jsp
+  endif
+
+  let b:classpath_jsp = ''
+  let path = expand('%:p:h')
+  while 1
+    if isdirectory(path . '/WEB-INF' )
+      if isdirectory(path . '/WEB-INF/classes')
+	let b:classpath_jsp .= s:PATH_SEP . path . '/WEB-INF/classes'
+      endif
+      if isdirectory(path . '/WEB-INF/lib')
+	let libs = globpath(path . '/WEB-INF/lib', '*.jar')
+	if libs != ''
+	  let b:classpath_jsp .= s:PATH_SEP . substitute(libs, "\n", s:PATH_SEP, 'g')
+	endif
+      endif
+      return b:classpath_jsp
+    endif
+
+    let prev = path
+    let path = fnamemodify(path, ":p:h:h")
+    if path == prev
+      break
+    endif
+  endwhile
+  return ''
+endfu
+
+" return only classpath which are directories
+fu! s:GetClassDirs()
+  let dirs = []
+  for path in split(s:GetClassPath(), s:PATH_SEP)
+    if isdirectory(path)
+      call add(dirs, fnamemodify(path, ':p:h'))
+    endif
+  endfor
+  return dirs
+endfu
+
+" s:GetPackageName()							{{{2
+fu! s:GetPackageName()
+  let lnum_old = line('.')
+  let col_old = col('.')
+
+  call cursor(1, 1)
+  let lnum = search('^\s*package[ \t\r\n]\+\([a-zA-Z][a-zA-Z0-9.]*\);', 'w')
+  let packageName = substitute(getline(lnum), '^\s*package\s\+\([a-zA-Z][a-zA-Z0-9.]*\);', '\1', '')
+
+  call cursor(lnum_old, col_old)
+  return packageName
+endfu
+
+fu! s:IsStatic(modifier)
+  return a:modifier[strlen(a:modifier)-4]
+endfu
+
+" utilities							{{{1
+" Convert a file name into the unique form.
+" Similar with fnamemodify(). NOTE that ':gs' should not be used.
+fu! s:fnamecanonize(fname, mods)
+  return fnamemodify(a:fname, a:mods . ':gs?[\\/]\+?/?')
+endfu
+
+" Similar with filter(), but returns a new list instead of operating in-place.
+" `item` has the value of the current item.
+fu! s:filter(expr, string)
+  if type(a:expr) == type([])
+    let result = []
+    for item in a:expr
+      if eval(a:string)
+	call add(result, item)
+      endif
+    endfor
+    return result
+  else
+    let result = {}
+    for item in items(a:expr)
+      if eval(a:string)
+	let result[item[0]] = item[1]
+      endif
+    endfor
+    return result
+  endif
+endfu
+
+fu! s:Index(list, expr, key)
+  let i = 0
+  while i < len(a:list)
+    if get(a:list[i], a:key, '') == a:expr
+      return i
+    endif
+    let i += 1
+  endwhile
+  return -1
+endfu
+
+fu! s:Match(list, expr, key)
+  let i = 0
+  while i < len(a:list)
+    if get(a:list[i], a:key, '') =~ a:expr
+      return i
+    endif
+    let i += 1
+  endwhile
+  return -1
+endfu
+
+fu! s:KeepCursor(cmd)
+  let lnum_old = line('.')
+  let col_old = col('.')
+  exe a:cmd
+  call cursor(lnum_old, col_old)
+endfu
+
+fu! s:InCommentOrLiteral(line, col)
+  if has("syntax") && &ft != 'jsp'
+    return synIDattr(synID(a:line, a:col, 1), "name") =~? '\(Comment\|String\|Character\)'
+  endif
+endfu
+
+function! s:InComment(line, col)
+  if has("syntax") && &ft != 'jsp'
+    return synIDattr(synID(a:line, a:col, 1), "name") =~? 'comment'
+  endif
+"  if getline(a:line) =~ '\s*\*'
+"    return 1
+"  endif
+"  let idx = strridx(getline(a:line), '//')
+"  if idx >= 0 && idx < a:col
+"    return 1
+"  endif
+"  return 0
+endfunction
+
+" set string literal empty, remove comments, trim begining or ending spaces
+" test case: ' 	sb. /* block comment*/ append( "stringliteral" ) // comment '
+function! s:Prune(str, ...)
+  if a:str =~ '^\s*$' | return '' | endif
+
+  let str = substitute(a:str, '"\(\\\(["\\''ntbrf]\)\|[^"]\)*"', '""', 'g')
+  let str = substitute(str, '\/\/.*', '', 'g')
+  let str = s:RemoveBlockComments(str)
+  return a:0 > 0 ? str : str . ' '
+endfunction
+
+" Given argument, replace block comments with spaces of same number
+fu! s:RemoveBlockComments(str, ...)
+  let result = a:str
+  let ib = match(result, '\/\*')
+  let ie = match(result, '\*\/')
+  while ib != -1 && ie != -1 && ib < ie
+    let result = strpart(result, 0, ib) . (a:0 == 0 ? ' ' : repeat(' ', ie-ib+2)) . result[ie+2: ]
+    let ib = match(result, '\/\*')
+    let ie = match(result, '\*\/')
+  endwhile
+  return result
+endfu
+
+fu! s:Trim(str)
+  let str = substitute(a:str, '^\s*', '', '')
+  return substitute(str, '\s*$', '', '')
+endfu
+
+fu! s:SplitAt(str, index)
+  return [strpart(a:str, 0, a:index+1), strpart(a:str, a:index+1)]
+endfu
+
+" TODO: search pair used in string, like 
+" 	'create(ao.fox("("), new String).foo().'
+function! s:GetMatchedIndexEx(str, idx, one, another)
+  let pos = a:idx
+  while 0 <= pos && pos < len(a:str)
+    let pos = match(a:str, '['. a:one . escape(a:another, ']') .']', pos+1)
+    if pos != -1
+      if a:str[pos] == a:one
+	let pos = s:GetMatchedIndexEx(a:str, pos, a:one, a:another)
+      elseif a:str[pos] == a:another
+	break
+      endif
+    endif
+  endwhile
+  return 0 <= pos && pos < len(a:str) ? pos : -3
+endfunction
+
+function! s:SearchPairBackward(str, idx, one, another)
+  let idx = a:idx
+  let n = 0
+  while idx >= 0
+    let idx -= 1
+    if a:str[idx] == a:one
+      if n == 0
+	break
+      endif
+      let n -= 1
+    elseif a:str[idx] == a:another  " nested 
+      let n += 1
+    endif
+  endwhile
+  return idx
+endfunction
+
+fu! s:CountDims(str)
+  if match(a:str, '[[\]]') == -1
+    return 0
+  endif
+
+  " int[] -> [I, String[] -> 
+  let dims = len(matchstr(a:str, '^[\+'))
+  if dims == 0
+    let idx = len(a:str)-1
+    while idx >= 0 && a:str[idx] == ']'
+      let dims += 1
+      let idx = s:SearchPairBackward(a:str, idx, '[', ']')-1
+    endwhile
+  endif
+  return dims
+endfu
+
+fu! s:GotoUpperBracket()
+  let searched = 0
+  while (!searched)
+    call search('[{}]', 'bW')
+    if getline('.')[col('.')-1] == '}'
+      normal %
+    else
+      let searched = 1
+    endif
+  endwhile
+endfu
+
+" Improve recognition of variable declaration using my version of searchdecl() for accuracy reason.
+" TODO:
+fu! s:Searchdecl(name, ...)
+  let global = a:0 > 0 ? a:1 : 0
+  let thisblock = a:0 > 1 ? a:2 : 1
+
+  call search('\<' . a:name . '\>', 'bW')
+  let lnum_old = line('.')
+  let col_old = col('.')
+
+  call s:GotoUpperBracket()
+  let lnum_bracket = line('.')
+  let col_bracket = col('.')
+  call search('\<' . a:name . '\>', 'W', lnum_old)
+  if line('.') != lnum_old || col('.') != col_old
+    return 0
+  endif
+
+  " search globally
+  if global
+    call cursor(lnum_bracket, col_bracket)
+    " search backward
+    while (1)
+      if search('\([{}]\|\<' . a:name . '\>\)', 'bW') == 0
+	break
+      endif
+      if s:InComment(line('.'), col('.')) "|| s:InStringLiteral()
+        continue
+      endif
+      let cword = expand('<cword>')
+      if cword == a:name
+	return 0
+      endif
+      if getline('.')[col('.')-1] == '}'
+	normal %
+      endif
+    endwhile
+
+    call cursor(lnum_old, col_old)
+    " search forward
+    call search('[{};]', 'W')
+    while (1)
+      if search('\([{}]\|\<' . a:name . '\>\)', 'W') == 0
+	break
+      endif
+      if s:InComment(line('.'), col('.')) "|| s:InStringLiteral()
+        continue
+      endif
+      let cword = expand('<cword>')
+      if cword == a:name
+	return 0
+      endif
+      if getline('.')[col('.')-1] == '{'
+	normal %
+      endif
+    endwhile
+  endif
+  return 1
+endfu
+"nmap <F8> :call <SID>Searchdecl(expand('<cword>'))<CR>
+
+fu! javacomplete#Exe(cmd)
+  exe a:cmd
+endfu
+
+" cache utilities							{{{1
+
+" key of s:files for current buffer. It may be the full path of current file or the bufnr of unnamed buffer, and is updated when BufEnter, BufLeave.
+fu! s:GetCurrentFileKey()
+  return has("autocmd") ? s:curfilekey : empty(expand('%')) ? bufnr('%') : expand('%:p')
+endfu
+
+fu! s:SetCurrentFileKey()
+  let s:curfilekey = empty(expand('%')) ? bufnr('%') : expand('%:p')
+endfu
+
+call s:SetCurrentFileKey()
+if has("autocmd")
+  autocmd BufEnter *.java call s:SetCurrentFileKey()
+  autocmd FileType java call s:SetCurrentFileKey()
+endif
+
+
+" Log utilities								{{{1
+fu! s:WatchVariant(variant)
+  "echoerr a:variant
+endfu
+
+" level
+" 	5	off/fatal 
+" 	4	error 
+" 	3	warn
+" 	2	info
+" 	1	debug
+" 	0	trace
+fu! javacomplete#SetLogLevel(level)
+  let s:loglevel = a:level
+endfu
+
+fu! javacomplete#GetLogLevel()
+  return exists('s:loglevel') ? s:loglevel : 3
+endfu
+
+fu! javacomplete#GetLogContent()
+  return s:log
+endfu
+
+fu! s:Trace(msg)
+  call s:Log(0, a:msg)
+endfu
+
+fu! s:Debug(msg)
+  call s:Log(1, a:msg)
+endfu
+
+fu! s:Info(msg)
+  call s:Log(2, a:msg)
+endfu
+
+fu! s:Log(level, key, ...)
+  if a:level >= javacomplete#GetLogLevel()
+    echo a:key
+    call add(s:log, a:key)
+  endif
+endfu
+
+fu! s:System(cmd, caller)
+  call s:WatchVariant(a:cmd)
+  let t = reltime()
+  let res = system(a:cmd)
+  call s:Debug(reltimestr(reltime(t)) . 's to exec "' . a:cmd . '" by ' . a:caller)
+  return res
+endfu
+
+" functions to get information						{{{1
+" utilities								{{{2
+fu! s:MemberCompare(m1, m2)
+  return a:m1['n'] == a:m2['n'] ? 0 : a:m1['n'] > a:m2['n'] ? 1 : -1
+endfu
+
+fu! s:Sort(ci)
+  let ci = a:ci
+  if has_key(ci, 'fields')
+    call sort(ci['fields'], 's:MemberCompare')
+  endif
+  if has_key(ci, 'methods')
+    call sort(ci['methods'], 's:MemberCompare')
+  endif
+  return ci
+endfu
+
+" Function to run Reflection						{{{2
+fu! s:RunReflection(option, args, log)
+  let classpath = ''
+  if !exists('s:isjdk11')
+    let classpath = ' -classpath "' . s:GetClassPath() . '" '
+  endif
+
+  let cmd = javacomplete#GetJVMLauncher() . classpath . ' Reflection ' . a:option . ' "' . a:args . '"'
+  return s:System(cmd, a:log)
+endfu
+" class information							{{{2
+
+
+" The standard search order of a FQN is as follows:
+" 1. a file-name toplevel type or static member type accessed by the file-name type declared in source files
+" 2. other types declared in source files
+" 3. an accessible loadable type.
+" parameters:
+"   fqns	- list of fqn
+"   srcpaths	- a comma-separated list of directory names.
+"   a:1		- search all.
+" return	a dict of fqn -> type info
+" precondition: 
+" NOTE: call expand() to convert path to standard form
+fu! s:DoGetTypeInfoForFQN(fqns, srcpath, ...)
+  if empty(a:fqns) || empty(a:srcpath)
+    return
+  endif
+
+  " 1
+  let files = {}	" fqn -> java file path
+  for fqn in a:fqns
+    " toplevel type
+    let filepath = globpath(a:srcpath, substitute(fqn, '\.', '/', 'g') . '.java')
+    if filepath != ''
+      let files[fqn] = expand(filepath)
+
+    " nested type
+    elseif stridx(fqn, '.') >= 0
+      let idents = split(fqn, '\.')
+      let i = len(idents)-2
+      while i >= 0
+	let filepath = globpath(a:srcpath, join(idents[:i], '/') . '.java')
+	if filepath != ''
+	  let files[fqn] = expand(filepath)
+	  break
+	endif
+	let i -= 1
+      endwhile
+    endif
+  endfor
+
+
+  " 2
+  let dirs = {}		" dir.idents	-> names of nested type
+			" dir.qfitems	-> items of quick fix
+			" dir.fqn	-> fqn
+  for fqn in a:fqns
+    if !has_key(files, fqn)
+      for path in split(a:srcpath, ',')
+	let idents = split(fqn, '\.')
+	let i = len(idents)-2
+	while i >= 0
+	  let dirpath = path . '/' . join(idents[:i], '/')
+	  " it is a package
+	  if isdirectory(dirpath)
+	    let dirs[fnamemodify(dirpath, ':p:h:gs?[\\/]\+?/?')] = {'fqn': fqn, 'idents': idents[i+1:]}
+	    break
+	  endif
+	  let i -= 1
+	endwhile
+      endfor
+    endif
+  endfor
+
+  if !empty(dirs)
+    let items = {}	" dir -> items of quick fix
+
+    let filepatterns = ''
+    for dirpath in keys(dirs)
+      let filepatterns .= escape(dirpath, ' \') . '/*.java '
+    endfor
+
+    let cwd = fnamemodify(expand('%:p:h'), ':p:h:gs?[\\/]\+?/?')
+    exe 'vimgrep /\s*' . s:RE_TYPE_DECL . '/jg ' . filepatterns
+    for item in getqflist()
+      if item.text !~ '^\s*\*\s\+'
+	let text = matchstr(s:Prune(item.text, -1), '\s*' . s:RE_TYPE_DECL)
+	if text != ''
+	  let subs = split(substitute(text, '\s*' . s:RE_TYPE_DECL, '\1;\2;\3', ''), ';', 1)
+	  let dirpath = fnamemodify(bufname(item.bufnr), ':p:h:gs?[\\/]\+?/?')
+	  let idents = dirs[dirpath].idents
+	  if index(idents, subs[2]) >= 0 && (subs[0] =~ '\C\<public\>' || dirpath == cwd)	" FIXME?
+	    let item.subs = subs
+	    let dirs[dirpath].qfitems = get(dirs[dirpath], 'qfitems', []) + [item]
+	  endif
+	endif
+      endif
+    endfor
+
+    for dirpath in keys(dirs)
+      " a. names of nested type must be existed in the same file
+      "	PackageName.NonFileNameTypeName.NestedType.NestedNestedType
+      let qfitems = get(dirs[dirpath], 'qfitems', [])
+      let nr = 0
+      for ident in dirs[dirpath].idents
+	for item in qfitems
+	  if item.subs[2] == ident
+	    let nr += 1
+	  endif
+	endfor
+      endfor
+      if nr == len(dirs[dirpath].idents)
+	" b. TODO: Check whether one enclosed another is correct
+	let files[fqn] = expand(bufname(qfitems[0].bufnr))
+      endif
+    endfor
+  endif
+
+
+  call s:Info('FQN1&2: ' . string(keys(files)))
+  for fqn in keys(files)
+    if !has_key(s:cache, fqn) || get(get(s:files, files[fqn], {}), 'modifiedtime', 0) != getftime(files[fqn])
+      let ti = s:GetClassInfoFromSource(fqn[strridx(fqn, '.')+1:], files[fqn])
+      if !empty(ti)
+	let s:cache[fqn] = s:Sort(ti)
+      endif
+    endif
+    if (a:0 == 0 || !a:1)
+      return
+    endif
+  endfor
+
+
+  " 3
+  let commalist = ''
+  for fqn in a:fqns
+    if has_key(s:cache, fqn) && (a:0 == 0 || !a:1)
+      return
+    else "if stridx(fqn, '.') >= 0
+      let commalist .= fqn . ','
+    endif
+  endfor
+  if !empty(commalist)
+    let res = s:RunReflection('-E', commalist, 'DoGetTypeInfoForFQN in Batch')
+    if res =~ "^{'"
+      let dict = eval(res)
+      for key in keys(dict)
+	if !has_key(s:cache, key)
+	  if type(dict[key]) == type({})
+	    let s:cache[key] = s:Sort(dict[key])
+	  elseif type(dict[key]) == type([])
+	    let s:cache[key] = sort(dict[key])
+	  endif
+	endif
+      endfor
+    endif
+  endif
+endfu
+
+" a:1	filepath
+" a:2	package name
+fu! s:DoGetClassInfo(class, ...)
+  if has_key(s:cache, a:class)
+    return s:cache[a:class]
+  endif
+
+  " array type:	TypeName[] or '[I' or '[[Ljava.lang.String;'
+  if a:class[-1:] == ']' || a:class[0] == '['
+    return s:ARRAY_TYPE_INFO
+  endif
+
+  " either this or super is not qualified
+  if a:class == 'this' || a:class == 'super'
+    if &ft == 'jsp'
+      let ci = s:DoGetReflectionClassInfo('javax.servlet.jsp.HttpJspPage')
+      if a:class == 'this'
+	" TODO: search methods defined in <%! [declarations] %>
+	"	search methods defined in other jsp files included
+	"	avoid including self directly or indirectly
+      endif
+      return ci
+    endif
+
+    call s:Info('A0. ' . a:class)
+    " this can be a local class or anonymous class as well as static type
+    let t = get(s:SearchTypeAt(javacomplete#parse(), java_parser#MakePos(line('.')-1, col('.')-1)), -1, {})
+    if !empty(t)
+      " What will be returned for super?
+      " - the protected or public inherited fields and methods. No ctors.
+      " - the (public static) fields of interfaces.
+      " - the methods of the Object class.
+      " What will be returned for this?
+      " - besides the above, all fields and methods of current class. No ctors.
+      return s:Sort(s:Tree2ClassInfo(t))
+      "return s:Sort(s:AddInheritedClassInfo(a:class == 'this' ? s:Tree2ClassInfo(t) : {}, t, 1))
+    endif
+
+    return {}
+  endif
+
+
+  if a:class !~ '^\s*' . s:RE_QUALID . '\s*$' || s:HasKeyword(a:class)
+    return {}
+  endif
+
+
+  let typename	= substitute(a:class, '\s', '', 'g')
+  let filekey	= a:0 > 0 ? a:1 : s:GetCurrentFileKey()
+  let packagename = a:0 > 1 ? a:2 : s:GetPackageName()
+  let srcpath	= join(s:GetSourceDirs(a:0 > 0 && a:1 != bufnr('%') ? a:1 : expand('%:p'), packagename), ',')
+
+  let names = split(typename, '\.')
+  " remove the package name if in the same packge
+  if len(names) > 1
+    if packagename == join(names[:-2], '.')
+      let names = names[-1:]
+    endif
+  endif
+
+  " a FQN
+  if len(names) > 1
+    call s:DoGetTypeInfoForFQN([typename], srcpath)
+    let ci = get(s:cache, typename, {})
+    if get(ci, 'tag', '') == 'CLASSDEF'
+      return s:cache[typename]
+    elseif get(ci, 'tag', '') == 'PACKAGE'
+      return {}
+    endif
+  endif
+
+
+  " The standard search order of a simple type name is as follows:
+  " 1. The current type including inherited types.
+  " 2. A nested type of the current type.
+  " 3. Explicitly named imported types (single type import).
+  " 4. Other types declared in the same package. Not only current directory.
+  " 5. Implicitly named imported types (import on demand).
+
+  " 1 & 2.
+  " NOTE: inherited types are treated as normal
+  if filekey == s:GetCurrentFileKey()
+    let simplename = typename[strridx(typename, '.')+1:]
+    if s:FoundClassDeclaration(simplename) != 0
+      call s:Info('A1&2')
+      let ci = s:GetClassInfoFromSource(simplename, '%')
+      " do not cache it
+      if !empty(ci)
+	return ci
+      endif
+    endif
+  else
+    let ci = s:GetClassInfoFromSource(typename, filekey)
+    if !empty(ci)
+      return ci
+    endif
+  endif
+
+  " 3.
+  " NOTE: PackageName.Ident, TypeName.Ident
+  let fqn = s:SearchSingleTypeImport(typename, s:GetImports('imports_fqn', filekey))
+  if !empty(fqn)
+    call s:Info('A3')
+    call s:DoGetTypeInfoForFQN([fqn], srcpath)
+    let ti = get(s:cache, fqn, {})
+    if get(ti, 'tag', '') != 'CLASSDEF'
+      " TODO: mark the wrong import declaration.
+    endif
+    return ti
+  endif
+
+  " 4 & 5
+  " NOTE: Keeps the fqn of the same package first!!
+  call s:Info('A4&5')
+  let fqns = [empty(packagename) ? typename : packagename . '.' . typename]
+  for p in s:GetImports('imports_star', filekey)
+    call add(fqns, p . typename)
+  endfor
+  call s:DoGetTypeInfoForFQN(fqns, srcpath)
+  for fqn in fqns
+    if has_key(s:cache, fqn)
+      return get(s:cache[fqn], 'tag', '') == 'CLASSDEF' ? s:cache[fqn] : {}
+    endif
+  endfor
+
+  return {}
+endfu
+
+" Rules of overriding and hiding:
+" 1. Fields cannot be overridden; they can only be hidden.
+"    In the subclass, the hidden field of superclass can no longer be accessed
+"    directly by its simple name. `super` or another reference must be used.
+" 2. A method can be overriden only if it is accessible.
+"    When overriding methods, both the signature and return type must be the
+"    same as in the superclass.
+" 3. Static members cannot be overridden; they can only be hidden
+"    -- whether a field or a method. But hiding static members has little effect,
+"    because static should be accessed via the name of its declaring class.
+" Given optional argument, add protected, default (package) access, private members.
+"fu! s:MergeClassInfo(ci, another, ...)
+"  if empty(a:another)	| return a:ci		| endif
+"
+"  if empty(a:ci)
+"    let ci = copy(a:another)
+""    if a:0 > 0 && a:1
+""      call extend(ci.fields, get(a:another, 'declared_fields', []))
+""      call extend(ci.methods, get(a:another, 'declared_methods', []))
+""    endif
+"    return ci
+"  endif
+"
+"  call extend(a:ci.methods, a:another.methods)
+"
+"  for f in a:another.fields
+"    if s:Index(a:ci.fields, f.n, 'n') < 0
+"      call add(a:ci.fields, f)
+"    endif
+"  endfor
+"  return a:ci
+"endfu
+
+
+" Parameters:
+"   class	the qualified class name
+" Return:	TClassInfo or {} when not found
+" See ClassInfoFactory.getClassInfo() in insenvim.
+function! s:DoGetReflectionClassInfo(fqn)
+  if !has_key(s:cache, a:fqn)
+    let res = s:RunReflection('-C', a:fqn, 's:DoGetReflectionClassInfo')
+    if res =~ '^{'
+      let s:cache[a:fqn] = s:Sort(eval(res))
+    elseif res =~ '^['
+      for type in eval(res)
+	if get(type, 'name', '') != ''
+	  let s:cache[type.name] = s:Sort(type)
+	endif
+      endfor
+    else
+      let b:errormsg = res
+    endif
+  endif
+  return get(s:cache, a:fqn, {})
+endfunction
+
+fu! s:GetClassInfoFromSource(class, filename)
+  let ci = {}
+  if len(tagfiles()) > 0
+    let ci = s:DoGetClassInfoFromTags(a:class)
+  endif
+
+  if empty(ci)
+    call s:Info('Use java_parser.vim to generate class information')
+    let unit = javacomplete#parse(a:filename)
+    let targetPos = a:filename == '%' ? java_parser#MakePos(line('.')-1, col('.')-1) : -1
+    for t in s:SearchTypeAt(unit, targetPos, 1)
+      if t.name == a:class
+	let t.filepath = a:filename == '%' ? s:GetCurrentFileKey() : expand(a:filename)
+	return s:Tree2ClassInfo(t)
+	"return s:AddInheritedClassInfo(s:Tree2ClassInfo(t), t)
+      endif
+    endfor
+  endif
+  return ci
+endfu
+
+fu! s:Tree2ClassInfo(t)
+  let t = a:t
+
+  " fill fields and methods
+  let t.fields = []
+  let t.methods = []
+  let t.ctors = []
+  let t.classes = []
+  for def in t.defs
+    if def.tag == 'METHODDEF'
+      call add(def.n == t.name ? t.ctors : t.methods, def)
+    elseif def.tag == 'VARDEF'
+      call add(t.fields, def)
+    elseif def.tag == 'CLASSDEF'
+      call add(t.classes, t.fqn . '.' . def.name)
+    endif
+  endfor
+
+  " convert type name in extends to fqn for class defined in source files
+  if !has_key(a:t, 'classpath') && has_key(a:t, 'extends')
+    if has_key(a:t, 'filepath') && a:t.filepath != s:GetCurrentFileKey()
+      let filepath = a:t.filepath
+      let packagename = get(s:files[filepath].unit, 'package', '')
+    else
+      let filepath = expand('%:p')
+      let packagename = s:GetPackageName()
+    endif
+
+    let extends = a:t.extends
+    let i = 0
+    while i < len(extends)
+      let ci = s:DoGetClassInfo(java_parser#type2Str(extends[i]), filepath, packagename)
+      if has_key(ci, 'fqn')
+	let extends[i] = ci.fqn
+      endif
+      let i += 1
+    endwhile
+  endif
+
+  return t
+endfu
+
+"fu! s:AddInheritedClassInfo(ci, t, ...)
+"  let ci = a:ci
+"  " add inherited fields and methods
+"  let list = []
+"  for i in get(a:t, 'extends', [])
+"    call add(list, java_parser#type2Str(i))
+"  endfor
+"
+"  if has_key(a:t, 'filepath') && a:t.filepath != expand('%:p')
+"    let filepath = a:t.filepath
+"    let props = get(s:files, a:t.filepath, {})
+"    let packagename = get(props.unit, 'package', '')
+"  else
+"    let filepath = expand('%:p')
+"    let packagename = s:GetPackageName()
+"  endif
+"
+"  for id in list
+"    let ci = s:MergeClassInfo(ci, s:DoGetClassInfo(id, filepath, packagename), a:0 > 0 && a:1)
+"  endfor
+"  return ci
+"endfu
+
+" To obtain information of the class in current file or current folder, or
+" even in current project.
+function! s:DoGetClassInfoFromTags(class)
+  " find tag of a:class declaration
+  let tags = taglist('^' . a:class)
+  let filename = ''
+  let cmd = ''
+  for tag in tags
+    if has_key(tag, 'kind')
+      if tag['kind'] == 'c'
+	let filename = tag['filename']
+	let cmd = tag['cmd']
+	break
+      endif
+    endif
+  endfor
+
+  let tags = taglist('^' . (empty(b:incomplete) ? '.*' : b:incomplete) )
+  if filename != ''
+    call filter(tags, "v:val['filename'] == '" . filename . "' && has_key(v:val, 'class') ? v:val['class'] == '" . a:class . "' : 1")
+  endif
+
+  let ci = {'name': a:class}
+  " extends and implements
+  let ci['ctors'] = []
+  let ci['fields'] = []
+  let ci['methods'] = []
+
+  " members
+  for tag in tags
+    let member = {'n': tag['name']}
+
+    " determine kind
+    let kind = 'm'
+    if has_key(tag, 'kind')
+      let kind = tag['kind']
+    endif
+
+    let cmd = tag['cmd']
+    if cmd =~ '\<static\>'
+      let member['m'] = '1000'
+    else
+      let member['m'] = ''
+    endif
+
+    let desc = substitute(cmd, '/^\s*', '', '')
+    let desc = substitute(desc, '\s*{\?\s*$/$', '', '')
+
+    if kind == 'm'
+      " description
+      if cmd =~ '\<static\>'
+	let desc = substitute(desc, '\s\+static\s\+', ' ', '')
+      endif
+      let member['d'] = desc
+
+      let member['p'] = ''
+      let member['r'] = ''
+      if tag['name'] == a:class
+	call add(ci['ctors'], member)
+      else
+	call add(ci['methods'], member)
+      endif
+    elseif kind == 'f'
+      let member['t'] = substitute(desc, '\([a-zA-Z0-9_[\]]\)\s\+\<' . tag['name'] . '\>.*$', '\1', '')
+      call add(ci['fields'], member)
+    endif
+  endfor
+  return ci
+endfu
+
+" package information							{{{2
+
+fu! s:DoGetInfoByReflection(class, option)
+  if has_key(s:cache, a:class)
+    return s:cache[a:class]
+  endif
+
+  let res = s:RunReflection(a:option, a:class, 's:DoGetInfoByReflection')
+  if res =~ '^[{\[]'
+    let v = eval(res)
+    if type(v) == type([])
+      let s:cache[a:class] = sort(v)
+    elseif type(v) == type({})
+      if get(v, 'tag', '') =~# '^\(PACKAGE\|CLASSDEF\)$'
+	let s:cache[a:class] = v
+      else
+	call extend(s:cache, v, 'force')
+      endif
+    endif
+    unlet v
+  else
+    let b:errormsg = res
+  endif
+
+  return get(s:cache, a:class, {})
+endfu
+
+" search in members							{{{2
+" TODO: what about default access?
+" public for all              
+" protected for this or super 
+" private for this            
+fu! s:CanAccess(mods, kind)
+  return (a:mods[-4:-4] || a:kind/10 == 0)
+	\ &&   (a:kind == 1 || a:mods[-1:]
+	\	|| (a:mods[-3:-3] && (a:kind == 1 || a:kind == 2))
+	\	|| (a:mods[-2:-2] && a:kind == 1))
+endfu
+
+fu! s:SearchMember(ci, name, fullmatch, kind, returnAll, memberkind, ...)
+  let result = [[], [], []]
+
+  if a:kind != 13
+    for m in (a:0 > 0 && a:1 ? [] : get(a:ci, 'fields', [])) + ((a:kind == 1 || a:kind == 2) ? get(a:ci, 'declared_fields', []) : [])
+      if empty(a:name) || (a:fullmatch ? m.n ==# a:name : m.n =~# '^' . a:name)
+	if s:CanAccess(m.m, a:kind)
+	  call add(result[2], m)
+	endif
+      endif
+    endfor
+
+    for m in (a:0 > 0 && a:1 ? [] : get(a:ci, 'methods', [])) + ((a:kind == 1 || a:kind == 2) ? get(a:ci, 'declared_methods', []) : [])
+      if empty(a:name) || (a:fullmatch ? m.n ==# a:name : m.n =~# '^' . a:name)
+	if s:CanAccess(m.m, a:kind)
+	  call add(result[1], m)
+	endif
+      endif
+    endfor
+  endif
+
+  if a:kind/10 != 0
+    let types = get(a:ci, 'classes', [])
+    for t in types
+      if empty(a:name) || (a:fullmatch ? t[strridx(t, '.')+1:] ==# a:name : t[strridx(t, '.')+1:] =~# '^' . a:name)
+	if !has_key(s:cache, t) || !has_key(s:cache[t], 'flags') || a:kind == 1 || s:cache[t].flags[-1:]
+	  call add(result[0], t)
+	endif
+      endif
+    endfor
+  endif
+
+  " key `classpath` indicates it is a loaded class from classpath
+  " All public members of a loaded class are stored in current ci
+  if !has_key(a:ci, 'classpath') || (a:kind == 1 || a:kind == 2)
+    for i in get(a:ci, 'extends', [])
+      let ci = s:DoGetClassInfo(java_parser#type2Str(i))
+      let members = s:SearchMember(ci, a:name, a:fullmatch, a:kind == 1 ? 2 : a:kind, a:returnAll, a:memberkind)
+      let result[0] += members[0]
+      let result[1] += members[1]
+      let result[2] += members[2]
+    endfor
+  endif
+  return result
+endfu
+
+
+" generate member list							{{{2
+
+fu! s:DoGetFieldList(fields)
+  let s = ''
+  for field in a:fields
+    let s .= "{'kind':'" . (s:IsStatic(field.m) ? "F" : "f") . "','word':'" . field.n . "','menu':'" . field.t . "','dup':1},"
+  endfor
+  return s
+endfu
+
+fu! s:DoGetMethodList(methods, ...)
+  let paren = a:0 == 0 || !a:1 ? '(' : ''
+  let s = ''
+  for method in a:methods
+    let s .= "{'kind':'" . (s:IsStatic(method.m) ? "M" : "m") . "','word':'" . method.n . paren . "','abbr':'" . method.n . "()','menu':'" . method.d . "','dup':'1'},"
+  endfor
+  return s
+endfu
+
+" kind:
+"	0 - for instance, 1 - this, 2 - super, 3 - class, 4 - array, 5 - method result, 6 - primitive type
+"	11 - for type, with `class` and static member and nested types.
+"	12 - for import static, no lparen for static methods
+"	13 - for import or extends or implements, only nested types
+"	20 - for package
+fu! s:DoGetMemberList(ci, kind)
+  if type(a:ci) != type({}) || a:ci == {}
+    return []
+  endif
+
+  let s = a:kind == 11 ? "{'kind': 'C', 'word': 'class', 'menu': 'Class'}," : ''
+
+  let members = s:SearchMember(a:ci, '', 1, a:kind, 1, 0, a:kind == 2)
+
+  " add accessible member types
+  if a:kind / 10 != 0
+    " Use dup here for member type can share name with field.
+    for class in members[0]
+    "for class in get(a:ci, 'classes', [])
+      let v = get(s:cache, class, {})
+      if v == {} || v.flags[-1:]
+	let s .= "{'kind': 'C', 'word': '" . substitute(class, a:ci.name . '\.', '\1', '') . "','dup':1},"
+      endif
+    endfor
+  endif
+
+  if a:kind != 13
+    let fieldlist = []
+    let sfieldlist = []
+    for field in members[2]
+    "for field in get(a:ci, 'fields', [])
+      if s:IsStatic(field['m'])
+	call add(sfieldlist, field)
+      elseif a:kind / 10 == 0
+	call add(fieldlist, field)
+      endif
+    endfor
+
+    let methodlist = []
+    let smethodlist = []
+    for method in members[1]
+      if s:IsStatic(method['m'])
+	call add(smethodlist, method)
+      elseif a:kind / 10 == 0
+	call add(methodlist, method)
+      endif
+    endfor
+
+    if a:kind / 10 == 0
+      let s .= s:DoGetFieldList(fieldlist)
+      let s .= s:DoGetMethodList(methodlist)
+    endif
+    let s .= s:DoGetFieldList(sfieldlist)
+    let s .= s:DoGetMethodList(smethodlist, a:kind == 12)
+
+    let s = substitute(s, '\<' . a:ci.name . '\.', '', 'g')
+    let s = substitute(s, '\<java\.lang\.', '', 'g')
+    let s = substitute(s, '\<\(public\|static\|synchronized\|transient\|volatile\|final\|strictfp\|serializable\|native\)\s\+', '', 'g')
+  endif
+  return eval('[' . s . ']')
+endfu
+
+" interface							{{{2
+
+function! s:GetMemberList(class)
+  if s:IsBuiltinType(a:class)
+    return []
+  endif
+
+  return s:DoGetMemberList(s:DoGetClassInfo(a:class), 0)
+endfunction
+
+fu! s:GetStaticMemberList(class)
+  return s:DoGetMemberList(s:DoGetClassInfo(a:class), 11)
+endfu
+
+function! s:GetConstructorList(class)
+  let ci = s:DoGetClassInfo(a:class)
+  if empty(ci)
+    return []
+  endif
+
+  let s = ''
+  for ctor in get(ci, 'ctors', [])
+    let s .= "{'kind': '+', 'word':'". a:class . "(','abbr':'" . ctor.d . "','dup':1},"
+  endfor
+
+  let s = substitute(s, '\<java\.lang\.', '', 'g')
+  let s = substitute(s, '\<public\s\+', '', 'g')
+  return eval('[' . s . ']')
+endfunction
+
+" Name can be a (simple or qualified) package name, or a (simple or qualified)
+" type name.
+fu! s:GetMembers(fqn, ...)
+  let list = []
+  let isClass = 0
+
+  let v = s:DoGetInfoByReflection(a:fqn, '-E')
+  if type(v) == type([])
+    let list = v
+  elseif type(v) == type({}) && v != {}
+    if get(v, 'tag', '') == 'PACKAGE'
+      if b:context_type == s:CONTEXT_IMPORT_STATIC || b:context_type == s:CONTEXT_IMPORT
+	call add(list, {'kind': 'P', 'word': '*;'})
+      endif
+      if b:context_type != s:CONTEXT_PACKAGE_DECL
+	for c in sort(get(v, 'classes', []))
+	  call add(list, {'kind': 'C', 'word': c})
+	endfor
+      endif
+      for p in sort(get(v, 'subpackages', []))
+	call add(list, {'kind': 'P', 'word': p})
+      endfor
+    else	" elseif get(v, 'tag', '') == 'CLASSDEF'
+      let isClass = 1
+      let list += s:DoGetMemberList(v, b:context_type == s:CONTEXT_IMPORT || b:context_type == s:CONTEXT_NEED_TYPE ? 13 : b:context_type == s:CONTEXT_IMPORT_STATIC ? 12 : 11)
+    endif
+  endif
+
+  if !isClass
+    let list += s:DoGetPackageInfoInDirs(a:fqn, b:context_type == s:CONTEXT_PACKAGE_DECL)
+  endif
+
+  return list
+endfu
+
+" a:1		incomplete mode
+" return packages in classes directories or source pathes
+fu! s:DoGetPackageInfoInDirs(package, onlyPackages, ...)
+  let list = []
+
+  let pathes = s:GetSourceDirs(expand('%:p'))
+  for path in s:GetClassDirs()
+    if index(pathes, path) <= 0
+      call add(pathes, path)
+    endif
+  endfor
+
+  let globpattern  = a:0 > 0 ? a:package . '*' : substitute(a:package, '\.', '/', 'g') . '/*'
+  let matchpattern = a:0 > 0 ? a:package : a:package . '[\\/]'
+  for f in split(globpath(join(pathes, ','), globpattern), "\n")
+      for path in pathes
+	let idx = matchend(f, escape(path, ' \') . '[\\/]\?\C' . matchpattern)
+	if idx != -1
+	  let name = (a:0 > 0 ? a:package : '') . strpart(f, idx)
+	  if f[-5:] == '.java'
+	    if !a:onlyPackages
+	      call add(list, {'kind': 'C', 'word': name[:-6]})
+	    endif
+	  elseif name =~ '^' . s:RE_IDENTIFIER . '$' && isdirectory(f) && f !~# 'CVS$'
+	    call add(list, {'kind': 'P', 'word': name})
+	  endif
+	endif
+      endfor
+  endfor
+  return list
+endfu
+" }}}
+"}}}
+" vim:set fdm=marker sw=2 nowrap:
diff --git a/vim/plugins/javacomplete/doc/javacomplete.txt b/vim/plugins/javacomplete/doc/javacomplete.txt
new file mode 100644
index 0000000..ef5f211
--- /dev/null
+++ b/vim/plugins/javacomplete/doc/javacomplete.txt
@@ -0,0 +1,568 @@
+*javacomplete.txt*	For Vim version 7.0 and above. Last change: 2011-01-30
+
+		    JAVACOMPLETE REFERENCE MANUAL	by cheng fang~
+		    					fangread@yahoo.com.cn~
+
+
+1. Overview					|javacomplete-overview|
+   1.1 Features					|javacomplete-features|
+   1.2 Requirements				|javacomplete-requirements|
+   1.3 Download					|javacomplete-download|
+   1.4 Install					|javacomplete-install|
+2. Usage    					|javacomplete-usage|
+   2.1 Input contexts				|javacomplete-contexts|
+   2.2 Kind letter				|javacomplete-kindletter|
+   2.3 Options					|javacomplete-options|
+   2.4 Commands					|javacomplete-commands|
+3. Java parser in Vim    			|javacomplete-parser|
+   3.1 Abstract Syntax Tree			|javacomplete-ast|
+   3.2 Global Constants				|javacomplete-constants|
+   3.3 Parsing Functions			|javacomplete-functions|
+   3.4 Sample					|javacomplete-sample|
+4. FAQ						|javacomplete-faq|
+5. Limitations					|javacomplete-limitations|
+6. History					
+   6.1 javacomplete				|javacomplete-history|
+   6.2 Parser					|java-parser-history|
+   6.2 Reflection.java				|javacomplete-reflection|
+7. Todo						|javacomplete-todo|
+8. Thanks					|javacomplete-thanks|
+
+==============================================================================
+1. Overview 					*javacomplete-overview*
+
+This is javacomplete, an omni-completion script of JAVA language for vim 7 and
+above. It includes javacomplete.vim, java_parser.vim, Reflection.java, and 
+javacomplete.txt.
+
+1.1 Features					*javacomplete-features*
+
+- List members of a class, including (static) fields, (static) methods and ctors.
+- List classes or subpackages of a package.
+- Provide parameters information of a method, list all overload methods.
+- Complete an incomplete word.
+- Provide a complete JAVA parser written in Vim script language.
+- Use the JVM to obtain most information.
+- Use the embedded parser to obtain the class information from source files.
+- Tags generated by ctags can also be used.
+- JSP is supported, Builtin objects such as request, session can be recognized.
+  The classes and jar files in the WEB-INF will be appended automatically to the classpath.
+
+1.2 Requirements				*javacomplete-requirements*
+
+It works on all the platforms wherever
+- Vim version 7.0 and above,
+- JDK version 1.1 and above, 
+exists.
+
+1.3 Download					*javacomplete-download*
+
+You can download the lastest version from this url:
+	http://www.vim.org/scripts/script.php?script_id=1785
+
+1.4 Install					*javacomplete-install*
+
+1. Unzip javacomplete.zip to a directory of 'runtimepath', e.g.
+$HOME/.vim (unix/linux), $VIM/vimfiles (windows). >
+	> unzip javacomplete.zip -d ~/.vim
+
+<   To update Vim help tags, run vim and run command: >
+	:helptags $HOME/.vim/doc
+<   or >
+	:helptags $VIM/vimfiles/doc
+
+NOTE: javacomplete.vim, java_parser.vim and Reflection.java should be in one
+autoload directory of 'runtimepath'.
+javacomplete.txt should be in one doc directory of 'runtimepath'.
+
+2. Set 'omnifunc' option. e.g. >
+	:setlocal omnifunc=javacomplete#Complete
+<   Or, use autocmd: >
+	:" Only do this part when compiled with support for autocommands.
+	:if has("autocmd")
+	:  autocmd Filetype java setlocal omnifunc=javacomplete#Complete
+	:endif
+You can add this command to your .vimrc or _vimrc.
+
+3. Set 'completefunc' option to show parameters information IF YOU LIKE. e.g. >
+	:setlocal completefunc=javacomplete#CompleteParamsInfo
+You can map as follows for better display: >
+	:inoremap <buffer> <C-X><C-U> <C-X><C-U><C-P>
+	:inoremap <buffer> <C-S-Space> <C-X><C-U><C-P>
+
+4. Reflection.java will be automatcally compiled and placed to $HOME when you
+use first time. Assure that Reflection.java is in the same directory with
+javacomplete.vim to be searched in autoload subdirectory of &rtp. 
+If no Reflection.class is generated, check that you have the write permission
+in $HOME directory.
+If a previous Reflection.java is not compatible with the new version
+javacomplete.vim, please compile Reflection.java manually.
+
+==============================================================================
+2. Usage    					*javacomplete-usage*
+
+You can use it like other omni-completion script. Many samples of input context 
+are gived in the following section.
+
+Make sure a JVM launcher (default 'java') can be searched in the PATH enviroment
+variable, otherwise Use javacomplete#SetJVMLauncher() to specify one. See option
+`javacomplete-launcher`.
+
+See FAQ in time if some problem occurs. When meeting other problems not
+described in FAQ, you can contact with the auther by the following e-mail:
+fangread@yahoo.com.cn
+
+2.1 Input contexts				|javacomplete-contexts|
+It recognize nearly all kinds of Primary Expressions (see langspec-3.0)
+except for "Primary.new Indentifier". Casting conversion is also supported.
+
+Samples of input contexts are as following: (Note that '|' indicates cursor)
+    (1). after '.', list members of a class or a package
+    - package.| 	subpackages and classes of a package
+    - Type.| 		static members of the 'Type' class and "class"
+    - var.| or field.|	members of a variable or a field
+    - method().| 	members of result of method()
+    - this.|		members of the current class
+    - ClassName.this.|	members of the qualified class
+    - super.|		members of the super class
+    - array.|		members of an array object
+    - array[i].|	array access, return members of the element of array
+    - "String".|	String literal, return members of java.lang.String
+    - int.| or void.|	primitive type or pseudo-type, return "class"
+    - int[].|		array type, return members of a array type and "class"
+    - java.lang.String[].|
+    - new int[].|	members of the new array instance
+    - new java.lang.String[i=1][].|
+    - new Type().|	members of the new class instance 
+    - Type.class.|	class literal, return members of java.lang.Class
+    - void.class.| or int.class.|
+    - ((Type)var).|	cast var as Type, return members of Type.
+    - (var.method()).|	same with "var.|"
+    - (new Class()).|	same with "new Class().|"
+
+   (2). after '(', list matching methods with parameters information.
+    - method(|) 	methods matched
+    - var.method(|) 	methods matched
+    - new ClassName(|)	constructors matched
+    - this(|) 		constructors of current class matched
+    - super(|) 		constructors of super class matched
+    Any place between '(' and ')' will be supported soon.
+    Help information of javadoc is not supported yet.
+
+   (3). after an incomplete word, list all the matched beginning with it.
+    - var.ab| 	subset of members of var beginning with `ab`
+    - ab|	list of all maybes
+
+   (4). import statement
+    - " import 	java.util.|"
+    - " import 	java.ut|"
+    - " import 	ja|"
+    - " import 	java.lang.Character.|"	e.g. "Subset"
+    - " import static java.lang.Math.|"	e.g. "PI, abs"
+
+   (5). package declaration
+    - " package 	com.|"
+
+   The above are in simple expression.
+   (6). after compound expression:
+    - PrimaryExpr.var.|
+    - PrimaryExpr.method().|
+    - PrimaryExpr.method(|)
+    - PrimaryExpr.var.ab|
+    e.g.
+    - "java.lang	. System.in .|"
+    - "java.lang.System.getenv().|"
+    - "int.class.toString().|"
+    - "list.toArray().|"
+    - "new ZipFile(path).|"
+    - "new ZipFile(path).entries().|"
+
+   (7). Nested expression:
+    - "System.out.println( str.| )"
+    - "System.out.println(str.charAt(| )"
+    - "for (int i = 0; i < str.|; i++)"
+    - "for ( Object o : a.getCollect| )"
+
+
+2.2 Kind letter					*javacomplete-kindletter*
+
+A single letter indicates the kind of compeltion item. These kinds are:
+	+	ctor
+	v	local variable or parameter
+	f	nonstatic field
+	F	static field
+	m	nonstatic method
+	M	static method
+	P	package
+	C	class type
+	I	interface type
+
+2.3 Options					*javacomplete-options*
+
+1. Set java compiler (default 'javac') using the following function:
+	javacomplete#SetCompiler('javac')	*javacomplete-compiler*
+
+2. Set java launcher (default 'java') using the following function:
+	javacomplete#SetJVMLauncher('java')	*javacomplete-launcher*
+
+3. Set classpath using the following function: >
+	javacomplete#AddClassPath('jarfile_or_classes_path')
+	javacomplete#DelClassPath('jarfile_or_classes_path')
+	javacomplete#SetClassPath('semicolon_separated_string')
+<
+    Another two variables will be used if they are existing:
+	|g:java_classpath|	global classpath
+	|b:classpath|		associated with current buffer
+    In one sense, s:classpath is like a classpath option for a PROJECT.
+    If some of them are body set, the priority of these variables is:
+	first,  b:classpath first,
+	second, s:classpath
+	third,  g:java_classpath
+	last,   $CLASSPATH
+
+4. Set sourcepath using the following function: >
+	javacomplete#AddSourcePath('sources_file_path')
+	javacomplete#DelSourcePath('sources_file_path')
+	javacomplete#SetSourcePath('sources_file_path')
+
+5. Set option for using JDK1.1 if you meet the problem described in FAQ 3: >
+	javacomplete#UseJDK11()
+
+6. Set methods to search declaration: >
+	" 1 - by builtin searchdecl(), quickest but inaccurate in many cases.
+	" 2 - by special Searchdecl(), work NOT WELL YET.
+	" 4 - by java_parser, slowest but accurate in most cases. Not for JSP.
+	javacomplete#SetSearchdeclMethod()
+
+2.4 Commands					*javacomplete-commands*
+
+==============================================================================
+3. Java parser in Vim    			*javacomplete-parser*
+
+3.1 Abstract Syntax Tree			*javacomplete-ast*
+
+3.2 Global Constants				*javacomplete-constants*
+
+3.3 Parsing Functions				*javacomplete-functions*
+
+3.4 Sample Codes					*javacomplete-sample*
+This parser can be a good candidate for anyone who needs a java parser to get 
+a abstract syntax tree for many use. The following are sample codes: >
+
+  " NOTE: The script contains a single parser instance. You cannot create 
+  " another parser! The only way to parse another JAVA code is reset the
+  " parser by calling java_parser#InitParser().
+
+  " 1. Initialize the parser
+  " for a code snippet,
+  call java_parser#InitParser(['for (int i = 0; i < N; i++) {', '', '}'])
+  " or for the current buffer,
+  call java_parser#InitParser(getline('^', '$'))
+  " or for a whole source file
+  call java_parser#InitParser(readfile('java/util/Arrays.java'))
+
+  " 2. Get the result tree
+  call java_parser#compilationUnit()
+  " or others according to the input code
+  call java_parser#expression()
+  call java_parser#block()
+  call java_parser#statement()
+
+  " 3. Use the tree as you like
+
+  " 4. The default scan strategy is scanning only sklenton. 
+  " You can change it by set the option 'scanStrategy'.
+  " The values for 'scanStrategy' option are:
+  "	0 - only class members when parse full file; 
+  "	1 - keep statement as a whole string; 
+  "	2 - all 
+  call java_parser#InitParser(getline('^', '$'), {'scanStrategy': 2})
+
+  " 5. I recommend that keeping scanStrategy as default. 
+  " If you want to parse a code snippet such as a method body of the whole
+  " file, you can call java_parser#GotoPosition() to go to what you are going 
+  " to start parsing.
+  " Then, call java_parser#block(), java_parser#statement() or 
+  " java_parser#expression() to parse the smaller snippet.
+  " NOTE: This way will keep the result tree reserved.
+  call java_parser#GotoPosition(def.body.pos)
+  call java_parser#block()
+
+==============================================================================
+4. FAQ						*javacomplete-faq*
+
+(1). When you meets the following problem: >
+	omni-completion error: Exception in thread "main" 
+	java.lang.NoClassDefFoundError: Reflection
+It is Reflection.class not found in autoload directory or $HOME that cause
+this problem.
+There are several reasons causing this problem:
+    o	No compiler. Use javacomplete#SetCompiler() to specify one.
+    o	No write permission for $HOME directory.
+
+(2). Reflection.java should be searched in autoload subdirectory of &rtp.
+Reflection.class should be searched in $HOME or autoload subdirectory of &rtp.
+If not found, javacomplete try to compile it and place the generated class
+file in $HOME.
+
+(3). A error when using JDK1.1:
+    Unable to initialize threads: cannot find class java/lang/Thread
+When I tested JDK1.1.8 on Windows XP, I found -classpath options cause it.
+There are two way to avoid it is:
+    o	Add the runtime classes to classpath, like
+	"${JDK118}\classes;${JDK118}\lib\classes.zip;${JDK118}\lib\classes.jar;"
+    o	Add Reflection.class and others to the CLASSPATH enviroment variable.
+	And call javacomplete#UseJDK11() to set option.
+
+==============================================================================
+5. Limitations					*javacomplete-limitations*
+
+The embedded parser works a bit slower than expected.
+
+==============================================================================
+6. History					
+
+6.1 javacomplete				*javacomplete-history*
+
+v0.77.1.2
+    2011-01-30	Fixed to adapt globpath() (vim < 7.2). Patched by Sam Lidder.
+
+v0.77.1.1
+    2010-11-12	Fixed to ignore the 'suffixes' and 'wildignore' options which 
+    		make Reflection.class can not be found.
+
+v0.77.1
+    2007-09-19	Supported showing method parameters information in any place
+    		between parenthesises.
+
+v0.77
+    2007-09-19	bug fix
+    2007-09-18	Added GetCurrentFileKey() avoid empty key of s:files for current buffer.
+    2007-09-16	Use a new strategy for searching inherited members.
+    2007-09-11
+    -	Supported new contexts "jav|", "var|", just after an incomplete word.
+    -	Supported new context "abs(|)", a imported static method.
+    2007-09-10
+    -	Improved FoundClassDeclaration()
+    -	Fixed bug calling cursor(0, 0)
+    2007-09-09	Rewrote DoGetClassInfo(), GetFQN() and IsFQN()��
+    2007-09-08	Fixed a bug when merging superclass's members
+    2007-09-05 -- 07
+    -	Improved s:MergeLines() and s:ExtractCleanExpr().
+    -	Rewrote CompleteAfterDot(). Added ParseExpr(). Removed s:GetNextSubexprType()
+    -	Supported accessible static imported members.
+    -	Supported accessible inherited members.
+
+    2007-09-04	Used b:changedtick and getftime() to check buffer (or other file) for changing.
+    2007-09-01	Supported not-file-name toplevel or static member class in source files.
+
+v0.76.8
+    2007-08-30
+    -	Created the s:TreeVisitor to search type or symbol names.
+    -	Supported local and anonymous class.
+
+    2007-08-29
+    -	Supported appending automatically classpath under WEB-INF for jsp files.
+
+v0.76.7
+    2007-08-28
+    -	Fixed case of "new java.util.zip.ZipFile().|"
+    -	Improved process of type arguments and method parameters. JAVA5+
+    -	Reorganize codes in javacomplete#Complete()
+    -	Added CONTEXT_NEED_TYPE, removed CONTEXT_INCOMPLETE_WORD
+
+    2007-08-24	Add Context types for type declaration: CONTEXT_NEED_TYPE
+
+v0.76.6
+    2007-08-23	Improved GetStatement() and related. Bug fixed.
+
+v0.76.5
+    2007-08-21
+    -	Fixed bug: "foo().|", "getFoo().foo().|", 
+	"for (Enumeration entries = ; entries.|; )".
+    -	Supported input contexts: "((Object)o).|", "((Object)o).getClass().|",
+	"new ZipFile(path).|", "(new String().)|".
+
+v0.76.4
+    2007-08-17
+    -	Improved input contexts: "int.class.toString().|", "list.toArray().|".
+    -	Fixed recognizing "this(|)", "method1(|)"
+    -	Added the 'kind' letter to distinguish between classes and packages.
+    2007-08-14
+    -	Support accessible nested classes.
+    -	Support import static members and import accessible nested classes.
+    2007-08-11
+    -	Fixed a bug when Reflection.java is in the path which contains space.
+    -	Improved process of this and super in JSP.
+    -	Fixed an severe bug parsing current jsp file.
+
+v0.76.3
+    2007-08-10
+    -	Add an option 'searchdecl' set by javacomplete#SetSearchdeclMethod().
+    -	Make an improvement for jsp file.
+    -	Clear cache when set options affecting classpath.
+    -	Improved DoGetPackageList() and s:GenerateImports().
+    -	Replace codes searching list of string with index().
+
+v0.76.2
+    2007-08-08
+    -	Fix failing to list members of nested class.
+    -	Combine members of local packages and loadable packages.
+    -	Add quick recognition of package or import. 
+    2007-08-06	Add inherited fields and methods to local class.
+
+v0.76.1
+    2007-08-04
+    -	Fix using a: in javacomplete#SetClassPath()
+    -	Fix a bug in javacomplete#GetClassPath()
+
+v0.76 2007-08-04
+    2007-08-04
+    -	Fix a infinite loop bug in s:GetMatchedIndexEx()
+    -	Fix that array type not recognised in compound expression.
+    -	Add a option for JDK1.1. See FAQ 3.
+    2007-08-03
+    -	Improve for 'this' or 'super'.
+    -	Support searching toplevel class in sourcepath.
+    -	Clean
+    2007-08-02  
+    -	Improve the process of checking a class in one of packages.
+    2007-08-01
+    -	Add Searchdecl() using java_parser.vim to provide quick information.
+    -	Supports input context: "StringLiteral".|, "int.|", "void.|"
+    2007-07-28
+    -	Automatcally compile Reflection.java and place it to $HOME.
+    -	Add option 'javacompiler', default 'javac'
+    -	Add option 'java', default 'java'
+
+v0.75 2007-02-13
+    -	Add java_parser.vim.
+    -	Add b:sourcepath option.
+    -	Improve recognition of classes defined in current buffer or in source path.
+    -	Support generating class information from tags instead of returning list directly.
+
+v0.74 2007-02-03
+    -	Support jre1.2 (and above).
+    -	Support input context like "boolean.class.|"
+    -	Handle java primitive types like 'int'.
+
+v0.73 2007-02-01
+    -	Fix bug that CLASSPATH not used when b:classpath or g:java_classpath not set.
+    -	Fix bug that call filter() without making a copy for incomplete.
+    -	Improve recognition of declaration of this class
+
+v0.72 2007-01-31	Handle nested expression.
+v0.71 2007-01-28	Add Basic support for class in current folder.
+v0.70 2007-01-27	Complete the reflection part.
+v0.60 2007-01-25	Design TClassInfo, etc.
+v0.50 2007-01-21	Use java and Reflection.class directly.
+
+
+6.2 Parser					*java-parser-history*
+
+v0.67
+    2007-09-11	Append a error string to imported qid when error occurs.
+    2007-09-10	Improved regexp constants.
+    2007-09-07	Fixed type2Str(). Removed qualident2Str(). 
+
+v0.66.1	08-30	Changed classCreatorRest().
+v0.66	08-27	Minor changes
+
+v0.65
+    2007-08-23
+    -	Improved s:scanComment(), s:Strpart(), s:String2Flags().
+    -	Improved recognizing methods, ctors, and variable declarators declared in most common form.
+    -	Added s:optFinalParameter(), s:methodDeclaratorRest_opt(). 
+    -	Removed s:GetLine() and s:GetCol().
+    -	Rewrote binary functions.
+
+v0.64
+    2007-08-21
+    -	Added quick recognizing fields or methods declared in most common form.
+    -	Optimized code: s:modeAndEXPR(), formalParameter(), and others.
+
+v0.63
+    2007-08-10	
+    -	Removed the unclear s:tokens and s:modifier_keywords.
+    -	Add java_parser#GetSnapshot() and java_parser#Restore().
+    2007-08-09	Fixed a bug when no top level class defined
+
+v0.62 2007-08-08
+    2007-08-08	Fix values in s:Flags and s:modifiersOpt() and the related.
+    2007-08-07	Optimize code of scanDoubleQuote() and importDeclaration().
+
+v0.61 2007-08-04
+    2007-08-01 Fix a bug typetag(). return a:token -> return tolower(a:token)
+    2007-07-31
+    -	Rename all script functions matching "s:Java_\(\i\+\)" to "s:\1".
+    -	Change s:EOI = ''
+    -	Use get() instead of s:GetOption(). Remove it.
+    -	Use repeat() instead of s:PrependChar(). Remove it.
+    -	Improve scanChar()
+
+v0.60 2007-07-31	Now it nearly is a complete parser and support Java5,6.
+			And tested correctly on all java files in jdk6 src.zip.
+    2007-07-19	Support new language features in java 5 and above.
+    2007-07-25	Add supports for parsing statement, block or expression
+    2007-07-28	Place it to autoload directory. 
+    2007-07-30	Clean this script.
+
+v0.51 2007-02-13	Optimize several scan function.
+v0.50 2007-02-10	Complete the skeleton.
+
+
+6.3 Reflection.java			*javacomplete-reflection*
+
+v0.77
+    2007-09-14	Improved generating information of all packages in jar files.
+    2007-09-06	
+    -	Improved getting paths of all system jar files for different JDKs 
+	in different platforms.
+    2007-08-14	Major improvement. Support nontoplevel classes.
+
+v0.76.3
+    2007-08-09	Redefined '-P' option for returning all packages and subpackages info in one time.
+
+v0.76.2
+    2007-08-06	Return a modifier value as a string because it more than 32bit.
+
+v0.76
+    2007-08-04	Support checking and reading package members for '-E'.
+    2007-08-02
+    -	Add an option '-E'.
+    -	Use ZipFile and ZipEntry instead of JarFile and JarEntry,
+	so that it can be compiled by and run on JDK1.1 and above.
+v0.7  2007-02-17	
+
+==============================================================================
+7. Todo						*javacomplete-todo*
+
+-  Improve performance of the embedded parser. Incremental parser.
+-  Add quick information using balloonexpr, ballooneval, balloondelay.
+-  Add javadoc
+-  Give a hint for class name conflict in different packages.
+-  Support parameter information for template
+
+==============================================================================
+8. Thanks					*javacomplete-thanks*
+        * Bram Moolenaar and all Vim contributors for Vim
+        * The insenvim project
+        * The javac and gjc sources
+        * All of you for using this script :)
+
+        * For help, documentation, bug report :
+	 	Martin Stubenschrott	author of IComplete
+		Vissale NEANG		author of OmniCppComplete
+		David Fishburn		author of SQLComplete and others
+		Nico Weber		testing on the Mac
+		Thomas Link		testing on cygwin+bash
+		Zhixing Yu
+	* For the bug of 'wildignore' options
+		Rodrigo Rosenfeld Rosas
+		Alexandru Mo?oi
+
+FeedBack:
+Any problem, bug or suggest are welcome to send to fangread@yahoo.com.cn
+
+==============================================================================
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/kotlin-vim/README.md b/vim/plugins/kotlin-vim/README.md
new file mode 100644
index 0000000..5d7f34b
--- /dev/null
+++ b/vim/plugins/kotlin-vim/README.md
@@ -0,0 +1,22 @@
+# kotlin-vim
+
+## Installation
+
+### [Vundle](https://github.com/gmarik/Vundle.vim)
+
+Add `Plugin 'udalov/kotlin-vim'` to your `~/.vimrc` and run `PluginInstall`.
+
+### [Pathogen](https://github.com/tpope/vim-pathogen)
+
+    $ git clone https://github.com/udalov/kotlin-vim ~/.vim/bundle/kotlin-vim
+
+### Manual
+
+0. `mkdir -p ~/.vim/{syntax,indent,ftdetect}`
+1. `cp syntax/kotlin.vim ~/.vim/syntax/kotlin.vim`
+2. `cp indent/kotlin.vim ~/.vim/indent/kotlin.vim`
+3. `cp ftdetect/kotlin.vim ~/.vim/ftdetect/kotlin.vim`
+4. If you use [Syntastic](https://github.com/scrooloose/syntastic): `cp -r syntax_checkers/kotlin ~/.vim/syntax_checkers/`
+5. Restart Vim
+
+##### Enjoy!
diff --git a/vim/plugins/kotlin-vim/ftdetect/kotlin.vim b/vim/plugins/kotlin-vim/ftdetect/kotlin.vim
new file mode 100644
index 0000000..6d5ebb7
--- /dev/null
+++ b/vim/plugins/kotlin-vim/ftdetect/kotlin.vim
@@ -0,0 +1,2 @@
+autocmd BufNewFile,BufRead *.kt setfiletype kotlin
+autocmd BufNewFile,BufRead *.kts setfiletype kotlin
diff --git a/vim/plugins/kotlin-vim/indent/kotlin.vim b/vim/plugins/kotlin-vim/indent/kotlin.vim
new file mode 100644
index 0000000..b487973
--- /dev/null
+++ b/vim/plugins/kotlin-vim/indent/kotlin.vim
@@ -0,0 +1,66 @@
+" Vim indent file
+" Language: Kotlin
+" Maintainer: Alexander Udalov
+" Latest Revision: 15 July 2017
+
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal cinoptions& cinoptions+=j1,L0
+setlocal indentexpr=GetKotlinIndent()
+setlocal indentkeys=0},0),!^F,o,O,e,<CR>
+setlocal autoindent " TODO ?
+
+" TODO teach it to count bracket balance, etc.
+function! GetKotlinIndent()
+    if v:lnum == 0
+        return 0
+    endif
+
+    let prev_num = prevnonblank(v:lnum - 1)
+    let prev = getline(prev_num)
+    let prev_indent = indent(prev_num)
+    let cur = getline(v:lnum)
+
+    if cur =~ '^\s*\*'
+        return cindent(v:lnum)
+    endif
+
+    if prev =~ '^\s*\*/'
+        let st = prev
+        while st > 1
+            if getline(st) =~ '^\s*/\*'
+                break
+            endif
+            let st = st - 1
+        endwhile
+        return indent(st)
+    endif
+
+    let prev_open_paren = prev =~ '^.*(\s*$'
+    let cur_close_paren = cur =~ '^\s*).*$'
+
+    if prev_open_paren && !cur_close_paren
+        return prev_indent + 2 * &shiftwidth
+    endif
+
+    if cur_close_paren && !prev_open_paren
+        return prev_indent - 2 * &shiftwidth
+    endif
+
+
+    let prev_open_brace = prev =~ '^.*\({\|->\)\s*$'
+    let cur_close_brace = cur =~ '^\s*}.*$'
+
+    if prev_open_brace && !cur_close_brace
+        return prev_indent + &shiftwidth
+    endif
+
+    if cur_close_brace && !prev_open_brace
+        return prev_indent - &shiftwidth
+    endif
+
+    return prev_indent
+endfunction
diff --git a/vim/plugins/kotlin-vim/syntax/kotlin.vim b/vim/plugins/kotlin-vim/syntax/kotlin.vim
new file mode 100644
index 0000000..e5f6b72
--- /dev/null
+++ b/vim/plugins/kotlin-vim/syntax/kotlin.vim
@@ -0,0 +1,103 @@
+" Vim syntax file
+" Language: Kotlin
+" Maintainer: Alexander Udalov
+" Latest Revision: 18 September 2017
+
+if exists("b:current_syntax")
+    finish
+endif
+
+let b:current_syntax = "kotlin"
+
+syn keyword ktStatement break continue return
+syn keyword ktConditional if else when
+syn keyword ktRepeat do for while
+syn keyword ktOperator as in is by
+syn keyword ktKeyword get set out super this where
+syn keyword ktException try catch finally throw
+
+syn keyword ktInclude import package
+
+syn keyword ktType Any Boolean Byte Char Double Float Int Long Nothing Short Unit
+syn keyword ktModifier annotation companion enum inner internal private protected public abstract final open override sealed vararg dynamic header impl expect actual
+syn keyword ktStructure class object interface typealias fun val var constructor init
+
+syn keyword ktReservedKeyword typeof
+
+syn keyword ktBoolean true false
+syn keyword ktConstant null
+
+syn keyword ktModifier data tailrec lateinit reified external inline noinline crossinline const operator infix suspend
+
+syn keyword ktTodo TODO FIXME XXX contained
+syn match ktShebang "\v^#!.*$"
+syn match ktLineComment "\v//.*$" contains=ktTodo,@Spell
+syn region ktComment matchgroup=ktCommentMatchGroup start="/\*" end="\*/" contains=ktComment,ktTodo,@Spell
+
+syn match ktSpecialCharError "\v\\." contained
+syn match ktSpecialChar "\v\\([tbnr'"$\\]|u\x{4})" contained
+syn region ktString start='"' skip='\\"' end='"' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError
+syn region ktString start='"""' end='"""' contains=ktSimpleInterpolation,ktComplexInterpolation,ktSpecialChar,ktSpecialCharError
+syn match ktCharacter "\v'[^']*'" contains=ktSpecialChar,ktSpecialCharError
+syn match ktCharacter "\v'\\''" contains=ktSpecialChar
+syn match ktCharacter "\v'[^\\]'"
+
+" TODO: highlight label in 'this@Foo'
+syn match ktAnnotation "\v(\w)@<!\@[[:alnum:]_.]*(:[[:alnum:]_.]*)?"
+syn match ktLabel "\v\w+\@"
+
+syn match ktSimpleInterpolation "\v\$\h\w*" contained
+syn region ktComplexInterpolation matchgroup=ktComplexInterpolationBrace start="\v\$\{" end="\v\}" contains=ALLBUT,ktSimpleInterpolation
+
+syn match ktNumber "\v<\d+[_[:digit:]]*[LFf]?"
+syn match ktNumber "\v<0[Xx]\x+[_[:xdigit:]]*L?"
+syn match ktNumber "\v<0[Bb][01]+[_01]*L?"
+syn match ktFloat "\v<\d*(\d[eE][-+]?\d+|\.\d+([eE][-+]?\d+)?)[Ff]?"
+
+syn match ktEscapedName "\v`.*`"
+
+syn match ktExclExcl "!!"
+syn match ktArrow "->"
+
+
+
+hi link ktStatement Statement
+hi link ktConditional Conditional
+hi link ktRepeat Repeat
+hi link ktOperator Operator
+hi link ktKeyword Keyword
+hi link ktException Exception
+hi link ktReservedKeyword Error
+
+hi link ktInclude Include
+
+hi link ktType Type
+hi link ktModifier StorageClass
+hi link ktStructure Structure
+hi link ktTypedef Typedef
+
+hi link ktBoolean Boolean
+hi link ktConstant Constant
+
+hi link ktTodo Todo
+hi link ktShebang Comment
+hi link ktLineComment Comment
+hi link ktComment Comment
+hi link ktCommentMatchGroup Comment
+
+hi link ktSpecialChar SpecialChar
+hi link ktSpecialCharError Error
+hi link ktString String
+hi link ktCharacter Character
+
+hi link ktAnnotation Identifier
+hi link ktLabel Identifier
+
+hi link ktSimpleInterpolation Identifier
+hi link ktComplexInterpolationBrace Identifier
+
+hi link ktNumber Number
+hi link ktFloat Float
+
+hi link ktExclExcl Special
+hi link ktArrow Structure
diff --git a/vim/plugins/kotlin-vim/syntax_checkers/kotlin/kotlinc.vim b/vim/plugins/kotlin-vim/syntax_checkers/kotlin/kotlinc.vim
new file mode 100644
index 0000000..49d71a9
--- /dev/null
+++ b/vim/plugins/kotlin-vim/syntax_checkers/kotlin/kotlinc.vim
@@ -0,0 +1,105 @@
+" Vim syntastic plugin
+" Language: Kotlin
+
+if exists('g:loaded_syntastic_kotlin_kotlinc_checker')
+	finish
+endif
+let g:loaded_syntastic_kotlin_kotlinc_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+if !exists("g:syntastic_kotlin_kotlinc_options")
+	let g:syntastic_kotlin_kotlinc_options = ""
+endif
+
+if !exists("g:syntastic_kotlin_kotlinc_delete_output")
+	let g:syntastic_kotlin_kotlinc_delete_output = 1
+endif
+
+if !exists("g:syntastic_kotlin_kotlinc_config_file_enabled")
+	let g:syntastic_kotlin_kotlinc_config_file_enabled = 0
+endif
+
+if !exists("g:syntastic_kotlin_kotlinc_config_file")
+	let g:syntastic_kotlin_kotlinc_config_file = ".syntastic_kotlinc_config"
+endif
+
+if !exists("g:syntastic_kotlin_kotlinc_classpath")
+	let g:syntastic_kotlin_kotlinc_classpath = ""
+endif
+
+if !exists("g:syntastic_kotlin_kotlinc_sourcepath")
+	let g:syntastic_kotlin_kotlinc_sourcepath = ""
+endif
+
+function! SyntaxCheckers_kotlin_kotlinc_GetLocList() dict
+	let kotlinc_opts = g:syntastic_kotlin_kotlinc_options
+
+	if g:syntastic_kotlin_kotlinc_config_file_enabled
+		if filereadable(expand(g:syntastic_kotlin_kotlinc_config_file, 1))
+			execute "source " . fnameescape(expand(g:syntastic_kotlin_kotlinc_config_file, 1))
+		endif
+	endif
+
+	if g:syntastic_kotlin_kotlinc_classpath !=# ""
+		let kotlinc_opts .= " -cp " . g:syntastic_kotlin_kotlinc_classpath
+	endif
+
+	let fname = ""
+	if g:syntastic_kotlin_kotlinc_sourcepath !=# ""
+		let fname .= expand(g:syntastic_kotlin_kotlinc_sourcepath, 1) . " "
+	endif
+	let fname .=  shellescape(expand("%", 1))
+
+
+	let output_dir = ""
+	if g:syntastic_kotlin_kotlinc_delete_output
+		let output_dir = syntastic#util#tmpdir()
+		let kotlinc_opts .= " -d " . syntastic#util#shescape(output_dir)
+	endif
+
+	let makeprg = self.makeprgBuild({
+		\ "exe": "kotlinc",
+		\ "args": kotlinc_opts,
+		\ "fname": fname })
+
+	let errorformat =
+		\ "%E%f:%l:%c: error: %m," .
+		\ "%W%f:%l:%c: warning: %m," .
+		\ "%Eerror: %m," .
+		\ "%Wwarning: %m," .
+		\ "%Iinfo: %m,"
+
+	if output_dir !=# ''
+		silent! call mkdir(output_dir, 'p')
+	endif
+
+	let errors = SyntasticMake({
+		\ 'makeprg': makeprg,
+		\ 'errorformat': errorformat, })
+
+	if output_dir !=# ''
+		call syntastic#util#rmrf(output_dir)
+	endif
+
+	let currbufnr = bufnr("%")
+	let relevant_errors = []
+
+	for error in errors
+		" Only get messages bounded to this buffer or are 'bufferless'
+		if (error.bufnr == currbufnr) || (error.bufnr == 0)
+			let relevant_errors = add(relevant_errors, error)
+		endif
+	endfor
+
+	return relevant_errors
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+	\ 'filetype': 'kotlin',
+	\ 'name': 'kotlinc',
+	\ 'exec': 'kotlinc' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/neco-vim/.gitignore b/vim/plugins/neco-vim/.gitignore
new file mode 100644
index 0000000..63746c0
--- /dev/null
+++ b/vim/plugins/neco-vim/.gitignore
@@ -0,0 +1,2 @@
+*.py[cod]
+doc/tags
diff --git a/vim/plugins/neco-vim/LICENSE b/vim/plugins/neco-vim/LICENSE
new file mode 100644
index 0000000..3a4b98e
--- /dev/null
+++ b/vim/plugins/neco-vim/LICENSE
@@ -0,0 +1,21 @@
+License: MIT license
+AUTHOR:  Shougo Matsushita <Shougo.Matsu at 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.
diff --git a/vim/plugins/neco-vim/autoload/cm/sources/necovim.vim b/vim/plugins/neco-vim/autoload/cm/sources/necovim.vim
new file mode 100644
index 0000000..29724d7
--- /dev/null
+++ b/vim/plugins/neco-vim/autoload/cm/sources/necovim.vim
@@ -0,0 +1,12 @@
+"=============================================================================
+" FILE: necovim.vim (NCM source)
+" AUTHOR:  Karl Yngve Lervåg <karl.yngve@gmail.com>
+" License: MIT license
+"=============================================================================
+
+function! cm#sources#necovim#refresh(opt, ctx)
+  let startcol = necovim#get_complete_position(a:ctx.typed)
+  let base = strpart(a:ctx.typed, startcol)
+  let cnd = necovim#gather_candidates(a:ctx.typed, base)
+  call cm#complete(a:opt.name, a:ctx, startcol+1, cnd)
+endfunction
diff --git a/vim/plugins/neco-vim/autoload/necovim.vim b/vim/plugins/neco-vim/autoload/necovim.vim
new file mode 100644
index 0000000..ad4ba58
--- /dev/null
+++ b/vim/plugins/neco-vim/autoload/necovim.vim
@@ -0,0 +1,112 @@
+"=============================================================================
+" FILE: necovim.vim
+" AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
+" License: MIT license
+"=============================================================================
+
+" Global options definition.
+let g:necovim#keyword_pattern =
+      \ get(g:, 'necovim#keyword_pattern',
+      \'\h[[:alnum:]-]*=\?\|\c\[:\%(\h\w*:\]\)\?\|&\h[[:alnum:]_:]*\|'.
+      \'<SID>\%(\h\w*\)\?\|<Plug>([^)]*)\?'.
+      \'\|<\h[[:alnum:]_-]*>\?\|\h[[:alnum:]_:#]*[!(]\?\|$\h\w*')
+
+
+function! necovim#get_complete_position(input) abort
+  let cur_text = necovim#get_cur_text(a:input)
+
+  if cur_text =~ '^\s*"'
+    " Comment.
+    return -1
+  endif
+
+  let pattern = '\.\%(\h\w*\)\?$\|\%(' .
+        \ g:necovim#keyword_pattern . '\)$'
+
+  let [complete_pos, complete_str] =
+        \ necovim#match_word(a:input, pattern)
+  if complete_pos < 0
+    " Use args pattern.
+    let [complete_pos, complete_str] =
+          \ necovim#match_word(a:input, '\S\+$')
+  endif
+
+  return complete_pos
+endfunction
+
+function! necovim#gather_candidates(input, complete_str) abort
+  let cur_text = necovim#get_cur_text(a:input)
+
+  if cur_text =~ '\h\w*\.\%(\h\w*\)\?$'
+    " Dictionary.
+    let complete_str = matchstr(cur_text, '.\%(\h\w*\)\?$')
+    return necovim#helper#var_dictionary(
+          \ cur_text, complete_str)
+  elseif a:complete_str =~# '^&\%([gl]:\)\?'
+    " Options.
+    let prefix = matchstr(a:complete_str, '^&\%([gl]:\)\?')
+    let list = deepcopy(necovim#helper#option(cur_text, a:complete_str))
+    for keyword in list
+      let keyword.word = prefix . keyword.word
+    endfor
+  elseif a:complete_str =~? '^\c<sid>'
+    " SID functions.
+    let prefix = matchstr(a:complete_str, '^\c<sid>')
+    let complete_str = substitute(
+          \ a:complete_str, '^\c<sid>', 's:', '')
+    let list = deepcopy(necovim#helper#function(cur_text, complete_str))
+    for keyword in list
+      let keyword.word = prefix . keyword.word[2:]
+      let keyword.abbr = prefix .
+            \ get(keyword, 'abbr', keyword.word)[2:]
+    endfor
+  elseif cur_text =~# '\<let\s'
+    let list = necovim#helper#let(cur_text, a:complete_str)
+  elseif cur_text =~# '\<has([''"]\w*$'
+    " Features.
+    let list = necovim#helper#feature(cur_text, a:complete_str)
+  elseif cur_text =~# '\<expand([''"][<>[:alnum:]]*$'
+    " Expand.
+    let list = necovim#helper#expand(cur_text, a:complete_str)
+  elseif a:complete_str =~ '^\$'
+    " Environment.
+    let list = necovim#helper#environment(cur_text, a:complete_str)
+  else
+    " Commands.
+    let list = necovim#helper#command(cur_text, a:complete_str)
+  endif
+
+  return list
+endfunction
+
+function! necovim#get_cur_text(input) abort
+  let cur_text = a:input
+  if &filetype == 'vimshell' && exists('*vimshell#get_secondary_prompt')
+        \   && empty(b:vimshell.continuation)
+    return cur_text[len(vimshell#get_secondary_prompt()) :]
+  endif
+
+  let line = line('.')
+  let cnt = 0
+  while cur_text =~ '^\s*\\' && line > 1 && cnt < 5
+    let cur_text = getline(line - 1) .
+          \ substitute(cur_text, '^\s*\\', '', '')
+    let line -= 1
+    let cnt += 1
+  endwhile
+
+  return split(cur_text, '\s\+|\s\+\|<bar>', 1)[-1]
+endfunction
+function! necovim#get_command(cur_text) abort
+  return matchstr(a:cur_text, '\<\%(\d\+\)\?\zs\h\w*\ze!\?\|'.
+        \ '\<\%([[:digit:],[:space:]$''<>]\+\)\?\zs\h\w*\ze/.*')
+endfunction
+
+function! necovim#match_word(cur_text, pattern) abort
+  let complete_pos = match(a:cur_text, a:pattern)
+
+  let complete_str = (complete_pos >=0) ?
+        \ a:cur_text[complete_pos :] : ''
+
+  return [complete_pos, complete_str]
+endfunction
diff --git a/vim/plugins/neco-vim/autoload/necovim/helper.vim b/vim/plugins/neco-vim/autoload/necovim/helper.vim
new file mode 100644
index 0000000..159b1f5
--- /dev/null
+++ b/vim/plugins/neco-vim/autoload/necovim/helper.vim
@@ -0,0 +1,673 @@
+"=============================================================================
+" FILE: helper.vim
+" AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
+" License: MIT license
+"=============================================================================
+
+if !exists('s:internal_candidates_list')
+  let s:internal_candidates_list = {}
+  let s:global_candidates_list = {
+        \ 'dictionary_variables' : {}, 'runtimepath' : &runtimepath }
+  let s:script_candidates_list = {}
+  let s:local_candidates_list = {}
+endif
+
+let s:dictionary_path =
+      \ substitute(fnamemodify(expand('<sfile>'), ':h'), '\\', '/', 'g')
+
+function! necovim#helper#make_cache() abort
+  if &filetype !=# 'vim'
+    return
+  endif
+
+  let s:script_candidates_list[bufnr('%')] =
+        \ s:get_script_candidates(bufnr('%'))
+endfunction
+
+function! necovim#helper#augroup(cur_text, complete_str) abort
+  " Make cache.
+  if s:check_global_candidates('augroups')
+    let s:global_candidates_list.augroups = s:get_augrouplist()
+  endif
+
+  return copy(s:global_candidates_list.augroups)
+endfunction
+function! necovim#helper#colorscheme_args(cur_text, complete_str) abort
+  return s:make_completion_list(map(split(
+        \ globpath(&runtimepath, 'colors/*.vim'), '\n'),
+        \ 'fnamemodify(v:val, ":t:r")'))
+endfunction
+function! necovim#helper#command(cur_text, complete_str) abort
+  if a:cur_text == '' ||
+        \ a:cur_text =~ '^[[:digit:],[:space:][:tab:]$''<>]*\h\w*$'
+    " Commands.
+
+    " Make cache.
+    if s:check_global_candidates('commands')
+      let s:global_candidates_list.commands = s:get_cmdlist()
+    endif
+    if !has_key(s:internal_candidates_list, 'commands')
+      let s:internal_candidates_list.commands = s:make_cache_commands()
+    endif
+
+    let list = copy(s:internal_candidates_list.commands)
+          \ + copy(s:global_candidates_list.commands)
+  else
+    " Commands args.
+
+    " Expression.
+    let list = necovim#helper#expression(a:cur_text, a:complete_str)
+
+    if s:has_cmdline()
+      let list += s:make_completion_list(
+            \ getcompletion(a:cur_text, 'cmdline'))
+      let list = s:uniq_by(list, 'v:val.word')
+    endif
+  endif
+
+  return list
+endfunction
+function! necovim#helper#environment(cur_text, complete_str) abort
+  " Make cache.
+  if s:check_global_candidates('environments')
+    let s:global_candidates_list.environments = s:get_envlist()
+  endif
+
+  return copy(s:global_candidates_list.environments)
+endfunction
+function! necovim#helper#expand(cur_text, complete_str) abort
+  return s:make_completion_list(
+        \ ['<cfile>', '<afile>', '<abuf>', '<amatch>',
+        \  '<sfile>', '<cword>', '<cWORD>', '<client>'])
+endfunction
+function! necovim#helper#expression(cur_text, complete_str) abort
+  return necovim#helper#function(a:cur_text, a:complete_str)
+        \+ necovim#helper#var(a:cur_text, a:complete_str)
+endfunction
+function! necovim#helper#feature(cur_text, complete_str) abort
+  if !has_key(s:internal_candidates_list, 'features')
+    let s:internal_candidates_list.features = s:make_cache_features()
+  endif
+  return copy(s:internal_candidates_list.features)
+endfunction
+function! necovim#helper#filetype(cur_text, complete_str) abort
+  if !has_key(s:internal_candidates_list, 'filetypes')
+    let s:internal_candidates_list.filetypes =
+          \ s:make_completion_list(map(
+          \ split(globpath(&runtimepath, 'syntax/*.vim'), '\n') +
+          \ split(globpath(&runtimepath, 'indent/*.vim'), '\n') +
+          \ split(globpath(&runtimepath, 'ftplugin/*.vim'), '\n')
+          \ , "matchstr(fnamemodify(v:val, ':t:r'), '^[[:alnum:]-]*')"))
+  endif
+
+  return copy(s:internal_candidates_list.filetypes)
+endfunction
+function! necovim#helper#function(cur_text, complete_str) abort
+  " Make cache.
+  if s:check_global_candidates('functions')
+    let s:global_candidates_list.functions = s:get_functionlist()
+  endif
+  if !has_key(s:internal_candidates_list, 'functions')
+    let s:internal_candidates_list.functions = s:make_cache_functions()
+  endif
+
+  let script_functions = values(s:get_cached_script_candidates().functions)
+  if a:complete_str =~ '^s:'
+    let list = script_functions
+  elseif a:complete_str =~ '^\a:'
+    let list = deepcopy(script_functions)
+    for keyword in list
+      let keyword.word = '<SID>' . keyword.word[2:]
+      let keyword.abbr = '<SID>' . keyword.abbr[2:]
+    endfor
+  else
+    let list = copy(s:internal_candidates_list.functions)
+          \ + copy(s:global_candidates_list.functions)
+          \ + script_functions
+    for functions in map(values(s:script_candidates_list), 'v:val.functions')
+      let list += values(filter(copy(functions), 'v:val.word[:1] !=# "s:"'))
+    endfor
+  endif
+
+  return list
+endfunction
+function! necovim#helper#let(cur_text, complete_str) abort
+  if a:cur_text !~ '='
+    return necovim#helper#var(a:cur_text, a:complete_str)
+  elseif a:cur_text =~# '\<let\s\+&\%([lg]:\)\?filetype\s*=\s*'
+    " FileType.
+    return necovim#helper#filetype(a:cur_text, a:complete_str)
+  else
+    return necovim#helper#expression(a:cur_text, a:complete_str)
+  endif
+endfunction
+function! necovim#helper#option(cur_text, complete_str) abort
+  " Make cache.
+  if !has_key(s:internal_candidates_list, 'options')
+    let s:internal_candidates_list.options = s:make_cache_options()
+  endif
+
+  if a:cur_text =~ '\<set\%[local]\s\+\%(filetype\|ft\)='
+    return necovim#helper#filetype(a:cur_text, a:complete_str)
+  else
+    return copy(s:internal_candidates_list.options)
+  endif
+endfunction
+function! necovim#helper#var_dictionary(cur_text, complete_str) abort
+  let var_name = matchstr(a:cur_text,
+        \'\%(\a:\)\?\h\w*\ze\.\%(\h\w*\%(()\?\)\?\)\?$')
+  let list = []
+  if a:cur_text =~ '[btwg]:\h\w*\.\%(\h\w*\%(()\?\)\?\)\?$'
+    let list = has_key(s:global_candidates_list.dictionary_variables, var_name) ?
+          \ values(s:global_candidates_list.dictionary_variables[var_name]) : []
+  elseif a:cur_text =~ 's:\h\w*\.\%(\h\w*\%(()\?\)\?\)\?$'
+    let list = values(get(s:get_cached_script_candidates().dictionary_variables,
+          \ var_name, {}))
+  endif
+
+  return list
+endfunction
+function! necovim#helper#var(cur_text, complete_str) abort
+  " Make cache.
+  if s:check_global_candidates('variables')
+    let s:global_candidates_list.variables =
+          \ s:get_variablelist(g:, 'g:') + s:get_variablelist(v:, 'v:')
+          \ + s:make_completion_list(['v:val'])
+  endif
+
+  if a:complete_str =~ '^[swtb]:'
+    let list = values(s:get_cached_script_candidates().variables)
+    if a:complete_str !~ '^s:'
+      let prefix = matchstr(a:complete_str, '^[swtb]:')
+      let list += s:get_variablelist(eval(prefix), prefix)
+    endif
+  elseif a:complete_str =~ '^[vg]:'
+    let list = copy(s:global_candidates_list.variables)
+  else
+    let list = s:get_local_variables()
+  endif
+
+  return list
+endfunction
+
+function! s:get_local_variables() abort
+  " Get local variable list.
+
+  let keyword_dict = {}
+  " Search function.
+  let line_num = line('.') - 1
+  let end_line = (line('.') > 100) ? line('.') - 100 : 1
+  while line_num >= end_line
+    let line = getline(line_num)
+    if line =~ '\<endf\%[unction]\>'
+      break
+    elseif line =~ '\<fu\%[nction]!\?\s\+'
+      " Get function arguments.
+      call s:analyze_variable_line(line, keyword_dict)
+      break
+    endif
+
+    let line_num -= 1
+  endwhile
+  let line_num += 1
+
+  let end_line = line('.') - 1
+  while line_num <= end_line
+    let line = getline(line_num)
+
+    if line =~ '\<\%(let\|for\)\s\+'
+      if line =~ '\<\%(let\|for\)\s\+s:' &&
+            \ has_key(s:script_candidates_list, bufnr('%'))
+            \ && has_key(s:script_candidates_list[bufnr('%')], 'variables')
+        let candidates_list = s:script_candidates_list[bufnr('%')].variables
+      else
+        let candidates_list = keyword_dict
+      endif
+
+      call s:analyze_variable_line(line, candidates_list)
+    endif
+
+    let line_num += 1
+  endwhile
+
+  return values(keyword_dict)
+endfunction
+
+function! s:get_cached_script_candidates() abort
+  return has_key(s:script_candidates_list, bufnr('%')) ?
+        \ s:script_candidates_list[bufnr('%')] : {
+        \   'functions' : {}, 'variables' : {},
+        \   'function_prototypes' : {}, 'dictionary_variables' : {} }
+endfunction
+function! s:get_script_candidates(bufnumber) abort
+  " Get script candidate list.
+
+  let function_dict = {}
+  let variable_dict = {}
+  let dictionary_variable_dict = {}
+  let function_prototypes = {}
+  let var_pattern = '\a:[[:alnum:]_:]*\.\h\w*\%(()\?\)\?'
+
+  for line in getbufline(a:bufnumber, 1, '$')
+    if line =~ '\<fu\%[nction]!\?\s\+'
+      call s:analyze_function_line(
+            \ line, function_dict, function_prototypes)
+    elseif line =~ '\<let\s\+'
+      " Get script variable.
+      call s:analyze_variable_line(line, variable_dict)
+    elseif line =~ var_pattern
+      while line =~ var_pattern
+        let var_name = matchstr(line, '\a:[[:alnum:]_:]*\ze\.\h\w*')
+        let candidates_dict = dictionary_variable_dict
+        if !has_key(candidates_dict, var_name)
+          let candidates_dict[var_name] = {}
+        endif
+
+        call s:analyze_dictionary_variable_line(
+              \ line, candidates_dict[var_name], var_name)
+
+        let line = line[matchend(line, var_pattern) :]
+      endwhile
+    endif
+  endfor
+
+  return { 'functions' : function_dict, 'variables' : variable_dict,
+        \ 'function_prototypes' : function_prototypes,
+        \ 'dictionary_variables' : dictionary_variable_dict }
+endfunction
+
+function! s:make_cache_options() abort
+  let options = map(filter(split(s:redir('set all'), '\s\{2,}\|\n')[1:],
+        \ "!empty(v:val) && v:val =~ '^\\h\\w*=\\?'"),
+        \ "substitute(v:val, '^no\\|=\\zs.*$', '', '')")
+  for option in copy(options)
+    if option[-1:] != '='
+      call add(options, 'no'.option)
+    endif
+  endfor
+
+  return map(filter(options, "v:val =~ '^\\h\\w*=\\?'"), "{
+        \ 'word' : substitute(v:val, '=$', '', ''), 'kind' : 'o',
+        \ }")
+endfunction
+function! s:make_cache_features() abort
+  let helpfile = expand(findfile('doc/eval.txt', &runtimepath))
+
+  if !filereadable(helpfile)
+    return []
+  endif
+
+  let features = []
+  let lines = readfile(helpfile)
+  let start = match(lines,
+        \ ((v:version > 704 || v:version == 704 && has('patch11')) ?
+        \   'acl' : '^all_builtin_terms'))
+  let end = match(lines, '^x11')
+  for l in lines[start : end]
+    let _ = matchlist(l, '^\(\k\+\)\t\+\(.\+\)$')
+    if !empty(_)
+      call add(features, {
+            \ 'word' : _[1],
+            \ 'menu' : '; ' . _[2],
+            \ })
+    endif
+  endfor
+
+  call add(features, {
+        \ 'word' : 'patch',
+        \ 'menu' : '; Included patches Ex: patch123',
+        \ })
+  if has('patch-7.4.237')
+    call add(features, {
+          \ 'word' : 'patch-',
+          \ 'menu' : '; Version and patches Ex: patch-7.4.237'
+          \ })
+  endif
+
+  return features
+endfunction
+function! s:make_cache_functions() abort
+  let helpfile = expand(findfile('doc/eval.txt', &runtimepath))
+  if !filereadable(helpfile)
+    return []
+  endif
+
+  let lines = readfile(helpfile)
+  let functions = []
+  let start = match(lines, '^abs')
+  let end = match(lines, '^abs', start, 2)
+  for i in range(end-1, start, -1)
+    let func = matchstr(lines[i], '^\s*\zs\w\+(.\{-})')
+    if func != ''
+      call insert(functions, {
+            \ 'word' : substitute(func, '(\zs.\+)', '', ''),
+            \ 'abbr' : substitute(func, '(\zs\s\+', '', ''),
+            \ })
+    endif
+  endfor
+
+  return functions
+endfunction
+function! s:make_cache_commands() abort
+  let helpfile = expand(findfile('doc/index.txt', &runtimepath))
+  if !filereadable(helpfile)
+    return []
+  endif
+
+  let lines = readfile(helpfile)
+  let commands = []
+  let start = match(lines, '^|:!|')
+  let end = match(lines, '^|:\~|', start)
+  for lnum in range(end, start, -1)
+    let desc = substitute(lines[lnum], '^\s\+\ze', '', 'g')
+    let _ = matchlist(desc, '^|:\(.\{-}\)|\s\+\S\+')
+    if !empty(_)
+      call add(commands, {
+            \ 'word' : _[1], 'kind' : 'c',
+            \ })
+    endif
+  endfor
+
+  return commands
+endfunction
+function! s:make_cache_autocmds() abort
+  let helpfile = expand(findfile('doc/autocmd.txt', &runtimepath))
+  if !filereadable(helpfile)
+    return []
+  endif
+
+  let lines = readfile(helpfile)
+  let autocmds = []
+  let start = match(lines, '^|BufNewFile|')
+  let end = match(lines, '^|User|', start)
+  let desc = ''
+  for lnum in range(end, start, -1)
+    let desc = substitute(lines[lnum], '^\s\+\ze', '', 'g') . ' ' . desc
+    let _ = matchlist(desc, '^|\(.\{-}\)|\s\+\S\+')
+    if !empty(_)
+      call add(autocmds, { 'word' : _[1], })
+      let desc = ''
+    endif
+  endfor
+
+  return autocmds
+endfunction
+
+function! s:get_cmdlist() abort
+  let list = exists('*getcompletion') ?
+        \ getcompletion('', 'command') :
+        \ split(s:redir('command'), '\n')[1:]
+  return s:make_completion_list(list)
+endfunction
+function! s:get_variablelist(dict, prefix) abort
+  let kind_dict =
+        \ ['0', '""', '()', '[]', '{}', '.', 'b', 'no', 'j', 'ch']
+  return values(map(copy(a:dict), "{
+        \ 'word' : a:prefix.v:key,
+        \ 'kind' : kind_dict[type(v:val)],
+        \}"))
+endfunction
+function! s:get_functionlist() abort
+  let keyword_dict = {}
+  let function_prototypes = {}
+  for line in split(s:redir('function'), '\n')
+    let line = line[9:]
+    if line =~ '^<SNR>'
+      continue
+    endif
+    let orig_line = line
+
+    let word = matchstr(line, '\h[[:alnum:]_:#.]*()\?')
+    if word != ''
+      let keyword_dict[word] = {
+            \ 'word' : word, 'abbr' : line,
+            \}
+
+      let function_prototypes[word] = orig_line[len(word):]
+    endif
+  endfor
+
+  let s:global_candidates_list.function_prototypes = function_prototypes
+
+  return values(keyword_dict)
+endfunction
+function! s:get_augrouplist() abort
+  let list = exists('*getcompletion') ?
+        \ getcompletion('', 'augroup') :
+        \ split(s:redir('augroup') . ' END', '\s\|\n')
+  return s:make_completion_list(list)
+endfunction
+function! s:get_mappinglist() abort
+  let keyword_list = []
+  for line in split(s:redir('map'), '\n')
+    let map = matchstr(line, '^\a*\s*\zs\S\+')
+    if map !~ '^<' || map =~ '^<SNR>'
+      continue
+    endif
+    call add(keyword_list, { 'word' : map })
+  endfor
+  return keyword_list
+endfunction
+function! s:get_envlist() abort
+  let keyword_list = []
+  for line in split(system('set'), '\n')
+    let word = '$' . toupper(matchstr(line, '^\h\w*'))
+    call add(keyword_list, { 'word' : word, 'kind' : 'e' })
+  endfor
+  return keyword_list
+endfunction
+
+function! s:make_completion_list(list) abort
+  return map(copy(a:list), "{ 'word' : v:val }")
+endfunction
+function! s:analyze_function_line(line, keyword_dict, prototype) abort
+  " Get script function.
+  let line = substitute(matchstr(a:line,
+        \ '\<fu\%[nction]!\?\s\+\zs.*)'), '".*$', '', '')
+  let orig_line = line
+  let word = matchstr(line, '^\h[[:alnum:]_:#.]*()\?')
+  if word != '' && !has_key(a:keyword_dict, word)
+    let a:keyword_dict[word] = {
+          \ 'word' : word, 'abbr' : line, 'kind' : 'f'
+          \}
+    let a:prototype[word] = orig_line[len(word):]
+  endif
+endfunction
+function! s:analyze_variable_line(line, keyword_dict) abort
+  if a:line =~ '\<\%(let\|for\)\s\+\a[[:alnum:]_:]*'
+    " let var = pattern.
+    let word = matchstr(a:line, '\<\%(let\|for\)\s\+\zs\a[[:alnum:]_:]*')
+    let expression = matchstr(a:line, '\<let\s\+\a[[:alnum:]_:]*\s*=\s*\zs.*$')
+    if !has_key(a:keyword_dict, word) 
+      let a:keyword_dict[word] = {
+            \ 'word' : word,
+            \ 'kind' : s:get_variable_type(expression)
+            \}
+    elseif expression != '' && a:keyword_dict[word].kind == ''
+      " Update kind.
+      let a:keyword_dict[word].kind = s:get_variable_type(expression)
+    endif
+  elseif a:line =~ '\<\%(let\|for\)\s\+\[.\{-}\]'
+    " let [var1, var2] = pattern.
+    let words = split(matchstr(a:line,
+          \'\<\%(let\|for\)\s\+\[\zs.\{-}\ze\]'), '[,[:space:]]\+')
+      let expressions = split(matchstr(a:line,
+            \'\<let\s\+\[.\{-}\]\s*=\s*\[\zs.\{-}\ze\]$'), '[,[:space:];]\+')
+
+      let i = 0
+      while i < len(words)
+        let expression = get(expressions, i, '')
+        let word = words[i]
+
+        if !has_key(a:keyword_dict, word) 
+          let a:keyword_dict[word] = {
+                \ 'word' : word,
+                \ 'kind' : s:get_variable_type(expression)
+                \}
+        elseif expression != '' && a:keyword_dict[word].kind == ''
+          " Update kind.
+          let a:keyword_dict[word].kind = s:get_variable_type(expression)
+        endif
+
+        let i += 1
+      endwhile
+    elseif a:line =~ '\<fu\%[nction]!\?\s\+'
+      " Get function arguments.
+      for arg in split(matchstr(a:line, '^[^(]*(\zs[^)]*'), '\s*,\s*')
+        let word = 'a:' . (arg == '...' ?  '000' : arg)
+        let a:keyword_dict[word] = {
+              \ 'word' : word,
+              \ 'kind' : (arg == '...' ?  '[]' : '')
+              \}
+
+      endfor
+      if a:line =~ '\.\.\.)'
+        " Extra arguments.
+        for arg in range(5)
+          let word = 'a:' . arg
+          let a:keyword_dict[word] = {
+                \ 'word' : word,
+                \ 'kind' : (arg == 0 ?  '0' : '')
+                \}
+        endfor
+      endif
+    endif
+endfunction
+function! s:analyze_dictionary_variable_line(line, keyword_dict, var_name) abort
+  let let_pattern = '\<let\s\+'.a:var_name.'\.\h\w*'
+  let call_pattern = '\<call\s\+'.a:var_name.'\.\h\w*()\?'
+
+  if a:line =~ let_pattern
+    let word = matchstr(a:line, a:var_name.'\zs\.\h\w*')
+    let kind = ''
+  elseif a:line =~ call_pattern
+    let word = matchstr(a:line, a:var_name.'\zs\.\h\w*()\?')
+    let kind = '()'
+  else
+    let word = matchstr(a:line, a:var_name.'\zs.\h\w*\%(()\?\)\?')
+    let kind = s:get_variable_type(
+          \ matchstr(a:line, a:var_name.'\.\h\w*\zs.*$'))
+  endif
+
+  if !has_key(a:keyword_dict, word)
+    let a:keyword_dict[word] = { 'word' : word, 'kind' : kind }
+  elseif kind != '' && a:keyword_dict[word].kind == ''
+    " Update kind.
+    let a:keyword_dict[word].kind = kind
+  endif
+endfunction
+function! s:split_args(cur_text, complete_str) abort
+  let args = split(a:cur_text)
+  if a:complete_str == ''
+    call add(args, '')
+  endif
+
+  return args
+endfunction
+
+" Initialize return types.
+function! s:set_dictionary_helper(variable, keys, value) abort
+  for key in split(a:keys, ',')
+    let a:variable[key] = a:value
+  endfor
+endfunction
+let s:function_return_types = {}
+call s:set_dictionary_helper(
+      \ s:function_return_types,
+      \ 'len,match,matchend',
+      \ '0')
+call s:set_dictionary_helper(
+      \ s:function_return_types,
+      \ 'input,matchstr',
+      \ '""')
+call s:set_dictionary_helper(
+      \ s:function_return_types,
+      \ 'expand,filter,sort,split',
+      \ '[]')
+
+function! s:get_variable_type(expression) abort
+  " Analyze variable type.
+  if a:expression =~ '^\%(\s*+\)\?\s*\d\+\.\d\+'
+    return '.'
+  elseif a:expression =~ '^\%(\s*+\)\?\s*\d\+'
+    return '0'
+  elseif a:expression =~ '^\%(\s*\.\)\?\s*["'']'
+    return '""'
+  elseif a:expression =~ '\<function('
+    return '()'
+  elseif a:expression =~ '^\%(\s*+\)\?\s*\['
+    return '[]'
+  elseif a:expression =~ '^\s*{\|^\.\h[[:alnum:]_:]*'
+    return '{}'
+  elseif a:expression =~ '\<\h\w*('
+    " Function.
+    let func_name = matchstr(a:expression, '\<\zs\h\w*\ze(')
+    return has_key(s:function_return_types, func_name) ? s:function_return_types[func_name] : ''
+  else
+    return ''
+  endif
+endfunction
+
+function! s:set_dictionary_helper(variable, keys, pattern) abort
+  for key in split(a:keys, '\s*,\s*')
+    if !has_key(a:variable, key)
+      let a:variable[key] = a:pattern
+    endif
+  endfor
+endfunction
+
+function! s:check_global_candidates(key) abort
+  if s:global_candidates_list.runtimepath !=# &runtimepath
+    let s:global_candidates_list.runtimepath = &runtimepath
+    return 1
+  endif
+
+  return !has_key(s:global_candidates_list, a:key)
+endfunction
+function! s:redir(command) abort
+  if exists('*execute')
+    return execute(a:command)
+  endif
+
+  redir => r
+  execute 'silent!' a:command
+  redir END
+
+  return r
+endfunction
+
+function! s:has_cmdline() abort
+  if !exists('*getcompletion')
+    return 0
+  endif
+
+  try
+    call getcompletion('', 'cmdline')
+  catch
+    return 0
+  endtry
+
+  return 1
+endfunction
+
+" Removes duplicates from a list.
+function! s:uniq(list) abort
+  return s:uniq_by(a:list, 'v:val')
+endfunction
+
+" Removes duplicates from a list.
+function! s:uniq_by(list, f) abort
+  let list = map(copy(a:list), printf('[v:val, %s]', a:f))
+  let i = 0
+  let seen = {}
+  while i < len(list)
+    let key = string(list[i][1])
+    if has_key(seen, key)
+      call remove(list, i)
+    else
+      let seen[key] = 1
+      let i += 1
+    endif
+  endwhile
+  return map(list, 'v:val[0]')
+endfunction
diff --git a/vim/plugins/neco-vim/autoload/neocomplete/sources/vim.vim b/vim/plugins/neco-vim/autoload/neocomplete/sources/vim.vim
new file mode 100644
index 0000000..3835b0c
--- /dev/null
+++ b/vim/plugins/neco-vim/autoload/neocomplete/sources/vim.vim
@@ -0,0 +1,29 @@
+"=============================================================================
+" FILE: vim.vim
+" AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
+" License: MIT license
+"=============================================================================
+
+let s:source = {
+      \ 'name' : 'vim',
+      \ 'kind' : 'manual',
+      \ 'filetypes' : { 'vim' : 1, 'vimconsole' : 1, },
+      \ 'mark' : '[vim]',
+      \ 'is_volatile' : 1,
+      \ 'rank' : 300,
+      \ 'input_pattern' : '\.\w*',
+      \}
+
+function! s:source.get_complete_position(context) abort "{{{
+  return necovim#get_complete_position(a:context.input)
+endfunction"}}}
+
+function! s:source.gather_candidates(context) abort "{{{
+  return necovim#gather_candidates(a:context.input, a:context.complete_str)
+endfunction"}}}
+
+function! neocomplete#sources#vim#define() abort "{{{
+  return s:source
+endfunction"}}}
+
+" vim: foldmethod=marker
diff --git a/vim/plugins/neco-vim/doc/necovim.txt b/vim/plugins/neco-vim/doc/necovim.txt
new file mode 100644
index 0000000..27406bc
--- /dev/null
+++ b/vim/plugins/neco-vim/doc/necovim.txt
@@ -0,0 +1,53 @@
+*necovim.txt*	Vim source for neocomplete/deoplete.
+
+Version: 0.1
+Author: Shougo <Shougo.Matsu at gmail.com>
+License: MIT license
+
+CONTENTS					*necovim-contents*
+
+Introduction		|necovim-introduction|
+Install			|necovim-install|
+Interface		|necovim-interface|
+  Commands		  |necovim-commands|
+  Variables		  |necovim-variables|
+FAQ			|necovim-faq|
+
+==============================================================================
+INTRODUCTION					*necovim-introduction*
+
+*neco-vim* is the Vim source for neocomplete/deoplete.
+
+==============================================================================
+INSTALL						*necovim-install*
+
+
+==============================================================================
+INTERFACE					*necovim-interface*
+
+------------------------------------------------------------------------------
+COMMANDS 					*necovim-commands*
+
+------------------------------------------------------------------------------
+VARIABLES 					*necovim-variables*
+
+				*g:necovim#complete_functions*
+g:necovim#complete_functions
+		It which appoints vim source call function when completes
+		custom and customlist command.  The key is command name.  The
+		value is function name.
+
+		Default value is {}.
+>
+		" Examples:
+		if !exists('g:necovim#complete_functions')
+		  let g:necovim#complete_functions = {}
+		endif
+		let g:necovim#complete_functions.Ref =
+		\ 'ref#complete'
+<
+==============================================================================
+FAQ						*necovim-faq*
+
+==============================================================================
+vim:tw=78:ts=8:ft=help:norl:noet:fen:noet:
diff --git a/vim/plugins/neco-vim/plugin/necovim.vim b/vim/plugins/neco-vim/plugin/necovim.vim
new file mode 100644
index 0000000..ef87093
--- /dev/null
+++ b/vim/plugins/neco-vim/plugin/necovim.vim
@@ -0,0 +1,26 @@
+"=============================================================================
+" FILE: necovim.vim
+" AUTHOR:  Shougo Matsushita <Shougo.Matsu@gmail.com>
+" License: MIT license
+"=============================================================================
+
+augroup necovim
+  autocmd!
+  autocmd BufWritePost,FileType vim call necovim#helper#make_cache()
+
+  " Register source for NCM
+  autocmd User CmSetup call cm#register_source({
+        \ 'name': 'vim',
+        \ 'abbreviation': 'vim',
+        \ 'priority': 9,
+        \ 'scoping': 1,
+        \ 'scopes': ['vim'],
+        \ 'cm_refresh': 'cm#sources#necovim#refresh',
+        \ 'cm_refresh_patterns': ['\w\+\.$'],
+        \ })
+augroup END
+
+let g:loaded_necovim = 1
+
+" __END__
+" vim: foldmethod=marker
diff --git a/vim/plugins/neco-vim/rplugin/python3/deoplete/sources/vim.py b/vim/plugins/neco-vim/rplugin/python3/deoplete/sources/vim.py
new file mode 100644
index 0000000..9d858a3
--- /dev/null
+++ b/vim/plugins/neco-vim/rplugin/python3/deoplete/sources/vim.py
@@ -0,0 +1,29 @@
+#=============================================================================
+# FILE: vim.py
+# AUTHOR:  Shougo Matsushita <Shougo.Matsu at gmail.com>
+# License: MIT license
+#=============================================================================
+
+from .base import Base
+
+import deoplete.util
+
+class Source(Base):
+    def __init__(self, vim):
+        Base.__init__(self, vim)
+
+        self.name = 'vim'
+        self.mark = '[vim]'
+        self.filetypes = ['vim']
+        self.is_bytepos = True
+        self.rank = 500
+        self.input_pattern = r'\.\w*'
+
+    def get_complete_position(self, context):
+        return self.vim.call('necovim#get_complete_position',
+                             context['input'])
+
+    def gather_candidates(self, context):
+        return self.vim.call('necovim#gather_candidates',
+                             context['input'],
+                             context['complete_str'])
diff --git a/vim/plugins/nerdcommenter/.gitignore b/vim/plugins/nerdcommenter/.gitignore
new file mode 100644
index 0000000..3698c0e
--- /dev/null
+++ b/vim/plugins/nerdcommenter/.gitignore
@@ -0,0 +1,3 @@
+*~
+*.swp
+tags
diff --git a/vim/plugins/nerdcommenter/README.md b/vim/plugins/nerdcommenter/README.md
new file mode 100644
index 0000000..fd7eec0
--- /dev/null
+++ b/vim/plugins/nerdcommenter/README.md
@@ -0,0 +1,156 @@
+# NERD Commenter
+
+Comment functions so powerful—no comment necessary.
+
+## Installation
+
+### Via Plugin Manager (Recommended)
+
+#### [Vim-Plug](https://github.com/junegunn/vim-plug)
+
+1. Add `Plug 'scrooloose/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:PlugInstall`
+
+#### [Vundle](https://github.com/VundleVim/Vundle.vim) or similar
+
+1. Add `Plugin 'scrooloose/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:BundleInstall`
+
+#### [NeoBundle](https://github.com/Shougo/neobundle.vim)
+
+1. Add `NeoBundle 'scrooloose/nerdcommenter'` to your vimrc file.
+2. Reload your vimrc or restart
+3. Run `:NeoUpdate``
+
+#### [Pathogen](https://github.com/tpope/vim-pathogen)
+
+```sh
+cd ~/.vim/bundle
+git clone https://github.com/scrooloose/nerdcommenter.git
+```
+
+### Manual Installation
+
+#### Unix
+
+(For Neovim, change `~/.vim/` to `~/.config/nvim/`.)
+
+```sh
+curl -fLo ~/.vim/plugin/NERD_Commenter.vim --create-dirs \
+  https://raw.githubusercontent.com/scrooloose/nerdcommenter/master/plugin/NERD_commenter.vim
+curl -fLo ~/.vim/doc/NERD_Commenter.txt --create-dirs \
+  https://raw.githubusercontent.com/scrooloose/nerdcommenter/master/doc/NERD_commenter.txt
+```
+
+#### Windows (PowerShell)
+
+```powershell
+md ~\vimfiles\plugin
+md ~\vimfiles\doc
+$pluguri = 'https://raw.githubusercontent.com/scrooloose/nerdcommenter/master/plugin/NERD_commenter.vim'
+$docsuri = 'https://raw.githubusercontent.com/scrooloose/nerdcommenter/master/doc/NERD_commenter.txt'
+(New-Object Net.WebClient).DownloadFile($pluguri, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("~\vimfiles\plugin\NERD_commenter.vim"))
+(New-Object Net.WebClient).DownloadFile($docsuri, $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath("~\vimfiles\doc\NERD_commenter.txt"))
+```
+
+### Post Installation
+
+Make sure that you have filetype plugins enabled, as the plugin makes use of **|commentstring|** where possible (which is usually set in a filetype plugin). See **|filetype-plugin-on|** for details, but the short version is make sure this line appears in your vimrc:
+
+```sh
+filetype plugin on
+```
+
+## Usage
+
+### Documentation
+
+Please see the vim help system for full documentation of all options: `:help nerdcommenter`
+
+### Settings
+
+Several settings can be added to your vimrc to change the default behavior. Some examples:
+
+```vim
+" Add spaces after comment delimiters by default
+let g:NERDSpaceDelims = 1
+
+" Use compact syntax for prettified multi-line comments
+let g:NERDCompactSexyComs = 1
+
+" Align line-wise comment delimiters flush left instead of following code indentation
+let g:NERDDefaultAlign = 'left'
+
+" Set a language to use its alternate delimiters by default
+let g:NERDAltDelims_java = 1
+
+" Add your own custom formats or override the defaults
+let g:NERDCustomDelimiters = { 'c': { 'left': '/**','right': '*/' } }
+
+" Allow commenting and inverting empty lines (useful when commenting a region)
+let g:NERDCommentEmptyLines = 1
+
+" Enable trimming of trailing whitespace when uncommenting
+let g:NERDTrimTrailingWhitespace = 1
+```
+
+### Default mappings
+
+The following key mappings are provided by default (there is also a menu provided that contains menu items corresponding to all the below mappings):
+
+Most of the following mappings are for normal/visual mode only. The **|NERDComInsertComment|** mapping is for insert mode only.
+
+  * `[count]<leader>cc` **|NERDComComment|**
+
+    Comment out the current line or text selected in visual mode.
+
+  * `[count]<leader>cn` **|NERDComNestedComment|**
+
+    Same as <leader>cc but forces nesting.
+
+  * `[count]<leader>c<space>` **|NERDComToggleComment|**
+
+    Toggles the comment state of the selected line(s). If the topmost selected line is commented, all selected lines are uncommented and vice versa.
+
+  * `[count]<leader>cm` **|NERDComMinimalComment|**
+
+    Comments the given lines using only one set of multipart delimiters.
+
+  * `[count]<leader>ci` **|NERDComInvertComment|**
+
+    Toggles the comment state of the selected line(s) individually.
+
+  * `[count]<leader>cs` **|NERDComSexyComment|**
+
+    Comments out the selected lines with a pretty block formatted layout.
+
+  * `[count]<leader>cy` **|NERDComYankComment|**
+
+    Same as <leader>cc except that the commented line(s) are yanked first.
+
+  * `<leader>c$` **|NERDComEOLComment|**
+
+    Comments the current line from the cursor to the end of line.
+
+  * `<leader>cA` **|NERDComAppendComment|**
+
+    Adds comment delimiters to the end of line and goes into insert mode between them.
+
+  * **|NERDComInsertComment|**
+
+    Adds comment delimiters at the current cursor position and inserts between. Disabled by default.
+
+  * `<leader>ca` **|NERDComAltDelim|**
+
+    Switches to the alternative set of delimiters.
+
+  * `[count]<leader>cl`  
+    `[count]<leader>cb` **|NERDComAlignedComment|**
+
+    Same as **|NERDComComment|** except that the delimiters are aligned down the left side (`<leader>cl`) or both sides (`<leader>cb`).
+
+  * `[count]<leader>cu` **|NERDComUncommentLine|**
+
+    Uncomments the selected line(s).
diff --git a/vim/plugins/nerdcommenter/Rakefile b/vim/plugins/nerdcommenter/Rakefile
new file mode 100644
index 0000000..c7bf9e6
--- /dev/null
+++ b/vim/plugins/nerdcommenter/Rakefile
@@ -0,0 +1,76 @@
+# written by travis jeffery <travisjeffery@gmail.com>
+# contributions by scrooloose <github:scrooloose>
+
+require 'rake'
+require 'find'
+require 'pathname'
+
+IGNORE = [/\.gitignore$/, /Rakefile$/]
+
+files = `git ls-files`.split("\n")
+files.reject! { |f| IGNORE.any? { |re| f.match(re) } }
+
+desc 'Zip up the project files'
+task :zip do
+  zip_name = File.basename(File.dirname(__FILE__))
+  zip_name.gsub!(/ /, '_')
+  zip_name = "#{zip_name}.zip"
+
+  if File.exist?(zip_name)
+    abort("Zip file #{zip_name} already exists. Remove it first.")
+  end
+
+  puts "Creating zip file: #{zip_name}"
+  system("zip #{zip_name} #{files.join(" ")}")
+end
+
+desc 'Install plugin and documentation'
+task :install do
+  vimfiles = if ENV['VIMFILES']
+               ENV['VIMFILES']
+             elsif RUBY_PLATFORM =~ /(win|w)32$/
+               File.expand_path("~/vimfiles")
+             else
+               File.expand_path("~/.vim")
+             end
+  files.each do |file|
+    target_file = File.join(vimfiles, file)
+    FileUtils.mkdir_p File.dirname(target_file)
+    FileUtils.cp file, target_file
+
+    puts "Installed #{file} to #{target_file}"
+  end
+
+end
+
+desc 'Pulls from origin'
+task :pull do
+  puts "Updating local repo..."
+  system("cd " << Dir.new(File.dirname(__FILE__)).path << " && git pull")
+end
+
+desc 'Calls pull task and then install task'
+task :update => ['pull', 'install'] do
+  puts "Update of vim script complete."
+end
+
+desc 'Uninstall plugin and documentation'
+task :uninstall do
+  vimfiles = if ENV['VIMFILES']
+               ENV['VIMFILES']
+             elsif RUBY_PLATFORM =~ /(win|w)32$/
+               File.expand_path("~/vimfiles")
+             else
+               File.expand_path("~/.vim")
+             end
+  files.each do |file|
+    target_file = File.join(vimfiles, file)
+    FileUtils.rm target_file
+
+    puts "Uninstalled #{target_file}"
+  end
+
+end
+
+task :default => ['update']
+
diff --git a/vim/plugins/nerdcommenter/doc/NERD_commenter.txt b/vim/plugins/nerdcommenter/doc/NERD_commenter.txt
new file mode 100644
index 0000000..d37507a
--- /dev/null
+++ b/vim/plugins/nerdcommenter/doc/NERD_commenter.txt
@@ -0,0 +1,1101 @@
+*NERD_commenter.txt*         Plugin for commenting code
+
+
+                        NERD COMMENTER REFERENCE MANUAL~
+
+
+
+
+
+==============================================================================
+CONTENTS                                               *NERDCommenterContents*
+
+    1.Intro...................................|NERDCommenter|
+    2.Installation............................|NERDComInstallation|
+    3.Functionality provided..................|NERDComFunctionality|
+        3.1 Functionality Summary.............|NERDComFunctionalitySummary|
+        3.2 Functionality Details.............|NERDComFunctionalityDetails|
+            3.2.1 Comment map.................|NERDComComment|
+            3.2.2 Nested comment map..........|NERDComNestedComment|
+            3.2.3 Toggle comment map..........|NERDComToggleComment|
+            3.2.4 Minimal comment map.........|NERDComMinimalComment|
+            3.2.5 Invert comment map..........|NERDComInvertComment|
+            3.2.6 Sexy comment map............|NERDComSexyComment|
+            3.2.7 Yank comment map............|NERDComYankComment|
+            3.2.8 Comment to EOL map..........|NERDComEOLComment|
+            3.2.9 Append com to line map......|NERDComAppendComment|
+            3.2.10 Insert comment map.........|NERDComInsertComment|
+            3.2.11 Use alternate delims map...|NERDComAltDelim|
+            3.2.12 Comment aligned maps.......|NERDComAlignedComment|
+            3.2.13 Uncomment line map.........|NERDComUncommentLine|
+        3.3 Sexy Comments.....................|NERDComSexyComments|
+        3.4 The NERDComment function..........|NERDComNERDComment|
+        3.5 The Hooks.........................|NERDComHooks|
+    4.Options.................................|NERDComOptions|
+        4.1 Options summary...................|NERDComOptionsSummary|
+        4.2 Options details...................|NERDComOptionsDetails|
+        4.3 Default delimiter Options.........|NERDComDefaultDelims|
+    5. Customising key mappings...............|NERDComMappings|
+    6. Issues with the script.................|NERDComIssues|
+        6.1 Delimiter detection heuristics....|NERDComHeuristics|
+        6.2 Nesting issues....................|NERDComNesting|
+    7.About..     ............................|NERDComAbout|
+    8.Changelog...............................|NERDComChangelog|
+    9.Credits.................................|NERDComCredits|
+    10.License................................|NERDComLicense|
+
+==============================================================================
+1. Intro                                                       *NERDCommenter*
+
+The NERD commenter provides many different commenting operations and styles
+which are invoked via key mappings and a menu. These operations are available
+for most filetypes.
+
+There are also options that allow to tweak the commenting engine to your
+taste.
+
+==============================================================================
+2. Installation                                          *NERDComInstallation*
+
+The NERD Commenter requires Vim 7 or higher.
+
+Extract the plugin files in your ~/.vim (*nix) or ~/vimfiles (Windows). You
+should have 2 files: >
+    plugin/NERD_commenter.vim
+    doc/NERD_commenter.txt
+<
+Next, to finish installing the help file run: >
+    :helptags ~/.vim/doc
+<
+See |add-local-help| for more details.
+
+Make sure that you have filetype plugins enabled, as the script makes use of
+|'commentstring'| where possible (which is usually set in a filetype plugin).
+See |filetype-plugin-on| for details, but basically, stick this in your vimrc >
+    filetype plugin on
+<
+
+==============================================================================
+3. Functionality provided                               *NERDComFunctionality*
+
+------------------------------------------------------------------------------
+3.1 Functionality summary                        *NERDComFunctionalitySummary*
+
+The following key mappings are provided by default (there is also a menu
+with items corresponding to all the mappings below):
+
+[count]|<Leader>|cc |NERDComComment|
+Comment out the current line or text selected in visual mode.
+
+
+[count]|<Leader>|cn |NERDComNestedComment|
+Same as |<Leader>|cc but forces nesting.
+
+
+[count]|<Leader>|c<space> |NERDComToggleComment|
+Toggles the comment state of the selected line(s). If the topmost selected
+line is commented, all selected lines are uncommented and vice versa.
+
+
+[count]|<Leader>|cm |NERDComMinimalComment|
+Comments the given lines using only one set of multipart delimiters.
+
+
+[count]|<Leader>|ci |NERDComInvertComment|
+Toggles the comment state of the selected line(s) individually.
+
+
+[count]|<Leader>|cs |NERDComSexyComment|
+Comments out the selected lines ``sexily''
+
+
+[count]|<Leader>|cy |NERDComYankComment|
+Same as |<Leader>|cc except that the commented line(s) are yanked first.
+
+
+|<Leader>|c$ |NERDComEOLComment|
+Comments the current line from the cursor to the end of line.
+
+
+|<Leader>|cA |NERDComAppendComment|
+Adds comment delimiters to the end of line and goes into insert mode between
+them.
+
+
+|NERDComInsertComment|
+Adds comment delimiters at the current cursor position and inserts between.
+Disabled by default.
+
+
+|<Leader>|ca |NERDComAltDelim|
+Switches to the alternative set of delimiters.
+
+
+[count]|<Leader>|cl
+[count]|<Leader>|cb    |NERDComAlignedComment|
+Same as |NERDComComment| except that the delimiters are aligned down the
+left side (|<Leader>|cl) or both sides (|<Leader>|cb).
+
+
+[count]|<Leader>|cu |NERDComUncommentLine|
+Uncomments the selected line(s).
+
+
+With the optional repeat.vim plugin (vimscript #2136), the mappings can also
+be repeated via |.|
+
+------------------------------------------------------------------------------
+3.2 Functionality details                        *NERDComFunctionalityDetails*
+
+------------------------------------------------------------------------------
+3.2.1 Comment map                                             *NERDComComment*
+
+Default mapping: [count]|<Leader>|cc
+Mapped to: <plug>NERDCommenterComment
+Applicable modes: normal visual visual-line visual-block.
+
+
+Comments out the current line. If multiple lines are selected in visual-line
+mode, they are all commented out.  If some text is selected in visual or
+visual-block mode then the script will try to comment out the exact text that
+is selected using multi-part delimiters if they are available.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.2 Nested comment map                                *NERDComNestedComment*
+
+Default mapping: [count]|<Leader>|cn
+Mapped to: <plug>NERDCommenterNested
+Applicable modes: normal visual visual-line visual-block.
+
+Performs nested commenting.  Works the same as |<Leader>|cc except that if a line
+is already commented then it will be commented again.
+
+If |'NERDUsePlaceHolders'| is set then the previous comment delimiters will
+be replaced by place-holder delimiters if needed.  Otherwise the nested
+comment will only be added if the current commenting delimiters have no right
+delimiter (to avoid syntax errors)
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related options:
+|'NERDDefaultNesting'|
+
+------------------------------------------------------------------------------
+3.2.3 Toggle comment map                                *NERDComToggleComment*
+
+Default mapping: [count]|<Leader>|c<space>
+Mapped to: <plug>NERDCommenterToggle
+Applicable modes: normal visual-line.
+
+Toggles commenting of the lines selected. The behaviour of this mapping
+depends on whether the first line selected is commented or not.  If so, all
+selected lines are uncommented and vice versa.
+
+With this mapping, a line is only considered to be commented if it starts with
+a left delimiter.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.4 Minimal comment map                              *NERDComMinimalComment*
+
+Default mapping: [count]|<Leader>|cm
+Mapped to: <plug>NERDCommenterMinimal
+Applicable modes: normal visual-line.
+
+Comments the selected lines using one set of multipart delimiters if possible.
+
+For example: if you are programming in c and you select 5 lines and press
+|<Leader>|cm then a '/*' will be placed at the start of the top line and a '*/'
+will be placed at the end of the last line.
+
+Sets of multipart comment delimiters that are between the top and bottom
+selected lines are replaced with place holders (see |'NERDLPlace'|) if
+|'NERDUsePlaceHolders'| is set for the current filetype. If it is not, then
+the comment will be aborted if place holders are required to prevent illegal
+syntax.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.5 Invert comment map                                *NERDComInvertComment*
+
+Default mapping: |<Leader>|ci
+Mapped to: <plug>NERDCommenterInvert
+Applicable modes: normal visual-line.
+
+Inverts the commented state of each selected line. If the selected line is
+commented then it is uncommented and vice versa. Each line is examined and
+commented/uncommented individually.
+
+With this mapping, a line is only considered to be commented if it starts with
+a left delimiter.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.6 Sexy comment map                                    *NERDComSexyComment*
+
+Default mapping: [count]|<Leader>|cs
+Mapped to: <plug>NERDCommenterSexy
+Applicable modes: normal, visual-line.
+
+Comments the selected line(s) ``sexily''. See |NERDComSexyComments| for
+a description of what sexy comments are. Can only be done on filetypes for
+which there is at least one set of multipart comment delimiters specified.
+
+Sexy comments cannot be nested and lines inside a sexy comment cannot be
+commented again.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related options:
+|'NERDCompactSexyComs'|
+
+------------------------------------------------------------------------------
+3.2.7 Yank comment map                                    *NERDComYankComment*
+
+Default mapping: [count]|<Leader>|cy
+Mapped to: <plug>NERDCommenterYank
+Applicable modes: normal visual visual-line visual-block.
+
+Same as |<Leader>|cc except that it yanks the line(s) that are commented first.
+
+------------------------------------------------------------------------------
+3.2.8 Comment to EOL map                                   *NERDComEOLComment*
+
+Default mapping: |<Leader>|c$
+Mapped to: <plug>NERDCommenterToEOL
+Applicable modes: normal.
+
+Comments the current line from the current cursor position up to the end of
+the line.
+
+------------------------------------------------------------------------------
+3.2.9 Append com to line map                            *NERDComAppendComment*
+
+Default mapping: |<Leader>|cA
+Mapped to: <plug>NERDCommenterAppend
+Applicable modes: normal.
+
+Appends comment delimiters to the end of the current line and goes
+to insert mode between the new delimiters.
+
+------------------------------------------------------------------------------
+3.2.10 Insert comment map                               *NERDComInsertComment*
+
+Default mapping: disabled by default.
+Map it to: <plug>NERDCommenterInsert
+Applicable modes: insert.
+
+Adds comment delimiters at the current cursor position and inserts
+between them.
+
+NOTE: prior to version 2.1.17 this was mapped to <C-c>. To restore this
+mapping add >
+    imap <C-c> <plug>NERDCommenterInsert
+<
+to your vimrc.
+
+------------------------------------------------------------------------------
+3.2.11 Use alternate delims map                              *NERDComAltDelim*
+
+Default mapping: |<Leader>|ca
+Mapped to: <plug>NERDCommenterAltDelims
+Applicable modes: normal.
+
+Changes to the alternative commenting style if one is available. For example,
+if the user is editing a c++ file using // comments and they hit |<Leader>|ca
+then they will be switched over to /**/ comments.
+
+See also |NERDComDefaultDelims|
+
+------------------------------------------------------------------------------
+3.2.12 Comment aligned maps                            *NERDComAlignedComment*
+
+Default mappings: [count]|<Leader>|cl   [count]|<Leader>|cb
+Mapped to: <plug>NERDCommenterAlignLeft
+           <plug>NERDCommenterAlignBoth
+Applicable modes: normal visual-line.
+
+Same as |<Leader>|cc except that the comment delimiters are aligned on the left
+side or both sides respectively. These comments are always nested if the
+line(s) are already commented.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+------------------------------------------------------------------------------
+3.2.13 Uncomment line map                               *NERDComUncommentLine*
+
+Default mapping: [count]|<Leader>|cu
+Mapped to: <plug>NERDCommenterUncomment
+Applicable modes: normal visual visual-line visual-block.
+
+Uncomments the current line. If multiple lines are selected in
+visual mode then they are all uncommented.
+
+When uncommenting, if the line contains multiple sets of delimiters then the
+``outermost'' pair of delimiters will be removed.
+
+The script uses a set of heuristics to distinguish ``real'' delimiters from
+``fake'' ones when uncommenting. See |NERDComIssues| for details.
+
+If a [count] is given in normal mode, the mapping works as though that many
+lines were selected in visual-line mode.
+
+Related  options:
+|'NERDRemoveAltComs'|
+|'NERDRemoveExtraSpaces'|
+
+------------------------------------------------------------------------------
+3.3 Sexy Comments                                        *NERDComSexyComments*
+These are comments that use one set of multipart comment delimiters as well as
+one other marker symbol. For example: >
+    /*
+     * This is a c style sexy comment
+     * So there!
+     */
+
+    /* This is a c style sexy comment
+     * So there!
+     * But this one is ``compact'' style */
+<
+Here the multipart delimiters are /* and */ and the marker is *.
+
+------------------------------------------------------------------------------
+3.4 The NERDComment function                             *NERDComNERDComment*
+
+All of the NERD commenter mappings and menu items invoke a single function
+which delegates the commenting work to other functions. This function is
+public and has the prototype: >
+    function! NERDComment(mode, type)
+<
+The arguments to this function are simple:
+    - mode: a character indicating the mode in which the comment is requested:
+     'n' for Normal mode, 'x' for Visual mode
+    - type: is used to specify what type of commenting operation is to be
+      performed, and it can be one of the following: "sexy", "invert",
+      "minimal", "toggle", "alignLeft", "alignBoth", "comment", "nested",
+      "toEOL", "append", "insert", "uncomment", "yank"
+
+For example, if you typed >
+    :call NERDComment(1, 'sexy')
+<
+then the script would do a sexy comment on the last visual selection.
+
+------------------------------------------------------------------------------
+3.5 The hooks                                                   *NERDComHooks*
+|fu! NERDCommenter_before()|  Before NERDComment/SwitchToAlternativeDelimiters
+|fu! NERDCommenter_after()|    After NERDComment/SwitchToAlternativeDelimiters
+
+For example, in order to handle different language blocks embedded in the same
+file such as |vim-vue|, you can change the filetype, comment something and
+change the filetype back: >
+    let g:ft = ''
+    fu! NERDCommenter_before()
+        if &ft == 'vue'
+            let g:ft = 'vue'
+            let stack = synstack(line('.'), col('.'))
+            if len(stack) > 0
+                let syn = synIDattr((stack)[0], 'name')
+                if len(syn) > 0
+                    let syn = tolower(syn)
+                    exe 'setf '.syn
+                endif
+            endif
+        endif
+    endfu
+    fu! NERDCommenter_after()
+        if g:ft == 'vue'
+            setf vue
+            let g:ft = ''
+        endif
+    endfu
+<
+
+==============================================================================
+4. Options                                                    *NERDComOptions*
+
+------------------------------------------------------------------------------
+4.1 Options summary                                    *NERDComOptionsSummary*
+
+|'loaded_nerd_comments'|              Turns off the script.
+
+|'NERDAllowAnyVisualDelims'|          Allows multipart alternative delimiters
+                                      to be used when commenting in
+                                      visual/visual-block mode.
+
+|'NERDBlockComIgnoreEmpty'|           Forces right delimiters to be placed
+                                      when doing visual-block comments.
+
+|'NERDCommentEmptyLines'|             Specifies if empty lines should be
+                                      commented (useful with regions).
+
+|'NERDCommentWholeLinesInVMode'|      Changes behaviour of visual comments.
+
+|'NERDCreateDefaultMappings'|         Turn the default mappings on/off.
+
+|'NERDCustomDelimiters'|              Add or override delimiters for any
+                                      filetypes.
+                                      
+|'NERDDefaultNesting'|                Tells the script to use nested comments
+                                      by default.
+                                      
+|'NERDMenuMode'|                      Specifies how the NERD commenter menu
+                                      will appear (if at all).
+                                      
+|'NERDLPlace'|                        Specifies what to use as the left
+                                      delimiter placeholder when nesting
+                                      comments.
+                                      
+|'NERDUsePlaceHolders'|               Specifies which filetypes may use
+                                      placeholders when nesting comments.
+                                      
+|'NERDRemoveAltComs'|                 Tells the script whether to remove
+                                      alternative comment delimiters when
+                                      uncommenting.
+                                      
+|'NERDRemoveExtraSpaces'|             Tells the script to always remove the
+                                      extra spaces when uncommenting
+                                      (regardless of whether NERDSpaceDelims
+                                      is set).
+                                      
+|'NERDRPlace'|                        Specifies what to use as the right
+                                      delimiter placeholder when nesting
+                                      comments.
+                                      
+|'NERDSpaceDelims'|                   Specifies whether to add extra spaces
+                                      around delimiters when commenting, and
+                                      whether to remove them when
+                                      uncommenting.
+                                      
+|'NERDTrimTrailingWhitespace'|        Specifies if trailing whitespace
+                                      should be deleted when uncommenting.
+
+|'NERDCompactSexyComs'|               Specifies whether to use the compact
+                                      style sexy comments.
+
+|'NERDDefaultAlign'|                  Specifies the default alignment to use,
+                                      one of 'none', 'left', 'start', or
+                                      'both'.
+
+------------------------------------------------------------------------------
+4.3 Options details                                    *NERDComOptionsDetails*
+
+To enable any of the below options you should put the given line in your
+~/.vimrc
+
+                                                       *'loaded_nerd_comments'*
+If this script is driving you insane you can turn it off by setting this
+option >
+    let loaded_nerd_comments=1
+<
+------------------------------------------------------------------------------
+                                                    *'NERDAllowAnyVisualDelims'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 1 then, when doing a visual or visual-block comment (but not a
+visual-line comment), the script will choose the right delimiters to use for
+the comment. This means either using the current delimiters if they are
+multipart or using the alternative delimiters if THEY are multipart.  For
+example if we are editing the following java code: >
+    float foo = 1221;
+    float bar = 324;
+    System.out.println(foo * bar);
+<
+If we are using // comments and select the "foo" and "bar" in visual-block
+mode, as shown left below (where '|'s are used to represent the visual-block
+boundary), and comment it then the script will use the alternative delimiters
+as shown on the right: >
+
+    float |foo| = 1221;                   float /*foo*/ = 1221;
+    float |bar| = 324;                    float /*bar*/ = 324;
+    System.out.println(foo * bar);        System.out.println(foo * bar);
+<
+------------------------------------------------------------------------------
+                                                     *'NERDBlockComIgnoreEmpty'*
+Values: 0 or 1.
+Default: 1.
+
+This option  affects visual-block mode commenting. If this option is turned
+on, lines that begin outside the right boundary of the selection block will be
+ignored.
+
+For example, if you are commenting this chunk of c code in visual-block mode
+(where the '|'s are used to represent the visual-block boundary) >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+   |int| main(){
+   |   | printf("SUCK THIS\n");
+   |   | while(1){
+   |   |     fork();
+   |   | }
+   |}  |
+<
+If NERDBlockComIgnoreEmpty=0 then this code will become: >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    /*int*/ main(){
+    /*   */ printf("SUCK THIS\n");
+    /*   */ while(1){
+    /*   */     fork();
+    /*   */ }
+    /*}  */
+<
+Otherwise, the code block would become: >
+    #include <sys/types.h>
+    #include <unistd.h>
+    #include <stdio.h>
+    /*int*/ main(){
+    printf("SUCK THIS\n");
+    while(1){
+        fork();
+    }
+    /*}  */
+<
+------------------------------------------------------------------------------
+                                                     *'NERDCommentEmptyLines'*
+Values: 0 or 1.
+Default: 0.
+
+This option affects commenting of empty lines. If this option is turned on,
+then empty lines will be commented as well. Useful when commenting regions of
+code.
+
+------------------------------------------------------------------------------
+                                                *'NERDCommentWholeLinesInVMode'*
+Values: 0, 1 or 2.
+Default: 0.
+
+By default the script tries to comment out exactly what is selected in visual
+mode (v). For example if you select and comment the following c code (using |
+to represent the visual boundary): >
+    in|t foo = 3;
+    int bar =| 9;
+    int baz = foo + bar;
+<
+This will result in: >
+    in/*t foo = 3;*/
+    /*int bar =*/ 9;
+    int baz = foo + bar;
+<
+But some people prefer it if the whole lines are commented like: >
+    /*int foo = 3;*/
+    /*int bar = 9;*/
+    int baz = foo + bar;
+<
+If you prefer the second option then stick this line in your vimrc: >
+    let NERDCommentWholeLinesInVMode=1
+<
+
+If the filetype you are editing only has no multipart delimiters (for example
+a shell script) and you hadn't set this option then the above would become >
+    in#t foo = 3;
+    #int bar = 9;
+<
+(where # is the comment delimiter) as this is the closest the script can
+come to commenting out exactly what was selected. If you prefer for whole
+lines to be commented out when there is no multipart delimiters but the EXACT
+text that was selected to be commented out if there IS multipart delimiters
+then stick the following line in your vimrc: >
+    let NERDCommentWholeLinesInVMode=2
+<
+
+Note that this option does not affect the behaviour of commenting in
+|visual-block| mode.
+
+------------------------------------------------------------------------------
+                                                 *'NERDCreateDefaultMappings'*
+Values: 0 or 1.
+Default: 1.
+
+If set to 0, none of the default mappings will be created.
+
+See also |NERDComMappings|.
+
+------------------------------------------------------------------------------
+                                                      *'NERDCustomDelimiters'*
+Values: A map (format specified below).
+Default: {}
+
+Use this option if you have new filetypes you want the script to handle, or if
+you want to override the default delimiters of a filetype.
+
+Example: >
+    let g:NERDCustomDelimiters = {
+        \ 'ruby': { 'left': '#', 'leftAlt': 'FOO', 'rightAlt': 'BAR' },
+        \ 'grondle': { 'left': '{{', 'right': '}}' }
+    \ }
+<
+
+Here we override the delimiter settings for ruby and add FOO/BAR as alternative
+delimiters. We also add {{ and }} as delimiters for a new filetype called
+'grondle'.
+
+------------------------------------------------------------------------------
+                                                           *'NERDRemoveAltComs'*
+Values: 0 or 1.
+Default: 1.
+
+When uncommenting a line (for a filetype with an alternative commenting style)
+this option tells the script whether to look for, and remove, comment
+delimiters of the alternative style.
+
+For example, if you are editing a c++ file using // style comments and you go
+|<Leader>|cu on this line: >
+    /* This is a c++ comment baby! */
+<
+It will not be uncommented if the NERDRemoveAltComs is set to 0.
+
+------------------------------------------------------------------------------
+                                                       *'NERDRemoveExtraSpaces'*
+Values: 0 or 1.
+Default: 0.
+
+By default, the NERD commenter will remove spaces around comment delimiters if
+either:
+1. |'NERDSpaceDelims'| is set to 1.
+2. NERDRemoveExtraSpaces is set to 1.
+
+This means that if we have the following lines in a c code file: >
+    /* int foo = 5; */
+    /* int bar = 10; */
+    int baz = foo + bar
+<
+If either of the above conditions hold then if these lines are uncommented
+they will become: >
+    int foo = 5;
+    int bar = 10;
+    int baz = foo + bar
+<
+Otherwise they would become: >
+     int foo = 5;
+     int bar = 10;
+    int baz = foo + bar
+<
+
+Note: When using 'start' as the default alignment, the enabling of
+NERDRemoveExtraSpaces will still result in the removal of a space after the
+delimiter.  This can be undesirable since aligning the delimiters at the very
+start of the line (index 0) will usually result in spaces between the comment
+delimiters and the text which probably shouldn't be removed.  So when using
+'start' as the default alignment, take care to also disable
+NERDRemoveExtraSpaces.
+
+------------------------------------------------------------------------------
+                                                                  *'NERDLPlace'*
+                                                                  *'NERDRPlace'*
+Values: arbitrary string.
+Default:
+    NERDLPlace: "[>"
+    NERDRPlace: "<]"
+
+These options are used to control the strings used as place-holder delimiters.
+Place holder delimiters are used when performing nested commenting when the
+filetype supports commenting styles with both left and right delimiters.
+To set these options use lines like: >
+    let NERDLPlace="FOO"
+    let NERDRPlace="BAR"
+<
+Following the above example, if we have line of c code: >
+    /* int horse */
+<
+and we comment it with |<Leader>|cn it will be changed to: >
+    /*FOO int horse BAR*/
+<
+When we uncomment this line it will go back to what it was.
+
+------------------------------------------------------------------------------
+                                                                *'NERDMenuMode'*
+Values: 0, 1, 2, 3.
+Default: 3
+
+This option can take 4 values:
+    "0": Turns the menu off.
+    "1": Turns the 'comment' menu on with no menu shortcut.
+    "2": Turns the 'comment' menu on with <alt>-c as the shortcut.
+    "3": Turns the 'Plugin -> comment' menu on with <alt>-c as the shortcut.
+
+------------------------------------------------------------------------------
+                                                         *'NERDUsePlaceHolders'*
+Values: 0 or 1.
+Default 1.
+
+This option is used to specify whether place-holder delimiters should be used
+when creating a nested comment.
+
+------------------------------------------------------------------------------
+                                                             *'NERDSpaceDelims'*
+Values: 0 or 1.
+Default 0.
+
+Some people prefer a space after the left delimiter and before the right
+delimiter like this: >
+    /* int foo=2; */
+<
+as opposed to this: >
+    /*int foo=2;*/
+<
+If you want spaces to be added then set NERDSpaceDelims to 1 in your vimrc.
+
+See also |'NERDRemoveExtraSpaces'|.
+
+------------------------------------------------------------------------------
+                                                  *'NERDTrimTrailingWhitespace'*
+Values: 0 or 1.
+Default 0.
+
+When uncommenting an empty line some whitespace may be left as a result of
+alignment padding. With this option enabled any trailing whitespace will be
+deleted when uncommenting a line.
+
+------------------------------------------------------------------------------
+                                                             *'NERDDefaultAlign'*
+Values: 'none', 'left', 'start', 'both'
+Default 'none'.
+
+Specifies the default alignment to use when inserting comments.
+
+Note: When using 'start' as the default alignment be sure to disable
+NERDRemoveExtraSpaces.  See the note at the bottom of |NERDRemoveExtraSpaces|
+for more details.
+
+------------------------------------------------------------------------------
+                                                         *'NERDCompactSexyComs'*
+Values: 0 or 1.
+Default 0.
+
+Some people may want their sexy comments to be like this: >
+    /* Hi There!
+     * This is a sexy comment
+     * in c */
+<
+As opposed to like this: >
+    /*
+     * Hi There!
+     * This is a sexy comment
+     * in c
+     */
+<
+If this option is set to 1 then the top style will be used.
+
+------------------------------------------------------------------------------
+                                                          *'NERDDefaultNesting'*
+Values: 0 or 1.
+Default 1.
+
+When this option is set to 1, comments are nested automatically. That is, if
+you hit |<Leader>|cc on a line that is already commented it will be commented
+again.
+
+------------------------------------------------------------------------------
+3.3 Default delimiter customisation                     *NERDComDefaultDelims*
+
+If you want the NERD commenter to use the alternative delimiters for a
+specific filetype by default then put a line of this form into your vimrc: >
+    let g:NERDAltDelims_<filetype> = 1
+<
+Example: java uses // style comments by default, but you want it to default to
+/* */ style comments instead. You would put this line in your vimrc: >
+    let g:NERDAltDelims_java = 1
+<
+
+See |NERDComAltDelim| for switching commenting styles at runtime.
+
+==============================================================================
+5. Key mapping customisation                                *NERDComMappings*
+
+To change a mapping just map another key combo to the internal <plug> mapping.
+For example, to remap the |NERDComComment| mapping to ",omg" you would put
+this line in your vimrc: >
+    map ,omg <plug>NERDCommenterComment
+<
+This will stop the corresponding default mappings from being created.
+
+See the help for the mapping in question to see which <plug> mapping to
+map to.
+
+See also |'NERDCreateDefaultMappings'|.
+
+==============================================================================
+6. Issues with the script                                      *NERDComIssues*
+
+
+------------------------------------------------------------------------------
+6.1 Delimiter detection heuristics                         *NERDComHeuristics*
+
+Heuristics are used to distinguish the real comment delimiters
+
+Because we have comment mappings that place delimiters in the middle of lines,
+removing comment delimiters is a bit tricky. This is because if comment
+delimiters appear in a line doesn't mean they really ARE delimiters. For
+example, Java uses // comments but the line >
+    System.out.println("//");
+<
+clearly contains no real comment delimiters.
+
+To distinguish between ``real'' comment delimiters and ``fake'' ones we use a
+set of heuristics. For example, one such heuristic states that any comment
+delimiter that has an odd number of non-escaped " characters both preceding
+and following it on the line is not a comment because it is probably part of a
+string. These heuristics, while usually pretty accurate, will not work for all
+cases.
+
+------------------------------------------------------------------------------
+6.2 Nesting issues                                            *NERDComNesting*
+
+If we have some line of code like this: >
+    /*int foo */ = /*5 + 9;*/
+<
+This will not be uncommented legally. The NERD commenter will remove the
+"outer most" delimiters so the line will become: >
+    int foo */ = /*5 + 9;
+<
+which almost certainly will not be what you want. Nested sets of comments will
+uncomment fine though. E.g.: >
+    /*int/* foo =*/ 5 + 9;*/
+<
+will become: >
+    int/* foo =*/ 5 + 9;
+<
+(Note that in the above examples I have deliberately not used place holders
+for simplicity)
+
+==============================================================================
+7. About                                                        *NERDComAbout*
+
+The author of the NERD commenter is Martyzillatron --- the half robot, half
+dinosaur bastard son of Megatron and Godzilla. He enjoys destroying
+metropolises and eating tourist buses.
+
+Drop him a line at martin_grenfell at msn.com. He would love to hear from you.
+It's a lonely life being the worlds premier terror machine. How would you feel
+if your face looked like a toaster and a t-rex put together? :(
+
+The latest stable versions can be found at
+    http://www.vim.org/scripts/script.php?script_id=1218
+
+The latest dev versions are on github
+    http://github.com/scrooloose/nerdcommenter
+
+==============================================================================
+8. Changelog                                                *NERDComChangelog*
+
+2.3.0
+    - remove all filetypes which have a &commentstring in the standard vim
+      runtime for vim > 7.0 unless the script stores an alternate set of
+      delimiters
+    - make the script complain if the user doesn't have filetype plugins enabled
+    - use |<Leader>| instead of comma to start the default mappings
+    - fix a couple of bugs with sexy comments - thanks to Tim Smart
+    - lots of refactoring
+
+2.2.2
+    - remove the NERDShutup option and the message is suppresses, this makes
+      the plugin silently rely on &commentstring for unknown filetypes.
+    - add support for dhcpd, limits, ntp, resolv, rgb, sysctl, udevconf and
+      udevrules. Thanks to Thilo Six.
+    - match filetypes case insensitively
+    - add support for mp (metapost), thanks to Andrey Skvortsov.
+    - add support for htmlcheetah, thanks to Simon Hengel.
+    - add support for javacc, thanks to Matt Tolton.
+    - make <%# %> the default delims for eruby, thanks to tpope.
+    - add support for javascript.jquery, thanks to Ivan Devat.
+    - add support for cucumber and pdf. Fix sass and railslog delims,
+      thanks to tpope
+
+2.2.1
+    - add support for newlisp and clojure, thanks to Matthew Lee Hinman.
+    - fix automake comments, thanks to Elias Pipping
+    - make haml comments default to -# with / as the alternative delimiter,
+      thanks to tpope
+    - add support for actionscript and processing thanks to Edwin Benavides
+    - add support for ps1 (powershell), thanks to Jason Mills
+    - add support for hostsaccess, thanks to Thomas Rowe
+    - add support for CVScommit
+    - add support for asciidoc, git and gitrebase. Thanks to Simon Ruderich.
+    - use # for gitcommit comments, thanks to Simon Ruderich.
+    - add support for mako and genshi, thanks to Keitheis.
+    - add support for conkyrc, thanks to David
+    - add support for SVNannotate, thanks to Miguel Jaque Barbero.
+    - add support for sieve, thanks to Stefan Walk
+    - add support for objj, thanks to Adam Thorsen.
+
+2.2.0
+    - rewrote the mappings system to be more "standard".
+      - removed all the mapping options. Now, mappings to <plug> mappings are
+        used
+      - see :help NERDComMappings, and :help NERDCreateDefaultMappings for
+        more info
+    - remove "prepend comments" and "right aligned comments".
+    - add support for applescript, calbire, man, SVNcommit, potwiki, txt2tags and SVNinfo.
+      Thanks to nicothakis, timberke, sgronblo, mntnoe, Bernhard Grotz, John
+      O'Shea, François and Giacomo Mariani respectively.
+    - bugfix for haskell delimiters. Thanks to mntnoe.
+2.1.18
+    - add support for llvm. Thanks to nicothakis.
+    - add support for xquery. Thanks to Phillip Kovalev.
+2.1.17
+    - fixed haskell delimiters (hackily). Thanks to Elias Pipping.
+    - add support for mailcap. Thanks to Pascal Brueckner.
+    - add support for stata. Thanks to Jerónimo Carballo.
+    - applied a patch from ewfalor to fix an error in the help file with the
+      NERDMapleader doc
+    - disable the insert mode ctrl-c mapping by default, see :help
+      NERDComInsertComment if you wish to restore it
+
+==============================================================================
+9. Credits                                                    *NERDComCredits*
+
+Thanks to the follow people for suggestions and patches:
+
+Nick Brettell
+Matthew Hawkins
+Mathieu Clabaut
+Greg Searle
+Nguyen
+Litchi
+Jorge Scandaliaris
+Shufeng Zheng
+Martin Stubenschrott
+Markus Erlmann
+Brent Rice
+Richard Willis
+Igor Prischepoff
+Harry
+David Bourgeois
+Eike Von Seggern
+Torsten Blix
+Alexander Bosecke
+Stefano Zacchiroli
+Norick Chen
+Joseph Barker
+Gary Church
+Tim Carey-Smith
+Markus Klinik
+Anders
+Seth Mason
+James Hales
+Heptite
+Cheng Fang
+Yongwei Wu
+David Miani
+Jeremy Hinegardner
+Marco
+Ingo Karkat
+Zhang Shuhan
+tpope
+Ben Schmidt
+David Fishburn
+Erik Falor
+JaGoTerr
+Elias Pipping
+mntnoe
+Mark S.
+
+
+Thanks to the following people for sending me new filetypes to support:
+
+The hackers                         The filetypes~
+Sam R                               verilog
+Jonathan                            Derque context, plaintext and mail
+Vigil                               fetchmail
+Michael Brunner                     kconfig
+Antono Vasiljev                     netdict
+Melissa Reid                        omlet
+Ilia N Ternovich                    quickfix
+John O'Shea                         RTF, SVNcommitlog and vcscommit, SVNCommit
+Anders                              occam
+Mark Woodward                       csv
+fREW                                gentoo-package-mask,
+                                    gentoo-package-keywords,
+                                    gentoo-package-use, and vo_base
+Alexey                              verilog_systemverilog, systemverilog
+Lizendir                            fstab
+Michael Böhler                      autoit, autohotkey and docbk
+Aaron Small                         cmake
+Ramiro                              htmldjango and django
+Stefano Zacchiroli                  debcontrol, debchangelog, mkd
+Alex Tarkovsky                      ebuild and eclass
+Jorge Rodrigues                     gams
+Rainer Müller                       Objective C
+Jason Mills                         Groovy, ps1
+Normandie Azucena                   vera
+Florian Apolloner                   ldif
+David Fishburn                      lookupfile
+Niels Aan de Brugh                  rst
+Don Hatlestad                       ahk
+Christophe Benz                     Desktop and xsd
+Eyolf Østrem                        lilypond, bbx and lytex
+Ingo Karkat                         dosbatch
+Nicolas Weber                       markdown, objcpp
+tinoucas                            gentoo-conf-d
+Greg Weber                          D, haml
+Bruce Sherrod                       velocity
+timberke                            cobol, calibre
+Aaron Schaefer                      factor
+Mr X                                asterisk, mplayerconf
+Kuchma Michael                      plsql
+Brett Warneke                       spectre
+Pipp                                lhaskell
+Renald Buter                        scala
+Vladimir Lomov                      asymptote
+Marco                               mrxvtrc, aap
+nicothakis                          SVNAnnotate, CVSAnnotate, SVKAnnotate,
+                                    SVNdiff, gitAnnotate, gitdiff, dtrace
+                                    llvm, applescript
+Chen Xing                           Wikipedia
+Jacobo Diaz                         dakota, patran
+Li Jin                              gentoo-env-d, gentoo-init-d,
+                                    gentoo-make-conf, grub, modconf, sudoers
+SpookeyPeanut                       rib
+Greg Jandl                          pyrex/cython
+Christophe Benz                     services, gitcommit
+A Pontus                            vimperator
+Stromnov                            slice, bzr
+Martin Kustermann                   pamconf
+Indriði Einarsson                   mason
+Chris                               map
+Krzysztof A. Adamski                group
+Pascal Brueckner                    mailcap
+Jerónimo Carballo                   stata
+Phillip Kovalev                     xquery
+Bernhard Grotz                      potwiki
+sgronblo                            man
+François                            txt2tags
+Giacomo Mariani                     SVNinfo
+Matthew Lee Hinman                  newlisp, clojure
+Elias Pipping                       automake
+Edwin Benavides                     actionscript, processing
+Thomas Rowe                         hostsaccess
+Simon Ruderich                      asciidoc, git, gitcommit, gitrebase
+Keitheis                            mako, genshi
+David                               conkyrc
+Miguel Jaque Barbero                SVNannotate
+Stefan Walk                         sieve
+Adam Thorsen                        objj
+Thilo Six                           dhcpd, limits, ntp, resolv, rgb, sysctl,
+                                    udevconf, udevrules
+Andrey Skvortsov                    mp
+Simon Hengel                        htmlcheetah
+Matt Tolton                         javacc
+Ivan Devat                          javascript.jquery
+tpope                               cucumber,pdf
+Lyude Paul                          piglit shader_test
+==============================================================================
+10. License                                                   *NERDComLicense*
+
+The NERD commenter is released under the wtfpl.
+See http://sam.zoy.org/wtfpl/COPYING.
diff --git a/vim/plugins/nerdcommenter/plugin/NERD_commenter.vim b/vim/plugins/nerdcommenter/plugin/NERD_commenter.vim
new file mode 100644
index 0000000..df14ece
--- /dev/null
+++ b/vim/plugins/nerdcommenter/plugin/NERD_commenter.vim
@@ -0,0 +1,3047 @@
+" ============================================================================
+" File:        NERD_commenter.vim
+" Description: vim global plugin that provides easy code commenting
+" Author:      Martin Grenfell <martin.grenfell at gmail dot com>
+" Maintainer:  Caleb Maclennan <caleb@alerque.com>
+" Version:     2.4.0
+" Last Change: Tue May 24 14:03:29 EEST 2016
+" 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_comments")
+    finish
+endif
+if v:version < 700
+    echoerr "NERDCommenter: this plugin requires vim >= 7. DOWNLOAD IT! You'll thank me later!"
+    finish
+endif
+let loaded_nerd_comments = 1
+
+" 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)
+        execute 'let ' . a:var . ' = ' . "'" . a:value . "'"
+        return 1
+    endif
+    return 0
+endfunction
+
+" Section: space string init{{{2
+" When putting spaces after the left delimiter and before the right we use
+" s:spaceStr for the space char. This way we can make it add anything after
+" the left and before the right by modifying this variable
+let s:spaceStr = ' '
+let s:lenSpaceStr = strlen(s:spaceStr)
+
+" Section: variable initialization {{{2
+call s:InitVariable("g:NERDAllowAnyVisualDelims", 1)
+call s:InitVariable("g:NERDBlockComIgnoreEmpty", 0)
+call s:InitVariable("g:NERDCommentWholeLinesInVMode", 0)
+call s:InitVariable("g:NERDCommentEmptyLines", 0)
+call s:InitVariable("g:NERDCompactSexyComs", 0)
+call s:InitVariable("g:NERDCreateDefaultMappings", 1)
+call s:InitVariable("g:NERDDefaultNesting", 1)
+call s:InitVariable("g:NERDMenuMode", 3)
+call s:InitVariable("g:NERDLPlace", "[>")
+call s:InitVariable("g:NERDUsePlaceHolders", 1)
+call s:InitVariable("g:NERDRemoveAltComs", 1)
+call s:InitVariable("g:NERDRemoveExtraSpaces", 0)
+call s:InitVariable("g:NERDRPlace", "<]")
+call s:InitVariable("g:NERDSpaceDelims", 0)
+call s:InitVariable("g:NERDDefaultAlign", "none")
+call s:InitVariable("g:NERDTrimTrailingWhitespace", 0)
+
+let s:NERDFileNameEscape="[]#*$%'\" ?`!&();<>\\"
+
+let s:delimiterMap = {
+    \ 'aap': { 'left': '#' },
+    \ 'abc': { 'left': '%' },
+    \ 'acedb': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'actionscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ada': { 'left': '--', 'leftAlt': '--  ' },
+    \ 'ahdl': { 'left': '--' },
+    \ 'ahk': { 'left': ';', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'amiga': { 'left': ';' },
+    \ 'aml': { 'left': '/*' },
+    \ 'ampl': { 'left': '#' },
+    \ 'ansible': { 'left': '#' },
+    \ 'apache': { 'left': '#' },
+    \ 'apachestyle': { 'left': '#' },
+    \ 'applescript': { 'left': '--', 'leftAlt': '(*', 'rightAlt': '*)' },
+    \ 'armasm': { 'left': ';' },
+    \ 'asciidoc': { 'left': '//' },
+    \ 'asm': { 'left': ';', 'leftAlt': '#' },
+    \ 'asm68k': { 'left': ';' },
+    \ 'asn': { 'left': '--' },
+    \ 'asp': { 'left': '%', 'leftAlt': '%*', 'rightAlt': '*%' },
+    \ 'aspvbs': { 'left': '''', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'asterisk': { 'left': ';' },
+    \ 'asy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'atlas': { 'left': 'C', 'right': '$' },
+    \ 'augeas': { 'left': '(*', 'right': '*)' },
+    \ 'autohotkey': { 'left': ';', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'autoit': { 'left': ';' },
+    \ 'ave': { 'left': "'" },
+    \ 'awk': { 'left': '#' },
+    \ 'basic': { 'left': "'", 'leftAlt': 'REM ' },
+    \ 'bbx': { 'left': '%' },
+    \ 'bc': { 'left': '#' },
+    \ 'bib': { 'left': '//' },
+    \ 'bindzone': { 'left': ';' },
+    \ 'blade': { 'left': '{{--', 'right': '--}}' },
+    \ 'bst': { 'left': '%' },
+    \ 'btm': { 'left': '::' },
+    \ 'c': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'cabal': { 'left': '--' },
+    \ 'calibre': { 'left': '//' },
+    \ 'caos': { 'left': '*' },
+    \ 'catalog': { 'left': '--', 'right': '--' },
+    \ 'cf': { 'left': '<!---', 'right': '--->' },
+    \ 'cfg': { 'left': '#' },
+    \ 'cg': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ch': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'cl': { 'left': '#' },
+    \ 'clean': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'clipper': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'clojure': { 'left': ';' },
+    \ 'cmake': { 'left': '#' },
+    \ 'coffee': { 'left': '#', 'leftAlt': '###', 'rightAlt': '###' },
+    \ 'conkyrc': { 'left': '#' },
+    \ 'context': { 'left': '%', 'leftAlt': '--' },
+    \ 'coq': { 'left': '(*', 'right': '*)' },
+    \ 'cpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'crontab': { 'left': '#' },
+    \ 'cs': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'csp': { 'left': '--' },
+    \ 'cterm': { 'left': '*' },
+    \ 'cucumber': { 'left': '#' },
+    \ 'cuda': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'cvs': { 'left': 'CVS:' },
+    \ 'cython': { 'left': '# ', 'leftAlt': '#' },
+    \ 'd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'dakota': { 'left': '#' },
+    \ 'dcl': { 'left': '$!' },
+    \ 'debcontrol': { 'left': '#' },
+    \ 'debsources': { 'left': '#' },
+    \ 'def': { 'left': ';' },
+    \ 'desktop': { 'left': '#' },
+    \ 'dhcpd': { 'left': '#' },
+    \ 'diff': { 'left': '#' },
+    \ 'django': { 'left': '<!--', 'right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'dns': { 'left': ';' },
+    \ 'docbk': { 'left': '<!--', 'right': '-->' },
+    \ 'dockerfile': { 'left': '#' },
+    \ 'dosbatch': { 'left': 'REM ', 'leftAlt': '::' },
+    \ 'dosini': { 'left': ';' },
+    \ 'dot': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'dracula': { 'left': ';' },
+    \ 'dsl': { 'left': ';' },
+    \ 'dtml': { 'left': '<dtml-comment>', 'right': '</dtml-comment>' },
+    \ 'dylan': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ebuild': { 'left': '#' },
+    \ 'ecd': { 'left': '#' },
+    \ 'eclass': { 'left': '#' },
+    \ 'eiffel': { 'left': '--' },
+    \ 'elf': { 'left': "'" },
+    \ 'elixir': { 'left': '#' },
+    \ 'elm': { 'left': '--', 'leftAlt': '{--', 'rightAlt': '--}' },
+    \ 'elmfilt': { 'left': '#' },
+    \ 'ember-script': { 'left': '#' },
+    \ 'emblem': { 'left': '/' },
+    \ 'erlang': { 'left': '%', 'leftAlt': '%%' },
+    \ 'eruby': { 'left': '<%#', 'right': '%>', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'esmtprc': { 'left': '#' },
+    \ 'expect': { 'left': '#' },
+    \ 'exports': { 'left': '#' },
+    \ 'factor': { 'left': '! ', 'leftAlt': '!# ' },
+    \ 'fancy': { 'left': '#' },
+    \ 'fgl': { 'left': '#' },
+    \ 'focexec': { 'left': '-*' },
+    \ 'form': { 'left': '*' },
+    \ 'fortran': { 'left': '!' },
+    \ 'foxpro': { 'left': '*' },
+    \ 'fsharp': { 'left': '(*', 'right': '*)', 'leftAlt': '//' },
+    \ 'fstab': { 'left': '#' },
+    \ 'fvwm': { 'left': '#' },
+    \ 'fx': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gams': { 'left': '*' },
+    \ 'gdb': { 'left': '#' },
+    \ 'gdmo': { 'left': '--' },
+    \ 'geek': { 'left': 'GEEK_COMMENT:' },
+    \ 'genshi': { 'left': '<!--', 'right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'gentoo-conf-d': { 'left': '#' },
+    \ 'gentoo-env-d': { 'left': '#' },
+    \ 'gentoo-init-d': { 'left': '#' },
+    \ 'gentoo-make-conf': { 'left': '#' },
+    \ 'gentoo-package-keywords': { 'left': '#' },
+    \ 'gentoo-package-mask': { 'left': '#' },
+    \ 'gentoo-package-use': { 'left': '#' },
+    \ 'gitcommit': { 'left': '#' },
+    \ 'gitconfig': { 'left': ';' },
+    \ 'gitignore': { 'left': '#' },
+    \ 'gitrebase': { 'left': '#' },
+    \ 'glsl': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gnuplot': { 'left': '#' },
+    \ 'go': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'groovy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'gsp': { 'left': '<%--', 'right': '--%>', 'leftAlt': '<!--', 'rightAlt': '-->' },
+    \ 'gtkrc': { 'left': '#' },
+    \ 'h': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'haml': { 'left': '-#', 'leftAlt': '/' },
+    \ 'handlebars': { 'left': '{{!-- ', 'right': ' --}}' },
+    \ 'haskell': { 'left': '{-', 'right': '-}', 'nested': 1, 'leftAlt': '--', 'nestedAlt': 1 },
+    \ 'haxe': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'hb': { 'left': '#' },
+    \ 'hbs': { 'left': '{{!-- ', 'right': ' --}}' },
+    \ 'hercules': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'hive': { 'left': '-- ' },
+    \ 'hog': { 'left': '#' },
+    \ 'hostsaccess': { 'left': '#' },
+    \ 'htmlcheetah': { 'left': '##' },
+    \ 'htmldjango': { 'left': '<!--', 'right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'htmlos': { 'left': '#', 'right': '/#' },
+    \ 'hxml': { 'left': '#' },
+    \ 'hyphy': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ia64': { 'left': '#' },
+    \ 'icon': { 'left': '#' },
+    \ 'idl': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'idlang': { 'left': ';' },
+    \ 'idris': { 'leftAlt': '--', 'left': '{-', 'right': '-}' },
+    \ 'incar': { 'left': '!' },
+    \ 'inform': { 'left': '!' },
+    \ 'inittab': { 'left': '#' },
+    \ 'ishd': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'iss': { 'left': ';' },
+    \ 'ist': { 'left': '%' },
+    \ 'jade': { 'left': '//-', 'leftAlt': '//' },
+    \ 'java': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javacc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javascript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'javascript.jquery': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'jess': { 'left': ';' },
+    \ 'jgraph': { 'left': '(*', 'right': '*)' },
+    \ 'jinja': { 'left': '<!--', 'right': '-->', 'leftAlt': '{#', 'rightAlt': '#}' },
+    \ 'jproperties': { 'left': '#' },
+    \ 'jsp': { 'left': '<%--', 'right': '--%>' },
+    \ 'julia': { 'left': '#' },
+    \ 'kix': { 'left': ';' },
+    \ 'kscript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'lace': { 'left': '--' },
+    \ 'laravel': { 'left': '{{--', 'right': '--}}' },
+    \ 'ldif': { 'left': '#' },
+    \ 'less': { 'left': '/*', 'right': '*/' },
+    \ 'lhaskell': { 'left': '>{-', 'right': '-}', 'leftAlt': '>-- ' },
+    \ 'lilo': { 'left': '#' },
+    \ 'lilypond': { 'left': '%' },
+    \ 'liquid': { 'left': '{% comment %}', 'right': '{% endcomment %}' },
+    \ 'lisp': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'llvm': { 'left': ';' },
+    \ 'lotos': { 'left': '(*', 'right': '*)' },
+    \ 'lout': { 'left': '#' },
+    \ 'lpc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'lprolog': { 'left': '%' },
+    \ 'lscript': { 'left': "'" },
+    \ 'lss': { 'left': '#' },
+    \ 'lua': { 'left': '--', 'leftAlt': '--[[', 'rightAlt': ']]' },
+    \ 'lynx': { 'left': '#' },
+    \ 'lytex': { 'left': '%' },
+    \ 'm4': { 'left': 'dnl ' },
+    \ 'mail': { 'left': '> ' },
+    \ 'mako': { 'left': '##' },
+    \ 'man': { 'left': '."' },
+    \ 'map': { 'left': '%' },
+    \ 'maple': { 'left': '#' },
+    \ 'markdown': { 'left': '<!--', 'right': '-->' },
+    \ 'masm': { 'left': ';' },
+    \ 'mason': { 'left': '<% #', 'right': '%>' },
+    \ 'master': { 'left': '$' },
+    \ 'matlab': { 'left': '%', 'leftAlt': '%{', 'rightAlt': '%}' },
+    \ 'mel': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'meson': { 'left': '#' },
+    \ 'mib': { 'left': '--' },
+    \ 'mips': { 'left': '#' },
+    \ 'mirah': {'left': '#' },
+    \ 'mkd': { 'left': '<!---', 'right': '-->' },
+    \ 'mma': { 'left': '(*', 'right': '*)' },
+    \ 'model': { 'left': '$', 'right': '$' },
+    \ 'moduala.': { 'left': '(*', 'right': '*)' },
+    \ 'modula2': { 'left': '(*', 'right': '*)' },
+    \ 'modula3': { 'left': '(*', 'right': '*)' },
+    \ 'molpro': { 'left': '!' },
+    \ 'monk': { 'left': ';' },
+    \ 'mush': { 'left': '#' },
+    \ 'mustache': { 'left': '{{!', 'right': '}}' },
+    \ 'nagios': { 'left': ';' },
+    \ 'named': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'nasm': { 'left': ';' },
+    \ 'nastran': { 'left': '$' },
+    \ 'natural': { 'left': '/*' },
+    \ 'ncf': { 'left': ';' },
+    \ 'newlisp': { 'left': ';' },
+    \ 'nginx': { 'left': '#' },
+    \ 'nimrod': { 'left': '#' },
+    \ 'nroff': { 'left': '\"' },
+    \ 'nsis': { 'left': '#' },
+    \ 'ntp': { 'left': '#' },
+    \ 'objc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'objcpp': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'objj': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ocaml': { 'left': '(*', 'right': '*)', 'nested': 1 },
+    \ 'occam': { 'left': '--' },
+    \ 'octave': { 'left': '%', 'leftAlt': '#' },
+    \ 'omlet': { 'left': '(*', 'right': '*)' },
+    \ 'omnimark': { 'left': ';' },
+    \ 'ooc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'openroad': { 'left': '//' },
+    \ 'opl': { 'left': "REM" },
+    \ 'ora': { 'left': '#' },
+    \ 'ox': { 'left': '//' },
+    \ 'paludis-use-conf': { 'left': '#' },
+    \ 'pandoc': { 'left': '<!--', 'right': '-->' },
+    \ 'pascal': { 'left': '{', 'right': '}', 'leftAlt': '(*', 'rightAlt': '*)' },
+    \ 'patran': { 'left': '$', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pcap': { 'left': '#' },
+    \ 'pccts': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pdf': { 'left': '%' },
+    \ 'perl': { 'left': '#' },
+    \ 'pfmain': { 'left': '//' },
+    \ 'php': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pic': { 'left': ';' },
+    \ 'pike': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pilrc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'pine': { 'left': '#' },
+    \ 'plm': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'plsql': { 'left': '-- ', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'po': { 'left': '#' },
+    \ 'poscar': { 'left': '!' },
+    \ 'postscr': { 'left': '%' },
+    \ 'pov': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'povini': { 'left': ';' },
+    \ 'ppd': { 'left': '%' },
+    \ 'ppwiz': { 'left': ';;' },
+    \ 'privoxy': { 'left': '#' },
+    \ 'processing': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'prolog': { 'left': '%', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'ps1': { 'left': '#' },
+    \ 'psf': { 'left': '#' },
+    \ 'ptcap': { 'left': '#' },
+    \ 'pug': { 'left': '//-', 'leftAlt': '//' },
+    \ 'puppet': { 'left': '#' },
+    \ 'pyrex': { 'left': '# ', 'leftAlt': '#' },
+    \ 'python': { 'left': '# ', 'leftAlt': '#' },
+    \ 'r': { 'left': '#', 'leftAlt': '#''' },
+    \ 'racket': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'radiance': { 'left': '#' },
+    \ 'ratpoison': { 'left': '#' },
+    \ 'rc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'rebol': { 'left': ';' },
+    \ 'registry': { 'left': ';' },
+    \ 'remind': { 'left': '#' },
+    \ 'resolv': { 'left': '#' },
+    \ 'rgb': { 'left': '!' },
+    \ 'rib': { 'left': '#' },
+    \ 'rmd': { 'left': '#' },
+    \ 'robots': { 'left': '#' },
+    \ 'rspec': { 'left': '#' },
+    \ 'ruby': { 'left': '#', 'leftAlt': '=begin', 'rightAlt': '=end' },
+    \ 'rust': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sa': { 'left': '--' },
+    \ 'samba': { 'left': ';', 'leftAlt': '#' },
+    \ 'sass': { 'left': '//', 'leftAlt': '/*' },
+    \ 'sather': { 'left': '--' },
+    \ 'scala': { 'left': '//', 'nested': 1, 'leftAlt': '/*', 'rightAlt': '*/', 'nestedAlt': 1 },
+    \ 'scheme': { 'left': ';', 'nested': 1, 'leftAlt': '#|', 'rightAlt': '|#', 'nestedAlt': 1 },
+    \ 'scilab': { 'left': '//' },
+    \ 'scons': { 'left': '#' },
+    \ 'scsh': { 'left': ';' },
+    \ 'scss': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'sed': { 'left': '#' },
+    \ 'sgmldecl': { 'left': '--', 'right': '--' },
+    \ 'sgmllnx': { 'left': '<!--', 'right': '-->' },
+    \ 'sh': { 'left': '#' },
+    \ 'shader_test': { 'left': '#' },
+    \ 'sicad': { 'left': '*' },
+    \ 'sile': { 'left': '%' },
+    \ 'simula': { 'left': '%', 'leftAlt': '--' },
+    \ 'sinda': { 'left': '$' },
+    \ 'skill': { 'left': ';' },
+    \ 'slang': { 'left': '%' },
+    \ 'slice': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'slim': { 'left': '/', 'leftAlt': '/!' },
+    \ 'slrnrc': { 'left': '%' },
+    \ 'sls': { 'left': '#' },
+    \ 'sm': { 'left': '#' },
+    \ 'smarty': { 'left': '{*', 'right': '*}' },
+    \ 'smil': { 'left': '<!', 'right': '>' },
+    \ 'smith': { 'left': ';' },
+    \ 'sml': { 'left': '(*', 'right': '*)', 'nested': 1 },
+    \ 'snippets': { 'left': '#' },
+    \ 'snnsnet': { 'left': '#' },
+    \ 'snnspat': { 'left': '#' },
+    \ 'snnsres': { 'left': '#' },
+    \ 'snobol4': { 'left': '*' },
+    \ 'spec': { 'left': '#' },
+    \ 'specman': { 'left': '//' },
+    \ 'spectre': { 'left': '//', 'leftAlt': '*' },
+    \ 'spice': { 'left': '$' },
+    \ 'spin': { 'left': '''', 'leftAlt': '{', 'rightAlt': '}' },
+    \ 'sql': { 'left': '-- ' },
+    \ 'sqlforms': { 'left': '-- ' },
+    \ 'sqlj': { 'left': '-- ' },
+    \ 'sqr': { 'left': '!' },
+    \ 'squid': { 'left': '#' },
+    \ 'ss': { 'left': ';', 'leftAlt': '#|', 'rightAlt': '|#' },
+    \ 'sshdconfig': { 'left': '#' },
+    \ 'st': { 'left': '"' },
+    \ 'stan': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'stp': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'supercollider': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'swift': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tads': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tags': { 'left': ';' },
+    \ 'tak': { 'left': '$' },
+    \ 'tasm': { 'left': ';' },
+    \ 'tcl': { 'left': '#' },
+    \ 'teak': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'terraform': { 'left': '#', 'leftAlt': '/*', 'rightAlt': '*/'  },
+    \ 'tex': { 'left': '%' },
+    \ 'texinfo': { 'left': "@c " },
+    \ 'texmf': { 'left': '%' },
+    \ 'tf': { 'left': ';' },
+    \ 'tidy': { 'left': '#' },
+    \ 'tli': { 'left': '#' },
+    \ 'tmux': { 'left': '#' },
+    \ 'toml': { 'left': '#' },
+    \ 'trasys': { 'left': "$" },
+    \ 'tsalt': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'tsscl': { 'left': '#' },
+    \ 'tssgm': { 'left': "comment = '", 'right': "'" },
+    \ 'tup': { 'left': '#' },
+    \ 'twig': { 'left': '{#', 'right': '#}' },
+    \ 'txt2tags': { 'left': '%' },
+    \ 'typescript': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'uc': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'uil': { 'left': '!' },
+    \ 'upstart': { 'left': '#' },
+    \ 'vala': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'vasp': { 'left': '!' },
+    \ 'vb': { 'left': "'" },
+    \ 'velocity': { 'left': "##", 'right': "", 'leftAlt': '#*', 'rightAlt': '*#' },
+    \ 'vera': { 'left': '/*', 'right': '*/', 'leftAlt': '//' },
+    \ 'verilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'verilog_systemverilog': { 'left': '//', 'leftAlt': '/*', 'rightAlt': '*/' },
+    \ 'vgrindefs': { 'left': '#' },
+    \ 'vhdl': { 'left': '--' },
+    \ 'vimperator': { 'left': '"' },
+    \ 'virata': { 'left': '%' },
+    \ 'vrml': { 'left': '#' },
+    \ 'vsejcl': { 'left': '/*' },
+    \ 'webmacro': { 'left': '##' },
+    \ 'wget': { 'left': '#' },
+    \ 'wikipedia': { 'left': '<!--', 'right': '-->' },
+    \ 'winbatch': { 'left': ';' },
+    \ 'wml': { 'left': '#' },
+    \ 'wvdial': { 'left': ';' },
+    \ 'xdefaults': { 'left': '!' },
+    \ 'xkb': { 'left': '//' },
+    \ 'xmath': { 'left': '#' },
+    \ 'xpm2': { 'left': '!' },
+    \ 'xquery': { 'left': '(:', 'right': ':)' },
+    \ 'yaml': { 'left': '#' },
+    \ 'z8a': { 'left': ';' }
+    \ }
+
+let g:NERDDelimiterMap = s:delimiterMap
+
+if exists("g:NERDCustomDelimiters")
+    call extend(s:delimiterMap, g:NERDCustomDelimiters)
+endif
+
+" Section: Comment mapping functions, autocommands and commands {{{1
+" ============================================================================
+" Section: Comment enabler autocommands {{{2
+" ============================================================================
+
+augroup NERDCommenter
+
+    "if the user enters a buffer or reads a buffer then we gotta set up
+    "the comment delimiters for that new filetype
+    autocmd BufEnter,BufRead * :call s:SetUpForNewFiletype(&filetype, 0)
+
+    "if the filetype of a buffer changes, force the script to reset the
+    "delimiters for the buffer
+    autocmd Filetype * :call s:SetUpForNewFiletype(&filetype, 1)
+augroup END
+
+
+" Function: s:SetUpForNewFiletype(filetype) function {{{2
+" This function is responsible for setting up buffer scoped variables for the
+" given filetype.
+"
+" Args:
+"   -filetype: the filetype to set delimiters for
+"   -forceReset: 1 if the delimiters should be reset if they have already be
+"    set for this buffer.
+"
+function s:SetUpForNewFiletype(filetype, forceReset)
+    let ft = a:filetype
+
+    "for compound filetypes, if we don't know how to handle the full filetype
+    "then break it down and use the first part that we know how to handle
+    if ft =~ '\.' && !has_key(s:delimiterMap, ft)
+        let filetypes = split(a:filetype, '\.')
+        for i in filetypes
+            if has_key(s:delimiterMap, i)
+                let ft = i
+                break
+            endif
+        endfor
+    endif
+
+    let b:NERDSexyComMarker = ''
+
+    if has_key(s:delimiterMap, ft)
+        let b:NERDCommenterDelims = s:delimiterMap[ft]
+        for i in ['left', 'leftAlt', 'right', 'rightAlt']
+            if !has_key(b:NERDCommenterDelims, i)
+                let b:NERDCommenterDelims[i] = ''
+            endif
+        endfor
+        for i in ['nested', 'nestedAlt']
+            if !has_key(b:NERDCommenterDelims, i)
+                let b:NERDCommenterDelims[i] = 0
+            endif
+        endfor
+        " if g:NERD_<filetype>_alt_style is defined, use the alternate style
+        let b:NERDCommenterFirstInit = getbufvar(1,"NERDCommenterFirstInit")
+        if exists('g:NERDAltDelims_'.ft) && eval('g:NERDAltDelims_'.ft) && !b:NERDCommenterFirstInit
+            call s:SwitchToAlternativeDelimiters(0)
+            let b:NERDCommenterFirstInit = 1
+        endif
+    else
+        let b:NERDCommenterDelims = s:CreateDelimMapFromCms()
+    endif
+
+endfunction
+
+function s:CreateDelimMapFromCms()
+    if &ft == '' && exists('g:NERDDefaultDelims')
+        let delims = g:NERDDefaultDelims
+        for i in ['left', 'leftAlt', 'right', 'rightAlt']
+            if !has_key(delims, i)
+                let delims[i] = ''
+            endif
+        endfor
+        return delims
+    endif
+    return {
+        \ 'left': substitute(&commentstring, '\([^ \t]*\)\s*%s.*', '\1', ''),
+        \ 'right': substitute(&commentstring, '.*%s\s*\(.*\)', '\1', 'g'),
+        \ 'nested': 0,
+        \ 'leftAlt': '',
+        \ 'rightAlt': '',
+        \ 'nestedAlt': 0}
+endfunction
+
+" Function: s:SwitchToAlternativeDelimiters(printMsgs) function {{{2
+" This function is used to swap the delimiters that are being used to the
+" alternative delimiters for that filetype. For example, if a c++ file is
+" being edited and // comments are being used, after this function is called
+" /**/ comments will be used.
+"
+" Args:
+"   -printMsgs: if this is 1 then a message is echoed to the user telling them
+"    if this function changed the delimiters or not
+function s:SwitchToAlternativeDelimiters(printMsgs)
+    if exists('*NERDCommenter_before')
+        exe "call NERDCommenter_before()"
+    endif
+    "if both of the alternative delimiters are empty then there is no
+    "alternative comment style so bail out
+    if b:NERDCommenterDelims['leftAlt'] == '' && b:NERDCommenterDelims['rightAlt'] == ''
+        if a:printMsgs
+            call s:NerdEcho("Cannot use alternative delimiters, none are specified", 0)
+        endif
+        return 0
+    endif
+
+    "save the current delimiters
+    let tempLeft = s:Left()
+    let tempRight = s:Right()
+    let tempNested = s:Nested()
+
+    "swap current delimiters for alternative
+    let b:NERDCommenterDelims['left'] = b:NERDCommenterDelims['leftAlt']
+    let b:NERDCommenterDelims['right'] = b:NERDCommenterDelims['rightAlt']
+    "set information on whether these are nested
+    let b:NERDCommenterDelims['nested'] = b:NERDCommenterDelims['nestedAlt']
+
+    "set the previously current delimiters to be the new alternative ones
+    let b:NERDCommenterDelims['leftAlt'] = tempLeft
+    let b:NERDCommenterDelims['rightAlt'] = tempRight
+    let b:NERDCommenterDelims['nestedAlt'] = tempNested
+
+    "tell the user what comment delimiters they are now using
+    if a:printMsgs
+        call s:NerdEcho("Now using " . s:Left() . " " . s:Right() . " to delimit comments", 1)
+    endif
+
+    if exists('*NERDCommenter_after')
+        exe "call NERDCommenter_after()"
+    endif
+
+    return 1
+endfunction
+
+" Section: Comment delimiter add/removal functions {{{1
+" ============================================================================
+" Function: s:AppendCommentToLine(){{{2
+" This function appends comment delimiters at the EOL and places the cursor in
+" position to start typing the comment
+function s:AppendCommentToLine()
+    let left = s:Left({'space': 1})
+    let right = s:Right({'space': 1})
+
+    " get the length of the right delimiter
+    let lenRight = strlen(right)
+
+    let isLineEmpty = strlen(getline(".")) == 0
+    let insOrApp = (isLineEmpty==1 ? 'i' : 'A')
+
+    "stick the delimiters down at the end of the line. We have to format the
+    "comment with spaces as appropriate
+    execute ":normal! " . insOrApp . (isLineEmpty ? '' : ' ') . left . right
+
+    " if there is a right delimiter then we gotta move the cursor left
+    " by the length of the right delimiter so we insert between the delimiters
+    if lenRight > 0
+        let leftMoveAmount = lenRight - 1
+        execute ":normal! " . leftMoveAmount . "h"
+        startinsert
+    else
+        startinsert!
+    endif
+endfunction
+
+" Function: s:CommentBlock(top, bottom, lSide, rSide, forceNested ) {{{2
+" This function is used to comment out a region of code. This region is
+" specified as a bounding box by arguments to the function.
+"
+" Args:
+"   -top: the line number for the top line of code in the region
+"   -bottom: the line number for the bottom line of code in the region
+"   -lSide: the column number for the left most column in the region
+"   -rSide: the column number for the right most column in the region
+"   -forceNested: a flag indicating whether comments should be nested
+function s:CommentBlock(top, bottom, lSide, rSide, forceNested )
+    " we need to create local copies of these arguments so we can modify them
+    let top = a:top
+    let bottom = a:bottom
+    let lSide = a:lSide
+    let rSide = a:rSide
+
+    "if the top or bottom line starts with tabs we have to adjust the left and
+    "right boundaries so that they are set as though the tabs were spaces
+    let topline = getline(top)
+    let bottomline = getline(bottom)
+    if s:HasLeadingTabs(topline, bottomline)
+
+        "find out how many tabs are in the top line and adjust the left
+        "boundary accordingly
+        let numTabs = s:NumberOfLeadingTabs(topline)
+        if lSide < numTabs
+            let lSide = &ts * lSide
+        else
+            let lSide = (lSide - numTabs) + (&ts * numTabs)
+        endif
+
+        "find out how many tabs are in the bottom line and adjust the right
+        "boundary accordingly
+        let numTabs = s:NumberOfLeadingTabs(bottomline)
+        let rSide = (rSide - numTabs) + (&ts * numTabs)
+    endif
+
+    "we must check that bottom IS actually below top, if it is not then we
+    "swap top and bottom. Similarly for left and right.
+    if bottom < top
+        let temp = top
+        let top = bottom
+        let bottom = top
+    endif
+    if rSide < lSide
+        let temp = lSide
+        let lSide = rSide
+        let rSide = temp
+    endif
+
+    "if the current delimiters aren't multipart then we will switch to the
+    "alternative delimiters (if THEY are) as the comment will be better and more
+    "accurate with multipart delimiters
+    let switchedDelims = 0
+    if !s:Multipart() && g:NERDAllowAnyVisualDelims && s:AltMultipart()
+        let switchedDelims = 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+    "start the commenting from the top and keep commenting till we reach the
+    "bottom
+    let currentLine=top
+    while currentLine <= bottom
+
+        "check if we are allowed to comment this line
+        if s:CanCommentLine(a:forceNested, currentLine)
+
+            "convert the leading tabs into spaces
+            let theLine = getline(currentLine)
+            let lineHasLeadTabs = s:HasLeadingTabs(theLine)
+            if lineHasLeadTabs
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+            endif
+
+            "don't comment lines that begin after the right boundary of the
+            "block unless the user has specified to do so
+            if theLine !~ '^ \{' . rSide . '\}' || !g:NERDBlockComIgnoreEmpty
+
+                "attempt to place the cursor in on the left of the boundary box,
+                "then check if we were successful, if not then we cant comment this
+                "line
+                call setline(currentLine, theLine)
+                if s:CanPlaceCursor(currentLine, lSide)
+
+                    let leftSpaced = s:Left({'space': 1})
+                    let rightSpaced = s:Right({'space': 1})
+
+                    "stick the left delimiter down
+                    let theLine = strpart(theLine, 0, lSide-1) . leftSpaced . strpart(theLine, lSide-1)
+
+                    if s:Multipart()
+                        "stick the right delimiter down
+                        let theLine = strpart(theLine, 0, rSide+strlen(leftSpaced)) . rightSpaced . strpart(theLine, rSide+strlen(leftSpaced))
+
+                        let firstLeftDelim = s:FindDelimiterIndex(s:Left(), theLine)
+                        let lastRightDelim = s:LastIndexOfDelim(s:Right(), theLine)
+
+                        if firstLeftDelim != -1 && lastRightDelim != -1
+                            let searchStr = strpart(theLine, 0, lastRightDelim)
+                            let searchStr = strpart(searchStr, firstLeftDelim+strlen(s:Left()))
+
+                            "replace the outer most delimiters in searchStr with
+                            "place-holders
+                            let theLineWithPlaceHolders = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, searchStr)
+
+                            "add the right delimiter onto the line
+                            let theLine = strpart(theLine, 0, firstLeftDelim+strlen(s:Left())) . theLineWithPlaceHolders . strpart(theLine, lastRightDelim)
+                        endif
+                    endif
+                endif
+            endif
+
+            "restore tabs if needed
+            if lineHasLeadTabs
+                let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+            endif
+
+            if g:NERDTrimTrailingWhitespace == 1
+              let theLine = s:TrimTrailingWhitespace(theLine)
+            endif
+
+            call setline(currentLine, theLine)
+        endif
+
+        let currentLine = currentLine + 1
+    endwhile
+
+    "if we switched delimiterss then we gotta go back to what they were before
+    if switchedDelims == 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+endfunction
+
+" Function: s:CommentLines(forceNested, alignLeft, alignRight, firstLine, lastLine) {{{2
+" This function comments a range of lines.
+"
+" Args:
+"   -forceNested: a flag indicating whether the called is requesting the comment
+"    to be nested if need be
+"   -align: should be "left", "start", "both" or "none"
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLines(forceNested, align, firstLine, lastLine)
+    " we need to get the left and right indexes of the leftmost char in the
+    " block of of lines and the right most char so that we can do alignment of
+    " the delimiters if the user has specified
+    let leftAlignIndx = a:align == "start" ? 0 : s:LeftMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = s:RightMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+
+    " gotta add the length of the left delimiter onto the rightAlignIndx cos
+    " we'll be adding a left delimiter to the line
+    let rightAlignIndx = rightAlignIndx + strlen(s:Left({'space': 1}))
+
+    " now we actually comment the lines. Do it line by line
+    let currentLine = a:firstLine
+    while currentLine <= a:lastLine
+
+        " get the next line, check commentability and convert spaces to tabs
+        let theLine = getline(currentLine)
+        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        if s:CanCommentLine(a:forceNested, currentLine)
+            "if the user has specified forceNesting then we check to see if we
+            "need to switch delimiters for place-holders
+            if a:forceNested && g:NERDUsePlaceHolders && !s:Nested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+
+            " find out if the line is commented using normal delimiters and/or
+            " alternate ones
+            let isCommented = s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
+
+            " check if we can comment this line
+            if !isCommented || g:NERDUsePlaceHolders || s:Multipart()
+                if a:align == "left" || a:align == "start" || a:align == "both"
+                    let theLine = s:AddLeftDelimAligned(s:Left({'space': 1}), theLine, leftAlignIndx)
+                else
+                    let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
+                endif
+                if a:align == "both"
+                    let theLine = s:AddRightDelimAligned(s:Right({'space': 1}), theLine, rightAlignIndx)
+                else
+                    let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
+                endif
+            endif
+        endif
+
+        " restore leading tabs if appropriate
+        if lineHasLeadingTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace == 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " we are done with this line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentLinesMinimal(firstLine, lastLine) {{{2
+" This function comments a range of lines in a minimal style. I
+"
+" Args:
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLinesMinimal(firstLine, lastLine)
+    "check that minimal comments can be done on this filetype
+    if !s:HasMultipartDelims()
+        throw 'NERDCommenter.Delimiters exception: Minimal comments can only be used for filetypes that have multipart delimiters'
+    endif
+
+    let sexyNested = s:SexyNested()
+
+    "if we need to use place holders for the comment, make sure they are
+    "enabled for this filetype, or the delimiterss allow nesting
+    if !g:NERDUsePlaceHolders && !sexyNested && s:DoesBlockHaveMultipartDelim(a:firstLine, a:lastLine)
+        throw 'NERDCommenter.Settings exception: Place holders are required but disabled.'
+    endif
+
+    "get the left and right delimiters to smack on
+    let left = s:GetSexyComLeft(g:NERDSpaceDelims,0)
+    let right = s:GetSexyComRight(g:NERDSpaceDelims,0)
+
+    "make sure all multipart delimiters on the lines are replaced with
+    "placeholders to prevent illegal syntax
+    if !sexyNested
+        let currentLine = a:firstLine
+        while(currentLine <= a:lastLine)
+            let theLine = getline(currentLine)
+            let theLine = s:ReplaceDelims(left, right, g:NERDLPlace, g:NERDRPlace, theLine)
+            call setline(currentLine, theLine)
+            let currentLine = currentLine + 1
+        endwhile
+    endif
+
+    "add the delimiter to the top line
+    let theLine = getline(a:firstLine)
+    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+    let theLine = s:AddLeftDelim(left, theLine)
+    if lineHasLeadingTabs
+        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+    endif
+    call setline(a:firstLine, theLine)
+
+    "add the delimiter to the bottom line
+    let theLine = getline(a:lastLine)
+    let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+    let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+    let theLine = s:AddRightDelim(right, theLine)
+    if lineHasLeadingTabs
+        let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+    endif
+
+    if g:NERDTrimTrailingWhitespace == 1
+        let theLine = s:TrimTrailingWhitespace(theLine)
+    endif
+
+    call setline(a:lastLine, theLine)
+endfunction
+
+" Function: s:CommentLinesSexy(topline, bottomline) function {{{2
+" This function is used to comment lines in the 'Sexy' style. E.g., in c:
+" /*
+"  * This is a sexy comment
+"  */
+" Args:
+"   -topline: the line number of the top line in the sexy comment
+"   -bottomline: the line number of the bottom line in the sexy comment
+function s:CommentLinesSexy(topline, bottomline)
+    let left = s:GetSexyComLeft(0, 0)
+    let right = s:GetSexyComRight(0, 0)
+
+    "check if we can do a sexy comment with the available delimiters
+    if left == -1 || right == -1
+        throw 'NERDCommenter.Delimiters exception: cannot perform sexy comments with available delimiters.'
+    endif
+
+    "make sure the lines aren't already commented sexually or we can nest
+    if !s:CanSexyCommentLines(a:topline, a:bottomline)
+        throw 'NERDCommenter.Nesting exception: cannot nest sexy comments'
+    endif
+
+
+    let sexyComMarker = s:GetSexyComMarker(0,0)
+    let sexyComMarkerSpaced = s:GetSexyComMarker(1,0)
+
+
+    " we jam the comment as far to the right as possible
+    let leftAlignIndx = s:LeftMostIndx(1, 1, a:topline, a:bottomline)
+
+    "check if we should use the compact style i.e that the left/right
+    "delimiters should appear on the first and last lines of the code and not
+    "on separate lines above/below the first/last lines of code
+    if g:NERDCompactSexyComs
+        let spaceString = (g:NERDSpaceDelims ? s:spaceStr : '')
+
+        "comment the top line
+        let theLine = getline(a:topline)
+        let lineHasTabs = s:HasLeadingTabs(theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        endif
+        if !s:SexyNested()
+            let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+        endif
+        let theLine = s:AddLeftDelimAligned(left . spaceString, theLine, leftAlignIndx)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:topline, theLine)
+
+        "comment the bottom line
+        if a:bottomline != a:topline
+            let theLine = getline(a:bottomline)
+            let lineHasTabs = s:HasLeadingTabs(theLine)
+            if lineHasTabs
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+            endif
+            if !s:SexyNested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+        endif
+        let theLine = s:AddRightDelim(spaceString . right, theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:bottomline, theLine)
+    else
+
+        " add the left delimiter one line above the lines that are to be commented
+        call cursor(a:topline, 1)
+        execute 'normal! O'
+        let theLine = repeat(' ', leftAlignIndx) . left
+
+        " Make sure tabs are respected
+        if !&expandtab
+           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:topline, theLine)
+
+        " add the right delimiter after bottom line (we have to add 1 cos we moved
+        " the lines down when we added the left delimiter
+        call cursor(a:bottomline+1, 1)
+        execute 'normal! o'
+        let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . right
+
+        " Make sure tabs are respected
+        if !&expandtab
+           let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+        call setline(a:bottomline+2, theLine)
+
+    endif
+
+    " go thru each line adding the sexyComMarker marker to the start of each
+    " line in the appropriate place to align them with the comment delimiters
+    let currentLine = a:topline+1
+    while currentLine <= a:bottomline + !g:NERDCompactSexyComs
+        " get the line and convert the tabs to spaces
+        let theLine = getline(currentLine)
+        let lineHasTabs = s:HasLeadingTabs(theLine)
+        if lineHasTabs
+            let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        endif
+
+        if !s:SexyNested()
+            let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+        endif
+
+        " add the sexyComMarker
+        let theLine = repeat(' ', leftAlignIndx) . repeat(' ', strlen(left)-strlen(sexyComMarker)) . sexyComMarkerSpaced . strpart(theLine, leftAlignIndx)
+
+        if lineHasTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace == 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " set the line and move onto the next one
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentLinesToggle(forceNested, firstLine, lastLine) {{{2
+" Applies "toggle" commenting to the given range of lines
+"
+" Args:
+"   -forceNested: a flag indicating whether the called is requesting the comment
+"    to be nested if need be
+"   -firstLine/lastLine: the top and bottom lines to comment
+function s:CommentLinesToggle(forceNested, firstLine, lastLine)
+    let currentLine = a:firstLine
+
+    let align = g:NERDDefaultAlign
+    let leftAlignIndx = align == "start" ? 0 : s:LeftMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = s:RightMostIndx(a:forceNested, 0, a:firstLine, a:lastLine)
+    let rightAlignIndx = rightAlignIndx + strlen(s:Left({'space': 1}))
+
+    while currentLine <= a:lastLine
+
+        " get the next line, check commentability and convert spaces to tabs
+        let theLine = getline(currentLine)
+        let lineHasLeadingTabs = s:HasLeadingTabs(theLine)
+        let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+        if s:CanToggleCommentLine(a:forceNested, currentLine)
+
+            "if the user has specified forceNesting then we check to see if we
+            "need to switch delimiters for place-holders
+            if g:NERDUsePlaceHolders && !s:Nested()
+                let theLine = s:SwapOuterMultiPartDelimsForPlaceHolders(theLine)
+            endif
+
+            if align == 'left' || align == 'start' || align == 'both'
+                let theLine = s:AddLeftDelimAligned(s:Left({'space': 1}), theLine, leftAlignIndx)
+            else
+                let theLine = s:AddLeftDelim(s:Left({'space': 1}), theLine)
+            endif
+            if align == "both"
+                let theLine = s:AddRightDelimAligned(s:Right({'space': 1}), theLine, rightAlignIndx)
+            else
+                let theLine = s:AddRightDelim(s:Right({'space': 1}), theLine)
+            endif
+        endif
+
+        " restore leading tabs if appropriate
+        if lineHasLeadingTabs
+            let theLine = s:ConvertLeadingSpacesToTabs(theLine)
+        endif
+
+        if g:NERDTrimTrailingWhitespace == 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " we are done with this line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+endfunction
+
+" Function: s:CommentRegion(topline, topCol, bottomLine, bottomCol) function {{{2
+" This function comments chunks of text selected in visual mode.
+" It will comment exactly the text that they have selected.
+" Args:
+"   -topLine: the line number of the top line in the sexy comment
+"   -topCol: top left column for this comment
+"   -bottomline: the line number of the bottom line in the sexy comment
+"   -bottomCol: the bottom right column for this comment
+"   -forceNested: whether the caller wants comments to be nested if the
+"    line(s) are already commented
+function s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested)
+
+    "switch delimiters (if we can) if the current set isn't multipart
+    let switchedDelims = 0
+    if !s:Multipart() && s:AltMultipart() && !g:NERDAllowAnyVisualDelims
+        let switchedDelims = 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+    "if there is only one line in the comment then just do it
+    if a:topLine == a:bottomLine
+        call s:CommentBlock(a:topLine, a:bottomLine, a:topCol, a:bottomCol, a:forceNested)
+
+    "there are multiple lines in the comment
+    else
+        "comment the top line
+        call s:CommentBlock(a:topLine, a:topLine, a:topCol, strlen(getline(a:topLine)), a:forceNested)
+
+        "comment out all the lines in the middle of the comment
+        let topOfRange = a:topLine+1
+        let bottomOfRange = a:bottomLine-1
+        if topOfRange <= bottomOfRange
+            call s:CommentLines(a:forceNested, g:NERDDefaultAlign, topOfRange, bottomOfRange)
+        endif
+
+        "comment the bottom line
+        let bottom = getline(a:bottomLine)
+        let numLeadingSpacesTabs = strlen(substitute(bottom, '^\([ \t]*\).*$', '\1', ''))
+        call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested)
+
+    endif
+
+    "stick the cursor back on the char it was on before the comment
+    call cursor(a:topLine, a:topCol + strlen(s:Left()) + g:NERDSpaceDelims)
+
+    "if we switched delimiters then we gotta go back to what they were before
+    if switchedDelims == 1
+        call s:SwitchToAlternativeDelimiters(0)
+    endif
+
+endfunction
+
+" Function: s:InvertComment(firstLine, lastLine) function {{{2
+" Inverts the comments on the lines between and including the given line
+" numbers i.e all commented lines are uncommented and vice versa
+" Args:
+"   -firstLine: the top of the range of lines to be inverted
+"   -lastLine: the bottom of the range of lines to be inverted
+function s:InvertComment(firstLine, lastLine)
+
+    " go thru all lines in the given range
+    let currentLine = a:firstLine
+    while currentLine <= a:lastLine
+        let theLine = getline(currentLine)
+
+        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
+
+        " if the line is commented normally, uncomment it
+        if s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+            call s:UncommentLines(currentLine, currentLine)
+            let currentLine = currentLine + 1
+
+        " check if the line is commented sexually
+        elseif !empty(sexyComBounds)
+            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
+            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
+
+            "move to the line after last line of the sexy comment
+            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
+            let currentLine = sexyComBounds[1] - (numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved) + 1
+
+        " the line isn't commented
+        else
+            call s:CommentLinesToggle(1, currentLine, currentLine)
+            let currentLine = currentLine + 1
+        endif
+
+    endwhile
+endfunction
+
+function! NERDCommentIsLineCommented(lineNo)
+    let theLine = getline(a:lineNo)
+    return s:IsInSexyComment(a:lineNo) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+endfunction
+
+" Function: NERDComment(mode, type) function {{{2
+" This function is a Wrapper for the main commenting functions
+"
+" Args:
+"   -mode: a character indicating the mode in which the comment is requested:
+"   'n' for Normal mode, 'x' for Visual mode
+"   -type: the type of commenting requested. Can be 'Sexy', 'Invert',
+"    'Minimal', 'Toggle', 'AlignLeft', 'AlignBoth', 'Comment',
+"    'Nested', 'ToEOL', 'Append', 'Insert', 'Uncomment', 'Yank'
+function! NERDComment(mode, type) range
+    if exists('*NERDCommenter_before')
+        exe "call NERDCommenter_before()"
+    endif
+
+    let isVisual = a:mode =~ '[vsx]'
+
+    if !exists("g:did_load_ftplugin") || g:did_load_ftplugin != 1
+        call s:NerdEcho("filetype plugins should be enabled. See :help NERDComInstallation and :help :filetype-plugin-on", 0)
+    endif
+
+    if isVisual
+        let firstLine = line("'<")
+        let lastLine = line("'>")
+        let firstCol = col("'<")
+        let lastCol = col("'>") - (&selection == 'exclusive' ? 1 : 0)
+    else
+        let firstLine = a:firstline
+        let lastLine = a:lastline
+    endif
+    "
+    " Save options we need to change so we can recover them later
+    let state = s:SetupStateBeforeLineComment(firstLine, lastLine)
+
+    let countWasGiven = (!isVisual && firstLine != lastLine)
+
+    let forceNested = (a:type ==? 'Nested' || g:NERDDefaultNesting)
+
+    if a:type ==? 'Comment' || a:type ==? 'Nested'
+        if isVisual && visualmode() == "\<C-V>"
+            call s:CommentBlock(firstLine, lastLine, firstCol, lastCol, forceNested)
+        elseif isVisual && visualmode() == "v" && (g:NERDCommentWholeLinesInVMode==0 || (g:NERDCommentWholeLinesInVMode==2 && s:HasMultipartDelims()))
+            call s:CommentRegion(firstLine, firstCol, lastLine, lastCol, forceNested)
+        else
+            call s:CommentLines(forceNested, g:NERDDefaultAlign, firstLine, lastLine)
+        endif
+
+    elseif a:type ==? 'AlignLeft' || a:type ==? 'AlignBoth'
+        let align = "none"
+        if a:type ==? "AlignLeft"
+            let align = "left"
+        elseif a:type ==? "AlignBoth"
+            let align = "both"
+        endif
+        call s:CommentLines(forceNested, align, firstLine, lastLine)
+
+    elseif a:type ==? 'Invert'
+        call s:InvertComment(firstLine, lastLine)
+
+    elseif a:type ==? 'Sexy'
+        try
+            call s:CommentLinesSexy(firstLine, lastLine)
+        catch /NERDCommenter.Delimiters/
+            call s:CommentLines(forceNested, g:NERDDefaultAlign, firstLine, lastLine)
+        catch /NERDCommenter.Nesting/
+            call s:NerdEcho("Sexy comment aborted. Nested sexy cannot be nested", 0)
+        endtry
+
+    elseif a:type ==? 'Toggle'
+        let theLine = getline(firstLine)
+
+        if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
+            call s:UncommentLines(firstLine, lastLine)
+        else
+            call s:CommentLinesToggle(forceNested, firstLine, lastLine)
+        endif
+
+    elseif a:type ==? 'Minimal'
+        try
+            call s:CommentLinesMinimal(firstLine, lastLine)
+        catch /NERDCommenter.Delimiters/
+            call s:NerdEcho("Minimal comments can only be used for filetypes that have multipart delimiters.", 0)
+        catch /NERDCommenter.Settings/
+            call s:NerdEcho("Place holders are required but disabled.", 0)
+        endtry
+
+    elseif a:type ==? 'ToEOL'
+        call s:SaveScreenState()
+        call s:CommentBlock(firstLine, firstLine, col("."), col("$")-1, 1)
+        call s:RestoreScreenState()
+
+    elseif a:type ==? 'Append'
+        call s:AppendCommentToLine()
+
+    elseif a:type ==? 'Insert'
+        call s:PlaceDelimitersAndInsBetween()
+
+    elseif a:type ==? 'Uncomment'
+        call s:UncommentLines(firstLine, lastLine)
+
+    elseif a:type ==? 'Yank'
+        if isVisual
+            normal! gvy
+        elseif countWasGiven
+            execute firstLine .','. lastLine .'yank'
+        else
+            normal! yy
+        endif
+        execute firstLine .','. lastLine .'call NERDComment("'. a:mode .'", "Comment")'
+    endif
+
+    call s:RecoverStateAfterLineComment(state)
+
+    if isVisual
+        let nlines = lastLine - firstLine
+        silent! call repeat#set("V" . nlines . "jo" . "\<Plug>NERDCommenter". a:type)
+    else
+        silent! call repeat#set("\<Plug>NERDCommenter". a:type)
+    endif
+
+    if exists('*NERDCommenter_after')
+        exe "call NERDCommenter_after()"
+    endif
+
+endfunction
+
+" Function: s:PlaceDelimitersAndInsBetween() function {{{2
+" This is function is called to place comment delimiters down and place the
+" cursor between them
+function s:PlaceDelimitersAndInsBetween()
+    " get the left and right delimiters without any escape chars in them
+    let left = s:Left({'space': 1})
+    let right = s:Right({'space': 1})
+
+    let theLine = getline(".")
+    let lineHasLeadTabs = s:HasLeadingTabs(theLine) || (theLine =~ '^ *$' && !&expandtab)
+
+    "convert tabs to spaces and adjust the cursors column to take this into
+    "account
+    let untabbedCol = s:UntabbedCol(theLine, col("."))
+    call setline(line("."), s:ConvertLeadingTabsToSpaces(theLine))
+    call cursor(line("."), untabbedCol)
+
+    " get the length of the right delimiter
+    let lenRight = strlen(right)
+
+    let isDelimOnEOL = col(".") >= strlen(getline("."))
+
+    " if the cursor is in the first col then we gotta insert rather than
+    " append the comment delimiters here
+    let insOrApp = (col(".")==1 ? 'i' : 'a')
+
+    " place the delimiters down. We do it differently depending on whether
+    " there is a left AND right delimiter
+    if lenRight > 0
+        execute ":normal! " . insOrApp . left . right
+        execute ":normal! " . lenRight . "h"
+    else
+        execute ":normal! " . insOrApp . left
+    endif
+    silent! normal! l
+
+    "if needed convert spaces back to tabs and adjust the cursors col
+    "accordingly
+    if lineHasLeadTabs
+        let tabbedCol = s:TabbedCol(getline("."), col("."))
+        call setline(line("."), s:ConvertLeadingSpacesToTabs(getline(".")))
+        call cursor(line("."), tabbedCol)
+    endif
+
+    if isDelimOnEOL && lenRight == 0
+        startinsert!
+    else
+        startinsert
+    endif
+endfunction
+
+" Function: s:RemoveDelimiters(left, right, line) {{{2
+" this function is called to remove the first left comment delimiter and the
+" last right delimiter of the given line.
+"
+" The arguments left and right must be strings. If there is no right delimiter (as
+" is the case for e.g vim file comments) them the argument right should be ""
+"
+" Args:
+"   -left: the left comment delimiter
+"   -right: the right comment delimiter
+"   -line: the line to remove the delimiters from
+function s:RemoveDelimiters(left, right, line)
+
+    let l:left = a:left
+    let l:right = a:right
+    let lenLeft = strlen(left)
+    let lenRight = strlen(right)
+
+    let delimsSpaced = (g:NERDSpaceDelims || g:NERDRemoveExtraSpaces)
+
+    let line = a:line
+
+    "look for the left delimiter, if we find it, remove it.
+    let leftIndx = s:FindDelimiterIndex(a:left, line)
+    if leftIndx != -1
+        let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+lenLeft)
+
+        "if the user has specified that there is a space after the left delimiter
+        "then check for the space and remove it if it is there
+        if delimsSpaced && strpart(line, leftIndx, s:lenSpaceStr) == s:spaceStr
+            let line = strpart(line, 0, leftIndx) . strpart(line, leftIndx+s:lenSpaceStr)
+        endif
+    endif
+
+    "look for the right delimiter, if we find it, remove it
+    let rightIndx = s:LastIndexOfDelim(a:right, line)
+    if rightIndx != -1
+        let line = strpart(line, 0, rightIndx) . strpart(line, rightIndx+lenRight)
+
+        "if the user has specified that there is a space before the right delimiter
+        "then check for the space and remove it if it is there
+        if delimsSpaced && strpart(line, rightIndx-s:lenSpaceStr, s:lenSpaceStr) == s:spaceStr && (s:Multipart() || s:AltMultipart())
+            let line = strpart(line, 0, rightIndx-s:lenSpaceStr) . strpart(line, rightIndx)
+        endif
+    endif
+
+    return line
+endfunction
+
+" Function: s:SetupStateBeforeLineComment(topLine, bottomLine) {{{2
+" Changes ignorecase and foldmethod options before commenting lines and saves
+" their original values in a dict, which is returned as a result
+"
+" Args:
+" topLine: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+"
+" Return: a dict with the state prior to configuration changes
+"
+function s:SetupStateBeforeLineComment(topLine, bottomLine)
+    let state = {'foldmethod' : &foldmethod,
+                \'ignorecase' : &ignorecase}
+
+    " Vim's foldmethods are evaluated every time we use 'setline', which can
+    " make commenting wide ranges of lines VERY slow. We'll change it to
+    " manual, do the commenting stuff and recover it later. To avoid slowing
+    " down commenting few lines, we avoid doing this for ranges smaller than
+    " 10 lines
+    if a:bottomLine - a:topLine >= 10 && &foldmethod != "manual"
+        set foldmethod=manual
+    endif
+
+    " we want case sensitivity when commenting
+    set noignorecase
+
+    return state
+endfunction
+
+" Function: s:RecoverStateAfterLineComment(state) {{{2
+" Receives the state returned by s:SetupStateBeforeLineComment and restores
+" the state accordingly
+"
+" Args:
+" state: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+function s:RecoverStateAfterLineComment(state)
+    if a:state['foldmethod'] != &foldmethod
+        let &foldmethod = a:state['foldmethod']
+    endif
+    if a:state['ignorecase'] != &ignorecase
+        let &ignorecase = a:state['ignorecase']
+    endif
+endfunction
+
+" Function: s:TrimTrailingWhitespace(line) {{{2
+" This function removes all the trailing whitespace
+" Args:
+"   -line: the target line
+function s:TrimTrailingWhitespace(line)
+    let toReturn = substitute(a:line, '\s\+$', '', 'g')
+    return toReturn
+endfunction
+
+" Function: s:UncommentLines(topLine, bottomLine) {{{2
+" This function uncomments the given lines
+"
+" Args:
+" topLine: the top line of the visual selection to uncomment
+" bottomLine: the bottom line of the visual selection to uncomment
+function s:UncommentLines(topLine, bottomLine)
+    "make local copies of a:firstline and a:lastline and, if need be, swap
+    "them around if the top line is below the bottom
+    let l:firstline = a:topLine
+    let l:lastline = a:bottomLine
+    if firstline > lastline
+        let firstline = lastline
+        let lastline = a:topLine
+    endif
+
+    "go thru each line uncommenting each line removing sexy comments
+    let currentLine = firstline
+    while currentLine <= lastline
+
+        "check the current line to see if it is part of a sexy comment
+        let sexyComBounds = s:FindBoundingLinesOfSexyCom(currentLine)
+        if !empty(sexyComBounds)
+
+            "we need to store the number of lines in the buffer before the comment is
+            "removed so we know how many lines were removed when the sexy comment
+            "was removed
+            let numLinesBeforeSexyComRemoved = s:NumLinesInBuf()
+
+            call s:UncommentLinesSexy(sexyComBounds[0], sexyComBounds[1])
+
+            "move to the line after last line of the sexy comment
+            let numLinesAfterSexyComRemoved = s:NumLinesInBuf()
+            let numLinesRemoved = numLinesBeforeSexyComRemoved - numLinesAfterSexyComRemoved
+            let currentLine = sexyComBounds[1] - numLinesRemoved + 1
+            let lastline = lastline - numLinesRemoved
+
+        "no sexy com was detected so uncomment the line as normal
+        else
+            call s:UncommentLinesNormal(currentLine, currentLine)
+            let currentLine = currentLine + 1
+        endif
+    endwhile
+
+endfunction
+
+" Function: s:UncommentLinesSexy(topline, bottomline) {{{2
+" This function removes all the comment characters associated with the sexy
+" comment spanning the given lines
+" Args:
+"   -topline/bottomline: the top/bottom lines of the sexy comment
+function s:UncommentLinesSexy(topline, bottomline)
+    let left = s:GetSexyComLeft(0,1)
+    let right = s:GetSexyComRight(0,1)
+
+
+    "check if it is even possible for sexy comments to exist with the
+    "available delimiters
+    if left == -1 || right == -1
+        throw 'NERDCommenter.Delimiters exception: cannot uncomment sexy comments with available delimiters.'
+    endif
+
+    let leftUnEsc = s:GetSexyComLeft(0,0)
+    let rightUnEsc = s:GetSexyComRight(0,0)
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+    let sexyComMarkerUnEsc = s:GetSexyComMarker(0, 0)
+
+    "the markerOffset is how far right we need to move the sexyComMarker to
+    "line it up with the end of the left delimiter
+    let markerOffset = strlen(leftUnEsc)-strlen(sexyComMarkerUnEsc)
+
+    " go thru the intermediate lines of the sexy comment and remove the
+    " sexy comment markers (e.g., the '*'s on the start of line in a c sexy
+    " comment)
+    let currentLine = a:topline+1
+    while currentLine < a:bottomline
+        let theLine = getline(currentLine)
+
+        " remove the sexy comment marker from the line. We also remove the
+        " space after it if there is one and if appropriate options are set
+        let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
+        if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
+        endif
+
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+
+        let theLine = s:ConvertLeadingWhiteSpace(theLine)
+
+        if g:NERDTrimTrailingWhitespace == 1
+            let theLine = s:TrimTrailingWhitespace(theLine)
+        endif
+
+        " move onto the next line
+        call setline(currentLine, theLine)
+        let currentLine = currentLine + 1
+    endwhile
+
+    " gotta make a copy of a:bottomline cos we modify the position of the
+    " last line  it if we remove the topline
+    let bottomline = a:bottomline
+
+    " get the first line so we can remove the left delimiter from it
+    let theLine = getline(a:topline)
+
+    " if the first line contains only the left delimiter then just delete it
+    if theLine =~ '^[ \t]*' . left . '[ \t]*$' && !g:NERDCompactSexyComs
+        call cursor(a:topline, 1)
+        normal! dd
+        let bottomline = bottomline - 1
+
+    " topline contains more than just the left delimiter
+    else
+
+        " remove the delimiter. If there is a space after it
+        " then remove this too if appropriate
+        let delimIndx = stridx(theLine, leftUnEsc)
+        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) == s:spaceStr && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(leftUnEsc))
+        endif
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+        call setline(a:topline, theLine)
+    endif
+
+    " get the last line so we can remove the right delimiter
+    let theLine = getline(bottomline)
+
+    " if the bottomline contains only the right delimiter then just delete it
+    if theLine =~ '^[ \t]*' . right . '[ \t]*$'
+        call cursor(bottomline, 1)
+        normal! dd
+
+    " the last line contains more than the right delimiter
+    else
+        " remove the right delimiter. If there is a space after it and
+        " if the appropriate options are set then remove this too.
+        let delimIndx = s:LastIndexOfDelim(rightUnEsc, theLine)
+        if strpart(theLine, delimIndx+strlen(leftUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc)+s:lenSpaceStr)
+        else
+            let theLine = strpart(theLine, 0, delimIndx) . strpart(theLine, delimIndx+strlen(rightUnEsc))
+        endif
+
+        " if the last line also starts with a sexy comment marker then we
+        " remove this as well
+        if theLine =~ '^[ \t]*' . sexyComMarker
+
+            " remove the sexyComMarker. If there is a space after it then
+            " remove that too
+            let sexyComMarkerIndx = stridx(theLine, sexyComMarkerUnEsc)
+            if strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc), s:lenSpaceStr) == s:spaceStr  && g:NERDSpaceDelims
+                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc)+s:lenSpaceStr)
+            else
+                let theLine = strpart(theLine, 0, sexyComMarkerIndx - markerOffset ) . strpart(theLine, sexyComMarkerIndx+strlen(sexyComMarkerUnEsc))
+            endif
+        endif
+
+        let theLine = s:SwapOuterPlaceHoldersForMultiPartDelims(theLine)
+        call setline(bottomline, theLine)
+    endif
+
+    " remove trailing whitespaces for first and last line
+    if g:NERDTrimTrailingWhitespace == 1
+        let theLine = getline(a:bottomline)
+        let theLine = s:TrimTrailingWhitespace(theLine)
+        call setline(a:bottomline, theLine)
+        let theLine = getline(a:topline)
+        let theLine = s:TrimTrailingWhitespace(theLine)
+        call setline(a:topline, theLine)
+    endif
+endfunction
+
+" Function: s:UncommentLineNormal(line) {{{2
+" uncomments the given line and returns the result
+" Args:
+"   -line: the line to uncomment
+function s:UncommentLineNormal(line)
+    let line = a:line
+
+    "get the positions of all delimiter types on the line
+    let indxLeft = s:FindDelimiterIndex(s:Left(), line)
+    let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line)
+    let indxRight = s:LastIndexOfDelim(s:Right(), line)
+    let indxRightAlt = s:LastIndexOfDelim(s:Right({'alt': 1}), line)
+
+    "get the comment status on the line so we know how it is commented
+    let lineCommentStatus =  s:IsCommentedOutermost(s:Left(), s:Right(), s:Left({'alt': 1}), s:Right({'alt': 1}), line)
+
+    "it is commented with s:Left() and s:Right() so remove these delimiters
+    if lineCommentStatus == 1
+        let line = s:RemoveDelimiters(s:Left(), s:Right(), line)
+
+    "it is commented with s:Left({'alt': 1}) and s:Right({'alt': 1}) so remove these delimiters
+    elseif lineCommentStatus == 2 && g:NERDRemoveAltComs
+        let line = s:RemoveDelimiters(s:Left({'alt': 1}), s:Right({'alt': 1}), line)
+
+    "it is not properly commented with any delimiters so we check if it has
+    "any random left or right delimiters on it and remove the outermost ones
+    else
+        "remove the outer most left comment delimiter
+        if indxLeft != -1 && (indxLeft < indxLeftAlt || indxLeftAlt == -1)
+            let line = s:RemoveDelimiters(s:Left(), '', line)
+        elseif indxLeftAlt != -1 && g:NERDRemoveAltComs
+            let line = s:RemoveDelimiters(s:Left({'alt': 1}), '', line)
+        endif
+
+        "remove the outer most right comment delimiter
+        if indxRight != -1 && (indxRight < indxRightAlt || indxRightAlt == -1)
+            let line = s:RemoveDelimiters('', s:Right(), line)
+        elseif indxRightAlt != -1 && g:NERDRemoveAltComs
+            let line = s:RemoveDelimiters('', s:Right({'alt': 1}), line)
+        endif
+    endif
+
+
+    let indxLeftPlace = s:FindDelimiterIndex(g:NERDLPlace, line)
+    let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line)
+
+    let right = s:Right()
+    let left = s:Left()
+    if !s:Multipart()
+        let right = s:Right({'alt': 1})
+        let left = s:Left({'alt': 1})
+    endif
+
+
+    "if there are place-holders on the line then we check to see if they are
+    "the outermost delimiters on the line. If so then we replace them with
+    "real delimiters
+    if indxLeftPlace != -1
+        if (indxLeftPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
+            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
+        endif
+    elseif indxRightPlace != -1
+        if (indxRightPlace < indxLeft || indxLeft==-1) && (indxLeftPlace < indxLeftAlt || indxLeftAlt==-1)
+            let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, line)
+        endif
+
+    endif
+
+    let line = s:ConvertLeadingWhiteSpace(line)
+
+    if g:NERDTrimTrailingWhitespace == 1
+        let line = s:TrimTrailingWhitespace(line)
+    endif
+
+    return line
+endfunction
+
+" Function: s:UncommentLinesNormal(topline, bottomline) {{{2
+" This function is called to uncomment lines that aren't a sexy comment
+" Args:
+"   -topline/bottomline: the top/bottom line numbers of the comment
+function s:UncommentLinesNormal(topline, bottomline)
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+        let line = getline(currentLine)
+        call setline(currentLine, s:UncommentLineNormal(line))
+        let currentLine = currentLine + 1
+    endwhile
+endfunction
+
+
+" Section: Other helper functions {{{1
+" ============================================================================
+
+" Function: s:AddLeftDelim(delim, theLine) {{{2
+" Args:
+function s:AddLeftDelim(delim, theLine)
+    return substitute(a:theLine, '^\([ \t]*\)', '\1' . a:delim, '')
+endfunction
+
+" Function: s:AddLeftDelimAligned(delim, theLine) {{{2
+" Args:
+function s:AddLeftDelimAligned(delim, theLine, alignIndx)
+
+    "if the line is not long enough then bung some extra spaces on the front
+    "so we can align the delimiter properly
+    let theLine = a:theLine
+    if strlen(theLine) < a:alignIndx
+        let theLine = repeat(' ', a:alignIndx - strlen(theLine))
+    endif
+
+    return strpart(theLine, 0, a:alignIndx) . a:delim . strpart(theLine, a:alignIndx)
+endfunction
+
+" Function: s:AddRightDelim(delim, theLine) {{{2
+" Args:
+function s:AddRightDelim(delim, theLine)
+    if a:delim == ''
+        return a:theLine
+    else
+        return substitute(a:theLine, '$', a:delim, '')
+    endif
+endfunction
+
+" Function: s:AddRightDelimAligned(delim, theLine, alignIndx) {{{2
+" Args:
+function s:AddRightDelimAligned(delim, theLine, alignIndx)
+    if a:delim == ""
+        return a:theLine
+    else
+
+        " when we align the right delimiter we are just adding spaces
+        " so we get a string containing the needed spaces (it
+        " could be empty)
+        let extraSpaces = ''
+        let extraSpaces = repeat(' ', a:alignIndx-strlen(a:theLine))
+
+        " add the right delimiter
+        return substitute(a:theLine, '$', extraSpaces . a:delim, '')
+    endif
+endfunction
+
+" Function: s:AltMultipart() {{{2
+" returns 1 if the alternative delimiters are multipart
+function s:AltMultipart()
+    return b:NERDCommenterDelims['rightAlt'] != ''
+endfunction
+
+" Function: s:AltNested() {{{2
+" returns 1 if the alternate multipart (if any) delimiters allow nesting
+function s:AltNested()
+    return b:NERDCommenterDelims['nestedAlt']
+endfunction
+
+" Function: s:CanCommentLine(forceNested, line) {{{2
+"This function is used to determine whether the given line can be commented.
+"It returns 1 if it can be and 0 otherwise
+"
+" Args:
+"   -forceNested: a flag indicating whether the caller wants comments to be nested
+"    if the current line is already commented
+"   -lineNum: the line number of the line to check for commentability
+function s:CanCommentLine(forceNested, lineNum)
+    let theLine = getline(a:lineNum)
+
+    " make sure we don't comment lines that are just spaces or tabs or empty,
+    " unless configured otherwise
+    if g:NERDCommentEmptyLines == 0 && theLine =~ "^[ \t]*$"
+        return 0
+    endif
+
+    "if the line is part of a sexy comment then just flag it...
+    if s:IsInSexyComment(a:lineNum)
+        return 0
+    endif
+
+    let isCommented = s:IsCommentedNormOrSexy(a:lineNum)
+
+    "if the line isn't commented return true
+    if !isCommented
+        return 1
+    endif
+
+    "if the line is commented but nesting is allowed then return true
+    if s:Nested() || (a:forceNested && (!s:Multipart() || g:NERDUsePlaceHolders))
+        return 1
+    endif
+
+    return 0
+endfunction
+
+" Function: s:CanPlaceCursor(line, col) {{{2
+" returns 1 if the cursor can be placed exactly in the given position
+function s:CanPlaceCursor(line, col)
+    let c = col(".")
+    let l = line(".")
+    call cursor(a:line, a:col)
+    let success = (line(".") == a:line && col(".") == a:col)
+    call cursor(l,c)
+    return success
+endfunction
+
+" Function: s:CanSexyCommentLines(topline, bottomline) {{{2
+" Return: 1 if the given lines can be commented sexually, 0 otherwise
+function s:CanSexyCommentLines(topline, bottomline)
+    " see if the selected regions have any sexy comments
+    " however, if the language allows nested comments,
+    " we allow nested sexy comments
+    if s:SexyNested()
+        return 1
+    endif
+    let currentLine = a:topline
+    while(currentLine <= a:bottomline)
+        if s:IsInSexyComment(currentLine)
+            return 0
+        endif
+        let currentLine = currentLine + 1
+    endwhile
+    return 1
+endfunction
+" Function: s:CanToggleCommentLine(forceNested, line) {{{2
+"This function is used to determine whether the given line can be toggle commented.
+"It returns 1 if it can be and 0 otherwise
+"
+" Args:
+"   -lineNum: the line number of the line to check for commentability
+function s:CanToggleCommentLine(forceNested, lineNum)
+    let theLine = getline(a:lineNum)
+    if (s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)) && !a:forceNested
+        return 0
+    endif
+
+    " make sure we don't comment lines that are just spaces or tabs or empty,
+    " unless configured otherwise
+    if g:NERDCommentEmptyLines == 0 && theLine =~ "^[ \t]*$"
+        return 0
+    endif
+
+    "if the line is part of a sexy comment then just flag it...
+    if s:IsInSexyComment(a:lineNum)
+        return 0
+    endif
+
+    return 1
+endfunction
+
+" Function: s:ConvertLeadingSpacesToTabs(line) {{{2
+" This function takes a line and converts all leading tabs on that line into
+" spaces
+"
+" Args:
+"   -line: the line whose leading tabs will be converted
+function s:ConvertLeadingSpacesToTabs(line)
+    let toReturn  = a:line
+    while toReturn =~ '^\t*' . s:TabSpace() . '\(.*\)$'
+        let toReturn = substitute(toReturn, '^\(\t*\)' . s:TabSpace() . '\(.*\)$'  ,  '\1\t\2' , "")
+    endwhile
+
+    return toReturn
+endfunction
+
+
+" Function: s:ConvertLeadingTabsToSpaces(line) {{{2
+" This function takes a line and converts all leading spaces on that line into
+" tabs
+"
+" Args:
+"   -line: the line whose leading spaces will be converted
+function s:ConvertLeadingTabsToSpaces(line)
+    let toReturn  = a:line
+    while toReturn =~ '^\( *\)\t'
+        let toReturn = substitute(toReturn, '^\( *\)\t',  '\1' . s:TabSpace() , "")
+    endwhile
+
+    return toReturn
+endfunction
+
+" Function: s:ConvertLeadingWhiteSpace(line) {{{2
+" Converts the leading white space to tabs/spaces depending on &ts
+"
+" Args:
+"   -line: the line to convert
+function s:ConvertLeadingWhiteSpace(line)
+    let toReturn = a:line
+    while toReturn =~ '^ *\t'
+        let toReturn = substitute(toReturn, '^ *\zs\t\ze', s:TabSpace(), "g")
+    endwhile
+
+    if !&expandtab
+        let toReturn = s:ConvertLeadingSpacesToTabs(toReturn)
+    endif
+
+    return toReturn
+endfunction
+
+
+" Function: s:CountNonESCedOccurances(str, searchstr, escChar) {{{2
+" This function counts the number of substrings contained in another string.
+" These substrings are only counted if they are not escaped with escChar
+" Args:
+"   -str: the string to look for searchstr in
+"   -searchstr: the substring to search for in str
+"   -escChar: the escape character which, when preceding an instance of
+"    searchstr, will cause it not to be counted
+function s:CountNonESCedOccurances(str, searchstr, escChar)
+    "get the index of the first occurrence of searchstr
+    let indx = stridx(a:str, a:searchstr)
+
+    "if there is an instance of searchstr in str process it
+    if indx != -1
+        "get the remainder of str after this instance of searchstr is removed
+        let lensearchstr = strlen(a:searchstr)
+        let strLeft = strpart(a:str, indx+lensearchstr)
+
+        "if this instance of searchstr is not escaped, add one to the count
+        "and recurse. If it is escaped, just recurse
+        if !s:IsEscaped(a:str, indx, a:escChar)
+            return 1 + s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
+        else
+            return s:CountNonESCedOccurances(strLeft, a:searchstr, a:escChar)
+        endif
+    endif
+endfunction
+" Function: s:DoesBlockHaveDelim(delim, top, bottom) {{{2
+" Returns 1 if the given block of lines has a delimiter (a:delim) in it
+" Args:
+"   -delim: the comment delimiter to check the block for
+"   -top: the top line number of the block
+"   -bottom: the bottom line number of the block
+function s:DoesBlockHaveDelim(delim, top, bottom)
+    let currentLine = a:top
+    while currentLine < a:bottom
+        let theline = getline(currentLine)
+        if s:FindDelimiterIndex(a:delim, theline) != -1
+            return 1
+        endif
+        let currentLine = currentLine + 1
+    endwhile
+    return 0
+endfunction
+
+" Function: s:DoesBlockHaveMultipartDelim(top, bottom) {{{2
+" Returns 1 if the given block has a >= 1 multipart delimiter in it
+" Args:
+"   -top: the top line number of the block
+"   -bottom: the bottom line number of the block
+function s:DoesBlockHaveMultipartDelim(top, bottom)
+    if s:HasMultipartDelims()
+        if s:Multipart()
+            return s:DoesBlockHaveDelim(s:Left(), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right(), a:top, a:bottom)
+        else
+            return s:DoesBlockHaveDelim(s:Left({'alt': 1}), a:top, a:bottom) || s:DoesBlockHaveDelim(s:Right({'alt': 1}), a:top, a:bottom)
+        endif
+    endif
+    return 0
+endfunction
+
+
+" Function: s:Esc(str) {{{2
+" Escapes all the tricky chars in the given string
+function s:Esc(str)
+    let charsToEsc = '*/\."&$+'
+    return escape(a:str, charsToEsc)
+endfunction
+
+" Function: s:FindDelimiterIndex(delimiter, line) {{{2
+" This function is used to get the string index of the input comment delimiter
+" on the input line. If no valid comment delimiter is found in the line then
+" -1 is returned
+" Args:
+"   -delimiter: the delimiter we are looking to find the index of
+"   -line: the line we are looking for delimiter on
+function s:FindDelimiterIndex(delimiter, line)
+
+    "make sure the delimiter isn't empty otherwise we go into an infinite loop.
+    if a:delimiter == ""
+        return -1
+    endif
+
+
+    let l:delimiter = a:delimiter
+    let lenDel = strlen(l:delimiter)
+
+    "get the index of the first occurrence of the delimiter
+    let delIndx = stridx(a:line, l:delimiter)
+
+    "keep looping thru the line till we either find a real comment delimiter
+    "or run off the EOL
+    while delIndx != -1
+
+        "if we are not off the EOL get the str before the possible delimiter
+        "in question and check if it really is a delimiter. If it is, return
+        "its position
+        if delIndx != -1
+            if s:IsDelimValid(l:delimiter, delIndx, a:line)
+                return delIndx
+            endif
+        endif
+
+        "we have not yet found a real comment delimiter so move past the
+        "current one we are looking at
+        let restOfLine = strpart(a:line, delIndx + lenDel)
+        let distToNextDelim = stridx(restOfLine , l:delimiter)
+
+        "if distToNextDelim is -1 then there is no more potential delimiters
+        "on the line so set delIndx to -1. Otherwise, move along the line by
+        "distToNextDelim
+        if distToNextDelim == -1
+            let delIndx = -1
+        else
+            let delIndx = delIndx + lenDel + distToNextDelim
+        endif
+    endwhile
+
+    "there is no comment delimiter on this line
+    return -1
+endfunction
+
+" Function: s:FindBoundingLinesOfSexyCom(lineNum) {{{2
+" This function takes in a line number and tests whether this line number is
+" the top/bottom/middle line of a sexy comment. If it is then the top/bottom
+" lines of the sexy comment are returned
+" Args:
+"   -lineNum: the line number that is to be tested whether it is the
+"    top/bottom/middle line of a sexy com
+" Returns:
+"   A string that has the top/bottom lines of the sexy comment encoded in it.
+"   The format is 'topline,bottomline'. If a:lineNum turns out not to be the
+"   top/bottom/middle of a sexy comment then -1 is returned
+function s:FindBoundingLinesOfSexyCom(lineNum)
+
+    "find which delimiters to look for as the start/end delimiters of the comment
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left({'esc': 1})
+        let right = s:Right({'esc': 1})
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1, 'esc': 1})
+        let right = s:Right({'alt': 1, 'esc': 1})
+    else
+        return []
+    endif
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+
+    "initialise the top/bottom line numbers of the sexy comment to -1
+    let top = -1
+    let bottom = -1
+
+    let currentLine = a:lineNum
+    while top == -1 || bottom == -1
+        let theLine = getline(currentLine)
+
+        "check if the current line is the top of the sexy comment
+        if currentLine <= a:lineNum && theLine =~ '^[ \t]*' . left && theLine !~ '.*' . right && currentLine < s:NumLinesInBuf()
+            let top = currentLine
+            let currentLine = a:lineNum
+
+        "check if the current line is the bottom of the sexy comment
+        elseif theLine =~ '^[ \t]*' . right && theLine !~ '.*' . left && currentLine > 1
+            let bottom = currentLine
+
+        "the right delimiter is on the same line as the last sexyComMarker
+        elseif theLine =~ '^[ \t]*' . sexyComMarker . '.*' . right
+            let bottom = currentLine
+
+        "we have not found the top or bottom line so we assume currentLine is an
+        "intermediate line and look to prove otherwise
+        else
+
+            "if the line doesn't start with a sexyComMarker then it is not a sexy
+            "comment
+            if theLine !~ '^[ \t]*' . sexyComMarker
+                return []
+            endif
+
+        endif
+
+        "if top is -1 then we haven't found the top yet so keep looking up
+        if top == -1
+            let currentLine = currentLine - 1
+        "if we have found the top line then go down looking for the bottom
+        else
+            let currentLine = currentLine + 1
+        endif
+
+    endwhile
+
+    return [top, bottom]
+endfunction
+
+
+" Function: s:GetSexyComMarker() {{{2
+" Returns the sexy comment marker for the current filetype.
+"
+" C style sexy comments are assumed if possible. If not then the sexy comment
+" marker is the last char of the delimiter pair that has both left and right
+" delimiters and has the longest left delimiter
+"
+" Args:
+"   -space: specifies whether the marker is to have a space string after it
+"    (the space string will only be added if NERDSpaceDelims is set)
+"   -esc: specifies whether the tricky chars in the marker are to be ESCed
+function s:GetSexyComMarker(space, esc)
+    let sexyComMarker = b:NERDSexyComMarker
+
+    "if there is no hardcoded marker then we find one
+    if sexyComMarker == ''
+
+        "if the filetype has c style comments then use standard c sexy
+        "comments
+        if s:HasCStyleComments()
+            let sexyComMarker = '*'
+        else
+            "find a comment marker by getting the longest available left delimiter
+            "(that has a corresponding right delimiter) and taking the last char
+            let lenLeft = strlen(s:Left())
+            let lenLeftAlt = strlen(s:Left({'alt': 1}))
+            let left = ''
+            let right = ''
+            if s:Multipart() && lenLeft >= lenLeftAlt
+                let left = s:Left()
+            elseif s:AltMultipart()
+                let left = s:Left({'alt': 1})
+            else
+                return -1
+            endif
+
+            "get the last char of left
+            let sexyComMarker = strpart(left, strlen(left)-1)
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let sexyComMarker = sexyComMarker . s:spaceStr
+    endif
+
+    if a:esc
+        let sexyComMarker = s:Esc(sexyComMarker)
+    endif
+
+    return sexyComMarker
+endfunction
+
+" Function: s:SexyNested() {{{2
+" Returns 1 if the sexy delimeters allow nesting
+" TODO this is ugly copy&paste from the GetSexyComLeft/Right functions,
+" these could all be cleaned up
+function s:SexyNested()
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        return (s:Left() == '/*' && s:Nested()) || (s:Left({'alt': 1}) == '/*' && s:AltNested())
+    else
+        "grab the longest left delim that has a right
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            return s:Nested()
+        elseif s:AltMultipart()
+            return s:AltNested()
+        else
+            return 0
+        endif
+    endif
+endfunction
+
+" Function: s:GetSexyComLeft(space, esc) {{{2
+" Returns the left delimiter for sexy comments for this filetype or -1 if
+" there is none. C style sexy comments are used if possible
+" Args:
+"   -space: specifies if the delimiter has a space string on the end
+"   (the space string will only be added if NERDSpaceDelims is set)
+"   -esc: specifies whether the tricky chars in the string are ESCed
+function s:GetSexyComLeft(space, esc)
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+    let left = ''
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        let left = '/*'
+    else
+        "grab the longest left delimiter that has a right
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            let left = s:Left()
+        elseif s:AltMultipart()
+            let left = s:Left({'alt': 1})
+        else
+            return -1
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let left = left . s:spaceStr
+    endif
+
+    if a:esc
+        let left = s:Esc(left)
+    endif
+
+    return left
+endfunction
+
+" Function: s:GetSexyComRight(space, esc) {{{2
+" Returns the right delimiter for sexy comments for this filetype or -1 if
+" there is none. C style sexy comments are used if possible.
+" Args:
+"   -space: specifies if the delimiter has a space string on the start
+"   (the space string will only be added if NERDSpaceDelims
+"   is specified for the current filetype)
+"   -esc: specifies whether the tricky chars in the string are ESCed
+function s:GetSexyComRight(space, esc)
+    let lenLeft = strlen(s:Left())
+    let lenLeftAlt = strlen(s:Left({'alt': 1}))
+    let right = ''
+
+    "assume c style sexy comments if possible
+    if s:HasCStyleComments()
+        let right = '*/'
+    else
+        "grab the right delimiter that pairs with the longest left delimiter
+        if s:Multipart() && lenLeft >= lenLeftAlt
+            let right = s:Right()
+        elseif s:AltMultipart()
+            let right = s:Right({'alt': 1})
+        else
+            return -1
+        endif
+    endif
+
+    if a:space && g:NERDSpaceDelims
+        let right = s:spaceStr . right
+    endif
+
+    if a:esc
+        let right = s:Esc(right)
+    endif
+
+    return right
+endfunction
+
+" Function: s:HasMultipartDelims() {{{2
+" Returns 1 if the current filetype has at least one set of multipart delimiters
+function s:HasMultipartDelims()
+    return s:Multipart() || s:AltMultipart()
+endfunction
+
+" Function: s:HasLeadingTabs(...) {{{2
+" Returns 1 if any of the given strings have leading tabs
+function s:HasLeadingTabs(...)
+    for s in a:000
+        if s =~ '^\t.*'
+            return 1
+        end
+    endfor
+    return 0
+endfunction
+" Function: s:HasCStyleComments() {{{2
+" Returns 1 if the current filetype has c style comment delimiters
+function s:HasCStyleComments()
+    return (s:Left() == '/*' && s:Right() == '*/') || (s:Left({'alt': 1}) == '/*' && s:Right({'alt': 1}) == '*/')
+endfunction
+
+" Function: s:IsCommentedNormOrSexy(lineNum) {{{2
+"This function is used to determine whether the given line is commented with
+"either set of delimiters or if it is part of a sexy comment
+"
+" Args:
+"   -lineNum: the line number of the line to check
+function s:IsCommentedNormOrSexy(lineNum)
+    let theLine = getline(a:lineNum)
+
+    "if the line is commented normally return 1
+    if s:IsCommented(s:Left(), s:Right(), theLine) || s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)
+        return 1
+    endif
+
+    "if the line is part of a sexy comment return 1
+    if s:IsInSexyComment(a:lineNum)
+        return 1
+    endif
+    return 0
+endfunction
+
+" Function: s:IsCommented(left, right, line) {{{2
+"This function is used to determine whether the given line is commented with
+"the given delimiters
+"
+" Args:
+"   -line: the line that to check if commented
+"   -left/right: the left and right delimiters to check for
+function s:IsCommented(left, right, line)
+    "if the line isn't commented return true
+    if s:FindDelimiterIndex(a:left, a:line) != -1 && (s:LastIndexOfDelim(a:right, a:line) != -1 || !s:Multipart())
+        return 1
+    endif
+    return 0
+endfunction
+
+" Function: s:IsCommentedFromStartOfLine(left, line) {{{2
+"This function is used to determine whether the given line is commented with
+"the given delimiters at the start of the line i.e the left delimiter is the
+"first thing on the line (apart from spaces\tabs)
+"
+" Args:
+"   -line: the line that to check if commented
+"   -left: the left delimiter to check for
+function s:IsCommentedFromStartOfLine(left, line)
+    let theLine = s:ConvertLeadingTabsToSpaces(a:line)
+    let numSpaces = strlen(substitute(theLine, '^\( *\).*$', '\1', ''))
+    let delimIndx = s:FindDelimiterIndex(a:left, theLine)
+    return delimIndx == numSpaces
+endfunction
+
+" Function: s:IsCommentedOutermost(left, right, leftAlt, rightAlt, line) {{{2
+" Finds the type of the outermost delimiters on the line
+"
+" Args:
+"   -line: the line that to check if the outermost comments on it are
+"    left/right
+"   -left/right: the left and right delimiters to check for
+"   -leftAlt/rightAlt: the left and right alternative delimiters to check for
+"
+" Returns:
+"   0 if the line is not commented with either set of delimiters
+"   1 if the line is commented with the left/right delimiter set
+"   2 if the line is commented with the leftAlt/rightAlt delim set
+function s:IsCommentedOutermost(left, right, leftAlt, rightAlt, line)
+    "get the first positions of the left delimiters and the last positions of the
+    "right delimiters
+    let indxLeft = s:FindDelimiterIndex(a:left, a:line)
+    let indxLeftAlt = s:FindDelimiterIndex(a:leftAlt, a:line)
+    let indxRight = s:LastIndexOfDelim(a:right, a:line)
+    let indxRightAlt = s:LastIndexOfDelim(a:rightAlt, a:line)
+
+    "check if the line has a left delimiter before a leftAlt delimiter
+    if (indxLeft <= indxLeftAlt || indxLeftAlt == -1) && indxLeft != -1
+        "check if the line has a right delimiter after any rightAlt delimiter
+        if (indxRight > indxRightAlt && indxRight > indxLeft) || !s:Multipart()
+            return 1
+        endif
+
+        "check if the line has a leftAlt delimiter before a left delimiter
+    elseif (indxLeftAlt <= indxLeft || indxLeft == -1) && indxLeftAlt != -1
+        "check if the line has a rightAlt delimiter after any right delimiter
+        if (indxRightAlt > indxRight && indxRightAlt > indxLeftAlt) || !s:AltMultipart()
+            return 2
+        endif
+    else
+        return 0
+    endif
+
+    return 0
+
+endfunction
+
+
+" Function: s:IsDelimValid(delimiter, delIndx, line) {{{2
+" This function is responsible for determining whether a given instance of a
+" comment delimiter is a real delimiter or not. For example, in java the
+" // string is a comment delimiter but in the line:
+"               System.out.println("//");
+" it does not count as a comment delimiter. This function is responsible for
+" distinguishing between such cases. It does so by applying a set of
+" heuristics that are not fool proof but should work most of the time.
+"
+" Args:
+"   -delimiter: the delimiter we are validating
+"   -delIndx: the position of delimiter in line
+"   -line: the line that delimiter occurs in
+"
+" Returns:
+" 0 if the given delimiter is not a real delimiter (as far as we can tell) ,
+" 1 otherwise
+function s:IsDelimValid(delimiter, delIndx, line)
+    "get the delimiter without the escchars
+    let l:delimiter = a:delimiter
+
+    "get the strings before and after the delimiter
+    let preComStr = strpart(a:line, 0, a:delIndx)
+    let postComStr = strpart(a:line, a:delIndx+strlen(delimiter))
+
+    "to check if the delimiter is real, make sure it isn't preceded by
+    "an odd number of quotes and followed by the same (which would indicate
+    "that it is part of a string and therefore is not a comment)
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, '"', "\\"))
+        return 0
+    endif
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "'", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "'", "\\"))
+        return 0
+    endif
+    if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, "`", "\\")) && !s:IsNumEven(s:CountNonESCedOccurances(postComStr, "`", "\\"))
+        return 0
+    endif
+
+
+    "if the comment delimiter is escaped, assume it isn't a real delimiter
+    if s:IsEscaped(a:line, a:delIndx, "\\")
+        return 0
+    endif
+
+    "vim comments are so fucking stupid!! Why the hell do they have comment
+    "delimiters that are used elsewhere in the syntax?!?! We need to check
+    "some conditions especially for vim
+    if &filetype == "vim"
+        if !s:IsNumEven(s:CountNonESCedOccurances(preComStr, '"', "\\"))
+            return 0
+        endif
+
+        "if the delimiter is on the very first char of the line or is the
+        "first non-tab/space char on the line then it is a valid comment delimiter
+        if a:delIndx == 0 || a:line =~ "^[ \t]\\{" . a:delIndx . "\\}\".*$"
+            return 1
+        endif
+
+        let numLeftParen =s:CountNonESCedOccurances(preComStr, "(", "\\")
+        let numRightParen =s:CountNonESCedOccurances(preComStr, ")", "\\")
+
+        "if the quote is inside brackets then assume it isn't a comment
+        if numLeftParen > numRightParen
+            return 0
+        endif
+
+        "if the line has an even num of unescaped "'s then we can assume that
+        "any given " is not a comment delimiter
+        if s:IsNumEven(s:CountNonESCedOccurances(a:line, "\"", "\\"))
+            return 0
+        endif
+    endif
+
+    return 1
+
+endfunction
+
+" Function: s:IsNumEven(num) {{{2
+" A small function the returns 1 if the input number is even and 0 otherwise
+" Args:
+"   -num: the number to check
+function s:IsNumEven(num)
+    return (a:num % 2) == 0
+endfunction
+
+" Function: s:IsEscaped(str, indx, escChar) {{{2
+" This function takes a string, an index into that string and an esc char and
+" returns 1 if the char at the index is escaped (i.e if it is preceded by an
+" odd number of esc chars)
+" Args:
+"   -str: the string to check
+"   -indx: the index into str that we want to check
+"   -escChar: the escape char the char at indx may be ESCed with
+function s:IsEscaped(str, indx, escChar)
+    "initialise numEscChars to 0 and look at the char before indx
+    let numEscChars = 0
+    let curIndx = a:indx-1
+
+    "keep going back thru str until we either reach the start of the str or
+    "run out of esc chars
+    while curIndx >= 0 && strpart(a:str, curIndx, 1) == a:escChar
+
+        "we have found another esc char so add one to the count and move left
+        "one char
+        let numEscChars  = numEscChars + 1
+        let curIndx = curIndx - 1
+
+    endwhile
+
+    "if there is an odd num of esc chars directly before the char at indx then
+    "the char at indx is escaped
+    return !s:IsNumEven(numEscChars)
+endfunction
+
+" Function: s:IsInSexyComment(line) {{{2
+" returns 1 if the given line number is part of a sexy comment
+function s:IsInSexyComment(line)
+    return !empty(s:FindBoundingLinesOfSexyCom(a:line))
+endfunction
+
+" Function: s:IsSexyComment(topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns 1 if the lines between and
+" including the given line numbers are a sexy comment. It returns 0 otherwise.
+" Args:
+"   -topline: the line that the possible sexy comment starts on
+"   -bottomline: the line that the possible sexy comment stops on
+function s:IsSexyComment(topline, bottomline)
+
+    "get the delimiter set that would be used for a sexy comment
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left()
+        let right = s:Right()
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1})
+        let right = s:Right({'alt': 1})
+    else
+        return 0
+    endif
+
+    "swap the top and bottom line numbers around if need be
+    let topline = a:topline
+    let bottomline = a:bottomline
+    if bottomline < topline
+        topline = bottomline
+        bottomline = a:topline
+    endif
+
+    "if there is < 2 lines in the comment it cannot be sexy
+    if (bottomline - topline) <= 0
+        return 0
+    endif
+
+    "if the top line doesn't begin with a left delimiter then the comment isn't sexy
+    if getline(a:topline) !~ '^[ \t]*' . left
+        return 0
+    endif
+
+    "if there is a right delimiter on the top line then this isn't a sexy comment
+    if s:LastIndexOfDelim(right, getline(a:topline)) != -1
+        return 0
+    endif
+
+    "if there is a left delimiter on the bottom line then this isn't a sexy comment
+    if s:FindDelimiterIndex(left, getline(a:bottomline)) != -1
+        return 0
+    endif
+
+    "if the bottom line doesn't begin with a right delimiter then the comment isn't
+    "sexy
+    if getline(a:bottomline) !~ '^.*' . right . '$'
+        return 0
+    endif
+
+    let sexyComMarker = s:GetSexyComMarker(0, 1)
+
+    "check each of the intermediate lines to make sure they start with a
+    "sexyComMarker
+    let currentLine = a:topline+1
+    while currentLine < a:bottomline
+        let theLine = getline(currentLine)
+
+        if theLine !~ '^[ \t]*' . sexyComMarker
+            return 0
+        endif
+
+        "if there is a right delimiter in an intermediate line then the block isn't
+        "a sexy comment
+        if s:LastIndexOfDelim(right, theLine) != -1
+            return 0
+        endif
+
+        let currentLine = currentLine + 1
+    endwhile
+
+    "we have not found anything to suggest that this isn't a sexy comment so
+    return 1
+
+endfunction
+
+" Function: s:LastIndexOfDelim(delim, str) {{{2
+" This function takes a string and a delimiter and returns the last index of
+" that delimiter in string
+" Args:
+"   -delim: the delimiter to look for
+"   -str: the string to look for delimiter in
+function s:LastIndexOfDelim(delim, str)
+    let delim = a:delim
+    let lenDelim = strlen(delim)
+
+    "set index to the first occurrence of delimiter. If there is no occurrence then
+    "bail
+    let indx = s:FindDelimiterIndex(delim, a:str)
+    if indx == -1
+        return -1
+    endif
+
+    "keep moving to the next instance of delimiter in str till there is none left
+    while 1
+
+        "search for the next delimiter after the previous one
+        let searchStr = strpart(a:str, indx+lenDelim)
+        let indx2 = s:FindDelimiterIndex(delim, searchStr)
+
+        "if we find a delimiter update indx to record the position of it, if we
+        "don't find another delimiter then indx is the last one so break out of
+        "this loop
+        if indx2 != -1
+            let indx = indx + indx2 + lenDelim
+        else
+            break
+        endif
+    endwhile
+
+    return indx
+
+endfunction
+
+" Function: s:Left(...) {{{2
+" returns left delimiter data
+function s:Left(...)
+    let params = a:0 ? a:1 : {}
+
+    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['leftAlt'] : b:NERDCommenterDelims['left']
+
+    if delim == ''
+        return ''
+    endif
+
+    if has_key(params, 'space') && g:NERDSpaceDelims
+        let delim = delim . s:spaceStr
+    endif
+
+    if has_key(params, 'esc')
+        let delim = s:Esc(delim)
+    endif
+
+    return delim
+endfunction
+
+" Function: s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns the index of the left most
+" char (that is not a space or a tab) on all of these lines.
+" Args:
+"   -countCommentedLines: 1 if lines that are commented are to be checked as
+"    well. 0 otherwise
+"   -countEmptyLines: 1 if empty lines are to be counted in the search
+"   -topline: the top line to be checked
+"   -bottomline: the bottom line to be checked
+function s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
+
+    " declare the left most index as an extreme value
+    let leftMostIndx = 1000
+
+    " go thru the block line by line updating leftMostIndx
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+
+        " get the next line and if it is allowed to be commented, or is not
+        " commented, check it
+        let theLine = getline(currentLine)
+        if a:countEmptyLines || theLine !~ '^[ \t]*$'
+            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
+                " convert spaces to tabs and get the number of leading spaces for
+                " this line and update leftMostIndx if need be
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+                let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') )
+                if leadSpaceOfLine < leftMostIndx
+                    let leftMostIndx = leadSpaceOfLine
+                endif
+            endif
+        endif
+
+        " move on to the next line
+        let currentLine = currentLine + 1
+    endwhile
+
+    if leftMostIndx == 1000
+        return 0
+    else
+        return leftMostIndx
+    endif
+endfunction
+
+" Function: s:Multipart() {{{2
+" returns 1 if the current delimiters are multipart
+function s:Multipart()
+    return s:Right() != ''
+endfunction
+
+" Function: s:NerdEcho(msg, typeOfMsg) {{{2
+" Args:
+"   -msg: the message to echo
+"   -typeOfMsg: 0 = warning message
+"               1 = normal message
+function s:NerdEcho(msg, typeOfMsg)
+    if a:typeOfMsg == 0
+        echohl WarningMsg
+        echom 'NERDCommenter:' . a:msg
+        echohl None
+    elseif a:typeOfMsg == 1
+        echom 'NERDCommenter:' . a:msg
+    endif
+endfunction
+
+" Function: s:Nested() {{{2
+" returns 1 if the current multipart (if any) delimiters allow nesting
+function s:Nested()
+    return b:NERDCommenterDelims['nested']
+endfunction
+
+" Function: s:NumberOfLeadingTabs(s) {{{2
+" returns the number of leading tabs in the given string
+function s:NumberOfLeadingTabs(s)
+    return strlen(substitute(a:s, '^\(\t*\).*$', '\1', ""))
+endfunction
+
+" Function: s:NumLinesInBuf() {{{2
+" Returns the number of lines in the current buffer
+function s:NumLinesInBuf()
+    return line('$')
+endfunction
+
+" Function: s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str) {{{2
+" This function takes in a string, 2 delimiters in that string and 2 strings
+" to replace these delimiters with.
+"
+" Args:
+"   -toReplace1: the first delimiter to replace
+"   -toReplace2: the second delimiter to replace
+"   -replacor1: the string to replace toReplace1 with
+"   -replacor2: the string to replace toReplace2 with
+"   -str: the string that the delimiters to be replaced are in
+function s:ReplaceDelims(toReplace1, toReplace2, replacor1, replacor2, str)
+    let line = s:ReplaceLeftMostDelim(a:toReplace1, a:replacor1, a:str)
+    let line = s:ReplaceRightMostDelim(a:toReplace2, a:replacor2, line)
+    return line
+endfunction
+
+" Function: s:ReplaceLeftMostDelim(toReplace, replacor, str) {{{2
+" This function takes a string and a delimiter and replaces the left most
+" occurrence of this delimiter in the string with a given string
+"
+" Args:
+"   -toReplace: the delimiter in str that is to be replaced
+"   -replacor: the string to replace toReplace with
+"   -str: the string that contains toReplace
+function s:ReplaceLeftMostDelim(toReplace, replacor, str)
+    let toReplace = a:toReplace
+    let replacor = a:replacor
+    "get the left most occurrence of toReplace
+    let indxToReplace = s:FindDelimiterIndex(toReplace, a:str)
+
+    "if there IS an occurrence of toReplace in str then replace it and return
+    "the resulting string
+    if indxToReplace != -1
+        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
+        return line
+    endif
+
+    return a:str
+endfunction
+
+" Function: s:ReplaceRightMostDelim(toReplace, replacor, str) {{{2
+" This function takes a string and a delimiter and replaces the right most
+" occurrence of this delimiter in the string with a given string
+"
+" Args:
+"   -toReplace: the delimiter in str that is to be replaced
+"   -replacor: the string to replace toReplace with
+"   -str: the string that contains toReplace
+"
+function s:ReplaceRightMostDelim(toReplace, replacor, str)
+    let toReplace = a:toReplace
+    let replacor = a:replacor
+    let lenToReplace = strlen(toReplace)
+
+    "get the index of the last delimiter in str
+    let indxToReplace = s:LastIndexOfDelim(toReplace, a:str)
+
+    "if there IS a delimiter in str, replace it and return the result
+    let line = a:str
+    if indxToReplace != -1
+        let line = strpart(a:str, 0, indxToReplace) . replacor . strpart(a:str, indxToReplace+strlen(toReplace))
+    endif
+    return line
+endfunction
+
+"FUNCTION: s:RestoreScreenState() {{{2
+"
+"Sets the screen state back to what it was when s:SaveScreenState was last
+"called.
+"
+function s:RestoreScreenState()
+    if !exists("t:NERDComOldTopLine") || !exists("t:NERDComOldPos")
+        throw 'NERDCommenter exception: cannot restore screen'
+    endif
+
+    call cursor(t:NERDComOldTopLine, 0)
+    normal! zt
+    call setpos(".", t:NERDComOldPos)
+endfunction
+
+" Function: s:Right(...) {{{2
+" returns right delimiter data
+function s:Right(...)
+    let params = a:0 ? a:1 : {}
+
+    let delim = has_key(params, 'alt') ? b:NERDCommenterDelims['rightAlt'] : b:NERDCommenterDelims['right']
+
+    if delim == ''
+        return ''
+    endif
+
+    if has_key(params, 'space') && g:NERDSpaceDelims
+        let delim = s:spaceStr . delim
+    endif
+
+    if has_key(params, 'esc')
+        let delim = s:Esc(delim)
+    endif
+
+    return delim
+endfunction
+
+" Function: s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline) {{{2
+" This function takes in 2 line numbers and returns the index of the right most
+" char on all of these lines.
+" Args:
+"   -countCommentedLines: 1 if lines that are commented are to be checked as
+"    well. 0 otherwise
+"   -countEmptyLines: 1 if empty lines are to be counted in the search
+"   -topline: the top line to be checked
+"   -bottomline: the bottom line to be checked
+function s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottomline)
+    let rightMostIndx = -1
+
+    " go thru the block line by line updating rightMostIndx
+    let currentLine = a:topline
+    while currentLine <= a:bottomline
+
+        " get the next line and see if it is commentable, otherwise it doesn't
+        " count
+        let theLine = getline(currentLine)
+        if a:countEmptyLines || theLine !~ '^[ \t]*$'
+
+            if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
+
+                " update rightMostIndx if need be
+                let theLine = s:ConvertLeadingTabsToSpaces(theLine)
+                let lineLen = strlen(theLine)
+                if lineLen > rightMostIndx
+                    let rightMostIndx = lineLen
+                endif
+            endif
+        endif
+
+        " move on to the next line
+        let currentLine = currentLine + 1
+    endwhile
+
+    return rightMostIndx
+endfunction
+
+"FUNCTION: s:SaveScreenState() {{{2
+"Saves the current cursor position in the current buffer and the window
+"scroll position
+function s:SaveScreenState()
+    let t:NERDComOldPos = getpos(".")
+    let t:NERDComOldTopLine = line("w0")
+endfunction
+
+" Function: s:SwapOuterMultiPartDelimsForPlaceHolders(line) {{{2
+" This function takes a line and swaps the outer most multi-part delimiters for
+" place holders
+" Args:
+"   -line: the line to swap the delimiters in
+"
+function s:SwapOuterMultiPartDelimsForPlaceHolders(line)
+    " find out if the line is commented using normal delimiters and/or
+    " alternate ones
+    let isCommented = s:IsCommented(s:Left(), s:Right(), a:line)
+    let isCommentedAlt = s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), a:line)
+
+    let line2 = a:line
+
+    "if the line is commented and there is a right delimiter, replace
+    "the delimiters with place-holders
+    if isCommented && s:Multipart()
+        let line2 = s:ReplaceDelims(s:Left(), s:Right(), g:NERDLPlace, g:NERDRPlace, a:line)
+
+    "similarly if the line is commented with the alternative
+    "delimiters
+    elseif isCommentedAlt && s:AltMultipart()
+        let line2 = s:ReplaceDelims(s:Left({'alt': 1}), s:Right({'alt': 1}), g:NERDLPlace, g:NERDRPlace, a:line)
+    endif
+
+    return line2
+endfunction
+
+" Function: s:SwapOuterPlaceHoldersForMultiPartDelims(line) {{{2
+" This function takes a line and swaps the outermost place holders for
+" multi-part delimiters
+" Args:
+"   -line: the line to swap the delimiters in
+"
+function s:SwapOuterPlaceHoldersForMultiPartDelims(line)
+    let left = ''
+    let right = ''
+    if s:Multipart()
+        let left = s:Left()
+        let right = s:Right()
+    elseif s:AltMultipart()
+        let left = s:Left({'alt': 1})
+        let right = s:Right({'alt': 1})
+    endif
+
+    let line = s:ReplaceDelims(g:NERDLPlace, g:NERDRPlace, left, right, a:line)
+    return line
+endfunction
+" Function: s:TabbedCol(line, col) {{{2
+" Gets the col number for given line and existing col number. The new col
+" number is the col number when all leading spaces are converted to tabs
+" Args:
+"   -line:the line to get the rel col for
+"   -col: the abs col
+function s:TabbedCol(line, col)
+    let lineTruncated = strpart(a:line, 0, a:col)
+    let lineSpacesToTabs = substitute(lineTruncated, s:TabSpace(), '\t', 'g')
+    return strlen(lineSpacesToTabs)
+endfunction
+"FUNCTION: s:TabSpace() {{{2
+"returns a string of spaces equal in length to &tabstop
+function s:TabSpace()
+    let tabSpace = ""
+    let spacesPerTab = &tabstop
+    while spacesPerTab > 0
+        let tabSpace = tabSpace . " "
+        let spacesPerTab = spacesPerTab - 1
+    endwhile
+    return tabSpace
+endfunction
+
+" Function: s:UnEsc(str, escChar) {{{2
+" This function removes all the escape chars from a string
+" Args:
+"   -str: the string to remove esc chars from
+"   -escChar: the escape char to be removed
+function s:UnEsc(str, escChar)
+    return substitute(a:str, a:escChar, "", "g")
+endfunction
+
+" Function: s:UntabbedCol(line, col) {{{2
+" Takes a line and a col and returns the absolute column of col taking into
+" account that a tab is worth 3 or 4 (or whatever) spaces.
+" Args:
+"   -line:the line to get the abs col for
+"   -col: the col that doesn't take into account tabs
+function s:UntabbedCol(line, col)
+    let lineTruncated = strpart(a:line, 0, a:col)
+    let lineTabsToSpaces = substitute(lineTruncated, '\t', s:TabSpace(), 'g')
+    return strlen(lineTabsToSpaces)
+endfunction
+" Section: Comment mapping and menu item setup {{{1
+" ===========================================================================
+
+" Create menu items for the specified modes.  If a:combo is not empty, then
+" also define mappings and show a:combo in the menu items.
+function! s:CreateMaps(modes, target, desc, combo)
+    " Build up a map command like
+    " 'noremap <silent> <plug>NERDCommenterComment :call NERDComment("n", "Comment")'
+    let plug = '<plug>NERDCommenter' . a:target
+    let plug_start = 'noremap <silent> ' . plug . ' :call NERDComment("'
+    let plug_end = '", "' . a:target . '")<cr>'
+    " Build up a menu command like
+    " 'menu <silent> comment.Comment<Tab>\\cc <plug>NERDCommenterComment'
+    let menuRoot = get(['', 'comment', '&comment', '&Plugin.&comment'],
+                \ g:NERDMenuMode, '')
+    let menu_command = 'menu <silent> ' . menuRoot . '.' . escape(a:desc, ' ')
+    if strlen(a:combo)
+        let leader = exists('g:mapleader') ? g:mapleader : '\'
+        let menu_command .= '<Tab>' . escape(leader, '\') . a:combo
+    endif
+    let menu_command .= ' ' . (strlen(a:combo) ? plug : a:target)
+    " Execute the commands built above for each requested mode.
+    for mode in (a:modes == '') ? [''] : split(a:modes, '\zs')
+        if strlen(a:combo)
+            execute mode . plug_start . mode . plug_end
+            if g:NERDCreateDefaultMappings && !hasmapto(plug, mode)
+                execute mode . 'map <leader>' . a:combo . ' ' . plug
+            endif
+        endif
+        " Check if the user wants the menu to be displayed.
+        if g:NERDMenuMode != 0
+            execute mode . menu_command
+        endif
+    endfor
+endfunction
+call s:CreateMaps('nx', 'Comment',    'Comment', 'cc')
+call s:CreateMaps('nx', 'Toggle',     'Toggle', 'c<space>')
+call s:CreateMaps('nx', 'Minimal',    'Minimal', 'cm')
+call s:CreateMaps('nx', 'Nested',     'Nested', 'cn')
+call s:CreateMaps('n',  'ToEOL',      'To EOL', 'c$')
+call s:CreateMaps('nx', 'Invert',     'Invert', 'ci')
+call s:CreateMaps('nx', 'Sexy',       'Sexy', 'cs')
+call s:CreateMaps('nx', 'Yank',       'Yank then comment', 'cy')
+call s:CreateMaps('n',  'Append',     'Append', 'cA')
+call s:CreateMaps('',   ':',          '-Sep-', '')
+call s:CreateMaps('nx', 'AlignLeft',  'Left aligned', 'cl')
+call s:CreateMaps('nx', 'AlignBoth',  'Left and right aligned', 'cb')
+call s:CreateMaps('',   ':',          '-Sep2-', '')
+call s:CreateMaps('nx', 'Uncomment',  'Uncomment', 'cu')
+call s:CreateMaps('n',  'AltDelims',  'Switch Delimiters', 'ca')
+call s:CreateMaps('i',  'Insert',     'Insert Comment Here', '')
+call s:CreateMaps('',   ':',          '-Sep3-', '')
+call s:CreateMaps('',   ':help NERDCommenterContents<CR>', 'Help', '')
+
+inoremap <silent> <plug>NERDCommenterInsert <SPACE><BS><ESC>:call NERDComment('i', "insert")<CR>
+
+" switch to/from alternative delimiters (does not use wrapper function)
+nnoremap <plug>NERDCommenterAltDelims :call <SID>SwitchToAlternativeDelimiters(1)<cr>
+
+" This is a workaround to enable lazy-loading from supported plugin managers:
+" See https://github.com/scrooloose/nerdcommenter/issues/176
+call s:SetUpForNewFiletype(&filetype, 1)
+
+" vim: set foldmethod=marker :
diff --git a/vim/plugins/nvim-yarp/.gitignore b/vim/plugins/nvim-yarp/.gitignore
new file mode 100644
index 0000000..85fb978
--- /dev/null
+++ b/vim/plugins/nvim-yarp/.gitignore
@@ -0,0 +1,5 @@
+__pycache__
+
+# demo
+/plugin/hello.vim
+/pythonx/hello.py
diff --git a/vim/plugins/nvim-yarp/README.md b/vim/plugins/nvim-yarp/README.md
new file mode 100644
index 0000000..fbbda94
--- /dev/null
+++ b/vim/plugins/nvim-yarp/README.md
@@ -0,0 +1,115 @@
+
+# Yet Another Remote Plugin Framework for Neovim
+
+This is my attempt on writing a remote plugin framework without
+`:UpdateRemotePlugins`.
+
+## Requirements
+
+- `has('python3')`
+- For Vim 8:
+  - [roxma/vim-hug-neovim-rpc](https://github.com/roxma/vim-hug-neovim-rpc)
+  - `g:python3_host_prog` pointed to your python3 executable, or `echo
+      exepath('python3')` is not empty.
+  - [neovim python client](https://github.com/neovim/python-client) (`pip3
+      install neovim`)
+
+## Usage
+
+pythonx/hello.py
+
+```python
+import vim, time
+def greet():
+    time.sleep(3)
+    vim.command('echo "Hello world"')
+```
+
+plugin/hello.vim
+
+```vim
+" Create a python3 process running the hello module. The process is lazy load.
+let s:hello = yarp#py3('hello')
+
+com HelloSync call s:hello.request('greet')
+com HelloAsync call s:hello.notify('greet')
+
+" You could type :Hello greet
+com -nargs=1 Hello call s:hello.request(<f-args>)
+```
+
+## Debugging
+
+Add logging settigns to your vimrc. Log files will be generated with prefix
+`/tmp/nvim_log`. An alternative is to export environment variables before
+starting vim/nvim.
+
+```vim
+let $NVIM_PYTHON_LOG_FILE="/tmp/nvim_log"
+let $NVIM_PYTHON_LOG_LEVEL="DEBUG"
+```
+
+## Example for existing neovim rplugin porting to Vim 8
+
+More realistic examples could be found at
+[nvim-typescript#84](https://github.com/mhartington/nvim-typescript/pull/84),
+[deoplete#553](https://github.com/Shougo/deoplete.nvim/pull/553),
+[callmekohei/quickdebug](https://github.com/callmekohei/quickdebug).
+
+Now let's consider the following simple rplugin.
+
+After `UpdateRemotePlugins` and restarting neovim, you get `foobar` by `:echo
+Bar()`.
+
+```python
+# rplugin/python3/foo.py
+import neovim
+
+@neovim.plugin
+class Foo(object):
+
+    def __init__(self, vim):
+        self._vim = vim
+
+    @neovim.function("Bar", sync=True)
+    def bar(self, args):
+        return 'hello' + str(args)
+```
+
+For working on Vim 8, you need to add these two files:
+
+
+```vim
+" plugin/foo.vim
+if has('nvim')
+    finish
+endif
+
+let s:foo = yarp#py3('foo_wrap')
+
+func! Bar(v)
+    return s:foo.call('bar',a:v)
+endfunc
+```
+
+
+```python
+# pythonx/foo_wrap.py
+from foo import Foo as _Foo
+import vim
+
+_obj = _Foo(vim)
+
+
+def bar(*args):
+    return _obj.bar(args)
+```
+
+How to use
+```
+$ vim
+
+: echo bar('world')
+
+hello('world',)
+```
diff --git a/vim/plugins/nvim-yarp/autoload/yarp.vim b/vim/plugins/nvim-yarp/autoload/yarp.vim
new file mode 100644
index 0000000..b60af87
--- /dev/null
+++ b/vim/plugins/nvim-yarp/autoload/yarp.vim
@@ -0,0 +1,17 @@
+
+func! yarp#py3(module)
+    let rp = yarp#core#new()
+    let rp.type = 'py3'
+    let rp.module = a:module
+    let rp.init = function('yarp#pyx#init')
+    return rp
+endfunc
+
+func! yarp#py(module)
+    let rp = yarp#core#new()
+    let rp.type = 'py'
+    let rp.module = a:module
+    let rp.init = function('yarp#pyx#init')
+    return rp
+endfunc
+
diff --git a/vim/plugins/nvim-yarp/autoload/yarp/core.vim b/vim/plugins/nvim-yarp/autoload/yarp/core.vim
new file mode 100644
index 0000000..4850710
--- /dev/null
+++ b/vim/plugins/nvim-yarp/autoload/yarp/core.vim
@@ -0,0 +1,149 @@
+if get(s:, 'loaded', 0)
+    finish
+endif
+let s:loaded = 1
+
+let s:id = 1
+let s:reg = {}
+let s:leaving = 0
+
+augroup yarp
+    autocmd!
+    " this one is which you're most likely to use?
+    autocmd VimLeavePre * let s:leaving = 1 
+augroup end
+
+if has('nvim')
+    let s:rpcrequest = 'rpcrequest'
+    let s:rpcnotify = 'rpcnotify'
+    let s:jobstart = 'jobstart'
+    fun! s:_serveraddr()
+        return v:servername
+    endfunc
+    let s:serveraddr = function('s:_serveraddr')
+else
+    let s:rpcrequest = get(g:, 'yarp_rpcrequest', 'neovim_rpc#rpcrequest')
+    let s:rpcnotify = get(g:, 'yarp_rpcnotify', 'neovim_rpc#rpcnotify')
+    let s:jobstart = get(g:, 'yarp_jobstart', 'neovim_rpc#jobstart')
+    let s:serveraddr = get(g:, 'yarp_serveraddr', 'neovim_rpc#serveraddr')
+endif
+
+func! yarp#core#new()
+    let s:id = s:id + 1
+
+    let rp = {}
+
+    let rp.jobstart = function('yarp#core#jobstart')
+    func rp.error(msg) dict
+        call yarp#core#error(self.module, a:msg)
+    endfunc
+    let rp.call = function('yarp#core#request')
+    let rp.request = function('yarp#core#request')
+    let rp.notify = function('yarp#core#notify')
+    let rp.wait_channel = function('yarp#core#wait_channel')
+    let rp.id = s:id
+    let rp.job_is_dead = 0
+    let s:reg[rp.id] = rp
+
+    " reserved for user
+    let rp.extra = {}
+    return rp
+endfunc
+
+func! yarp#core#on_stderr(chan_id, data, event) dict
+    let mod = self.self
+    call mod.error(filter(a:data, 'len(v:val)'))
+endfunc
+
+func! yarp#core#on_exit(chan_id, data, event) dict
+    let mod = self.self
+    let mod.job_is_dead = 1
+    if v:dying == 0 && s:leaving == 0
+        call mod.error("Job is dead. cmd=" . string(mod.cmd))
+    endif
+endfunc
+
+func! yarp#core#channel_started(id, channel)
+    let s:reg[a:id].channel = a:channel
+endfunc
+
+func! yarp#core#request(method, ...) dict
+    call self.wait_channel()
+    return call(s:rpcrequest, [self.channel, a:method] + a:000)
+endfunc
+
+func! yarp#core#notify(method, ...) dict
+    call self.wait_channel()
+    call call(s:rpcnotify, [self.channel, a:method] + a:000)
+endfunc
+
+func! yarp#core#wait_channel() dict
+    if has_key(self, 'channel')
+        return
+    endif
+    if ! has_key(self, 'job')
+        call self.jobstart()
+    endif
+    if get(self, 'job', -1) == -1
+        throw '[yarp] [' . self.module . '] job is not running'
+    endif
+    let cnt = 5000 / 20
+    while ! has_key(self, 'channel')
+        if self.job_is_dead
+            throw '[yarp] [' . self.module .
+                    \ '] job is dead. failed establishing channel for ' .
+                    \ string(self.cmd)
+        endif
+        if cnt <= 0
+            throw '[yarp] [' . self.module . '] timeout establishing channel for ' . string(self.cmd)
+        endif
+        let cnt = cnt - 1
+        silent sleep 20m
+    endwhile
+endfunc
+
+func! yarp#core#jobstart() dict
+    if ! has_key(self, 'cmd')
+        call self.init()
+        if ! has_key(self, 'cmd')
+            call self.error("cmd of the job is not set")
+            return
+        endif
+    endif
+    if has_key(self, 'job')
+        return
+    endif
+    let opts = {'on_stderr': function('yarp#core#on_stderr'),
+            \ 'on_exit': function('yarp#core#on_exit'),
+            \ 'self': self}
+    try
+        let self.job = call(s:jobstart, [self.cmd, opts])
+        if self.job == -1
+            call self.error('Failed starting job: ' . string(self.cmd))
+        endif
+    catch
+        let self.job = -1
+        call self.error(['Failed starting job: ' . string(self.cmd), v:exception])
+    endtry
+endfunc
+
+func! yarp#core#serveraddr()
+    return call (s:serveraddr, [])
+endfunc
+
+func! yarp#core#error(mod, msg)
+    if mode() == 'i'
+        " NOTE: side effect, sorry, but this is necessary
+        set nosmd
+    endif
+    if type(a:msg) == type("")
+        let lines = split(a:msg, "\n", 1)
+    else
+        let lines = a:msg
+    endif
+    echoh ErrorMsg
+    for line in lines
+        echom '[' . a:mod . '@yarp] ' . line
+    endfor
+    echoh None
+endfunc
diff --git a/vim/plugins/nvim-yarp/autoload/yarp/pyx.vim b/vim/plugins/nvim-yarp/autoload/yarp/pyx.vim
new file mode 100644
index 0000000..92ebc14
--- /dev/null
+++ b/vim/plugins/nvim-yarp/autoload/yarp/pyx.vim
@@ -0,0 +1,70 @@
+
+func! yarp#pyx#init() dict
+    if self.type == 'py'
+        let l:Detect = function('s:pyexe')
+    else
+        let l:Detect = function('s:py3exe')
+    endif
+
+    let exe = call(l:Detect, [], self)
+
+    if get(s:, 'script', '') == ''
+        let s:script = globpath(&rtp,'pythonx/yarp.py',1)
+    endif
+
+    let self.cmd = [exe, 
+                \ '-u',
+                \ s:script,
+                \ yarp#core#serveraddr(),
+                \ self.id,
+                \ self.module]
+    call self.jobstart()
+endfunc
+
+func! s:pyexe() dict
+    if get(g:, '_yarp_py', '')
+        return g:_yarp_py
+    endif
+    let g:_yarp_py = get(g:, 'python_host_prog', '')
+    if g:_yarp_py == '' && has('nvim') && has('python')
+        " heavy weight
+        " but better support for python detection
+        python import sys
+        let g:_yarp_py = pyeval('sys.executable')
+    endif
+    if g:_yarp_py == ''
+        let g:_yarp_py = 'python2'
+    endif
+    return g:_yarp_py
+endfunc
+
+func! s:py3exe() dict
+    if get(g:, '_yarp_py3', '')
+        return g:_yarp_py3
+    endif
+    let g:_yarp_py3 = get(g:, 'python3_host_prog', '')
+    if g:_yarp_py3 == '' && has('nvim') && has('python3')
+        " heavy weight
+        " but better support for python detection
+        python3 import sys
+        let g:_yarp_py3 = py3eval('sys.executable')
+    endif
+    if g:_yarp_py3 == ''
+        let g:_yarp_py3 = 'python3'
+    endif
+    if exepath(g:_yarp_py3) == ''
+        call self.error(
+                    \ "Python3 executable [" .
+                    \ g:_yarp_py3 .
+                    \ "] not found.")
+        if has('vim_starting')
+            call self.error("")
+        endif
+        call self.error("###### Please configure g:python3_host_prog properly ######")
+        if has('vim_starting')
+            call self.error("")
+        endif
+    endif
+    return g:_yarp_py3
+endfunc
+
diff --git a/vim/plugins/nvim-yarp/pythonx/yarp.py b/vim/plugins/nvim-yarp/pythonx/yarp.py
new file mode 100644
index 0000000..b745993
--- /dev/null
+++ b/vim/plugins/nvim-yarp/pythonx/yarp.py
@@ -0,0 +1,55 @@
+from neovim import attach, setup_logging
+import sys
+import importlib
+
+serveraddr = sys.argv[1]
+yarpid = int(sys.argv[2])
+module = sys.argv[3]
+module_obj = None
+
+setup_logging(module)
+
+# create another connection to avoid synchronization issue?
+if len(serveraddr.split(':')) == 2:
+    serveraddr, port = serveraddr.split(':')
+    port = int(port)
+    nvim = attach('tcp', address=serveraddr, port=port)
+else:
+    nvim = attach('socket', path=serveraddr)
+
+sys.modules['vim'] = nvim
+sys.modules['nvim'] = nvim
+
+paths = nvim.eval(r'globpath(&rtp,"pythonx",1) . "\n" .'
+                  r' globpath(&rtp,"rplugin/python3",1)')
+for path in paths.split("\n"):
+    if not path:
+        continue
+    if path not in sys.path:
+        sys.path.append(path)
+
+nvim.call('yarp#core#channel_started', yarpid, nvim.channel_id)
+
+module_obj = importlib.import_module(module)
+
+
+def on_request(method, args):
+    if hasattr(module_obj, method):
+        return getattr(module_obj, method)(*args)
+    else:
+        raise Exception('method %s not found' % method)
+
+
+def on_notification(method, args):
+    if hasattr(module_obj, method):
+        getattr(module_obj, method)(*args)
+    else:
+        raise Exception('method %s not found' % method)
+    pass
+
+
+def on_setup():
+    pass
+
+
+nvim.run_loop(on_request, on_notification, on_setup)
diff --git a/vim/plugins/pythonsyntax/CHANGES.txt b/vim/plugins/pythonsyntax/CHANGES.txt
new file mode 100644
index 0000000..2d3b520
--- /dev/null
+++ b/vim/plugins/pythonsyntax/CHANGES.txt
@@ -0,0 +1,224 @@
+Revision 3.6.0 (2015-11-XX):
+
+    - Fix 'async def' highlighting. Patch by Joongi Kim
+    - Add dummy 'pythonInclude' group to avoid crashing standard pyrex.vim.
+      Patch by Antony Lee
+
+Revision 3.5.0 (2015-06-10):
+
+    - Add support for 'async ...' and 'await' keywords introduced in
+      Python 3.5. Patch by Ihor Gorobets
+
+Revision 3.3.7 (2014-12-27):
+
+    - Add support for Python 3 non-ASCII decorator names.
+      Patch by Victor Salgado
+
+Revision 3.3.6 (2013-11-18):
+
+    - Highlight 'yield from' statement introduced in Python 3.3. Reported by
+      Elizabeth Myers.
+
+Revision 3.3.5 (2013-08-31):
+
+    - Highlight 'import', 'from' and 'as' as include statements.
+      Patch by David Briscoe
+    - Added new option 'python_highlight_file_headers_as_comments' (disabled by
+      default) to highlight shebang and coding file headers as comments.
+      Proposed by David Briscoe.
+
+Revision 3.3.4 (2013-08-11):
+
+    - Highlight True and False as booleans. Patch by Yuri Habrusiev.
+
+Revision 3.3.3 (2013-06-02):
+
+   - More lightweight syntax reloading. Patch by Will Gray.
+
+Revision 3.3.2 (2013-06-01):
+
+   - Fixed behaviour of b:python_version_2 variable. Reported by Will Gray.
+
+Revision 3.3.1 (2013-05-12):
+
+   - The script was moved to its own repository at
+     https://github.com/hdima/python-syntax
+
+Revision 3.3.0 (2013-03-10):
+
+    - Merge Python 2 and Python 3 script versions into the single python.vim
+      script
+
+Revision 3.0.7 (2012-02-11):
+
+    - Updated email and URL
+
+Revision 2.6.7 (2012-02-11):
+
+    - Updated email and URL
+
+Revision 3.0.6 (2010-11-14):
+
+    - Fixed highlighting for str.format syntax. Patch by Anton Butanaev.
+
+Revision 3.0.5 (2010-11-11):
+
+    - Fixed highlighting for bytes. Patch by Anton Butanaev.
+    - Fixed highlighting for numbers.
+
+Revision 3.0.4 (2010-11-09):
+
+    - Fixed highlighting for raw bytes literals. Patch by Anton Butanaev.
+
+Revision 3.0.3 (2010-04-09):
+
+    - Applied patch by Andrea Riciputi with new configuration options
+      "python_highlight_builtin_objs" and "python_highlight_builtin_funcs"
+
+Revision 3.0.2 (2009-07-24):
+
+    - Applied patch by Caleb Adamantine which fixes highlighting for decorators
+
+Revision 3.0.1 (2009-05-03):
+
+    - Fixed compatibility with pyrex.vim
+
+Revision 3.0.0 (2008-12-07):
+
+    - Added support for non-ASCII identifiers;
+    - Added support for new text strings and binary data (bytes);
+    - Updated support for numeric literals;
+    - Updated support for str.format;
+    - Added new builtins introduced in Python 2.6: "ascii", "exec",
+      "memoryview", "print";
+    - Added new keyword "nonlocal";
+    - Removed exception "StandardError";
+    - Removed builtins: "apply", "basestring", "buffer", "callable", "coerce",
+      "execfile", "file", "help", "intern", "long", "raw_input", "reduce",
+      "reload", "unichr", "unicode", "xrange";
+
+Revision 2.6.6 (2010-04-09):
+
+    - Applied patch by Andrea Riciputi with new configuration options
+      "python_highlight_builtin_objs" and "python_highlight_builtin_funcs"
+
+Revision 2.6.5 (2009-07-24):
+
+    - Applied patch by Caleb Adamantine which fixes highlighting for decorators
+
+Revision 2.6.4 (2009-05-03):
+
+    - Fixed compatibility with pyrex.vim
+
+Revision 2.6.3 (2008-09-29):
+
+    - Return back trailing 'L' support for numbers. Actually it was changed for
+      future Python 3.0 syntax but in wrong file;
+
+Revision 2.6.2 (2008-09-22):
+
+    - Added "VMSError" exception;
+    - Added support for b"..." syntax;
+    - Added support for str.format brace escaping;
+
+Revision 2.6.1 (2008-09-21):
+
+    - Added new builtins and exceptions introduced in Python 2.6: "bin",
+      "bytearray", "bytes", "format", "next", "BufferError", "BytesWarning";
+    - Added builtin "__debug__";
+    - Added global variables: "__doc__", "__file__", "__name__", "__package__";
+    - Removed "OverflowWarning" (removed in Python 2.5);
+    - Added option "python_print_as_function" for highlight "print" as a
+      function;
+    - Added support for new integer literal syntax "0o" and "0b";
+    - Added support for string.Template syntax controlled by
+      "python_highlight_string_templates" option;
+    - Added support for str.format syntax controlled by
+      "python_highlight_string_format" option;
+    - Removed highlighting for "--" and "++" because it's a valid Python
+      expressions which can be interpreted as "a + +b";
+
+Revision 2.5.6 (2007-02-04):
+
+    - Applied patch by Pedro Algarvio to enable spell checking only for
+      the right spots (strings and comments);
+
+Revision 2.5.5 (2006-09-26):
+
+    - added new warnings (ImportWarning, UnicodeWarning)
+      introduced in Python 2.5;
+
+Revision 2.5.4 (2006-05-11):
+
+    - added highlighting for erroneous operators: &&, ||, ++, --, ===
+      (inspired by http://www.vim.org/tips/tip.php?tip_id=969, thanks
+      Jeroen Ruigrok van der Werven for the link);
+    - added highlighting for new 'with' statement and 'BaseException',
+      'GeneratorExit' exceptions introduced in Python 2.5;
+    - added highlighting for 'OverflowWarning' exception which had been
+      forgotten;
+    - returned more robust recognition for function names;
+
+Revision 2.5.3:
+
+    - fixed %-formatting highlighting for raw unicode strings;
+
+Revision 2.5.2:
+
+    - slightly simplified option handling;
+    - fixed regexp for indentation errors;
+    - fixed highlighting for backslashed symbols inside strings;
+    - added highlighting for trailing-space errors (triggered by new
+      option: python_highlight_space_errors);
+    - added highlighting for variable name errors;
+    - added highlighting for hex number errors;
+
+Revision 2.5.1 (2005-03-13):
+
+    - added new builtins 'all' and 'any' (Python 2.5a0)
+
+Revision 2.4.2 (2004-08-05):
+
+    - added highlighting for new @decorator syntax introduced in python 2.4a2
+
+Revision 2.4.1 (2004-03-17):
+
+    - new versioning scheme (based on python version numbers);
+    - added highlighting for new types/builtins introduced in python 2.4
+      (set, frozenset, reversed, sorted);
+    - new option added: python_slow_sync (set this for slow but more
+      robust syntax synchronization);
+    - added highlighting for doctests;
+
+Revision 1.19:
+
+    - new option added: python_highlight_indent_errors;
+    - python_highlight_all now not override previously set options,
+      for example code:
+          let python_highlight_indent_errors = 0
+          let python_highlight_all = 1
+      set all highlight options except indentation errors highlighting option;
+
+Revision 1.17:
+
+    - changed header, "Based on..." string added;
+
+Revision 1.16:
+
+    - added basestring builtin;
+
+Revision 1.15 (first public revision).
+
+    The changes since the original (vim6.1) python.vim are:
+
+    - changed string highlighting;
+    - enhanced special symbols highlighting inside strings;
+    - enhanced constant numbers highlighting;
+    - added optional highlighting for %-formatting inside strings;
+    - added highlighting for error conditions (wrong symbols in source file,
+      mixing spaces and tabs, wrong number values,
+      wrong %-formatting inside strings);
+    - added highlighting for magic comments: source code encoding
+      and #! (executable) strings;
+    - added highlighting for new exceptions and builtins introduced
+      in python 2.3;
diff --git a/vim/plugins/pythonsyntax/LICENSE b/vim/plugins/pythonsyntax/LICENSE
new file mode 100644
index 0000000..348583e
--- /dev/null
+++ b/vim/plugins/pythonsyntax/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2002-2014 Dmitry Vasiliev <dima@hlabs.org>
+
+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/pythonsyntax/README.rst b/vim/plugins/pythonsyntax/README.rst
new file mode 100644
index 0000000..f9cd20d
--- /dev/null
+++ b/vim/plugins/pythonsyntax/README.rst
@@ -0,0 +1,147 @@
+Python syntax highlighting script for Vim
+=========================================
+
+.. contents::
+
+About
+-----
+
+Enhanced version of the original Python syntax highlighting script. Based on
+``python.vim`` from Vim 6.1 distribution by Neil Schemenauer (nas at python dot
+ca). Check also `python.vim page on vim.org
+<http://www.vim.org/scripts/script.php?script_id=790>`_.
+
+Please use the following channels for reporting bugs, offering suggestions or
+feedback:
+
+- python.vim issue tracker: https://github.com/hdima/python-syntax/issues
+- Email: Dmitry Vasiliev (dima at hlabs.org)
+- Send a message or follow me for updates on Twitter: `@hdima
+  <https://twitter.com/hdima>`__
+
+Features
+--------
+
+Changes from the original ``python.vim`` are:
+
+- Added support for Python 3 syntax highlighting
+- Added ``:Python2Syntax`` and ``:Python3Syntax`` commands which allow to
+  switch between Python 2 and Python 3 syntaxes respectively without
+  reloads/restarts
+- Updated strings highlighting
+- Enhanced special symbols highlighting inside strings
+- Enhanced highlighting of numeric constants
+- Added optional highlighting for %-formatting inside strings
+- Added highlighting for magic comments: source code encoding and #!
+  (executable) strings
+- Added highlighting for new exceptions and builtins
+- Added highlighting for doctests
+- Added highlighting for new ``@decorator`` syntax introduced in Python 2.4a2
+- Added highlighting for the following errors:
+
+  - invalid symbols in source file
+  - mixing spaces and tabs
+  - invalid numeric constants
+  - invalid %-formatting inside strings
+  - invalid variable names
+  - trailing spaces (triggered by the ``python_highlight_space_errors`` option)
+
+Some of these features was later backported into the original ``python.vim``.
+
+How to install
+--------------
+
+The easiest installation method is to place `syntax/python.vim
+<https://github.com/hdima/python-syntax/blob/master/syntax/python.vim>`_ script
+into your ``~/.vim/syntax/`` directory.
+
+You can also use `Pathogen <https://github.com/tpope/vim-pathogen>`_ or `Vundle
+<https://github.com/gmarik/vundle>`_ plugin managers in which case you can
+install the whole `python.vim repository
+<https://github.com/hdima/python-syntax>`_ into the corresponding plugins
+directory.
+
+Script options
+--------------
+
+There are two commands to enable or disable an option:
+
+``:let OPTION_NAME = 1``
+  Enable option
+``:let OPTION_NAME = 0``
+  Disable option
+
+For example to enable all syntax highlighting features you can place the
+following command in your ``~/.vimrc`` script::
+
+  let python_highlight_all = 1
+
+Option and commands to select Python version
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``python_version_2``
+  Enable highlighting for Python 2 (Python 3 highlighting is enabled by
+  default). Also can be set as a local to buffer ``b:python_version_2``
+  variable.
+
+The following local to buffer commands can be used to switch between two
+highlighting modes:
+
+``:Python2Syntax``
+  Switch to Python 2 highlighting mode
+``:Python3Syntax``
+  Switch to Python 3 highlighting mode
+
+Options used by the script
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``python_highlight_builtins``
+  Highlight builtin functions and objects
+``python_highlight_builtin_objs``
+  Highlight builtin objects only
+``python_highlight_builtin_funcs``
+  Highlight builtin functions only
+``python_highlight_exceptions``
+  Highlight standard exceptions
+``python_highlight_string_formatting``
+  Highlight ``%`` string formatting
+``python_highlight_string_format``
+  Highlight syntax of ``str.format`` syntax
+``python_highlight_string_templates``
+  Highlight syntax of ``string.Template``
+``python_highlight_indent_errors``
+  Highlight indentation errors
+``python_highlight_space_errors``
+  Highlight trailing spaces
+``python_highlight_doctests``
+  Highlight doc-tests
+``python_print_as_function``
+  Highlight ``print`` statement as function for Python 2
+``python_highlight_file_headers_as_comments``
+  Highlight shebang and coding headers as comments
+``python_highlight_all``
+  Enable all the options above. *NOTE: This option don't override any
+  previously set options*
+``python_slow_sync``
+  Can be set to 0 for slow machines
+
+Contributors
+------------
+
+List of the contributors in alphabetical order:
+
+- `Andrea Riciputi <https://github.com/mrrech>`_
+- Anton Butanaev
+- `Antony Lee <https://github.com/anntzer>`_
+- Caleb Adamantine
+- `David Briscoe <https://github.com/idbrii>`_
+- `Elizabeth Myers <https://github.com/Elizafox>`_
+- `Ihor Gorobets <https://github.com/iho>`_
+- `Jeroen Ruigrok van der Werven <https://github.com/ashemedai>`_
+- `John Eikenberry <https://github.com/eikenb>`_
+- `Joongi Kim <https://github.com/achimnol>`_
+- `Marc Weber <https://github.com/MarcWeber>`_
+- `Pedro Algarvio <https://github.com/s0undt3ch>`_
+- `Victor Salgado <https://github.com/mcsalgado>`_
+- `Will Gray <https://github.com/graywh>`_
+- `Yuri Habrusiev <https://github.com/yuriihabrusiev>`_
diff --git a/vim/plugins/pythonsyntax/TODO.txt b/vim/plugins/pythonsyntax/TODO.txt
new file mode 100644
index 0000000..605c45a
--- /dev/null
+++ b/vim/plugins/pythonsyntax/TODO.txt
@@ -0,0 +1,26 @@
+Now
+===
+
+- It seems python.vim doesn't highlight special characters inside strings by
+  default but only when reloaded? Or maybe only when set to Python 2
+  by default?
+
+- Add support for slice syntax:
+  http://img155.imageshack.us/img155/7767/screenshotgs.png
+
+- When we check spelling we don't need to check the whole strings only the
+  content. For example we don't need to check 'u' for spelling in strings
+  like this: u"Some text";
+
+Later
+=====
+
+- Need more accurate way to handle indentation errors. For example
+  mixing spaces and tabs may be used for pretty formatting;
+
+- Need more checks for errors like: absent brackets, absent quotes,
+  back slash at the end of strings;
+
+- pythonError tips from
+  http://blog.sontek.net/2008/05/11/python-with-a-modular-ide-vim/ (reported by
+  Giuliani Deon Sanches)
diff --git a/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.13 b/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.13
new file mode 100644
index 0000000..e5ea668
--- /dev/null
+++ b/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.13
@@ -0,0 +1,237 @@
+" Vim syntax file
+" Language:	Python
+" Maintainer:	Neil Schemenauer <nas at python dot ca>
+" Updated:	$Date: 2003/01/12 14:17:34 $
+" Updated by:	Dmitry Vasiliev <dima at hlabs dot org>
+" Filenames:	*.py
+" $Revision: 1.13 $
+"
+" Options:
+" For folded functions and classes:
+"
+"    let python_folding = 1
+"
+" For highlighted builtin functions:
+"
+"    let python_highlight_builtins = 1
+"
+" For highlighted standard exceptions:
+"
+"    let python_highlight_exceptions = 1
+"
+" For highlighted string formatting:
+"
+"    let python_highlight_string_formatting = 1
+"
+" If you want all possible Python highlighting:
+"
+"    let python_highlight_all = 1
+"
+" TODO: Check more errors?
+
+" 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
+
+if exists("python_highlight_all")
+  let python_folding = 1
+  let python_highlight_builtins = 1
+  let python_highlight_exceptions = 1
+  let python_highlight_string_formatting = 1
+endif
+
+" Keywords
+syn keyword pythonStatement	break continue del
+syn keyword pythonStatement	exec return
+syn keyword pythonStatement	pass print raise
+syn keyword pythonStatement	global assert
+syn keyword pythonStatement	lambda yield
+if exists("python_folding") && has("folding")
+  syn match pythonStatement	"\<\(def\|class\)\>" display nextgroup=pythonFunction skipwhite
+else
+  syn keyword pythonStatement	def class nextgroup=pythonFunction skipwhite
+endif
+syn match   pythonFunction	"\h\w*" display contained
+syn keyword pythonRepeat	for while
+syn keyword pythonConditional	if elif else
+syn keyword pythonImport	import from as
+syn keyword pythonException	try except finally
+syn keyword pythonOperator	and in is not or
+
+" Comments
+syn match   pythonComment	"#.*$" display contains=pythonTodo
+syn keyword pythonTodo		TODO FIXME XXX contained
+
+" Erroneous characters that cannont be in a python program
+syn match pythonError		"[@$?]" display
+" Mixing spaces and tabs is bad
+syn match pythonIndentError	"^\s*\(\t \| \t\)\s*" display
+
+" Strings
+syn region pythonString		start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+"""+ end=+"""+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+'''+ end=+'''+ contains=pythonEscape,pythonEscapeError
+
+syn match  pythonEscape		+\\[abfnrtv'"\\]+ display contained
+syn match  pythonEscapeError	+\\[^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 strings
+syn region pythonUniString	start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]"""+ end=+"""+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]'''+ end=+'''+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+
+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=+$+ contains=pythonRawEscape
+syn region pythonRawString	start=+[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonRawEscape
+syn region pythonRawString	start=+[rR]"""+ end=+"""+
+syn region pythonRawString	start=+[rR]'''+ end=+'''+
+
+syn match pythonRawEscape	+\\['"]+ display transparent contained
+
+" Unicode raw strings
+syn region pythonUniRawString	start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]"""+ end=+"""+ contains=pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]'''+ end=+'''+ contains=pythonUniRawEscape,pythonUniRawEscapeError
+
+syn match  pythonUniRawEscape		"\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained
+syn match  pythonUniRawEscapeError	"\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained
+
+if exists("python_highlight_string_formatting")
+  " String formatting
+  syn match pythonStrFormat	"%\(([^)]\+)\)\=[-#0 +]\=\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString
+  syn match pythonStrFormat	"%[-#0 +]\=\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString
+endif
+
+" Numbers (ints, longs, floats, complex)
+syn match   pythonNumber	"\<0[xX]\x\+[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   pythonOctalError	"\<0\o*[89]\d*[lLjJ]\=\>" display
+
+if exists("python_highlight_builtins")
+  " Builtin functions, types and objects, not really part of the syntax
+  syn keyword pythonBuiltinObj	True False Ellipsis None NotImplemented
+  syn keyword pythonBuiltinFunc	bool __import__ abs
+  syn keyword pythonBuiltinFunc	apply buffer callable chr classmethod cmp
+  syn keyword pythonBuiltinFunc	coerce compile complex delattr dict dir divmod
+  syn keyword pythonBuiltinFunc	eval execfile file filter float getattr globals
+  syn keyword pythonBuiltinFunc	hasattr hash hex id input int intern isinstance
+  syn keyword pythonBuiltinFunc	issubclass iter len list locals long map max
+  syn keyword pythonBuiltinFunc	min object oct open ord pow property range
+  syn keyword pythonBuiltinFunc	raw_input reduce reload repr round setattr
+  syn keyword pythonBuiltinFunc	slice staticmethod str super tuple type unichr
+  syn keyword pythonBuiltinFunc	unicode vars xrange zip
+endif
+
+if exists("python_highlight_exceptions")
+  " Builtin exceptions and warnings
+  syn keyword pythonExClass	ArithmeticError AssertionError AttributeError
+  syn keyword pythonExClass	DeprecationWarning EOFError EnvironmentError
+  syn keyword pythonExClass	Exception FloatingPointError IOError
+  syn keyword pythonExClass	ImportError IndentiationError IndexError
+  syn keyword pythonExClass	KeyError KeyboardInterrupt LookupError
+  syn keyword pythonExClass	MemoryError NameError NotImplementedError
+  syn keyword pythonExClass	OSError OverflowError OverflowWarning
+  syn keyword pythonExClass	ReferenceError RuntimeError RuntimeWarning
+  syn keyword pythonExClass	StandardError StopIteration SyntaxError
+  syn keyword pythonExClass	SyntaxWarning SystemError SystemExit TabError
+  syn keyword pythonExClass	TypeError UnboundLocalError UnicodeError
+  syn keyword pythonExClass	UserWarning ValueError Warning WindowsError
+  syn keyword pythonExClass	ZeroDivisionError
+endif
+
+syn sync clear
+if exists("python_folding") && has("folding")
+  syn sync fromstart
+
+  "syn match pythonFold "^\(\s*\)\(class\|def\)\s.*\(\(\n\s*\)*\n\1\s\+\S.*\)\+" transparent fold
+  syn region pythonFold start="^\z(\s*\)\(class\|def\)\s" skip="^\z1\s\+\S" end="^\s*\S"me=s-1 transparent fold
+  syn region pythonFold start="{" end="}" transparent fold
+  syn region pythonFold start="\[" end="\]" transparent fold
+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. If
+  " you have a fast machine you can try uncommenting the "sync minlines"
+  " and commenting out the rest.
+  syn sync match pythonSync grouphere NONE "):$"
+  syn sync maxlines=200
+  "syn sync minlines=2000
+endif
+
+if version >= 508 || !exists("did_python_syn_inits")
+  if version <= 508
+    let did_python_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink pythonStatement	Statement
+  HiLink pythonImport		Statement
+  HiLink pythonFunction		Function
+  HiLink pythonConditional	Conditional
+  HiLink pythonRepeat		Repeat
+  HiLink pythonException	Exception
+  HiLink pythonOperator		Operator
+
+  HiLink pythonComment		Comment
+  HiLink pythonTodo		Todo
+
+  HiLink pythonError		Error
+  HiLink pythonIndentError	Error
+
+  HiLink pythonString		String
+  HiLink pythonUniString	String
+  HiLink pythonRawString	String
+  HiLink pythonUniRawString	String
+
+  HiLink pythonEscape			Special
+  HiLink pythonEscapeError		Error
+  HiLink pythonUniEscape		Special
+  HiLink pythonUniEscapeError		Error
+  HiLink pythonUniRawEscape		Special
+  HiLink pythonUniRawEscapeError	Error
+
+  if exists("python_highlight_string_formatting")
+    HiLink pythonStrFormat	Special
+  endif
+
+  HiLink pythonNumber		Number
+  HiLink pythonFloat		Float
+  HiLink pythonOctalError	Error
+
+  if exists("python_highlight_builtins")
+    HiLink pythonBuiltinObj	Structure
+    HiLink pythonBuiltinFunc	Function
+  endif
+
+  if exists("python_highlight_exceptions")
+    HiLink pythonExClass	Structure
+  endif
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "python"
diff --git a/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.14 b/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.14
new file mode 100644
index 0000000..9027838
--- /dev/null
+++ b/vim/plugins/pythonsyntax/folding-ideas/python.vim.1.14
@@ -0,0 +1,236 @@
+" Vim syntax file
+" Language:	Python
+" Maintainer:	Neil Schemenauer <nas at python dot ca>
+" Updated:	$Date: 2003/01/12 15:35:02 $
+" Updated by:	Dmitry Vasiliev <dima at hlabs dot org>
+" Filenames:	*.py
+" $Revision: 1.14 $
+"
+" Options:
+" For folded functions and classes:
+"
+"    let python_folding = 1
+"
+" For highlighted builtin functions:
+"
+"    let python_highlight_builtins = 1
+"
+" For highlighted standard exceptions:
+"
+"    let python_highlight_exceptions = 1
+"
+" For highlighted string formatting:
+"
+"    let python_highlight_string_formatting = 1
+"
+" If you want all possible Python highlighting:
+"
+"    let python_highlight_all = 1
+"
+" TODO: Check more errors?
+
+" 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
+
+if exists("python_highlight_all")
+  let python_folding = 1
+  let python_highlight_builtins = 1
+  let python_highlight_exceptions = 1
+  let python_highlight_string_formatting = 1
+endif
+
+" Keywords
+syn keyword pythonStatement	break continue del
+syn keyword pythonStatement	exec return
+syn keyword pythonStatement	pass print raise
+syn keyword pythonStatement	global assert
+syn keyword pythonStatement	lambda yield
+if exists("python_folding") && has("folding")
+  syn match pythonStatement	"\<\(def\|class\)\>" display nextgroup=pythonFunction skipwhite
+else
+  syn keyword pythonStatement	def class nextgroup=pythonFunction skipwhite
+endif
+syn match   pythonFunction	"\h\w*" display contained
+syn keyword pythonRepeat	for while
+syn keyword pythonConditional	if elif else
+syn keyword pythonImport	import from as
+syn keyword pythonException	try except finally
+syn keyword pythonOperator	and in is not or
+
+" Comments
+syn match   pythonComment	"#.*$" display contains=pythonTodo
+syn keyword pythonTodo		TODO FIXME XXX contained
+
+" Erroneous characters that cannont be in a python program
+syn match pythonError		"[@$?]" display
+" Mixing spaces and tabs is bad
+syn match pythonError	"^\s*\(\t \| \t\)\s*" display
+
+" Strings
+syn region pythonString		start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+"""+ end=+"""+ contains=pythonEscape,pythonEscapeError
+syn region pythonString		start=+'''+ end=+'''+ contains=pythonEscape,pythonEscapeError
+
+syn match  pythonEscape		+\\[abfnrtv'"\\]+ display contained
+syn match  pythonEscapeError	+\\[^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 strings
+syn region pythonUniString	start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]"""+ end=+"""+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+syn region pythonUniString	start=+[uU]'''+ end=+'''+ contains=pythonEscape,pythonUniEscape,pythonEscapeError,pythonUniEscapeError
+
+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=+$+ contains=pythonRawEscape
+syn region pythonRawString	start=+[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonRawEscape
+syn region pythonRawString	start=+[rR]"""+ end=+"""+
+syn region pythonRawString	start=+[rR]'''+ end=+'''+
+
+syn match pythonRawEscape	+\\['"]+ display transparent contained
+
+" Unicode raw strings
+syn region pythonUniRawString	start=+[uU][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ contains=pythonRawEscape,pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]"""+ end=+"""+ contains=pythonUniRawEscape,pythonUniRawEscapeError
+syn region pythonUniRawString	start=+[uU][rR]'''+ end=+'''+ contains=pythonUniRawEscape,pythonUniRawEscapeError
+
+syn match  pythonUniRawEscape		"\([^\\]\(\\\\\)*\)\@<=\\u\x\{4}" display contained
+syn match  pythonUniRawEscapeError	"\([^\\]\(\\\\\)*\)\@<=\\u\x\{,3}\X" display contained
+
+if exists("python_highlight_string_formatting")
+  " String formatting
+  syn match pythonStrFormat	"%\(([^)]\+)\)\=[-#0 +]\=\d*\(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString
+  syn match pythonStrFormat	"%[-#0 +]\=\(\*\|\d\+\)\=\(\.\(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonRawString
+endif
+
+" Numbers (ints, longs, floats, complex)
+syn match   pythonNumber	"\<0[xX]\x\+[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   pythonOctalError	"\<0\o*[89]\d*[lLjJ]\=\>" display
+
+if exists("python_highlight_builtins")
+  " Builtin functions, types and objects, not really part of the syntax
+  syn keyword pythonBuiltinObj	True False Ellipsis None NotImplemented
+  syn keyword pythonBuiltinFunc	bool __import__ abs
+  syn keyword pythonBuiltinFunc	apply buffer callable chr classmethod cmp
+  syn keyword pythonBuiltinFunc	coerce compile complex delattr dict dir divmod
+  syn keyword pythonBuiltinFunc	eval execfile file filter float getattr globals
+  syn keyword pythonBuiltinFunc	hasattr hash hex id input int intern isinstance
+  syn keyword pythonBuiltinFunc	issubclass iter len list locals long map max
+  syn keyword pythonBuiltinFunc	min object oct open ord pow property range
+  syn keyword pythonBuiltinFunc	raw_input reduce reload repr round setattr
+  syn keyword pythonBuiltinFunc	slice staticmethod str super tuple type unichr
+  syn keyword pythonBuiltinFunc	unicode vars xrange zip
+endif
+
+if exists("python_highlight_exceptions")
+  " Builtin exceptions and warnings
+  syn keyword pythonExClass	ArithmeticError AssertionError AttributeError
+  syn keyword pythonExClass	DeprecationWarning EOFError EnvironmentError
+  syn keyword pythonExClass	Exception FloatingPointError IOError
+  syn keyword pythonExClass	ImportError IndentiationError IndexError
+  syn keyword pythonExClass	KeyError KeyboardInterrupt LookupError
+  syn keyword pythonExClass	MemoryError NameError NotImplementedError
+  syn keyword pythonExClass	OSError OverflowError OverflowWarning
+  syn keyword pythonExClass	ReferenceError RuntimeError RuntimeWarning
+  syn keyword pythonExClass	StandardError StopIteration SyntaxError
+  syn keyword pythonExClass	SyntaxWarning SystemError SystemExit TabError
+  syn keyword pythonExClass	TypeError UnboundLocalError UnicodeError
+  syn keyword pythonExClass	UserWarning ValueError Warning WindowsError
+  syn keyword pythonExClass	ZeroDivisionError
+endif
+
+syn sync clear
+if exists("python_folding") && has("folding")
+  syn sync fromstart
+
+  "syn match pythonFold "^\(\s*\)\(class\|def\)\s.*\(\(\n\s*\)*\n\1\s\+\S.*\)\+" transparent fold
+  syn region pythonFold start="^\z(\s*\)\(class\|def\)\s" skip="\(\s*\n\)\+\z1\s\+\(\S\|\%$\)" end="\(\s*\n\)\+\s*\(\S\|\%$\)"me=s-1 transparent fold
+  syn region pythonFold start="{" end="}" transparent fold
+  syn region pythonFold start="\[" end="\]" transparent fold
+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. If
+  " you have a fast machine you can try uncommenting the "sync minlines"
+  " and commenting out the rest.
+  syn sync match pythonSync grouphere NONE "):$"
+  syn sync maxlines=200
+  "syn sync minlines=2000
+endif
+
+if version >= 508 || !exists("did_python_syn_inits")
+  if version <= 508
+    let did_python_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink pythonStatement	Statement
+  HiLink pythonImport		Statement
+  HiLink pythonFunction		Function
+  HiLink pythonConditional	Conditional
+  HiLink pythonRepeat		Repeat
+  HiLink pythonException	Exception
+  HiLink pythonOperator		Operator
+
+  HiLink pythonComment		Comment
+  HiLink pythonTodo		Todo
+
+  HiLink pythonError		Error
+
+  HiLink pythonString		String
+  HiLink pythonUniString	String
+  HiLink pythonRawString	String
+  HiLink pythonUniRawString	String
+
+  HiLink pythonEscape			Special
+  HiLink pythonEscapeError		Error
+  HiLink pythonUniEscape		Special
+  HiLink pythonUniEscapeError		Error
+  HiLink pythonUniRawEscape		Special
+  HiLink pythonUniRawEscapeError	Error
+
+  if exists("python_highlight_string_formatting")
+    HiLink pythonStrFormat	Special
+  endif
+
+  HiLink pythonNumber		Number
+  HiLink pythonFloat		Float
+  HiLink pythonOctalError	Error
+
+  if exists("python_highlight_builtins")
+    HiLink pythonBuiltinObj	Structure
+    HiLink pythonBuiltinFunc	Function
+  endif
+
+  if exists("python_highlight_exceptions")
+    HiLink pythonExClass	Structure
+  endif
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "python"
diff --git a/vim/plugins/pythonsyntax/syntax.txt b/vim/plugins/pythonsyntax/syntax.txt
new file mode 100644
index 0000000..294b11a
--- /dev/null
+++ b/vim/plugins/pythonsyntax/syntax.txt
@@ -0,0 +1,65 @@
+PYTHON						*python.vim* *ft-python-syntax*
+
+There are two commands to enable or disable an option for python.vim
+
+  Enable option: >
+    :let option_name = 1
+<
+  Disable option: >
+    :let option_name = 0
+<
+For example to enable all syntax highlighting features you can place the
+following command in your `~/.vimrc` script: >
+
+  let python_highlight_all = 1
+<
+Option and commands to select Python version: >
+
+  :let python_version_2 = 1
+<
+  Enable highlighting for Python 2 (Python 3 highlighting is enabled by
+  default). Also can be set as a local to buffer `b:python_version_2`
+  variable.
+
+The following local to buffer commands can be used to switch between two
+highlighting modes:
+
+  Switch to Python 2 highlighting mode >
+    :Python2Syntax
+<
+  Switch to Python 3 highlighting mode >
+    :Python3Syntax
+<
+Options used by the script
+
+  Highlight builtin functions and objects >
+    :let python_highlight_builtins = 1
+<  Highlight builtin objects only >
+    :let python_highlight_builtin_objs = 1
+<  Highlight builtin functions only >
+    :let python_highlight_builtin_funcs = 1
+<  Highlight standard exceptions >
+    :let python_highlight_exceptions = 1
+<  Highlight `%` string formatting >
+    :let python_highlight_string_formatting = 1
+<  Highlight syntax of `str.format` syntax >
+    :let python_highlight_string_format = 1
+<  Highlight syntax of `string.Template` >
+    :let python_highlight_string_templates = 1
+<  Highlight indentation errors >
+    :let python_highlight_indent_errors = 1
+<  Highlight trailing spaces >
+    :let python_highlight_space_errors = 1
+<  Highlight doc-tests >
+    :let python_highlight_doctests = 1
+<  Highlight `print` statement as function for Python 2 >
+    :let python_print_as_function = 1
+<  Highlight shebang and coding headers as comments >
+    :let python_highlight_file_headers_as_comments = 1
+<  Enable all the options above. NOTE: This option don't override any
+  previously set options >
+    :let python_highlight_all = 1
+<  Can be set to 0 for slow machines >
+    :let python_slow_sync = 1
+<
+ vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/vim/plugins/pythonsyntax/syntax/python.vim b/vim/plugins/pythonsyntax/syntax/python.vim
new file mode 100644
index 0000000..e963628
--- /dev/null
+++ b/vim/plugins/pythonsyntax/syntax/python.vim
@@ -0,0 +1,568 @@
+" Vim syntax file
+" Language:             Python
+" Current Maintainer:   Dmitry Vasiliev <dima at hlabs dot org>
+" Previous Maintainer:  Neil Schemenauer <nas at python dot ca>
+" URL:                  https://github.com/hdima/python-syntax
+" Last Change:          2015-11-01
+" Filenames:            *.py
+" Version:              3.6.0
+"
+" Based on python.vim (from Vim 6.1 distribution)
+" by Neil Schemenauer <nas at python dot ca>
+"
+" Please use the following channels for reporting bugs, offering suggestions or
+" feedback:
+
+" - python.vim issue tracker: https://github.com/hdima/python-syntax/issues
+" - Email: Dmitry Vasiliev (dima at hlabs.org)
+" - Send a message or follow me for updates on Twitter: `@hdima
+"   <https://twitter.com/hdima>`__
+"
+" Contributors
+" ============
+"
+" List of the contributors in alphabetical order:
+"
+"   Andrea Riciputi
+"   Anton Butanaev
+"   Antony Lee
+"   Caleb Adamantine
+"   David Briscoe
+"   Elizabeth Myers
+"   Ihor Gorobets
+"   Jeroen Ruigrok van der Werven
+"   John Eikenberry
+"   Joongi Kim
+"   Marc Weber
+"   Pedro Algarvio
+"   Victor Salgado
+"   Will Gray
+"   Yuri Habrusiev
+"
+" Options
+" =======
+"
+"    :let OPTION_NAME = 1                   Enable option
+"    :let OPTION_NAME = 0                   Disable option
+"
+"
+" Option to select Python version
+" -------------------------------
+"
+"    python_version_2                       Enable highlighting for Python 2
+"                                           (Python 3 highlighting is enabled
+"                                           by default). Can also be set as
+"                                           a buffer (b:python_version_2)
+"                                           variable.
+"
+"    You can also use the following local to buffer commands to switch
+"    between two highlighting modes:
+"
+"    :Python2Syntax                         Switch to Python 2 highlighting
+"                                           mode
+"    :Python3Syntax                         Switch to Python 3 highlighting
+"                                           mode
+"
+" Option names used by the script
+" -------------------------------
+"
+"    python_highlight_builtins              Highlight builtin functions and
+"                                           objects
+"      python_highlight_builtin_objs        Highlight builtin objects only
+"      python_highlight_builtin_funcs       Highlight builtin functions only
+"    python_highlight_exceptions            Highlight standard exceptions
+"    python_highlight_string_formatting     Highlight % string formatting
+"    python_highlight_string_format         Highlight str.format syntax
+"    python_highlight_string_templates      Highlight string.Template syntax
+"    python_highlight_indent_errors         Highlight indentation errors
+"    python_highlight_space_errors          Highlight trailing spaces
+"    python_highlight_doctests              Highlight doc-tests
+"    python_print_as_function               Highlight 'print' statement as
+"                                           function for Python 2
+"    python_highlight_file_headers_as_comments
+"                                           Highlight shebang and coding
+"                                           headers as comments
+"
+"    python_highlight_all                   Enable all the options above
+"                                           NOTE: This option don't override
+"                                           any previously set options
+"
+"    python_slow_sync                       Can be set to 0 for slow machines
+"
+
+" For version 5.x: Clear all syntax items
+" For versions greater than 6.x: Quit when a syntax file was already loaded
+if version < 600
+  syntax clear
+elseif exists("b:current_syntax")
+  finish
+endif
+
+"
+" Commands
+"
+command! -buffer Python2Syntax let b:python_version_2 = 1 | let &syntax=&syntax
+command! -buffer Python3Syntax let b:python_version_2 = 0 | let &syntax=&syntax
+
+" Enable option if it's not defined
+function! s:EnableByDefault(name)
+  if !exists(a:name)
+    let {a:name} = 1
+  endif
+endfunction
+
+" Check if option is enabled
+function! s:Enabled(name)
+  return exists(a:name) && {a:name}
+endfunction
+
+" Is it Python 2 syntax?
+function! s:Python2Syntax()
+  if exists("b:python_version_2")
+      return b:python_version_2
+  endif
+  return s:Enabled("g:python_version_2")
+endfunction
+
+"
+" Default options
+"
+
+call s:EnableByDefault("g:python_slow_sync")
+
+if s:Enabled("g:python_highlight_all")
+  call s:EnableByDefault("g:python_highlight_builtins")
+  if s:Enabled("g:python_highlight_builtins")
+    call s:EnableByDefault("g:python_highlight_builtin_objs")
+    call s:EnableByDefault("g:python_highlight_builtin_funcs")
+  endif
+  call s:EnableByDefault("g:python_highlight_exceptions")
+  call s:EnableByDefault("g:python_highlight_string_formatting")
+  call s:EnableByDefault("g:python_highlight_string_format")
+  call s:EnableByDefault("g:python_highlight_string_templates")
+  call s:EnableByDefault("g:python_highlight_indent_errors")
+  call s:EnableByDefault("g:python_highlight_space_errors")
+  call s:EnableByDefault("g:python_highlight_doctests")
+  call s:EnableByDefault("g:python_print_as_function")
+endif
+
+"
+" Keywords
+"
+
+syn keyword pythonStatement     break continue del
+syn keyword pythonStatement     exec return
+syn keyword pythonStatement     pass raise
+syn keyword pythonStatement     global assert
+syn keyword pythonStatement     lambda
+syn keyword pythonStatement     with
+syn keyword pythonStatement     def class nextgroup=pythonFunction skipwhite
+syn keyword pythonRepeat        for while
+syn keyword pythonConditional   if elif else
+" The standard pyrex.vim unconditionally removes the pythonInclude group, so
+" we provide a dummy group here to avoid crashing pyrex.vim.
+syn keyword pythonInclude       import
+syn keyword pythonImport        import
+syn keyword pythonException     try except finally
+syn keyword pythonOperator      and in is not or
+
+syn match pythonStatement   "\<yield\>" display
+syn match pythonImport      "\<from\>" display
+
+if s:Python2Syntax()
+  if !s:Enabled("g:python_print_as_function")
+    syn keyword pythonStatement  print
+  endif
+  syn keyword pythonImport      as
+  syn match   pythonFunction    "[a-zA-Z_][a-zA-Z0-9_]*" display contained
+else
+  syn keyword pythonStatement   as nonlocal None
+  syn match   pythonStatement   "\<yield\s\+from\>" display
+  syn keyword pythonBoolean     True False
+  syn match   pythonFunction    "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained
+  syn keyword pythonStatement   await
+  syn match   pythonStatement   "\<async\s\+def\>" nextgroup=pythonFunction skipwhite
+  syn match   pythonStatement   "\<async\s\+with\>" display
+  syn match   pythonStatement   "\<async\s\+for\>" display
+endif
+
+"
+" Decorators (new in Python 2.4)
+"
+
+syn match   pythonDecorator	"@" display nextgroup=pythonDottedName skipwhite
+if s:Python2Syntax()
+  syn match   pythonDottedName "[a-zA-Z_][a-zA-Z0-9_]*\%(\.[a-zA-Z_][a-zA-Z0-9_]*\)*" display contained
+else
+  syn match   pythonDottedName "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\)*" display contained
+endif
+syn match   pythonDot        "\." display containedin=pythonDottedName
+
+"
+" Comments
+"
+
+syn match   pythonComment	"#.*$" display contains=pythonTodo,@Spell
+if !s:Enabled("g:python_highlight_file_headers_as_comments")
+  syn match   pythonRun		"\%^#!.*$"
+  syn match   pythonCoding	"\%^.*\%(\n.*\)\?#.*coding[:=]\s*[0-9A-Za-z-_.]\+.*$"
+endif
+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
+
+" Mixing spaces and tabs also may be used for pretty formatting multiline
+" statements
+if s:Enabled("g:python_highlight_indent_errors")
+  syn match pythonIndentError	"^\s*\%( \t\|\t \)\s*\S"me=e-1 display
+endif
+
+" Trailing space errors
+if s:Enabled("g:python_highlight_space_errors")
+  syn match pythonSpaceError	"\s\+$" display
+endif
+
+"
+" Strings
+"
+
+if s:Python2Syntax()
+  " Python 2 strings
+  syn region pythonString   start=+[bB]\='+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonString   start=+[bB]\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonString   start=+[bB]\="""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonString   start=+[bB]\='''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell
+else
+  " Python 3 byte strings
+  syn region pythonBytes		start=+[bB]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell
+  syn region pythonBytes		start=+[bB]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell
+  syn region pythonBytes		start=+[bB]"""+ end=+"""+ keepend contains=pythonBytesError,pythonBytesContent,pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonBytes		start=+[bB]'''+ end=+'''+ keepend contains=pythonBytesError,pythonBytesContent,pythonDocTest,pythonSpaceError,@Spell
+
+  syn match pythonBytesError    ".\+" display contained
+  syn match pythonBytesContent  "[\u0000-\u00ff]\+" display contained contains=pythonBytesEscape,pythonBytesEscapeError
+endif
+
+syn match pythonBytesEscape       +\\[abfnrtv'"\\]+ display contained
+syn match pythonBytesEscape       "\\\o\o\=\o\=" display contained
+syn match pythonBytesEscapeError  "\\\o\{,2}[89]" display contained
+syn match pythonBytesEscape       "\\x\x\{2}" display contained
+syn match pythonBytesEscapeError  "\\x\x\=\X" display contained
+syn match pythonBytesEscape       "\\$"
+
+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
+
+if s:Python2Syntax()
+  " Python 2 Unicode strings
+  syn region pythonUniString  start=+[uU]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonUniString  start=+[uU]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonUniString  start=+[uU]"""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonUniString  start=+[uU]'''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell
+else
+  " Python 3 strings
+  syn region pythonString   start=+'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonString   start=+"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,@Spell
+  syn region pythonString   start=+"""+ end=+"""+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonString   start=+'''+ end=+'''+ keepend contains=pythonBytesEscape,pythonBytesEscapeError,pythonUniEscape,pythonUniEscapeError,pythonDocTest,pythonSpaceError,@Spell
+endif
+
+if s:Python2Syntax()
+  " Python 2 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
+endif
+
+" Python 2/3 raw strings
+if s:Python2Syntax()
+  syn region pythonRawString  start=+[bB]\=[rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell
+  syn region pythonRawString  start=+[bB]\=[rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell
+  syn region pythonRawString  start=+[bB]\=[rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonRawString  start=+[bB]\=[rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell
+else
+  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 region pythonRawBytes  start=+[bB][rR]'+ skip=+\\\\\|\\'\|\\$+ excludenl end=+'+ end=+$+ keepend contains=pythonRawEscape,@Spell
+  syn region pythonRawBytes  start=+[bB][rR]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonRawEscape,@Spell
+  syn region pythonRawBytes  start=+[bB][rR]"""+ end=+"""+ keepend contains=pythonDocTest2,pythonSpaceError,@Spell
+  syn region pythonRawBytes  start=+[bB][rR]'''+ end=+'''+ keepend contains=pythonDocTest,pythonSpaceError,@Spell
+endif
+
+syn match pythonRawEscape +\\['"]+ display transparent contained
+
+if s:Enabled("g:python_highlight_string_formatting")
+  " % operator string formatting
+  if s:Python2Syntax()
+    syn match pythonStrFormatting	"%\%(([^)]\+)\)\=[-#0 +]*\d*\%(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+    syn match pythonStrFormatting	"%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+  else
+    syn match pythonStrFormatting	"%\%(([^)]\+)\)\=[-#0 +]*\d*\%(\.\d\+\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString
+    syn match pythonStrFormatting	"%[-#0 +]*\%(\*\|\d\+\)\=\%(\.\%(\*\|\d\+\)\)\=[hlL]\=[diouxXeEfFgGcrs%]" contained containedin=pythonString,pythonRawString
+  endif
+endif
+
+if s:Enabled("g:python_highlight_string_format")
+  " str.format syntax
+  if s:Python2Syntax()
+    syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+    syn match pythonStrFormat	"{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+  else
+    syn match pythonStrFormat "{{\|}}" contained containedin=pythonString,pythonRawString
+    syn match pythonStrFormat	"{\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)\=\%(\.\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\[\%(\d\+\|[^!:\}]\+\)\]\)*\%(![rsa]\)\=\%(:\%({\%(\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*\|\d\+\)}\|\%([^}]\=[<>=^]\)\=[ +-]\=#\=0\=\d*,\=\%(\.\d\+\)\=[bcdeEfFgGnosxX%]\=\)\=\)\=}" contained containedin=pythonString,pythonRawString
+  endif
+endif
+
+if s:Enabled("g:python_highlight_string_templates")
+  " string.Template format
+  if s:Python2Syntax()
+    syn match pythonStrTemplate	"\$\$" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+    syn match pythonStrTemplate	"\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+    syn match pythonStrTemplate	"\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonUniString,pythonUniRawString,pythonRawString
+  else
+    syn match pythonStrTemplate	"\$\$" contained containedin=pythonString,pythonRawString
+    syn match pythonStrTemplate	"\${[a-zA-Z_][a-zA-Z0-9_]*}" contained containedin=pythonString,pythonRawString
+    syn match pythonStrTemplate	"\$[a-zA-Z_][a-zA-Z0-9_]*" contained containedin=pythonString,pythonRawString
+  endif
+endif
+
+if s:Enabled("g:python_highlight_doctests")
+  " 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
+
+"
+" Numbers (ints, longs, floats, complex)
+"
+
+if s:Python2Syntax()
+  syn match   pythonHexError	"\<0[xX]\x*[g-zG-Z]\+\x*[lL]\=\>" display
+  syn match   pythonOctError	"\<0[oO]\=\o*\D\+\d*[lL]\=\>" display
+  syn match   pythonBinError	"\<0[bB][01]*\D\+\d*[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   pythonNumberError	"\<\d\+\D[lL]\=\>" display
+  syn match   pythonNumber	"\<\d[lL]\=\>" display
+  syn match   pythonNumber	"\<[0-9]\d\+[lL]\=\>" display
+  syn match   pythonNumber	"\<\d\+[lLjJ]\>" display
+
+  syn match   pythonOctError	"\<0[oO]\=\o*[8-9]\d*[lL]\=\>" display
+  syn match   pythonBinError	"\<0[bB][01]*[2-9]\d*[lL]\=\>" display
+else
+  syn match   pythonHexError	"\<0[xX]\x*[g-zG-Z]\x*\>" display
+  syn match   pythonOctError	"\<0[oO]\=\o*\D\+\d*\>" display
+  syn match   pythonBinError	"\<0[bB][01]*\D\+\d*\>" display
+
+  syn match   pythonHexNumber	"\<0[xX]\x\+\>" display
+  syn match   pythonOctNumber "\<0[oO]\o\+\>" display
+  syn match   pythonBinNumber "\<0[bB][01]\+\>" display
+
+  syn match   pythonNumberError	"\<\d\+\D\>" display
+  syn match   pythonNumberError	"\<0\d\+\>" display
+  syn match   pythonNumber	"\<\d\>" display
+  syn match   pythonNumber	"\<[1-9]\d\+\>" display
+  syn match   pythonNumber	"\<\d\+[jJ]\>" display
+
+  syn match   pythonOctError	"\<0[oO]\=\o*[8-9]\d*\>" display
+  syn match   pythonBinError	"\<0[bB][01]*[2-9]\d*\>" display
+endif
+
+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
+
+"
+" Builtin objects and types
+"
+
+if s:Enabled("g:python_highlight_builtin_objs")
+  if s:Python2Syntax()
+    syn keyword pythonBuiltinObj	None
+    syn keyword pythonBoolean		True False
+  endif
+  syn keyword pythonBuiltinObj	Ellipsis NotImplemented
+  syn keyword pythonBuiltinObj	__debug__ __doc__ __file__ __name__ __package__
+endif
+
+"
+" Builtin functions
+"
+
+if s:Enabled("g:python_highlight_builtin_funcs")
+  if s:Python2Syntax()
+    syn keyword pythonBuiltinFunc	apply basestring buffer callable coerce
+    syn keyword pythonBuiltinFunc	execfile file help intern long raw_input
+    syn keyword pythonBuiltinFunc	reduce reload unichr unicode xrange
+    if s:Enabled("g:python_print_as_function")
+      syn keyword pythonBuiltinFunc	print
+    endif
+  else
+    syn keyword pythonBuiltinFunc	ascii exec memoryview print
+  endif
+  syn keyword pythonBuiltinFunc	__import__ abs all any
+  syn keyword pythonBuiltinFunc	bin bool bytearray bytes
+  syn keyword pythonBuiltinFunc	chr classmethod cmp compile complex
+  syn keyword pythonBuiltinFunc	delattr dict dir divmod enumerate eval
+  syn keyword pythonBuiltinFunc	filter float format frozenset getattr
+  syn keyword pythonBuiltinFunc	globals hasattr hash hex id
+  syn keyword pythonBuiltinFunc	input int isinstance
+  syn keyword pythonBuiltinFunc	issubclass iter len list locals map max
+  syn keyword pythonBuiltinFunc	min next object oct open ord
+  syn keyword pythonBuiltinFunc	pow property range
+  syn keyword pythonBuiltinFunc	repr reversed round set setattr
+  syn keyword pythonBuiltinFunc	slice sorted staticmethod str sum super tuple
+  syn keyword pythonBuiltinFunc	type vars zip
+endif
+
+"
+" Builtin exceptions and warnings
+"
+
+if s:Enabled("g:python_highlight_exceptions")
+  if s:Python2Syntax()
+    syn keyword pythonExClass	StandardError
+  else
+    syn keyword pythonExClass	BlockingIOError ChildProcessError
+    syn keyword pythonExClass	ConnectionError BrokenPipeError
+    syn keyword pythonExClass	ConnectionAbortedError ConnectionRefusedError
+    syn keyword pythonExClass	ConnectionResetError FileExistsError
+    syn keyword pythonExClass	FileNotFoundError InterruptedError
+    syn keyword pythonExClass	IsADirectoryError NotADirectoryError
+    syn keyword pythonExClass	PermissionError ProcessLookupError TimeoutError
+
+    syn keyword pythonExClass	ResourceWarning
+  endif
+  syn keyword pythonExClass	BaseException
+  syn keyword pythonExClass	Exception 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 s:Enabled("g:python_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
+
+if version >= 508 || !exists("did_python_syn_inits")
+  if version <= 508
+    let did_python_syn_inits = 1
+    command -nargs=+ HiLink hi link <args>
+  else
+    command -nargs=+ HiLink hi def link <args>
+  endif
+
+  HiLink pythonStatement        Statement
+  HiLink pythonImport           Include
+  HiLink pythonFunction         Function
+  HiLink pythonConditional      Conditional
+  HiLink pythonRepeat           Repeat
+  HiLink pythonException        Exception
+  HiLink pythonOperator         Operator
+
+  HiLink pythonDecorator        Define
+  HiLink pythonDottedName       Function
+  HiLink pythonDot              Normal
+
+  HiLink pythonComment          Comment
+  if !s:Enabled("g:python_highlight_file_headers_as_comments")
+    HiLink pythonCoding           Special
+    HiLink pythonRun              Special
+  endif
+  HiLink pythonTodo             Todo
+
+  HiLink pythonError            Error
+  HiLink pythonIndentError      Error
+  HiLink pythonSpaceError       Error
+
+  HiLink pythonString           String
+  HiLink pythonRawString        String
+
+  HiLink pythonUniEscape        Special
+  HiLink pythonUniEscapeError   Error
+
+  if s:Python2Syntax()
+    HiLink pythonUniString          String
+    HiLink pythonUniRawString       String
+    HiLink pythonUniRawEscape       Special
+    HiLink pythonUniRawEscapeError  Error
+  else
+    HiLink pythonBytes              String
+    HiLink pythonRawBytes           String
+    HiLink pythonBytesContent       String
+    HiLink pythonBytesError         Error
+    HiLink pythonBytesEscape        Special
+    HiLink pythonBytesEscapeError   Error
+  endif
+
+  HiLink pythonStrFormatting    Special
+  HiLink pythonStrFormat        Special
+  HiLink pythonStrTemplate      Special
+
+  HiLink pythonDocTest          Special
+  HiLink pythonDocTest2         Special
+
+  HiLink pythonNumber           Number
+  HiLink pythonHexNumber        Number
+  HiLink pythonOctNumber        Number
+  HiLink pythonBinNumber        Number
+  HiLink pythonFloat            Float
+  HiLink pythonNumberError      Error
+  HiLink pythonOctError         Error
+  HiLink pythonHexError         Error
+  HiLink pythonBinError         Error
+
+  HiLink pythonBoolean          Boolean
+
+  HiLink pythonBuiltinObj       Structure
+  HiLink pythonBuiltinFunc      Function
+
+  HiLink pythonExClass          Structure
+
+  delcommand HiLink
+endif
+
+let b:current_syntax = "python"
diff --git a/vim/plugins/pythonsyntax/test.py b/vim/plugins/pythonsyntax/test.py
new file mode 100644
index 0000000..df81a9a
--- /dev/null
+++ b/vim/plugins/pythonsyntax/test.py
@@ -0,0 +1,143 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# Above the run-comment and file encoding comment.
+
+# Comments.
+
+# TODO FIXME XXX
+
+# Keywords.
+
+with break continue del exec return pass print raise global assert lambda yield
+for while if elif else import from as try except finally and in is not or
+
+yield from
+
+def functionname
+class Classname
+def функция
+class Класс
+
+await
+async def Test
+async with
+async for
+
+# Builtin objects.
+
+True False Ellipsis None NotImplemented
+
+# Builtin function and types.
+
+__import__ abs all any apply basestring bool buffer callable chr classmethod
+cmp coerce compile complex delattr dict dir divmod enumerate eval execfile file
+filter float frozenset getattr globals hasattr hash help hex id input int
+intern isinstance issubclass iter len list locals long map max min object oct
+open ord pow property range raw_input reduce reload repr reversed round set
+setattr slice sorted staticmethod str sum super tuple type unichr unicode vars
+xrange zip
+
+# Builtin exceptions and warnings.
+
+BaseException Exception StandardError ArithmeticError LookupError
+EnvironmentError
+
+AssertionError AttributeError EOFError FloatingPointError GeneratorExit IOError
+ImportError IndexError KeyError KeyboardInterrupt MemoryError NameError
+NotImplementedError OSError OverflowError ReferenceError RuntimeError
+StopIteration SyntaxError IndentationError TabError SystemError SystemExit
+TypeError UnboundLocalError UnicodeError UnicodeEncodeError UnicodeDecodeError
+UnicodeTranslateError ValueError WindowsError ZeroDivisionError
+
+Warning UserWarning DeprecationWarning PendingDepricationWarning SyntaxWarning
+RuntimeWarning FutureWarning ImportWarning UnicodeWarning
+
+# Decorators.
+
+@ decoratorname
+@ object.__init__(arg1, arg2)
+@ декоратор
+@ декоратор.décorateur
+
+# Numbers
+
+0 1 2 9 10 0x1f .3 12.34 0j 0j 34.2E-3 0b10 0o77 1023434 0x0
+
+# Erroneous numbers
+
+077 100L 0xfffffffL 0L 08 0xk 0x  0b102 0o78 0o123LaB
+
+# Strings
+
+" test " ' test '
+"""
+  test
+"""
+'''
+  test
+'''
+
+" \a\b\c\"\'\n\r \x34\077 \08 \xag"
+r" \" \' "
+
+"testтест"
+
+b"test"
+
+b"test\r\n\xffff"
+
+b"тестtest"
+
+br"test"
+
+br"\a\b\n\r"
+
+# Formattings
+
+" %f "
+b" %f "
+
+"{0.name!r:b} {0[n]} {name!s:  } {{test}} {{}} {} {.__len__:s}"
+b"{0.name!r:b} {0[n]} {name!s:  } {{test}} {{}} {} {.__len__:s}"
+
+"${test} ${test ${test}aname $$$ $test+nope"
+b"${test} ${test ${test}aname $$$ $test+nope"
+
+# Doctests.
+
+"""
+    Test:
+    >>> a = 5
+    >>> a
+    5
+
+    Test
+"""
+
+'''
+    Test:
+    >>> a = 5
+    >>> a
+    5
+
+    Test
+'''
+
+# Erroneous symbols or bad variable names.
+
+$ ? 6xav
+
+&& || ===
+
+# Indentation errors.
+
+    	    break
+
+# Trailing space errors.
+
+    	
+    break	    
+"""  	
+   	 
+    test    	
+"""  	
diff --git a/vim/plugins/simpylfold/.gitattributes b/vim/plugins/simpylfold/.gitattributes
new file mode 100644
index 0000000..de2f316
--- /dev/null
+++ b/vim/plugins/simpylfold/.gitattributes
@@ -0,0 +1,2 @@
+.gitignore export-ignore
+.gitattributes export-ignore
diff --git a/vim/plugins/simpylfold/.gitignore b/vim/plugins/simpylfold/.gitignore
new file mode 100644
index 0000000..0a56e3f
--- /dev/null
+++ b/vim/plugins/simpylfold/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/vim/plugins/simpylfold/.vintrc.yaml b/vim/plugins/simpylfold/.vintrc.yaml
new file mode 100644
index 0000000..b371660
--- /dev/null
+++ b/vim/plugins/simpylfold/.vintrc.yaml
@@ -0,0 +1,3 @@
+policies:
+  ProhibitImplicitScopeVariable:
+    enabled: false
diff --git a/vim/plugins/simpylfold/AUTHORS b/vim/plugins/simpylfold/AUTHORS
new file mode 100644
index 0000000..f7bd823
--- /dev/null
+++ b/vim/plugins/simpylfold/AUTHORS
@@ -0,0 +1,9 @@
+# This is the list of SimpylFold authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder. To see the full list
+# of contributors, see the revision history in source control.
+
+Taylor Hedberg
+Google Inc.
+nfnty
diff --git a/vim/plugins/simpylfold/LICENSE b/vim/plugins/simpylfold/LICENSE
new file mode 100644
index 0000000..340bc67
--- /dev/null
+++ b/vim/plugins/simpylfold/LICENSE
@@ -0,0 +1,25 @@
+Copyright 2012-2017 the SimpylFold authors
+All rights reserved.
+
+Redistribution and use 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 Taylor M. Hedberg nor the names of other contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+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 HOLDER 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.
diff --git a/vim/plugins/simpylfold/README.md b/vim/plugins/simpylfold/README.md
new file mode 100644
index 0000000..7c06e81
--- /dev/null
+++ b/vim/plugins/simpylfold/README.md
@@ -0,0 +1,80 @@
+SimpylFold
+==========
+
+Because of its reliance on significant whitespace rather than explicit block
+delimiters, properly folding Python code can be tricky. The Python syntax
+definition that comes bundled with Vim doesn't contain any fold directives at
+all, and the simplest workaround is to `set foldmethod=indent`, which usually
+ends up folding a lot more than you really want it to.
+
+There's no shortage of Vim plugins for improved Python folding, but most seem
+to suffer from cobbled-together algorithms with bizarre, intractable bugs
+in the corner cases.  SimpylFold aims to be exactly what its name suggests:
+simple, correct folding for Python.
+
+It's nothing more than it needs to be: it properly folds class and
+function/method definitions, and leaves your loops and conditional blocks
+untouched. There's no BS involved: no screwing around with unrelated options
+(which several of the other plugins do), no choice of algorithms to scratch
+your head over (there's only one that's correct); it just works, simply.
+
+Installation
+------------
+
+Use one of the following plugin managers:
+
+* [dein](https://github.com/Shougo/dein.vim)
+* [vim-plug](https://github.com/junegunn/vim-plug)
+* [vundle](https://github.com/VundleVim/Vundle.vim)
+* [pathogen](https://github.com/tpope/vim-pathogen)
+
+Also strongly recommend using [FastFold](https://github.com/Konfekt/FastFold)
+due to Vim's folding being extremely slow by default.
+
+Configuration
+-------------
+
+No configuration is necessary. However, there are a few configurable options.
+
+### Option variables
+
+Set variable to `1` to enable or `0` to disable.
+
+For example to enable docstring preview in fold text you can add the
+following command to your `~/.config/nvim/init.vim` or `~/.vimrc`:
+```vim
+let g:SimpylFold_docstring_preview = 1
+```
+| Variable                         | Description                    | Default |
+| -------------------------------- | ------------------------------ | ------- |
+| `g:SimpylFold_docstring_preview` | Preview docstring in fold text | `0`     |
+| `g:SimpylFold_fold_docstring`    | Fold docstrings                | `1`     |
+| `b:SimpylFold_fold_docstring`    | Fold docstrings (buffer local) | `1`     |
+| `g:SimpylFold_fold_import`       | Fold imports                   | `1`     |
+| `b:SimpylFold_fold_import`       | Fold imports (buffer local)    | `1`     |
+
+### Commands
+
+There are also a few buffer local commands for fast toggling:
+
+| Command                 | Description               |
+| ----------------------- | ------------------------- |
+| `SimpylFoldDocstrings`  | Enable docstring folding  |
+| `SimpylFoldDocstrings!` | Disable docstring folding |
+| `SimpylFoldImports`     | Enable import folding     |
+| `SimpylFoldImports!`    | Disable import folding    |
+
+Usage
+-----
+
+Use Vim's built-in folding commands to expand and collapse folds.
+The most basic commands are `zc` to close a fold and `zo` to open one.
+See `:help fold-commands` for full documentation.
+
+Bugs
+----
+
+If you find any bugs, please report them and submit pull requests on GitHub!
+Simple is nice, but simple and correct is much better.
+
+Happy hacking!
diff --git a/vim/plugins/simpylfold/autoload/SimpylFold.vim b/vim/plugins/simpylfold/autoload/SimpylFold.vim
new file mode 100644
index 0000000..ec1281d
--- /dev/null
+++ b/vim/plugins/simpylfold/autoload/SimpylFold.vim
@@ -0,0 +1,389 @@
+let s:blank_re = '^\s*$'
+let s:comment_re = '^\s*#'
+let s:multi_def_end_re = ')\%(\s*->\s*\S\+[^#]*\)\?:\s*\%(#.*\)\?$'
+let s:multi_def_end_solo_re = '^\s*)\%(\s*->\s*\S\+[^#]*\)\?:\s*\%(#.*\)\?$'
+let s:docstring_re = '^\s*[bBfFrRuU]\{0,2}\\\@<!\(''''''\|"""\|[''"]\)'
+let s:string_start_re = '[bBfFrRuU]\{0,2}\\\@<!\%(''''''\|"""\|[''"]\)'
+let s:string_prefix_re = '[bBfFrRuU]\{0,2}'
+let s:line_cont_re = '\\$'
+let s:import_start_re = '^\s*\%(from\|import\)'
+let s:import_cont_re = '\%(from.*\((\)[^)]*\|.*\(\\\)\)$'
+let s:import_end_paren_re = ')\s*$'
+let s:import_end_esc_re = '[^\\]$'
+
+" Initialize buffer
+function! SimpylFold#BufferInit() abort
+    if &filetype ==# 'pyrex' || &filetype ==# 'cython'
+        let b:SimpylFold_def_re =
+            \ '\v^\s*%(%(class|%(async\s+)?def|cdef|cpdef|ctypedef)\s+\w+)|cdef\s*:'
+    else
+        let b:SimpylFold_def_re =
+            \ '\v^\s*%(class|%(async\s+)?def)\s+\w+|if\s+__name__\s*\=\=\s*%("__main__"|''__main__'')\s*:'
+    endif
+
+    if !exists('b:SimpylFold_fold_docstring')
+        let b:SimpylFold_fold_docstring =
+            \ !exists('g:SimpylFold_fold_docstring') || g:SimpylFold_fold_docstring
+    endif
+    if !exists('b:SimpylFold_fold_import')
+        let b:SimpylFold_fold_import =
+            \ !exists('g:SimpylFold_fold_import') || g:SimpylFold_fold_import
+    endif
+endfunction
+
+" Get spaces per indent setting
+function! s:indent_spaces() abort
+    if &softtabstop > 0
+        return &softtabstop
+    elseif &softtabstop < 0 && &shiftwidth > 0
+        return &shiftwidth
+    endif
+    return &tabstop
+endfunction
+
+" Calculate indent
+function! s:indent(line, ind_spaces) abort
+    let ind = matchend(a:line, '^ *') / a:ind_spaces
+    if ind == 0
+        let ind = matchend(a:line, '^\t*')
+    endif
+    " Fix indent for solo def multiline endings
+    if a:line =~# s:multi_def_end_solo_re
+        return ind + 1
+    endif
+    return ind
+endfunction
+
+function! s:defs_stack_prune(cache, defs_stack, ind) abort
+    for idx in range(len(a:defs_stack))
+        let ind_stack = a:cache[(a:defs_stack[idx])]['indent']
+        if a:ind == ind_stack
+            return a:defs_stack[(idx + 1):]
+        elseif a:ind > ind_stack
+            return a:defs_stack[(idx):]
+        endif
+    endfor
+    return []
+endfunction
+
+" Adjust previous blanks and comments
+function! s:blanks_adj(cache, lnum, foldlevel) abort
+    let lnum_prev = a:lnum - 1
+    while lnum_prev != 0 && (
+            \ a:cache[lnum_prev]['is_blank'] || (
+                \ a:cache[lnum_prev]['is_comment'] &&
+                \ a:cache[lnum_prev]['indent'] <= a:cache[(a:lnum)]['indent']
+            \ )
+        \ )
+        let a:cache[lnum_prev]['foldexpr'] = a:foldlevel
+        let lnum_prev -= 1
+    endwhile
+endfunction
+
+" Check if previous lines are blanks or comments
+function! s:are_lines_prev_blank(cache, lnum) abort
+    let lnum_prev = a:lnum - 1
+    while lnum_prev != 0
+        if !a:cache[lnum_prev]['is_blank'] && !a:cache[lnum_prev]['is_comment']
+            return 0
+        endif
+        let lnum_prev -= 1
+    endwhile
+    return 1
+endfunction
+
+" Compatibility shim
+" 1.1x slower when `matchstrpos` exists
+" 2.5x slower otherwise
+let s:exists_matchstrpos = exists('*matchstrpos')
+function! s:matchstrpos(expr, pat) abort
+    if s:exists_matchstrpos
+        return matchstrpos(a:expr, a:pat)
+    else
+        return [matchstr(a:expr, a:pat), match(a:expr, a:pat), matchend(a:expr, a:pat)]
+    endif
+endfunction
+
+" Multiline string parsing
+" Returns:
+"     - bool: In string?
+"     - bool: Single quoted?
+"     - bool: Found multiple strings?
+"     - string: End regex.
+"     - string: Everything before first match.
+function! s:multi_string(line, first_re, in_string) abort
+    " 2x performance for general case
+    if a:line !~# '[''"]'
+        return [a:in_string, 0, 0, '', '']
+    endif
+
+    let string_match = s:matchstrpos(a:line, a:first_re)
+    if string_match[1] == -1
+        return [a:in_string, 0, 0, '', '']
+    endif
+
+    " Anything before first match?
+    if string_match[1] >= 1
+        let before_first = a:line[:(string_match[1] - 1)]
+    else
+        let before_first = ''
+    endif
+
+    let in_string = a:in_string
+    let next_re = ''
+    let line_slice = a:line
+    let found_ends = 0
+    while string_match[1] != -1
+        if in_string
+            let in_string = 0
+            let found_ends += 1
+            let next_re = s:string_start_re
+        else
+            let in_string = 1
+            let quotes = string_match[0][matchend(string_match[0], s:string_prefix_re):]
+            let next_re = '\\\@<!' . quotes
+        endif
+
+        let line_slice = line_slice[(string_match[2]):]
+        if empty(line_slice)
+            break
+        endif
+        let string_match = s:matchstrpos(line_slice, next_re)
+    endwhile
+
+    if in_string
+        " Check if in single quoted string and line continues
+        let single_quoted = quotes =~# '^[''"]$'
+        if single_quoted && line_slice !~# s:line_cont_re
+            return [0, single_quoted, (found_ends >= 1), '', before_first]
+        else
+            return [1, single_quoted, (found_ends >= 1), next_re, before_first]
+        endif
+    else
+        return [0, 0, (found_ends >= 2), '', before_first]
+    endif
+endfunction
+
+" Create a new cache
+function! s:cache() abort
+    let cache = [{}]  " With padding for lnum offset
+    let lines = getbufline(bufnr('%'), 1, '$')
+    let lnum_last = len(lines)
+    call insert(lines, '')  " Padding for lnum offset
+
+    let ind_spaces = s:indent_spaces()
+
+    let defs_stack = []
+    let ind_def = -1
+    let in_string = 0
+    let docstring_start = -1
+    let in_import = 0
+    let was_import = 0
+    for lnum in range(1, lnum_last)
+        let line = lines[lnum]
+
+        " Multiline strings
+        if in_string
+            let foldlevel = len(defs_stack)
+            call add(cache, {'is_blank': 0, 'is_comment': 0, 'foldexpr': foldlevel})
+
+            let string_match = s:multi_string(line, string_end_re, 1)
+            if string_match[0]
+                " Starting new multiline string?
+                if string_match[2]
+                    let in_string_single = string_match[1]
+                    let string_end_re = string_match[3]
+                    let docstring_start = -1  " Invalid docstring
+                elseif in_string_single && line !~# s:line_cont_re
+                    let in_string = 0
+                endif
+            else
+                if docstring_start != -1
+                    let foldlevel += 1
+                    let cache[docstring_start]['foldexpr'] = '>' . foldlevel
+                    for lnum_docstring in range((docstring_start + 1), lnum)
+                        let cache[lnum_docstring]['foldexpr'] = foldlevel
+                    endfor
+                    let docstring_start = -1
+                endif
+                let in_string = 0
+            endif
+            continue
+        endif
+
+        " Blank lines
+        if line =~# s:blank_re
+            if lnum == lnum_last
+                call add(cache, {'is_blank': 1, 'is_comment': 0, 'foldexpr': 0})
+                call s:blanks_adj(cache, lnum, 0)
+            else
+                call add(cache, {'is_blank': 1, 'is_comment': 0, 'foldexpr': len(defs_stack)})
+            endif
+            continue
+        endif
+
+        let ind = s:indent(line, ind_spaces)
+
+        " Comments
+        if line =~# s:comment_re
+            call add(cache, {'is_blank': 0, 'is_comment': 1, 'indent': ind})
+            let foldlevel = 0
+            let defs_stack_len = len(defs_stack)
+            for idx in range(defs_stack_len)
+                if ind > cache[defs_stack[idx]]['indent']
+                    let foldlevel = defs_stack_len - idx
+                    break
+                endif
+            endfor
+            let cache[lnum]['foldexpr'] = foldlevel
+            call s:blanks_adj(cache, lnum, foldlevel)
+            continue
+        endif
+
+        call add(cache, {'is_blank': 0, 'is_comment': 0,
+            \            'is_def': line =~# b:SimpylFold_def_re, 'indent': ind})
+
+        " Definitions
+        if cache[lnum]['is_def']
+            if empty(defs_stack)
+                let defs_stack = [lnum]
+            elseif ind == ind_def
+                let defs_stack[0] = lnum
+            elseif ind > ind_def
+                call insert(defs_stack, lnum)
+            elseif ind < ind_def
+                let defs_stack = [lnum] + s:defs_stack_prune(cache, defs_stack, ind)
+            endif
+            let foldlevel = len(defs_stack) - 1
+            let ind_def = ind
+            call s:blanks_adj(cache, lnum, foldlevel)
+            let cache[lnum]['foldexpr'] = '>' . (foldlevel + 1)
+            continue
+        endif
+
+        " Everything else
+        if !empty(defs_stack)
+            if ind == ind_def
+                let defs_stack = defs_stack[1:]
+                let ind_def = cache[defs_stack[0]]['indent']
+            elseif ind < ind_def
+                let defs_stack = s:defs_stack_prune(cache, defs_stack, ind)
+                if !empty(defs_stack)
+                    let ind_def = cache[defs_stack[0]]['indent']
+                else
+                    let ind_def = -1
+                endif
+            endif
+        endif
+        let foldlevel = len(defs_stack)
+
+        " Multiline strings start
+        let string_match = s:multi_string(line, s:string_start_re, 0)
+        if string_match[0]
+            let in_string = 1
+            let in_string_single = string_match[1]
+            let string_end_re = string_match[3]
+
+            " Docstrings
+            if b:SimpylFold_fold_docstring && !string_match[2] && string_match[4] =~# s:blank_re
+                let lnum_prev = lnum - 1
+                if lnum == 1 || s:are_lines_prev_blank(cache, lnum) || (
+                        \ !cache[lnum_prev]['is_blank'] && !cache[lnum_prev]['is_comment'] && (
+                            \ cache[lnum_prev]['is_def'] ||
+                            \ lines[lnum_prev] =~# s:multi_def_end_re
+                        \ )
+                    \ )
+                    let docstring_start = lnum
+                endif
+            endif
+
+            let cache[lnum]['foldexpr'] = foldlevel
+            continue
+        endif
+
+        " Imports
+        if b:SimpylFold_fold_import
+            if in_import
+                if line =~# import_end_re
+                    let in_import = 0
+                endif
+
+                call s:blanks_adj(cache, lnum, foldlevel + 1)
+                let cache[lnum]['foldexpr'] = foldlevel + 1
+                continue
+            elseif match(line, s:import_start_re) != -1
+                let import_cont_match = matchlist(line, s:import_cont_re)
+                if !empty(import_cont_match)
+                    if import_cont_match[1] ==# '('
+                        let import_end_re = s:import_end_paren_re
+                        let in_import = 1
+                    elseif import_cont_match[2] ==# '\'
+                        let import_end_re = s:import_end_esc_re
+                        let in_import = 1
+                    endif
+                endif
+
+                if was_import
+                    call s:blanks_adj(cache, lnum, foldlevel + 1)
+                    let cache[lnum]['foldexpr'] = foldlevel + 1
+                else
+                    let cache[lnum]['foldexpr'] = '>' . (foldlevel + 1)
+                endif
+                let was_import = 1
+                continue
+            else
+                let was_import = 0
+            endif
+        endif
+
+        " Normal
+        call s:blanks_adj(cache, lnum, foldlevel)
+        let cache[lnum]['foldexpr'] = foldlevel
+    endfor
+
+    return cache
+endfunction
+
+" Compute foldexpr for Python code
+function! SimpylFold#FoldExpr(lnum) abort
+    if !exists('b:SimpylFold_cache')
+        let b:SimpylFold_cache = s:cache()
+    endif
+    return b:SimpylFold_cache[(a:lnum)]['foldexpr']
+endfunction
+
+" Recache the buffer
+function! SimpylFold#Recache() abort
+    if exists('b:SimpylFold_cache')
+        unlet b:SimpylFold_cache
+    endif
+endfunction
+
+" Compute foldtext by obtaining the first line of the docstring for
+" the folded class or function, if any exists
+function! SimpylFold#FoldText() abort
+    let lnum = v:foldstart
+    let line = getline(lnum)
+    let string_match = matchlist(line, s:docstring_re)
+    " Docstring folds
+    if !empty(string_match)
+        let docstring = substitute(line, s:docstring_re, '', '')
+        if docstring !~# s:blank_re
+            return ''
+        endif
+        let docstring = getline(nextnonblank(lnum + 1))
+    " Definition folds
+    else
+        let lnum = nextnonblank(lnum + 1)
+        let line = getline(lnum)
+        let string_match = matchlist(line, s:docstring_re)
+        if empty(string_match)
+            return ''
+        endif
+        let docstring = substitute(line, s:docstring_re, '', '')
+        if docstring =~# s:blank_re
+            let docstring = getline(nextnonblank(lnum + 1))
+        endif
+    endif
+    return ' ' . substitute(docstring, '^\s*\|\s*$\|' . string_match[1] . '\s*$', '', 'g')
+endfunction
diff --git a/vim/plugins/simpylfold/doc/SimpylFold.txt b/vim/plugins/simpylfold/doc/SimpylFold.txt
new file mode 100644
index 0000000..3f09557
--- /dev/null
+++ b/vim/plugins/simpylfold/doc/SimpylFold.txt
@@ -0,0 +1,69 @@
+*SimpylFold.txt* No-BS Python code folding for Vim
+
+==============================================================================
+Introduction                                                        *SimpylFold*
+
+Because of its reliance on significant whitespace rather than explicit block
+delimiters, properly folding Python code can be tricky. The Python syntax
+definition that comes bundled with Vim doesn't contain any fold directives at
+all, and the simplest workaround is to `set foldmethod=indent`, which usually
+ends up folding a lot more than you really want it to.
+
+There's no shortage of Vim plugins for improved Python folding, but most seem
+to suffer from cobbled-together algorithms with bizarre, intractable bugs
+in the corner cases.  SimpylFold aims to be exactly what its name suggests:
+simple, correct folding for Python.
+
+It's nothing more than it needs to be: it properly folds class and
+function/method definitions, and leaves your loops and conditional blocks
+untouched. There's no BS involved: no screwing around with unrelated options
+(which several of the other plugins do), no choice of algorithms to scratch
+your head over (there's only one that's correct); it just works, simply.
+
+==============================================================================
+Configuration                                         *SimpylFold-configuration*
+
+No configuration is necessary. However, there are a few configurable options.
+
+Option variables
+----------------
+
+Set variable to `1` to enable or `0` to disable.
+
+For example to enable docstring preview in fold text you can add the
+following command to your `~/.config/nvim/init.vim` or `~/.vimrc`: >
+
+    let g:SimpylFold_docstring_preview = 1
+<
+| Variable                        | Description                    | Default |
+| ------------------------------- | ------------------------------ | ------- |
+| `g:SimpylFold_docstring_preview`  | Preview docstring in fold text | `0`       |
+| `g:SimpylFold_fold_docstring`     | Fold docstrings                | `1`       |
+| `b:SimpylFold_fold_docstring`     | Fold docstrings (buffer local) | `1`       |
+| `g:SimpylFold_fold_import`        | Fold imports                   | `1`       |
+| `b:SimpylFold_fold_import`        | Fold imports (buffer local)    | `1`       |
+
+Commands
+--------
+
+There are also a few buffer local commands for fast toggling:
+
+| Command                 | Description               |
+| ----------------------- | ------------------------- |
+| `SimpylFoldDocstrings`    | Enable docstring folding  |
+| `SimpylFoldDocstrings!`   | Disable docstring folding |
+| `SimpylFoldImports`       | Enable import folding     |
+| `SimpylFoldImports!`      | Disable import folding    |
+
+==============================================================================
+Usage                                                         *SimpylFold-usage*
+
+Use Vim's built-in folding commands to expand and collapse folds.
+The most basic commands are `zc` to close a fold and `zo` to open one.
+See `:help fold-commands` for full documentation.
+
+==============================================================================
+Bugs                                                           *SimpylFold-bugs*
+
+If you find any bugs, please report them and submit pull requests on GitHub!
+Simple is nice, but simple and correct is much better.
diff --git a/vim/plugins/simpylfold/ftplugin/cython b/vim/plugins/simpylfold/ftplugin/cython
new file mode 120000
index 0000000..d8654aa
--- /dev/null
+++ b/vim/plugins/simpylfold/ftplugin/cython
@@ -0,0 +1 @@
+python
\ No newline at end of file
diff --git a/vim/plugins/simpylfold/ftplugin/python/SimpylFold.vim b/vim/plugins/simpylfold/ftplugin/python/SimpylFold.vim
new file mode 100644
index 0000000..f8882c5
--- /dev/null
+++ b/vim/plugins/simpylfold/ftplugin/python/SimpylFold.vim
@@ -0,0 +1,16 @@
+if exists('b:loaded_SimpylFold')
+    finish
+endif
+let b:loaded_SimpylFold = 1
+
+call SimpylFold#BufferInit()
+setlocal foldexpr=SimpylFold#FoldExpr(v:lnum)
+setlocal foldmethod=expr
+
+augroup SimpylFold
+    autocmd TextChanged,InsertLeave <buffer> call SimpylFold#Recache()
+augroup END
+
+if exists('g:SimpylFold_docstring_preview') && g:SimpylFold_docstring_preview
+    setlocal foldtext=foldtext()\ .\ SimpylFold#FoldText()
+endif
diff --git a/vim/plugins/simpylfold/plugin/SimpylFold.vim b/vim/plugins/simpylfold/plugin/SimpylFold.vim
new file mode 100644
index 0000000..35cda77
--- /dev/null
+++ b/vim/plugins/simpylfold/plugin/SimpylFold.vim
@@ -0,0 +1,7 @@
+if exists('g:loaded_SimpylFold')
+    finish
+endif
+let g:loaded_SimpylFold = 1
+
+command! -bang SimpylFoldDocstrings let b:SimpylFold_fold_docstring = <bang>1 | call SimpylFold#Recache()
+command! -bang SimpylFoldImports let b:SimpylFold_fold_import = <bang>1 | call SimpylFold#Recache()
diff --git a/vim/plugins/singlecompile/.editorconfig b/vim/plugins/singlecompile/.editorconfig
new file mode 100644
index 0000000..0d23a5a
--- /dev/null
+++ b/vim/plugins/singlecompile/.editorconfig
@@ -0,0 +1,9 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
diff --git a/vim/plugins/singlecompile/COPYING b/vim/plugins/singlecompile/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/vim/plugins/singlecompile/COPYING
@@ -0,0 +1,674 @@
+                    GNU 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.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/vim/plugins/singlecompile/README.rst b/vim/plugins/singlecompile/README.rst
new file mode 100644
index 0000000..804df10
--- /dev/null
+++ b/vim/plugins/singlecompile/README.rst
@@ -0,0 +1,4 @@
+Please visit the `project homepage`_ or `Vim Online`_ for more information.
+
+.. _project homepage: http://singlecompile.topbug.net
+.. _Vim Online: http://www.vim.org/scripts/script.php?script_id=3115
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile.vim b/vim/plugins/singlecompile/autoload/SingleCompile.vim
new file mode 100644
index 0000000..ba6d3ab
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile.vim
@@ -0,0 +1,1657 @@
+" Copyright (C) 2010-2015 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" File: autoload/SingleCompile.vim
+" Version: 2.11.0
+" check doc/SingleCompile.txt for more information
+
+
+let s:saved_cpo = &cpo
+set cpo&vim
+
+
+" varibles {{{1
+" the dict to store the compiler template
+let s:CompilerTemplate = {}
+
+" is template initialize
+let s:Initialized = 0
+
+" Chars to escape for ':lcd' command
+if has('win32')
+    let s:CharsEscape = '" '
+else
+    let s:CharsEscape = '" \'
+endif
+
+" executable suffix
+if has('win32')
+    let s:ExecutableSuffix = '.exe'
+else
+    let s:ExecutableSuffix = ''
+endif
+
+function! SingleCompile#GetExecutableSuffix()
+    return s:ExecutableSuffix
+endfunction
+
+" seperator in the environment varibles
+if has('win32')
+    let s:EnvSeperator = ';'
+else
+    let s:EnvSeperator = ':'
+endif
+
+if has('win32')
+    let s:PathSeperator = '\'
+else
+    let s:PathSeperator = '/'
+endif
+
+" the path of file where the output running result is stored
+let s:run_result_tempfile = ''
+
+
+
+function! SingleCompile#GetVersion() " get the script version {{{1
+    " Before 2.9.3, the return value is: major * 100 + minor * 10 + subminor
+    " For example, 2.9.2 is corresponding to 292
+    " From 2.10.0, the return value is: major * 1000 + minor * 10 + subminor
+    " For example, 2.10.1 is corresponding to 2101
+    return 2110
+endfunction
+
+" util {{{1
+function! SingleCompile#GetDefaultOpenCommand() " {{{2
+" Get the default open command. It is "open" on Windows and Mac OS X,
+" "xdg-open" on Linux and other UNIX systems.
+    if has('win32')
+        return 'start'
+    elseif has('macunix')
+        return 'open'
+    elseif has('unix')
+        return 'xdg-open'
+    else
+        return 'open' " We guess 'open' for any other systems
+    endif
+endfunction
+
+function! s:GetCurrentShell() " {{{2
+" Get the name of the current shell according to &shell for UNIX. For example,
+" if &shell is '/bin/sh', the return value would be 'sh'.
+    if has('unix')
+        return strpart(&shell, strridx(&shell, '/') + 1)
+    endif
+endfunction
+
+function! s:IsShellSh(shell_name) " is the shell Bourne shell? {{2
+    if a:shell_name =~ '^sh' ||
+                \a:shell_name =~ '^bash' ||
+                \a:shell_name =~ '^ksh' ||
+                \a:shell_name =~ '^mksh' ||
+                \a:shell_name =~ '^pdksh' ||
+                \a:shell_name =~ '^zsh'
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+function! s:IsShellCsh(shell_name) " is the shell C Shell? {{2
+    if a:shell_name =~ '^csh' || a:shell_name =~ '^tcsh'
+        return 1
+    else
+        return 0
+    endif
+endfunction
+
+function! s:IsShellFish(shell_name) " is the shell FISH shell {{2
+    return a:shell_name =~ '^fish'
+endfunction
+
+function! s:GetShellLastExitCodeVariable() " {{{2
+    " Get the variable that presents the exit code of last command.
+
+    if has('unix')
+
+        let l:cur_shell = s:GetCurrentShell()
+
+        if s:IsShellCsh(l:cur_shell) || s:IsShellFish(l:cur_shell)
+            return '$status'
+        elseif s:IsShellSh(l:cur_shell)
+            return '$?'
+        else
+            return ''
+        endif
+
+    elseif has('win32')
+        return '$?'
+    endif
+
+endfunction
+
+function! s:GetShellPipe(tee_used) " {{{2
+    " get the shell pipe command according to it's platform. If a:tee_used is
+    " set to nonzero, then the shell pipe contains "tee", otherwise "tee"
+    " wouldn't be contained in the return value.
+
+    if has('unix')
+
+        let l:cur_shell = s:GetCurrentShell()
+
+        if s:IsShellCsh(l:cur_shell)
+            if a:tee_used
+                return '|& tee'
+            else
+                return '>&'
+            endif
+        elseif s:IsShellSh(l:cur_shell) || s:IsShellFish(l:cur_shell)
+            if a:tee_used
+                return '2>&1| tee'
+            else
+                return '>%s 2>&1'
+            endif
+        else
+            if a:tee_used
+                return '| tee'
+            else
+                return '>'
+            endif
+        endif
+    elseif has('win32')
+        if executable('tee') && a:tee_used && g:SingleCompile_usetee
+            return '2>&1 | tee'
+        else
+            return '>%s 2>&1'
+        endif
+    endif
+
+endfunction
+function! s:Expand(str, ...) " expand the string{{{2
+    " the second argument is optional. If it is given and it is zero, then
+    " we thought we don't need any quote; otherwise, we use double quotes on
+    " Windows and single quotes on all other systems.
+
+    let l:quote_needed = 1
+    if a:0 > 1
+        call s:ShowMessage('s:Expand argument error.')
+        return ''
+    elseif a:0 == 1
+        if !a:1
+            let l:quote_needed = 0
+        endif
+    endif
+
+    let l:rep_dict = {
+                \'\$(FILE_NAME)\$': '%',
+                \'\$(FILE_PATH)\$': '%:p',
+                \'\$(FILE_TITLE)\$': '%:r',
+                \'\$(FILE_EXEC)\$': '%:p:r',
+                \'\$(FILE_RUN)\$': '%:p:r'}
+    let l:rep_dict_prefix = {
+                \'\$(FILE_NAME)\$': '',
+                \'\$(FILE_PATH)\$': '',
+                \'\$(FILE_TITLE)\$': '',
+                \'\$(FILE_EXEC)\$': '',
+                \'\$(FILE_RUN)\$': ''}
+    let l:rep_dict_suffix = {
+                \'\$(FILE_NAME)\$': '',
+                \'\$(FILE_PATH)\$': '',
+                \'\$(FILE_TITLE)\$': '',
+                \'\$(FILE_EXEC)\$': '',
+                \'\$(FILE_RUN)\$': ''}
+
+    if has('win32')
+        let l:rep_dict_prefix['\$(FILE_RUN)\$'] = ''
+        let l:rep_dict_suffix['\$(FILE_EXEC)\$'] = '.exe'
+        let l:rep_dict_suffix['\$(FILE_RUN)\$'] = '.exe'
+    elseif has('unix')
+        let l:rep_dict_prefix['\$(FILE_RUN)\$'] = './'
+        let l:rep_dict_suffix['\$(FILE_EXEC)\$'] = ''
+        let l:rep_dict_suffix['\$(FILE_RUN)\$'] = ''
+    endif
+
+
+    let l:str = a:str
+    for one_key in keys(l:rep_dict)
+        let l:rep_string = l:rep_dict_prefix[one_key] .
+                    \ expand(l:rep_dict[one_key]) .
+                    \ l:rep_dict_suffix[one_key]
+
+        " on win32, replace the backslash with '/'
+        if has('win32')
+            let l:rep_string = substitute(l:rep_string, '/', '\\', 'g')
+        endif
+
+        let l:rep_string = escape(l:rep_string, '\')
+        if l:quote_needed && match(l:rep_string, ' ') != -1
+
+            if has('win32')
+                let l:rep_string = '"'.l:rep_string.'"'
+            else
+                let l:rep_string = "'".l:rep_string."'"
+            endif
+
+        endif
+        let l:str = substitute(l:str, one_key, l:rep_string, 'g')
+    endfor
+
+    return l:str
+endfunction
+
+function! s:RunAsyncWithMessage(run_cmd) " {{{2
+    " run a command and display messages that we need to
+
+    let l:async_run_res = SingleCompileAsync#Run(a:run_cmd)
+
+    if l:async_run_res != 0
+        call s:ShowMessage(
+                    \"Fail to run the command '".
+                    \a:run_cmd."'. Error code: ".l:async_run_res)
+
+        if l:async_run_res == 1
+            call s:ShowMessage(
+                        \'There is already an existing process '.
+                        \'running in background.')
+        endif
+
+        return 1
+    endif
+
+    return 0
+endfunction
+
+function! s:PushEnvironmentVaribles() " {{{2
+    " push environment varibles into stack. Win32 only.
+
+    if !exists('s:environment_varibles_list') ||
+                \ type(s:environment_varibles_list) != type([])
+        unlet! s:environment_varibles_list
+        let s:environment_varibles_list = []
+    endif
+
+    let l:environment_varibles_dic = {}
+
+    let l:environment_varibles_string = system('set')
+
+    for line in split(l:environment_varibles_string, '\n')
+
+        " find the '=' first. The left part is environment varible's name, the
+        " right part is the value
+        let l:eq_pos = match(line, '=')
+        if l:eq_pos == -1
+            continue
+        endif
+
+        let l:key = strpart(line, 0, l:eq_pos)
+        let l:val = strpart(line, l:eq_pos + 1)
+
+        let l:environment_varibles_dic[l:key] = l:val
+    endfor
+
+    call add(s:environment_varibles_list, l:environment_varibles_dic)
+endfunction
+
+function! s:PopEnvironmentVaribles() " {{{2
+    " pop environment varibles out of the stack. Win32 only.
+
+    if !exists('s:environment_varibles_list') ||
+                \ type(s:environment_varibles_list) != type([]) ||
+                \ empty(s:environment_varibles_list)
+        return 0
+    endif
+
+    let l:environment_varibles_dic = remove(
+                \ s:environment_varibles_list,
+                \ len(s:environment_varibles_list) - 1)
+
+    for l:key in keys(l:environment_varibles_dic)
+        silent! exec 'let $' . l:key . "='" .
+                    \ substitute(l:environment_varibles_dic[l:key],
+                    \ "'", "''", 'g') . "'"
+    endfor
+endfunction
+
+" pre-do functions {{{1
+
+function! s:AddLmIfMathH(compiling_info) " {{{2
+    " add -lm flag if math.h is included
+
+    " if we find '#include <math.h>' in the file, then add '-lm' flag
+    if match(getline(1, '$'), '^[ \t]*#[ \t]*include[ \t]*["<]math.h[">][ \t]*$')
+                \!= -1
+        let l:new_comp_info = a:compiling_info
+        let l:new_comp_info['args'] = l:new_comp_info['args'] . ' -lm'
+        return l:new_comp_info
+    endif
+
+    return a:compiling_info
+endfunction
+
+function! SingleCompile#PredoWatcom(compiling_info) " watcom pre-do {{{2
+    let s:old_path = $PATH
+    let $PATH = $WATCOM.s:PathSeperator.'binnt'.s:EnvSeperator.
+                \$WATCOM.s:PathSeperator.'binw'.s:EnvSeperator.
+                \$PATH
+    return a:compiling_info
+endfunction
+
+function! SingleCompile#PredoGcc(compiling_info) " gcc pre-do {{{2
+    if has('unix')
+        return s:AddLmIfMathH(a:compiling_info)
+    else
+        return a:compiling_info
+    endif
+endfunction
+
+function! SingleCompile#PredoSolStudioC(compiling_info) " solaris studio C/C++ pre-do {{{2
+    return s:AddLmIfMathH(a:compiling_info)
+endfunction
+
+function! SingleCompile#PredoClang(compiling_info) " clang Predo {{{2
+    if has('unix')
+        return s:AddLmIfMathH(a:compiling_info)
+    else
+        return a:compiling_info
+    endif
+endfunction
+
+function! SingleCompile#PredoMicrosoftVC(compiling_info) " MSVC Predo {{{2
+
+    call s:PushEnvironmentVaribles()
+
+    " to get the result environment varibles, we need to write a temp batch
+    " file and call it.
+    let l:tmpbat = tempname() . '.bat'
+    call writefile(['@echo off', 'call "%VS'.
+                \str2nr(strpart(a:compiling_info['command'], 2)).
+                \'COMNTOOLS%..\..\VC\vcvarsall.bat"', 'set'], l:tmpbat)
+    let l:environment_varibles_string = system(l:tmpbat)
+
+    " Set the environment varibles
+    for l:line in split(l:environment_varibles_string, '\n')
+        let l:eq_pos = match(l:line, '=')
+
+        if l:eq_pos == -1
+            continue
+        endif
+
+        silent! exec 'let $' . strpart(l:line, 0, l:eq_pos) . "='" .
+                    \ substitute(strpart(l:line, l:eq_pos + 1),
+                    \ "'", "''", 'g') . "'"
+    endfor
+
+    let l:new_compiling_info = a:compiling_info
+    let l:new_compiling_info['command'] = 'cl'
+
+    return l:new_compiling_info
+endfunction
+
+function! SingleCompile#PredoShell(compiling_info) " shell predo {{{2
+    let l:new_compiling_info = a:compiling_info
+
+    let l:shebang = getline(1)
+    if l:shebang !~ '#!/.*' " don't change anything if no shebang is found
+        return a:compiling_info
+    endif
+
+    " Use the shell indicated by the shebang
+    let l:new_compiling_info['command'] = matchstr(l:shebang, '#!\zs/.*')
+
+    return l:new_compiling_info
+endfunction
+
+" post-do functions {{{1
+function! SingleCompile#PostdoWatcom(compiling_info) " watcom pre-do {{{2
+    let $PATH = s:old_path
+    return a:compiling_info
+endfunction
+
+function! SingleCompile#PostdoMicrosoftVC(not_used_arg) " MSVC post-do {{{2
+    call s:PopEnvironmentVaribles()
+endfunction
+
+" compiler detect functions {{{1
+function! s:DetectCompilerGenerally(compiling_command) " {{{2
+    " the general function of compiler detection. The principle is to search
+    " the environment varible PATH and some special directory
+
+    if has('unix')
+        let l:list_to_detect = [s:Expand(expand(a:compiling_command)),
+                    \s:Expand(expand('~/bin/'.a:compiling_command)),
+                    \s:Expand(expand('/usr/local/bin/'.a:compiling_command)),
+                    \s:Expand(expand('/usr/bin/'.a:compiling_command)),
+                    \s:Expand(expand('/bin/'.a:compiling_command))
+                    \]
+    else
+        let l:list_to_detect = [s:Expand(expand(a:compiling_command))]
+    endif
+
+    for cmd in l:list_to_detect
+        if executable(cmd) == 1
+            return cmd
+        endif
+    endfor
+
+    return 0
+endfunction
+
+function! SingleCompile#DetectCompilerGenerally(compiling_command)
+    return s:DetectCompilerGenerally(a:compiling_command)
+endfunction
+
+function! SingleCompile#DetectWatcom(compiling_command) " {{{2
+    let l:watcom_command =
+                \s:DetectCompilerGenerally(a:compiling_command)
+    if l:watcom_command != 0
+        return l:watcom_command
+    endif
+
+    if $WATCOM != ''
+        return $WATCOM.'\binnt\'.a:compiling_command
+    endif
+endfunction
+
+function! SingleCompile#DetectMicrosoftVC(compiling_command) " {{{2
+    " the compiling_command should be cl_vcversion, such as cl80, cl100, etc.
+
+    " return 0 if not starting with 'cl'
+    if strpart(a:compiling_command, 0, 2) != 'cl'
+        return 0
+    endif
+
+    " get the version of vc
+    let l:vc_version = strpart(a:compiling_command, 2)
+
+    " if we have VSXXCOMNTOOLS environment variable, and
+    " %VSXXCOMNTOOLS%\..\..\VC\BIN\cl.exe is executable, and
+    " %VSXXCOMNTOOLS%\..\..\VC\vcvarsall.bat is executable, MSVC is detected
+    exec 'let l:vs_common_tools = $VS'.l:vc_version.'COMNTOOLS'
+
+    if !empty(l:vs_common_tools) &&
+                \ executable(l:vs_common_tools.'..\..\VC\BIN\cl.exe') &&
+                \ executable(l:vs_common_tools.'..\..\VC\vcvarsall.bat')
+        return a:compiling_command
+    else
+        return 0
+    endif
+endfunction
+
+function! SingleCompile#DetectIe(not_used_arg) " {{{2
+    if executable('iexplore')
+        return 'iexplore'
+    endif
+
+    if has('win32')
+        let iepath = $PROGRAMFILES . '\Internet Explorer\iexplore.exe'
+        if executable(iepath)
+            return "\"".iepath."\""
+        endif
+    endif
+endfunction
+
+function! s:Initialize() "{{{1
+
+    if s:Initialized == 0
+        let s:Initialized = 1
+    else
+        return
+    endif
+
+    if !exists('g:SingleCompile_alwayscompile') ||
+                \type(g:SingleCompile_alwayscompile) != type(0)
+        unlet! g:SingleCompile_alwayscompile
+        let g:SingleCompile_alwayscompile = 1
+    endif
+
+    if !exists('g:SingleCompile_asyncrunmode') ||
+                \type(g:SingleCompile_asyncrunmode) != type('')
+        unlet! g:SingleCompile_asyncrunmode
+        let g:SingleCompile_asyncrunmode = 'auto'
+    endif
+
+    if !exists('g:SingleCompile_autowrite') ||
+                \type(g:SingleCompile_autowrite) != type(0)
+        unlet! g:SingleCompile_autowrite
+        let g:SingleCompile_autowrite = 1
+    endif
+
+    if !exists('g:SingleCompile_quickfixwindowposition') ||
+                \type(g:SingleCompile_quickfixwindowposition) != type('')
+        unlet! g:SingleCompile_quickfixwindowposition
+        let g:SingleCompile_quickfixwindowposition = 'botright'
+    end
+
+    if !exists('g:SingleCompile_resultsize') ||
+                \type(g:SingleCompile_resultsize) != type(0) ||
+                \g:SingleCompile_resultsize <= 0
+        unlet! g:SingleCompile_resultsize
+        let g:SingleCompile_resultsize = 5
+    endif
+
+    if !exists('g:SingleCompile_split')
+        let g:SingleCompile_split = 'split'
+    endif
+
+    if !exists('g:SingleCompile_showquickfixiferror') ||
+                \type(g:SingleCompile_showquickfixiferror) != type(0)
+        unlet! g:SingleCompile_showquickfixiferror
+        let g:SingleCompile_showquickfixiferror = 0
+    endif
+
+    if !exists('g:SingleCompile_showquickfixifwarning') ||
+                \type(g:SingleCompile_showquickfixifwarning) != type(0)
+        unlet! g:SingleCompile_showquickfixifwarning
+        let g:SingleCompile_showquickfixifwarning =
+                    \g:SingleCompile_showquickfixiferror
+    endif
+
+    if !exists('g:SingleCompile_showresultafterrun') ||
+                \type(g:SingleCompile_showresultafterrun) != type(0)
+        unlet! g:SingleCompile_showresultafterrun
+        let g:SingleCompile_showresultafterrun = 0
+    endif
+
+    if !exists('g:SingleCompile_usedialog') ||
+                \type(g:SingleCompile_usedialog) != type(0)
+        unlet! g:SingleCompile_usedialog
+        let g:SingleCompile_usedialog = 0
+    endif
+
+    if !exists('g:SingleCompile_usequickfix') ||
+                \type(g:SingleCompile_usequickfix) != type(0)
+        unlet! g:SingleCompile_usequickfix
+        let g:SingleCompile_usequickfix = 1
+    endif
+
+    if !exists('g:SingleCompile_usetee') ||
+                \type(g:SingleCompile_usetee) != type(0)
+        unlet! g:SingleCompile_usetee
+        let g:SingleCompile_usetee = 1
+    endif
+
+    if !exists('g:SingleCompile_silentcompileifshowquickfix') ||
+                \type(g:SingleCompile_silentcompileifshowquickfix) != type(0)
+        unlet! g:SingleCompile_silentcompileifshowquickfix
+        let g:SingleCompile_silentcompileifshowquickfix = 0
+    endif
+
+    " Initialize async mode
+    if g:SingleCompile_asyncrunmode !=? 'none'
+        let l:async_init_res = SingleCompileAsync#Initialize(
+                    \g:SingleCompile_asyncrunmode)
+
+        if type(l:async_init_res) == type('')
+            call s:ShowMessage(
+                        \"Failed to initialize the async mode '".
+                        \g:SingleCompile_asyncrunmode."'.\n".l:async_init_res)
+        elseif l:async_init_res == 3
+            call s:ShowMessage("The specified async mode '".
+                        \g:SingleCompile_asyncrunmode."' doesn't exist.")
+        elseif l:async_init_res != 0
+            call s:ShowMessage(
+                        \"Failed to initialize the async mode'".
+                        \g:SingleCompile_asyncrunmode."'.")
+        endif
+    endif
+
+    " terminate the background process before existing vim
+    if has('autocmd')
+        autocmd VimLeave * call SingleCompileAsync#Terminate()
+    endif
+
+    " initialize builtin templates
+    if has('win32')
+        let g:SingleCompile_common_run_command = '$(FILE_TITLE)$.exe'
+        let g:SingleCompile_common_out_file = '$(FILE_TITLE)$.exe'
+    else
+        let g:SingleCompile_common_run_command = './$(FILE_TITLE)$'
+        let g:SingleCompile_common_out_file = '$(FILE_TITLE)$'
+    endif
+
+    for builtin_filetype in [
+                \ 'ada',
+                \ 'bash',
+                \ 'c',
+                \ 'cmake',
+                \ 'cpp',
+                \ 'coffee',
+                \ 'cs',
+                \ 'csh',
+                \ 'd',
+                \ 'dosbatch',
+                \ 'elixir',
+                \ 'erlang',
+                \ 'fortran',
+                \ 'go',
+                \ 'haskell',
+                \ 'html',
+                \ 'idlang',
+                \ 'java',
+                \ 'javascript',
+                \ 'ksh',
+                \ 'lisp',
+                \ 'ls',
+                \ 'lua',
+                \ 'make',
+                \ 'markdown',
+                \ 'matlab',
+                \ 'ocaml',
+                \ 'objc',
+                \ 'pascal',
+                \ 'perl',
+                \ 'php',
+                \ 'python',
+                \ 'qml',
+                \ 'r',
+                \ 'rst',
+                \ 'ruby',
+                \ 'rust',
+                \ 'scala',
+                \ 'sh',
+                \ 'tcl',
+                \ 'tcsh',
+                \ 'tex',
+                \ 'vb',
+                \ 'vim',
+                \ 'xhtml',
+                \ 'zsh']
+        exec 'call SingleCompile#templates#' .
+                    \ builtin_filetype . '#Initialize()'
+    endfor
+endfunction
+
+function! s:SetVimCompiler(lang_name, compiler) " {{{1
+    " call the :compiler command
+
+    let l:dict_compiler = s:CompilerTemplate[a:lang_name][a:compiler]
+    if has_key(l:dict_compiler, 'vim-compiler')
+        silent! exec 'compiler '.l:dict_compiler['vim-compiler']
+    else
+        silent! exec 'compiler '.a:compiler
+    endif
+endfunction
+
+function! s:SetGlobalVimCompiler(lang_name, compiler) " {{{1
+    "call the :compiler! command
+
+    let l:dict_compiler = s:CompilerTemplate[a:lang_name][a:compiler]
+    if has_key(l:dict_compiler, 'vim-compiler')
+        silent! exec 'compiler! '.l:dict_compiler['vim-compiler']
+    else
+        silent! exec 'compiler! '.a:compiler
+    endif
+endfunction
+
+" SingleCompile#SetCompilerTemplate {{{1
+function! SingleCompile#SetCompilerTemplate(lang_name, compiler,
+            \compiler_name, detect_func_arg, flags, run_command, ...)
+    " set compiler's template, including compiler, compiler's name, the
+    " detecting function argument, compilation flags, run command and
+    " a compiler detecting function which is optional.
+
+    call s:Initialize()
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, 'name',
+                \a:compiler_name)
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler,
+                \'detect_func_arg', a:detect_func_arg)
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, 'flags',
+                \a:flags)
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, 'run',
+                \a:run_command)
+    if a:0 == 0
+        call SingleCompile#SetDetectFunc(a:lang_name, a:compiler,
+                    \function("s:DetectCompilerGenerally"))
+    else
+        call SingleCompile#SetDetectFunc(a:lang_name, a:compiler, a:1)
+    endif
+endfunction
+
+" function! SingleCompile#SetCompilerTemplateByDict {{{1
+function! SingleCompile#SetCompilerTemplateByDict(
+            \lang_name, compiler, template_dict)
+    " set templates by using a dict(template_dict), thus calling the template
+    " settings functions below one by one is not needed.
+
+    let l:key_list = ['name', 'detect_func_arg', 'flags', 'run',
+                \'detect_func', 'pre-do', 'priority', 'post-do', 'out-file',
+                \'vim-compiler']
+
+    for key in l:key_list
+        if has_key(a:template_dict, key)
+            call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, key,
+                        \get(a:template_dict, key))
+        endif
+    endfor
+endfunction
+
+" extra template settings functions {{{1
+function! SingleCompile#SetDetectFunc(lang_name, compiler, detect_func) " {{{2
+    " set the detect_func function
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, 'detect_func',
+                \a:detect_func)
+endfunction
+
+function! SingleCompile#SetPredo(lang_name, compiler, predo_func) " {{{2
+    " set the pre-do function
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler, 'pre-do',
+                \a:predo_func)
+endfunction
+
+function! SingleCompile#SetPostdo(lang_name, compiler, postdo_func) " {{{2
+    " set the post-do function
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler,
+                \'post-do', a:postdo_func)
+endfunction
+
+function! SingleCompile#SetOutfile(lang_name, compiler, outfile) " {{{2
+    " set out-file
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler,
+                \'out-file', a:outfile)
+endfunction
+
+fun! SingleCompile#SetVimCompiler(lang_name, compiler, vim_compiler) " {{{2
+    " set vim-compiler
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler,
+                \'vim-compiler', a:vim_compiler)
+endfunction
+
+function! SingleCompile#SetPriority(lang_name, compiler, priority) " {{{2
+    " set priority
+
+    call s:SetCompilerSingleTemplate(a:lang_name, a:compiler,
+                \ 'priority', a:priority)
+endfunction
+
+function! s:GetCompilerSingleTemplate(lang_name, compiler_name, key) " {{{1
+    return s:CompilerTemplate[a:lang_name][a:compiler_name][a:key]
+endfunction
+
+" SetCompilerSingleTemplate {{{1
+fun! s:SetCompilerSingleTemplate(lang_name, compiler, key, value, ...)
+    " set the template. if the '...' is nonzero, this function will not
+    " override the corresponding template if there is an existing template
+
+    " Set the default template first so that we could let this override the
+    " default compile template.
+    call s:Initialize()
+
+    if a:0 > 1
+        call s:ShowMessage(
+                    \'Too many argument for'.
+                    \' SingleCompile#SetCompilerSingleTemplate function!')
+        return
+    endif
+
+    " if the key a:lang_name does not exist, create it
+    if !has_key(s:CompilerTemplate,a:lang_name)
+        let s:CompilerTemplate[a:lang_name] = {}
+    elseif type(s:CompilerTemplate[a:lang_name]) != type({})
+        unlet! s:CompilerTemplate[a:lang_name]
+        let s:CompilerTemplate[a:lang_name] = {}
+    endif
+
+    " if a:compiler does not exist, create it
+    if !has_key(s:CompilerTemplate[a:lang_name],a:compiler)
+        let s:CompilerTemplate[a:lang_name][a:compiler] = {}
+    elseif type(s:CompilerTemplate[a:lang_name][a:compiler]) != type({})
+        unlet! s:CompilerTemplate[a:lang_name][a:compiler]
+        let s:CompilerTemplate[a:lang_name][a:compiler] = {}
+    endif
+
+    " if a:key does not exist, create it
+    " if the ... from the argument is 0 or the additional argument does
+    " not exist, also override the original one
+    if !has_key(s:CompilerTemplate[a:lang_name][a:compiler], a:key) ||
+                \a:0 == 0 || a:1 == 0
+        let s:CompilerTemplate[a:lang_name][a:compiler][a:key] = a:value
+    endif
+endfunction
+
+function! SingleCompile#SetTemplate(lang_name, stype, string,...) " {{{1
+    " set the template. if the '...' is nonzero, this function will not
+    " override the corresponding template if there is an existing template
+
+    if a:0 > 1
+        call s:ShowMessage('Too many argument for '.
+                    \'SingleCompile#SetTemplate function')
+        return
+    endif
+
+    if a:0 == 0 || a:1 == 0
+        let l:override = 0
+    else
+        let l:override = 1
+    endif
+
+    if a:stype == 'command'
+        let l:stype = 'detect_func_arg'
+    else
+        let l:stype = a:stype
+    endif
+
+    " Set the name any way
+    call s:SetCompilerSingleTemplate(a:lang_name,
+                \'user_defined_compiler_using_old_style_function',
+                \'name', 'user_defined_compiler_using_old_style_function', 1)
+
+    let l:compiler_dict = s:CompilerTemplate[a:lang_name][
+                \ 'user_defined_compiler_using_old_style_function']
+
+    " Use general detect_func
+    if !has_key(l:compiler_dict, 'detect_func')
+        call SingleCompile#SetDetectFunc(a:lang_name,
+                    \'user_defined_compiler_using_old_style_function',
+                    \function("s:DetectCompilerGenerally"))
+    endif
+
+    " Set the template we want to set
+    call s:SetCompilerSingleTemplate(a:lang_name,
+                \'user_defined_compiler_using_old_style_function',
+                \l:stype, a:string, l:override)
+
+    if has_key(l:compiler_dict, 'name') &&
+                \ has_key(l:compiler_dict, 'detect_func') &&
+                \ has_key(l:compiler_dict, 'detect_func_arg') &&
+                \ has_key(l:compiler_dict, 'flags') &&
+                \ has_key(l:compiler_dict, 'run')
+        call SingleCompile#ChooseCompiler(a:lang_name,
+                    \ 'user_defined_compiler_using_old_style_function')
+    endif
+endfunction
+
+
+function! s:ShowMessage(message) "{{{1
+
+    if g:SingleCompile_usedialog == 0 || !((has('gui_running') &&
+                \has('dialog_gui')) || has('dialog_con'))
+        echohl Error | echo 'SingleCompile: '.a:message | echohl None
+    else
+        call confirm('SingleCompile: '.a:message)
+    endif
+
+endfunction
+
+function! s:IsLanguageInterpreting(filetype_name) "{{{1
+    "tell if a language is an interpreting language, reutrn 1 if yes, 0 if no
+
+    let l:chosen_compiler =
+                \s:CompilerTemplate[a:filetype_name]['chosen_compiler']
+    return (!has_key(
+                \s:CompilerTemplate[a:filetype_name][l:chosen_compiler],
+                \'run')
+                \ || substitute(
+                \s:CompilerTemplate[a:filetype_name][l:chosen_compiler]
+                \['run'],
+                \' ', '', "g") == '')
+endfunction
+
+function! s:ShouldQuickfixBeUsed() " tell whether quickfix sould be used{{{1
+    if g:SingleCompile_usequickfix == 0
+                \ || !has('quickfix')
+                \ || ( s:IsLanguageInterpreting(&filetype) && !has('unix') )
+        return 0
+    else
+        return 1
+    endif
+endfunction
+
+function! SingleCompile#Compile(...) " compile synchronously {{{1
+    return s:CompileInternal(a:000, 0)
+endfunction
+
+function! SingleCompile#CompileAsync(...) " compile asynchronously {{{1
+    return s:CompileInternal(a:000, 1)
+endfunction
+
+function! s:CompileInternal(arg_list, async) " compile only {{{1
+    " Return 0 for compiling language successfully compiled;
+    " Return 1 for compiling language failed to be compiled;
+    " Return 2 for interpreting language successfully run;
+    " Return 3 for interpreting language failed to be run.
+
+    call s:Initialize()
+    let l:toret = 0
+
+    " whether we should run asynchronously if we are working with an
+    " interpreting language
+    let l:async = a:async && !empty(SingleCompileAsync#GetMode())
+    if !l:async && executable('tee') && g:SingleCompile_usetee
+                \ && g:SingleCompile_showresultafterrun == 1
+        let l:show_result_after_run = 1
+    else
+        let l:show_result_after_run = 0
+    endif
+
+    " save current file type. Don't use &filetype directly because after
+    " 'make' and quickfix is working and the error is in another file,
+    " sometimes the value of &filetype may be incorrect.
+    let l:cur_filetype = &filetype
+
+    " Save the filetype to a script variable so it can be used by s:Run()
+    let s:cur_filetype = l:cur_filetype
+
+    " if current filetype is an empty string, show an error message and
+    " return.
+    if l:cur_filetype == ''
+        call s:ShowMessage(
+                    \"Current buffer's filetype is not specified. ".
+                    \"Use \" :help 'filetype' \" command to see more details".
+                    \" if you don't know what filetype is.")
+        return -1
+    endif
+
+    " Check whether the language template is available
+    if !(has_key(s:CompilerTemplate, l:cur_filetype) &&
+                \type(s:CompilerTemplate[l:cur_filetype]) == type({}))
+        call s:ShowMessage('Language template for "'.
+                    \l:cur_filetype.'" is not defined on your system.')
+        return -1
+    endif
+
+    " if current buffer has no name (for example the buffer has never been
+    " saved), don't compile
+    if bufname('%') == ''
+        call s:ShowMessage(
+                    \'Current buffer does not have a file name. '.
+                    \'Please save current buffer first. '.
+                    \'Compilation canceled.')
+        return -1
+    endif
+
+
+    " if autowrite is set and the buffer has been modified, then save
+    if g:SingleCompile_autowrite != 0 && &modified != 0
+        write
+    endif
+
+    " detect compilers
+    if !has_key(s:CompilerTemplate[l:cur_filetype], 'chosen_compiler')
+        let l:detected_compilers = s:DetectCompiler(l:cur_filetype)
+        " if l:detected_compilers is empty, then no compiler is detected
+        if empty(l:detected_compilers)
+            call s:ShowMessage(
+                        \'No compiler is detected on your system!')
+            return -1
+        endif
+
+        let s:CompilerTemplate[l:cur_filetype]['chosen_compiler'] =
+                    \get(l:detected_compilers, 0)
+    endif
+    let l:chosen_compiler =
+                \s:CompilerTemplate[l:cur_filetype]['chosen_compiler']
+    let l:compile_cmd = s:GetCompilerSingleTemplate(
+                \l:cur_filetype, l:chosen_compiler, 'command')
+
+    " save current working directory
+    let l:cwd = getcwd()
+    " switch current work directory to the file's directory
+    silent lcd %:p:h
+
+    " If current language is not interpreting language, check the last
+    " modification time of the file, whose name is the value of the 'out-file'
+    " key. If the last modification time of that file is earlier than the last
+    " modification time of current buffer's file, don't compile.
+    if !g:SingleCompile_alwayscompile
+                \&& !s:IsLanguageInterpreting(l:cur_filetype)
+                \&& has_key(
+                \s:CompilerTemplate[l:cur_filetype][l:chosen_compiler],
+                \'out-file')
+                \&& getftime(s:Expand(
+                \s:CompilerTemplate[l:cur_filetype][l:chosen_compiler]
+                \['out-file'], 0))
+                \> getftime(expand('%:p'))
+        " switch back to the original directory
+        exec 'lcd '.escape(l:cwd, s:CharsEscape)
+        echo 'SingleCompile: '.
+                    \'No need to compile. '.
+                    \'No modification is detected.'
+        return 0
+    endif
+
+    if len(a:arg_list) == 1
+        " if there is only one argument, it means use this argument as the
+        " compilation flag
+
+        let l:compile_flags = a:arg_list[0]
+    elseif len(a:arg_list) == 2 && has_key(
+                \s:CompilerTemplate[l:cur_filetype][
+                \s:CompilerTemplate[l:cur_filetype]['chosen_compiler']],
+                \'flags')
+        " if there are two arguments, it means append the provided argument to
+        " the flag defined in the template
+
+        let l:compile_flags = s:GetCompilerSingleTemplate(l:cur_filetype,
+                    \s:CompilerTemplate[l:cur_filetype]['chosen_compiler'],
+                    \'flags').' '.a:arg_list[1]
+    elseif len(a:arg_list) == 0 && has_key(
+                \s:CompilerTemplate[l:cur_filetype][
+                \s:CompilerTemplate[l:cur_filetype]['chosen_compiler']],
+                \'flags')
+        let l:compile_flags = s:GetCompilerSingleTemplate(l:cur_filetype,
+                    \s:CompilerTemplate[l:cur_filetype]['chosen_compiler'],
+                    \'flags')
+    else
+        " if len(a:arg_list) is zero and 'flags' is not defined, assign '' to
+        " let l:compile_flags
+
+        let l:compile_flags = ''
+    endif
+
+
+    if match(l:compile_flags, '\$(FILE_PATH)\$') == -1 &&
+                \match(l:compile_flags, '\$(FILE_NAME)\$') == -1
+        let l:compile_flags = l:compile_flags.' $(FILE_PATH)$'
+    endif
+    let l:compile_args = s:Expand(l:compile_flags)
+
+    " call the pre-do function if set
+    if has_key(s:CompilerTemplate[l:cur_filetype][l:chosen_compiler],
+                \ 'pre-do')
+        let l:command_dic =
+                    \s:CompilerTemplate[l:cur_filetype][l:chosen_compiler][
+                    \'pre-do'](
+                    \{ 'command': l:compile_cmd,
+                    \'args': l:compile_args})
+        let l:compile_cmd = l:command_dic['command']
+        let l:compile_args = l:command_dic['args']
+    endif
+
+
+
+    if s:ShouldQuickfixBeUsed() == 0
+        " if quickfix is not enabled for this plugin or the language is an
+        " interpreting language not in unix, then don't use quickfix
+
+        if l:async && s:IsLanguageInterpreting(l:cur_filetype)
+
+            call s:RunAsyncWithMessage(l:compile_cmd.' '.l:compile_args)
+        else
+            exec '!'.l:compile_cmd.' '.l:compile_args
+
+            " check whether compiling is successful, if not, show the return value
+            " with error message highlighting and set the return value to 1
+            if v:shell_error != 0
+                echo ' '
+                call s:ShowMessage('Error! Return value is '.v:shell_error)
+                if s:IsLanguageInterpreting(l:cur_filetype)
+                    let l:toret = 3
+                else
+                    let l:toret = 1
+                endif
+            endif
+        endif
+
+    elseif has('unix') && s:IsLanguageInterpreting(l:cur_filetype)
+        " use quickfix for interpreting language in unix
+
+        if l:async
+            " run the interpreter asynchronously
+
+            call s:RunAsyncWithMessage(l:compile_cmd.' '.l:compile_args)
+        else
+            " save old values of makeprg and errorformat which :compiler!
+            " command may change
+            let l:old_makeprg = &g:makeprg
+            let l:old_errorformat = &g:errorformat
+
+            " call :compiler! command to set vim compiler. We use :compiler!
+            " but not :compiler because cgetexpr command uses global option
+            " value of errorformat
+            call s:SetGlobalVimCompiler(l:cur_filetype, l:chosen_compiler)
+
+            let l:exit_code_tempfile = tempname()
+            let s:run_result_tempfile = tempname()
+            " The output is put into s:run_result_tempfile, and exit code is
+            " written into l:exit_code_tempfile. The command should be
+            " something like this on bash:
+            "   !(compiler_cmd compile_args; echo $? >tmp1) | tee tmp2
+            exec (l:show_result_after_run ? 'silent ' : '').
+                        \ '!('.l:compile_cmd.' '.l:compile_args.'; '.
+                        \ 'echo '.s:GetShellLastExitCodeVariable().' >'.
+                        \ l:exit_code_tempfile.') '.s:GetShellPipe(1).' '.
+                        \ s:run_result_tempfile
+
+            " if the exit code couldn't be obtained or the exit code is not 0,
+            " l:toret is set to 3 (this return value is for interpreting
+            " language only, means interpreting failed)
+            let l:exit_code_str = readfile(l:exit_code_tempfile)
+            if (len(l:exit_code_str) < 1) ||
+                        \ (len(l:exit_code_str) >= 1 &&
+                        \ str2nr(l:exit_code_str[0]))
+                echo ' '
+                call s:ShowMessage(
+                            \ 'Interpreter exit code is '.l:exit_code_str[0])
+
+                let l:toret = 3
+            endif
+
+            cgetexpr readfile(s:run_result_tempfile)
+
+            " recover the old makeprg and errorformat value
+            let &g:makeprg = l:old_makeprg
+            let &g:errorformat = l:old_errorformat
+        endif
+
+    else " use quickfix for compiling language
+
+        " change the makeprg and shellpipe temporarily
+        let l:old_makeprg = &l:makeprg
+        let l:old_shellpipe = &l:shellpipe
+        let l:old_errorformat = &l:errorformat
+
+        " call :compiler command to set vim compiler
+        call s:SetVimCompiler(l:cur_filetype, l:chosen_compiler)
+
+        let &l:makeprg = l:compile_cmd
+        let &l:shellpipe = s:GetShellPipe(0)
+        let l:prefix_args = ''
+        let l:silentcompile = g:SingleCompile_silentcompileifshowquickfix &&
+                    \ g:SingleCompile_showquickfixiferror &&
+                    \ has("gui_running")
+
+        if l:silentcompile
+            let l:prefix_args = 'silent '
+        endif
+        exec l:prefix_args.'make'.' '.l:compile_args
+
+        " check whether compiling is successful, if not, show the return value
+        " with error message highlighting and set the return value to 1
+        if v:shell_error != 0
+            if !l:silentcompile
+                echo ' '
+                call s:ShowMessage(
+                            \ 'Compiler exit code is '.v:shell_error)
+            endif
+            let l:toret = 1
+        endif
+
+        " set back makeprg and shellpipe
+        let &l:makeprg = l:old_makeprg
+        let &l:shellpipe = l:old_shellpipe
+        let &l:errorformat = l:old_errorformat
+    endif
+
+    " if it's interpreting language, and l:toret has not been set, then return
+    " 2 (means do not call run if user uses SCCompileRun command
+    if l:toret == 0 && s:IsLanguageInterpreting(l:cur_filetype)
+        let l:toret = 2
+    endif
+
+    " call the post-do function if set
+    if has_key(s:CompilerTemplate[l:cur_filetype][l:chosen_compiler],
+                \'post-do')
+        let l:TmpFunc = s:CompilerTemplate[l:cur_filetype][l:chosen_compiler][
+                    \'post-do']
+        call l:TmpFunc({'command': l:compile_cmd, 'args': l:compile_args})
+    endif
+
+
+    " switch back to the original directory
+    exec 'lcd '.escape(l:cwd, s:CharsEscape)
+
+    " show the quickfix window if error occurs, quickfix is used and
+    " g:SingleCompile_showquickfixiferror is set to nonzero
+    if g:SingleCompile_showquickfixiferror && s:ShouldQuickfixBeUsed()
+        " We have error
+        if l:toret == 1 || l:toret == 3
+            " workaround when the compiler file is broken
+            exec g:SingleCompile_quickfixwindowposition . ' cope'
+        " We may have warning
+        elseif g:SingleCompile_showquickfixifwarning
+            exec g:SingleCompile_quickfixwindowposition . ' cw'
+        endif
+    endif
+
+    " if we are running an interpreting language source file, and we want to
+    " show the result window right after the run, and we are not running it
+    " asynchronously, then we show or hide the result
+    if l:show_result_after_run
+        if l:toret == 2
+            call SingleCompile#ViewResult(0)
+            redraw!
+        elseif l:toret == 1 || l:toret == 3
+            call SingleCompile#CloseViewResult()
+        endif
+    endif
+
+    return l:toret
+endfunction
+
+function! s:CompareCompilerPriority(compiler1, compiler2) " {{{1
+    " Compare the priorities of two compiler. The lang_name is determinted by
+    " s:lang_name_compare_compiler_priority (if it is presented) or &filetype
+
+    if exists('s:lang_name_compare_compiler_priority')
+        let l:lang_name = s:lang_name_compare_compiler_priority
+    else
+        let l:lang_name = &filetype
+    endif
+
+    if has_key(s:CompilerTemplate[l:lang_name][a:compiler1], 'priority')
+        let l:compiler1_priority =
+                    \ s:CompilerTemplate[l:lang_name][a:compiler1]['priority']
+    else
+        let l:compiler1_priority = 100
+    endif
+
+    if has_key(s:CompilerTemplate[l:lang_name][a:compiler2], 'priority')
+        let l:compiler2_priority =
+                    \ s:CompilerTemplate[l:lang_name][a:compiler2]['priority']
+    else
+        let l:compiler2_priority = 100
+    endif
+
+    return l:compiler1_priority == l:compiler2_priority ? 0 : (
+                \ l:compiler1_priority > l:compiler2_priority ? 1 : -1)
+endfunction
+
+function! s:DetectCompiler(lang_name) " {{{1
+    " to detect compilers for one language. Return available compilers sorted
+    " by priority
+
+    let l:toret = []
+
+    " call the compiler detection function to get the compilation command
+    for some_compiler in keys(s:CompilerTemplate[a:lang_name])
+        if some_compiler == 'chosen_compiler'
+            continue
+        endif
+
+        " ignore this compiler if things are not all available (name,
+        " detect_func, detect_func_arg, flags, run)
+        let l:compiler_dict = s:CompilerTemplate[a:lang_name][some_compiler]
+        if !(has_key(l:compiler_dict, 'name') &&
+                    \ has_key(l:compiler_dict, 'detect_func') &&
+                    \ has_key(l:compiler_dict, 'detect_func_arg') &&
+                    \ has_key(l:compiler_dict, 'flags') &&
+                    \ has_key(l:compiler_dict, 'run'))
+            continue
+        endif
+
+        let l:DetectFunc = s:CompilerTemplate[a:lang_name][some_compiler][
+                    \'detect_func']
+
+        call s:SetCompilerSingleTemplate(
+                    \a:lang_name,
+                    \some_compiler,
+                    \'command',
+                    \l:DetectFunc(
+                    \s:CompilerTemplate[a:lang_name][some_compiler][
+                    \'detect_func_arg']))
+
+        " if the type of s:CompilerTemplate[&filetype]['command'] returned
+        " by the detection function is not a string, then we may think
+        " that this compiler cannot be detected
+        if type(s:CompilerTemplate[a:lang_name][some_compiler]['command']) ==
+                    \type('')
+            call add(l:toret, some_compiler)
+        endif
+    endfor
+
+    " sort detected compilers by priority
+    let s:lang_name_compare_compiler_priority = a:lang_name
+    call sort(l:toret, 's:CompareCompilerPriority')
+
+    return l:toret
+endfunction
+
+function! s:Run(async) " {{{1
+    " if async is non-zero, then run asynchronously
+
+    " Get the current filetype. We do not use &filetype because quickfix may
+    " open another file automatically, which may cause the filetype changed to
+    " an incorrect value.
+    let l:cur_filetype = s:cur_filetype
+
+    let l:ret_val = 0
+
+    call s:Initialize()
+
+    " whether we should use async mode
+    let l:async = a:async && !empty(SingleCompileAsync#GetMode())
+    if !l:async && executable('tee') && g:SingleCompile_usetee
+                \ && g:SingleCompile_showresultafterrun == 1
+        let l:show_result_after_run = 1
+    else
+        let l:show_result_after_run = 0
+    endif
+
+    if !(has_key(s:CompilerTemplate[l:cur_filetype][
+                \s:CompilerTemplate[l:cur_filetype]['chosen_compiler']],
+                \'run'))
+        call s:ShowMessage('Fail to run!')
+        return 1
+    endif
+
+    " save current working directory
+    let l:cwd = getcwd()
+    silent lcd %:p:h
+
+    let l:run_cmd = s:Expand(s:GetCompilerSingleTemplate(l:cur_filetype,
+                \ s:CompilerTemplate[l:cur_filetype]['chosen_compiler'],
+                \ 'run'), 1)
+
+    if l:async
+        let l:ret_val = s:RunAsyncWithMessage(l:run_cmd)
+    else
+        if executable('tee') && g:SingleCompile_usetee
+            " if tee is available, and we enabled the use of "tee", then
+            " redirect the result to a temp file
+
+            let s:run_result_tempfile = tempname()
+            let l:run_cmd = l:run_cmd.
+                        \' '.s:GetShellPipe(1).' '.s:run_result_tempfile
+        endif
+
+        try
+            exec (l:show_result_after_run ? 'silent ' : '').'!'.l:run_cmd
+        catch
+            call s:ShowMessage('Failed to execute "'.l:run_cmd.'"')
+        endtry
+    endif
+
+    " switch back to the original directory
+    exec 'lcd '.escape(l:cwd, s:CharsEscape)
+
+    " if tee is available, and we are running synchronously, and we want to
+    " show the result window right after the run, then we call
+    " SingleCompile#ViewResult
+    if l:show_result_after_run
+        call SingleCompile#ViewResult(0)
+        redraw!
+    endif
+
+    return l:ret_val
+endfunction
+
+function! s:CompileRunInternal(comp_param, async) " {{{1
+
+    " save the current path, thus if quickfix switches to another file, we can
+    " still switch back to execute future code correctly
+    let l:cur_filepath = expand('%:p')
+
+    " if async run is not available, give an error message and stop here.
+    if a:async && empty(SingleCompileAsync#GetMode())
+        call s:ShowMessage('Async mode is not available for your vim.')
+        return
+    endif
+
+    " call different functions according to a:async
+    if a:async
+        let l:CompileFunc = function('SingleCompile#CompileAsync')
+    else
+        let l:CompileFunc = function('SingleCompile#Compile')
+    endif
+
+    if len(a:comp_param) == 1
+        let l:compile_result = l:CompileFunc(a:comp_param[0])
+    elseif len(a:comp_param) == 2
+        let l:compile_result = l:CompileFunc(
+                    \a:comp_param[0], a:comp_param[1])
+    else
+        let l:compile_result = l:CompileFunc()
+    endif
+
+    if l:compile_result != 0
+        return
+    endif
+
+
+
+    let l:cur_filepath2 = expand('%:p')
+
+    if l:cur_filepath != l:cur_filepath2
+        exec 'edit ' . l:cur_filepath
+    endif
+
+    " run the command and display the following messages only when the process
+    " is successfully run.
+    if !s:Run(a:async) && a:async
+        echo 'SingleCompile: Now the program is running in background.'
+        echo 'SingleCompile: you could use :SCViewResultAsync to see the '
+                    \.'output if the program has terminated.'
+    endif
+
+    if l:cur_filepath != l:cur_filepath2
+        exec 'edit ' . l:cur_filepath2
+    endif
+endfunction
+
+function! SingleCompile#CompileRun(...) " compile and run {{{1
+    call s:CompileRunInternal(a:000, 0)
+endfunction
+
+function! SingleCompile#CompileRunAsync(...) " {{{1
+    " compile and run asynchronously
+
+    call s:CompileRunInternal(a:000, 1)
+endfunction
+
+fun! SingleCompile#ChooseCompiler(lang_name, ...) " choose a compiler {{{1
+
+    call s:Initialize()
+
+    if a:0 > 1
+        call s:ShowMessage(
+                    \'Too many argument for SingleCompile#ChooseCompiler!')
+        return
+    endif
+
+    if a:0 == 1 " a:0 == 1 means the user has specified a compiler to choose
+        if type(a:1) != type('')
+            call s:ShowMessage(
+                        \'SingleCompile#ChooseCompiler argument error')
+            return
+        endif
+
+        " If the current language template is set, then we check whether it is
+        " available on the system; If not, then an error message is given.  If
+        " the current language template is not set, then we give an error
+        " message directly.
+        if has_key(s:CompilerTemplate, a:lang_name) &&
+                    \has_key(s:CompilerTemplate[a:lang_name], a:1)
+            " current language template is set
+
+            let l:detected_compilers = s:DetectCompiler(a:lang_name)
+
+            if count(l:detected_compilers, a:1) == 0
+                " if a:1 is not a detected compiler
+
+                call s:ShowMessage('"'.
+                            \a:1.'" is not available on your system.')
+                return
+            endif
+
+            let s:CompilerTemplate[a:lang_name]['chosen_compiler'] = a:1
+        else
+            " current language template is not set
+            call s:ShowMessage(
+                        \'The template of the compiler/interpreter "'.
+                        \a:1.'" is not set.')
+        endif
+
+        return
+    endif
+
+    " when no argument is provided, list all available compilers and
+    " interpreters for user to choose
+    if a:0 == 0
+
+        " if the language template is not defined for this language, show an
+        " error message then return
+        if !has_key(s:CompilerTemplate, a:lang_name)
+            call s:ShowMessage('Language template for "'.
+                        \a:lang_name.'" is not defined on your system.')
+            return
+        endif
+
+        let l:detected_compilers = s:DetectCompiler(a:lang_name)
+        " used to store the detected compilers
+        let l:choose_list = []
+        " used to filled with compiler names to be displayed in front of user
+        let l:choose_list_display = []
+
+        let l:count = 1
+
+        if !has_key(s:CompilerTemplate[a:lang_name], 'chosen_compiler')
+            let s:CompilerTemplate[a:lang_name]['chosen_compiler'] =
+                        \ get(l:detected_compilers, 0)
+        endif
+
+        for some_compiler in sort(keys(s:CompilerTemplate[a:lang_name]))
+            if some_compiler == 'chosen_compiler'
+                continue
+            endif
+
+            if count(l:detected_compilers, some_compiler) > 0
+                " if the compiler is detected, then add it to the choose_list,
+                " which would be displayed then
+
+                call add(l:choose_list, some_compiler)
+                call add(l:choose_list_display,
+                            \l:count.'. '.some_compiler.'('.
+                            \s:CompilerTemplate[a:lang_name][some_compiler][
+                            \'name'].
+                            \')')
+                let l:count += 1
+            endif
+        endfor
+
+        " if l:choose_list is empty, it means no compiler is available for
+        " this language
+        if empty(l:choose_list)
+            call s:ShowMessage(
+                        \'No compiler is available for this language!')
+            return
+        endif
+
+        " display current compiler/interpreter
+        echo "Current Compiler/Interpreter: " .
+                    \ s:CompilerTemplate[a:lang_name]['chosen_compiler']
+
+        let l:user_choose = inputlist( extend(['Detected compilers: '],
+                    \l:choose_list_display) )
+
+        " If user cancels the choosing, then return directly; if user chooses
+        " a number which is too big, then echo an empty line first and then
+        " show an error message, then return
+        if l:user_choose <= 0
+            return
+        elseif l:user_choose > len(l:choose_list_display)
+            echo ' '
+            call s:ShowMessage(
+                        \'The number you have chosen is invalid.')
+            return
+        endif
+
+        let s:CompilerTemplate[a:lang_name]['chosen_compiler'] =
+                    \get(l:choose_list, l:user_choose-1)
+
+        return
+    endif
+endfunction
+
+function! SingleCompile#ViewResult(async) " view the running result {{{1
+    " split a window below and put the result there
+
+    " don't show result if s:run_result_tempfile is empty for synchronous run
+    " result and the mode hasn't been set or the process is still running in
+    " background
+    if (!a:async && empty(s:run_result_tempfile))
+                \|| (a:async
+                \&& (empty(SingleCompileAsync#GetMode())
+                \|| SingleCompileAsync#IsRunning()))
+        return
+    endif
+
+    " if the async output cannot be obtained, give an error message and return
+    " directly
+    if a:async
+        let l:async_out = SingleCompileAsync#GetOutput()
+        if type(l:async_out) == type(0)
+            call s:ShowMessage(
+                        \'Failed to get the output of the '.
+                        \'process running asynchronously.')
+            return
+        endif
+    endif
+
+    call s:Initialize()
+
+    let l:result_bufnr = bufnr('__SINGLE_COMPILE_RUN_RESULT__')
+
+    " if the __SINGLE_COMPILE_RUN_RESULT__ buffer doesn't exist, make one
+    " else clear it, but leave it there to be refilled
+    if l:result_bufnr == -1
+        exec 'keepalt rightbelow '.g:SingleCompile_resultsize.
+                    \g:SingleCompile_split.' __SINGLE_COMPILE_RUN_RESULT__'
+        setl noswapfile buftype=nofile bufhidden=wipe foldcolumn=0 nobuflisted
+    else
+        let l:result_bufwinnr = bufwinnr(l:result_bufnr)
+        exec l:result_bufwinnr.'wincmd w'
+        let l:save_cursor = getpos(".")
+        setl modifiable
+        normal! ggdG
+        setl nomodifiable
+    endif
+
+
+    setl modifiable
+    if a:async
+        call append(0, l:async_out)
+    else
+        call append(0, readfile(s:run_result_tempfile))
+    endif
+    nnoremap <buffer> q :q<CR>
+    setl nomodifiable
+
+    if l:result_bufnr != -1
+        call setpos('.', l:save_cursor)
+    endif
+
+    exec 'wincmd p'
+endfunction
+
+function! SingleCompile#CloseViewResult() " close the last result {{{1
+    let l:result_bufnr = bufnr('__SINGLE_COMPILE_RUN_RESULT__')
+    if l:result_bufnr != -1
+        exec bufwinnr(l:result_bufnr).'wincmd w'
+        if l:result_bufnr == bufnr('%') " if we got there
+            quit
+        endif
+    endif
+endfunction
+
+call s:Initialize() " {{{1 call the initialize function
+
+
+
+" }}}
+
+
+let &cpo = s:saved_cpo
+unlet! s:saved_cpo
+
+" vim703: cc=78
+" vim: fdm=marker et ts=4 tw=78 sw=4 fdc=3
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/ada.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ada.vim
new file mode 100644
index 0000000..6dc4bb2
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ada.vim
@@ -0,0 +1,27 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#ada#Initialize()
+    call SingleCompile#SetCompilerTemplate('ada', 'gnat', 'GNAT', 'gnat',
+                \'make', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('ada', 'gnat', g:SingleCompile_common_out_file)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/bash.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/bash.vim
new file mode 100644
index 0000000..6bad5f9
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/bash.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#bash#Initialize()
+    call SingleCompile#SetCompilerTemplate('bash', 'bash',
+                \'Bourne-Again Shell', 'bash', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/c.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/c.vim
new file mode 100644
index 0000000..0b17339
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/c.vim
@@ -0,0 +1,141 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#c#Initialize()
+    call SingleCompile#SetCompilerTemplate('c', 'open-watcom',
+                \'Open Watcom C/C++32 Compiler', 'wcl386', '',
+                \g:SingleCompile_common_run_command, function('SingleCompile#DetectWatcom'))
+    call SingleCompile#SetCompilerTemplateByDict('c', 'open-watcom', {
+                \ 'pre-do'  : function('SingleCompile#PredoWatcom'),
+                \ 'post-do' : function('SingleCompile#PostdoWatcom'),
+                \ 'out-file': g:SingleCompile_common_out_file
+                \})
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('c', 'msvc',
+                    \'Microsoft Visual C++ (In PATH)', 'cl',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('c', 'msvc', g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('c', 'msvc80',
+                    \ 'Microsoft Visual C++ 2005 (8.0)', 'cl80',
+                    \ '-o $(FILE_TITLE)$', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('c', 'msvc80', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 15,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('c', 'msvc90',
+                    \ 'Microsoft Visual C++ 2008 (9.0)', 'cl90',
+                    \ ' ', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('c', 'msvc90', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 14,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('c', 'msvc100',
+                    \ 'Microsoft Visual C++ 2010 (10.0)', 'cl100',
+                    \ ' ', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('c', 'msvc100', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 13,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('c', 'msvc110',
+                    \ 'Microsoft Visual C++ 2012 (11.0)', 'cl110',
+                    \ ' ', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('c', 'msvc110', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 12,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('c', 'bcc',
+                    \'Borland C++ Builder', 'bcc32',
+                    \'-o$(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('c', 'bcc', g:SingleCompile_common_out_file)
+    endif
+    call SingleCompile#SetCompilerTemplate('c', 'gcc', 'GNU C Compiler',
+                \'gcc', '-g -o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetCompilerTemplateByDict('c', 'gcc', {
+                \ 'pre-do'  : function('SingleCompile#PredoGcc'),
+                \ 'priority' : 20,
+                \ 'out-file': g:SingleCompile_common_out_file
+                \})
+    call SingleCompile#SetCompilerTemplate('c', 'icc',
+                \'Intel C++ Compiler', 'icc', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('c', 'icc', g:SingleCompile_common_out_file)
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('c', 'lcc',
+                    \'Little C Compiler', 'lc',
+                    \'$(FILE_TITLE)$ -o "$(FILE_TITLE)$.exe"',
+                    \g:SingleCompile_common_run_command)
+    else
+        call SingleCompile#SetCompilerTemplate('c', 'lcc',
+                    \'Little C Compiler', 'lc',
+                    \'$(FILE_TITLE)$ -o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+    endif
+    call SingleCompile#SetOutfile('c', 'lcc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('c', 'pcc',
+                \'Portable C Compiler', 'pcc', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('c', 'pcc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('c', 'tcc', 'Tiny C Compiler',
+                \'tcc', '-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('c', 'tcc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('c', 'tcc-run',
+                \'Tiny C Compiler with "-run" Flag', 'tcc', '-run', '')
+    call SingleCompile#SetPriority('c', 'tcc-run', 140)
+    call SingleCompile#SetCompilerTemplate('c', 'ch',
+                \'SoftIntegration Ch', 'ch', '', '')
+    call SingleCompile#SetPriority('c', 'ch', 130)
+    call SingleCompile#SetCompilerTemplate('c', 'clang',
+                \ 'the Clang C and Objective-C compiler', 'clang',
+                \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetCompilerTemplateByDict('c', 'clang', {
+                \ 'pre-do'  : function('SingleCompile#PredoClang'),
+                \ 'out-file': g:SingleCompile_common_out_file
+                \})
+    if has('unix')
+        call SingleCompile#SetCompilerTemplate('c', 'cc',
+                    \'UNIX C Compiler', 'cc', '-o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('c', 'cc', g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('c', 'sol-studio',
+                    \'Sun C Compiler (Sun Solaris Studio)', 'suncc',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetCompilerTemplateByDict('c', 'sol-studio', {
+                    \ 'pre-do'  : function('SingleCompile#PredoSolStudioC'),
+                    \ 'out-file': g:SingleCompile_common_out_file
+                    \})
+        call SingleCompile#SetCompilerTemplate('c', 'open64',
+                    \'Open64 C Compiler', 'opencc', '-o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/cmake.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cmake.vim
new file mode 100644
index 0000000..242bcd1
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cmake.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#cmake#Initialize()
+    call SingleCompile#SetCompilerTemplate('cmake', 'cmake', 'cmake',
+                \'cmake', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/coffee.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/coffee.vim
new file mode 100644
index 0000000..cb1680f
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/coffee.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2013 Rack Lin
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#coffee#Initialize()
+    call SingleCompile#SetCompilerTemplate('coffee', 'coffee',
+                \'CoffeeScript', 'coffee', '-c $(FILE_NAME)$', 'coffee $(FILE_NAME)$')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/cpp.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cpp.vim
new file mode 100644
index 0000000..d61ef14
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cpp.vim
@@ -0,0 +1,120 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#cpp#Initialize()
+    call SingleCompile#SetCompilerTemplate('cpp', 'open-watcom',
+                \'Open Watcom C/C++32 Compiler',
+                \ 'wcl386', '', g:SingleCompile_common_run_command,
+                \ function('SingleCompile#DetectWatcom'))
+    call SingleCompile#SetCompilerTemplateByDict('cpp', 'open-watcom', {
+                \ 'pre-do'  : function('SingleCompile#PredoWatcom'),
+                \ 'post-do' : function('SingleCompile#PostdoWatcom'),
+                \ 'out-file': g:SingleCompile_common_out_file
+                \})
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('cpp', 'msvc',
+                    \'Microsoft Visual C++ (In PATH)', 'cl',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('cpp', 'msvc', g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('cpp', 'msvc80',
+                    \ 'Microsoft Visual C++ 2005 (8.0)', 'cl80',
+                    \ '-o $(FILE_TITLE)$', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('cpp', 'msvc80', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 15,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('cpp', 'msvc90',
+                    \ 'Microsoft Visual C++ 2008 (9.0)', 'cl90',
+                    \ '/EHsc', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('cpp', 'msvc90', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 14,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('cpp', 'msvc100',
+                    \ 'Microsoft Visual C++ 2010 (10.0)', 'cl100',
+                    \ '/EHsc', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('cpp', 'msvc100', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 13,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('cpp', 'msvc110',
+                    \ 'Microsoft Visual C++ 2012 (11.0)', 'cl110',
+                    \ '/EHsc', g:SingleCompile_common_run_command,
+                    \ function('SingleCompile#DetectMicrosoftVC'))
+        call SingleCompile#SetCompilerTemplateByDict('cpp', 'msvc110', {
+                    \ 'pre-do' : function('SingleCompile#PredoMicrosoftVC'),
+                    \ 'post-do' : function('SingleCompile#PostdoMicrosoftVC'),
+                    \ 'out-file' : g:SingleCompile_common_out_file,
+                    \ 'priority' : 12,
+                    \ 'vim-compiler' : 'msvc'})
+        call SingleCompile#SetCompilerTemplate('cpp', 'bcc',
+                    \'Borland C++ Builder','bcc32', '-o$(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('cpp', 'bcc', g:SingleCompile_common_out_file)
+    endif
+    call SingleCompile#SetCompilerTemplate('cpp', 'g++',
+                \'GNU C++ Compiler', 'g++', '-g -o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetCompilerTemplateByDict('cpp', 'g++', {
+                \ 'pre-do'  : function('SingleCompile#PredoGcc'),
+                \ 'out-file': g:SingleCompile_common_out_file,
+                \ 'priority' : 20,
+                \ 'vim-compiler': 'gcc'
+                \})
+    call SingleCompile#SetCompilerTemplate('cpp', 'icc',
+                \'Intel C++ Compiler', 'icc', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('cpp', 'icc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('cpp', 'ch',
+                \'SoftIntegration Ch', 'ch', '', '')
+    call SingleCompile#SetPriority('cpp', 'ch', 130)
+    call SingleCompile#SetCompilerTemplate('cpp', 'clang',
+                \ 'the Clang C and Objective-C compiler',
+                \'clang++', '-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetCompilerTemplateByDict('cpp', 'clang', {
+                \ 'pre-do'  : function('SingleCompile#PredoClang'),
+                \ 'out-file': g:SingleCompile_common_out_file,
+                \ 'vim-compiler': 'clang'
+                \})
+    if has('unix')
+        call SingleCompile#SetCompilerTemplate('cpp', 'sol-studio',
+                    \'Sun C++ Compiler (Sun Solaris Studio)', 'sunCC',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetCompilerTemplateByDict('cpp', 'sol-studio',{
+                    \ 'pre-do'  : function('SingleCompile#PredoSolStudioC'),
+                    \ 'out-file': g:SingleCompile_common_out_file
+                    \})
+        call SingleCompile#SetCompilerTemplate('cpp', 'open64',
+                    \'Open64 C++ Compiler', 'openCC',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('cpp', 'open64', g:SingleCompile_common_out_file)
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/cs.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cs.vim
new file mode 100644
index 0000000..0bdc1c9
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/cs.vim
@@ -0,0 +1,39 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#cs#Initialize()
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('cs', 'msvcs',
+                    \'Microsoft Visual C#', 'csc', '',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('cs', 'msvcs',
+                    \g:SingleCompile_common_out_file)
+        call SingleCompile#SetPriority('cs', 'msvcs', 50)
+        call SingleCompile#SetVimCompiler('cs', 'msvcs', 'cs')
+    endif
+    call SingleCompile#SetCompilerTemplate('cs', 'mono',
+                \'Mono C# compiler', 'mcs', '',
+                \'mono $(FILE_TITLE)$'.'.exe')
+    call SingleCompile#SetOutfile('cs', 'mono',
+                \'$(FILE_TITLE)$'.'.exe')
+    call SingleCompile#SetVimCompiler('cs', 'mono', 'mcs')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/csh.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/csh.vim
new file mode 100644
index 0000000..f6d36e4
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/csh.vim
@@ -0,0 +1,29 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#csh#Initialize()
+    call SingleCompile#SetCompilerTemplate('csh', 'csh',
+                \'C Shell', 'csh', '', '')
+    call SingleCompile#SetCompilerTemplate('csh', 'tcsh',
+                \'TENEX C shell', 'tcsh', '', '')
+    call SingleCompile#SetPriority('csh', 'tcsh', 80)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/d.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/d.vim
new file mode 100644
index 0000000..15b29fc
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/d.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#d#Initialize()
+    call SingleCompile#SetCompilerTemplate('d', 'dmd', 'DMD Compiler',
+                \'dmd', '', g:SingleCompile_common_run_command)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/dosbatch.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/dosbatch.vim
new file mode 100644
index 0000000..ce6420e
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/dosbatch.vim
@@ -0,0 +1,30 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#dosbatch#Initialize()
+    if has('win32')
+        let l:cmd_path = $SYSTEMROOT . '\System32\cmd.exe'
+
+        call SingleCompile#SetCompilerTemplate('dosbatch', 'dosbatch',
+                    \'DOS Batch', l:cmd_path, '/C', '')
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/elixir.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/elixir.vim
new file mode 100644
index 0000000..37e86f9
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/elixir.vim
@@ -0,0 +1,27 @@
+" Copyright (C) 2015 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#elixir#Initialize()
+    call SingleCompile#SetCompilerTemplate('elixir', 'elixir',
+                \'Elixir', 'elixir', '', '')
+endfunction
+
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/erlang.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/erlang.vim
new file mode 100644
index 0000000..93ee1f1
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/erlang.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#erlang#Initialize()
+    call SingleCompile#SetCompilerTemplate('erlang', 'escript',
+                \'Erlang Scripting Support', 'escript', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/fortran.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/fortran.vim
new file mode 100644
index 0000000..97917f7
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/fortran.vim
@@ -0,0 +1,93 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#fortran#Initialize()
+    call SingleCompile#SetCompilerTemplate('fortran', 'gfortran',
+                \'GNU Fortran Compiler', 'gfortran',
+                \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('fortran', 'gfortran',
+                \g:SingleCompile_common_out_file)
+    call SingleCompile#SetPriority('fortran', 'gfortran', 70)
+    call SingleCompile#SetCompilerTemplate('fortran', 'g95',
+                \'G95', 'g95', '-o $(FILE_TITLE)$'.SingleCompile#GetExecutableSuffix(),
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('fortran', 'g95', g:SingleCompile_common_out_file)
+    if has('unix')
+        call SingleCompile#SetCompilerTemplate('fortran',
+                    \'sol-studio-f77',
+                    \'Sun Fortran 77 Compiler (Sun Solaris Studio)',
+                    \'sunf77', '-o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'sol-studio-f77',
+                    \g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('fortran',
+                    \'sol-studio-f90',
+                    \'Sun Fortran 90 Compiler (Sun Solaris Studio)',
+                    \'sunf90', '-o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'sol-studio-f90',
+                    \g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('fortran',
+                    \'sol-studio-f95',
+                    \'Sun Fortran 95 Compiler (Sun Solaris Studio)',
+                    \'sunf95', '-o $(FILE_TITLE)$',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'sol-studio-f95',
+                    \g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('fortran', 'open64-f90',
+                    \'Open64 Fortran 90 Compiler', 'openf90',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'open64-f90',
+                    \g:SingleCompile_common_out_file)
+        call SingleCompile#SetCompilerTemplate('fortran', 'open64-f95',
+                    \'Open64 Fortran 95 Compiler', 'openf95',
+                    \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'open64-f95',
+                    \g:SingleCompile_common_out_file)
+    endif
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('fortran', 'ftn95',
+                    \'Silverfrost FTN95', 'ftn95', '$(FILE_NAME)$ /LINK',
+                    \g:SingleCompile_common_run_command)
+        call SingleCompile#SetOutfile('fortran', 'ftn95',
+                    \g:SingleCompile_common_out_file)
+    endif
+    call SingleCompile#SetCompilerTemplate('fortran', 'g77',
+                \'GNU Fortran 77 Compiler', 'g77', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('fortran', 'g77', g:SingleCompile_common_out_file)
+    call SingleCompile#SetVimCompiler('fortran', 'g77', 'fortran_g77')
+    call SingleCompile#SetCompilerTemplate('fortran', 'ifort',
+                \'Intel Fortran Compiler', 'ifort', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('fortran', 'ifort', g:SingleCompile_common_out_file)
+    call SingleCompile#SetPriority('fortran', 'ifort', 80)
+    call SingleCompile#SetCompilerTemplate('fortran', 'open-watcom',
+                \'Open Watcom Fortran 77/32 Compiler', 'wfl386', '',
+                \g:SingleCompile_common_run_command, function('SingleCompile#DetectWatcom'))
+    call SingleCompile#SetCompilerTemplateByDict('fortran', 'open-watcom',
+                \{
+                \ 'pre-do'  : function('SingleCompile#PredoWatcom'),
+                \ 'post-do' : function('SingleCompile#PostdoWatcom'),
+                \ 'out-file': g:SingleCompile_common_out_file
+                \})
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/go.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/go.vim
new file mode 100644
index 0000000..a42d99b
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/go.vim
@@ -0,0 +1,27 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#go#Initialize()
+    call SingleCompile#SetCompilerTemplate('go', 'go', 'Go',
+                \ 'go', 'build -o $(FILE_EXEC)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetPriority('go', 'Go', 20)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/haskell.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/haskell.vim
new file mode 100644
index 0000000..666bb53
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/haskell.vim
@@ -0,0 +1,30 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#haskell#Initialize()
+    call SingleCompile#SetCompilerTemplate('haskell', 'ghc',
+                \'Glasgow Haskell Compiler', 'ghc', '-o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('haskell', 'ghc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('haskell', 'runhaskell',
+                \'runhaskell', 'runhaskell', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/html.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/html.vim
new file mode 100644
index 0000000..cb52649
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/html.vim
@@ -0,0 +1,51 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#html#Initialize()
+    call SingleCompile#SetCompilerTemplate('html', 'firefox',
+                \'Mozilla Firefox', 'firefox', '', '')
+    call SingleCompile#SetPriority('html', 'firefox', 60)
+    call SingleCompile#SetCompilerTemplate('html', 'chrome',
+                \'Google Chrome', 'google-chrome', '', '')
+    call SingleCompile#SetPriority('html', 'chrome', 70)
+    call SingleCompile#SetCompilerTemplate('html', 'chromium',
+                \'Chromium', 'chromium', '', '')
+    call SingleCompile#SetPriority('html', 'chromium', 71)
+    call SingleCompile#SetCompilerTemplate('html', 'opera', 'Opera',
+                \'opera', '', '')
+    call SingleCompile#SetPriority('html', 'opera', 80)
+    call SingleCompile#SetCompilerTemplate('html', 'konqueror',
+                \'Konqueror', 'konqueror', '', '')
+    call SingleCompile#SetCompilerTemplate('html', 'arora',
+                \'Arora', 'arora', '', '')
+    call SingleCompile#SetCompilerTemplate('html', 'epiphany',
+                \'Epiphany', 'epiphany', '', '')
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('html', 'ie',
+                    \'Microsoft Internet Explorer', 'iexplore', '', '',
+                    \function('SingleCompile#DetectIe'))
+        call SingleCompile#SetPriority('html', 'ie', 50)
+    else
+        call SingleCompile#SetCompilerTemplate('html', 'ie',
+                    \'Microsoft Internet Explorer', 'iexplore', '', '')
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/idlang.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/idlang.vim
new file mode 100644
index 0000000..7dcf407
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/idlang.vim
@@ -0,0 +1,32 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#idlang#Initialize()
+    call SingleCompile#SetCompilerTemplate('idlang', 'idl',
+                \'ITT Visual Information Solutions '.
+                \'Interactive Data Language', 'idl',
+                \"-quiet -e '.run $(FILE_NAME)$'", '')
+    call SingleCompile#SetPriority('idlang', 'idl', 70)
+    call SingleCompile#SetCompilerTemplate('idlang', 'gdl',
+                \'GNU Data Language incremental compiler',
+                \'gdl', "-quiet -e '.run $(FILE_NAME)$'", '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/java.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/java.vim
new file mode 100644
index 0000000..15986f0
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/java.vim
@@ -0,0 +1,34 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#java#Initialize()
+    call SingleCompile#SetCompilerTemplate('java', 'sunjdk',
+                \ 'Sun Java Development Kit', 'javac', '',
+                \'java $(FILE_TITLE)$')
+    call SingleCompile#SetOutfile('java', 'sunjdk',
+                \'$(FILE_TITLE)$'.'.class')
+    call SingleCompile#SetVimCompiler('java', 'sunjdk', 'javac')
+    call SingleCompile#SetPriority('java', 'sunjdk', 70)
+    call SingleCompile#SetCompilerTemplate('java', 'gcj',
+                \'GNU Java Compiler', 'gcj', '', 'java $(FILE_TITLE)$')
+    call SingleCompile#SetOutfile('java', 'gcj', '$(FILE_TITLE)$'.'.class')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/javascript.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/javascript.vim
new file mode 100644
index 0000000..c8ea664
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/javascript.vim
@@ -0,0 +1,35 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#javascript#Initialize()
+    call SingleCompile#SetCompilerTemplate('javascript', 'gjs',
+                \'Javascript Bindings for GNOME', 'gjs', '', '')
+    call SingleCompile#SetPriority('javascript', 'gjs', 120)
+    call SingleCompile#SetCompilerTemplate('javascript', 'js',
+                \'SpiderMonkey, a JavaScript engine written in C',
+                \'js', '', '')
+    call SingleCompile#SetCompilerTemplate('javascript', 'node.js',
+                \'node.js', 'node', '', '')
+    call SingleCompile#SetCompilerTemplate('javascript', 'rhino',
+                \'Rhino, a JavaScript engine written in Java',
+                \'rhino', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/ksh.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ksh.vim
new file mode 100644
index 0000000..9084164
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ksh.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#ksh#Initialize()
+    call SingleCompile#SetCompilerTemplate('ksh', 'ksh',
+                \'Korn Shell', 'ksh', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/lisp.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/lisp.vim
new file mode 100644
index 0000000..774d361
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/lisp.vim
@@ -0,0 +1,30 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#lisp#Initialize()
+    call SingleCompile#SetCompilerTemplate('lisp', 'clisp', 'GNU CLISP',
+                \'clisp', '', '')
+    call SingleCompile#SetCompilerTemplate('lisp', 'ecl',
+                \'Embeddable Common-Lisp', 'ecl', '-shell', '')
+    call SingleCompile#SetCompilerTemplate('lisp', 'gcl',
+                \'GNU Common Lisp', 'gcl', '-batch -load', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/ls.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ls.vim
new file mode 100644
index 0000000..882b274
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ls.vim
@@ -0,0 +1,27 @@
+" Copyright (C) 2010-2012 Rack Lin
+"
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#ls#Initialize()
+    call SingleCompile#SetCompilerTemplate('ls', 'lsc',
+                \'LiveScript', 'lsc', '-c $(FILE_NAME)$', 'lsc $(FILE_NAME)$')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/lua.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/lua.vim
new file mode 100644
index 0000000..29ee475
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/lua.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#lua#Initialize()
+    call SingleCompile#SetCompilerTemplate('lua', 'lua',
+                \'Lua Interpreter', 'lua', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/make.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/make.vim
new file mode 100644
index 0000000..6f5b6cd
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/make.vim
@@ -0,0 +1,47 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! s:DetectGmake(not_used_arg)
+    let l:make_command = s:DetectCompilerGenerally('gmake')
+    if l:make_command != 0
+        return l:make_command
+    endif
+
+    let l:make_command = s:DetectCompilerGenerally('make')
+    if l:make_command != 0
+        return l:make_command
+    endif
+
+    return 0
+endfunction
+
+function! SingleCompile#templates#make#Initialize()
+    call SingleCompile#SetCompilerTemplate('make', 'gmake', 'GNU Make',
+                \'gmake', '-f', '', function('s:DetectGmake'))
+    call SingleCompile#SetCompilerTemplate('make', 'mingw32-make',
+                \'MinGW32 Make', 'mingw32-make', '-f', '')
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('make', 'nmake',
+                    \'Microsoft Program Maintenance Utility', 'nmake',
+                    \'-f', '')
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/markdown.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/markdown.vim
new file mode 100644
index 0000000..c16b1c4
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/markdown.vim
@@ -0,0 +1,42 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#markdown#Initialize()
+    call SingleCompile#SetCompilerTemplate('markdown', 'markdown',
+                \ 'text-to-HTML conversion tool', 'markdown',
+                \ '-o $(FILE_TITLE)$.html',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.html"')
+    call SingleCompile#SetPriority('markdown', 'markdown', 50)
+
+    call SingleCompile#SetCompilerTemplate('markdown', 'rdiscount',
+                \ 'Discount Markdown Processor for Ruby', 'rdiscount',
+                \ '$(FILE_NAME)$ >$(FILE_TITLE)$.html',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.html"')
+
+    call SingleCompile#SetCompilerTemplate('markdown', 'markdown_py',
+                \ 'Discount Markdown Processor for Python', 'markdown_py',
+                \ '-f $(FILE_TITLE)$.html -o html5 $(FILE_NAME)$',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.html"')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/matlab.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/matlab.vim
new file mode 100644
index 0000000..68f0cba
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/matlab.vim
@@ -0,0 +1,30 @@
+" Copyright (C) 2013 PAN, Myautsai
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#matlab#Initialize()
+    call SingleCompile#SetCompilerTemplate('matlab', 'matlab', 'MathWorks MATLAB',
+                \'matlab', '-nodisplay -nosplash -r $(FILE_TITLE)$,exit', '')
+    call SingleCompile#SetPriority('matlab', 'matlab', 50)
+    call SingleCompile#SetCompilerTemplate('matlab', 'octave', 'GNU Octave',
+                \'octave', '', '')
+    call SingleCompile#SetPriority('matlab', 'octave', 60)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/objc.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/objc.vim
new file mode 100644
index 0000000..ffa9dcb
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/objc.vim
@@ -0,0 +1,33 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#objc#Initialize()
+    call SingleCompile#SetCompilerTemplate('objc', 'clang',
+                \ 'the Clang C and Objective-C compiler', 'clang',
+                \ '-g -o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('objc', 'clang', g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('objc', 'gcc',
+                \'GNU Object-C Compiler', 'gcc', '-g -o $(FILE_TITLE)$',
+                \g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('objc', 'gcc', g:SingleCompile_common_out_file)
+    call SingleCompile#SetPriority('objc', 'gcc', 80)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/ocaml.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ocaml.vim
new file mode 100644
index 0000000..bc19936
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ocaml.vim
@@ -0,0 +1,28 @@
+" Copyright (C) 2015 Vishesh Yadav
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#ocaml#Initialize()
+    call SingleCompile#SetCompilerTemplate('ocaml', 'ocaml', 'OCaml',
+                \ 'ocamlc', '-o $(FILE_TITLE)$',
+                \ g:SingleCompile_common_run_command)
+    call SingleCompile#SetVimCompiler('ocaml', 'ocaml', 'ocamlc')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/pascal.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/pascal.vim
new file mode 100644
index 0000000..64e1db6
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/pascal.vim
@@ -0,0 +1,34 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#pascal#Initialize()
+    call SingleCompile#SetCompilerTemplate('pascal', 'fpc',
+                \'Free Pascal Compiler', 'fpc',
+                \'', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('pascal', 'fpc',
+                \g:SingleCompile_common_out_file)
+    call SingleCompile#SetCompilerTemplate('pascal', 'gpc',
+                \'GNU Pascal Compiler', 'gpc',
+                \'-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+    call SingleCompile#SetOutfile('pascal', 'gpc',
+                \g:SingleCompile_common_out_file)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/perl.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/perl.vim
new file mode 100644
index 0000000..1967d9f
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/perl.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#perl#Initialize()
+    call SingleCompile#SetCompilerTemplate('perl', 'perl',
+                \'Perl Interpreter', 'perl', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/php.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/php.vim
new file mode 100644
index 0000000..5df9451
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/php.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#php#Initialize()
+    call SingleCompile#SetCompilerTemplate('php', 'php',
+                \"PHP Command Line Interface 'CLI'", 'php', '-f', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/python.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/python.vim
new file mode 100644
index 0000000..e5f03df
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/python.vim
@@ -0,0 +1,40 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#python#Initialize()
+    call SingleCompile#SetCompilerTemplate('python', 'python', 'CPython (Usually the system default version. Can be Python 2 or 3.)',
+                \'python', '', '')
+    call SingleCompile#SetPriority('python', 'python', 50)
+    call SingleCompile#SetCompilerTemplate('python', 'ironpython',
+                \'IronPython', 'ipy', '', '')
+    call SingleCompile#SetCompilerTemplate('python', 'jython', 'Jython',
+                \'jython', '', '')
+    call SingleCompile#SetCompilerTemplate('python', 'pypy', 'PyPy',
+                \'pypy', '', '')
+    call SingleCompile#SetPriority('python', 'pypy', 110)
+    call SingleCompile#SetCompilerTemplate('python', 'python2',
+                \'CPython 2', 'python2', '', '')
+    call SingleCompile#SetPriority('python', 'python', 60)
+    call SingleCompile#SetCompilerTemplate('python', 'python3',
+                \'CPython 3', 'python3', '', '')
+    call SingleCompile#SetPriority('python', 'python3', 120)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/qml.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/qml.vim
new file mode 100644
index 0000000..053484f
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/qml.vim
@@ -0,0 +1,29 @@
+" Copyright (C) 2014 Francisco Lopes
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#qml#Initialize()
+    call SingleCompile#SetCompilerTemplate('qml', 'qmlviewer', 'qmlviewer',
+                \ 'qmlviewer', '', '')
+    call SingleCompile#SetCompilerTemplate('qml', 'qmlscene', 'qmlscene',
+                \ 'qmlscene', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
+
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/r.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/r.vim
new file mode 100644
index 0000000..13edea7
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/r.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#r#Initialize()
+    call SingleCompile#SetCompilerTemplate('r', 'R', 'R', 'R',
+                \'CMD BATCH', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/rst.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/rst.vim
new file mode 100644
index 0000000..728a801
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/rst.vim
@@ -0,0 +1,33 @@
+" Copyright (C) 2010-2012 Hong Xu
+" Copyright © 2012 Martin Ueding <dev@martin-ueding.de>
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#rst#Initialize()
+    call SingleCompile#SetCompilerTemplate('rst', 'rst2html',
+                \ 'reST-to-HTML conversion tool',
+                \ 'rst2html',
+                \ '$(FILE_NAME)$ $(FILE_TITLE)$.html',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.html"')
+    call SingleCompile#SetOutfile('rst', 'rst2html', '"$(FILE_TITLE)$.html"')
+    call SingleCompile#SetPriority('rst', 'rst2html', 50)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/ruby.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ruby.vim
new file mode 100644
index 0000000..c76c250
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/ruby.vim
@@ -0,0 +1,44 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#ruby#Initialize()
+    call SingleCompile#SetCompilerTemplate('ruby', 'ruby',
+                \'Ruby Interpreter', 'ruby', '', '')
+    call SingleCompile#SetPriority('ruby', 'ruby', 50)
+
+    call SingleCompile#SetCompilerTemplate('ruby', 'jruby',
+                \'Ruby JVM Interpreter (default Ruby version)', 'jruby', '', '')
+    call SingleCompile#SetPriority('ruby', 'jruby', 55)
+
+    call SingleCompile#SetCompilerTemplate('ruby', 'jruby1.8',
+                \'Ruby JVM Interpreter (1.8)', 'jruby', '--1.8', '')
+    call SingleCompile#SetPriority('ruby', 'jruby1.8', 80)
+
+    call SingleCompile#SetCompilerTemplate('ruby', 'jruby1.9',
+                \'Ruby JVM Interpreter (1.9)', 'jruby', '--1.9', '')
+    call SingleCompile#SetPriority('ruby', 'jruby1.9', 60)
+
+    call SingleCompile#SetCompilerTemplate('ruby', 'jruby2.0',
+                \'Ruby JVM Interpreter (2.0)', 'jruby', '--2.0', '')
+    call SingleCompile#SetPriority('ruby', 'jruby2.0', 70)
+
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/rust.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/rust.vim
new file mode 100644
index 0000000..8497eb6
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/rust.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2013 Francisco Lopes
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#rust#Initialize()
+    call SingleCompile#SetCompilerTemplate('rust', 'rustc', 'Rust',
+                \ 'rustc', '-o $(FILE_TITLE)$', g:SingleCompile_common_run_command)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/scala.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/scala.vim
new file mode 100644
index 0000000..a20f3c5
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/scala.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Reza Jelveh
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#scala#Initialize()
+    call SingleCompile#SetCompilerTemplate('scala', 'scala',
+                \'Scala Compiler', 'scala', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/sh.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/sh.vim
new file mode 100644
index 0000000..e5b5219
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/sh.vim
@@ -0,0 +1,43 @@
+" Copyright (C) 2010-2015 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#sh#Initialize()
+    call SingleCompile#SetCompilerTemplate('sh', 'shell',
+                \'Guess from shebang', 'sh', '', '')
+    call SingleCompile#SetPriority('sh', 'shell', 10)
+    call SingleCompile#SetPredo('sh', 'shell',
+                \function('SingleCompile#PredoShell'))
+    call SingleCompile#SetCompilerTemplate('sh', 'sh',
+                \'Bourne Shell', 'sh', '', '')
+    call SingleCompile#SetPriority('sh', 'sh', 80)
+    call SingleCompile#SetCompilerTemplate('sh', 'bash',
+                \'Bourne-Again Shell', 'bash', '', '')
+    call SingleCompile#SetPriority('sh', 'bash', 90)
+    call SingleCompile#SetCompilerTemplate('sh', 'ksh',
+                \'Korn Shell', 'ksh', '', '')
+    call SingleCompile#SetCompilerTemplate('sh', 'zsh',
+                \'Z Shell', 'zsh', '', '')
+    call SingleCompile#SetCompilerTemplate('sh', 'ash',
+                \'Almquist Shell', 'ash', '', '')
+    call SingleCompile#SetCompilerTemplate('sh', 'dash',
+                \'Debian Almquist Shell', 'dash', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcl.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcl.vim
new file mode 100644
index 0000000..8ff5114
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcl.vim
@@ -0,0 +1,28 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#tcl#Initialize()
+    call SingleCompile#SetCompilerTemplate('tcl', 'tclsh',
+                \'Simple shell containing Tcl interpreter', 'tclsh',
+                \'', '')
+    call SingleCompile#SetVimCompiler('tcl', 'tclsh', 'tcl')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcsh.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcsh.vim
new file mode 100644
index 0000000..07e329d
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tcsh.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#tcsh#Initialize()
+    call SingleCompile#SetCompilerTemplate('tcsh', 'tcsh',
+                \'TENEX C Shell', 'tcsh', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/tex.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tex.vim
new file mode 100644
index 0000000..a02b152
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/tex.vim
@@ -0,0 +1,42 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#tex#Initialize()
+    call SingleCompile#SetCompilerTemplate('tex', 'pdflatex', 'pdfLaTeX',
+                \'pdflatex', '-interaction=nonstopmode',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.pdf"')
+    call SingleCompile#SetPriority('tex', 'pdflatex', 50)
+    call SingleCompile#SetCompilerTemplate('tex', 'latex', 'LaTeX',
+                \'latex', '-interaction=nonstopmode',
+                \ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.dvi"')
+    call SingleCompile#SetPriority('tex', 'latex', 80)
+
+	" latexmk which automatically calls pdflatex, but runs it multiple times
+	" to that all references are sorted out correctly.
+	call SingleCompile#SetCompilerTemplate('tex', 'latexmk', 'latexmk',
+				\ 'latexmk', '-pdf',
+				\ SingleCompile#GetDefaultOpenCommand() .
+                \ ' "$(FILE_TITLE)$.pdf"')
+    call SingleCompile#SetPriority('tex', 'latexmk', 30)
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/vb.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/vb.vim
new file mode 100644
index 0000000..3a40561
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/vb.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#vb#Initialize()
+    call SingleCompile#SetCompilerTemplate('vb', 'vbs',
+                \'VB Script Interpreter', 'cscript', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/vim.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/vim.vim
new file mode 100644
index 0000000..92c9655
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/vim.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#vim#Initialize()
+    call SingleCompile#SetCompilerTemplate('vim', 'vim', 'Vim',
+                \'vim', '-u NONE -U NONE -e -N -n -S', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/xhtml.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/xhtml.vim
new file mode 100644
index 0000000..1f0bcb6
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/xhtml.vim
@@ -0,0 +1,51 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#xhtml#Initialize()
+    call SingleCompile#SetCompilerTemplate('xhtml', 'firefox',
+                \'Mozilla Firefox', 'firefox', '', '')
+    call SingleCompile#SetPriority('xhtml', 'firefox', 60)
+    call SingleCompile#SetCompilerTemplate('xhtml', 'chrome',
+                \'Google Chrome', 'google-chrome', '', '')
+    call SingleCompile#SetPriority('xhtml', 'chrome', 70)
+    call SingleCompile#SetCompilerTemplate('xhtml', 'chromium',
+                \'Chromium', 'chromium', '', '')
+    call SingleCompile#SetPriority('xhtml', 'chromium', 71)
+    call SingleCompile#SetCompilerTemplate('xhtml', 'opera',
+                \'Opera', 'opera', '', '')
+    call SingleCompile#SetPriority('xhtml', 'opera', 80)
+    call SingleCompile#SetCompilerTemplate('xhtml', 'konqueror',
+                \'Konqueror', 'konqueror', '', '')
+    call SingleCompile#SetCompilerTemplate('xhtml', 'arora',
+                \'Arora', 'arora', '', '')
+    call SingleCompile#SetCompilerTemplate('xhtml', 'epiphany',
+                \'Epiphany', 'epiphany', '', '')
+    if has('win32')
+        call SingleCompile#SetCompilerTemplate('xhtml', 'ie',
+                    \'Microsoft Internet Explorer', 'iexplore', '', '',
+                    \function('SingleCompile#DetectIe'))
+        call SingleCompile#SetPriority('xhtml', 'ie', 50)
+    else
+        call SingleCompile#SetCompilerTemplate('xhtml', 'ie',
+                    \'Microsoft Internet Explorer', 'iexplore', '', '')
+    endif
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompile/templates/zsh.vim b/vim/plugins/singlecompile/autoload/SingleCompile/templates/zsh.vim
new file mode 100644
index 0000000..3e97852
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompile/templates/zsh.vim
@@ -0,0 +1,26 @@
+" Copyright (C) 2010-2012 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" check doc/SingleCompile.txt for more information
+
+function! SingleCompile#templates#zsh#Initialize()
+    call SingleCompile#SetCompilerTemplate('zsh', 'zsh',
+                \'Z Shell', 'zsh', '', '')
+endfunction
+
+"vim703: cc=78
+"vim: et ts=4 tw=78 sw=4
diff --git a/vim/plugins/singlecompile/autoload/SingleCompileAsync.vim b/vim/plugins/singlecompile/autoload/SingleCompileAsync.vim
new file mode 100644
index 0000000..9e8dccf
--- /dev/null
+++ b/vim/plugins/singlecompile/autoload/SingleCompileAsync.vim
@@ -0,0 +1,300 @@
+" Copyright (C) 2010-2014 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" File: autoload/SingleCompileAsync.vim
+" Version: 2.12.0
+" check doc/SingleCompile.txt for more information
+
+
+let s:saved_cpo = &cpo
+set cpo&vim
+
+let s:cur_mode = ''
+let s:mode_dict = {}
+
+" python mode functions {{{1
+
+function! s:InitializePython() " {{{2
+    " the Initialize function of python
+
+    if !has('python')
+        return 'Python interface is not available in this Vim.'
+    endif
+
+    let l:ret = ''
+
+python << EEOOFF
+
+try:
+    import vim
+    import shlex
+    import subprocess
+    import sys
+except:
+    vim.command("let l:ret = 'Library import error.'")
+EEOOFF
+
+    if !empty(l:ret)
+        return l:ret
+    endif
+
+python << EEOOFF
+if sys.version_info[0] < 2 or sys.version_info[1] < 6:
+    vim.command("let l:ret = 'At least python 2.6 is required.'")
+EEOOFF
+
+    if !empty(l:ret)
+        return l:ret
+    endif
+
+python << EEOOFF
+
+class SingleCompileAsync:
+    sub_proc = None
+    output = None
+    # This value will be set below if we are on win32. For other systems,
+    # leave this as None
+    startupinfo = None
+
+# if we are on win32, we need to set STARTUPINFO before calling
+# subprocess.Popen() to make the console of the subprocess show minimized and
+# not actived.
+if sys.platform == 'win32':
+
+    # set subprocess constants
+    subprocess.STARTF_USESHOWWINDOW = 1
+    subprocess.SW_HIDE = 0
+
+    SingleCompileAsync.startupinfo = subprocess.STARTUPINFO()
+    SingleCompileAsync.startupinfo.dwFlags = subprocess.STARTF_USESHOWWINDOW
+    SingleCompileAsync.startupinfo.wShowWindow = subprocess.SW_HIDE
+
+EEOOFF
+endfunction
+
+function! s:IsRunningPython() " {{{2
+    " The IsRunning function of python
+
+python << EEOOFF
+
+if SingleCompileAsync.sub_proc != None and \
+        SingleCompileAsync.sub_proc.poll() == None:
+    vim.command('let l:ret_val = 1')
+else:
+    vim.command('let l:ret_val = 0')
+
+EEOOFF
+
+    return l:ret_val
+endfunction
+
+function! s:RunPython(run_command) " {{{2
+    " The Run function of python
+
+    let l:ret_val = 0
+
+python << EEOOFF
+
+try:
+    SingleCompileAsync.sub_proc = subprocess.Popen(
+            shlex.split(vim.eval('a:run_command')),
+            shell = False,
+            universal_newlines = True,
+            startupinfo = SingleCompileAsync.startupinfo,
+            stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+
+except:
+    vim.command('let l:ret_val = 2')
+
+EEOOFF
+
+    return l:ret_val
+endfunction
+
+function! s:TerminatePython() " {{{2
+    " The Terminate function of python
+
+    let l:ret_val = 0
+
+python << EEOOFF
+
+try:
+    SingleCompileAsync.sub_proc.kill()
+except:
+    vim.command('let l:ret_val = 2')
+
+EEOOFF
+
+    return l:ret_val
+endfunction
+
+function! s:GetOutputPython() " {{{2
+    " The GetOutput function of python
+
+python << EEOOFF
+try:
+    SingleCompileAsync.tmpout = SingleCompileAsync.sub_proc.communicate()[0]
+except:
+    pass
+else:
+    SingleCompileAsync.output = SingleCompileAsync.tmpout
+    del SingleCompileAsync.tmpout
+
+try:
+    vim.command("let l:ret_val = '" +
+            SingleCompileAsync.output.replace("'", "''") + "'")
+except:
+    vim.command('let l:ret_val = 2')
+
+EEOOFF
+
+    if type(l:ret_val) == type('')
+        let l:ret_list = split(l:ret_val, "\n")
+        unlet! l:ret_val
+        let l:ret_val = l:ret_list
+    endif
+
+    return l:ret_val
+endfunction
+
+function! SingleCompileAsync#GetMode() " {{{1
+    return s:cur_mode
+endfunction
+
+function! SingleCompileAsync#Initialize(mode) " {{{1
+    " return 1 if failed to initialize the mode;
+    " return 2 if mode has been set;
+    " return 3 if the specific mode doesn't exist;
+    " return 0 if succeed.
+
+    " only set to the new mode if no mode is set before.
+    if !empty(s:cur_mode)
+        return 2
+    endif
+
+    " set function refs to dict
+    if a:mode ==? 'auto'
+        " autodetect for an appropriate mode
+
+        for l:one_mode in ['python']
+
+            let l:init_result = SingleCompileAsync#Initialize(l:one_mode)
+            if type(l:init_result) == type(0) && l:init_result == 0
+                return 0
+            endif
+        endfor
+
+        return 0
+
+    elseif a:mode ==? 'python'
+        let s:mode_dict['Initialize'] = function('s:InitializePython')
+        let s:mode_dict['IsRunning'] = function('s:IsRunningPython')
+        let s:mode_dict['Run'] = function('s:RunPython')
+        let s:mode_dict['Terminate'] = function('s:TerminatePython')
+        let s:mode_dict['GetOutput'] = function('s:GetOutputPython')
+    else
+        return 3
+    endif
+
+    " call the initialization function
+    let l:init_result = s:mode_dict['Initialize']()
+
+    if type(l:init_result) == type('') ||
+                \ (type(l:init_result) == type(0) && l:init_result != 0)
+        return l:init_result
+    endif
+
+    let s:cur_mode = a:mode
+
+    return 0
+endfunction
+
+function! SingleCompileAsync#IsRunning() " {{{1
+    " check is there a process running in background.
+    " Return 1 means there is a process running in background,
+    " return 0 means there is no process running in background,
+    " return -1 if mode hasn't been set,
+    " return other values if failed to check whether the process is running.
+
+    if empty(s:cur_mode)
+        return 0
+    endif
+
+    return s:mode_dict['IsRunning']()
+endfunction
+
+function! SingleCompileAsync#Run(run_command) " {{{1
+    " run a new command.
+    " Return -1 if mode hasn't been set;
+    " return 1 if a process is running in background;
+    " return 0 means the command is run successfully;
+    " return other values means the command is not run successfully.
+
+    if empty(s:cur_mode)
+        return -1
+    endif
+
+    if SingleCompileAsync#IsRunning() == 1
+        return 1
+    endif
+
+    return s:mode_dict['Run'](a:run_command)
+endfunction
+
+function! SingleCompileAsync#Terminate() " {{{1
+    " terminate current background process
+
+    " Return -1 if mode hasn't been set;
+    " return 1 if no process is running in background;
+    " return 0 means terminating the process successfully;
+    " return other values means failed to terminate.
+
+    if empty(s:cur_mode)
+        return -1
+    endif
+
+    if SingleCompileAsync#IsRunning() == 0
+        return 1
+    endif
+
+    return s:mode_dict['Terminate']()
+endfunction
+
+function! SingleCompileAsync#GetOutput() " {{{1
+    " get the output of the process.
+    " Return -1 if mode hasn't been set;
+    " return 1 if a process is running in background;
+    " return other integer values if failed to get the output;
+    " return a list if the output is successfully gained.
+
+    if empty(s:cur_mode)
+        return -1
+    endif
+
+    if SingleCompileAsync#IsRunning() == 1
+        return 1
+    endif
+
+    return s:mode_dict['GetOutput']()
+endfunction
+" }}}
+
+let &cpo = s:saved_cpo
+unlet! s:saved_cpo
+
+" vim703: cc=78
+" vim: fdm=marker et ts=4 tw=78 sw=4 fdc=3
diff --git a/vim/plugins/singlecompile/doc/SingleCompile.txt b/vim/plugins/singlecompile/doc/SingleCompile.txt
new file mode 100644
index 0000000..08d599e
--- /dev/null
+++ b/vim/plugins/singlecompile/doc/SingleCompile.txt
@@ -0,0 +1,1081 @@
+*SingleCompile.txt*
+
+File: SingleCompile.txt
+Version: 2.12.0
+Original Author and Current Maintainer: Hong Xu <hong@topbug.net>
+Last Change: 11 June 2013
+Homepage: http://www.topbug.net/SingleCompile
+GitHub repo: https://github.com/xuhdev/SingleCompile
+Description: Make it more convenient to compile or run a single source file.
+License:
+    Copyright (C) 2010-2014 Hong Xu
+
+    This file is part of SingleCompile.
+
+    SingleCompile 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 3 of the License, or
+    (at your option) any later version.
+
+    SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+CONTENTS~
+                                            *SingleCompile-contents*
+----------------------------------------------------------------------------
+1.  Overview                                 |SingleCompile-overview|
+2.  Installation                             |SingleCompile-installation|
+3.  Commands                                 |SingleCompile-commands|
+4.  Settings                                 |SingleCompile-settings|
+5.  Key-mappings                             |SingleCompile-key-mapping|
+6.  Compiler template                        |SingleCompile-compiler-template|
+7.  Supporting plugins                       |SingleCompile-supporting-plugins|
+8.  Advanced                                 |SingleCompile-advanced|
+9.  Credits                                  |SingleCompile-credits|
+10. Todo                                     |SingleCompile-todo|
+
+
+OVERVIEW~
+                                            *SingleCompile-overview*
+----------------------------------------------------------------------------
+This plugin is aimed at making it more convenient to compile or run a single
+source file without leaving vim.
+
+A short introduction is available here:
+http://www.topbug.net/blog/2012/03/07/use-singlecompile-to-compile-and-run-a-single-source-file-easily-in-vim/
+
+Consider this situation: you have just written a small c source file for a
+small test, but you have to write a Makefile to compile it or exit vim to
+compile it or compile it using "!gcc" without quickfix feature because vim's
+make command only use the "make" command? This plugin will help you out.
+
+Add these key-mappings to your vimrc:
+>
+ nmap <F9> :SCCompile<cr>
+ nmap <F10> :SCCompileRun<cr>
+<
+Note that the two lines here should not have any trailing space. If your file
+type is supported, then press F9 to compile your source file, and press F10 to
+compile and run your source file. If there is a compilation error, and the
+|quickfix| feature is enabled, then you could use |:cope| command to see the
+error list. You may also use ":SCChooseCompiler" command to choose a compiler
+if you have more than one kind of compiler available on you system.
+":SCViewResult" will show you the last run result.
+
+
+Features:
+1. Compile or run the source file quickly using |quickfix| feature and
+   |compiler| feature of vim;
+2. Compilers and interpreters auto detecting;
+3. Fast switch between several installed compilers or interpreters;
+4. Multi-language support;
+5. Custom your own compiler/interpreter template;
+6. View the result of last run command at any time(requires "tee" command);
+7. Run the compiled program asynchronously and view the result at any time
+   (see |:SCCompileRunAsync|).
+
+
+The complete list of built-in compiler templates is at
+|SingleCompile-built-in-compiler|.
+
+You can add your compiler or interpreter support if the compiler or
+interpreter you want is not in the list. See details in the help file.
+
+There are some supporting code in this plugin for Marc Weber's
+vim-addon-actions:
+     http://github.com/MarcWeber/vim-addon-actions
+
+If you find any bug, please report it to hong@topbug.net or submit it on
+the issue tracker:
+https://bitbucket.org/xuhdev/singlecompile/issues
+
+If you've written some templates for some compilers or interpreters which are
+not included as built-in template, and you think they are useful for other
+people, you could send me an email to inform me, and I'll put them in the
+built-in templates.
+
+
+Git repository on github.com: https://github.com/xuhdev/SingleCompile
+Mercurial repository on bitbucket.org: https://bitbucket.org/xuhdev/singlecompile
+
+Follow xuhdev on twitter if you are interested in my development:
+http://twitter.com/xuhdev
+
+
+INSTALLATION~
+                                            *SingleCompile-installation*
+----------------------------------------------------------------------------
+Download the SingleCompile.zip file and extract it to your vim runtime
+directory(~/.vim on linux and $VIM_INSTALLATION_FOLDER\vimfiles on windows),
+you'd better then use ":helptags" command to generate the help tag(for example
+use ":helptags ~/.vim/doc" on UNIX/Linux).
+
+
+COMMANDS~
+                                            *SingleCompile-commands*
+----------------------------------------------------------------------------
+
+                                            *:SCCompile*
+Command:
+    :SCCompile
+If you are editing a source file of a compiling language such as C, Java, this
+command will compile the file which you are editing now. If you are editing a
+source file of a interpreted language such as python language, this command
+will run the file which you are editing. See |SingleCompile-compiler-template|
+about the compilation command.
+
+You can add some arguments after the command. For example, you want to compile
+your c source file with "-g -o %<" flag instead of the "-o %<" flag defined in
+the language template(see |SingleCompile-compiler-template|) for just this
+time, just use the following command:
+>
+ :SCCompile -g -o %<
+<
+"%<" means the current file name without extension.
+Also see |:SCCompileAF|.
+
+                                            *:SingleCompile*
+Command:
+    :SingleCompile
+Same as |:SCCompile|, only for backward compatibility use. Not recommended to
+use any more.
+
+                                            *:SCCompileAF*
+Command:
+    :SCCompileAF
+This command is also used for compiling your source file, but it allows you to
+append some additional compilation or interpretion flags other than the flags
+already defined in the compiler and interpreter template. The "AF" is short
+for "Addtional Flags". For example, GCC compiler for C has already been
+defined some flags: "-o "%<"". But sometimes you also want to use "-O2" flag
+to optimize your code, then you can use the following commands to compile your
+file:
+>
+ :SCCompileAF -O2
+<
+:SCCompile can also be used with some arguments, but there are some
+differences. :SCCompileAF use your arguments as "additional" compilation
+flags, which means the flags defined in the original templates are also valid,
+while :SCCompile use you arguments as compilation flags only, which means the
+flags defined in the original templates are not used. For example, the
+templates of GCC defined "flags" as '-o "%<"', "%<" stands for the output file
+name. ":SCCompile -O2" will use "gcc -O2 some_file.c" to compile your source
+file, while ":SCCompileAF -O2" will use "gcc -o some_file -O2 some_file.c" to
+compile your source file.
+
+                                            *:SCCompileRun*
+Command:
+    :SCCompileRun
+If you are editing a source file of a compiling language such as C, Java, this
+command will compile the file which you are editing now and run the
+executable; if you are editing a source file of a interpreted language such as
+python, ruby, this command will run the source file you are editing. That
+means, there is nothing different between |:SCCompile| and |:SCCompileRun| for an
+interpreted language source file.
+
+You can also add some arguments after SCCompileRun command, the meaning of
+arguments is the same as SingleCompile command above. Here is an example:
+>
+ :SCCompileRun -g -o %<
+<
+
+When the program you've just compiled (or the script you've just written)
+runs, vim will hang up to wait for the program to terminate. If you do not
+want vim to hang up when running the program, use |:SCCompileRunAsync|
+instead. See |:SCCompileRunAsync| for further information.
+
+                                            *:SingleCompileRun*
+Command:
+    :SingleCompileRun
+Same as |:SCCompileRun|, only for backward compatibility use. Not recommended
+to use any more.
+
+                                            *:SCCompileRunAF*
+Command:
+    :SCCompileRunAF
+Same as |:SCCompileAF|, but also run the binary file after compilation. For
+example, the following command is going to compile your source file with an
+additional "-O2" flag and run the output binary file:
+>
+ :SCCompileRunAF -O2
+<
+
+                                            *:SCCompileRunAsync*
+Command:
+    :SCCompileRunAsync
+Same as |:SCCompileRun|, but compile the source and run asynchronously. That
+is to say, after the program starts to run, you are still able to edit the
+source file, because vim does not hang up waiting for the program to
+terminate. The result of the run could be viewed by |:SCViewResultAsync|
+command. This command might not be available on your vim, see
+|SingleCompile-asyncrunmode| for more information. This command is useful when
+the program takes a long time to run or you are developing a GUI program. Also
+see |:SCViewResultAsync|, |:SCTerminateAsync| and |:SCIsRunningAsync|.
+
+                                            *:SCCompileRunAsyncAF*
+Command:
+    :SCCompileRunAsyncAF
+Same as |:SCCompileRunAF|, but compile the source and run asynchronously. The
+result of the run could be viewed by |:SCViewResultAsync| command. This
+command is disabled by default, to enable it, see
+|SingleCompile-asyncrunmode|. Also see |:SCCompileRunAsync|.
+
+                                            *:SCChooseCompiler*
+Command:
+    :SCChooseCompiler
+Choose a compiler to use. This command will display a list of compilers for
+you to choose one. If you want to set a default compiler in your vimrc, please
+use the function SingleCompile#ChooseCompiler. See
+|SingleCompile-use-built-in-template|.
+
+                                            *:SCChooseInterpreter*
+Command:
+    :SCChooseInterpreter
+Same as |:SCChooseCompiler|.
+
+                                            *:SCIsRunningAsync*
+Command:
+    :SCIsRunningAsync
+Check whether the asynchronously run process is still running. Also see
+|:SCCompileRunAsync|.
+
+                                            *:SCTerminateAsync*
+Command:
+    :SCTerminateAsync
+Terminate the process which is running asynchronously if exists. Also see
+|:SCCompileRunAsync|.
+
+                                            *:SCViewResult*
+Command:
+    :SCViewResult
+View the result of the last run command. Only valid when "tee" command is
+available. "tee" is usually available on a UNIX system. If you are under
+Windows, install cygwin or visit the following link to download a "tee"
+command for Windows:
+
+http://gnuwin32.sourceforge.net/packages/coreutils.htm
+
+NOTE: When you disable "tee" by setting |SingleCompile_usetee| to 0, you
+will disable this feature.
+
+                                            *:SCViewResultAsync*
+Command:
+    :SCViewResultAsync
+Same as |:SCViewResult|, but the result displayed is the result of the process
+run by |:SCCompileRunAsync| or |:SCCompileRunAsyncAF|.
+
+
+SETTINGS~
+                                            *SingleCompile-settings*
+----------------------------------------------------------------------------
+
+                                            *g:SingleCompile_alwayscompile*
+If g:SingleCompile_alwayscompile is set to 0, when using |:SCCompileRun|
+command, SingleCompile may run the output of the compilation directly if the
+modification time of the source file is earlier than the output file. If you
+want to enable this feature, add the following line to your vimrc:
+>
+ let g:SingleCompile_alwayscompile = 0
+<
+The default value of g:SingleCompile_alwayscompile is 1.
+
+                                            *g:SingleCompile_asyncrunmode*
+This option specifies the asynchronous mode for |:SCCompileRunAsync| and
+|:SCCompileRunAsyncAF|. The default value is "auto", which means SingleCompile
+will automatically detect whether you are able to enable async run mode and
+select one mode for you. Use the following line, replace modename with the
+mode you want to change mode:
+>
+ let g:SingleCompile_asyncrunmode = 'modename'
+<
+
+Here is a list of available mode:
+
+auto        This is the default value. SingleCompile automatically selects one
+            mode for you.
+>
+ let g:SingleCompile_asyncrunmode = 'auto'
+<
+
+none        Disable asynchronous mode, which means |:SCCompileRunAsync| and
+            |:SCCompileRunAsyncAF| and related commands are disabled.
+>
+ let g:SingleCompile_asyncrunmode = 'none'
+<
+
+python      Use python interface when running asynchronously. Required vim
+            compiled with python interface 2.6+. See |+python|.
+>
+ let g:SingleCompile_asyncrunmode = 'python'
+<
+
+
+                                            *g:SingleCompile_autowrite*
+If you don't want to save your file automatically when you use "SingleCompile"
+command or "SingleCompileRun" command, add the following line to your vimrc:
+>
+ let g:SingleCompile_autowrite = 0
+<
+NOTE: If you let g:SingleCompile_usequickfix=1, this option will take no
+effect, the running result will depend on the vim's option 'autowrite'. See
+'autowrite' for more information.
+
+                                            *SingleCompile-menumode*
+                                            *g:SingleCompile_menumode*
+If you don't want the menus of SingleCompile to show, copy the following line
+to your vimrc:
+>
+ let g:SingleCompile_menumode = 0
+<
+If you want the menus of SingleCompile to show as a sub menu of Plugin, copy
+the following line to your vimrc:
+>
+ let g:SingleCompile_menumode = 1
+<
+If you want the menus of SingleCompile to show in the menu bar, copy the
+following line to your vimrc:
+>
+ let g:SingleCompile_menumode = 2
+<
+The default value is 1.
+
+                                            *SingleCompile-quickfixwindowposition*
+                                            *g:SingleCompile_quickfixwindowposition*
+If |g:SingleCompile_showquickfixiferror| is set to 1,
+|g:SingleCompile_quickfixwindowposition| defines the position where quickfix
+window shows up. The default value is "botright", but you can change this
+value by add the following line to your vimrc file:
+>
+ let g:SingleCompile_quickfixwindowposition = 'some_position'
+<
+Accepted values are "aboveleft", "topleft", "botright", "belowright",
+"vertical", "leftabove", etc. SingleCompile will simply prepend
+|g:SingleCompile_quickfixwindowposition| to 'cope' and 'cw' commands. See
+|opening-window| and 'cope' for more details.
+
+                                            *SingleCompile-resultsize*
+                                            *g:SingleCompile_resultsize*
+g:SingleCompile_resultsize is the height/width of the result displaying window
+triggered by |:SCViewResult| command. To set the value, add the following line
+to your vimrc file:
+>
+ let g:SingleCompile_resultsize = a_number
+<
+Replace a_number to any number you want, such as "10", "4". The default value
+of g:SingleCompile_resultsize is 5.
+
+                                            *SingleCompile-split*
+                                            *g:SingleCompile_split*
+g:SingleCompile_split is the command used to open the result window triggered
+by |:SCViewResult| command. To set the value, add the following line to your
+vimrc file:
+>
+ let g:SingleCompile_split = 'vsplit'
+<
+or
+>
+ let g:SingleCompile_split = 'tabe'
+<
+It is also possible to select between vertical or horizontal split depending
+on the current window width. To achieve this it is necessary to update the
+plugin options on the mapping that calls |:SCCompileRun|. This can be done in
+a new mapping, or replacing the default mapping to |:SCCompileRun|, <F10>:
+>
+ nnoremap <F10> :call SingleCompileSplit() \| SCCompileRun<CR>
+ function! SingleCompileSplit()
+    if winwidth(0) > 160
+       let g:SingleCompile_split = "vsplit"
+       let g:SingleCompile_resultsize = winwidth(0)/2
+    else
+       let g:SingleCompile_split = "split"
+       let g:SingleCompile_resultsize = 15
+    endif
+ endfunction
+<
+The default value is `'split'`.
+
+                                            *SingleCompile-showquickfixiferror*
+                                            *g:SingleCompile_showquickfixiferror*
+If |quickfix| is enabled and used, and you want the quickfix window to show
+automatically if there is a compilation error, then add the following line to
+your vimrc file:
+>
+ let g:SingleCompile_showquickfixiferror = 1
+<
+The default value of g:SingleCompile_showquickfixiferror is 0. You may want to
+use this option with |SingleCompile-silentcompileifshowquickfix|. Note that
+this option will be ignored if you are using interpreting languages on
+Windows, such as Python, Ruby. Also see |SingleCompile-showquickfixifwarning|.
+
+                                          *SingleCompile-showquickfixifwarning*
+                                          *g:SingleCompile_showquickfixifwarning*
+If |quickfix| is enabled and used, and you want the quickfix window to show
+automatically if there is a compilation warning.  This setting is only valid
+when |g:SingleCompile_showquickfixiferror| is set to 1.
+>
+ let g:SingleCompile_showquickfixifwarning = 0
+<
+The default value of g:SingleCompile_showquickfixifwarning is as same as
+g:SingleCompile_showquickfixiferror.  You don't want miss a warning, will you?
+
+                                            *SingleCompile-showresultafterrun*
+                                            *g:SingleCompile_showresultafterrun*
+If "tee" command is available on your system, copy the following line to your
+vimrc file will make vim show the result of the run automatically after you
+run the program:
+>
+ let g:SingleCompile_showresultafterrun = 1
+<
+This option is only valid for synchronous run. That is to say, asynchronous
+run is not affected by this option. The default value of
+g:SingleCompile_showresultafterrun is 0. Also see |:SCViewResult|.
+
+                                    *SingleCompile-silentcompileifshowquickfix*
+                                    *g:SingleCompile_silentcompileifshowquickfix*
+Avoid the additional hit of enter when using quickfix feature to compile.
+This is done by dismisses the output of the compilation (:silent make).  This
+feature is only valid when showquickfixiferror is enabled.  This feature won't
+enable on terminal because of the problem of screen refresh.
+>
+ let g:SingleCompile_silentcompileifshowquickfix = 1
+<
+This is not default enabled for compatible.
+
+                                            *SingleCompile-usedialog*
+                                            *g:SingleCompile_usedialog*
+If you want SingleCompile to show message in a dialog, add the
+following line to your vimrc:
+>
+ let g:SingleCompile_usedialog = 1
+<
+This setting will take no effect if your vim is not compiled with
+'+dialog_con' and '+dialog_gui'.
+
+                                          *SingleCompile-usetee*
+                                          *g:SingleCompile_usetee*
+When set to 0, the use of tee is disabled when running your compiled program.
+This would make the flush of the display of the output of your program perform
+normally but you will lose the feature of |SCViewResult|.
+>
+ let g:SingleCompile_usetee = 0
+<
+The default value of g:SingleCompile_usetee is 1.
+
+                                            *SingleCompile-usequickfix*
+                                            *g:SingleCompile_usequickfix*
+If you don't want SingleCompile to use quickfix feature, add the following
+line to your vimrc:
+>
+ let g:SingleCompile_usequickfix = 0
+<
+
+
+KEY-MAPPING~
+                                            *SingleCompile-key-mapping*
+----------------------------------------------------------------------------
+I recommend you to copy the following two lines about key mapping to your
+vimrc:
+>
+ nmap <F9> :SingleCompile<cr>
+ nmap <F10> :SingleCompileRun<cr>
+<
+Then you can press F9 to compile, and F10 to compile and run.
+
+
+COMPILER-TEMPLATE~
+                                            *SingleCompile-compiler-template*
+----------------------------------------------------------------------------
+                                          *SingleCompile-use-built-in-template*
+                                          *SingleCompile#ChooseCompiler*
+To use a built-in compiler, add the following line to your vimrc file:
+>
+ call SingleCompile#ChooseCompiler('filetype', 'compiler')
+<
+"filetype" is the type of file which your compiler is for, such as "c",
+"python", and "compiler" is the short name of the compiler. "filetype" is a
+terminology of vim. See |filetype| if you don't know what is "filetype". For
+example:
+>
+ call SingleCompile#ChooseCompiler('c', 'icc')
+ call SingleCompile#ChooseCompiler('fortran', 'gfortran')
+<
+This will choose icc (short for Intel C++ Compiler) as your current C compiler
+and choose gfortran (GNU Fortran Compiler) as your current Fortran compiler.
+For the list of built-in supported compilers, see
+|SingleCompile-built-in-compilers|.
+
+If you don't choose a compiler by yourself, SingleCompile will automatically
+choose one for you according to the compiler's priority value (See
+|SingleCompile-priority|).
+
+You can also extend the compiler template if the compiler you want is not in
+the built-in supporting list. SingleCompile#ChooseCompiler could also be used
+to choose a user defined compiler. Check |SingleCompile-add-your-compiler| for
+more information.
+
+                                          *SingleCompile-add-your-compiler*
+                                          *SingleCompile#SetCompilerTemplate*
+To add a new compiler support by yourself, there are two ways:
+1. (Recommended) Add the following lines to your vimrc file:
+>
+ call SingleCompile#SetCompilerTemplate('filetype', 'compiler', 'compiler_name', 'command', 'flag', 'run_command')
+ call SingleCompile#SetOutfile('filetype', 'compiler', 'out_file')
+ call SingleCompile#ChooseCompiler('filetype', 'compiler')
+<
+Now Let's see the first line. "filetype" is the source file type, such as "c",
+"cpp", "python", etc. It is a terminology of vim. See |filetype| if you don't
+know what is "filetype". For compiling languages such as C, Java, Fortran,
+"compiler" is the short name for the compiler, such as "gcc", "icc"; "command"
+is the command of compiling, such as "gcc", "g++"; "flag" is the flags of
+compiling, such as "-O2"; "run_command" is the command of running, such as
+"./a.out". For interpreted languages such as Python, Ruby, "command" is the
+command of interpreting, such as "python"; "flag" is the flags of
+interpreting; and "run_command" MUST be set to be empty.
+
+For the second line, "filetype" and  "compiler" has the same meanings with the
+first line. "out_file" is the output file of the compilation, such as
+"./a.out", "./a.exe", etc. This line could be omitted if you don't want
+SingleCompile to check whether compilation is needed. See
+|SingleCompile-alwayscompile| for more information.
+
+There are four special variable that you can use:
+'$(FILE_NAME)$' returns the "%".
+'$(FILE_PATH)$' returns "%:p".
+'$(FILE_TITLE)$' returns "%:r".
+'$(FILE_EXEC)$' returns "%:r.exe" on windows and "%:r" on unix.
+'$(FILE_RUN)$' returns "%:r.exe" on windows and "./%:r" on unix.
+Also see |%|.
+
+The first two lines are to set the template of your compiler, while the third
+line is to tell SingleCompile to use your compiler. If the second line is
+omitted, SingleCompile will detect the compilers available on your system
+automatically, and use the first detected one.
+
+Here are some examples modified from built-in compiler templates:
+>
+ " set the most common used run command
+ " you may also use $(FILE_RUN)$ as an alternative.
+ if has('win32') || has('win64') || has('os2')
+     let l:common_run_command = '$(FILE_TITLE)$'
+     let l:common_out_file = '$(FILE_TITLE)$.exe'
+ else
+     let l:common_run_command = './$(FILE_TITLE)$'
+     let l:common_out_file = '$(FILE_TITLE)$'
+ endif
+
+ " c
+ call SingleCompile#SetCompilerTemplate('c', 'gcc', 'GNU C Compiler',
+             \'gcc', '-o $(FILE_TITLE)$', l:common_run_command)
+ call SingleCompile#SetOutfile('c', 'gcc', l:common_out_file)
+ call SingleCompile#SetCompilerTemplate('c', 'icc',
+             \'Intel C++ Compiler', 'icc', '-o $(FILE_TITLE)$',
+             \l:common_run_command)
+ call SingleCompile#SetOutfile('c', 'icc', l:common_out_file)
+
+ call SingleCompile#ChooseCompiler('c', 'gcc')
+
+ " fortran
+ call SingleCompile#SetCompilerTemplate('fortran', 'g77',
+             \'GNU Fortran 77 Compiler', 'g77', '-o $(FILE_TITLE)$',
+             \l:common_run_command)
+ call SingleCompile#SetOutfile('fortran', 'g77', l:common_out_file)
+ call SingleCompile#SetCompilerTemplate('fortran', 'ifort',
+             \'Intel Fortran Compiler', 'ifort', '-o $(FILE_TITLE)$',
+             \l:common_run_command)
+ call SingleCompile#SetOutfile('fortran', 'ifort', l:common_out_file)
+
+ call SingleCompile#ChooseCompiler('fortran', 'g77')
+
+ " python
+ call SingleCompile#SetCompilerTemplate('python', 'python', 'CPython',
+             \'python', '', '')
+ call SingleCompile#SetCompilerTemplate('python', 'jython', 'Jython',
+             \'jython', '', '')
+
+ call SingleCompile#ChooseCompiler('python', 'jython')
+<
+
+2. (Deprecated, only kept for backward compatibility use)
+If you use this method to add a language template, many features of
+SingleCompile will be unavailable. For example, ":SCChooseCompiler" command
+will not be available. So I don't recommend you to use this method, and this
+method is kept ONLY for backward compatibility.
+
+Add the following lines to your vimrc file:
+>
+ call SingleCompile#SetTemplate('filetype', 'command', 'stringA')
+ call SingleCompile#SetTemplate('filetype', 'flags', 'stringB')
+ call SingleCompile#SetTemplate('filetype', 'run', 'stringC')
+<
+For compiling languages such as C, Java, stringA is the command of compiling,
+stringB is the flags of compiling, stringC is the command of running; For
+interpreted languages such as Python, Ruby, stringA is the command of
+interpreting, stringB is the flags of interpreting, stringC MUST be set to
+be empty.
+
+Here are some examples:
+>
+ " java
+ call SingleCompile#SetTemplate('java', 'command', 'javac')
+ call SingleCompile#SetTemplate('java', 'flags', '')
+ call SingleCompile#SetTemplate('java', 'run', 'java %<')
+
+ " python
+ call SingleCompile#SetTemplate('python', 'command', 'python')
+ call SingleCompile#SetTemplate('python', 'flags', '')
+ call SingleCompile#SetTemplate('python', 'run', '')
+
+ " latex
+ call SingleCompile#SetTemplate('tex', 'command', 'latex')
+ call SingleCompile#SetTemplate('tex', 'flags', '')
+ if has('unix')
+     call SingleCompile#SetTemplate('tex', 'run', 'xdvi %<.dvi')
+ elseif has('win32')
+     call SingleCompile#SetTemplate('tex', 'run', 'dviout %<.dvi')
+ endif
+<
+You can also use this method to modify the templates of a built-in supported
+language. For example, you can change 'dviout' to 'yap' in the example above
+to modify the built-in latex language template.
+
+Advanced: If you don't want to override the template if there is an existing
+one, but use the new template if there is no corresponding template existing,
+for example, you want to set the "command" of java language to javac if no
+command is set for java, but do nothing if the command of java is not set, use
+the following:
+>
+ call SingleCompile#SetTemplate('java', 'command', 'javac', 1)
+<
+In this way, if the command of java is already set, this sentence will do
+nothing. On the contrary, if the command of java is not set, it will set the
+compilation command of java to "javac".
+
+                                            *SingleCompile-built-in-compiler*
+The following compilers have built-in support in this plugin (For some
+compilers/interpreters, you need to set the environment varibles correctly to
+make them available for SingleCompile):
+
+Ada:
+    gnat (GNAT)
+
+bash:
+    bash (Bourne-Again Shell)
+
+C:
+    bcc (Borland C++ Builder), Windows only
+    cc (UNIX C Compiler), UNIX only
+    ch (SoftIntegration Ch)
+    clang (the Clang C and Objective-C compiler)
+    gcc (GNU C Compiler)
+    icc (Intel C++ Compiler)
+    lcc (Little C Compiler)
+    msvc (Microsoft Visual C++ (In PATH)), Windows only
+    msvc80 (Microsoft Visual C++ 2005), Windows only
+    msvc90 (Microsoft Visual C++ 2008), Windows only
+    msvc100 (Microsoft Visual C++ 2010), Windows only
+    msvc110 (Microsoft Visual C++ 2012), Windows only
+    open-watcom (Open Watcom C/C++32 Compiler)
+    open64 (Open64 C Compiler), UNIX only
+    pcc (Portable C Compiler)
+    sol-studio (Sun C Compiler(Sun Solaris Studio)), UNIX only
+    tcc (Tiny C Compiler)
+    tcc-run (Tiny C Compiler with "-run" Flag)
+
+C++:
+    bcc (Borland C++ Builder), Windows Only
+    ch (SoftIntegration Ch)
+    clang (the Clang C and Objective-C compiler)
+    g++ (GNU C++ Compiler)
+    icc (Intel C++ Compiler)
+    msvc (Microsoft Visual C++ (In PATH)), Windows only
+    msvc80 (Microsoft Visual C++ 2005), Windows only
+    msvc90 (Microsoft Visual C++ 2008), Windows only
+    msvc100 (Microsoft Visual C++ 2010), Windows only
+    msvc110 (Microsoft Visual C++ 2012), Windows only
+    open-watcom (Open Watcom C/C++32 Compiler)
+    open64 (Open64 C++ Compiler), UNIX only
+    sol-studio (Sun C++ Compiler(Sun Solaris Studio)), UNIX only
+
+C#:
+    msvcs(Microsoft Visual C#), Windows Only
+    mono (Mono C# compiler)
+
+cmake:
+    cmake (cmake)
+
+CoffeeScript:
+    coffee (CoffeeScript)
+
+csh:
+    csh (C Shell)
+    tcsh (TENEX C Shell)
+
+D:
+    dmd (DMD Compiler)
+
+dos batch:
+    dosbatch (DOS Batch)
+
+erlang:
+    escript (Erlang Scripting Support)
+
+Elixir:
+    elixir (Elixir)
+
+Fortran:
+    ftn95 (Silverfrost FTN95), Windows only
+    g77 (GNU Fortran 77 Compiler)
+    g95 (G95)
+    gfortran (GNU Fortran Compiler)
+    ifort (Intel Fortran Compiler)
+    open-watcom (Open Watcom Fortran 77/32 Compiler)
+    open64-f90 (Open64 Fortran 90 Compiler), UNIX only
+    open64-f95 (Open64 Fortran 95 Compiler), UNIX only
+    sol-studio-f77 (Sun Fortran 77 Compiler(Sun Solaris Studio)), UNIX only
+    sol-studio-f90 (Sun Fortran 90 Compiler(Sun Solaris Studio)), UNIX only
+    sol-studio-f95 (Sun Fortran 95 Compiler(Sun Solaris Studio)), UNIX only
+
+Go:
+    go (Go)
+
+Haskell:
+    ghc (Glasgow Haskell Compiler)
+    runhaskell (runhaskell)
+
+html:
+    arora (Arora)
+    chrome (Google Chrome)
+    chromium (Chromium)
+    epiphany (Epiphany)
+    firefox (Mozilla Firefox)
+    ie (Microsoft Internet Explorer)
+    konqueror (Konqueror)
+    opera (Opera)
+
+IDL(Interactive Data Language):
+    idl (ITT Visual Information Solutions Interactive Data Language)
+    gdl (GNU Data Language incremental compiler)
+
+Java:
+    gcj (GNU Java Compiler)
+    sunjdk (Sun Java Development Kit)
+
+JavaScript:
+    gjs (Javascript Bindings for GNOME)
+    js (SpiderMonkey, a JavaScript engine written in C)
+    node.js (node.js)
+    rhino (Rhino, a JavaScript engine written in Java)
+
+ksh:
+    ksh (Korn Shell)
+
+LaTeX:
+    latex (LaTeX)
+    pdflatex (pdfLaTeX)
+    latexmk (Automatic LaTeX document generation routine)
+
+LISP:
+    clisp (GNU CLISP)
+    ecl (Embeddable Common-Lisp)
+    gcl (GNU Common Lisp)
+
+LiveScript:
+    lsc (LiveScript)
+
+lua:
+    lua (Lua Interpreter)
+
+Makefile:
+    gmake (GNU Make)
+    nmake (Microsoft Program Maintenance Utility)
+    mingw32-make (MinGW32 Make)
+
+Markdown:
+    markdown (text-to-HTML conversion tool)
+    rdiscount (Discount Markdown Processor for Ruby)
+    Markdown (Python implementation of the Markdown language)
+
+Matlab:
+    matlab (MathWorks MATLAB)
+        Note: For Matlab, I highly recommend you to try out vim-matlab-behave plugin: https://github.com/elmanuelito/vim-matlab-behave
+    octave (GNU Octave)
+
+Object-C:
+    clang (the Clang C and Objective-C compiler)
+    gcc (GNU Object-C Compiler)
+
+OCaml:
+    ocaml (OCaml)
+
+Pascal:
+    fpc (Free Pascal Compiler)
+    gpc (GNU Pascal Compiler)
+
+perl:
+    perl (Perl Interpreter)
+
+PHP:
+    php (PHP Command Line Interface 'CLI')
+
+python:
+    ironpython (IronPython)
+    jython (Jython)
+    pypy (PyPy)
+    python (Python Interpreter, usually the system default Python, no matter it is Python 2 or 3.)
+    python2 (Python 2 Interpreter)
+    python3 (Python 3 Interpreter)
+
+QML:
+    qmlscene (QML Scene, for viewing QML based on QtQuick 2)
+    qmlviewer (QML Viewer, for viewing QML based on QtQuick 1)
+    Note: vim does not detect qml files out of the box.
+    See https://github.com/peterhoeg/vim-qml
+
+R:
+    R (R)
+
+reStructuredText:
+    rst2html (reST to HTML)
+
+ruby:
+    ruby (Ruby Interpreter)
+    jruby (Ruby on top of Java JVM, default mode)
+    jruby1.8 (Ruby on top of Java JVM, Ruby 1.8 mode)
+    jruby1.9 (Ruby on top of Java JVM, Ruby 1.9 mode)
+    jruby2.0 (Ruby on top of Java JVM, Ruby 2.0 mode, requires JRuby 1.7.4 or
+later)
+
+rust:
+    rustc (Rust compiler)
+
+scala:
+    scala (Scala compiler)
+    Note: vim does not detect scala files out the box.
+    See https://github.com/bjartek/scala-vim-support
+
+sh:
+    ash (Almquist Shell)
+    bash (Bourne-Again Shell)
+    dash (Debian Almquist Shell)
+    ksh (Korn Shell)
+    sh (Bourne Shell)
+    zsh (Z Shell)
+
+tcl:
+    tclsh (Simple shell containing Tcl interpreter)
+
+tcsh:
+    tcsh (TENEX C Shell)
+
+vb script:
+    vb (VB Script Interpreter)
+
+xhtml:
+    arora (Arora)
+    chrome (Google Chrome)
+    epiphany (Epiphany)
+    firefox (Mozilla Firefox)
+    ie (Microsoft Internet Explorer)
+    konqueror (Konqueror)
+    opera (Opera)
+
+zsh:
+    zsh (Z Shell)
+
+
+See |SingleCompile-add-your-compiler| to add your compiler support.
+
+
+SUPPORTINGS~
+                                            *SingleCompile-supporting-plugins*
+----------------------------------------------------------------------------
+There are some supporting code in this plugin for Marc Weber's
+vim-addon-actions:
+    http://github.com/MarcWeber/vim-addon-actions
+
+
+ADVANCED~
+                                            *SingleCompile-advanced*
+----------------------------------------------------------------------------
+This chapter is for advanced users.
+
+                                    *SingleCompile-custom-compiler-detecting*
+SingleCompile allows you to custom compiler detecting function by yourself.
+
+In |SingleCompile-compiler-template|, the following function is introduced:
+>
+ call SingleCompile#SetCompilerTemplate('filetype', 'compiler',
+             \'compiler_name', 'command', 'flag', 'run_command')
+<
+
+However, in fact, the function SingleCompile#SetCompilerTemplate could have a
+seventh parameter. The seventh parameter is a |Funcref| which references to a
+compiler detecting function. The compiler detecting function will be called in
+the function SingleCompile#SetCompilerTemplate. The compiler detecting
+function must accept one parameter, which would be passed in the "command"
+parameter in SingleCompile#SetCompilerTemplate, and return a detected compiler
+command if detected, which will be used as the compiling command by
+SingleCompile, or returns 0 if the compiler is not detected. Thus, it is more
+powerful to detect some compilers. If the seventh parameter is omitted, the
+function will use a built-in default compiler detecting function instead. The
+default function would check whether the "command" is in PATH, ~/bin,
+/usr/local/bin, /usr/bin, /bin on UNIX and whether it is in PATH on other
+OSes, and returns the full path of the command if it is not in PATH. If the
+command is not detected, the default function would return 0.
+
+Here is a short example excerpted from built-in template(OpenWatcom detecting
+function):
+>
+ function! s:DetectWatcom(compiling_command)
+     let l:watcom_command =
+                 \SingleCompile#DetectCompilerGenerally(a:compiling_command)
+     if l:watcom_command != 0
+         return l:watcom_command
+     endif
+
+     if $WATCOM != ''
+         return $WATCOM.'\binnt\'.a:compiling_command
+     endif
+ endfunction
+<
+SingleCompile#DetectCompilerGenerally is the default compiler detecting
+function introduced in the above paragraph. This function first uses a general
+way to detect the compiler. If the general way can not detect it, it check the
+environment varible "$WATCOM" to get the compiler's installation directory and
+get the full path of the compiling program.
+
+                                            *SingleCompile-predo-postdo*
+                                            *SingleCompile-predo*
+                                            *SingleCompile-postdo*
+                                            *SingleCompile#SetPredo*
+                                            *SingleCompile#SetPostdo*
+"Predo" and "Postdo" features allow you to initialize the compiler before
+compiling and clean up after compiling in you own way.
+
+"Predo" feature allows you to define a function, which would be called before
+compiling by SingleCompile, all by yourself. In the same way, "Postdo" feature
+allows you to define a function called by SingleCompile after compiling. Your
+"Predo" or "Postdo" function should accept one parameter, which would be
+passed in a dictionary containing compiling information, and return a new
+compiling information modified in the function by you. SingleCompile will use
+the new compiling information in its following work. The dictionary passed in
+is like this: >
+ {"command": "the-compiling-command", "args": "the-compiling-argument"}
+>
+Then modify the dictionary to meet your need and return the modified
+dictionary. If you don't want to modify the dictionary, please return the
+parameter passed in directly.
+
+The two functions below provide a way to set the "Predo" and "Postdo"
+functions:
+>
+ call SingleCompile#SetPredo('filetype', 'compiler',
+             \function('your_predo_function'))
+ call SingleCompile#SetPostdo('filetype', 'compiler',
+             \function('your_postdo_function'))
+<
+
+Example: OpenWatcom's "Predo" and "Postdo" functions:
+>
+ " pre-do
+ function! s:PredoWatcom(compiling_info)
+     let s:old_path = $PATH
+     let $PATH = $WATCOM.s:GetPathSeperator().'binnt'.s:GetEnvSeperator().
+                 \$WATCOM.s:GetPathSeperator().'binw'.s:GetEnvSeperator().
+                 \$PATH
+     return a:compiling_info
+ endfunction
+
+ " post-do
+ function! s:PostdoWatcom(compiling_info) " watcom pre-do {{{2
+     let $PATH = s:old_path
+     return a:compiling_info
+ endfunction
+
+ call SingleCompile#SetPredo('c', 'open-watcom', function('s:PredoWatcom'))
+ call SingleCompile#SetPostdo('c', 'open-watcom', function('s:PostdoWatcom'))
+<
+As you see, the OpenWatcom "Predo" function first saves the current PATH
+environment varible, then modifies $PATH to meet the OpenWatcom compiler needs.
+It returns the original compiling info because it does not need to modify it.
+The OpenWatcom "Postdo" function restores the original $PATH. After defining
+the two functions, the example calls "SetPredo" and "SetPostdo" function to
+set the functions as the "Predo" function and "Postdo" function for
+corresponding language and compiler.
+
+
+To make it less confusing, I better explain the calling order here. The
+calling order is: first the compiler detecting function, then "Predo"
+function, then compile, and the last is the "Postdo" function.
+
+                                            *SingleCompile-vim-compiler*
+                                            *SingleCompile#SetVimCompiler*
+SingleCompile can work with the compiler feature of vim(see |:compiler|). To
+set the compiler file in the compiler direcotry for a compiler, use
+SingleCompile#SetVimCompiler function. For example, for g77, the GNU Fortran
+77 compiler, use the following line to set the compiler file for g77:
+>
+ call SingleCompile#SetVimCompiler('fortran', 'g77', 'fortran_g77')
+<
+(This line is excerpted from the built-in templates.)
+
+Then if we are using g77 as our compiler, SingleCompile will first execute
+":compiler fortran_g77" before compiling the source file. This will give us
+the advantage that vim's quickfix will recognize the messages output by g77
+and help us locate these errors quickly.
+
+                                            *SingleCompile-priority*
+                                            *SingleCompile#SetPriority*
+Since version 2.9, every compiler template could be assigned a priority value.
+This value determines which compiler to use when seversal compilers has been
+detected. Use the following line to set a compiler's priority:
+>
+ call SingleCompile#SetPriority('language_name', 'compiler_name', priority)
+<
+The parameter "priority" is an integer. The smaller the parameter "priority"
+is, the higher priority the compiler has. For example, the following two lines
+set two Fortran compilers' priorities (The two lines are excerpted from the
+built-in template):
+>
+ call SingleCompile#SetPriority('fortran', 'gfortran', 70)
+ call SingleCompile#SetPriority('fortran', 'ifort', 80)
+<
+After executing the two lines above, if ifort (which is Intel Fortran
+Compiler) and gfortran (GNU fortran compiler) are both detected by
+SingleCompile, and the user does not call |SingleCompile#ChooseCompiler| to
+choose a compiler explicitly, SingleCompile will choose gfortran as the
+current compiler.
+
+CREDITS~
+                                            *SingleCompile-credits*
+----------------------------------------------------------------------------
+Marc Weber  Integrated SingleCompile with vim-addon-actions, and some other
+            improvements
+Darek       Fixed a directory switching bug
+sky hi      Provided DMD compiler for D language built-in template
+Zhou Yichao Made several improvements and fixed several bugs.
+
+
+TODO~
+                                            *SingleCompile-todo*
+----------------------------------------------------------------------------
+Add asynchronous compilation support.
+
+If "tee" is used when we are executing ":make" command, currently we can't get
+the exit code of the compiler. We need to fix this.
+
+When running compiled program, if "tee" is used for redirecting, things
+written to stdout are not printed as if what happens when stdout is a tty.
+This need to be fixed.
+
+Make it possible to store compiler template in config files, such as ini
+files.
+
+Reduce startup time and shrink memory use.
+
+vim:ts=4:ft=help:tw=78:et
diff --git a/vim/plugins/singlecompile/mkzip.sh b/vim/plugins/singlecompile/mkzip.sh
new file mode 100755
index 0000000..3517ae5
--- /dev/null
+++ b/vim/plugins/singlecompile/mkzip.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+zip SingleCompile.zip autoload/*.vim autoload/SingleCompile/templates/*.vim plugin/*.vim doc/*.txt
diff --git a/vim/plugins/singlecompile/plugin/SingleCompile.vim b/vim/plugins/singlecompile/plugin/SingleCompile.vim
new file mode 100644
index 0000000..03366af
--- /dev/null
+++ b/vim/plugins/singlecompile/plugin/SingleCompile.vim
@@ -0,0 +1,148 @@
+" Copyright (C) 2010-2014 Hong Xu
+
+" This file is part of SingleCompile.
+
+" SingleCompile 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 3 of the License, or
+" (at your option) any later version.
+
+" SingleCompile 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 SingleCompile.  If not, see <http://www.gnu.org/licenses/>.
+
+" File: plugin/SingleCompile.vim
+" GetLatestVimScripts: 3115 1 SingleCompile.zip
+" version 2.12.0
+" check doc/SingleCompile.txt for more version information
+
+if v:version < 700
+    finish
+endif
+
+" check whether this script is already loaded
+if exists("g:loaded_SingleCompile")
+    finish
+endif
+let g:loaded_SingleCompile = 1
+
+let s:saved_cpo = &cpo
+set cpo&vim
+
+
+" commands {{{1
+command -nargs=* SCCompile
+            \ if <q-args> == '' | call SingleCompile#Compile() |
+            \ else | call SingleCompile#Compile(<q-args>) | endif
+command -nargs=* SCCompileRun
+            \ if <q-args> == '' | call SingleCompile#CompileRun() |
+            \ else | call SingleCompile#CompileRun(<q-args>) | endif
+command -nargs=* SCCompileRunAsync
+            \ if <q-args> == '' | call SingleCompile#CompileRunAsync() |
+            \ else | call SingleCompile#CompileRunAsync(<q-args>) | endif
+command -nargs=* SingleCompile
+            \ if <q-args> == '' | call SingleCompile#Compile() |
+            \ else | call SingleCompile#Compile(<q-args>) | endif
+command -nargs=* SingleCompileRun
+            \ if <q-args> == '' | call SingleCompile#CompileRun() |
+            \ else | call SingleCompile#CompileRun(<q-args>) | endif
+command -nargs=+ SCCompileAF
+            \ call SingleCompile#Compile('AdditionalFlags', <q-args>)
+command -nargs=+ SCCompileRunAF
+            \ call SingleCompile#CompileRun('AdditionalFlags', <q-args>)
+command -nargs=+ SCCompileRunAsyncAF
+            \ call SingleCompile#CompileRunAsync('AdditionalFlags', <q-args>)
+command SCIsRunningAsync
+            \ if SingleCompileAsync#IsRunning() == 1 |
+            \ echo 'The background process is running.' |
+            \ else |
+            \ echo 'The background process is not running.' |
+            \ endif
+command SCTerminateAsync
+            \ if SingleCompileAsync#Terminate() |
+            \ echohl ErrorMsg |
+            \ echo 'Failed to terminate the background process!' |
+            \ echohl None |
+            \ else |
+            \ echo 'Background process terminated.' |
+            \ endif
+command SCChooseCompiler call SingleCompile#ChooseCompiler(&filetype)
+command SCChooseInterpreter call SingleCompile#ChooseCompiler(&filetype)
+command SCViewResult call SingleCompile#ViewResult(0)
+command SCViewResultAsync call SingleCompile#ViewResult(1)
+
+" menus {{{1
+
+if !exists('g:SingleCompile_menumode')
+    let g:SingleCompile_menumode = 1
+endif
+
+if has('gui_running') && has('menu')
+    if g:SingleCompile_menumode == 1
+        let s:menu_root = 'Plugin.SingleCompile'
+    elseif g:SingleCompile_menumode == 2
+        let s:menu_root = 'SingleCompile'
+    endif
+
+    " if g:SingleCompile_menumode is not 1 or 2, then we don't need to create
+    " menu
+    if g:SingleCompile_menumode == 1 || g:SingleCompile_menumode == 2
+        for s:menu_textcmd in [
+                    \ '&Compile<tab>:SCCompile '.
+                    \ ':SCCompile<cr>',
+                    \
+                    \ 'Compile\ and\ &Run<tab>:SCCompileRun '.
+                    \ ':SCCompileRun<cr>',
+                    \
+                    \ 'Compile\ and\ Run &Asynchronously'.
+                    \ '<tab>:SCCompileRunAsync'.
+                    \ ':SCCompileRunAsync<cr>',
+                    \
+                    \ 'C&hoose\ Compiler<tab>:SCChooseCompiler '.
+                    \ ':SCChooseCompiler<cr>',
+                    \
+                    \ '&View\ Result<tab>:SCViewResult '.
+                    \ ':SCViewResult<cr>',
+                    \
+                    \ 'V&iew\ Result\ of\ Asynchronous\ Running'.
+                    \ '<tab>:SCViewResultAsync '.
+                    \ ':SCViewResultAsync<cr>',
+                    \
+                    \ '&Terminate\ the\ Background\ Asynchronous\ Process'.
+                    \ '<tab>:SCTerminateAsync '.
+                    \ ':SCTerminateAsync<cr>'
+                    \ ]
+
+            for s:menu_type in ['nnoremenu', 'inoremenu', 'vnoremenu']
+                exec s:menu_type.' '.s:menu_root.'.'.s:menu_textcmd
+            endfor
+        endfor
+
+        unlet! s:menu_root
+        unlet! s:menu_type
+        unlet! s:menu_textcmd
+    endif
+endif
+
+" }}}
+
+
+" vim-addon-actions support (activate this addon after vim-addon-actions) {{{
+" eg call scriptmanager#Activate(["vim-addon-actions","SingleCompile"])
+if exists('g:vim_actions')
+    for cmd in ['SingleCompile','SingleCompileRun']
+        call actions#AddAction('run '.cmd,
+                    \{'action': funcref#Function('return '.string([cmd]))})
+    endfor
+endif
+"}}}
+
+let &cpo = s:saved_cpo
+unlet! s:saved_cpo
+
+" vim703: cc=78
+" vim:fdm=marker et ts=4 tw=78 sw=4
diff --git a/vim/plugins/supertab/.gitignore b/vim/plugins/supertab/.gitignore
new file mode 100644
index 0000000..8d4efa7
--- /dev/null
+++ b/vim/plugins/supertab/.gitignore
@@ -0,0 +1,4 @@
+*.swp
+*.vmb
+doc/tags
+/README.html
diff --git a/vim/plugins/supertab/Makefile b/vim/plugins/supertab/Makefile
new file mode 100644
index 0000000..7a3c371
--- /dev/null
+++ b/vim/plugins/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/supertab/README.rst b/vim/plugins/supertab/README.rst
new file mode 100644
index 0000000..89bafdb
--- /dev/null
+++ b/vim/plugins/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/supertab/doc/supertab.txt b/vim/plugins/supertab/doc/supertab.txt
new file mode 100644
index 0000000..941a9a0
--- /dev/null
+++ b/vim/plugins/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/supertab/ftplugin/html.vim b/vim/plugins/supertab/ftplugin/html.vim
new file mode 100644
index 0000000..4bd2385
--- /dev/null
+++ b/vim/plugins/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/supertab/ftplugin/xml.vim b/vim/plugins/supertab/ftplugin/xml.vim
new file mode 100644
index 0000000..2b23d88
--- /dev/null
+++ b/vim/plugins/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/supertab/plugin/supertab.vim b/vim/plugins/supertab/plugin/supertab.vim
new file mode 100644
index 0000000..ba8f4dd
--- /dev/null
+++ b/vim/plugins/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/syntastic/.gitignore b/vim/plugins/syntastic/.gitignore
new file mode 100644
index 0000000..cc07c93
--- /dev/null
+++ b/vim/plugins/syntastic/.gitignore
@@ -0,0 +1,4 @@
+*~
+*.swp
+tags
+.DS_Store
diff --git a/vim/plugins/syntastic/CONTRIBUTING.md b/vim/plugins/syntastic/CONTRIBUTING.md
new file mode 100644
index 0000000..44eb13f
--- /dev/null
+++ b/vim/plugins/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/syntastic/LICENCE b/vim/plugins/syntastic/LICENCE
new file mode 100644
index 0000000..8b1a9d8
--- /dev/null
+++ b/vim/plugins/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/syntastic/README.markdown b/vim/plugins/syntastic/README.markdown
new file mode 100644
index 0000000..8f0e460
--- /dev/null
+++ b/vim/plugins/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, CMake, 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, Julia, 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`, `statusline`, 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/syntastic/_assets/screenshot_1.png b/vim/plugins/syntastic/_assets/screenshot_1.png
new file mode 100644
index 0000000..c1b69f4
Binary files /dev/null and b/vim/plugins/syntastic/_assets/screenshot_1.png differ
diff --git a/vim/plugins/syntastic/autoload/syntastic/c.vim b/vim/plugins/syntastic/autoload/syntastic/c.vim
new file mode 100644
index 0000000..e49a29a
--- /dev/null
+++ b/vim/plugins/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/syntastic/autoload/syntastic/log.vim b/vim/plugins/syntastic/autoload/syntastic/log.vim
new file mode 100644
index 0000000..d6d41a2
--- /dev/null
+++ b/vim/plugins/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/syntastic/autoload/syntastic/postprocess.vim b/vim/plugins/syntastic/autoload/syntastic/postprocess.vim
new file mode 100644
index 0000000..136fa58
--- /dev/null
+++ b/vim/plugins/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/syntastic/autoload/syntastic/preprocess.vim b/vim/plugins/syntastic/autoload/syntastic/preprocess.vim
new file mode 100644
index 0000000..43a1b9a
--- /dev/null
+++ b/vim/plugins/syntastic/autoload/syntastic/preprocess.vim
@@ -0,0 +1,681 @@
+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#bandit(errors) abort " {{{2
+    let out = []
+    let json = s:_decode_JSON(join(a:errors, ''))
+
+    if type(json) == type({}) && has_key(json, 'results') && type(json['results']) == type([])
+        for issue in json['results']
+            if type(issue) == type({})
+                try
+                    call add(out,
+                        \ issue['filename'] . ':' .
+                        \ issue['line_number'] . ':' .
+                        \ { 'LOW': 'I', 'MEDIUM': 'W', 'HIGH': 'E' }[issue['issue_severity']] . ':' .
+                        \ issue['test_id'][1:] . ':' .
+                        \ issue['issue_text'] .
+                        \ ' [' . issue['test_name'] .  '] (confidence: ' . issue['issue_confidence'] . ')')
+                catch /\m^Vim\%((\a\+)\)\=:E716/
+                    call syntastic#log#warn('checker python/bandit: unrecognized error item ' . string(issue))
+                    let out = []
+                    break
+                endtry
+            else
+                call syntastic#log#warn('checker python/bandit: unrecognized error item ' . string(issue))
+            endif
+        endfor
+    else
+        call syntastic#log#warn('checker python/bandit: unrecognized error format (crashed checker?)')
+    endif
+
+    return out
+endfunction " }}}2
+
+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#dscanner(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, 'issues') && type(errs['issues']) == type([])
+        for issue in errs['issues']
+            try
+                call add(out,
+                    \ issue['fileName'] . ':' .
+                    \ issue['line'] . ':' .
+                    \ issue['column'] . ':' .
+                    \ issue['message'] . ' [' . issue['key'] . ']')
+            catch /\m^Vim\%((\a\+)\)\=:E716/
+                call syntastic#log#warn('checker d/dscanner: unrecognized error item ' . string(issue))
+                let out = []
+                break
+            endtry
+        endfor
+    else
+        call syntastic#log#warn('checker d/dscanner: 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 = join(a:errors, '')
+    if errs ==# ''
+        return []
+    endif
+
+    let json = s:_decode_JSON(errs)
+
+    let out = []
+    if type(json) == type({}) && has_key(json, 'messages')
+        if type(json['messages']) == type([])
+            for e in json['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
+    else
+        call syntastic#log#warn('checker python/prospector: unrecognized error format (crashed checker?)')
+    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, ''\v^((ERROR|WARNING): )?\zs(\([^)]+\))\s(.+)$'', ''\4 \3'', "")')
+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/syntastic/autoload/syntastic/util.vim b/vim/plugins/syntastic/autoload/syntastic/util.vim
new file mode 100644
index 0000000..6ead9ea
--- /dev/null
+++ b/vim/plugins/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(buf) abort " {{{2
+    for lnum in range(1, 5)
+        let line = get(getbufline(a:buf, lnum), 0, '')
+        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/syntastic/doc/syntastic-checkers.txt b/vim/plugins/syntastic/doc/syntastic-checkers.txt
new file mode 100644
index 0000000..38248b0
--- /dev/null
+++ b/vim/plugins/syntastic/doc/syntastic-checkers.txt
@@ -0,0 +1,7547 @@
+*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|
+    CMake....................................|syntastic-checkers-cmake|
+    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|
+    Julia....................................|syntastic-checkers-julia|
+
+    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. cppclean.................|syntastic-c-cppclean|
+    7. Flawfinder...............|syntastic-c-flawfinder|
+    8. GCC......................|syntastic-c-gcc|
+    9. make.....................|syntastic-c-make|
+    10. OClint..................|syntastic-c-oclint|
+    11. PC-Lint.................|syntastic-c-pc_lint|
+    12. Sparse..................|syntastic-c-sparse|
+    13. 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. cppclean                                             *syntastic-c-cppclean*
+
+Name:        cppclean
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"cppclean" attempts to find problems in C++ source that slow development in
+large code bases, for example various forms of unused code. See the project's
+page at GitHub for more information:
+
+    https://github.com/myint/cppclean
+
+Installation~
+
+Install it with "pip": >
+    pip install cppclean
+<
+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-cpp-cppclean|.
+
+------------------------------------------------------------------------------
+7. Flawfinder                                         *syntastic-c-flawfinder*
+
+Name:        flawfinder
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Flawfinder" scans C/C++ source code for possible security weaknesses. See the
+project's page for more information:
+
+    https://www.dwheeler.com/flawfinder
+
+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_c_flawfinder_thres'*
+Type: integer
+Default: 3
+Error threshold. Policy violations with a severity above this value are
+highlighted as errors, the others are considered warnings by syntastic.
+
+See also: |syntastic-cpp-flawfinder|.
+
+------------------------------------------------------------------------------
+8. 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|.
+
+------------------------------------------------------------------------------
+9. 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|.
+
+------------------------------------------------------------------------------
+10. 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|.
+
+------------------------------------------------------------------------------
+11. 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|.
+
+------------------------------------------------------------------------------
+12. 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.
+
+------------------------------------------------------------------------------
+13. 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. cppclean.................|syntastic-cpp-cppclean|
+    6. Cpplint..................|syntastic-cpp-cpplint|
+    7. Flawfinder...............|syntastic-cpp-flawfinder|
+    8. GCC......................|syntastic-cpp-gcc|
+    9. OClint...................|syntastic-cpp-oclint|
+    10. PC-Lint.................|syntastic-cpp-pc_lint|
+    11. 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. cppclean                                           *syntastic-cpp-cppclean*
+
+Name:        cppclean
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"cppclean" attempts to find problems in C++ source that slow development in
+large code bases, for example various forms of unused code. See the project's
+page at GitHub for more information:
+
+    https://github.com/myint/cppclean
+
+Installation~
+
+Install it with "pip": >
+    pip install cppclean
+<
+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-c-cppclean|.
+
+------------------------------------------------------------------------------
+6. 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"
+<
+------------------------------------------------------------------------------
+7. Flawfinder                                       *syntastic-cpp-flawfinder*
+
+Name:        flawfinder
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Flawfinder" scans C/C++ source code for possible security weaknesses. See the
+project's page for more information:
+
+    https://www.dwheeler.com/flawfinder
+
+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_flawfinder_thres'*
+Type: integer
+Default: 3
+Error threshold. Policy violations with a severity above this value are
+highlighted as errors, the others are considered warnings by syntastic.
+
+See also: |syntastic-c-flawfinder|.
+
+------------------------------------------------------------------------------
+8. 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|.
+
+------------------------------------------------------------------------------
+9. 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|.
+
+------------------------------------------------------------------------------
+10. 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|.
+
+------------------------------------------------------------------------------
+11. 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 CMAKE                           *syntastic-checkers-cmake*
+
+The following checkers are available for CMake (filetype "cmake"):
+
+    1. cmakelint................|syntastic-cmake-cmakelint|
+
+------------------------------------------------------------------------------
+1. cmakelint                                       *syntastic-cmake-cmakelint*
+
+Name:        cmakelint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"cmakelint" is a style checker for "CMake" files (https://cmake.org/).
+See the project's page at GitHub more information:
+
+    https://github.com/richq/cmake-lint
+
+Installation~
+
+Install it with "pip": >
+    pip install cmakelint
+<
+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 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|
+    2. D-Scanner................|syntastic-d-dscanner|
+
+------------------------------------------------------------------------------
+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.
+
+------------------------------------------------------------------------------
+2. D-Scanner                                            *syntastic-d-dscanner*
+
+Name:        dscanner
+Maintainer:  ANtlord
+
+"D-Scanner" is a tool for analyzing D source code (https://dlang.org/). See
+the project's page at GitHub for more information:
+
+    https://github.com/Hackerpilot/Dscanner
+
+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 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|
+    2. Hadolint.................|syntastic-dockerfile-hadolint|
+
+------------------------------------------------------------------------------
+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|.
+
+------------------------------------------------------------------------------
+2. Hadolint                                    *syntastic-dockerfile-hadolint*
+
+Name:        hadolint
+Maintainer:  Jesper B. Rosenkilde <jbr@humppa.dk>
+
+"Hadolint" is a dockerfile linter written in Haskell. See the project's page
+at GitHub for details:
+
+    https://github.com/lukasmartinelli/hadolint
+
+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. Dennis...................|syntastic-po-dennis|
+    2. msgfmt...................|syntastic-po-msgfmt|
+
+------------------------------------------------------------------------------
+1. Dennis                                                *syntastic-po-dennis*
+
+Name:        dennis
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Dennis" is a set of utilities for working with gettext Portable Object
+(http://www.gnu.org/software/gettext/manual/html_node/PO-Files.html)
+translation files:
+
+    https://github.com/willkg/dennis/
+
+See the program's manual for further details:
+
+    http://dennis.readthedocs.io/en/latest/linting.html
+
+Installation~
+
+Install it with "pip": >
+    pip install dennis
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+------------------------------------------------------------------------------
+2. 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.34.0 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 JULIA                           *syntastic-checkers-julia*
+
+The following checkers are available for Julia (filetype "julia"):
+
+    1. lint.....................|syntastic-julia-lint|
+
+------------------------------------------------------------------------------
+1. lint                                                 *syntastic-julia-lint*
+
+Name:        lint
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+This is a checker for Julia files (https://julialang.org/), using the Julia
+package "Lint". See the package's documentation for more information:
+
+    http://lintjl.readthedocs.io/
+
+Installation~
+
+You need to install Julia itself, and the package "Lint". You can install
+"Lint" from the Julia package manager, with the command: >
+    Pkg.add("Lint")
+<
+Checker Options~
+
+This checker doesn't call the "makeprgBuild()" function, and thus it ignores
+the usual 'g:syntastic_julia_lint_<option>' variables. The only exception is
+'g:syntastic_julia_lint_exec', which can still be used to override the "julia"
+executable.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Julia files, such as
+"julia-vim":
+
+    https://github.com/JuliaEditorSupport/julia-vim
+
+==============================================================================
+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|
+    5. PHPStan..................|syntastic-php-phpstan|
+
+------------------------------------------------------------------------------
+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|.
+
+------------------------------------------------------------------------------
+5. PHP Static Analysis Tool                            *syntastic-php-phpstan*
+
+Name:        phpstan
+Maintainer:  Przepompownia <przepompownia@users.noreply.github.com>
+
+"PHPStan" focuses on finding errors in your code without actually running it.
+See the project's page iat GitHub for details:
+
+    https://github.com/phpstan/phpstan
+
+Syntastic supports "PHPStan" 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|.
+
+==============================================================================
+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. Bandit...................|syntastic-python-bandit|
+    2. flake8...................|syntastic-python-flake8|
+    3. Frosted..................|syntastic-python-frosted|
+    4. mypy.....................|syntastic-python-mypy|
+    5. Prospector...............|syntastic-python-prospector|
+    6. py3kwarn.................|syntastic-python-py3kwarn|
+    7. pycodestyle..............|syntastic-python-pycodestyle|
+    8. pydocstyle...............|syntastic-python-pydocstyle|
+    9. Pyflakes.................|syntastic-python-pyflakes|
+    10. Pylama..................|syntastic-python-pylama|
+    11. Pylint..................|syntastic-python-pylint|
+    12. python..................|syntastic-python-python|
+
+------------------------------------------------------------------------------
+1. Bandit                                            *syntastic-python-bandit*
+
+Name:        bandit
+Maintainer:  LCD 47 <lcd047@gmail.com>
+
+"Bandit" is an AST-based static analyzer for Python from OpenStack Security
+Group (http://openstack.org). See the project's official documentation for
+details:
+
+    https://wiki.openstack.org/wiki/Security/Projects/Bandit
+
+Installation~
+
+Install it with "pip": >
+    pip install bandit
+<
+Checker options~
+
+This checker is initialised using the "makeprgBuild()" function and thus it
+accepts the standard options described at |syntastic-config-makeprg|.
+
+Note~
+
+In order to check all files in a project, rather than the current file: >
+    let g:syntastic_python_bandit_fname = ['/path/to/project']
+    let g:syntastic_python_bandit_args = '-r'
+<
+------------------------------------------------------------------------------
+2. 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|.
+
+------------------------------------------------------------------------------
+3. 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|.
+
+------------------------------------------------------------------------------
+4. 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|.
+
+------------------------------------------------------------------------------
+5. 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|.
+
+------------------------------------------------------------------------------
+6. 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|.
+
+------------------------------------------------------------------------------
+7. 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|.
+
+------------------------------------------------------------------------------
+8. 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|.
+
+------------------------------------------------------------------------------
+9. 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|.
+
+------------------------------------------------------------------------------
+10. 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|.
+
+------------------------------------------------------------------------------
+11. 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}"'
+<
+------------------------------------------------------------------------------
+12. 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. lintr....................|syntastic-r-lintr|
+    2. svtools..................|syntastic-r-svtools|
+
+------------------------------------------------------------------------------
+1. 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|.
+
+------------------------------------------------------------------------------
+2. 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
+<
+Note~
+
+You probably also need a plugin to set |filetype| for Slim files, such as
+"vim-slim":
+
+     https://github.com/slim-template/vim-slim
+
+------------------------------------------------------------------------------
+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|.
+
+Note~
+
+You probably also need a plugin to set |filetype| for Slim files, such as
+"vim-slim":
+
+     https://github.com/slim-template/vim-slim
+
+==============================================================================
+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|
+    2. Solium...................|syntastic-solidity-solium|
+
+------------------------------------------------------------------------------
+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
+
+------------------------------------------------------------------------------
+2. Solium                                          *syntastic-solidity-solium*
+
+Name:        solium
+Maintainer:  Matthijs van den Bos <matthijs@vandenbos.org>
+
+"Solium" is a linter for "Solidity" files. See the project's page for details:
+
+    https://github.com/duaraghav8/Solium
+
+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/syntastic/doc/syntastic.txt b/vim/plugins/syntastic/doc/syntastic.txt
new file mode 100644
index 0000000..8bc455d
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic.vim b/vim/plugins/syntastic/plugin/syntastic.vim
new file mode 100644
index 0000000..d7d0705
--- /dev/null
+++ b/vim/plugins/syntastic/plugin/syntastic.vim
@@ -0,0 +1,795 @@
+"============================================================================
+"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-56'
+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',
+            \ 'statusline',
+            \ '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
+
+" XXX Ugly hack to make g:_SYNTASTIC_UNAME available to :SyntasticInfo without
+" polluting session namespaces
+let g:syntastic_version =
+    \ g:_SYNTASTIC_VERSION .
+    \ ' (Vim ' . v:version . (has('nvim') ? ', Neovim' : '') . ', ' .
+    \ g:_SYNTASTIC_UNAME .
+    \ (has('gui') ? ', GUI' : '') . ')'
+lockvar g:syntastic_version
+
+" }}}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 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/syntastic/plugin/syntastic/autoloclist.vim b/vim/plugins/syntastic/plugin/syntastic/autoloclist.vim
new file mode 100644
index 0000000..415d5ab
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/balloons.vim b/vim/plugins/syntastic/plugin/syntastic/balloons.vim
new file mode 100644
index 0000000..fdd70bf
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/checker.vim b/vim/plugins/syntastic/plugin/syntastic/checker.vim
new file mode 100644
index 0000000..345d2f0
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/cursor.vim b/vim/plugins/syntastic/plugin/syntastic/cursor.vim
new file mode 100644
index 0000000..f59d87b
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/highlighting.vim b/vim/plugins/syntastic/plugin/syntastic/highlighting.vim
new file mode 100644
index 0000000..a9e1a08
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/loclist.vim b/vim/plugins/syntastic/plugin/syntastic/loclist.vim
new file mode 100644
index 0000000..3ad9375
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/modemap.vim b/vim/plugins/syntastic/plugin/syntastic/modemap.vim
new file mode 100644
index 0000000..74b09a7
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/notifiers.vim b/vim/plugins/syntastic/plugin/syntastic/notifiers.vim
new file mode 100644
index 0000000..6a3b823
--- /dev/null
+++ b/vim/plugins/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/syntastic/plugin/syntastic/registry.vim b/vim/plugins/syntastic/plugin/syntastic/registry.vim
new file mode 100644
index 0000000..4efd509
--- /dev/null
+++ b/vim/plugins/syntastic/plugin/syntastic/registry.vim
@@ -0,0 +1,441 @@
+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'],
+        \ 'cmake':         ['cmakelint'],
+        \ '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'],
+        \ 'julia':         [],
+        \ '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/syntastic/plugin/syntastic/signs.vim b/vim/plugins/syntastic/plugin/syntastic/signs.vim
new file mode 100644
index 0000000..e3bafa0
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/actionscript/mxmlc.vim b/vim/plugins/syntastic/syntax_checkers/actionscript/mxmlc.vim
new file mode 100644
index 0000000..1066769
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ada/gcc.vim b/vim/plugins/syntastic/syntax_checkers/ada/gcc.vim
new file mode 100644
index 0000000..6072ae4
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ansible/ansible_lint.vim b/vim/plugins/syntastic/syntax_checkers/ansible/ansible_lint.vim
new file mode 100644
index 0000000..fe62581
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/apiblueprint/drafter.vim b/vim/plugins/syntastic/syntax_checkers/apiblueprint/drafter.vim
new file mode 100644
index 0000000..e404a4f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/applescript/osacompile.vim b/vim/plugins/syntastic/syntax_checkers/applescript/osacompile.vim
new file mode 100644
index 0000000..406e029
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/asciidoc/asciidoc.vim b/vim/plugins/syntastic/syntax_checkers/asciidoc/asciidoc.vim
new file mode 100644
index 0000000..bc64e6a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/asciidoc/proselint.vim b/vim/plugins/syntastic/syntax_checkers/asciidoc/proselint.vim
new file mode 100644
index 0000000..7bc719f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/asl/iasl.vim b/vim/plugins/syntastic/syntax_checkers/asl/iasl.vim
new file mode 100644
index 0000000..0aae5d2
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/asm/gcc.vim b/vim/plugins/syntastic/syntax_checkers/asm/gcc.vim
new file mode 100644
index 0000000..f6a8b41
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/asm/gcc.vim
@@ -0,0 +1,62 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    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(buf)) })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetDialect(buf) " {{{2
+    return syntastic#util#bufVar(a:buf, 'asm_dialect', fnamemodify(bufname(a:buf), ':e') ==? '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/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim b/vim/plugins/syntastic/syntax_checkers/bemhtml/bemhtmllint.vim
new file mode 100644
index 0000000..1837067
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/bro/bro.vim b/vim/plugins/syntastic/syntax_checkers/bro/bro.vim
new file mode 100644
index 0000000..cea441b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/avrgcc.vim b/vim/plugins/syntastic/syntax_checkers/c/avrgcc.vim
new file mode 100644
index 0000000..a412497
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/checkpatch.vim b/vim/plugins/syntastic/syntax_checkers/c/checkpatch.vim
new file mode 100644
index 0000000..43b047c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/clang_check.vim b/vim/plugins/syntastic/syntax_checkers/c/clang_check.vim
new file mode 100644
index 0000000..4c3677a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/clang_tidy.vim b/vim/plugins/syntastic/syntax_checkers/c/clang_tidy.vim
new file mode 100644
index 0000000..6d8cbfe
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/cppcheck.vim b/vim/plugins/syntastic/syntax_checkers/c/cppcheck.vim
new file mode 100644
index 0000000..cd802a8
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/cppclean.vim b/vim/plugins/syntastic/syntax_checkers/c/cppclean.vim
new file mode 100644
index 0000000..bddd979
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/c/cppclean.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        cppclean.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_c_cppclean_checker')
+    finish
+endif
+let g:loaded_syntastic_c_cppclean_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_cppclean_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'cppclean' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/c/flawfinder.vim b/vim/plugins/syntastic/syntax_checkers/c/flawfinder.vim
new file mode 100644
index 0000000..f47912c
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/c/flawfinder.vim
@@ -0,0 +1,61 @@
+"============================================================================
+"File:        flawfinder.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_c_flawfinder_checker')
+    finish
+endif
+let g:loaded_syntastic_c_flawfinder_checker = 1
+
+if !exists('g:syntastic_c_flawfinder_sort')
+    let g:syntastic_c_flawfinder_sort = 1
+endif
+
+if !exists('g:syntastic_c_flawfinder_thres')
+    let g:syntastic_c_flawfinder_thres = 3
+endif
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_c_flawfinder_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m^(\S\+)\s\+\zs\S\+\ze:')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_c_flawfinder_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--columns --dataonly --singleline --quiet' })
+
+    let errorformat = '%f:%l:%c:  [%n] %m'
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0] })
+
+    for e in loclist
+        let e['type'] = e['nr'] < g:syntastic_{self.getFiletype()}_flawfinder_thres ? 'W' : 'E'
+        let e['nr'] = 0
+    endfor
+
+    return loclist
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'c',
+    \ 'name': 'flawfinder' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/c/gcc.vim b/vim/plugins/syntastic/syntax_checkers/c/gcc.vim
new file mode 100644
index 0000000..4fa9216
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/make.vim b/vim/plugins/syntastic/syntax_checkers/c/make.vim
new file mode 100644
index 0000000..e477994
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/oclint.vim b/vim/plugins/syntastic/syntax_checkers/c/oclint.vim
new file mode 100644
index 0000000..f172a11
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/pc_lint.vim b/vim/plugins/syntastic/syntax_checkers/c/pc_lint.vim
new file mode 100644
index 0000000..0f7f9da
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/c/pc_lint.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"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 buf = bufnr('')
+    let config = syntastic#util#findFileInParent(g:syntastic_pc_lint_config_file, fnamemodify(bufname(buf), ':p:h'))
+    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/syntastic/syntax_checkers/c/sparse.vim b/vim/plugins/syntastic/syntax_checkers/c/sparse.vim
new file mode 100644
index 0000000..ca831c0
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/c/splint.vim b/vim/plugins/syntastic/syntax_checkers/c/splint.vim
new file mode 100644
index 0000000..a4e19f0
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cabal/cabal.vim b/vim/plugins/syntastic/syntax_checkers/cabal/cabal.vim
new file mode 100644
index 0000000..6aa58af
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/cabal/cabal.vim
@@ -0,0 +1,56 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.getExecEscaped() . ' check'
+
+    let errorformat =
+        \ '%Ecabal: %f:%l: %m,' .
+        \ '%W* %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'cwd': fnamemodify(bufname(buf), ':p:h'),
+        \ 'preprocess': 'cabal',
+        \ 'defaults': {'bufnr': buf} })
+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/syntastic/syntax_checkers/chef/foodcritic.vim b/vim/plugins/syntastic/syntax_checkers/chef/foodcritic.vim
new file mode 100644
index 0000000..84d9af1
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cmake/cmakelint.vim b/vim/plugins/syntastic/syntax_checkers/cmake/cmakelint.vim
new file mode 100644
index 0000000..8468608
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/cmake/cmakelint.vim
@@ -0,0 +1,40 @@
+"============================================================================
+"File:        cmakelint.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_cmake_cmakelint_checker')
+    finish
+endif
+let g:loaded_syntastic_cmake_cmakelint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_cmake_cmakelint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%f:%l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cmake',
+    \ 'name': 'cmakelint' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/co/coco.vim b/vim/plugins/syntastic/syntax_checkers/co/coco.vim
new file mode 100644
index 0000000..9be5d7d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cobol/cobc.vim b/vim/plugins/syntastic/syntax_checkers/cobol/cobc.vim
new file mode 100644
index 0000000..0cff0cc
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/coffee/coffee.vim b/vim/plugins/syntastic/syntax_checkers/coffee/coffee.vim
new file mode 100644
index 0000000..3b521fc
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/coffee/coffeelint.vim b/vim/plugins/syntastic/syntax_checkers/coffee/coffeelint.vim
new file mode 100644
index 0000000..befdbc8
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/coq/coqtop.vim b/vim/plugins/syntastic/syntax_checkers/coq/coqtop.vim
new file mode 100644
index 0000000..6385554
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/avrgcc.vim b/vim/plugins/syntastic/syntax_checkers/cpp/avrgcc.vim
new file mode 100644
index 0000000..cc48b74
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/clang_check.vim b/vim/plugins/syntastic/syntax_checkers/cpp/clang_check.vim
new file mode 100644
index 0000000..cf9ec0c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/clang_tidy.vim b/vim/plugins/syntastic/syntax_checkers/cpp/clang_tidy.vim
new file mode 100644
index 0000000..770d1f6
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/cppcheck.vim b/vim/plugins/syntastic/syntax_checkers/cpp/cppcheck.vim
new file mode 100644
index 0000000..4e0eb86
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/cppclean.vim b/vim/plugins/syntastic/syntax_checkers/cpp/cppclean.vim
new file mode 100644
index 0000000..f2afa4c
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/cpp/cppclean.vim
@@ -0,0 +1,22 @@
+"============================================================================
+"File:        cppclean.vim
+"Description: Syntax checking plugin for syntastic
+"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_cppclean_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_cppclean_checker = 1
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'cppclean',
+    \ 'redirect': 'c/cppclean'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/cpp/cpplint.vim b/vim/plugins/syntastic/syntax_checkers/cpp/cpplint.vim
new file mode 100644
index 0000000..54984bb
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/flawfinder.vim b/vim/plugins/syntastic/syntax_checkers/cpp/flawfinder.vim
new file mode 100644
index 0000000..a003982
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/cpp/flawfinder.vim
@@ -0,0 +1,26 @@
+"============================================================================
+"File:        flawfinder.vim
+"Description: Syntax checking plugin for syntastic
+"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_flawfinder_checker')
+    finish
+endif
+let g:loaded_syntastic_cpp_flawfinder_checker = 1
+
+if !exists('g:syntastic_cpp_flawfinder_thres')
+    let g:syntastic_cpp_flawfinder_thres = 3
+endif
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'cpp',
+    \ 'name': 'flawfinder',
+    \ 'redirect': 'c/flawfinder'})
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/cpp/gcc.vim b/vim/plugins/syntastic/syntax_checkers/cpp/gcc.vim
new file mode 100644
index 0000000..1243980
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/oclint.vim b/vim/plugins/syntastic/syntax_checkers/cpp/oclint.vim
new file mode 100644
index 0000000..8217769
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/pc_lint.vim b/vim/plugins/syntastic/syntax_checkers/cpp/pc_lint.vim
new file mode 100644
index 0000000..a7c95e8
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cpp/verapp.vim b/vim/plugins/syntastic/syntax_checkers/cpp/verapp.vim
new file mode 100644
index 0000000..af1fd8c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cs/mcs.vim b/vim/plugins/syntastic/syntax_checkers/cs/mcs.vim
new file mode 100644
index 0000000..4544a93
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/csslint.vim b/vim/plugins/syntastic/syntax_checkers/css/csslint.vim
new file mode 100644
index 0000000..2d3702b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/mixedindentlint.vim b/vim/plugins/syntastic/syntax_checkers/css/mixedindentlint.vim
new file mode 100644
index 0000000..a0ce3ba
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/phpcs.vim b/vim/plugins/syntastic/syntax_checkers/css/phpcs.vim
new file mode 100644
index 0000000..a065f0e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/prettycss.vim b/vim/plugins/syntastic/syntax_checkers/css/prettycss.vim
new file mode 100644
index 0000000..b531f49
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/recess.vim b/vim/plugins/syntastic/syntax_checkers/css/recess.vim
new file mode 100644
index 0000000..ce6d5ae
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/css/stylelint.vim b/vim/plugins/syntastic/syntax_checkers/css/stylelint.vim
new file mode 100644
index 0000000..58c7dec
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cucumber/cucumber.vim b/vim/plugins/syntastic/syntax_checkers/cucumber/cucumber.vim
new file mode 100644
index 0000000..8a48690
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/cuda/nvcc.vim b/vim/plugins/syntastic/syntax_checkers/cuda/nvcc.vim
new file mode 100644
index 0000000..9601e73
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/cuda/nvcc.vim
@@ -0,0 +1,93 @@
+"============================================================================
+"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 buf = bufnr('')
+    let arch_flag = syntastic#util#bufVar(buf, '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'], fnamemodify(bufname(buf), ':e'), 0, 1) >= 0
+        if syntastic#util#bufVar(buf, 'cuda_check_header', 0)
+            let dummy = fnamemodify(bufname(buf), ':p:h') . 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,
+        \ 'defaults': {'type': 'E'} })
+
+    for e in loclist
+        let pat = matchstr(e['text'], '\m\c^\s*warning:\s*\zs.*')
+        if pat !=# ''
+            let e['text'] = pat
+            let e['type'] = 'W'
+        endif
+    endfor
+
+    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/syntastic/syntax_checkers/d/dmd.vim b/vim/plugins/syntastic/syntax_checkers/d/dmd.vim
new file mode 100644
index 0000000..de00b8e
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/d/dmd.vim
@@ -0,0 +1,133 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    if !exists('g:syntastic_d_include_dirs')
+        let g:syntastic_d_include_dirs = s:GetIncludes(self, fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/d/dscanner.vim b/vim/plugins/syntastic/syntax_checkers/d/dscanner.vim
new file mode 100644
index 0000000..5f64e3a
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/d/dscanner.vim
@@ -0,0 +1,48 @@
+"============================================================================
+"File:        dscanner.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  ANtlord
+"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_d_dscanner_checker')
+    finish
+endif
+let g:loaded_syntastic_d_dscanner_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_d_dscanner_GetHighlightRegex(i)
+    let term = matchstr(a:i['text'], '\m^.\{-}''\zs\S\+\ze''')
+    return term !=# '' ? '\V\<' . escape(term, '\') . '\>' : ''
+endfunction
+
+function! SyntaxCheckers_d_dscanner_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--report',
+        \ 'tail': '2>' . syntastic#util#DevNull() })
+
+    let errorformat = '%f:%l:%c:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'preprocess': 'dscanner',
+        \ 'subtype': 'Style',
+        \ 'returns': [0] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'd',
+    \ 'name': 'dscanner' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/dart/dartanalyzer.vim b/vim/plugins/syntastic/syntax_checkers/dart/dartanalyzer.vim
new file mode 100644
index 0000000..7afc5e5
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/dart/dartanalyzer.vim
@@ -0,0 +1,79 @@
+"============================================================================
+"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
+    if !exists('s:format_machine')
+        let s:format_machine = syntastic#util#versionIsAtLeast(self.getVersion(), [1, 23]) ? '--format=machine' : '--machine'
+    endif
+    let makeprg = self.makeprgBuild({ 'args_after': s:format_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/syntastic/syntax_checkers/docbk/igor.vim b/vim/plugins/syntastic/syntax_checkers/docbk/igor.vim
new file mode 100644
index 0000000..5448861
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/docbk/xmllint.vim b/vim/plugins/syntastic/syntax_checkers/docbk/xmllint.vim
new file mode 100644
index 0000000..30d66d2
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim b/vim/plugins/syntastic/syntax_checkers/dockerfile/dockerfile_lint.vim
new file mode 100644
index 0000000..4858a6b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/dockerfile/hadolint.vim b/vim/plugins/syntastic/syntax_checkers/dockerfile/hadolint.vim
new file mode 100644
index 0000000..4fd45b3
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/dockerfile/hadolint.vim
@@ -0,0 +1,41 @@
+"============================================================================
+"File:        hadolint.vim
+"Description: Dockerfile linter written in Haskell
+"             (http://hadolint.lukasmartinelli.ch/).
+"Maintainer:  Jesper B. Rosenkilde <jbr at humppa dot 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_dockerfile_hadolint_checker')
+    finish
+endif
+let g:loaded_syntastic_dockerfile_hadolint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_dockerfile_hadolint_GetLocList() dict
+    let makeprg = self.makeprgBuild({})
+
+    let errorformat = '%W%f:%l %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'dockerfile',
+    \ 'name': 'hadolint'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/dustjs/swiffer.vim b/vim/plugins/syntastic/syntax_checkers/dustjs/swiffer.vim
new file mode 100644
index 0000000..8edf1d5
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/elixir/elixir.vim b/vim/plugins/syntastic/syntax_checkers/elixir/elixir.vim
new file mode 100644
index 0000000..939520e
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/elixir/elixir.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"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 buf = bufnr('')
+    let make_options = {}
+    let compile_command = 'elixir'
+    let mix_file = syntastic#util#findFileInParent('mix.exs', fnamemodify(bufname(buf), ':p:h'))
+
+    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/syntastic/syntax_checkers/erlang/erlang_check_file.erl b/vim/plugins/syntastic/syntax_checkers/erlang/erlang_check_file.erl
new file mode 100755
index 0000000..8988434
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/erlang/erlang_check_file.erl
@@ -0,0 +1,284 @@
+#!/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.
+    Profile = which_compile_opts_profile(filename:absname(File)),
+    CompileOpts = case which_build_tool(Dir, Profile) of
+        {rebar, RebarFile} ->
+            %% `rebar.config` might contain relative paths.
+            %% They are relative to the file! Not to the project root.
+            %% rebar specific begin
+            rebar_opts(RebarFile);
+            %% rebar specific end
+        {erlangmk, ErlangMkDir} ->
+            %% Erlang.mk specific begin
+            erlangmk_opts(ErlangMkDir, Profile);
+            %% Erlang.mk specific end
+        undefined ->
+            fallback_opts()
+    end,
+    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, CompileOpts));
+
+main(_) ->
+    io:format("Usage: ~s <file>~n", [escript:script_name()]),
+    halt(1).
+
+which_compile_opts_profile(File) ->
+    case filename:basename(filename:dirname(File)) of
+        "test" -> test;
+        _      -> normal
+    end.
+
+which_build_tool(Dir, Profile) ->
+    %% rebar specific begin
+    RebarFile = rebar_file(Dir, Profile),
+    %% rebar specific end
+    case filelib:is_file(RebarFile) of
+        true ->
+            {rebar, RebarFile};
+        false ->
+            %% Erlang.mk specific begin
+            ErlangMk = erlangmk_file(Dir),
+            %% Erlang.mk specific end
+            case filelib:is_file(ErlangMk) of
+                true  -> {erlangmk, Dir};
+                false -> undefined
+            end
+    end.
+
+rebar_file(Dir, normal) -> filename:join(Dir, "rebar.config");
+rebar_file(Dir, test)   -> filename:join(Dir, "rebar.test.config").
+
+erlangmk_file(Dir) -> filename:join(Dir, "erlang.mk").
+
+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.
+
+erlangmk_opts(BaseDir, Profile) ->
+    Make =
+        case os:getenv("MAKE") of
+            false ->
+                case os:find_executable("gmake") of
+                    false -> "make";
+                    Path  -> Path
+                end;
+            Cmd ->
+                case (lists:member($/, Cmd) orelse lists:member($\\, Cmd)) of
+                    true  -> Cmd;
+                    false -> os:find_executable(Cmd)
+                end
+        end,
+    ERLC_OPTS_Target =
+        case Profile of
+            normal -> "show-ERLC_OPTS";
+            test   -> "show-TEST_ERLC_OPTS"
+        end,
+    Args = [
+        "--no-print-directory",
+        "-C", BaseDir,
+        "show-ERL_LIBS",
+        ERLC_OPTS_Target
+    ],
+    try
+        Port = erlang:open_port({spawn_executable, Make}, [
+            {args, Args},
+            exit_status, use_stdio, stderr_to_stdout]),
+        case erlangmk_port_receive_loop(Port, "", BaseDir) of
+            {error, _} ->
+                fallback_opts();
+            {ok, {ErlLibs, ErlcOpts}} ->
+                [code:add_pathsa(filelib:wildcard(
+                                   filename:join([ErlLib, "*", "ebin"])))
+                 || ErlLib <- ErlLibs],
+                ErlcOpts
+        end
+    catch
+        error:_ ->
+            fallback_opts()
+    end.
+
+erlangmk_port_receive_loop(Port, Stdout, BaseDir) ->
+    receive
+        {Port, {exit_status, 0}} ->
+            erlangmk_format_opts(Stdout, BaseDir);
+        {Port, {exit_status, _}} ->
+            {error, {erlangmk, make_target_failure}};
+        {Port, {data, Out}} ->
+            erlangmk_port_receive_loop(Port, Stdout ++ Out, BaseDir)
+    end.
+
+erlangmk_format_opts(Stdout, BaseDir) ->
+    case string:tokens(Stdout, "\n") of
+        [ErlLibsLine | ErlcOptsLines] ->
+            ErlLibs = erlangmk_format_erl_libs(ErlLibsLine),
+            ErlcOpts = erlangmk_format_erlc_opts(ErlcOptsLines, BaseDir),
+            {ok, {ErlLibs, ErlcOpts}};
+        _ ->
+            {error, {erlangmk, incorrect_output}}
+    end.
+
+erlangmk_format_erl_libs(ErlLibsLine) ->
+    case os:type() of
+        {win32, _} -> string:tokens(ErlLibsLine, ";");
+        _          -> string:tokens(ErlLibsLine, ":")
+    end.
+
+erlangmk_format_erlc_opts(ErlcOptsLines, BaseDir) ->
+    erlangmk_format_erlc_opts(ErlcOptsLines, [], BaseDir).
+
+erlangmk_format_erlc_opts(["+" ++ Option | Rest], Opts, BaseDir) ->
+    case make_term(Option) of
+        {error, _} -> erlangmk_format_erlc_opts(Rest, Opts, BaseDir);
+        Opt        -> erlangmk_format_erlc_opts(Rest, [Opt | Opts], BaseDir)
+    end;
+erlangmk_format_erlc_opts(["-I" ++ Opt | Rest], Opts, BaseDir)
+  when Opt =/= "" ->
+    erlangmk_format_erlc_opts(["-I", Opt | Rest], Opts, BaseDir);
+erlangmk_format_erlc_opts(["-I", [C | _] = Dir | Rest], Opts, BaseDir)
+  when C =/= $- andalso C =/= $+ ->
+    AbsDir = filename:absname(Dir, BaseDir),
+    erlangmk_format_erlc_opts(Rest, [{i, AbsDir} | Opts], BaseDir);
+erlangmk_format_erlc_opts(["-W" ++ Warn | Rest], Opts, BaseDir)
+  when Warn =/= "" ->
+    erlangmk_format_erlc_opts(["-W", Warn | Rest], Opts, BaseDir);
+erlangmk_format_erlc_opts(["-W", Warn | Rest], Opts, BaseDir) ->
+    case Warn of
+        "all" ->
+            erlangmk_format_erlc_opts(Rest, [{warn_format, 999} | Opts],
+                BaseDir);
+        "error" ->
+            erlangmk_format_erlc_opts(Rest, [warnings_as_errors | Opts],
+                BaseDir);
+        "" ->
+            erlangmk_format_erlc_opts(Rest, [{warn_format, 1} | Opts],
+                BaseDir);
+        _ ->
+            try list_to_integer(Warn) of
+                Level ->
+                    erlangmk_format_erlc_opts(Rest,
+                        [{warn_format, Level} | Opts], BaseDir)
+            catch
+                error:badarg ->
+                    erlangmk_format_erlc_opts(Rest, Opts, BaseDir)
+            end
+    end;
+erlangmk_format_erlc_opts(["-D" ++ Opt | Rest], Opts, BaseDir)
+  when Opt =/= "" ->
+    erlangmk_format_erlc_opts(["-D", Opt | Rest], Opts, BaseDir);
+erlangmk_format_erlc_opts(["-D", [C | _] = Val0 | Rest], Opts, BaseDir)
+  when C =/= $- andalso C =/= $+ ->
+    {Key0, Val1} = split_at_equals(Val0, []),
+    Key = list_to_atom(Key0),
+    case Val1 of
+        [] ->
+            erlangmk_format_erlc_opts(Rest, [{d, Key} | Opts], BaseDir);
+        Val2 ->
+            case make_term(Val2) of
+                {error, _} ->
+                    erlangmk_format_erlc_opts(Rest, Opts, BaseDir);
+                Val ->
+                    erlangmk_format_erlc_opts(Rest, [{d, Key, Val} | Opts], BaseDir)
+            end
+    end;
+erlangmk_format_erlc_opts([PathFlag, [_ | _] = Dir | Rest], Opts, BaseDir)
+  when PathFlag =:= "-pa" orelse PathFlag =:= "-pz" ->
+    AbsDir = filename:absname(Dir, BaseDir),
+    case PathFlag of
+        "-pa" -> code:add_patha(AbsDir);
+        "-pz" -> code:add_pathz(AbsDir)
+    end,
+    erlangmk_format_erlc_opts(Rest, Opts, BaseDir);
+erlangmk_format_erlc_opts([_ | Rest], Opts, BaseDir) ->
+    erlangmk_format_erlc_opts(Rest, Opts, BaseDir);
+erlangmk_format_erlc_opts([], Opts, _) ->
+    lists:reverse(Opts).
+
+%% Function imported from erl_compile.erl from Erlang 19.1.
+make_term(Str) ->
+    case erl_scan:string(Str) of
+        {ok, Tokens, _} ->
+            case erl_parse:parse_term(Tokens ++ [{dot, 1}]) of
+                {ok, Term}      -> Term;
+                {error, Reason} -> {error, Reason}
+            end;
+        {error, Reason, _} ->
+            {error, Reason}
+    end.
+
+%% Function imported from erl_compile.erl from Erlang 19.1.
+split_at_equals([$=|T], Acc) ->
+    {lists:reverse(Acc),T};
+split_at_equals([H|T], Acc) ->
+    split_at_equals(T, [H|Acc]);
+split_at_equals([], Acc) ->
+    {lists:reverse(Acc),[]}.
+
+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/syntastic/syntax_checkers/erlang/escript.vim b/vim/plugins/syntastic/syntax_checkers/erlang/escript.vim
new file mode 100644
index 0000000..f931e6b
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/erlang/escript.vim
@@ -0,0 +1,63 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+
+    if fnamemodify(bufname(buf), ':e') ==# 'hrl'
+        return []
+    endif
+
+    let shebang = syntastic#util#parseShebang(buf)
+    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(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/erlang/syntaxerl.vim b/vim/plugins/syntastic/syntax_checkers/erlang/syntaxerl.vim
new file mode 100644
index 0000000..45f4735
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/eruby/ruby.vim b/vim/plugins/syntastic/syntax_checkers/eruby/ruby.vim
new file mode 100644
index 0000000..4850eee
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/eruby/ruby.vim
@@ -0,0 +1,83 @@
+"============================================================================
+"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 buf = bufnr('')
+    let fname = "'" . escape(bufname(buf), "\\'") . "'"
+
+    " 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': buf, '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/syntastic/syntax_checkers/fortran/gfortran.vim b/vim/plugins/syntastic/syntax_checkers/fortran/gfortran.vim
new file mode 100644
index 0000000..fffaf30
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/glsl/cgc.vim b/vim/plugins/syntastic/syntax_checkers/glsl/cgc.vim
new file mode 100644
index 0000000..e51f833
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/glsl/cgc.vim
@@ -0,0 +1,66 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': '-oglsl -profile ' . s:GetProfile(buf),
+        \ '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(buf) " {{{2
+    let profile = matchstr(get(filter(getbufline(a:buf, 1, 100), 'v:val =~# "\\m\\C^//\\s*profile:"'), 0, ''), '\m\C^//\s*profile:\s*\zs.*')
+    if profile ==# ''
+        let extensions = syntastic#util#bufVar(a:buf, 'glsl_extensions', s:glsl_extensions)
+        let profile = get(extensions, tolower(fnamemodify(bufname(a:buf), ':e')), '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/syntastic/syntax_checkers/go/go.vim b/vim/plugins/syntastic/syntax_checkers/go/go.vim
new file mode 100644
index 0000000..c45de08
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/go/go.vim
@@ -0,0 +1,104 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+
+    " 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 bufname(buf) =~# '\m_test\.go$'
+        let cmd = 'test -c'
+        let opts = syntastic#util#bufVar(buf, 'go_go_test_args', s:go_new ? '-buildmode=archive' : '')
+        let cleanup = 1
+    else
+        let cmd = 'build'
+        let opts = syntastic#util#bufVar(buf, 'go_go_build_args', s:go_new ? '-buildmode=archive' : '')
+        let cleanup = 0
+    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': fnamemodify(bufname(buf), ':p:h'),
+        \ 'env': {'GOGC': 'off'},
+        \ 'defaults': {'type': 'e'} })
+
+    if cleanup
+        call delete(fnamemodify(bufname(buf), ':p:h') . syntastic#util#Slash() . fnamemodify(bufname(buf), ':p:h') . '.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/syntastic/syntax_checkers/go/gofmt.vim b/vim/plugins/syntastic/syntax_checkers/go/gofmt.vim
new file mode 100644
index 0000000..bdb6218
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/go/golint.vim b/vim/plugins/syntastic/syntax_checkers/go/golint.vim
new file mode 100644
index 0000000..29eee0c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/go/gometalinter.vim b/vim/plugins/syntastic/syntax_checkers/go/gometalinter.vim
new file mode 100644
index 0000000..1e084fc
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/go/gometalinter.vim
@@ -0,0 +1,54 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-t',
+        \ 'fname': syntastic#util#shescape(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/go/gotype.vim b/vim/plugins/syntastic/syntax_checkers/go/gotype.vim
new file mode 100644
index 0000000..fefe3a4
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/go/gotype.vim
@@ -0,0 +1,65 @@
+"============================================================================
+"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 buf = bufnr('')
+
+    if !exists('s:go_new')
+        let command = syntastic#util#shescape(syntastic#util#bufVar(buf, 'go_go_exec', 'go')) . ' version'
+        let version_output = syntastic#util#system(command)
+        call self.log('finding go version: ' . 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)
+            let s:go_new = syntastic#util#versionIsAtLeast(parsed_ver, [1, 8])
+        else
+            call syntastic#log#error("checker " . self.getCName() . ": can't parse go version (abnormal termination?)")
+            return []
+        endif
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'args': (bufname(buf) =~# '\m_test\.go$' ? (s:go_new ? '-t' : '-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': fnamemodify(bufname(buf), ':p:h'),
+        \ '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/syntastic/syntax_checkers/go/govet.vim b/vim/plugins/syntastic/syntax_checkers/go/govet.vim
new file mode 100644
index 0000000..1d8015c
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/go/govet.vim
@@ -0,0 +1,49 @@
+"============================================================================
+"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 buf = bufnr('')
+    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': fnamemodify(bufname(buf), ':p:h'),
+        \ '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/syntastic/syntax_checkers/haml/haml.vim b/vim/plugins/syntastic/syntax_checkers/haml/haml.vim
new file mode 100644
index 0000000..c0c7318
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/haml/haml_lint.vim b/vim/plugins/syntastic/syntax_checkers/haml/haml_lint.vim
new file mode 100644
index 0000000..60b3db3
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/handlebars/handlebars.vim b/vim/plugins/syntastic/syntax_checkers/handlebars/handlebars.vim
new file mode 100644
index 0000000..f5ae742
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/haskell/hdevtools.vim b/vim/plugins/syntastic/syntax_checkers/haskell/hdevtools.vim
new file mode 100644
index 0000000..18346f7
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/haskell/hdevtools.vim
@@ -0,0 +1,57 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'check',
+        \ 'fname': syntastic#util#shescape(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/haskell/hlint.vim b/vim/plugins/syntastic/syntax_checkers/haskell/hlint.vim
new file mode 100644
index 0000000..949a21b
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/haskell/hlint.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'fname': syntastic#util#shescape(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/haskell/scan.vim b/vim/plugins/syntastic/syntax_checkers/haskell/scan.vim
new file mode 100644
index 0000000..7cf7e7b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/haxe/haxe.vim b/vim/plugins/syntastic/syntax_checkers/haxe/haxe.vim
new file mode 100644
index 0000000..c799624
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/haxe/haxe.vim
@@ -0,0 +1,64 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    let hxml = syntastic#util#bufRawVar(buf, 'vaxe_hxml')
+    if hxml ==# ''
+        let hxml = syntastic#util#findGlobInParent('*.hxml', fnamemodify(bufname(buf), ':p:h'))
+    endif
+    let hxml = fnamemodify(hxml, ':p')
+
+    call self.log('hxml =', hxml)
+
+    if hxml !=# ''
+        let makeprg = self.makeprgBuild({
+            \ 'fname': syntastic#util#shescape(fnamemodify(hxml, ':t')),
+            \ 'args_after' :  ['--no-output'] })
+
+        let errorformat =
+            \ '%W%f:%l: characters %c-%n : Warning : %m,' .
+            \ '%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/syntastic/syntax_checkers/help/proselint.vim b/vim/plugins/syntastic/syntax_checkers/help/proselint.vim
new file mode 100644
index 0000000..53ea385
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/hss/hss.vim b/vim/plugins/syntastic/syntax_checkers/hss/hss.vim
new file mode 100644
index 0000000..d988615
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/eslint.vim b/vim/plugins/syntastic/syntax_checkers/html/eslint.vim
new file mode 100644
index 0000000..3e91931
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/gjslint.vim b/vim/plugins/syntastic/syntax_checkers/html/gjslint.vim
new file mode 100644
index 0000000..a26e2f3
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/htmlhint.vim b/vim/plugins/syntastic/syntax_checkers/html/htmlhint.vim
new file mode 100644
index 0000000..3518b7e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/jshint.vim b/vim/plugins/syntastic/syntax_checkers/html/jshint.vim
new file mode 100644
index 0000000..a7af758
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/proselint.vim b/vim/plugins/syntastic/syntax_checkers/html/proselint.vim
new file mode 100644
index 0000000..fc364df
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/textlint.vim b/vim/plugins/syntastic/syntax_checkers/html/textlint.vim
new file mode 100644
index 0000000..b95d8be
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/tidy.vim b/vim/plugins/syntastic/syntax_checkers/html/tidy.vim
new file mode 100644
index 0000000..3075a7d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/html/validator.vim b/vim/plugins/syntastic/syntax_checkers/html/validator.vim
new file mode 100644
index 0000000..2fbb158
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/html/validator.vim
@@ -0,0 +1,70 @@
+"============================================================================
+"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 buf = bufnr('')
+    let fname = syntastic#util#shescape(fnamemodify(bufname(buf), ':p'))
+    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/syntastic/syntax_checkers/html/w3.vim b/vim/plugins/syntastic/syntax_checkers/html/w3.vim
new file mode 100644
index 0000000..8701f99
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/html/w3.vim
@@ -0,0 +1,63 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.getExecEscaped() . ' -q -L -s -F output=json ' .
+        \ '-F uploaded_file=@' . syntastic#util#shescape(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/jade/jade_lint.vim b/vim/plugins/syntastic/syntax_checkers/jade/jade_lint.vim
new file mode 100644
index 0000000..32cc808
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/java/checkstyle.vim b/vim/plugins/syntastic/syntax_checkers/java/checkstyle.vim
new file mode 100644
index 0000000..5301832
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/java/checkstyle.vim
@@ -0,0 +1,87 @@
+"============================================================================
+"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
+
+    let buf = bufnr('')
+
+    " 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( fnamemodify(bufname(buf), ':p:h') . syntastic#util#Slash() . fnamemodify(bufname(buf), ':t') )
+    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/syntastic/syntax_checkers/java/javac.vim b/vim/plugins/syntastic/syntax_checkers/java/javac.vim
new file mode 100644
index 0000000..3b5b234
--- /dev/null
+++ b/vim/plugins/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, '$')
+    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, '$')
+    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/syntastic/syntax_checkers/javascript/closurecompiler.vim b/vim/plugins/syntastic/syntax_checkers/javascript/closurecompiler.vim
new file mode 100644
index 0000000..41c1346
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/javascript/closurecompiler.vim
@@ -0,0 +1,77 @@
+"============================================================================
+"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 buf = bufnr('')
+    let flist = expand(syntastic#util#bufVar(buf, 'javascript_closurecompiler_file_list'), 1)
+    if filereadable(flist)
+        let file_list = map( readfile(flist), 'expand(v:var, 1)' )
+    else
+        let file_list = [bufname(buf)]
+    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/syntastic/syntax_checkers/javascript/eslint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/eslint.vim
new file mode 100644
index 0000000..437bc55
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/flow.vim b/vim/plugins/syntastic/syntax_checkers/javascript/flow.vim
new file mode 100644
index 0000000..5bed76f
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/javascript/flow.vim
@@ -0,0 +1,68 @@
+"============================================================================
+"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, 34])
+endfunction
+
+function! SyntaxCheckers_javascript_flow_GetLocList() dict
+    let buf = bufnr('')
+    if syntastic#util#findFileInParent('.flowconfig', fnamemodify(bufname(buf), ':p:h')) ==# ''
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': self.getExecEscaped() . ' status',
+        \ 'args_after': '--quiet --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/syntastic/syntax_checkers/javascript/gjslint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/gjslint.vim
new file mode 100644
index 0000000..3368905
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/jscs.vim b/vim/plugins/syntastic/syntax_checkers/javascript/jscs.vim
new file mode 100644
index 0000000..d259086
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/jshint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/jshint.vim
new file mode 100644
index 0000000..492aa69
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/jsl.vim b/vim/plugins/syntastic/syntax_checkers/javascript/jsl.vim
new file mode 100644
index 0000000..aa9862b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/jslint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/jslint.vim
new file mode 100644
index 0000000..e2ce76c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/jsxhint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/jsxhint.vim
new file mode 100644
index 0000000..e29ce06
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/mixedindentlint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/mixedindentlint.vim
new file mode 100644
index 0000000..2995409
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/standard.vim b/vim/plugins/syntastic/syntax_checkers/javascript/standard.vim
new file mode 100644
index 0000000..e652bd0
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/javascript/tern_lint.vim b/vim/plugins/syntastic/syntax_checkers/javascript/tern_lint.vim
new file mode 100644
index 0000000..547942b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/json/jsonlint.vim b/vim/plugins/syntastic/syntax_checkers/json/jsonlint.vim
new file mode 100644
index 0000000..9a89c78
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/json/jsonval.vim b/vim/plugins/syntastic/syntax_checkers/json/jsonval.vim
new file mode 100644
index 0000000..2a756b6
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/julia/lint.vim b/vim/plugins/syntastic/syntax_checkers/julia/lint.vim
new file mode 100644
index 0000000..bf660d0
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/julia/lint.vim
@@ -0,0 +1,51 @@
+"============================================================================
+"File:        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_julia_lint_checker')
+    finish
+endif
+let g:loaded_syntastic_julia_lint_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_julia_lint_GetHighlightRegex(item)
+    let term = matchstr(a:item['text'], '\m^\S\+\ze:')
+    return term !=# '' ? '\V' . escape(term, '\') : ''
+endfunction
+
+function! SyntaxCheckers_julia_lint_IsAvailable() dict
+    return
+        \ executable(self.getExec()) &&
+        \ syntastic#util#system(self.getExecEscaped() . ' -e ' . syntastic#util#shescape('import Lint')) ==# '' &&
+        \ v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_julia_lint_GetLocList() dict
+    let buf = bufnr('')
+
+    let makeprg = self.getExecEscaped() . ' -e ' . syntastic#util#shescape('using Lint; display(filter(err -> !isinfo(err), lintfile("' . escape(bufname(buf), '\"') . '")))')
+
+    let errorformat = '%f:%l %t%n %m'
+
+    return SyntasticMake({ 'makeprg': makeprg, 'errorformat': errorformat })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'julia',
+    \ 'name': 'lint',
+    \ 'exec': 'julia' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/less/less-lint.coffee b/vim/plugins/syntastic/syntax_checkers/less/less-lint.coffee
new file mode 100644
index 0000000..0b05e4a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/less/less-lint.js b/vim/plugins/syntastic/syntax_checkers/less/less-lint.js
new file mode 100644
index 0000000..5abc653
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/less/lessc.vim b/vim/plugins/syntastic/syntax_checkers/less/lessc.vim
new file mode 100644
index 0000000..ad4035e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/less/recess.vim b/vim/plugins/syntastic/syntax_checkers/less/recess.vim
new file mode 100644
index 0000000..1a8d876
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/lex/flex.vim b/vim/plugins/syntastic/syntax_checkers/lex/flex.vim
new file mode 100644
index 0000000..82cbf10
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/limbo/limbo.vim b/vim/plugins/syntastic/syntax_checkers/limbo/limbo.vim
new file mode 100644
index 0000000..0c639f9
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/limbo/limbo.vim
@@ -0,0 +1,47 @@
+"============================================================================
+"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 buf = bufnr('')
+    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 bufname(buf) =~# '\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/syntastic/syntax_checkers/lisp/clisp.vim b/vim/plugins/syntastic/syntax_checkers/lisp/clisp.vim
new file mode 100644
index 0000000..26de435
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/llvm/llvm.vim b/vim/plugins/syntastic/syntax_checkers/llvm/llvm.vim
new file mode 100644
index 0000000..7e90314
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/lua/luac.vim b/vim/plugins/syntastic/syntax_checkers/lua/luac.vim
new file mode 100644
index 0000000..f37e923
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/lua/luacheck.vim b/vim/plugins/syntastic/syntax_checkers/lua/luacheck.vim
new file mode 100644
index 0000000..5c8521d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/markdown/mdl.vim b/vim/plugins/syntastic/syntax_checkers/markdown/mdl.vim
new file mode 100644
index 0000000..17dc86d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/markdown/proselint.vim b/vim/plugins/syntastic/syntax_checkers/markdown/proselint.vim
new file mode 100644
index 0000000..3f27574
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/markdown/textlint.vim b/vim/plugins/syntastic/syntax_checkers/markdown/textlint.vim
new file mode 100644
index 0000000..3419d4d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/matlab/mlint.vim b/vim/plugins/syntastic/syntax_checkers/matlab/mlint.vim
new file mode 100644
index 0000000..dfb1593
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/mercury/mmc.vim b/vim/plugins/syntastic/syntax_checkers/mercury/mmc.vim
new file mode 100644
index 0000000..75ee654
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/nasm/nasm.vim b/vim/plugins/syntastic/syntax_checkers/nasm/nasm.vim
new file mode 100644
index 0000000..9797d84
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/nasm/nasm.vim
@@ -0,0 +1,42 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-X gnu' .
+        \       ' -I ' . syntastic#util#shescape(fnamemodify(bufname(buf), ':p:h') . 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/syntastic/syntax_checkers/nix/nix.vim b/vim/plugins/syntastic/syntax_checkers/nix/nix.vim
new file mode 100644
index 0000000..f3c449d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/nroff/igor.vim b/vim/plugins/syntastic/syntax_checkers/nroff/igor.vim
new file mode 100644
index 0000000..dcad8c5
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/nroff/mandoc.vim b/vim/plugins/syntastic/syntax_checkers/nroff/mandoc.vim
new file mode 100644
index 0000000..8efc4ce
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/nroff/proselint.vim b/vim/plugins/syntastic/syntax_checkers/nroff/proselint.vim
new file mode 100644
index 0000000..d969490
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/objc/gcc.vim b/vim/plugins/syntastic/syntax_checkers/objc/gcc.vim
new file mode 100644
index 0000000..73da7f8
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/objc/oclint.vim b/vim/plugins/syntastic/syntax_checkers/objc/oclint.vim
new file mode 100644
index 0000000..534d82b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/objcpp/gcc.vim b/vim/plugins/syntastic/syntax_checkers/objcpp/gcc.vim
new file mode 100644
index 0000000..6ae7ba5
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/objcpp/oclint.vim b/vim/plugins/syntastic/syntax_checkers/objcpp/oclint.vim
new file mode 100644
index 0000000..5528258
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ocaml/camlp4o.vim b/vim/plugins/syntastic/syntax_checkers/ocaml/camlp4o.vim
new file mode 100644
index 0000000..0a1c421
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/ocaml/camlp4o.vim
@@ -0,0 +1,132 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = s:GetMakeprg(buf)
+    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': buf} })
+
+    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(buf) " {{{2
+    return
+        \ g:syntastic_ocaml_use_ocamlc ? g:syntastic_ocaml_use_ocamlc :
+        \ (g:syntastic_ocaml_use_ocamlbuild && isdirectory('_build')) ? s:GetOcamlcMakeprg(a:buf) :
+        \ s:GetOtherMakeprg(a:buf)
+endfunction " }}}2
+
+function! s:GetOcamlcMakeprg(buf) " {{{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#shescape(bufname(a:buf))
+    return build_cmd
+endfunction " }}}2
+
+function! s:GetOcamlBuildMakeprg(buf) " {{{2
+    return 'ocamlbuild -quiet -no-log -tag annot,' . s:ocamlpp . ' -no-links -no-hygiene -no-sanitize ' .
+        \ syntastic#util#shexpand(fnamemodify(bufname(a:buf), ':r')) . '.cmi'
+endfunction " }}}2
+
+function! s:GetOtherMakeprg(buf) " {{{2
+    "TODO: give this function a better name?
+    "
+    "TODO: should use throw/catch instead of returning an empty makeprg
+
+    let fname = bufname(a:buf)
+    let extension = fnamemodify(fname, ':e')
+    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#shescape(fname) . ' >' . syntastic#util#DevNull()
+    elseif stridx(extension,'mll') >= 0 && executable('ocamllex')
+        let makeprg = 'ocamllex -q ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shescape(fname)
+    else
+        let makeprg = 'camlp4o ' . syntastic#c#NullOutput() . ' ' . syntastic#util#shescape(fname)
+    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/syntastic/syntax_checkers/perl/perl.vim b/vim/plugins/syntastic/syntax_checkers/perl/perl.vim
new file mode 100644
index 0000000..c21de2c
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/perl/perl.vim
@@ -0,0 +1,95 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    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#bufVar(buf, 'perl_lib_path', []))
+    endif
+    let shebang = syntastic#util#parseShebang(buf)
+    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/syntastic/syntax_checkers/perl/perlcritic.vim b/vim/plugins/syntastic/syntax_checkers/perl/perlcritic.vim
new file mode 100644
index 0000000..abe9f43
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/perl/podchecker.vim b/vim/plugins/syntastic/syntax_checkers/perl/podchecker.vim
new file mode 100644
index 0000000..cad39bd
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/php/php.vim b/vim/plugins/syntastic/syntax_checkers/php/php.vim
new file mode 100644
index 0000000..071f976
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/php/php.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"File:        php.vim
+"Description: 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_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 error_log= -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/syntastic/syntax_checkers/php/phpcs.vim b/vim/plugins/syntastic/syntax_checkers/php/phpcs.vim
new file mode 100644
index 0000000..1bd8f98
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/php/phplint.vim b/vim/plugins/syntastic/syntax_checkers/php/phplint.vim
new file mode 100644
index 0000000..d04f3ba
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/php/phpmd.vim b/vim/plugins/syntastic/syntax_checkers/php/phpmd.vim
new file mode 100644
index 0000000..5207d3d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/php/phpstan.vim b/vim/plugins/syntastic/syntax_checkers/php/phpstan.vim
new file mode 100644
index 0000000..b81ccc9
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/php/phpstan.vim
@@ -0,0 +1,49 @@
+"============================================================================
+"File:        phpstan.vim
+"Description: Syntax checking plugin for syntastic
+"Maintainer:  Przepompownia przepompownia@users.noreply.github.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_phpstan_checker')
+    finish
+endif
+let g:loaded_syntastic_php_phpstan_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_php_phpstan_IsAvailable() dict
+    if !executable(self.getExec())
+        return 0
+    endif
+    return syntastic#util#versionIsAtLeast(self.getVersion(), [0, 7])
+endfunction
+
+function! SyntaxCheckers_php_phpstan_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'analyse',
+        \ 'args': '--level=5',
+        \ 'args_after': '--errorFormat raw' })
+
+    let errorformat = '%f:%l:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype' : 'Style' })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'php',
+    \ 'name': 'phpstan'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/po/dennis.vim b/vim/plugins/syntastic/syntax_checkers/po/dennis.vim
new file mode 100644
index 0000000..f3fade0
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/po/dennis.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        dennis.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_po_dennis_checker')
+    finish
+endif
+let g:loaded_syntastic_po_dennis_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_po_dennis_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'exe_after': 'lint',
+        \ 'post_args_after': '--reporter line' })
+
+    let errorformat = '%f:%l:%c:%t%n:%m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'subtype': 'Style',
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'po',
+    \ 'name': 'dennis',
+    \ 'exec': 'dennis-cmd' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/po/msgfmt.vim b/vim/plugins/syntastic/syntax_checkers/po/msgfmt.vim
new file mode 100644
index 0000000..1d09733
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/pod/podchecker.vim b/vim/plugins/syntastic/syntax_checkers/pod/podchecker.vim
new file mode 100644
index 0000000..9ef5dca
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/pod/proselint.vim b/vim/plugins/syntastic/syntax_checkers/pod/proselint.vim
new file mode 100644
index 0000000..bcb67b2
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/pug/pug_lint.vim b/vim/plugins/syntastic/syntax_checkers/pug/pug_lint.vim
new file mode 100644
index 0000000..880838e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/puppet/puppet.vim b/vim/plugins/syntastic/syntax_checkers/puppet/puppet.vim
new file mode 100644
index 0000000..83077c7
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/puppet/puppetlint.vim b/vim/plugins/syntastic/syntax_checkers/puppet/puppetlint.vim
new file mode 100644
index 0000000..a492db6
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/bandit.vim b/vim/plugins/syntastic/syntax_checkers/python/bandit.vim
new file mode 100644
index 0000000..f3d000a
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/python/bandit.vim
@@ -0,0 +1,54 @@
+"============================================================================
+"File:        bandit
+"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_bandit_checker')
+    finish
+endif
+let g:loaded_syntastic_python_bandit_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_python_bandit_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '--format json',
+        \ 'tail': '2> ' . syntastic#util#DevNull() })
+
+    let errorformat = '%f:%l:%t:%n:%m'
+
+    let env = syntastic#util#isRunningWindows() ? {} : { 'TERM': 'dumb' }
+
+    let loclist = SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'env': env,
+        \ 'preprocess': 'bandit',
+        \ 'returns': [0, 1] })
+
+    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': 'python',
+    \ 'name': 'bandit' })
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/python/codec.py b/vim/plugins/syntastic/syntax_checkers/python/codec.py
new file mode 100755
index 0000000..6e980c7
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/compile.py b/vim/plugins/syntastic/syntax_checkers/python/compile.py
new file mode 100755
index 0000000..32f1413
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/flake8.vim b/vim/plugins/syntastic/syntax_checkers/python/flake8.vim
new file mode 100644
index 0000000..257b69d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/frosted.vim b/vim/plugins/syntastic/syntax_checkers/python/frosted.vim
new file mode 100644
index 0000000..d642795
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/mypy.vim b/vim/plugins/syntastic/syntax_checkers/python/mypy.vim
new file mode 100644
index 0000000..19ca1fd
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pep257.vim b/vim/plugins/syntastic/syntax_checkers/python/pep257.vim
new file mode 100644
index 0000000..e59166b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pep8.vim b/vim/plugins/syntastic/syntax_checkers/python/pep8.vim
new file mode 100644
index 0000000..80ab980
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/prospector.vim b/vim/plugins/syntastic/syntax_checkers/python/prospector.vim
new file mode 100644
index 0000000..c5e4735
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/py3kwarn.vim b/vim/plugins/syntastic/syntax_checkers/python/py3kwarn.vim
new file mode 100644
index 0000000..b0e7771
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pycodestyle.vim b/vim/plugins/syntastic/syntax_checkers/python/pycodestyle.vim
new file mode 100644
index 0000000..3b1e705
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pydocstyle.vim b/vim/plugins/syntastic/syntax_checkers/python/pydocstyle.vim
new file mode 100644
index 0000000..05ea6b3
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pyflakes.vim b/vim/plugins/syntastic/syntax_checkers/python/pyflakes.vim
new file mode 100644
index 0000000..d403135
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pylama.vim b/vim/plugins/syntastic/syntax_checkers/python/pylama.vim
new file mode 100644
index 0000000..d4aab0a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/pylint.vim b/vim/plugins/syntastic/syntax_checkers/python/pylint.vim
new file mode 100644
index 0000000..884d07a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/python/python.vim b/vim/plugins/syntastic/syntax_checkers/python/python.vim
new file mode 100644
index 0000000..17ad2c9
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/qml/qmllint.vim b/vim/plugins/syntastic/syntax_checkers/qml/qmllint.vim
new file mode 100644
index 0000000..0aef61c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/r/lint.vim b/vim/plugins/syntastic/syntax_checkers/r/lint.vim
new file mode 100644
index 0000000..0e4f044
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/r/lint.vim
@@ -0,0 +1,84 @@
+"============================================================================
+"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 buf = bufnr('')
+
+    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#shescape(bufname(buf))
+
+    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/syntastic/syntax_checkers/r/lintr.vim b/vim/plugins/syntastic/syntax_checkers/r/lintr.vim
new file mode 100644
index 0000000..19068c9
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/r/lintr.vim
@@ -0,0 +1,83 @@
+"============================================================================
+"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 buf = bufnr('')
+
+    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#shescape(bufname(buf))
+
+    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/syntastic/syntax_checkers/r/svtools.vim b/vim/plugins/syntastic/syntax_checkers/r/svtools.vim
new file mode 100644
index 0000000..eb85f8a
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/r/svtools.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"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 buf = bufnr('')
+
+    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#shescape(bufname(buf))
+
+    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/syntastic/syntax_checkers/racket/code-ayatollah.vim b/vim/plugins/syntastic/syntax_checkers/racket/code-ayatollah.vim
new file mode 100644
index 0000000..14463c4
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/racket/racket.vim b/vim/plugins/syntastic/syntax_checkers/racket/racket.vim
new file mode 100644
index 0000000..b563a5b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rmd/lintr.vim b/vim/plugins/syntastic/syntax_checkers/rmd/lintr.vim
new file mode 100644
index 0000000..dcc235f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rnc/rnv.vim b/vim/plugins/syntastic/syntax_checkers/rnc/rnv.vim
new file mode 100644
index 0000000..848d60c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rst/proselint.vim b/vim/plugins/syntastic/syntax_checkers/rst/proselint.vim
new file mode 100644
index 0000000..07e8b64
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rst/rst2pseudoxml.vim b/vim/plugins/syntastic/syntax_checkers/rst/rst2pseudoxml.vim
new file mode 100644
index 0000000..532c75c
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rst/rstcheck.vim b/vim/plugins/syntastic/syntax_checkers/rst/rstcheck.vim
new file mode 100644
index 0000000..3c3b8c4
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/rst/sphinx.vim b/vim/plugins/syntastic/syntax_checkers/rst/sphinx.vim
new file mode 100644
index 0000000..1ef058b
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/rst/sphinx.vim
@@ -0,0 +1,81 @@
+"============================================================================
+"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 buf = bufnr('')
+
+    let srcdir = syntastic#util#bufVar(buf, 'rst_sphinx_source_dir')
+    call self.log('syntastic_rst_sphinx_source_dir =', srcdir)
+    if srcdir ==# ''
+        let config = syntastic#util#findFileInParent('conf.py',  fnamemodify(bufname(buf), ':p:h'))
+        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#bufVar(buf, 'rst_sphinx_config_dir')
+    call self.log('syntastic_rst_sphinx_config_dir =', confdir)
+    if confdir ==# ''
+        let config = syntastic#util#findFileInParent('conf.py',  fnamemodify(bufname(buf), ':p:h'))
+        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/syntastic/syntax_checkers/ruby/flog.vim b/vim/plugins/syntastic/syntax_checkers/ruby/flog.vim
new file mode 100644
index 0000000..127cdbd
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/jruby.vim b/vim/plugins/syntastic/syntax_checkers/ruby/jruby.vim
new file mode 100644
index 0000000..d9d2aee
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/macruby.vim b/vim/plugins/syntastic/syntax_checkers/ruby/macruby.vim
new file mode 100644
index 0000000..c51188f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/mri.vim b/vim/plugins/syntastic/syntax_checkers/ruby/mri.vim
new file mode 100644
index 0000000..563ed4f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/reek.vim b/vim/plugins/syntastic/syntax_checkers/ruby/reek.vim
new file mode 100644
index 0000000..d9a564a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/rubocop.vim b/vim/plugins/syntastic/syntax_checkers/ruby/rubocop.vim
new file mode 100644
index 0000000..56f54bf
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/ruby/rubylint.vim b/vim/plugins/syntastic/syntax_checkers/ruby/rubylint.vim
new file mode 100644
index 0000000..2e74f87
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sass/sass.vim b/vim/plugins/syntastic/syntax_checkers/sass/sass.vim
new file mode 100644
index 0000000..f4dd2f6
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/sass/sass.vim
@@ -0,0 +1,85 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    if !syntastic#util#bufVar(buf, 'sass_check_partials') && fnamemodify(bufname(buf), ':t')[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/syntastic/syntax_checkers/sass/sass_lint.vim b/vim/plugins/syntastic/syntax_checkers/sass/sass_lint.vim
new file mode 100644
index 0000000..e87da29
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sass/sassc.vim b/vim/plugins/syntastic/syntax_checkers/sass/sassc.vim
new file mode 100644
index 0000000..699e04e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scala/fsc.vim b/vim/plugins/syntastic/syntax_checkers/scala/fsc.vim
new file mode 100644
index 0000000..811443d
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/scala/fsc.vim
@@ -0,0 +1,50 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args': '-Ystop-after:parser',
+        \ 'fname': syntastic#util#shescape(fnamemodify(bufname(buf), ':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/syntastic/syntax_checkers/scala/scalac.vim b/vim/plugins/syntastic/syntax_checkers/scala/scalac.vim
new file mode 100644
index 0000000..854876b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scala/scalastyle.vim b/vim/plugins/syntastic/syntax_checkers/scala/scalastyle.vim
new file mode 100644
index 0000000..60d2163
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/mixedindentlint.vim b/vim/plugins/syntastic/syntax_checkers/scss/mixedindentlint.vim
new file mode 100644
index 0000000..04a1fec
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/sass.vim b/vim/plugins/syntastic/syntax_checkers/scss/sass.vim
new file mode 100644
index 0000000..3df8c80
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/sass_lint.vim b/vim/plugins/syntastic/syntax_checkers/scss/sass_lint.vim
new file mode 100644
index 0000000..c50dac4
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/sassc.vim b/vim/plugins/syntastic/syntax_checkers/scss/sassc.vim
new file mode 100644
index 0000000..f1b2372
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/scss_lint.vim b/vim/plugins/syntastic/syntax_checkers/scss/scss_lint.vim
new file mode 100644
index 0000000..c0f921a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/scss/stylelint.vim b/vim/plugins/syntastic/syntax_checkers/scss/stylelint.vim
new file mode 100644
index 0000000..1962916
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sh/bashate.vim b/vim/plugins/syntastic/syntax_checkers/sh/bashate.vim
new file mode 100644
index 0000000..c7888ad
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sh/checkbashisms.vim b/vim/plugins/syntastic/syntax_checkers/sh/checkbashisms.vim
new file mode 100644
index 0000000..2ed0717
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sh/sh.vim b/vim/plugins/syntastic/syntax_checkers/sh/sh.vim
new file mode 100644
index 0000000..007eec4
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/sh/sh.vim
@@ -0,0 +1,95 @@
+"============================================================================
+"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
+    let buf = bufnr('')
+    call self.log('shell =', s:GetShell(buf))
+    return s:IsShellValid(buf)
+endfunction " }}}1
+
+function! SyntaxCheckers_sh_sh_GetLocList() dict " {{{1
+    let buf = bufnr('')
+    if s:GetShell(buf) ==# 'zsh'
+        return s:ForwardToZshChecker()
+    endif
+
+    if !s:IsShellValid(buf)
+        return []
+    endif
+
+    let makeprg = self.makeprgBuild({
+        \ 'exe': s:GetShell(buf),
+        \ 'args_after': '-n' })
+
+    let errorformat = '%f: line %l: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat })
+endfunction " }}}1
+
+" Utilities {{{1
+
+function! s:GetShell(buf) " {{{2
+    let shell = syntastic#util#getbufvar(a:buf, 'shell')
+    if shell ==# ''
+        let shebang = syntastic#util#parseShebang(a:buf)['exe']
+        if shebang !=# ''
+            if shebang[-strlen('bash'):-1] ==# 'bash'
+                let shell = 'bash'
+            elseif shebang[-strlen('zsh'):-1] ==# 'zsh'
+                let shell = 'zsh'
+            elseif shebang[-strlen('sh'):-1] ==# 'sh'
+                let shell = 'sh'
+            endif
+        endif
+        " try to use env variable in case no shebang could be found
+        if shell ==# ''
+            let shell = fnamemodify($SHELL, ':t')
+        endif
+    endif
+    return shell
+endfunction " }}}2
+
+function! s:IsShellValid(buf) " {{{2
+    let shell = s:GetShell(a:buf)
+    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/syntastic/syntax_checkers/sh/shellcheck.vim b/vim/plugins/syntastic/syntax_checkers/sh/shellcheck.vim
new file mode 100644
index 0000000..cf86c7e
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/sh/shellcheck.vim
@@ -0,0 +1,67 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args': s:GetShell(buf),
+        \ '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(buf) " {{{2
+    let sh = ''
+
+    if syntastic#util#parseShebang(a:buf)['exe'] ==# ''
+        if syntastic#util#bufRawVar(a:buf, 'is_kornshell', 0) || syntastic#util#bufRawVar(a:buf, 'is_posix', 0)
+            let sh = 'ksh'
+        elseif syntastic#util#bufRawVar(a:buf, 'is_bash', 0)
+            let sh = 'bash'
+        elseif syntastic#util#bufRawVar(a:buf, '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/syntastic/syntax_checkers/slim/slim_lint.vim b/vim/plugins/syntastic/syntax_checkers/slim/slim_lint.vim
new file mode 100644
index 0000000..f387971
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/slim/slimrb.vim b/vim/plugins/syntastic/syntax_checkers/slim/slimrb.vim
new file mode 100644
index 0000000..80bac05
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sml/smlnj.vim b/vim/plugins/syntastic/syntax_checkers/sml/smlnj.vim
new file mode 100644
index 0000000..8b29db4
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/solidity/solc.vim b/vim/plugins/syntastic/syntax_checkers/solidity/solc.vim
new file mode 100644
index 0000000..e401c3e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/solidity/solium.vim b/vim/plugins/syntastic/syntax_checkers/solidity/solium.vim
new file mode 100644
index 0000000..327b7b7
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/solidity/solium.vim
@@ -0,0 +1,43 @@
+"============================================================================
+"File:        solium.vim
+"Description: Solidity syntax checker - using solium
+"Maintainer:  Matthijs van den Bos <matthijs@vandenbos.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_solidity_solium_checker')
+    finish
+endif
+let g:loaded_syntastic_solidity_solium_checker = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! SyntaxCheckers_solidity_solium_GetLocList() dict
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-R gcc',
+        \ 'fname_before': '--file'})
+
+    let errorformat =
+        \ '%f:%l:%c: %trror: %m,' .
+        \ '%f:%l:%c: %tarning: %m'
+
+    return SyntasticMake({
+        \ 'makeprg': makeprg,
+        \ 'errorformat': errorformat,
+        \ 'returns': [0, 1] })
+endfunction
+
+call g:SyntasticRegistry.CreateAndRegisterChecker({
+    \ 'filetype': 'solidity',
+    \ 'name': 'solium'})
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim: set sw=4 sts=4 et fdm=marker:
diff --git a/vim/plugins/syntastic/syntax_checkers/spec/rpmlint.vim b/vim/plugins/syntastic/syntax_checkers/spec/rpmlint.vim
new file mode 100644
index 0000000..7e9431b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/sql/sqlint.vim b/vim/plugins/syntastic/syntax_checkers/sql/sqlint.vim
new file mode 100644
index 0000000..1e1eea5
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/stylus/stylint.vim b/vim/plugins/syntastic/syntax_checkers/stylus/stylint.vim
new file mode 100644
index 0000000..b32b745
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/tcl/nagelfar.vim b/vim/plugins/syntastic/syntax_checkers/tcl/nagelfar.vim
new file mode 100644
index 0000000..adbce63
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/tex/chktex.vim b/vim/plugins/syntastic/syntax_checkers/tex/chktex.vim
new file mode 100644
index 0000000..9b35902
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/tex/lacheck.vim b/vim/plugins/syntastic/syntax_checkers/tex/lacheck.vim
new file mode 100644
index 0000000..f156520
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/tex/proselint.vim b/vim/plugins/syntastic/syntax_checkers/tex/proselint.vim
new file mode 100644
index 0000000..657503a
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/texinfo/makeinfo.vim b/vim/plugins/syntastic/syntax_checkers/texinfo/makeinfo.vim
new file mode 100644
index 0000000..a66e787
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/texinfo/proselint.vim b/vim/plugins/syntastic/syntax_checkers/texinfo/proselint.vim
new file mode 100644
index 0000000..1afac02
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/text/atdtool.vim b/vim/plugins/syntastic/syntax_checkers/text/atdtool.vim
new file mode 100644
index 0000000..e43d9dc
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/text/igor.vim b/vim/plugins/syntastic/syntax_checkers/text/igor.vim
new file mode 100644
index 0000000..588cf3b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/text/language_check.vim b/vim/plugins/syntastic/syntax_checkers/text/language_check.vim
new file mode 100644
index 0000000..e1aa69f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/text/proselint.vim b/vim/plugins/syntastic/syntax_checkers/text/proselint.vim
new file mode 100644
index 0000000..9aa9513
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/text/textlint.vim b/vim/plugins/syntastic/syntax_checkers/text/textlint.vim
new file mode 100644
index 0000000..3b51ae7
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/trig/rapper.vim b/vim/plugins/syntastic/syntax_checkers/trig/rapper.vim
new file mode 100644
index 0000000..f459cda
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/turtle/rapper.vim b/vim/plugins/syntastic/syntax_checkers/turtle/rapper.vim
new file mode 100644
index 0000000..4585a07
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/turtle/ttl.vim b/vim/plugins/syntastic/syntax_checkers/turtle/ttl.vim
new file mode 100644
index 0000000..c28e354
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/twig/twiglint.vim b/vim/plugins/syntastic/syntax_checkers/twig/twiglint.vim
new file mode 100644
index 0000000..547648f
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/typescript/eslint.vim b/vim/plugins/syntastic/syntax_checkers/typescript/eslint.vim
new file mode 100644
index 0000000..41e5276
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/typescript/tslint.vim b/vim/plugins/syntastic/syntax_checkers/typescript/tslint.vim
new file mode 100644
index 0000000..c8f9ab8
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/typescript/tslint.vim
@@ -0,0 +1,53 @@
+"============================================================================
+"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') })
+
+    let errorformat =
+        \ '%EERROR: %f[%l\, %c]: %m,' .
+        \ '%WWARNING: %f[%l\, %c]: %m,' .
+        \ '%E%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/syntastic/syntax_checkers/vala/valac.vim b/vim/plugins/syntastic/syntax_checkers/vala/valac.vim
new file mode 100644
index 0000000..6c3fef7
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/vala/valac.vim
@@ -0,0 +1,76 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+            \ 'args': '-C ' .
+            \   s:GetValaOpts(buf, 'modules',   'modules',  '--pkg') . ' ' .
+            \   s:GetValaOpts(buf, 'vapi_dirs', 'vapidirs', '--vapidir'),
+        \ })
+
+    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:GetValaOpts(buf, name, comment, cmd) " {{{2
+    let var = syntastic#util#bufVar(a:buf, 'vala_' . a:name)
+    if type(var) == type([])
+        let opts = map(copy(var), 'syntastic#util#shescape(v:val)')
+    elseif type(var) == type('')
+        if var !=# ''
+            let opts = split(var, '\m\s\+')
+        else
+            let opts = []
+            for line in filter(getbufline(a:buf, 1, 100), 'v:val =~# ' . string('\m^//\s\+' . a:comment . ':\s*'))
+                call extend(opts, split( matchstr(line, '\m^//\s\+' . a:comment . ':\s*\zs.*'), '\m\s\+' ))
+            endfor
+        endif
+    else
+        call syntastic#log#error('syntastic_vala_' . a:name . ' must be either a list, or a string')
+        return ''
+    endif
+
+    return join(map(opts, string(a:cmd . ' ') . ' . v:val'))
+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/syntastic/syntax_checkers/verilog/iverilog.vim b/vim/plugins/syntastic/syntax_checkers/verilog/iverilog.vim
new file mode 100644
index 0000000..c34fec1
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/verilog/verilator.vim b/vim/plugins/syntastic/syntax_checkers/verilog/verilator.vim
new file mode 100644
index 0000000..e5cfddc
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/vhdl/ghdl.vim b/vim/plugins/syntastic/syntax_checkers/vhdl/ghdl.vim
new file mode 100644
index 0000000..497152b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/vhdl/vcom.vim b/vim/plugins/syntastic/syntax_checkers/vhdl/vcom.vim
new file mode 100644
index 0000000..6cdf4fb
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/vim/vimlint.vim b/vim/plugins/syntastic/syntax_checkers/vim/vimlint.vim
new file mode 100644
index 0000000..968337d
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/vim/vimlint.vim
@@ -0,0 +1,113 @@
+"============================================================================
+"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
+    try
+        " Vim 7.2-051 and later
+        let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim', 1)
+        let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim', 1)
+    catch /\m^Vim\%((\a\+)\)\=:E118/
+        let vimlparser = globpath(&runtimepath, 'autoload/vimlparser.vim')
+        let vimlint    = globpath(&runtimepath, 'autoload/vimlint.vim')
+    endtry
+    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
+    let buf = bufnr('')
+
+    " 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 }
+
+    let opts = syntastic#util#bufVar(buf, 'vimlint_options')
+    if type(opts) == type({})
+        let options = filter(copy(opts), 'v:key =~# "\\m^EVL"')
+        call extend(param, options, 'force')
+    endif
+
+    call self.log('options =', param)
+
+    return vimlint#vimlint(bufname(buf), 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/syntastic/syntax_checkers/vim/vint.vim b/vim/plugins/syntastic/syntax_checkers/vim/vint.vim
new file mode 100644
index 0000000..23a041e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xhtml/jshint.vim b/vim/plugins/syntastic/syntax_checkers/xhtml/jshint.vim
new file mode 100644
index 0000000..f4536e2
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xhtml/proselint.vim b/vim/plugins/syntastic/syntax_checkers/xhtml/proselint.vim
new file mode 100644
index 0000000..aea24a8
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xhtml/tidy.vim b/vim/plugins/syntastic/syntax_checkers/xhtml/tidy.vim
new file mode 100644
index 0000000..7f76d8b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xml/plutil.vim b/vim/plugins/syntastic/syntax_checkers/xml/plutil.vim
new file mode 100644
index 0000000..8e80dde
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xml/xmllint.vim b/vim/plugins/syntastic/syntax_checkers/xml/xmllint.vim
new file mode 100644
index 0000000..1300437
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/xquery/basex.vim b/vim/plugins/syntastic/syntax_checkers/xquery/basex.vim
new file mode 100644
index 0000000..0d867ad
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/xquery/basex.vim
@@ -0,0 +1,52 @@
+"============================================================================
+"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 buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args_after': '-z',
+        \ 'fname_before': '-q',
+        \ 'fname': syntastic#util#shescape('inspect:module("' . escape(fnamemodify(bufname(buf), ':p'), '"') . '")') })
+
+    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/syntastic/syntax_checkers/xslt/xmllint.vim b/vim/plugins/syntastic/syntax_checkers/xslt/xmllint.vim
new file mode 100644
index 0000000..9ffb548
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/yacc/bison.vim b/vim/plugins/syntastic/syntax_checkers/yacc/bison.vim
new file mode 100644
index 0000000..af8ac91
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/yaml/jsyaml.vim b/vim/plugins/syntastic/syntax_checkers/yaml/jsyaml.vim
new file mode 100644
index 0000000..e8baa7e
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/yaml/yamllint.vim b/vim/plugins/syntastic/syntax_checkers/yaml/yamllint.vim
new file mode 100644
index 0000000..130877d
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/yaml/yamlxs.vim b/vim/plugins/syntastic/syntax_checkers/yaml/yamlxs.vim
new file mode 100644
index 0000000..55f8c64
--- /dev/null
+++ b/vim/plugins/syntastic/syntax_checkers/yaml/yamlxs.vim
@@ -0,0 +1,74 @@
+"============================================================================
+"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(bufnr('')) . ' -e ' . syntastic#util#shescape('exit(0)'))
+    return v:shell_error == 0
+endfunction
+
+function! SyntaxCheckers_yaml_yamlxs_GetLocList() dict
+    let buf = bufnr('')
+    let makeprg = self.makeprgBuild({
+        \ 'args_before': s:Modules(buf) . ' -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(buf)
+    let lib_path = syntastic#util#bufVar(a:buf, 'perl_lib_path')
+    if type(lib_path) == type('')
+        call syntastic#log#oneTimeWarn('variable syntastic_perl_lib_path should be a list')
+        let includes = split(lib_path, ',')
+    else
+        let includes = copy(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/syntastic/syntax_checkers/yang/pyang.vim b/vim/plugins/syntastic/syntax_checkers/yang/pyang.vim
new file mode 100644
index 0000000..f397fa0
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/z80/z80syntaxchecker.vim b/vim/plugins/syntastic/syntax_checkers/z80/z80syntaxchecker.vim
new file mode 100644
index 0000000..af61a8b
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/zpt/zptlint.vim b/vim/plugins/syntastic/syntax_checkers/zpt/zptlint.vim
new file mode 100644
index 0000000..31a6093
--- /dev/null
+++ b/vim/plugins/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/syntastic/syntax_checkers/zsh/zsh.vim b/vim/plugins/syntastic/syntax_checkers/zsh/zsh.vim
new file mode 100644
index 0000000..4d458de
--- /dev/null
+++ b/vim/plugins/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/ultisnips/.bzrignore b/vim/plugins/ultisnips/.bzrignore
new file mode 100644
index 0000000..a64bfd0
--- /dev/null
+++ b/vim/plugins/ultisnips/.bzrignore
@@ -0,0 +1,2 @@
+doc/tags
+.bzr-repo
diff --git a/vim/plugins/ultisnips/.gitignore b/vim/plugins/ultisnips/.gitignore
new file mode 100644
index 0000000..2584ce0
--- /dev/null
+++ b/vim/plugins/ultisnips/.gitignore
@@ -0,0 +1,4 @@
+*.pyc
+*.swp
+doc/tags
+.ropeproject/
diff --git a/vim/plugins/ultisnips/.travis.yml b/vim/plugins/ultisnips/.travis.yml
new file mode 100644
index 0000000..082fa02
--- /dev/null
+++ b/vim/plugins/ultisnips/.travis.yml
@@ -0,0 +1,29 @@
+language: python
+
+python:
+  - 2.7
+  - 3.3
+  - 3.4
+env:
+  - VIM_VERSION="74"
+  - VIM_VERSION="git"
+  # - VIM_VERSION="NEOVIM"
+
+install:
+   # Some of these commands fail transiently. We keep retrying them until they succeed.
+   - until sudo add-apt-repository ppa:kalakris/tmux -y; do sleep 10; done
+   - until sudo add-apt-repository ppa:neovim-ppa/unstable -y; do sleep 10; done
+   - until sudo apt-get update -qq; do sleep 10; done
+   - until sudo apt-get install -qq -y --force-yes tmux xclip gdb neovim git; do sleep 10; done
+   - ./travis_install.sh
+
+script:
+   - ./travis_test.sh
+
+notifications:
+  webhooks:
+    urls:
+      - https://webhooks.gitter.im/e/558acac434012ba838cd
+    on_success: change  # options: [always|never|change] default: always
+    on_failure: always  # options: [always|never|change] default: always
+    on_start: false     # default: false
diff --git a/vim/plugins/ultisnips/COPYING.txt b/vim/plugins/ultisnips/COPYING.txt
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/vim/plugins/ultisnips/COPYING.txt
@@ -0,0 +1,674 @@
+                    GNU 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.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/vim/plugins/ultisnips/ChangeLog b/vim/plugins/ultisnips/ChangeLog
new file mode 100644
index 0000000..f8cdc04
--- /dev/null
+++ b/vim/plugins/ultisnips/ChangeLog
@@ -0,0 +1,167 @@
+version 3.1 (TODO: date):
+	- This is the last release done by @SirVer. The new maintainer of UltiSnips
+	  is @seletskiy. The repository remains https://github.com/SirVer/ultisnips,
+	  so this should not affect any users. This is also the last release to be
+	  published on vim.org. Please follow the master branch on GitHub for the
+	  latest stable version.
+	- New option `e`: Context aware snippets. This gives very precise and
+	  powerful control over which snippet should be expanded depending on
+	  surrounding code. *UltiSnips-context-snippets*
+	- New option `m`: Trim whitespace in all snippet lines.
+	- Very powerful, freely configurable pre/post-expand and post-jump actions
+	  allow for transforming the buffer outside the snippet. *UltiSnips-snippet-actions*
+	- Automatic triggering of snippets without the need to press the expand
+	  trigger. *UltiSnips-autotrigger*
+	- Better error reporting for snippet errors including python stacktraces
+	  and listing of executed code.
+	- Undo is more granular. Each jump and expand is now a separate undo step.
+	- UltiSnips now emits autocommands on certain events. *UltiSnips-custom-autocommands*
+	- clearsnippets now clears all snippets below the current priority. This
+	  fits better with the priority system introduced in 3.0.
+	- snipMate snippets support can be disabled. *UltiSnipsEnableSnipMate*
+	- UltiSnipsEditSplit got a new value 'context'. *UltiSnipsEditSplit*
+	- Improved syntax highlighting for snippets filetype.
+	- Mappings and autocommands are now only established when needed, i.e. when
+	  a snippet is active. This boosts performance outside of snippets.
+	- New integration with Unite, TagBar, and deoplete.
+	- New Ctags configuration file for snippet definitions.
+	- Bug fixes, performance improvements, code cleanups and refactorings.
+	- No longer supports Vim < 7.4.
+
+version 3.0 (02-Mar-2014):
+	- Organisational changes: The project is now hosted on github. Snippets are
+	  now shipped separately - please track honza/vim-snippets.
+	- UltiSnips is now a drop in replacement for snipMate - it parses snipMate
+	  snippets and expands them emulating snipMates smaller feature set.
+	- Filetype tab completion for UltiSnipsEdit.
+	- UltiSnipsEdit now only edits private snippet files. Use UltiSnipsEdit! if
+	  you want to edit shipped files.
+	- New option 's' which strips trailing whitespace before jumping to next
+	  tabstop
+	- New option 'a' which converts non-ascii characters into ascii characters
+	  in transformations.
+	- New keyword in snippet files: priority defines which snippets should
+	  overwrite others. This deprecates the '!' option.
+	  *UltiSnips-adding-snippets*
+	- Remove common whitespace of visual line selections before inserting in an
+	  indented tabstop.
+	- Support for overwriting the snippet directory name on a per buffer basis
+	  to support per project snippets. *UltiSnips-snippet-search-path*
+	- The keymaps for jumping in snippets are now only mapped when a snippet is
+	  active, allowing them to be used for something else otherwise.
+	- Expanding and jumping no longer overwrites the unnamed register.
+	- Integration with Valloric/YouCompleteMe and Shougo/neocomplete.vim.
+	- Other plugins can add sources for snippets to create snippets on the fly.
+	  *UltiSnips-extending*
+	- Vim functions now indicates if it did any work.
+	  *UltiSnips-trigger-functions*
+	- For python extensions: UltiSnips adds itself to the sys.path and can be
+	  easily imported if it is available. *UltiSnips-python-module-path*
+	- A new function giving programmatic access to the snippets currently
+	  available for expansion for other plugins integrating with UltiSnips.
+	  *UltiSnips_SnippetsInCurrentScope*
+	- New or improved snippets (now in a different repo): all, bib, c, cpp, cs,
+	  d, django, eruby, go, haskell, html, html, htmljinja, java, javascript,
+	  js, ledger, ocaml, perl, php, puppet, python, ruby, scss, sh, tex, vim,
+	  xml, zsh.
+
+version 2.2 (01-Sep-2012):
+	- Support to silence Python-not-found warnings. *UltiSnips-python-warning*
+	- Matchit support for snippet files.
+	- Improvements to syntax file.
+	- Various smaller bug fixes.
+	- New command to manually add a filetype to the list for the current
+	  buffer. *:UltiSnipsAddFiletypes*
+	- New or improved snippets: all, snippets, haskell, bindzone, python, golang,
+	  json, html, coffee, coffee_jasmine, javascript_jasmine, ruby, php,
+	  markdown.
+
+version 2.1 (14-Feb-2012):
+	- Python interpolation access to text from visual selection via snip.v.
+	- Support for transformations of ${VISUAL} texts.
+	- New or improved snippets: python, tex, texmath, ruby, rails, html, django
+
+version 2.0 (05-Feb-2012):
+	- Backwards incompatible change: Support for normal mode editing. Snippets
+	  are no longer exited when leaving insert mode but only by leaving the
+	  text span of the snippets. This allows usage of normal mode commands and
+	  autoformatting. It also increases compatibility with other plugins.
+	- Backwards incompatible change: Changed glob patterns for snippets to
+	  behave more like Vim *UltiSnips-adding-snippets*
+	- Backwards incompatible change: Zero Tabstop is no longer removed in
+	  nested snippets
+	- Support for ${VISUAL:default text} placeholder. *UltiSnips-visual-placeholder*
+	- Improved handling of utf-8 characters in files and snippet definitions.
+	- Full support for :py3. UltiSnips now works with python >= 2.6 or >= 3.2.
+	- New or improved snippets: python, all
+
+version 1.6 (30-Dec-2011):
+	- Significant speed improvements and a few bugs fixed.
+	- Better handling of non ASCII chars in snippets by assuming UTF-8 encoding
+	  when no other information is available.
+	- Contributions for UltiSnips are now also accepted on GitHub: https://github.com/SirVer/ultisnips/
+	- New or improved snippets: ruby, rails, xhtml
+
+version 1.5 (24-Sep-2011):
+	- Some critical bug fixes for new vim versions.
+	- New or improved snippets: tex, texmath, python, jinja2, go, puppet, xhtml
+	- Configuration of search path for snippets *UltiSnips-snippet-search-path*
+	- New parser implementation: A little faster, more flexible and less bugged.
+
+version 1.4 (17-Jul-2011):
+	- New or improved snippets: php, html, djangohtml, mako, lua
+	- Snippets are now listed alphabetically by their trigger, no longer in
+	  order of appearance
+	- Snippet files are now automatically reloaded when they change.
+	- Support for other directory names for snippets beside
+	  "UltiSnips" *UltiSnips-snippet-search-path*
+	- Errors are now shown in a scratch window.
+	- Now fully supports Windows with python >= 2.6. UltiSnips should now work
+	  on all systems that Vim runs on.
+	- a syntax file was added for snippets files with nice highlighting.
+	- snippets definition files now have the filetype 'snippets'. It used to be
+	  'snippet'.
+
+version 1.3 (14-Feb-2011):
+	- Erlang snippets (g0rdin)
+	- Other VimScripts can now define and immediately expand anonymous snippets
+	  ( *UltiSnips_Anon* ) (Ryan Wooden)
+	- Other VimScripts can now define new snippets via a function
+	  ( *UltiSnips_AddSnippet* ) (Ryan Wooden)
+	- New Snippets for eruby and rails (Ches Martin).
+	- A new Option 't' has been added to snippets that avoid expanding tabstops.
+	  Be also more consistent with how indenting is handled. (Ryan Wooden)
+	- Added a ftplugin script for .snippets files. Syntax highlighting still
+	  missing. (Rupa Deadwyler)
+	- Added UltiSnipsReset and UltiSnipsEdit (Idea by JCEB)
+
+version 1.2 (24-Aug-2010):
+	- many bugs were fixed
+	- smode mappings for printable characters are now removed before expanding a
+	  snippet. This is configurable. *UltiSnips-warning-smappings*
+	- all shipped snippets are now fully compatible with UltiSnips
+	- added support for global snippets which enhance python interpolation even
+	  more *UltiSnips-globals*
+	- added support for multi word and regular expression triggers. Very
+	  powerful in combination with python interpolation.
+	- Python interpolation became much more powerful *UltiSnips-python*
+	- added support for clearsnippets command *UltiSnips-clearing-snippets*
+	- added support for option w which is a little more strict than i.
+	- added support for listing of valid triggers. Defaults to <c-tab>.
+	- added support for option i (inword expansion)
+	- extends keyword is now supported on the first line of snippet files. This makes it easy to
+	  define special cases, for example cpp extends c: a cpp trigger is useless
+	  in c, but a c trigger is valuable for cpp.
+	- UltiSnips now adheres to expandtab and tabstop options of vim
+
+version 1.1 (21-Jul-2009):
+	- Made triggers configurable. You can also use the same trigger for
+	  expanding and tabbing. The TextMate configuration <tab> and <s-tab> is now
+	  possible.
+	- Conditional Inserts can now be nested
+	- Added support for b option. This only considers a snippet at the beginning
+	  of a line ( *UltiSnips-adding-snippets* )
+	- Added support for ! option. This overwrites previously defined snippets
+	  with the same tab trigger ( *UltiSnips-adding-snippets* )
+	- Support for dotted filetype syntax. Now snippets for more than one filetype
+	  can be active ( *UltiSnips-adding-snippets* )
diff --git a/vim/plugins/ultisnips/README.md b/vim/plugins/ultisnips/README.md
new file mode 100644
index 0000000..f7edd0a
--- /dev/null
+++ b/vim/plugins/ultisnips/README.md
@@ -0,0 +1,81 @@
+[![Build Status](https://travis-ci.org/SirVer/ultisnips.svg?branch=master)](https://travis-ci.org/SirVer/ultisnips)
+[![Stories in Ready](https://badge.waffle.io/SirVer/ultisnips.png?label=ready&title=Ready)](https://waffle.io/SirVer/ultisnips)
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/SirVer/ultisnips?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
+UltiSnips
+=========
+
+UltiSnips is the ultimate solution for snippets in Vim. It has tons of features
+and is very fast.
+
+![GIF Demo](https://raw.github.com/SirVer/ultisnips/master/doc/demo.gif)
+
+In this demo I am editing a python file. I first expand the `#!` snippet, then
+the `class` snippet. The completion menu comes from
+[YouCompleteMe](https://github.com/Valloric/YouCompleteMe), UltiSnips also
+integrates with [neocomplete](https://github.com/Shougo/neocomplete.vim). I can
+jump through placeholders and add text while the snippet inserts text in other
+places automatically: when I add `Animal` as a base class, `__init__` gets
+updated to call the base class constructor. When I add arguments to the
+constructor, they automatically get assigned to instance variables. I then
+insert my personal snippet for `print` debugging. Note that I left insert mode,
+inserted another snippet and went back to add an additional argument to
+`__init__` and the class snippet was still active and added another instance
+variable.
+
+The official home of UltiSnips is at <https://github.com/sirver/ultisnips>.
+Please add pull requests and issues there.
+
+UltiSnips was started in Jun 2009 by @SirVer. In Dec 2015, maintenance was
+handed over to [@seletskiy](https://github.com/seletskiy).
+
+What can you do with UltiSnips?
+-------------------------------
+
+1. Advanced snippets:
+
+    * [Snippets Aliases](doc/examples/snippets-aliasing/README.md)
+    * [Dynamic Tabstops/Tabstop Generation](doc/examples/tabstop-generation/README.md)
+
+Quick Start
+-----------
+
+This assumes you are using [Vundle](https://github.com/gmarik/Vundle.vim). Adapt
+for your plugin manager of choice. Put this into your `.vimrc`.
+
+    " Track the engine.
+    Plugin 'SirVer/ultisnips'
+
+    " Snippets are separated from the engine. Add this if you want them:
+    Plugin 'honza/vim-snippets'
+
+    " Trigger configuration. Do not use <tab> if you use https://github.com/Valloric/YouCompleteMe.
+    let g:UltiSnipsExpandTrigger="<tab>"
+    let g:UltiSnipsJumpForwardTrigger="<c-b>"
+    let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+
+    " If you want :UltiSnipsEdit to split your window.
+    let g:UltiSnipsEditSplit="vertical"
+
+UltiSnips comes with comprehensive
+[documentation](https://github.com/SirVer/ultisnips/blob/master/doc/UltiSnips.txt).
+As there are more options and tons of features I suggest you at least skim it.
+
+Screencasts
+-----------
+
+From a gentle introduction to really advanced in a few minutes: The blog posts
+of the screencasts contain more advanced examples of the things discussed in the
+videos.
+
+- [Episode 1: What are snippets and do I need them?](http://www.sirver.net/blog/2011/12/30/first-episode-of-ultisnips-screencast/)
+- [Episode 2: Creating Basic Snippets](http://www.sirver.net/blog/2012/01/08/second-episode-of-ultisnips-screencast/)
+- [Episode 3: What's new in version 2.0](http://www.sirver.net/blog/2012/02/05/third-episode-of-ultisnips-screencast/)
+- [Episode 4: Python Interpolation](http://www.sirver.net/blog/2012/03/31/fourth-episode-of-ultisnips-screencast/)
+
+Also the excellent [Vimcasts](http://vimcasts.org) dedicated three episodes to
+UltiSnips:
+
+- [Meet UltiSnips](http://vimcasts.org/episodes/meet-ultisnips/)
+- [Using Python interpolation in UltiSnips snippets](http://vimcasts.org/episodes/ultisnips-python-interpolation/)
+- [Using selected text in UltiSnips snippets](http://vimcasts.org/episodes/ultisnips-visual-placeholder/)
diff --git a/vim/plugins/ultisnips/after/plugin/UltiSnips_after.vim b/vim/plugins/ultisnips/after/plugin/UltiSnips_after.vim
new file mode 100644
index 0000000..33ad9e0
--- /dev/null
+++ b/vim/plugins/ultisnips/after/plugin/UltiSnips_after.vim
@@ -0,0 +1,8 @@
+" Called after everything else to reclaim keys (Needed for Supertab)
+
+if exists("b:did_after_plugin_ultisnips_after") || !exists("g:_uspy")
+   finish
+endif
+let b:did_after_plugin_ultisnips_after = 1
+
+call UltiSnips#map_keys#MapKeys()
diff --git a/vim/plugins/ultisnips/autoload/UltiSnips.vim b/vim/plugins/ultisnips/autoload/UltiSnips.vim
new file mode 100644
index 0000000..7e4830d
--- /dev/null
+++ b/vim/plugins/ultisnips/autoload/UltiSnips.vim
@@ -0,0 +1,148 @@
+if exists("b:did_autoload_ultisnips") || !exists("g:_uspy")
+    finish
+endif
+let b:did_autoload_ultisnips = 1
+
+" Also import vim as we expect it to be imported in many places.
+exec g:_uspy "import vim"
+exec g:_uspy "from UltiSnips import UltiSnips_Manager"
+
+function! s:compensate_for_pum()
+    """ The CursorMovedI event is not triggered while the popup-menu is visible,
+    """ and it's by this event that UltiSnips updates its vim-state. The fix is
+    """ to explicitly check for the presence of the popup menu, and update
+    """ the vim-state accordingly.
+    if pumvisible()
+        exec g:_uspy "UltiSnips_Manager._cursor_moved()"
+    endif
+endfunction
+
+function! UltiSnips#Edit(bang, ...)
+    if a:0 == 1 && a:1 != ''
+        let type = a:1
+    else
+        let type = ""
+    endif
+    exec g:_uspy "vim.command(\"let file = '%s'\" % UltiSnips_Manager._file_to_edit(vim.eval(\"type\"), vim.eval('a:bang')))"
+
+    if !len(file)
+       return
+    endif
+
+    let mode = 'e'
+    if exists('g:UltiSnipsEditSplit')
+        if g:UltiSnipsEditSplit == 'vertical'
+            let mode = 'vs'
+        elseif g:UltiSnipsEditSplit == 'horizontal'
+            let mode = 'sp'
+        elseif g:UltiSnipsEditSplit == 'context'
+            let mode = 'vs'
+            if winwidth(0) <= 2 * (&tw ? &tw : 80)
+                let mode = 'sp'
+            endif
+        endif
+    endif
+    exe ':'.mode.' '.escape(file, ' ')
+endfunction
+
+function! UltiSnips#AddFiletypes(filetypes)
+    exec g:_uspy "UltiSnips_Manager.add_buffer_filetypes('" . a:filetypes . "')"
+    return ""
+endfunction
+
+function! UltiSnips#FileTypeComplete(arglead, cmdline, cursorpos)
+    let ret = {}
+    let items = map(
+    \   split(globpath(&runtimepath, 'syntax/*.vim'), '\n'),
+    \   'fnamemodify(v:val, ":t:r")'
+    \ )
+    call insert(items, 'all')
+    for item in items
+        if !has_key(ret, item) && item =~ '^'.a:arglead
+            let ret[item] = 1
+        endif
+    endfor
+
+    return sort(keys(ret))
+endfunction
+
+function! UltiSnips#ExpandSnippet()
+    exec g:_uspy "UltiSnips_Manager.expand()"
+    return ""
+endfunction
+
+function! UltiSnips#ExpandSnippetOrJump()
+    call s:compensate_for_pum()
+    exec g:_uspy "UltiSnips_Manager.expand_or_jump()"
+    return ""
+endfunction
+
+function! UltiSnips#ListSnippets()
+    exec g:_uspy "UltiSnips_Manager.list_snippets()"
+    return ""
+endfunction
+
+function! UltiSnips#SnippetsInCurrentScope(...)
+    let g:current_ulti_dict = {}
+    let all = get(a:, 1, 0)
+    if all
+      let g:current_ulti_dict_info = {}
+    endif
+    exec g:_uspy "UltiSnips_Manager.snippets_in_current_scope(" . all . ")"
+    return g:current_ulti_dict
+endfunction
+
+function! UltiSnips#SaveLastVisualSelection() range
+    exec g:_uspy "UltiSnips_Manager._save_last_visual_selection()"
+    return ""
+endfunction
+
+function! UltiSnips#JumpBackwards()
+    call s:compensate_for_pum()
+    exec g:_uspy "UltiSnips_Manager.jump_backwards()"
+    return ""
+endfunction
+
+function! UltiSnips#JumpForwards()
+    call s:compensate_for_pum()
+    exec g:_uspy "UltiSnips_Manager.jump_forwards()"
+    return ""
+endfunction
+
+function! UltiSnips#AddSnippetWithPriority(trigger, value, description, options, filetype, priority)
+    exec g:_uspy "trigger = vim.eval(\"a:trigger\")"
+    exec g:_uspy "value = vim.eval(\"a:value\")"
+    exec g:_uspy "description = vim.eval(\"a:description\")"
+    exec g:_uspy "options = vim.eval(\"a:options\")"
+    exec g:_uspy "filetype = vim.eval(\"a:filetype\")"
+    exec g:_uspy "priority = vim.eval(\"a:priority\")"
+    exec g:_uspy "UltiSnips_Manager.add_snippet(trigger, value, description, options, filetype, priority)"
+    return ""
+endfunction
+
+function! UltiSnips#Anon(value, ...)
+    " Takes the same arguments as SnippetManager.expand_anon:
+    " (value, trigger="", description="", options="")
+    exec g:_uspy "args = vim.eval(\"a:000\")"
+    exec g:_uspy "value = vim.eval(\"a:value\")"
+    exec g:_uspy "UltiSnips_Manager.expand_anon(value, *args)"
+    return ""
+endfunction
+
+
+function! UltiSnips#CursorMoved()
+    exec g:_uspy "UltiSnips_Manager._cursor_moved()"
+endf
+
+function! UltiSnips#LeavingBuffer()
+    exec g:_uspy "UltiSnips_Manager._leaving_buffer()"
+endf
+
+function! UltiSnips#LeavingInsertMode()
+    exec g:_uspy "UltiSnips_Manager._leaving_insert_mode()"
+endfunction
+
+function! UltiSnips#TrackChange()
+    exec g:_uspy "UltiSnips_Manager._track_change()"
+endfunction
+" }}}
diff --git a/vim/plugins/ultisnips/autoload/UltiSnips/map_keys.vim b/vim/plugins/ultisnips/autoload/UltiSnips/map_keys.vim
new file mode 100644
index 0000000..218b507
--- /dev/null
+++ b/vim/plugins/ultisnips/autoload/UltiSnips/map_keys.vim
@@ -0,0 +1,72 @@
+if exists("b:did_autoload_ultisnips_map_keys") || !exists("g:_uspy")
+   finish
+endif
+let b:did_autoload_ultisnips_map_keys = 1
+
+" The trigger used to expand a snippet.
+" NOTE: expansion and forward jumping can, but needn't be the same trigger
+if !exists("g:UltiSnipsExpandTrigger")
+    let g:UltiSnipsExpandTrigger = "<tab>"
+endif
+
+" The trigger used to display all triggers that could possible
+" match in the current position.
+if !exists("g:UltiSnipsListSnippets")
+    let g:UltiSnipsListSnippets = "<c-tab>"
+endif
+
+" The trigger used to jump forward to the next placeholder.
+" NOTE: expansion and forward jumping can be the same trigger.
+if !exists("g:UltiSnipsJumpForwardTrigger")
+    let g:UltiSnipsJumpForwardTrigger = "<c-j>"
+endif
+
+" The trigger to jump backward inside a snippet
+if !exists("g:UltiSnipsJumpBackwardTrigger")
+    let g:UltiSnipsJumpBackwardTrigger = "<c-k>"
+endif
+
+" Should UltiSnips unmap select mode mappings automagically?
+if !exists("g:UltiSnipsRemoveSelectModeMappings")
+    let g:UltiSnipsRemoveSelectModeMappings = 1
+end
+
+" If UltiSnips should remove Mappings, which should be ignored
+if !exists("g:UltiSnipsMappingsToIgnore")
+    let g:UltiSnipsMappingsToIgnore = []
+endif
+
+" UltiSnipsEdit will use this variable to decide if a new window
+" is opened when editing. default is "normal", allowed are also
+" "vertical", "horizontal", and "context".
+if !exists("g:UltiSnipsEditSplit")
+    let g:UltiSnipsEditSplit = 'normal'
+endif
+
+" A list of directory names that are searched for snippets.
+if !exists("g:UltiSnipsSnippetDirectories")
+    let g:UltiSnipsSnippetDirectories = [ "UltiSnips" ]
+endif
+
+" Enable or Disable snipmate snippet expansion.
+if !exists("g:UltiSnipsEnableSnipMate")
+    let g:UltiSnipsEnableSnipMate = 1
+endif
+
+function! UltiSnips#map_keys#MapKeys()
+    if g:UltiSnipsExpandTrigger == g:UltiSnipsJumpForwardTrigger
+        exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=UltiSnips#ExpandSnippetOrJump()<cr>"
+        exec "snoremap <silent> " . g:UltiSnipsExpandTrigger . " <Esc>:call UltiSnips#ExpandSnippetOrJump()<cr>"
+    else
+        exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=UltiSnips#ExpandSnippet()<cr>"
+        exec "snoremap <silent> " . g:UltiSnipsExpandTrigger . " <Esc>:call UltiSnips#ExpandSnippet()<cr>"
+    endif
+    exec "xnoremap <silent> " . g:UltiSnipsExpandTrigger. " :call UltiSnips#SaveLastVisualSelection()<cr>gvs"
+    exec "inoremap <silent> " . g:UltiSnipsListSnippets . " <C-R>=UltiSnips#ListSnippets()<cr>"
+    exec "snoremap <silent> " . g:UltiSnipsListSnippets . " <Esc>:call UltiSnips#ListSnippets()<cr>"
+
+    snoremap <silent> <BS> <c-g>c
+    snoremap <silent> <DEL> <c-g>c
+    snoremap <silent> <c-h> <c-g>c
+    snoremap <c-r> <c-g>"_c<c-r>
+endf
diff --git a/vim/plugins/ultisnips/autoload/neocomplete/sources/ultisnips.vim b/vim/plugins/ultisnips/autoload/neocomplete/sources/ultisnips.vim
new file mode 100644
index 0000000..5f45e5e
--- /dev/null
+++ b/vim/plugins/ultisnips/autoload/neocomplete/sources/ultisnips.vim
@@ -0,0 +1,32 @@
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:source = {
+   \ 'name' : 'ultisnips',
+   \ 'kind' : 'keyword',
+   \ 'mark' : '[US]',
+   \ 'rank' : 8,
+   \ 'matchers' :
+      \ (g:neocomplete#enable_fuzzy_completion ?
+      \ ['matcher_fuzzy'] : ['matcher_head']),
+   \ }
+
+function! s:source.gather_candidates(context)
+   let suggestions = []
+   let snippets = UltiSnips#SnippetsInCurrentScope()
+   for trigger in keys(snippets)
+      let description = get(snippets, trigger)
+      call add(suggestions, {
+         \ 'word' : trigger,
+         \ 'menu' : self.mark . ' '. description
+         \ })
+   endfor
+   return suggestions
+endfunction
+
+function! neocomplete#sources#ultisnips#define()
+   return s:source
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/ultisnips/autoload/unite/sources/ultisnips.vim b/vim/plugins/ultisnips/autoload/unite/sources/ultisnips.vim
new file mode 100644
index 0000000..1ded37f
--- /dev/null
+++ b/vim/plugins/ultisnips/autoload/unite/sources/ultisnips.vim
@@ -0,0 +1,82 @@
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:unite_source = {
+      \ 'name': 'ultisnips',
+      \ 'hooks': {},
+      \ 'action_table': {},
+      \ 'syntax' : 'uniteSource__Ultisnips',
+      \ 'default_action': 'expand',
+      \ }
+
+let s:unite_source.action_table.preview = {
+      \ 'description' : 'ultisnips snippets',
+      \ 'is_quit' : 0,
+      \ }
+
+function! s:unite_source.hooks.on_syntax(args, context) abort
+  syntax case ignore
+  syntax match uniteSource__UltisnipsHeader /^.*$/
+        \ containedin=uniteSource__Ultisnips
+  syntax match uniteSource__UltisnipsTrigger /\v^\s.{-}\ze\s/ contained
+        \ containedin=uniteSource__UltisnipsHeader
+        \ nextgroup=uniteSource__UltisnipsDescription
+  syntax match uniteSource__UltisnipsDescription /\v.{3}\s\zs\w.*$/ contained
+        \ containedin=uniteSource__UltisnipsHeader
+
+  highlight default link uniteSource__UltisnipsTrigger Identifier
+  highlight default link uniteSource__UltisnipsDescription Statement
+endfunction
+
+function! s:unite_source.action_table.preview.func(candidate)
+  " no nice preview at this point, cannot get snippet text
+  let snippet_preview = a:candidate['word']
+  echo snippet_preview
+endfunction
+
+let s:unite_source.action_table.expand = {
+      \ 'description': 'expand the current snippet',
+      \ 'is_quit': 1
+      \}
+
+function! s:unite_source.action_table.expand.func(candidate)
+  let delCurrWord = (getline(".")[col(".")-1] == " ") ? "" : "diw"
+  exe "normal " . delCurrWord . "a" . a:candidate['trigger'] . " "
+  call UltiSnips#ExpandSnippet()
+  return ''
+endfunction
+
+function! s:unite_source.get_longest_snippet_len(snippet_list)
+  let longest = 0
+  for snip in items(a:snippet_list)
+    if strlen(snip['word']) > longest
+      let longest = strlen(snip['word'])
+    endif
+  endfor
+  return longest
+endfunction
+
+function! s:unite_source.gather_candidates(args, context)
+  let default_val = {'word': '', 'unite__abbr': '', 'is_dummy': 0, 'source':
+        \  'ultisnips', 'unite__is_marked': 0, 'kind': 'command', 'is_matched': 1,
+        \    'is_multiline': 0}
+  let snippet_list = UltiSnips#SnippetsInCurrentScope()
+  let max_len = s:unite_source.get_longest_snippet_len(snippet_list)
+  let canditates = []
+  for snip in items(snippet_list)
+    let curr_val = copy(default_val)
+    let curr_val['word'] = printf('%-*s', max_len, snip[0]) . "     " . snip[1]
+    let curr_val['trigger'] = snip[0]
+    call add(canditates, curr_val)
+  endfor
+  return canditates
+endfunction
+
+function! unite#sources#ultisnips#define()
+  return s:unite_source
+endfunction
+
+"unlet s:unite_source
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/ultisnips/ctags/UltiSnips.cnf b/vim/plugins/ultisnips/ctags/UltiSnips.cnf
new file mode 100644
index 0000000..c30aa8b
--- /dev/null
+++ b/vim/plugins/ultisnips/ctags/UltiSnips.cnf
@@ -0,0 +1,3 @@
+--langdef=UltiSnips
+--langmap=UltiSnips:.snippets
+--regex-UltiSnips=/^snippet (.*)/\1/s,snippet/
diff --git a/vim/plugins/ultisnips/doc/UltiSnips.txt b/vim/plugins/ultisnips/doc/UltiSnips.txt
new file mode 100644
index 0000000..a2a13c8
--- /dev/null
+++ b/vim/plugins/ultisnips/doc/UltiSnips.txt
@@ -0,0 +1,1875 @@
+*UltiSnips.txt*    For Vim version 7.0 or later.
+
+        The Ultimate Plugin for Snippets in Vim~
+
+UltiSnips                                      *snippet* *snippets* *UltiSnips*
+
+1. Description                                  |UltiSnips-description|
+   1.1 Requirements                             |UltiSnips-requirements|
+   1.2 Acknowledgments                          |UltiSnips-acknowledgments|
+2. Installation and Updating                    |UltiSnips-installnupdate|
+3. Settings & Commands                          |UltiSnips-settings|
+   3.1 Commands                                 |UltiSnips-commands|
+   3.2 Triggers                                 |UltiSnips-triggers|
+      3.2.1 Using your own trigger functions    |UltiSnips-trigger-functions|
+      3.2.2 Custom autocommands                 |UltiSnips-custom-autocommands|
+      3.2.3 Path to Python Module               |UltiSnips-python-module-path|
+   3.3 Snippet Search Path                      |UltiSnips-snippet-search-path|
+   3.4 Warning About Select Mode Mappings       |UltiSnips-warning-smappings|
+   3.5 Functions                                |UltiSnips-functions|
+      3.5.1 UltiSnips#AddSnippetWithPriority    |UltiSnips#AddSnippetWithPriority|
+      3.5.2 UltiSnips#Anon                      |UltiSnips#Anon|
+      3.5.3 UltiSnips#SnippetsInCurrentScope    |UltiSnips#SnippetsInCurrentScope|
+   3.6 Missing python support                   |UltiSnips-python-warning|
+4. Syntax                                       |UltiSnips-syntax|
+   4.1 Adding Snippets                          |UltiSnips-adding-snippets|
+      4.1.1 Character Escaping                  |UltiSnips-character-escaping|
+   4.2 Plaintext Snippets                       |UltiSnips-plaintext-snippets|
+   4.3 Visual Placeholder                       |UltiSnips-visual-placeholder|
+   4.4 Interpolation                            |UltiSnips-interpolation|
+      4.4.1 Shellcode                           |UltiSnips-shellcode|
+      4.4.2 VimScript                           |UltiSnips-vimscript|
+      4.4.3 Python                              |UltiSnips-python|
+      4.4.4 Global Snippets                     |UltiSnips-globals|
+   4.5 Tabstops and Placeholders                |UltiSnips-tabstops|
+   4.6 Mirrors                                  |UltiSnips-mirrors|
+   4.7 Transformations                          |UltiSnips-transformations|
+      4.7.1 Replacement String                  |UltiSnips-replacement-string|
+      4.7.2 Demos                               |UltiSnips-demos|
+   4.8 Clearing snippets                        |UltiSnips-clearing-snippets|
+   4.9 Context snippets                         |UltiSnips-context-snippets|
+   4.10 Snippet actions                         |UltiSnips-snippet-actions|
+      4.10.1 Pre-expand actions                 |UltiSnips-pre-expand-actions|
+      4.10.2 Post-expand actions                |UltiSnips-post-expand-actions|
+      4.10.3 Post-jump actions                  |UltiSnips-post-jump-actions|
+   4.11 Autotrigger                             |UltiSnips-autotrigger|
+5. UltiSnips and Other Plugins                  |UltiSnips-other-plugins|
+   5.1 Existing Integrations                    |UltiSnips-integrations|
+   5.2 Extending UltiSnips                      |UltiSnips-extending|
+6. Helping Out                                  |UltiSnips-helping|
+7. Contributors                                 |UltiSnips-contributors|
+
+This plugin only works if 'compatible' is not set.
+{Vi does not have any of these features}
+{only available when |+python| or |+python3| have been enabled at compile time}
+
+
+==============================================================================
+1. Description                                        *UltiSnips-description*
+
+UltiSnips provides snippet management for the Vim editor. A snippet is a short
+piece of text that is either re-used often or contains a lot of redundant
+text. UltiSnips allows you to insert a snippet with only a few key strokes.
+Snippets are common in structured text like source code but can also be used
+for general editing like, for example, inserting a signature in an email or
+inserting the current date in a text file.
+
+@SirVer posted several short screencasts which make a great introduction to
+UltiSnips, illustrating its features and usage.
+
+http://www.sirver.net/blog/2011/12/30/first-episode-of-ultisnips-screencast/
+http://www.sirver.net/blog/2012/01/08/second-episode-of-ultisnips-screencast/
+http://www.sirver.net/blog/2012/02/05/third-episode-of-ultisnips-screencast/
+http://www.sirver.net/blog/2012/03/31/fourth-episode-of-ultisnips-screencast/
+
+Also the excellent [Vimcasts](http://vimcasts.org) dedicated three episodes to
+UltiSnips:
+
+http://vimcasts.org/episodes/meet-ultisnips/
+http://vimcasts.org/episodes/ultisnips-python-interpolation/
+http://vimcasts.org/episodes/ultisnips-visual-placeholder/
+
+1.1 Requirements                                     *UltiSnips-requirements*
+----------------
+
+This plugin works with Vim version 7.4 or later. It only works if the
+'compatible' setting is not set.
+
+This plugin is tested against Python 2.7, 3.3 or 3.4. All other versions are
+unsupported, but might work.
+
+The Python 2.x or Python 3.x interface must be available. In other words, Vim
+must be compiled with either the |+python| feature or the |+python3| feature.
+The following commands show how to test if you have python compiled in Vim.
+They print '1' if the python version is compiled in, '0' if not.
+
+Test if Vim is compiled with python version 2.x: >
+    :echo has("python")
+The python version Vim is linked against can be found with: >
+    :py import sys; print(sys.version)
+
+Test if Vim is compiled with python version 3.x: >
+    :echo has("python3")
+The python version Vim is linked against can be found with: >
+    :py3 import sys; print(sys.version)
+
+Note that Vim is maybe not using your system-wide installed python version, so
+make sure to check the Python version inside of Vim.
+
+UltiSnips attempts to auto-detect which python version is compiled into Vim.
+Unfortunately, in some versions of Vim this detection does not work.
+In that case you have to explicitly tell UltiSnips which version to use using
+the 'UltiSnipsUsePythonVersion' global variable.
+
+To use python version 2.x: >
+   let g:UltiSnipsUsePythonVersion = 2
+
+To use python version 3.x: >
+   let g:UltiSnipsUsePythonVersion = 3
+
+
+1.2 Acknowledgments                               *UltiSnips-acknowledgments*
+-------------------
+
+UltiSnips was inspired by the snippets feature of TextMate
+(http://macromates.com/), the GUI text editor for Mac OS X. Managing snippets
+in Vim is not new. I want to thank Michael Sanders, the author of snipMate,
+for some implementation details I borrowed from his plugin and for the
+permission to use his snippets.
+
+
+=============================================================================
+2. Installation and Updating                       *UltiSnips-installnupdate*
+
+The recommended way of getting UltiSnips is to track SirVer/ultisnips on
+github. The master branch is always stable.
+
+Using Pathogen:                                     *UltiSnips-using-pathogen*
+
+If you are a pathogen user, you can track the official mirror of UltiSnips on
+github: >
+
+   $ cd ~/.vim/bundle && git clone git://github.com/SirVer/ultisnips.git
+
+If you also want the default snippets, also track >
+
+   $ cd ~/.vim/bundle && git clone git://github.com/honza/vim-snippets.git
+
+See the pathogen documentation for more details on how to update a bundle.
+
+
+Using a downloaded packet:               *UltiSnips-using-a-downloaded-packet*
+
+Download the packet and unpack into a directory of your choice. Then add this
+directory to your Vim runtime path by adding this line to your vimrc file. >
+   set runtimepath+=~/.vim/ultisnips_rep
+
+UltiSnips also needs that Vim sources files from the ftdetect/ directory.
+Unfortunately, Vim only allows this directory in the .vim directory. You
+therefore have to symlink/copy the files: >
+   mkdir -p ~/.vim/ftdetect/
+   ln -s ~/.vim/ultisnips_rep/ftdetect/* ~/.vim/ftdetect/
+
+Restart Vim and UltiSnips should work. To access the help, use >
+   :helptags ~/.vim/ultisnips_rep/doc
+   :help UltiSnips
+
+UltiSnips comes without snippets. The default snippets can be found here:
+https://github.com/honza/vim-snippets
+
+=============================================================================
+3. Settings & Commands                                   *UltiSnips-settings*
+
+3.1 Commands                                             *UltiSnips-commands*
+------------
+                                                             *:UltiSnipsEdit*
+The UltiSnipsEdit command opens a private snippet definition file for the
+current filetype. If no snippet file exists, a new file is created. If used as
+UltiSnipsEdit! all public snippet files are taken into account too. If
+multiple files match the search, the user gets to choose the file.
+
+There are several variables associated with the UltiSnipsEdit command.
+
+                                                        *g:UltiSnipsEditSplit*
+g:UltiSnipsEditSplit        Defines how the edit window is opened. Possible
+                            values:
+                            |normal|         Default. Opens in the current window.
+                            |horizontal|     Splits the window horizontally.
+                            |vertical|       Splits the window vertically.
+                            |context|        Splits the window vertically or
+                                           horizontally depending on context.
+
+                                                        *g:UltiSnipsSnippetsDir*
+g:UltiSnipsSnippetsDir
+                            Defines the directory private snippet definition
+                            files are stored in. For example, if the variable
+                            is set to "~/.vim/mydir/UltiSnips" and the current
+                            'filetype' is "cpp", then :UltiSnipsEdit will open
+                            "~/.vim/mydir/UltiSnips/cpp.snippets" if file is
+                            not empty, if it's empty :UltiSnipsEdit will see
+                            for non-empty files in directories
+                            g:UltiSnipsSnippetDirectories, if nothing found,
+                            :UltiSnipsEdit will open new file in
+                            g:UltiSnipsSnippetsDir.
+                            Note that directories named "snippets" are
+                            reserved for snipMate snippets and cannot be used.
+
+                                                        *g:UltiSnipsSnippetDirectories*
+g:UltiSnipsSnippetDirectories
+                            Defines the directories for looking for snippets.
+                            Do not mix up this variable with previous one.
+                            More information about that variable can
+                            be found at section |UltiSnips-snippet-search-path|.
+
+                                                        *g:UltiSnipsEnableSnipMate*
+g:UltiSnipsEnableSnipMate
+                            Enable looking for SnipMate snippets in
+                            &runtimepath. UltiSnips will search only for
+                            directories named 'snippets' while looking for
+                            SnipMate snippets. Defaults to "1", so UltiSnips
+                            will look for SnipMate snippets.
+
+
+                                                       *:UltiSnipsAddFiletypes*
+The UltiSnipsAddFiletypes command allows for explicit merging of other snippet
+filetypes for the current buffer. For example, if you edit a .rst file but
+also want the Lua snippets to be available you can issue the command >
+
+   :UltiSnipsAddFiletypes rst.lua
+
+using the dotted filetype syntax. Order is important, the first filetype in
+this list will be the one used for UltiSnipsEdit and the list is
+ordered by evaluation priority. Consequently, you might add this to your
+ftplugin/rails.vim >
+
+   :UltiSnipsAddFiletypes rails.ruby
+
+I mention rails first because I want to edit rails snippets when using
+UltiSnipsEdit and because rails snippets should overwrite equivalent ruby
+snippets. The priority will now be rails -> ruby -> all. If you have some
+special programming snippets that should have lower priority than your ruby
+snippets you can call >
+
+   :UltiSnipsAddFiletypes ruby.programming
+
+The priority will then be rails -> ruby -> programming -> all.
+
+3.2 Triggers                                             *UltiSnips-triggers*
+------------
+
+                           *g:UltiSnipsExpandTrigger* *g:UltiSnipsListSnippets*
+               *g:UltiSnipsJumpForwardTrigger* *g:UltiSnipsJumpBackwardTrigger*
+You can define the keys used to trigger UltiSnips actions by setting global
+variables. Variables define the keys used to expand a snippet, jump forward
+and jump backwards within a snippet, and list all available snippets in the
+current expand context. Be advised, that some terminal emulators don't send
+<c-tab> to the running program. The variables with their default values are: >
+   g:UltiSnipsExpandTrigger               <tab>
+   g:UltiSnipsListSnippets                <c-tab>
+   g:UltiSnipsJumpForwardTrigger          <c-j>
+   g:UltiSnipsJumpBackwardTrigger         <c-k>
+
+UltiSnips will only map the jump triggers while a snippet is active to
+interfere as little as possible with other mappings.
+
+The default value for g:UltiSnipsJumpBackwardTrigger interferes with the
+built-in complete function: |i_CTRL-X_CTRL-K|. A workaround is to add the
+following to your vimrc file or switching to a plugin like Supertab or
+YouCompleteMe. >
+   inoremap <c-x><c-k> <c-x><c-k>
+
+3.2.1 Using your own trigger functions           *UltiSnips-trigger-functions*
+--------------------------------------
+
+For advanced users there are four functions that you can map directly to a
+key and that correspond to some of the triggers previously defined:
+   g:UltiSnipsExpandTrigger        <--> UltiSnips#ExpandSnippet
+   g:UltiSnipsJumpForwardTrigger   <--> UltiSnips#JumpForwards
+   g:UltiSnipsJumpBackwardTrigger  <--> UltiSnips#JumpBackwards
+
+If you have g:UltiSnipsExpandTrigger and g:UltiSnipsJumpForwardTrigger set
+to the same value then the function you are actually going to use is
+UltiSnips#ExpandSnippetOrJump.
+
+Each time any of the functions UltiSnips#ExpandSnippet,
+UltiSnips#ExpandSnippetOrJump, UltiSnips#JumpForwards or
+UltiSnips#JumpBackwards is called a global variable is set that contains the
+return value of the corresponding function.
+
+The corresponding variables and functions are:
+UltiSnips#ExpandSnippet       --> g:ulti_expand_res (0: fail, 1: success)
+UltiSnips#ExpandSnippetOrJump --> g:ulti_expand_or_jump_res (0: fail,
+                                                    1: expand, 2: jump)
+UltiSnips#JumpForwards        --> g:ulti_jump_forwards_res (0: fail, 1: success)
+UltiSnips#JumpBackwards       --> g:ulti_jump_backwards_res (0: fail, 1: success)
+
+To see how these return values may come in handy, suppose that you want to map
+a key to expand or jump, but if none of these actions is successful you want
+to call another function. UltiSnips already does this automatically for
+supertab, but this allows you individual fine tuning of your Tab key usage.
+
+Usage is as follows: You define a function >
+
+   let g:ulti_expand_or_jump_res = 0 "default value, just set once
+   function! Ulti_ExpandOrJump_and_getRes()
+     call UltiSnips#ExpandSnippetOrJump()
+     return g:ulti_expand_or_jump_res
+   endfunction
+
+then you define your mapping as >
+
+   inoremap <NL> <C-R>=(Ulti_ExpandOrJump_and_getRes() > 0)?"":IMAP_Jumpfunc('', 0)<CR>
+
+and if the you can't expand or jump from the current location then the
+alternative function IMAP_Jumpfunc('', 0) is called.
+
+3.2.2 Custom autocommands                       *UltiSnips-custom-autocommands*
+-------------------------
+
+Note Autocommands must *not* change the buffer in any way. If lines are added,
+deleted, or modified it will confuse UltiSnips which might scramble your
+snippets contents.
+
+                          *UltiSnipsEnterFirstSnippet* *UltiSnipsExitLastSnippet*
+For maximum compatibility with other plug-ins, UltiSnips sets up some special
+state, include mappings and autocommands, when a snippet starts being
+expanded, and tears them down once the last snippet has been exited. In order
+to make it possible to override these "inner" settings, it fires the following
+"User" autocommands:
+
+UltiSnipsEnterFirstSnippet
+UltiSnipsExitLastSnippet
+
+For example, to call a pair of custom functions in response to these events,
+you might do: >
+
+   autocmd! User UltiSnipsEnterFirstSnippet
+   autocmd User UltiSnipsEnterFirstSnippet call CustomInnerKeyMapper()
+   autocmd! User UltiSnipsExitLastSnippet
+   autocmd User UltiSnipsExitLastSnippet call CustomInnerKeyUnmapper()
+
+Note that snippet expansion may be nested, in which case
+|UltiSnipsEnterFirstSnippet| will fire only as the first (outermost) snippet
+is entered, and |UltiSnipsExitLastSnippet| will only fire once the last
+(outermost) snippet have been exited.
+
+
+
+3.2.3 Path to Python module                   *UltiSnips-python-module-path*
+---------------------------
+
+For even more advanced usage, you can directly write python functions using
+UltiSnip's python modules.
+
+Here is a small example funtion that expands a snippet: >
+
+   function! s:Ulti_ExpandSnip()
+   Python << EOF
+   import sys, vim
+   from UltiSnips import UltiSnips_Manager
+   UltiSnips_Manager.expand()
+   EOF
+   return ""
+   endfunction
+
+3.3 Snippet Search Path                       *UltiSnips-snippet-search-path*
+-----------------------
+
+UltiSnips snippet definition files are stored in one or more directories.
+There are several variables used to indicate those directories and to define
+how UltiSnips loads snippets.
+
+Snippet definition files are stored in snippet directories. A snippet
+directory must be a subdirectory of a directory defined in the 'runtimepath'
+option. The variable g:UltiSnipsSnippetDirectories defines a list of names
+used for snippet directories. Note that "snippets" is reserved for snipMate
+snippets and cannot be used. The default is shown below. >
+
+   let g:UltiSnipsSnippetDirectories=["UltiSnips"]
+
+UltiSnips will search each 'runtimepath' directory for the subdirectory names
+defined in g:UltiSnipsSnippetDirectories in the order they are defined. For
+example, if you keep your snippets in a .vim subdirectory called
+"mycoolsnippets" and you want to make use of the default snippets that come
+with UltiSnips, add the following to your vimrc file. >
+   let g:UltiSnipsSnippetDirectories=["UltiSnips", "mycoolsnippets"]
+If you do not want to use the third party snippets that come with plugins,
+define the variable accordingly: >
+   let g:UltiSnipsSnippetDirectories=["mycoolsnippets"]
+
+You can also redefine the search path on a buffer by buffer basis by setting
+the variable b:UltiSnipsSnippetDirectories. This variable takes precedence
+over the global variable.
+
+|UltiSnips-adding-snippets| explains which files are parsed for a given filetype.
+
+If only one directory is specified in this variable and this directory is
+specified by absolute path, UltiSnips will not look for snippets in
+&runtimepath, which can lead to significant speedup. So, the common case is:
+
+    let g:UltiSnipsSnippetDirectories=$HOME.'/.vim/UltiSnips'
+
+However, you will not able to use snippets that are shipped with third party
+plugins out of the box. You'll need to copy them into your chosen directory.
+
+
+3.4 Warning About Select Mode Mappings          *UltiSnips-warning-smappings*
+--------------------------------------
+
+Vim's help document for |mapmode-s| states: >
+   NOTE: Mapping a printable character in Select mode may confuse the user.
+   It's better to explicitly use :xmap and :smap for printable characters.  Or
+   use :sunmap after defining the mapping.
+
+However, most Vim plugins, including some default Vim plugins, do not adhere
+to this. UltiSnips uses Select mode to mark tabstops in snippets for
+overwriting. Existing Visual+Select mode mappings will interfere. Therefore,
+UltiSnips issues a |:sunmap| command to remove each Select mode mapping for
+printable characters. No other mappings are touched. In particular, UltiSnips
+does not change existing normal, insert or visual mode mappings.
+
+If this behavior is not desired, you can disable it by adding this line to
+your vimrc file. >
+   let g:UltiSnipsRemoveSelectModeMappings = 0
+
+If you want to disable this feature for specific mappings only, add them to
+the list of mappings to be ignored. For example, the following lines in your
+vimrc file will unmap all Select mode mappings except those mappings
+containing either the string "somePlugin" or the string "otherPlugin" in its
+complete definition as listed by the |:smap| command. >
+
+   let g:UltiSnipsRemoveSelectModeMappings = 1
+   let g:UltiSnipsMappingsToIgnore = [ "somePlugin", "otherPlugin" ]
+
+
+3.5 Functions                                           *UltiSnips-functions*
+-------------
+
+UltiSnips provides some functions for extending core functionality.
+
+
+ 3.5.1 UltiSnips#AddSnippetWithPriority    *UltiSnips#AddSnippetWithPriority*
+
+The first function is UltiSnips#AddSnippetWithPriority(trigger, value, description,
+options, filetyp, priority). It adds a new snippet with the provided trigger, value,
+description, and options to the current list of snippets. See
+|UltiSnips-syntax| for details on the meaning of the function arguments. The
+Priority is a number that defines which snippet should be preferred over
+others. See the priority keyword in|UltiSnips-add-snippets|.
+
+
+ 3.5.2 UltiSnips#Anon                                        *UltiSnips#Anon*
+
+The second function is UltiSnips#Anon(value, ...). It expands an anonymous
+snippet. Anonymous snippets are defined on the spot, expanded and immediately
+discarded again. Anonymous snippets are not added to the global list of
+snippets, so they cannot be expanded a second time unless the function is
+called again. The function takes three optional arguments, in order: trigger,
+description, options. Arguments coincide with the arguments of the
+|UltiSnips#AddSnippetWithPriority| function of the same name. The trigger and
+options arguments can change the way the snippet expands. Same options
+can be specified as in the snippet definition. See full list of options at
+|UltiSnips-snippet-options|. The description is unused at this point.
+
+An example use case might be this line from a reStructuredText plugin file:
+
+   inoremap <silent> $$ $$<C-R>=UltiSnips#Anon(':latex:\`$1\`', '$$')<cr>
+
+This expands the snippet whenever two $ signs are typed.
+Note: The right-hand side of the mapping starts with an immediate retype of
+the '$$' trigger and passes '$$' to the function as the trigger argument.
+This is required in order for UltiSnips to have access to the characters
+typed so it can determine if the trigger matches or not.
+
+ 3.5.3 UltiSnips#SnippetsInCurrentScope    *UltiSnips#SnippetsInCurrentScope*
+
+A third function is UltiSnips#SnippetsInCurrentScope which is the equivalent
+of snipmate GetSnipsInCurrentScope function.
+
+This function simply returns a vim dictionary with the snippets whose trigger
+matches the current word.  If you need all snippets information of current
+buffer, you can simply pass 1 (which means all) as first argument of this
+function, and use a global variable g:current_ulti_dict_info to get the
+result (see example below).
+
+This function does not add any new functionality to ultisnips directly but
+allows to use third party plugins to integrate the current available snippets.
+
+An example of such third party plugin is SnippetCompleteSnipMate which uses
+the function GetSnipsInCurrentScope to integrate the current available
+snippets with user defined abbreviations and provides these and a completion
+menu.
+This script is located in
+http://www.vim.org/scripts/script.php?script_id=4276.
+Note: If you check the above website it lists two dependencies: the
+SnippetComplete plugin and snipmate.
+You do need the SnippetComplete plugin but you obviously don't need snipmate,
+you just have to define the function GetSnipsInCurrentScope. Put the following
+in your vimrc:
+
+function! GetSnipsInCurrentScope()
+  return UltiSnips#SnippetsInCurrentScope()
+endfunction
+
+
+As a second example on how to use this function consider the following
+function and mapping definition:
+
+function! ExpandPossibleShorterSnippet()
+  if len(UltiSnips#SnippetsInCurrentScope()) == 1 "only one candidate...
+    let curr_key = keys(UltiSnips#SnippetsInCurrentScope())[0]
+    normal diw
+    exe "normal a" . curr_key
+    exe "normal a "
+    return 1
+  endif
+  return 0
+endfunction
+inoremap <silent> <C-L> <C-R>=(ExpandPossibleShorterSnippet() == 0? '': UltiSnips#ExpandSnippet())<CR>
+
+If the trigger for your snippet is lorem, you type lor, and you have no other
+snippets whose trigger matches lor then hitting <C-L> will expand to whatever
+lorem expands to.
+
+A third example on how to use this function to extract all snippets of
+current buffer: >
+
+function! GetAllSnippets()
+  call UltiSnips#SnippetsInCurrentScope(1)
+  let list = []
+  for [key, info] in items(g:current_ulti_dict_info)
+    let parts = split(info.location, ':')
+    call add(list, {
+      \"key": key,
+      \"path": parts[0],
+      \"linenr": parts[1],
+      \"description": info.description,
+      \})
+  endfor
+  return list
+endfunction
+
+The new variable g:current_ulti_dict_info is made to avoid confilct with
+exists third party plugins.  The definition location contains file path and
+line number is also included in this variable.
+
+3.6 Warning about missing python support           *UltiSnips-python-warning*
+----------------------------------------
+
+When UltiSnips is loaded, it will check that the running Vim was compiled with
+python support.  If no support is detected, a warning will be displayed and
+loading of UltiSnips will be skipped.
+
+If you would like to suppress this warning message, you may add the following
+line to your vimrc file.
+
+    let g:UltiSnipsNoPythonWarning = 1
+
+This may be useful if your Vim configuration files are shared across several
+systems where some of them may not have Vim compiled with python support.
+
+=============================================================================
+4. Syntax                                                  *UltiSnips-syntax*
+
+This chapter describes how to write your own snippets and snippet definition
+syntax. Examples are used to help illustrate.
+
+
+4.1 Adding Snippets                               *UltiSnips-adding-snippets*
+-------------------
+
+See |UltiSnips-snippet-search-path| for an explanation of where directories
+with snippet definitions should be located.
+
+Using a strategy similar to how Vim detects |ftplugins|, UltiSnips iterates
+over the snippet definition directories looking for files with names of the
+following patterns: ft.snippets, ft_*.snippets, or ft/*, where "ft" is the
+'filetype' of the current document and "*" is a shell-like wildcard matching
+any string including the empty string. The following table shows some typical
+snippet filenames and their associated filetype.
+
+    snippet filename         filetype ~
+    ruby.snippets            ruby
+    perl.snippets            perl
+    c.snippets               c
+    c_my.snippets            c
+    c/a                      c
+    c/b.snippets             c
+    all.snippets             *all
+    all/a.snippets           *all
+
+* The 'all' filetype is unique. It represents snippets available for use when
+editing any document regardless of the filetype. A date insertion snippet, for
+example, would fit well in the all.snippets file.
+
+UltiSnips understands Vim's dotted filetype syntax. For example, if you define
+a dotted filetype for the CUDA C++ framework, e.g. ":set ft=cuda.cpp", then
+UltiSnips will search for and activate snippets for both the cuda and cpp
+filetypes.
+
+The snippets file syntax is simple. All lines starting with a # character are
+considered comments. Comments are ignored by UltiSnips. Use them to document
+snippets.
+
+A line beginning with the keyword 'extends' provides a way of combining
+snippet files. When the 'extends' directive is included in a snippet file, it
+instructs UltiSnips to include all snippets from the indicated filetypes.
+
+The syntax looks like this: >
+   extends ft1, ft2, ft3
+
+For example, the first line in cpp.snippets looks like this: >
+   extends c
+When UltiSnips activates snippets for a cpp file, it first looks for all c
+snippets and activates them as well. This is a convenient way to create
+specialized snippet files from more general ones. Multiple 'extends' lines are
+permitted in a snippet file, and they can be included anywhere in the file.
+
+
+A line beginning with the keyword 'priority' sets the priority for all
+snippets defined in the current file after this line. The default priority for
+a file is always 0. When a snippet should be expanded, UltiSnips will collect
+all snippet definitions from all sources that match the trigger and keep only
+the ones with the highest priority. For example, all shipped snippets have a
+priority < 0, so that user defined snippets always overwrite shipped snippets.
+
+
+A line beginning with the keyword 'snippet' marks the beginning of snippet
+definition and a line starting with  the keyword 'endsnippet' marks the end.
+The snippet definition is placed between the lines. Here is a snippet of an
+'if' statement for the Unix shell (sh) filetype.
+
+    snippet if "if ... then (if)"
+    if ${2:[[ ${1:condition} ]]}; then
+            ${0:#statements}
+    fi
+    endsnippet
+
+The start line takes the following form: >
+
+   snippet tab_trigger [ "description" [ options ] ]
+
+The tab_trigger is required, but the description and options are optional.
+
+The 'tab_trigger' is the word or string sequence used to trigger the snippet.
+Generally a single word is used but the tab_trigger can include spaces. If you
+wish to include spaces, you must wrap the tab trigger in quotes. >
+
+    snippet "tab trigger" [ "description" [ options ] ]
+
+The quotes are not part of the trigger. To activate the snippet type: tab trigger
+followed by the snippet expand character.
+
+It is not technically necessary to use quotes to wrap a trigger with spaces.
+Any matching characters will do. For example, this is a valid snippet starting
+line. >
+    snippet !tab trigger! [ "description" [ options ] ]
+
+Quotes can be included as part of the trigger by wrapping the trigger in
+another character. >
+    snippet !"tab trigger"! [ "description" [ options ] ]
+
+To activate this snippet one would type: "tab trigger"
+
+The 'description' is a string describing the trigger. It is helpful for
+documenting the snippet and for distinguishing it from other snippets with the
+same tab trigger. When a snippet is activated and more than one tab trigger
+match, UltiSnips displays a list of the matching snippets with their
+descriptions. The user then selects the snippet they want.
+
+                                                  *UltiSnips-snippet-options*
+
+The 'options' control the behavior of the snippet. Options are indicated by
+single characters. The 'options' characters for a snippet are combined into
+a word without spaces.
+
+The options currently supported are: >
+   b   Beginning of line - A snippet with this option is expanded only if the
+       tab trigger is the first word on the line. In other words, if only
+       whitespace precedes the tab trigger, expand. The default is to expand
+       snippets at any position regardless of the preceding non-whitespace
+       characters.
+
+   i   In-word expansion - By default a snippet is expanded only if the tab
+       trigger is the first word on the line or is preceded by one or more
+       whitespace characters. A snippet with this option is expanded
+       regardless of the preceding character. In other words, the snippet can
+       be triggered in the middle of a word.
+
+   w   Word boundary - With this option, the snippet is expanded if
+       the tab trigger start matches a word boundary and the tab trigger end
+       matches a word boundary. In other words the tab trigger must be
+       preceded and followed by non-word characters. Word characters are
+       defined by the 'iskeyword' setting. Use this option, for example, to
+       permit expansion where the tab trigger follows punctuation without
+       expanding suffixes of larger words.
+
+   r   Regular expression - With this option, the tab trigger is expected to
+       be a python regular expression. The snippet is expanded if the recently
+       typed characters match the regular expression. Note: The regular
+       expression MUST be quoted (or surrounded with another character) like a
+       multi-word tab trigger (see above) whether it has spaces or not. A
+       resulting match is passed to any python code blocks in the snippet
+       definition as the local variable "match".
+
+   t   Do not expand tabs - If a snippet definition includes leading tab
+       characters, by default UltiSnips expands the tab characters honoring
+       the Vim 'shiftwidth', 'softtabstop', 'expandtab' and 'tabstop'
+       indentation settings. (For example, if 'expandtab' is set, the tab is
+       replaced with spaces.) If this option is set, UltiSnips will ignore the
+       Vim settings and insert the tab characters as is. This option is useful
+       for snippets involved with tab delimited formats, for example.
+
+   s   Remove whitespace immediately before the cursor at the end of a line
+       before jumping to the next tabstop.  This is useful if there is a
+       tabstop with optional text at the end of a line.
+
+   m   Trim all whitespaces from right side of snippet lines. Useful when
+       snippet contains empty lines which should remain empty after expanding.
+       Without this option empty lines in snippets definition will have
+       indentation too.
+
+   e   Context snippets - With this option expansion of snippet can be
+       controlled not only by previous characters in line, but by any given
+       python expression. This option can be specified along with other
+       options, like 'b'. See |UltiSnips-context-snippets| for more info.
+
+   A   Snippet will be triggered automatically, when condition matches.
+       See |UltiSnips-autotrigger| for more info.
+
+The end line is the 'endsnippet' keyword on a line by itself. >
+
+   endsnippet
+
+When parsing snippet files, UltiSnips chops the trailing newline character
+from the 'endsnippet' end line.
+
+
+ 4.1.1 Character Escaping:                     *UltiSnips-character-escaping*
+
+In snippet definitions, the characters '`', '{', '$' and '\' have special
+meaning. If you want to insert one of these characters literally, escape them
+with a backslash, '\'.
+
+
+4.2 Plaintext Snippets                         *UltiSnips-plaintext-snippets*
+----------------------
+
+To illustrate plaintext snippets, let's begin with a simple example. You can
+try the examples yourself. Simply edit a new file with Vim. Example snippets
+will be added to the 'all.snippets' file, so you'll want to open it in Vim for
+editing as well. >
+   ~/.vim/UltiSnips/all.snippets
+
+Add this snippet to 'all.snippets' and save the file.
+
+------------------- SNIP -------------------
+snippet bye "My mail signature"
+Good bye, Sir. Hope to talk to you soon.
+- Arthur, King of Britain
+endsnippet
+------------------- SNAP -------------------
+
+UltiSnips detects when you write changes to a snippets file and automatically
+makes the changes active. So in the empty buffer, type the tab trigger 'bye'
+and then press the <Tab> key.
+
+bye<Tab> -->
+Good bye, Sir. Hope to talk to you soon.
+- Arthur, King of Britain
+
+The word 'bye' will be replaced with the text of the snippet definition.
+
+
+4.3 Visual Placeholder                         *UltiSnips-visual-placeholder*
+----------------------
+
+Snippets can contain a special placeholder called ${VISUAL}. The ${VISUAL}
+variable is expanded with the text selected just prior to expanding the
+snippet.
+
+To see how a snippet with a ${VISUAL} placeholder works, define a snippet with
+the placeholder, use Vim's Visual mode to select some text, and then press the
+key you use to trigger expanding a snippet (see g:UltiSnipsExpandTrigger). The
+selected text is deleted, and you are dropped into Insert mode. Now type the
+snippet tab trigger and press the key to trigger expansion. As the snippet
+expands, the previously selected text is printed in place of the ${VISUAL}
+placeholder.
+
+The ${VISUAL} placeholder can contain default text to use when the snippet has
+been triggered when not in Visual mode. The syntax is: >
+    ${VISUAL:default text}
+
+The ${VISUAL} placeholder can also define a transformation (see
+|UltiSnips-transformations|). The syntax is: >
+    ${VISUAL:default/search/replace/option}.
+
+Here is a simple example illustrating a visual transformation. The snippet
+will take selected text, replace every instance of "should" within it with
+"is" , and wrap the result in tags.
+
+------------------- SNIP -------------------
+snippet t
+<tag>${VISUAL:inside text/should/is/g}</tag>
+endsnippet
+------------------- SNAP -------------------
+
+Start with this line of text: >
+   this should be cool
+
+Position the cursor on the word "should", then press the key sequence: viw
+(visual mode -> select inner word). Then press <Tab>, type "t" and press <Tab>
+again. The result is: >
+   -> this <tag>is</tag> be cool
+
+If you expand this snippet while not in Visual mode (e.g., in Insert mode type
+t<Tab>), you will get: >
+   <tag>inside text</tag>
+
+
+4.4 Interpolation                                   *UltiSnips-interpolation*
+-----------------
+
+ 4.4.1 Shellcode:                                       *UltiSnips-shellcode*
+
+Snippets can include shellcode. Put a shell command in a snippet and when the
+snippet is expanded, the shell command is replaced by the output produced when
+the command is executed. The syntax for shellcode is simple: wrap the code in
+backticks, '`'. When a snippet is expanded, UltiSnips runs shellcode by first
+writing it to a temporary script and then executing the script. The shellcode
+is replaced by the standard output. Anything you can run as a script can be
+used in shellcode. Include a shebang line, for example, #!/usr/bin/perl, and
+your snippet has the ability to run scripts using other programs, perl, for
+example.
+
+Here are some examples. This snippet uses a shell command to insert the
+current date.
+
+------------------- SNIP -------------------
+snippet today
+Today is the `date +%d.%m.%y`.
+endsnippet
+------------------- SNAP -------------------
+
+today<tab> ->
+Today is the 15.07.09.
+
+
+This example inserts the current date using perl.
+
+------------------- SNIP -------------------
+snippet today
+Today is `#!/usr/bin/perl
+@a = localtime(); print $a[3] . '.' . $a[4] . '.' . ($a[5]+1900);`.
+endsnippet
+------------------- SNAP -------------------
+today<tab> ->
+Today is 15.6.2009.
+
+
+ 4.4.2 VimScript:                                       *UltiSnips-vimscript*
+
+You can also use Vim scripts (sometimes called VimL) in interpolation. The
+syntax is similar to shellcode. Wrap the code in backticks and to distinguish
+it as a Vim script, start the code with '!v'. Here is an example that counts
+the indent of the current line:
+
+------------------- SNIP -------------------
+snippet indent
+Indent is: `!v indent(".")`.
+endsnippet
+------------------- SNAP -------------------
+    (note the 4 spaces in front): indent<tab> ->
+    (note the 4 spaces in front): Indent is: 4.
+
+
+ 4.4.3 Python:                                             *UltiSnips-python*
+
+Python interpolation is by far the most powerful. The syntax is similar to Vim
+scripts except code is started with '!p'. Python scripts can be run using the
+python shebang '#!/usr/bin/python', but using the '!p' format comes with some
+predefined objects and variables, which can simplify and shorten code. For
+example, a 'snip' object instance is implied in python code. Python code using
+the '!p' indicator differs in another way. Generally when a snippet is
+expanded the standard output of code replaces the code. With python code the
+value of the 'rv' property of the 'snip' instance replaces the code. Standard
+output is ignored.
+
+The variables automatically defined in python code are: >
+
+   fn      - The current filename
+   path    - The complete path to the current file
+   t       - The values of the placeholders, t[1] is the text of ${1}, etc.
+   snip    - UltiSnips.TextObjects.SnippetUtil object instance. Has methods
+             that simplify indentation handling.
+   context - Result of context condition. See |UltiSnips-context-snippets|.
+
+The 'snip' object provides the following methods: >
+
+    snip.mkline(line="", indent=None):
+        Returns a line ready to be appended to the result. If indent
+        is None, then mkline prepends spaces and/or tabs appropriate to the
+        current 'tabstop' and 'expandtab' variables.
+
+    snip.shift(amount=1):
+        Shifts the default indentation level used by mkline right by the
+        number of spaces defined by 'shiftwidth', 'amount' times.
+
+    snip.unshift(amount=1):
+        Shifts the default indentation level used by mkline left by the
+        number of spaces defined by 'shiftwidth', 'amount' times.
+
+    snip.reset_indent():
+        Resets the indentation level to its initial value.
+
+    snip.opt(var, default):
+        Checks if the Vim variable 'var' has been set. If so, it returns the
+        variable's value; otherwise, it returns the value of 'default'.
+
+The 'snip' object provides some properties as well: >
+
+    snip.rv:
+        'rv' is the return value, the text that will replace the python block
+        in the snippet definition. It is initialized to the empty string. This
+        deprecates the 'res' variable.
+
+    snip.c:
+        The text currently in the python block's position within the snippet.
+        It is set to empty string as soon as interpolation is completed. Thus
+        you can check if snip.c is != "" to make sure that the interpolation
+        is only done once. This deprecates the "cur" variable.
+
+    snip.v:
+         Data related to the ${VISUAL} placeholder. The property has two
+         attributes:
+             snip.v.mode   ('v', 'V', '^V', see |visual-mode| )
+             snip.v.text   The text that was selected.
+
+    snip.fn:
+        The current filename.
+
+    snip.basename:
+        The current filename with the extension removed.
+
+    snip.ft:
+        The current filetype.
+
+    snip.p:
+        Last selected placeholder. Will contain placeholder object with
+        following properties:
+
+        'current_text' - text in the placeholder on the moment of selection;
+        'start' - placeholder start on the moment of selection;
+        'end' - placeholder end on the moment of selection;
+
+For your convenience, the 'snip' object also provides the following
+operators: >
+
+    snip >> amount:
+        Equivalent to snip.shift(amount)
+    snip << amount:
+        Equivalent to snip.unshift(amount)
+    snip += line:
+        Equivalent to "snip.rv += '\n' + snip.mkline(line)"
+
+Any variables defined in a python block can be used in other python blocks
+that follow within the same snippet. Also, the python modules 'vim', 're',
+'os', 'string' and 'random' are pre-imported within the scope of snippet code.
+Other modules can be imported using the python 'import' command.
+
+Python code allows for very flexible snippets. For example, the following
+snippet mirrors the first tabstop value on the same line but right aligned and
+in uppercase.
+
+------------------- SNIP -------------------
+snippet wow
+${1:Text}`!p snip.rv = (75-2*len(t[1]))*' '+t[1].upper()`
+endsnippet
+------------------- SNAP -------------------
+wow<tab>Hello World ->
+Hello World                                                     HELLO WORLD
+
+The following snippet uses the regular expression option and illustrates
+regular expression grouping using python's match object. It shows that the
+expansion of a snippet can depend on the tab trigger used to define the
+snippet, and that tab trigger itself can vary.
+
+------------------- SNIP -------------------
+snippet "be(gin)?( (\S+))?" "begin{} / end{}" br
+\begin{${1:`!p
+snip.rv = match.group(3) if match.group(2) is not None else "something"`}}
+    ${2:${VISUAL}}
+\end{$1}$0
+endsnippet
+------------------- SNAP -------------------
+be<tab>center<c-j> ->
+\begin{center}
+
+\end{center}
+------------------- SNAP -------------------
+be center<tab> ->
+\begin{center}
+
+\end{center}
+
+The second form is a variation of the first; both produce the same result,
+but it illustrates how regular expression grouping works. Using regular
+expressions in this manner has some drawbacks:
+1. If you use the <Tab> key for both expanding snippets and completion then
+   if you typed "be form<Tab>" expecting the completion "be formatted", you
+   would end up with the above SNAP instead, not what you want.
+2. The snippet is harder to read.
+
+The biggest advantage, however, is that you can create snippets that take into
+account the text preceding a "trigger". This way, you can use it to create
+postfix snippets, which are popular in some IDEs.
+
+------------------- SNIP -------------------
+snippet "(\w+).par" "Parenthesis (postfix)" r
+(`!p snip.rv = match.group(1)`$1)$0
+endsnippet
+------------------- SNAP -------------------
+something.par<tab> ->
+(something)
+
+------------------- SNIP -------------------
+snippet "([^\s].*)\.return" "Return (postfix)" r
+return `!p snip.rv = match.group(1)`$0
+endsnippet
+------------------- SNAP -------------------
+value.return<tab> ->
+return value
+
+
+ 4.4.4 Global Snippets:                                   *UltiSnips-globals*
+
+Global snippets provide a way to reuse common code in multiple snippets.
+Currently, only python code is supported. The result of executing the contents
+of a global snippet is put into the globals of each python block in the
+snippet file. To create a global snippet, use the keyword 'global' in place of
+'snippet', and for python code, you use '!p' for the trigger. For example, the
+following snippet produces the same output as the last example . However, with
+this syntax the 'upper_right' snippet can be reused by other snippets.
+
+------------------- SNIP -------------------
+global !p
+def upper_right(inp):
+    return (75 - 2 * len(inp))*' ' + inp.upper()
+endglobal
+
+snippet wow
+${1:Text}`!p snip.rv = upper_right(t[1])`
+endsnippet
+------------------- SNAP -------------------
+wow<tab>Hello World ->
+Hello World                                                     HELLO WORLD
+
+Python global functions can be stored in a python module and then imported.
+This makes global functions easily accessible to all snippet files. Since Vim
+7.4 you can just drop python files into ~/.vim/pythonx and import them
+directly inside your snippets. For example to use
+~/.vim/pythonx/my_snippets_helpers.py  >
+
+   global !p
+   from my_snippet_helpers import *
+   endglobal
+
+
+4.5 Tabstops and Placeholders   *UltiSnips-tabstops* *UltiSnips-placeholders*
+-----------------------------
+
+Snippets are used to quickly insert reused text into a document. Often the
+text has a fixed structure with variable components. Tabstops are used to
+simplify modifying the variable content. With tabstops you can easily place
+the cursor at the point of the variable content, enter the content you want,
+then jump to the next variable component, enter that content, and continue
+until all the variable components are complete.
+
+The syntax for a tabstop is the dollar sign followed by a number, for example,
+'$1'. Tabstops start at number 1 and are followed in sequential order. The
+'$0' tabstop is a special tabstop. It is always the last tabstop in the
+snippet no matter how many tabstops are defined. If there is no '$0' defined,
+'$0' tabstop will be defined at the end of snippet.
+
+Here is a simple example.
+
+------------------- SNIP -------------------
+snippet letter
+Dear $1,
+$0
+Yours sincerely,
+$2
+endsnippet
+------------------- SNAP -------------------
+letter<tab>Ben<c-j>Paul<c-j>Thanks for suggesting UltiSnips!->
+Dear Ben,
+Thanks for suggesting UltiSnips!
+Yours sincerely,
+Paul
+
+You can use <c-j> to jump to the next tabstop, and <c-k> to jump to the
+previous. The <Tab> key was not used for jumping forward because many people
+(myself included) use <Tab> for completion. See |UltiSnips-triggers| for
+help on defining different keys for tabstops.
+
+It is often useful to have some default text for a tabstop. The default text
+may be a value commonly used for the variable component, or it may be a word
+or phrase that reminds you what is expected for the variable component. To
+include default text, the syntax is '${1:value}'.
+
+The following example illustrates a snippet for the shell 'case' statement.
+The tabstops use default values to remind the user of what value is expected.
+
+------------------- SNIP -------------------
+snippet case
+case ${1:word} in
+    ${2:pattern} ) $0;;
+esac
+endsnippet
+------------------- SNAP -------------------
+
+case<tab>$option<c-j>-v<c-j>verbose=true
+case $option in
+    -v ) verbose=true;;
+esac
+
+
+Sometimes it is useful to have a tabstop within a tabstop. To do this, simply
+include the nested tabstop as part of the default text. Consider the following
+example illustrating an HTML anchor snippet.
+
+------------------- SNIP -------------------
+snippet a
+<a href="${1:http://www.${2:example.com}}"</a>
+    $0
+</a>
+endsnippet
+------------------- SNAP -------------------
+
+When this snippet is expanded, the first tabstop has a default value of
+'http://www.example.com'. If you want the 'http://' schema, jump to the next
+tabstop. It has a default value of 'example.com'. This can be replaced by
+typing whatever domain you want.
+
+a<tab><c-j>google.com<c-j>Google ->
+<a href="http://www.google.com">
+    Google
+</a>
+
+If at the first tabstop you want a different url schema or want to replace the
+default url with a named anchor, '#name', for example, just type the value you
+want.
+
+a<tab>#top<c-j>Top ->
+<a href="#top">
+    Top
+</a>
+
+In the last example, typing any text at the first tabstop replaces the default
+value, including the second tabstop, with the typed text. So the second
+tabstop is essentially deleted. When a tabstop jump is triggered, UltiSnips
+moves to the next remaining tabstop '$0'. This feature can be used
+intentionally as a handy way for providing optional tabstop values to the
+user. Here is an example to illustrate.
+
+------------------- SNIP -------------------
+snippet a
+<a href="$1"${2: class="${3:link}"}>
+    $0
+</a>
+endsnippet
+------------------- SNAP -------------------
+
+Here, '$1' marks the first tabstop. It is assumed you always want to add a
+value for the 'href' attribute. After entering the url and pressing <c-j>, the
+snippet will jump to the second tabstop, '$2'. This tabstop is optional. The
+default text is ' class="link"'. You can press <c-j> to accept the tabstop,
+and the snippet will jump to the third tabstop, '$3', and you can enter the
+class attribute value, or, at the second tabstop you can press the backspace
+key thereby replacing the second tabstop default with an empty string,
+essentially removing it. In either case, continue by pressing <c-j> and the
+snippet will jump to the final tabstop inside the anchor.
+
+a<tab>http://www.google.com<c-j><c-j>visited<c-j>Google ->
+<a href="http://www.google.com" class="visited">
+    Google
+</a>
+
+a<tab>http://www.google.com<c-j><BS><c-j>Google ->
+<a href="http://www.google.com">
+    Google
+</a>
+
+The default text of tabstops can also contain mirrors, transformations or
+interpolation.
+
+
+4.6 Mirrors                                               *UltiSnips-mirrors*
+-----------
+
+Mirrors repeat the content of a tabstop. During snippet expansion when you
+enter the value for a tabstop, all mirrors of that tabstop are replaced with
+the same value. To mirror a tabstop simply insert the tabstop again using the
+"dollar sign followed by a number" syntax, e.g., '$1'.
+
+A tabstop can be mirrored multiple times in one snippet, and more than one
+tabstop can be mirrored in the same snippet. A mirrored tabstop can have a
+default value defined. Only the first instance of the tabstop need have a
+default value. Mirrored tabstop will take on the default value automatically.
+
+Mirrors are handy for start-end tags, for example, TeX 'begin' and 'end' tag
+labels, XML and HTML tags, and C code #ifndef blocks. Here are some snippet
+examples.
+
+------------------- SNIP -------------------
+snippet env
+\begin{${1:enumerate}}
+    $0
+\end{$1}
+endsnippet
+------------------- SNAP -------------------
+env<tab>itemize ->
+\begin{itemize}
+
+\end{itemize}
+
+------------------- SNIP -------------------
+snippet ifndef
+#ifndef ${1:SOME_DEFINE}
+#define $1
+$0
+#endif /* $1 */
+endsnippet
+------------------- SNAP -------------------
+ifndef<tab>WIN32 ->
+#ifndef WIN32
+#define WIN32
+
+#endif /* WIN32 */
+
+
+4.7 Transformations                               *UltiSnips-transformations*
+-------------------
+
+Note: Transformations are a bit difficult to grasp so this chapter is divided
+into two sections. The first describes transformations and their syntax, and
+the second illustrates transformations with demos.
+
+Transformations are like mirrors but instead of just copying text from the
+original tabstop verbatim, a regular expression is matched to the content of
+the referenced tabstop and a transformation is then applied to the matched
+pattern. The syntax and functionality of transformations in UltiSnips follow
+very closely to TextMate transformations.
+
+A transformation has the following syntax: >
+   ${<tab_stop_no/regular_expression/replacement/options}
+
+The components are defined as follows: >
+   tab_stop_no        - The number of the tabstop to reference
+   regular_expression - The regular expression the value of the referenced
+                        tabstop is matched on
+   replacement        - The replacement string, explained in detail below
+   options            - Options for the regular expression
+
+The options can be any combination of >
+   g    - global replace
+          By default, only the first match of the regular expression is
+          replaced. With this option all matches are replaced.
+   i    - case insensitive
+          By default, regular expression matching is case sensitive. With this
+          option, matching is done without regard to case.
+   m    - multiline
+          By default, the '^' and '$' special characters only apply to the
+          start and end of the entire string; so if you select multiple lines,
+          transformations are made on them entirely as a whole single line
+          string. With this option, '^' and '$' special characters match the
+          start or end of any line within a string ( separated by newline
+          character - '\n' ).
+   a    - ascii conversion
+          By default, transformation are made on the raw utf-8 string. With
+          this option, matching is done on the corresponding ASCII string
+          instead, for example 'à' will become 'a'.
+          This option required the python package 'unidecode'.
+
+The syntax of regular expressions is beyond the scope of this document. Python
+regular expressions are used internally, so the python 're' module can be used
+as a guide. See http://docs.python.org/library/re.html.
+
+The syntax for the replacement string is unique. The next paragraph describes
+it in detail.
+
+
+ 4.7.1 Replacement String:                     *UltiSnips-replacement-string*
+
+The replacement string can contain $no variables, e.g., $1, which reference
+matched groups in the regular expression. The $0 variable is special and
+yields the whole match. The replacement string can also contain special escape
+sequences: >
+   \u   - Uppercase next letter
+   \l   - Lowercase next letter
+   \U   - Uppercase everything till the next \E
+   \L   - Lowercase everything till the next \E
+   \E   - End upper or lowercase started with \L or \U
+   \n   - A newline
+   \t   - A literal tab
+
+Finally, the replacement string can contain conditional replacements using the
+syntax (?no:text:other text). This reads as follows: if the group $no has
+matched, insert "text", otherwise insert "other text". "other text" is
+optional and if not provided defaults to the empty string, "". This feature
+is very powerful. It allows you to add optional text into snippets.
+
+
+ 4.7.2 Demos:                                               *UltiSnips-demos*
+
+Transformations are very powerful but often the syntax is convoluted.
+Hopefully the demos below help illustrate transformation features.
+
+Demo: Uppercase one character
+------------------- SNIP -------------------
+snippet title "Title transformation"
+${1:a text}
+${1/\w+\s*/\u$0/}
+endsnippet
+------------------- SNAP -------------------
+title<tab>big small ->
+big small
+Big small
+
+
+Demo: Uppercase one character and global replace
+------------------- SNIP -------------------
+snippet title "Titlelize in the Transformation"
+${1:a text}
+${1/\w+\s*/\u$0/g}
+endsnippet
+------------------- SNAP -------------------
+title<tab>this is a title ->
+this is a title
+This Is A Title
+
+
+Demo: ASCII transformation
+------------------- SNIP -------------------
+snippet ascii "Replace non ascii chars"
+${1: an accentued text}
+${1/.*/$0/a}
+endsnippet
+------------------- SNAP -------------------
+ascii<tab>à la pêche aux moules
+à la pêche aux moules
+a la peche aux moules
+
+
+Demo: Regular expression grouping
+      This is a clever c-like printf snippet, the second tabstop is only shown
+      when there is a format (%) character in the first tabstop.
+
+------------------- SNIP -------------------
+snippet printf
+printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2:\);)/}
+endsnippet
+------------------- SNAP -------------------
+printf<tab>Hello<c-j> // End of line ->
+printf("Hello\n"); // End of line
+
+But
+printf<tab>A is: %s<c-j>A<c-j> // End of line ->
+printf("A is: %s\n", A); // End of line
+
+
+There are many more examples of what can be done with transformations in the
+bundled snippets.
+
+
+4.8 Clearing snippets                           *UltiSnips-clearing-snippets*
+
+To remove snippets for the current file type, use the 'clearsnippets'
+directive.
+
+------------------- SNIP -------------------
+clearsnippets
+------------------- SNAP -------------------
+
+'clearsnippets' removes all snippets with a priority lower than the current
+one. For example, the following cleares all snippets that have priority <= 1,
+even though the example snippet is defined after the 'clearsnippets'.
+
+------------------- SNIP -------------------
+priority 1
+clearsnippets
+
+priority -1
+snippet example "Cleared example"
+	This will never be expanded.
+endsnippet
+------------------- SNAP -------------------
+
+To clear one or more specific snippet, provide the triggers of the snippets as
+arguments to the 'clearsnippets' command. The following example will clear the
+snippets 'trigger1' and 'trigger2'.
+
+------------------- SNIP -------------------
+clearsnippets trigger1 trigger2
+------------------- SNAP -------------------
+
+
+4.9 Context snippets                            *UltiSnips-context-snippets*
+
+Context snippets can be enabled by using 'e' option in snippet definition.
+
+In that case snippet should be defined using this syntax: >
+
+    snippet tab_trigger "description" "expression" options
+
+Context can be defined using special header using this syntax: >
+
+    context "expression"
+    snippet tab_trigger "description" options
+
+The 'expression' can be any python expression. If 'expression' evaluates to
+'True', then this snippet will be chosen for expansion. The 'expression' must
+be wrapped with double-quotes.
+
+The following python modules are automatically imported into the scope before
+'expression' is evaluated: 're', 'os', 'vim', 'string', 'random'.
+
+Global variable `snip` will be available with following properties:
+    'snip.window' - alias for 'vim.current.window'
+    'snip.buffer' - alias for 'vim.current.window.buffer'
+    'snip.cursor' - cursor object, which behaves like
+        'vim.current.window.cursor', but zero-indexed and with following
+        additional methods:
+        - 'preserve()' - special method for executing pre/post/jump actions;
+        - 'set(line, column)' - sets cursor to specified line and column;
+        - 'to_vim_cursor()' - returns 1-indexed cursor, suitable for assigning
+          to 'vim.current.window.cursor';
+    'snip.line' and 'snip.column' - aliases for cursor position (zero-indexed);
+    'snip.visual_mode' - ('v', 'V', '^V', see |visual-mode|);
+    'snip.visual_text' - last visually-selected text;
+    'snip.last_placeholder' - last active placeholder from previous snippet
+        with following properties:
+
+        - 'current_text' - text in the placeholder on the moment of selection;
+        - 'start' - placeholder start on the moment of selection;
+        - 'end' - placeholder end on the moment of selection;
+
+
+
+------------------- SNIP -------------------
+snippet r "return" "re.match('^\s+if err ', snip.buffer[snip.line-1])" be
+return err
+endsnippet
+------------------- SNAP -------------------
+
+That snippet will expand to 'return err' only if the previous line is starting
+from 'if err' prefix.
+
+Note: context snippets prioritized over non-context ones. It makes possible to
+use non-context snippets as fallback, if no context matched:
+
+------------------- SNIP -------------------
+snippet i "if ..." b
+if $1 {
+    $2
+}
+endsnippet
+
+snippet i "if err != nil" "re.match('^\s+[^=]*err\s*:?=', snip.buffer[snip.line-1])" be
+if err != nil {
+    $1
+}
+endsnippet
+------------------- SNAP -------------------
+
+That snippet will expand into 'if err != nil' if previous line will
+match 'err :=' prefix, otherwise the default 'if' snippet will be expanded.
+
+It's a good idea to move context conditions to a separate module, so it can be
+used by other UltiSnips users. In that case, module should be imported
+using 'global' keyword, like this:
+
+------------------- SNIP -------------------
+global !p
+import my_utils
+endglobal
+
+snippet , "return ..., nil/err" "my_utils.is_return_argument(snip)" ie
+, `!p if my_utils.is_in_err_condition():
+    snip.rv = "err"
+else:
+    snip.rv = "nil"`
+endsnippet
+------------------- SNAP -------------------
+
+That snippet will expand only if the cursor is located in the return statement,
+and then it will expand either to 'err' or to 'nil' depending on which 'if'
+statement it's located. 'is_return_argument' and 'is_in_err_condition' are
+part of custom python module which is called 'my_utils' in this example.
+
+Context condition can return any value which python can use as condition in
+it's 'if' statement, and if it's considered 'True', then snippet will be
+expanded. The evaluated value of 'condition' is available in the 'snip.context'
+variable inside the snippet:
+
+------------------- SNIP -------------------
+snippet + "var +=" "re.match('\s*(.*?)\s*:?=', snip.buffer[snip.line-1])" ie
+`!p snip.rv = snip.context.group(1)` += $1
+endsnippet
+------------------- SNAP -------------------
+
+That snippet will expand to 'var1 +=' after line, which begins from 'var1 :='.
+
+                                                  *UltiSnips-capture-placeholder*
+
+You can capture placeholder text from previous snippet by using following
+trick:
+------------------- SNIP -------------------
+snippet = "desc" "snip.last_placeholder" Ae
+`!p snip.rv = snip.context.current_text` == nil
+endsnippet
+------------------- SNAP -------------------
+
+That snippet will be expanded only if you will replace selected tabstop in
+other snippet (like, as in 'if ${1:var}') and will replace that tabstop by
+tabstop value following by ' == nil'.
+
+
+4.10 Snippets actions                             *UltiSnips-snippet-actions*
+---------------------
+
+Snippet actions is an arbitrary python code which can be executed at specific
+points in lifetime of the snippet.
+
+There are three types of actions:
+
+* Pre-expand - invoked just after trigger condition was matched, but before
+  snippet actually expanded;
+* Post-expand - invoked after snippet was expanded and interpolations
+  was applied for the first time, but before jump on the first placeholder.
+* Jump - invoked just after jump to the next/prev placeholder.
+
+Specified code will be evaluated at stages defined above and same global
+variables and modules will be available that are stated in
+the |UltiSnips-context-snippets| section.
+
+                                                *UltiSnips-buffer-proxy*
+
+Note: special variable called 'snip.buffer' should be used for all buffer
+modifications. Not 'vim.current.buffer' and not 'vim.command("...")', because
+of in that case UltiSnips will not be able to track changes in buffer from
+actions.
+
+'snip.buffer' has the same interface as 'vim.current.window.buffer'.
+
+4.10.1 Pre-expand actions                       *UltiSnips-pre-expand-actions*
+
+Pre-expand actions can be used to match snippet in one location and then
+expand it in the different location. Some useful cases are: correcting
+indentation for snippet; expanding snippet for function declaration in another
+function body with moving expansion point beyond initial function; performing
+extract method refactoring via expanding snippet in different place.
+
+Pre-expand action declared as follows: >
+    pre_expand "python code here"
+    snippet ...
+    endsnippet
+
+Buffer can be modified in pre-expand action code through variable called
+'snip.buffer', snippet expansion position will be automatically adjusted.
+
+If cursor line (where trigger was matched) need to be modified, then special
+variable method 'snip.cursor.set(line, column)' must be called with the
+desired cursor position. In that case UltiSnips will not remove any matched
+trigger text and it should be done manually in action code.
+
+To addition to the scope variables defined above 'snip.visual_content' will be
+also declared and will contain text that was selected before snippet expansion
+(similar to $VISUAL placeholder).
+
+Following snippet will be expanded at 4 spaces indentation level no matter
+where it was triggered.
+
+------------------- SNIP -------------------
+pre_expand "snip.buffer[snip.line] = ' '*4; snip.cursor.set(line, 4)"
+snippet d
+def $1():
+    $0
+endsnippet
+------------------- SNAP -------------------
+
+Following snippet will move the selected code to the end of file and create
+new method definition for it:
+
+------------------- SNIP -------------------
+pre_expand "del snip.buffer[snip.line]; snip.buffer.append(''); snip.cursor.set(len(snip.buffer)-1, 0)"
+snippet x
+def $1():
+	${2:${VISUAL}}
+endsnippet
+------------------- SNAP -------------------
+
+4.10.2 Post-expand actions                     *UltiSnips-post-expand-actions*
+
+Post-expand actions can be used to perform some actions based on the expanded
+snippet text. Some cases are: code style formatting (e.g. inserting newlines
+before and after method declaration), apply actions depending on python
+interpolation result.
+
+Post-expand action declared as follows: >
+    post_expand "python code here"
+    snippet ...
+    endsnippet
+
+Buffer can be modified in post-expand action code through variable called
+'snip.buffer', snippet expansion position will be automatically adjusted.
+
+Variables 'snip.snippet_start' and 'snip.snippet_end' will be defined at the
+action code scope and will point to positions of the start and end of expanded
+snippet accordingly in the form '(line, column)'.
+
+Note: 'snip.snippet_start' and 'snip.snippet_end' will automatically adjust to
+the correct positions if post-action will insert or delete lines before
+expansion.
+
+Following snippet will expand to method definition and automatically insert
+additional newline after end of the snippet. It's very useful to create a
+function that will insert as many newlines as required in specific context.
+
+------------------- SNIP -------------------
+post_expand "snip.buffer[snip.snippet_end[0]+1:snip.snippet_end[0]+1] = ['']"
+snippet d "Description" b
+def $1():
+	$2
+endsnippet
+------------------- SNAP -------------------
+
+4.10.3 Post-jump actions                         *UltiSnips-post-jump-actions*
+
+Post-jump actions can be used to trigger some code based on user input into
+the placeholders. Notable use cases: expand another snippet after jump or
+anonymous snippet after last jump (e.g. perform move method refactoring and
+then insert new method invokation); insert heading into TOC after last jump.
+
+Jump-expand action declared as follows: >
+    post_jump "python code here"
+    snippet ...
+    endsnippet
+
+Buffer can be modified in post-jump action code through variable called
+'snip.buffer', snippet expansion position will be automatically adjusted.
+
+Next variables and methods will be also defined in the action code scope:
+* 'snip.tabstop' - number of tabstop jumped onto;
+* 'snip.jump_direction' - '1' if jumped forward and '-1' otherwise;
+* 'snip.tabstops' - list with tabstop objects, see above;
+* 'snip.snippet_start' - (line, column) of start of the expanded snippet;
+* 'snip.snippet_end' - (line, column) of end of the expanded snippet;
+* 'snip.expand_anon()' - alias for 'UltiSnips_Manager.expand_anon()';
+
+Tabstop object has several useful properties:
+* 'start' - (line, column) of the starting position of the tabstop (also
+  accessible as 'tabstop.line' and 'tabstop.col').
+* 'end' - (line, column) of the ending position;
+* 'current_text' - text inside the tabstop.
+
+Following snippet will insert section in the Table of Contents in the vim-help
+file:
+
+------------------- SNIP -------------------
+post_jump "if snip.tabstop == 0: insert_toc_item(snip.tabstops[1], snip.buffer)"
+snippet s "section" b
+`!p insert_delimiter_0(snip, t)`$1`!p insert_section_title(snip, t)`
+`!p insert_delimiter_1(snip, t)`
+$0
+endsnippet
+------------------- SNAP -------------------
+
+'insert_toc_item' will be called after first jump and will add newly entered
+section into the TOC for current file.
+
+Note: It is also possible to trigger snippet expansion from the jump action.
+In that case method 'snip.cursor.preserve()' should be called, so UltiSnips
+will know that cursor is already at the required position.
+
+Following example will insert method call at the end of file after user jump
+out of method declaration snippet.
+
+------------------- SNIP -------------------
+global !p
+def insert_method_call(name):
+	vim.command('normal G')
+	snip.expand_anon(name + '($1)\n')
+endglobal
+
+post_jump "if snip.tabstop == 0: insert_method_call(snip.tabstops[1].current_text)"
+snippet d "method declaration" b
+def $1():
+	$2
+endsnippet
+------------------- SNAP -------------------
+
+4.11 Autotrigger                                       *UltiSnips-autotrigger*
+----------------
+
+Note: vim should be newer than 7.4.214 to support this feature.
+
+Many language constructs can occur only at specific places, so it's
+possible to use snippets without manually triggering them.
+
+Snippet can be marked as autotriggered by specifying 'A' option in the snippet
+definition.
+
+After snippet is defined as being autotriggered, snippet condition will be
+checked on every typed character and if condition matches, then snippet will
+be triggered.
+
+*Warning:* using of this feature can lead to significant vim slowdown. If you
+discovered that, report an issue to the github.com/SirVer/UltiSnips.
+
+Consider following snippets, that can be usefull in Go programming:
+------------------- SNIP -------------------
+snippet "^p" "package" rbA
+package ${1:main}
+endsnippet
+
+snippet "^m" "func main" rbA
+func main() {
+	$1
+}
+endsnippet
+------------------- SNAP -------------------
+
+When "p" character will occur in the beginning of the line, it will be
+automatically expanded into "package main". Same with "m" character. There is
+no need to press trigger key after "m""
+
+==============================================================================
+5. UltiSnips and Other Plugins                      *UltiSnips-other-plugins*
+
+5.1 Existing Integrations                            *UltiSnips-integrations*
+-------------------------
+
+UltiSnips has built-in support for some common plugins and there are others
+that are aware of UltiSnips and use it to improve the user experience. This is
+an incomplete list - if you want to have your plugin listed here, just send a
+pull request.
+
+                                                    *UltiSnips-snipMate*
+
+snipMate - UltiSnips is a drop-in replacement for snipMate. It has many more
+features, so porting snippets is still a good idea, but switching has low
+friction now. UltiSnips is trying hard to truly emulate snipMate, for example
+recursive tabstops are not supported in snipMate snippets (but of course in
+UltiSnips snippets).
+
+YouCompleteMe - comes with out of the box completion support for UltiSnips. It
+offers a really nice completion dialogue for snippets.
+
+neocomplete - UltiSnips ships with a source for neocomplete and therefore
+offers out of the box completion dialogue support for it too.
+
+unite - UltiSnips has a source for unite. As an example of how you can use
+it add the following function and mappings to your vimrc: >
+
+  function! UltiSnipsCallUnite()
+    Unite -start-insert -winheight=100 -immediately -no-empty ultisnips
+    return ''
+  endfunction
+
+  inoremap <silent> <F12> <C-R>=(pumvisible()? "\<LT>C-E>":"")<CR><C-R>=UltiSnipsCallUnite()<CR>
+  nnoremap <silent> <F12> a<C-R>=(pumvisible()? "\<LT>C-E>":"")<CR><C-R>=UltiSnipsCallUnite()<CR>
+
+When typing <F12> in either insert or normal mode you will get the unite
+interface with matching snippets. Pressing enter will expand the corresponding
+snippet. If only one snippet matches the text in front of the cursor will be
+expanded when you press the <F12> key.
+
+Supertab - UltiSnips has built-in support for Supertab. Just use a recent
+enough version of both plugins and <tab> will either expand a snippet or defer
+to Supertab for expansion.
+
+5.2 Extending UltiSnips                               *UltiSnips-extending*
+-------------------------
+
+UltiSnips allows other plugins to add new snippets on the fly. Since UltiSnips
+is written in python, the integration is also on a python basis. A small
+example can be found in `test.py`, search for AddNewSnippetSource. Please
+contact us on github if you integrate UltiSnips with your plugin so it can be
+listed in the docs.
+
+=============================================================================
+6. Helping Out                                            *UltiSnips-helping*
+
+UltiSnips needs the help of the Vim community to keep improving. Please
+consider joining this effort by providing new features or bug reports.
+
+* Clone the repository on GitHub (git clone git@github.com:SirVer/ultisnips.git),
+  make your changes and send a pull request on GitHub.
+* Make a patch, report a bug/feature request (see below) and attach the patch
+  to it.
+
+You can contribute by fixing or reporting bugs in our issue tracker:
+https://github.com/sirver/ultisnips/issues
+
+=============================================================================
+7. Contributors                                      *UltiSnips-contributors*
+
+UltiSnips has been started and maintained from Jun 2009 - Dec 2015 by Holger
+Rapp (@SirVer, SirVer@gmx.de). It is now maintained by Stanislav Seletskiy
+(@seletskiy).
+
+This is the list of contributors pre-git in chronological order. For a full
+list of contributors take the union of this set and the authors according to
+git log.
+
+   JCEB - Jan Christoph Ebersbach
+   Michael Henry
+   Chris Chambers
+   Ryan Wooden
+   rupa - Rupa Deadwyler
+   Timo Schmiade
+   blueyed - Daniel Hahler
+   expelledboy - Anthony Jackson
+   allait - Alexey Bezhan
+   peacech - Charles Gunawan
+   guns - Sung Pae
+   shlomif - Shlomi Fish
+   pberndt - Phillip Berndt
+   thanatermesis-elive - Thanatermesis
+   rico-ambiescent - Rico Sta. Cruz
+   Cody Frazer
+   suy - Alejandro Exojo
+   grota - Giuseppe Rota
+   iiijjjii - Jim Karsten
+   fgalassi - Federico Galassi
+   lucapette
+   Psycojoker - Laurent Peuch
+   aschrab - Aaron Schrab
+   stardiviner - NagatoPain
+   skeept - Jorge Rodrigues
+   buztard
+   stephenmckinney - Steve McKinney
+   Pedro Algarvio - s0undt3ch
+   Eric Van Dewoestine - ervandew
+   Matt Patterson - fidothe
+   Mike Morearty - mmorearty
+   Stanislav Golovanov - JazzCore
+   David Briscoe - DavidBriscoe
+   Keith Welch - paralogiki
+   Zhao Cai - zhaocai
+   John Szakmeister - jszakmeister
+   Jonas Diemer - diemer
+   Romain Giot - rgiot
+   Sergey Alexandrov - taketwo
+   Brian Mock - saikobee
+   Gernot Höflechner - LFDM
+   Marcelo D Montu - mMontu
+   Karl Yngve Lervåg - lervag
+   Pedro Ferrari - petobens
+   Ches Martin - ches
+   Christian - Oberon00
+   Andrew Ruder - aeruder
+   Mathias Fußenegger - mfussenegger
+   Kevin Ballard - kballard
+   Ahbong Chang - cwahbong
+   Glenn Griffin - ggriffiniii
+   Michael - Pyrohh
+   Stanislav Seletskiy - seletskiy
+   Pawel Palucki - ppalucki
+   Dettorer - dettorer
+   Zhao Jiarong - kawing-chiu
+   Ye Ding - dyng
+   Greg Hurrell - wincent
+
+vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/ultisnips/doc/demo.gif b/vim/plugins/ultisnips/doc/demo.gif
new file mode 100644
index 0000000..32affe4
Binary files /dev/null and b/vim/plugins/ultisnips/doc/demo.gif differ
diff --git a/vim/plugins/ultisnips/doc/examples/autojump-if-empty/README.md b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/README.md
new file mode 100644
index 0000000..8b4a7fc
--- /dev/null
+++ b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/README.md
@@ -0,0 +1,68 @@
+# Autojump from tabstop when it's empty
+
+UltiSnips offers enough API to support automatic jump from one tabstop to
+another when some condition is encountered.
+
+One example of applying that behaviour is jump on the next placeholder when
+current becomes empty when user types `<BS>` or another erase sequence when
+tabstop is active.
+
+Let's imagine, that we have following snippet:
+
+![snippet](https://raw.githubusercontent.com/SirVer/ultisnips/master/doc/examples/autojump-if-empty/snippet.gif)
+
+First placeholder, surrounded by braces, can be erased by user, but then 
+surrounding quotes will left untouched, and user should remove quotes and
+one space, and only then jump to next placeholder, that equals to **5** total
+keypresses: <kbd>BackSpace</kbd> (erase placeholder), <kbd>BackSpace</kbd> and
+<kbd>Delete</kbd> (erase braces), <kbd>Delete</kbd> (erase space),
+<kbd>Ctrl+J</kbd> (jump to next placeholder).
+
+However, with UltiSnips, it can be done via only one keypress:
+<kbd>BackSpace</kbd>:
+
+![demo](https://raw.githubusercontent.com/SirVer/ultisnips/master/doc/examples/autojump-if-empty/demo.gif)
+
+## Implementation
+
+Using awesome [vim-pythonx
+library](https://github.com/reconquest/vim-pythonx/blob/master/pythonx/px/snippets.py),
+which provides set of functions to make coding little bit easier.
+
+```
+global !p
+import px.snippets
+endglobal
+
+global !p
+# This function will jump to next placeholder when first is empty.
+def jump_to_second_when_first_is_empty(snip):
+    if px.snippets.get_jumper_position(snip) == 1:
+        if not px.snippets.get_jumper_text(snip):
+            px.snippets.advance_jumper(snip)
+
+# This function will clean up first placeholder when this is empty.
+def clean_first_placeholder(snip):
+    # Jumper is a helper for performing jumps in UltiSnips.
+    px.snippets.make_jumper(snip)
+
+    if snip.tabstop == 2:
+        line = snip.buffer[snip.cursor[0]]
+        snip.buffer[snip.cursor[0]] = \
+            line[:snip.tabstops[1].start[1]-2] + \
+            line[snip.tabstops[1].end[1]+1:]
+        snip.cursor.set(
+            snip.cursor[0],
+            snip.cursor[1] - 3,
+        )
+endglobal
+
+context "px.snippets.make_context(snip)"
+post_jump "clean_first_placeholder(snip)"
+snippet x "Description" b
+`!p jump_to_second_when_first_is_empty(snip)
+`func (${1:blah}) $2() {
+    $3
+}
+endsnippet
+```
diff --git a/vim/plugins/ultisnips/doc/examples/autojump-if-empty/demo.gif b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/demo.gif
new file mode 100644
index 0000000..e068e73
Binary files /dev/null and b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/demo.gif differ
diff --git a/vim/plugins/ultisnips/doc/examples/autojump-if-empty/snippet.gif b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/snippet.gif
new file mode 100644
index 0000000..93da8d6
Binary files /dev/null and b/vim/plugins/ultisnips/doc/examples/autojump-if-empty/snippet.gif differ
diff --git a/vim/plugins/ultisnips/doc/examples/snippets-aliasing/README.md b/vim/plugins/ultisnips/doc/examples/snippets-aliasing/README.md
new file mode 100644
index 0000000..59908f1
--- /dev/null
+++ b/vim/plugins/ultisnips/doc/examples/snippets-aliasing/README.md
@@ -0,0 +1,52 @@
+# Aliases for snippets
+
+![gif](https://raw.githubusercontent.com/SirVer/ultisnips/master/doc/examples/snippets-aliasing/demo.gif)
+
+Let's imagine we're editing shell file and we need to debug some vars.
+
+Essentially, we will end up with snippet like that, that will automatically
+insert location of the debug statement and variable name.
+
+Example of that snippet is shown below:
+
+```
+snippet pr "print debug" bw
+`!p
+prefix = t[1] + ": %q\\n' "
+prefix = "{}:{}: {}".format(
+    os.path.basename(px.buffer.get().name),
+    str(px.cursor.get()[0]),
+    prefix
+)
+`printf 'XXXXXX `!p snip.rv=prefix`$1 >&2
+endsnippet
+```
+
+Now, we want to use same debug snippet, but dump variable to the file.
+How can we do it?
+
+Simple, declare new snippet in that way:
+
+```
+post_jump "px.snippets.expand(snip)"
+snippet pd "Description" b
+pr$1 >${2:/tmp/debug}
+endsnippet
+```
+
+This snippet will expand `pr` snippet automatically (note `pr$1` part) after
+jumping to the first placeholder (jump will be done automatically by UltiSnips
+engine).
+
+`px.snippets.expand(snip)` is declared in that way:
+
+```python
+def expand(snip, jump_pos=1):
+    if snip.tabstop != jump_pos:
+        return
+
+    vim.eval('feedkeys("\<C-R>=UltiSnips#ExpandSnippet()\<CR>")')
+```
+
+`px.buffer.get()` and `px.cursor.get()` are simple helpers for the
+`vim.current.window.buffer` and `vim.current.window.cursor`.
diff --git a/vim/plugins/ultisnips/doc/examples/snippets-aliasing/demo.gif b/vim/plugins/ultisnips/doc/examples/snippets-aliasing/demo.gif
new file mode 100644
index 0000000..2d4fc81
Binary files /dev/null and b/vim/plugins/ultisnips/doc/examples/snippets-aliasing/demo.gif differ
diff --git a/vim/plugins/ultisnips/doc/examples/tabstop-generation/README.md b/vim/plugins/ultisnips/doc/examples/tabstop-generation/README.md
new file mode 100644
index 0000000..4a857f7
--- /dev/null
+++ b/vim/plugins/ultisnips/doc/examples/tabstop-generation/README.md
@@ -0,0 +1,50 @@
+# Dynamic tabstop generation
+
+![gif](https://raw.githubusercontent.com/SirVer/ultisnips/master/doc/examples/tabstop-generation/demo.gif)
+
+UltiSnips at the present day is more than snippet engine. It's more like
+constructor, where you can implement some complex features without prior
+feature implementation in the snippet by itself.
+
+One of that features is dynamic tabstop generation.
+
+Consider case, where you want set of snippets for inserting latex rows of
+various lengths. No-brainer solution is just implement snippet for every
+row length you're possible will want, like this:
+
+```
+snippet tr9 "LaTeX table row of length nine"
+$1 & $2 & $3 & $4 & $5 & $6 & $7 & $8 & $9
+endsnippet
+```
+
+But soon it becomes a burden to maintain that kind of snippets.
+
+Gladly, tabstops can be generated by using anonymous snippet expansion:
+
+```
+global !p
+def create_row_placeholders(snip):
+    # retrieving singlee line from current string and treat it like tabstops
+    # count
+    placeholders_amount = int(snip.buffer[snip.line].strip())
+
+    # erase current line
+    snip.buffer[snip.line] = ''
+
+    # create anonymous snippet with expected content and number of tabstops
+    anon_snippet_body = ' & '.join(['$' + str(i+1)
+                                    for i in range(placeholders_amount)])
+
+    # expand anonymous snippet
+    snip.expand_anon(anon_snippet_body)
+endglobal
+
+post_jump "create_row_placeholders(snip)"
+snippet "tr(\d+)" "latex table row variable" br
+`!p snip.rv = match.group(1)`
+endsnippet
+```
+
+Snippet is declared via regular expression and will expand to any required
+number of fields in row.
diff --git a/vim/plugins/ultisnips/doc/examples/tabstop-generation/demo.gif b/vim/plugins/ultisnips/doc/examples/tabstop-generation/demo.gif
new file mode 100644
index 0000000..462951c
Binary files /dev/null and b/vim/plugins/ultisnips/doc/examples/tabstop-generation/demo.gif differ
diff --git a/vim/plugins/ultisnips/ftdetect/snippets.vim b/vim/plugins/ultisnips/ftdetect/snippets.vim
new file mode 100644
index 0000000..2a783ce
--- /dev/null
+++ b/vim/plugins/ultisnips/ftdetect/snippets.vim
@@ -0,0 +1,4 @@
+" recognize .snippet files
+if has("autocmd")
+    autocmd BufNewFile,BufRead *.snippets setf snippets
+endif
diff --git a/vim/plugins/ultisnips/ftplugin/snippets.vim b/vim/plugins/ultisnips/ftplugin/snippets.vim
new file mode 100644
index 0000000..8479a45
--- /dev/null
+++ b/vim/plugins/ultisnips/ftplugin/snippets.vim
@@ -0,0 +1,47 @@
+" Set some sane defaults for snippet files
+
+if exists('b:did_ftplugin')
+    finish
+endif
+let b:did_ftplugin = 1
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Fold by syntax, but open all folds by default
+setlocal foldmethod=syntax
+setlocal foldlevel=99
+
+setlocal commentstring=#%s
+
+setlocal noexpandtab
+setlocal autoindent nosmartindent nocindent
+
+" Define match words for use with matchit plugin
+" http://www.vim.org/scripts/script.php?script_id=39
+if exists("loaded_matchit") && !exists("b:match_words")
+  let b:match_ignorecase = 0
+  let b:match_words = '^snippet\>:^endsnippet\>,^global\>:^endglobal\>,\${:}'
+  let s:set_match_words = 1
+endif
+
+" Add TagBar support
+let g:tagbar_type_snippets = {
+            \ 'ctagstype': 'UltiSnips',
+            \ 'kinds': [
+                \ 's:snippets',
+            \ ],
+            \ 'deffile': expand('<sfile>:p:h:h') . '/ctags/UltiSnips.cnf',
+        \ }
+
+" don't unset g:tagbar_type_snippets, it serves no purpose
+let b:undo_ftplugin = "
+            \ setlocal foldmethod< foldlevel< commentstring<
+            \|setlocal expandtab< autoindent< smartindent< cindent<
+            \|if get(s:, 'set_match_words')
+                \|unlet! b:match_ignorecase b:match_words s:set_match_words
+            \|endif
+            \"
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/ultisnips/plugin/UltiSnips.vim b/vim/plugins/ultisnips/plugin/UltiSnips.vim
new file mode 100644
index 0000000..f7be308
--- /dev/null
+++ b/vim/plugins/ultisnips/plugin/UltiSnips.vim
@@ -0,0 +1,57 @@
+if exists('did_plugin_ultisnips') || &cp
+    finish
+endif
+let did_plugin_ultisnips=1
+
+if version < 704
+   echohl WarningMsg
+   echom  "UltiSnips requires Vim >= 7.4"
+   echohl None
+   finish
+endif
+
+if !exists("g:UltiSnipsUsePythonVersion")
+   let g:_uspy=":py3 "
+   if !has("python3")
+       if !has("python")
+           if !exists("g:UltiSnipsNoPythonWarning")
+               echohl WarningMsg
+               echom  "UltiSnips requires py >= 2.7 or py3"
+               echohl None
+           endif
+           unlet g:_uspy
+           finish
+       endif
+       let g:_uspy=":py "
+   endif
+else
+   " Use user-provided value, but check if it's available.
+   " This uses `has()`, because e.g. `exists(":python3")` is always 2.
+   if g:UltiSnipsUsePythonVersion == 2 && has('python')
+       let g:_uspy=":python "
+   elseif g:UltiSnipsUsePythonVersion == 3 && has('python3')
+       let g:_uspy=":python3 "
+   endif
+   if !exists('g:_uspy')
+       echohl WarningMsg
+       echom  "UltiSnips: the Python version from g:UltiSnipsUsePythonVersion (".g:UltiSnipsUsePythonVersion.") is not available."
+       echohl None
+       finish
+   endif
+endif
+
+" The Commands we define.
+command! -bang -nargs=? -complete=customlist,UltiSnips#FileTypeComplete UltiSnipsEdit
+    \ :call UltiSnips#Edit(<q-bang>, <q-args>)
+
+command! -nargs=1 UltiSnipsAddFiletypes :call UltiSnips#AddFiletypes(<q-args>)
+
+augroup UltiSnips_AutoTrigger
+    au!
+    au InsertCharPre * call UltiSnips#TrackChange()
+    au TextChangedI * call UltiSnips#TrackChange()
+augroup END
+
+call UltiSnips#map_keys#MapKeys()
+
+" vim: ts=8 sts=4 sw=4
diff --git a/vim/plugins/ultisnips/pylintrc b/vim/plugins/ultisnips/pylintrc
new file mode 100644
index 0000000..9d986cf
--- /dev/null
+++ b/vim/plugins/ultisnips/pylintrc
@@ -0,0 +1,269 @@
+[MASTER]
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+init-hook='import sys; sys.path.append("pythonx/")'
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS,compatibility_py3
+
+# Pickle collected data for later comparisons.
+persistent=no
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+
+[MESSAGES CONTROL]
+
+# 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.
+#enable=
+
+# 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"
+disable=
+   attribute-defined-outside-init,
+   fixme,
+   redefined-builtin,
+   too-few-public-methods,
+   too-many-arguments,
+   too-many-branches,
+   too-many-instance-attributes, 
+   too-many-locals,
+   too-many-public-methods, 
+   too-many-return-statements,
+   too-many-statements,
+   bad-continuation,
+
+
+[REPORTS]
+
+# 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.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+msg-template="{path}:{line}: [{msg_id}({symbol}), {obj}] {msg}"
+
+
+
+[BASIC]
+
+# Required attributes for module, separated by a comma
+required-attributes=
+
+# List of builtins function names that should not be used, separated by a comma
+bad-functions=apply,input
+
+# Regular expression which should only match correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression which should only match correct module level names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression which should only match correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression which should only match correct function names
+function-rgx=_?[a-z_][a-z0-9_]{2,50}$
+
+# Regular expression which should only match correct method names
+method-rgx=[a-z_][a-z0-9_]{2,50}$
+
+# Regular expression which should only match correct instance attribute names
+attr-rgx=[a-z_][a-z0-9_]{2,50}$
+
+# Regular expression which should only match correct argument names
+argument-rgx=[a-z_][a-z0-9_]{1,50}$
+
+# Regular expression which should only match correct variable names
+variable-rgx=[a-z_][a-z0-9_]{1,50}$
+
+# Regular expression which should only match correct attribute names in class
+# bodies
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression which should only match correct list comprehension /
+# generator expression variable names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,a,b,x,y,k,ex,Run,_
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=(__.*__|wrapper)
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+
+[FORMAT]
+
+# Maximum number of characters on a single line.
+max-line-length=80
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+# List of optional constructs for which whitespace checking is disabled
+no-space-check=trailing-comma,dict-separator
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=TODO
+
+
+[SIMILARITIES]
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+
+[TYPECHECK]
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# List of classes names for which member attributes should not be checked
+# (useful for classes with attributes dynamically set).
+ignored-classes=SQLObject
+
+# When zope mode is activated, add a predefined set of Zope acquired attributes
+# to generated-members.
+zope=no
+
+# 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.
+generated-members=REQUEST,acl_users,aq_parent
+
+
+[VARIABLES]
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# A regular expression matching the beginning of the name of dummy variables
+# (i.e. not used).
+dummy-variables-rgx=_$|dummy
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+
+[CLASSES]
+
+# 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.
+ignore-iface-methods=isImplementedBy,deferred,extends,names,namesAndDescriptions,queryDescriptionFor,getBases,getDescriptionFor,getDoc,getName,getTaggedValue,getTaggedValueTags,isEqualOrExtendedBy,setTaggedValue,isImplementedByInstancesOf,adaptWith,is_implemented_by
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=5
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=20
+
+
+[IMPORTS]
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=regsub,TERMIOS,Bastion,rexec
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/__init__.py
new file mode 100644
index 0000000..dfd3f48
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/__init__.py
@@ -0,0 +1,6 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Entry point for all thinks UltiSnips."""
+
+from UltiSnips.snippet_manager import UltiSnips_Manager
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/_diff.py b/vim/plugins/ultisnips/pythonx/UltiSnips/_diff.py
new file mode 100644
index 0000000..42a5383
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/_diff.py
@@ -0,0 +1,226 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Commands to compare text objects and to guess how to transform from one to
+another."""
+
+from collections import defaultdict
+import sys
+
+from UltiSnips import _vim
+from UltiSnips.position import Position
+
+
+def is_complete_edit(initial_line, original, wanted, cmds):
+    """Returns true if 'original' is changed to 'wanted' with the edit commands
+    in 'cmds'.
+
+    Initial line is to change the line numbers in 'cmds'.
+
+    """
+    buf = original[:]
+    for cmd in cmds:
+        ctype, line, col, char = cmd
+        line -= initial_line
+        if ctype == 'D':
+            if char != '\n':
+                buf[line] = buf[line][:col] + buf[line][col + len(char):]
+            else:
+                if line + 1 < len(buf):
+                    buf[line] = buf[line] + buf[line + 1]
+                    del buf[line + 1]
+                else:
+                    del buf[line]
+        elif ctype == 'I':
+            buf[line] = buf[line][:col] + char + buf[line][col:]
+        buf = '\n'.join(buf).split('\n')
+    return (len(buf) == len(wanted) and
+            all(j == k for j, k in zip(buf, wanted)))
+
+
+def guess_edit(initial_line, last_text, current_text, vim_state):
+    """Try to guess what the user might have done by heuristically looking at
+    cursor movement, number of changed lines and if they got longer or shorter.
+    This will detect most simple movements like insertion, deletion of a line
+    or carriage return. 'initial_text' is the index of where the comparison
+    starts, 'last_text' is the last text of the snippet, 'current_text' is the
+    current text of the snippet and 'vim_state' is the cached vim state.
+
+    Returns (True, edit_cmds) when the edit could be guessed, (False,
+    None) otherwise.
+
+    """
+    if not len(last_text) and not len(current_text):
+        return True, ()
+    pos = vim_state.pos
+    ppos = vim_state.ppos
+
+    # All text deleted?
+    if (len(last_text) and
+            (not current_text or
+             (len(current_text) == 1 and not current_text[0]))
+            ):
+        es = []
+        if not current_text:
+            current_text = ['']
+        for i in last_text:
+            es.append(('D', initial_line, 0, i))
+            es.append(('D', initial_line, 0, '\n'))
+        es.pop()  # Remove final \n because it is not really removed
+        if is_complete_edit(initial_line, last_text, current_text, es):
+            return True, es
+    if ppos.mode == 'v':  # Maybe selectmode?
+        sv = list(map(int, _vim.eval("""getpos("'<")""")))
+        sv = Position(sv[1] - 1, sv[2] - 1)
+        ev = list(map(int, _vim.eval("""getpos("'>")""")))
+        ev = Position(ev[1] - 1, ev[2] - 1)
+        if 'exclusive' in _vim.eval('&selection'):
+            ppos.col -= 1  # We want to be inclusive, sorry.
+            ev.col -= 1
+        es = []
+        if sv.line == ev.line:
+            es.append(('D', sv.line, sv.col,
+                       last_text[sv.line - initial_line][sv.col:ev.col + 1]))
+            if sv != pos and sv.line == pos.line:
+                es.append(('I', sv.line, sv.col,
+                           current_text[sv.line - initial_line][sv.col:pos.col + 1]))
+        if is_complete_edit(initial_line, last_text, current_text, es):
+            return True, es
+    if pos.line == ppos.line:
+        if len(last_text) == len(current_text):  # Movement only in one line
+            llen = len(last_text[ppos.line - initial_line])
+            clen = len(current_text[pos.line - initial_line])
+            if ppos < pos and clen > llen:  # maybe only chars have been added
+                es = (
+                    ('I', ppos.line, ppos.col,
+                        current_text[ppos.line - initial_line]
+                     [ppos.col:pos.col]),
+                )
+                if is_complete_edit(initial_line, last_text, current_text, es):
+                    return True, es
+            if clen < llen:
+                if ppos == pos:  # 'x' or DEL or dt or something
+                    es = (
+                        ('D', pos.line, pos.col,
+                            last_text[ppos.line - initial_line]
+                         [ppos.col:ppos.col + (llen - clen)]),
+                    )
+                    if is_complete_edit(initial_line, last_text,
+                                        current_text, es):
+                        return True, es
+                if pos < ppos:  # Backspacing or dT dF?
+                    es = (
+                        ('D', pos.line, pos.col,
+                            last_text[pos.line - initial_line]
+                         [pos.col:pos.col + llen - clen]),
+                    )
+                    if is_complete_edit(initial_line, last_text,
+                                        current_text, es):
+                        return True, es
+        elif len(current_text) < len(last_text):
+           # where some lines deleted? (dd or so)
+            es = []
+            for i in range(len(last_text) - len(current_text)):
+                es.append(('D', pos.line, 0,
+                           last_text[pos.line - initial_line + i]))
+                es.append(('D', pos.line, 0, '\n'))
+            if is_complete_edit(initial_line, last_text,
+                                current_text, es):
+                return True, es
+    else:
+        # Movement in more than one line
+        if ppos.line + 1 == pos.line and pos.col == 0:  # Carriage return?
+            es = (('I', ppos.line, ppos.col, '\n'),)
+            if is_complete_edit(initial_line, last_text,
+                                current_text, es):
+                return True, es
+    return False, None
+
+
+def diff(a, b, sline=0):
+    """
+    Return a list of deletions and insertions that will turn 'a' into 'b'. This
+    is done by traversing an implicit edit graph and searching for the shortest
+    route. The basic idea is as follows:
+
+        - Matching a character is free as long as there was no
+          deletion/insertion before. Then, matching will be seen as delete +
+          insert [1].
+        - Deleting one character has the same cost everywhere. Each additional
+          character costs only have of the first deletion.
+        - Insertion is cheaper the earlier it happens. The first character is
+          more expensive that any later [2].
+
+    [1] This is that world -> aolsa will be "D" world + "I" aolsa instead of
+        "D" w , "D" rld, "I" a, "I" lsa
+    [2] This is that "hello\n\n" -> "hello\n\n\n" will insert a newline after
+        hello and not after \n
+    """
+    d = defaultdict(list)  # pylint:disable=invalid-name
+    seen = defaultdict(lambda: sys.maxsize)
+
+    d[0] = [(0, 0, sline, 0, ())]
+    cost = 0
+    deletion_cost = len(a) + len(b)
+    insertion_cost = len(a) + len(b)
+    while True:
+        while len(d[cost]):
+            x, y, line, col, what = d[cost].pop()
+
+            if a[x:] == b[y:]:
+                return what
+
+            if x < len(a) and y < len(b) and a[x] == b[y]:
+                ncol = col + 1
+                nline = line
+                if a[x] == '\n':
+                    ncol = 0
+                    nline += 1
+                lcost = cost + 1
+                if (what and what[-1][0] == 'D' and what[-1][1] == line and
+                        what[-1][2] == col and a[x] != '\n'):
+                    # Matching directly after a deletion should be as costly as
+                    # DELETE + INSERT + a bit
+                    lcost = (deletion_cost + insertion_cost) * 1.5
+                if seen[x + 1, y + 1] > lcost:
+                    d[lcost].append((x + 1, y + 1, nline, ncol, what))
+                    seen[x + 1, y + 1] = lcost
+            if y < len(b):  # INSERT
+                ncol = col + 1
+                nline = line
+                if b[y] == '\n':
+                    ncol = 0
+                    nline += 1
+                if (what and what[-1][0] == 'I' and what[-1][1] == nline and
+                            what[-1][2] + len(what[-1][-1]) == col and b[y] != '\n' and
+                            seen[x, y + 1] > cost + (insertion_cost + ncol) // 2
+                        ):
+                    seen[x, y + 1] = cost + (insertion_cost + ncol) // 2
+                    d[cost + (insertion_cost + ncol) // 2].append(
+                        (x, y + 1, line, ncol, what[:-1] + (
+                            ('I', what[-1][1], what[-1][2],
+                             what[-1][-1] + b[y]),)
+                         )
+                    )
+                elif seen[x, y + 1] > cost + insertion_cost + ncol:
+                    seen[x, y + 1] = cost + insertion_cost + ncol
+                    d[cost + ncol + insertion_cost].append((x, y + 1, nline, ncol,
+                                                            what + (('I', line, col, b[y]),))
+                                                           )
+            if x < len(a):  # DELETE
+                if (what and what[-1][0] == 'D' and what[-1][1] == line and
+                            what[-1][2] == col and a[x] != '\n' and
+                            what[-1][-1] != '\n' and
+                            seen[x + 1, y] > cost + deletion_cost // 2
+                        ):
+                    seen[x + 1, y] = cost + deletion_cost // 2
+                    d[cost + deletion_cost // 2].append(
+                        (x + 1, y, line, col, what[:-1] + (
+                            ('D', line, col, what[-1][-1] + a[x]),))
+                    )
+                elif seen[x + 1, y] > cost + deletion_cost:
+                    seen[x + 1, y] = cost + deletion_cost
+                    d[cost + deletion_cost].append((x + 1, y, line, col, what +
+                                                    (('D', line, col, a[x]),))
+                                                   )
+        cost += 1
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/_vim.py b/vim/plugins/ultisnips/pythonx/UltiSnips/_vim.py
new file mode 100755
index 0000000..59188e3
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/_vim.py
@@ -0,0 +1,309 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Wrapper functionality around the functions we need from Vim."""
+
+import re
+
+import vim  # pylint:disable=import-error
+from vim import error  # pylint:disable=import-error,unused-import
+
+from UltiSnips.compatibility import col2byte, byte2col, \
+    as_unicode, as_vimencoding
+from UltiSnips.position import Position
+
+from contextlib import contextmanager
+
+
+class VimBuffer(object):
+
+    """Wrapper around the current Vim buffer."""
+
+    def __getitem__(self, idx):
+        if isinstance(idx, slice):  # Py3
+            return self.__getslice__(idx.start, idx.stop)
+        rv = vim.current.buffer[idx]
+        return as_unicode(rv)
+
+    def __getslice__(self, i, j):  # pylint:disable=no-self-use
+        rv = vim.current.buffer[i:j]
+        return [as_unicode(l) for l in rv]
+
+    def __setitem__(self, idx, text):
+        if isinstance(idx, slice):  # Py3
+            return self.__setslice__(idx.start, idx.stop, text)
+        vim.current.buffer[idx] = as_vimencoding(text)
+
+    def __setslice__(self, i, j, text):  # pylint:disable=no-self-use
+        vim.current.buffer[i:j] = [as_vimencoding(l) for l in text]
+
+    def __len__(self):
+        return len(vim.current.buffer)
+
+    @property
+    def line_till_cursor(self):  # pylint:disable=no-self-use
+        """Returns the text before the cursor."""
+        _, col = self.cursor
+        return as_unicode(vim.current.line)[:col]
+
+    @property
+    def number(self):  # pylint:disable=no-self-use
+        """The bufnr() of the current buffer."""
+        return vim.current.buffer.number
+
+    @property
+    def filetypes(self):
+        return [ft for ft in vim.eval('&filetype').split('.') if ft]
+
+    @property
+    def cursor(self):  # pylint:disable=no-self-use
+        """The current windows cursor.
+
+        Note that this is 0 based in col and 0 based in line which is
+        different from Vim's cursor.
+
+        """
+        line, nbyte = vim.current.window.cursor
+        col = byte2col(line, nbyte)
+        return Position(line - 1, col)
+
+    @cursor.setter
+    def cursor(self, pos):  # pylint:disable=no-self-use
+        """See getter."""
+        nbyte = col2byte(pos.line + 1, pos.col)
+        vim.current.window.cursor = pos.line + 1, nbyte
+buf = VimBuffer()  # pylint:disable=invalid-name
+
+@contextmanager
+def toggle_opt(name, new_value):
+    old_value = eval('&' + name)
+    command('set {0}={1}'.format(name, new_value))
+    try:
+        yield
+    finally:
+        command('set {0}={1}'.format(name, old_value))
+
+@contextmanager
+def save_mark(name):
+    old_pos = get_mark_pos(name)
+    try:
+        yield
+    finally:
+        if _is_pos_zero(old_pos):
+            delete_mark(name)
+        else:
+            set_mark_from_pos(name, old_pos)
+
+def escape(inp):
+    """Creates a vim-friendly string from a group of
+    dicts, lists and strings."""
+    def conv(obj):
+        """Convert obj."""
+        if isinstance(obj, list):
+            rv = as_unicode('[' + ','.join(conv(o) for o in obj) + ']')
+        elif isinstance(obj, dict):
+            rv = as_unicode('{' + ','.join([
+                '%s:%s' % (conv(key), conv(value))
+                for key, value in obj.iteritems()]) + '}')
+        else:
+            rv = as_unicode('"%s"') % as_unicode(obj).replace('"', '\\"')
+        return rv
+    return conv(inp)
+
+
+def command(cmd):
+    """Wraps vim.command."""
+    return as_unicode(vim.command(as_vimencoding(cmd)))
+
+
+def eval(text):
+    """Wraps vim.eval."""
+    rv = vim.eval(as_vimencoding(text))
+    if not isinstance(rv, (dict, list)):
+        return as_unicode(rv)
+    return rv
+
+
+def bindeval(text):
+    """Wraps vim.bindeval."""
+    rv = vim.bindeval(as_vimencoding(text))
+    if not isinstance(rv, (dict, list)):
+        return as_unicode(rv)
+    return rv
+
+
+def feedkeys(keys, mode='n'):
+    """Wrapper around vim's feedkeys function.
+
+    Mainly for convenience.
+
+    """
+    if eval('mode()') == 'n':
+        if keys == 'a':
+            cursor_pos = get_cursor_pos()
+            cursor_pos[2] = int(cursor_pos[2]) + 1
+            set_cursor_from_pos(cursor_pos)
+        if keys in 'ai':
+            keys = 'startinsert'
+
+    if keys == 'startinsert':
+        command('startinsert')
+    else:
+        command(as_unicode(r'call feedkeys("%s", "%s")') % (keys, mode))
+
+
+def new_scratch_buffer(text):
+    """Create a new scratch buffer with the text given."""
+    vim.command('botright new')
+    vim.command('set ft=')
+    vim.command('set buftype=nofile')
+
+    vim.current.buffer[:] = text.splitlines()
+
+    feedkeys(r"\<Esc>")
+
+
+def virtual_position(line, col):
+    """Runs the position through virtcol() and returns the result."""
+    nbytes = col2byte(line, col)
+    return line, int(eval('virtcol([%d, %d])' % (line, nbytes)))
+
+
+def select(start, end):
+    """Select the span in Select mode."""
+    _unmap_select_mode_mapping()
+
+    selection = eval('&selection')
+
+    col = col2byte(start.line + 1, start.col)
+    vim.current.window.cursor = start.line + 1, col
+
+    mode = eval('mode()')
+
+    move_cmd = ''
+    if mode != 'n':
+        move_cmd += r"\<Esc>"
+
+    if start == end:
+        # Zero Length Tabstops, use 'i' or 'a'.
+        if col == 0 or mode not in 'i' and \
+                col < len(buf[start.line]):
+            move_cmd += 'i'
+        else:
+            move_cmd += 'a'
+    else:
+        # Non zero length, use Visual selection.
+        move_cmd += 'v'
+        if 'inclusive' in selection:
+            if end.col == 0:
+                move_cmd += '%iG$' % end.line
+            else:
+                move_cmd += '%iG%i|' % virtual_position(end.line + 1, end.col)
+        elif 'old' in selection:
+            move_cmd += '%iG%i|' % virtual_position(end.line + 1, end.col)
+        else:
+            move_cmd += '%iG%i|' % virtual_position(end.line + 1, end.col + 1)
+        move_cmd += 'o%iG%i|o\\<c-g>' % virtual_position(
+            start.line + 1, start.col + 1)
+    feedkeys(move_cmd)
+
+def set_mark_from_pos(name, pos):
+    return _set_pos("'" + name, pos)
+
+def get_mark_pos(name):
+    return _get_pos("'" + name)
+
+def set_cursor_from_pos(pos):
+    return _set_pos('.', pos)
+
+def get_cursor_pos():
+    return _get_pos('.')
+
+def delete_mark(name):
+    try:
+        return command('delma ' + name)
+    except:
+        return False
+
+def _set_pos(name, pos):
+    return eval("setpos(\"{0}\", {1})".format(name, pos))
+
+def _get_pos(name):
+    return eval("getpos(\"{0}\")".format(name))
+
+def _is_pos_zero(pos):
+    return ['0'] * 4 == pos or [0] == pos
+
+def _unmap_select_mode_mapping():
+    """This function unmaps select mode mappings if so wished by the user.
+
+    Removes select mode mappings that can actually be typed by the user
+    (ie, ignores things like <Plug>).
+
+    """
+    if int(eval('g:UltiSnipsRemoveSelectModeMappings')):
+        ignores = eval('g:UltiSnipsMappingsToIgnore') + ['UltiSnips']
+
+        for option in ('<buffer>', ''):
+            # Put all smaps into a var, and then read the var
+            command(r"redir => _tmp_smaps | silent smap %s " % option +
+                    '| redir END')
+
+            # Check if any mappings where found
+            if hasattr(vim, 'bindeval'):
+                # Safer to use bindeval, if it exists, because it can deal with
+                # non-UTF-8 characters in mappings; see GH #690.
+                all_maps = bindeval(r"_tmp_smaps")
+            else:
+                all_maps = eval(r"_tmp_smaps")
+            all_maps = list(filter(len, all_maps.splitlines()))
+            if len(all_maps) == 1 and all_maps[0][0] not in ' sv':
+                # "No maps found". String could be localized. Hopefully
+                # it doesn't start with any of these letters in any
+                # language
+                continue
+
+            # Only keep mappings that should not be ignored
+            maps = [m for m in all_maps if
+                    not any(i in m for i in ignores) and len(m.strip())]
+
+            for map in maps:
+                # The first three chars are the modes, that might be listed.
+                # We are not interested in them here.
+                trig = map[3:].split()[0] if len(
+                    map[3:].split()) != 0 else None
+
+                if trig is None:
+                    continue
+
+                # The bar separates commands
+                if trig[-1] == '|':
+                    trig = trig[:-1] + '<Bar>'
+
+                # Special ones
+                if trig[0] == '<':
+                    add = False
+                    # Only allow these
+                    for valid in ['Tab', 'NL', 'CR', 'C-Tab', 'BS']:
+                        if trig == '<%s>' % valid:
+                            add = True
+                    if not add:
+                        continue
+
+                # UltiSnips remaps <BS>. Keep this around.
+                if trig == '<BS>':
+                    continue
+
+                # Actually unmap it
+                try:
+                    command('silent! sunmap %s %s' % (option, trig))
+                except:  # pylint:disable=bare-except
+                    # Bug 908139: ignore unmaps that fail because of
+                    # unprintable characters. This is not ideal because we
+                    # will not be able to unmap lhs with any unprintable
+                    # character. If the lhs stats with a printable
+                    # character this will leak to the user when he tries to
+                    # type this character as a first in a selected tabstop.
+                    # This case should be rare enough to not bother us
+                    # though.
+                    pass
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/buffer_proxy.py b/vim/plugins/ultisnips/pythonx/UltiSnips/buffer_proxy.py
new file mode 100644
index 0000000..85585f6
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/buffer_proxy.py
@@ -0,0 +1,229 @@
+# coding=utf8
+
+import vim
+import UltiSnips._vim
+from UltiSnips.compatibility import as_unicode, as_vimencoding
+from UltiSnips.position import Position
+from UltiSnips._diff import diff
+from UltiSnips import _vim
+
+from contextlib import contextmanager
+
+
+@contextmanager
+def use_proxy_buffer(snippets_stack, vstate):
+    """
+    Forward all changes made in the buffer to the current snippet stack while
+    function call.
+    """
+    buffer_proxy = VimBufferProxy(snippets_stack, vstate)
+    old_buffer = _vim.buf
+    try:
+        _vim.buf = buffer_proxy
+        yield
+    finally:
+        _vim.buf = old_buffer
+    buffer_proxy.validate_buffer()
+
+
+@contextmanager
+def suspend_proxy_edits():
+    """
+    Prevents changes being applied to the snippet stack while function call.
+    """
+    if not isinstance(_vim.buf, VimBufferProxy):
+        yield
+    else:
+        try:
+            _vim.buf._disable_edits()
+            yield
+        finally:
+            _vim.buf._enable_edits()
+
+
+class VimBufferProxy(_vim.VimBuffer):
+    """
+    Proxy object used for tracking changes that made from snippet actions.
+
+    Unfortunately, vim by itself lacks of the API for changing text in
+    trackable maner.
+
+    Vim marks offers limited functionality for tracking line additions and
+    deletions, but nothing offered for tracking changes withing single line.
+
+    Instance of this class is passed to all snippet actions and behaves as
+    internal vim.current.window.buffer.
+
+    All changes that are made by user passed to diff algorithm, and resulting
+    diff applied to internal snippet structures to ensure they are in sync with
+    actual buffer contents.
+    """
+
+    def __init__(self, snippets_stack, vstate):
+        """
+        Instantiate new object.
+
+        snippets_stack is a slice of currently active snippets.
+        """
+        self._snippets_stack = snippets_stack
+        self._buffer = vim.current.buffer
+        self._change_tick = int(vim.eval("b:changedtick"))
+        self._forward_edits = True
+        self._vstate = vstate
+
+    def is_buffer_changed_outside(self):
+        """
+        Returns true, if buffer was changed without using proxy object, like
+        with vim.command() or through internal vim.current.window.buffer.
+        """
+        return self._change_tick < int(vim.eval("b:changedtick"))
+
+    def validate_buffer(self):
+        """
+        Raises exception if buffer is changes beyound proxy object.
+        """
+        if self.is_buffer_changed_outside():
+            raise RuntimeError('buffer was modified using vim.command or ' +
+            'vim.current.buffer; that changes are untrackable and leads to ' +
+            'errors in snippet expansion; use special variable `snip.buffer` '
+            'for buffer modifications.\n\n' +
+            'See :help UltiSnips-buffer-proxy for more info.')
+
+    def __setitem__(self, key, value):
+        """
+        Behaves as vim.current.window.buffer.__setitem__ except it tracks
+        changes and applies them to the current snippet stack.
+        """
+        if isinstance(key, slice):
+            value = [as_vimencoding(line) for line in value]
+            changes = list(self._get_diff(key.start, key.stop, value))
+            self._buffer[key.start:key.stop] = [
+                line.strip('\n') for line in value
+            ]
+        else:
+            value = as_vimencoding(value)
+            changes = list(self._get_line_diff(key, self._buffer[key], value))
+            self._buffer[key] = value
+
+        self._change_tick += 1
+
+        if self._forward_edits:
+            for change in changes:
+                self._apply_change(change)
+            if self._snippets_stack:
+                self._vstate.remember_buffer(self._snippets_stack[0])
+
+    def __setslice__(self, i, j, text):
+        """
+        Same as __setitem__.
+        """
+        self.__setitem__(slice(i, j), text)
+
+    def __getitem__(self, key):
+        """
+        Just passing call to the vim.current.window.buffer.__getitem__.
+        """
+        if isinstance(key, slice):
+            return [as_unicode(l) for l in self._buffer[key.start:key.stop]]
+        else:
+            return as_unicode(self._buffer[key])
+
+    def __getslice__(self, i, j):
+        """
+        Same as __getitem__.
+        """
+        return self.__getitem__(slice(i, j))
+
+    def __len__(self):
+        """
+        Same as len(vim.current.window.buffer).
+        """
+        return len(self._buffer)
+
+    def append(self, line, line_number=-1):
+        """
+        Same as vim.current.window.buffer.append(), but with tracking changes.
+        """
+        if line_number < 0:
+            line_number = len(self)
+        if not isinstance(line, list):
+            line = [line]
+        self[line_number:line_number] = [as_vimencoding(l) for l in line]
+
+    def __delitem__(self, key):
+        if isinstance(key, slice):
+            self.__setitem__(key, [])
+        else:
+            self.__setitem__(slice(key, key+1), [])
+
+    def _get_diff(self, start, end, new_value):
+        """
+        Very fast diffing algorithm when changes are across many lines.
+        """
+        for line_number in range(start, end):
+            if line_number < 0:
+                line_number = len(self._buffer) + line_number
+            yield ('D', line_number, 0, self._buffer[line_number], True)
+
+        if start < 0:
+            start = len(self._buffer) + start
+        for line_number in range(0, len(new_value)):
+            yield ('I', start+line_number, 0, new_value[line_number], True)
+
+    def _get_line_diff(self, line_number, before, after):
+        """
+        Use precise diffing for tracking changes in single line.
+        """
+        if before == '':
+            for change in self._get_diff(line_number, line_number+1, [after]):
+                yield change
+        else:
+            for change in diff(before, after):
+                yield (change[0], line_number, change[2], change[3])
+
+    def _apply_change(self, change):
+        """
+        Apply changeset to current snippets stack, correctly moving around
+        snippet itself or its child.
+        """
+        if not self._snippets_stack:
+            return
+
+        change_type, line_number, column_number, change_text = change[0:4]
+
+        line_before = line_number <= self._snippets_stack[0]._start.line
+        column_before = column_number <= self._snippets_stack[0]._start.col
+        if line_before and column_before:
+            direction = 1
+            if change_type == 'D':
+                direction = -1
+
+            diff = Position(direction, 0)
+            if len(change) != 5:
+                diff = Position(0, direction * len(change_text))
+            print(change, diff)
+
+            self._snippets_stack[0]._move(
+                Position(line_number, column_number),
+                diff
+            )
+        else:
+            if line_number > self._snippets_stack[0]._end.line:
+                return
+            if column_number >= self._snippets_stack[0]._end.col:
+                return
+            self._snippets_stack[0]._do_edit(change[0:4])
+
+    def _disable_edits(self):
+        """
+        Temporary disable applying changes to snippets stack. Should be done
+        while expanding anonymous snippet in the middle of jump to prevent
+        double tracking.
+        """
+        self._forward_edits = False
+
+    def _enable_edits(self):
+        """
+        Enables changes forwarding back.
+        """
+        self._forward_edits = True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/compatibility.py b/vim/plugins/ultisnips/pythonx/UltiSnips/compatibility.py
new file mode 100644
index 0000000..b8781bb
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/compatibility.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""This file contains compatibility code to stay compatible with as many python
+versions as possible."""
+
+import sys
+
+import vim  # pylint:disable=import-error
+
+if sys.version_info >= (3, 0):
+    def _vim_dec(string):
+        """Decode 'string' using &encoding."""
+        # We don't have the luxury here of failing, everything
+        # falls apart if we don't return a bytearray from the
+        # passed in string
+        return string.decode(vim.eval('&encoding'), 'replace')
+
+    def _vim_enc(bytearray):
+        """Encode 'string' using &encoding."""
+        # We don't have the luxury here of failing, everything
+        # falls apart if we don't return a string from the passed
+        # in bytearray
+        return bytearray.encode(vim.eval('&encoding'), 'replace')
+
+    def open_ascii_file(filename, mode):
+        """Opens a file in "r" mode."""
+        return open(filename, mode, encoding='utf-8')
+
+    def col2byte(line, col):
+        """Convert a valid column index into a byte index inside of vims
+        buffer."""
+        # We pad the line so that selecting the +1 st column still works.
+        pre_chars = (vim.current.buffer[line - 1] + '  ')[:col]
+        return len(_vim_enc(pre_chars))
+
+    def byte2col(line, nbyte):
+        """Convert a column into a byteidx suitable for a mark or cursor
+        position inside of vim."""
+        line = vim.current.buffer[line - 1]
+        raw_bytes = _vim_enc(line)[:nbyte]
+        return len(_vim_dec(raw_bytes))
+
+    def as_unicode(string):
+        """Return 'string' as unicode instance."""
+        if isinstance(string, bytes):
+            return _vim_dec(string)
+        return str(string)
+
+    def as_vimencoding(string):
+        """Return 'string' as Vim internal encoding."""
+        return string
+else:
+    import warnings
+    warnings.filterwarnings('ignore', category=DeprecationWarning)
+
+    def _vim_dec(string):
+        """Decode 'string' using &encoding."""
+        try:
+            return string.decode(vim.eval('&encoding'))
+        except UnicodeDecodeError:
+            # At least we tried. There might be some problems down the road now
+            return string
+
+    def _vim_enc(string):
+        """Encode 'string' using &encoding."""
+        try:
+            return string.encode(vim.eval('&encoding'))
+        except UnicodeDecodeError:
+            return string
+        except UnicodeEncodeError:
+            return string
+
+    def open_ascii_file(filename, mode):
+        """Opens a file in "r" mode."""
+        return open(filename, mode)
+
+    def col2byte(line, col):
+        """Convert a valid column index into a byte index inside of vims
+        buffer."""
+        # We pad the line so that selecting the +1 st column still works.
+        pre_chars = _vim_dec(vim.current.buffer[line - 1] + '  ')[:col]
+        return len(_vim_enc(pre_chars))
+
+    def byte2col(line, nbyte):
+        """Convert a column into a byteidx suitable for a mark or cursor
+        position inside of vim."""
+        line = vim.current.buffer[line - 1]
+        if nbyte >= len(line):  # This is beyond end of line
+            return nbyte
+        return len(_vim_dec(line[:nbyte]))
+
+    def as_unicode(string):
+        """Return 'string' as unicode instance."""
+        if isinstance(string, str):
+            return _vim_dec(string)
+        return unicode(string)
+
+    def as_vimencoding(string):
+        """Return 'string' as unicode instance."""
+        return _vim_enc(string)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/debug.py b/vim/plugins/ultisnips/pythonx/UltiSnips/debug.py
new file mode 100644
index 0000000..e37f54e
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/debug.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Convenience methods that help with debugging.
+
+They should never be used in production code.
+
+"""
+
+import sys
+
+from UltiSnips.compatibility import as_unicode
+
+DUMP_FILENAME = '/tmp/file.txt' if not sys.platform.lower().startswith('win') \
+    else 'C:/windows/temp/ultisnips.txt'
+with open(DUMP_FILENAME, 'w'):
+    pass  # clears the file
+
+
+def echo_to_hierarchy(text_object):
+    """Outputs the given 'text_object' and its children hierarchically."""
+    # pylint:disable=protected-access
+    parent = text_object
+    while parent._parent:
+        parent = parent._parent
+
+    def _do_print(text_object, indent=''):
+        """prints recursively."""
+        debug(indent + as_unicode(text_object))
+        try:
+            for child in text_object._children:
+                _do_print(child, indent=indent + '  ')
+        except AttributeError:
+            pass
+    _do_print(parent)
+
+
+def debug(msg):
+    """Dumb 'msg' into the debug file."""
+    msg = as_unicode(msg)
+    with open(DUMP_FILENAME, 'ab') as dump_file:
+        dump_file.write((msg + '\n').encode('utf-8'))
+
+
+def print_stack():
+    """Dump a stack trace into the debug file."""
+    import traceback
+    with open(DUMP_FILENAME, 'ab') as dump_file:
+        traceback.print_stack(file=dump_file)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/err_to_scratch_buffer.py b/vim/plugins/ultisnips/pythonx/UltiSnips/err_to_scratch_buffer.py
new file mode 100644
index 0000000..daec4df
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/err_to_scratch_buffer.py
@@ -0,0 +1,51 @@
+# coding=utf8
+
+from functools import wraps
+import traceback
+import re
+import sys
+
+from UltiSnips import _vim
+
+def wrap(func):
+    """Decorator that will catch any Exception that 'func' throws and displays
+    it in a new Vim scratch buffer."""
+    @wraps(func)
+    def wrapper(self, *args, **kwds):
+        try:
+            return func(self, *args, **kwds)
+        except Exception as e:  # pylint: disable=bare-except
+            msg = \
+                """An error occured. This is either a bug in UltiSnips or a bug in a
+snippet definition. If you think this is a bug, please report it to
+https://github.com/SirVer/ultisnips/issues/new.
+
+Following is the full stack trace:
+"""
+
+            msg += traceback.format_exc()
+            if hasattr(e, 'snippet_info'):
+                msg += "\nSnippet, caused error:\n"
+                msg += re.sub(
+                    '^(?=\S)', '  ', e.snippet_info, flags=re.MULTILINE
+                )
+            # snippet_code comes from _python_code.py, it's set manually for
+            # providing error message with stacktrace of failed python code
+            # inside of the snippet.
+            if hasattr(e, 'snippet_code'):
+                _, _, tb = sys.exc_info()
+                tb_top = traceback.extract_tb(tb)[-1]
+                msg += "\nExecuted snippet code:\n"
+                lines = e.snippet_code.split("\n")
+                for number, line in enumerate(lines, 1):
+                    msg += str(number).rjust(3)
+                    prefix = "   " if line else ""
+                    if tb_top[1] == number:
+                        prefix = " > "
+                    msg += prefix + line + "\n"
+
+            # Vim sends no WinLeave msg here.
+            if hasattr(self, '_leaving_buffer'):
+                self._leaving_buffer()  # pylint:disable=protected-access
+            _vim.new_scratch_buffer(msg)
+    return wrapper
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/indent_util.py b/vim/plugins/ultisnips/pythonx/UltiSnips/indent_util.py
new file mode 100644
index 0000000..55525d6
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/indent_util.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""See module doc."""
+
+from UltiSnips import _vim
+
+
+class IndentUtil(object):
+
+    """Utility class for dealing properly with indentation."""
+
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        """Gets the spacing properties from Vim."""
+        self.shiftwidth = int(
+            _vim.eval("exists('*shiftwidth') ? shiftwidth() : &shiftwidth"))
+        self._expandtab = (_vim.eval('&expandtab') == '1')
+        self._tabstop = int(_vim.eval('&tabstop'))
+
+    def ntabs_to_proper_indent(self, ntabs):
+        """Convert 'ntabs' number of tabs to the proper indent prefix."""
+        line_ind = ntabs * self.shiftwidth * ' '
+        line_ind = self.indent_to_spaces(line_ind)
+        line_ind = self.spaces_to_indent(line_ind)
+        return line_ind
+
+    def indent_to_spaces(self, indent):
+        """Converts indentation to spaces respecting Vim settings."""
+        indent = indent.expandtabs(self._tabstop)
+        right = (len(indent) - len(indent.rstrip(' '))) * ' '
+        indent = indent.replace(' ', '')
+        indent = indent.replace('\t', ' ' * self._tabstop)
+        return indent + right
+
+    def spaces_to_indent(self, indent):
+        """Converts spaces to proper indentation respecting Vim settings."""
+        if not self._expandtab:
+            indent = indent.replace(' ' * self._tabstop, '\t')
+        return indent
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/position.py b/vim/plugins/ultisnips/pythonx/UltiSnips/position.py
new file mode 100644
index 0000000..3c9d2a5
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/position.py
@@ -0,0 +1,77 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Represents a Position in a text file: (0 based line index, 0 based column
+index) and provides methods for moving them around."""
+
+
+class Position(object):
+
+    """See module docstring."""
+
+    def __init__(self, line, col):
+        self.line = line
+        self.col = col
+
+    def move(self, pivot, delta):
+        """'pivot' is the position of the first changed character, 'delta' is
+        how text after it moved."""
+        if self < pivot:
+            return
+        if delta.line == 0:
+            if self.line == pivot.line:
+                self.col += delta.col
+        elif delta.line > 0:
+            if self.line == pivot.line:
+                self.col += delta.col - pivot.col
+            self.line += delta.line
+        else:
+            self.line += delta.line
+            if self.line == pivot.line:
+                self.col += - delta.col + pivot.col
+
+    def delta(self, pos):
+        """Returns the difference that the cursor must move to come from 'pos'
+        to us."""
+        assert isinstance(pos, Position)
+        if self.line == pos.line:
+            return Position(0, self.col - pos.col)
+        else:
+            if self > pos:
+                return Position(self.line - pos.line, self.col)
+            else:
+                return Position(self.line - pos.line, pos.col)
+        return Position(self.line - pos.line, self.col - pos.col)
+
+    def __add__(self, pos):
+        assert isinstance(pos, Position)
+        return Position(self.line + pos.line, self.col + pos.col)
+
+    def __sub__(self, pos):
+        assert isinstance(pos, Position)
+        return Position(self.line - pos.line, self.col - pos.col)
+
+    def __eq__(self, other):
+        return (self.line, self.col) == (other.line, other.col)
+
+    def __ne__(self, other):
+        return (self.line, self.col) != (other.line, other.col)
+
+    def __lt__(self, other):
+        return (self.line, self.col) < (other.line, other.col)
+
+    def __le__(self, other):
+        return (self.line, self.col) <= (other.line, other.col)
+
+    def __repr__(self):
+        return '(%i,%i)' % (self.line, self.col)
+
+    def __getitem__(self, index):
+        if index > 1:
+            raise IndexError(
+                'position can be indexed only 0 (line) and 1 (column)'
+            )
+        if index == 0:
+            return self.line
+        else:
+            return self.col
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/__init__.py
new file mode 100644
index 0000000..0128940
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/__init__.py
@@ -0,0 +1 @@
+"""Code related to snippets."""
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/__init__.py
new file mode 100644
index 0000000..fb08801
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/__init__.py
@@ -0,0 +1,4 @@
+"""In memory representation of snippet definitions."""
+
+from UltiSnips.snippet.definition.ultisnips import UltiSnipsSnippetDefinition
+from UltiSnips.snippet.definition.snipmate import SnipMateSnippetDefinition
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/_base.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/_base.py
new file mode 100644
index 0000000..b7f4bbe
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/_base.py
@@ -0,0 +1,443 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Snippet representation after parsing."""
+
+import re
+
+import vim
+import textwrap
+
+from UltiSnips import _vim
+from UltiSnips.compatibility import as_unicode
+from UltiSnips.indent_util import IndentUtil
+from UltiSnips.text import escape
+from UltiSnips.text_objects import SnippetInstance
+from UltiSnips.text_objects._python_code import \
+    SnippetUtilCursor, SnippetUtilForAction
+
+__WHITESPACE_SPLIT = re.compile(r"\s")
+
+
+def split_at_whitespace(string):
+    """Like string.split(), but keeps empty words as empty words."""
+    return re.split(__WHITESPACE_SPLIT, string)
+
+
+def _words_for_line(trigger, before, num_words=None):
+    """Gets the final 'num_words' words from 'before'.
+
+    If num_words is None, then use the number of words in 'trigger'.
+
+    """
+    if num_words is None:
+        num_words = len(split_at_whitespace(trigger))
+
+    word_list = split_at_whitespace(before)
+    if len(word_list) <= num_words:
+        return before.strip()
+    else:
+        before_words = before
+        for i in range(-1, -(num_words + 1), -1):
+            left = before_words.rfind(word_list[i])
+            before_words = before_words[:left]
+        return before[len(before_words):].strip()
+
+
+class SnippetDefinition(object):
+
+    """Represents a snippet as parsed from a file."""
+
+    _INDENT = re.compile(r"^[ \t]*")
+    _TABS = re.compile(r"^\t*")
+
+    def __init__(self, priority, trigger, value, description,
+                 options, globals, location, context, actions):
+        self._priority = int(priority)
+        self._trigger = as_unicode(trigger)
+        self._value = as_unicode(value)
+        self._description = as_unicode(description)
+        self._opts = options
+        self._matched = ''
+        self._last_re = None
+        self._globals = globals
+        self._location = location
+        self._context_code = context
+        self._context = None
+        self._actions = actions
+
+        # Make sure that we actually match our trigger in case we are
+        # immediately expanded.
+        self.matches(self._trigger)
+
+    def __repr__(self):
+        return '_SnippetDefinition(%r,%s,%s,%s)' % (
+            self._priority, self._trigger, self._description, self._opts)
+
+    def _re_match(self, trigger):
+        """Test if a the current regex trigger matches `trigger`.
+
+        If so, set _last_re and _matched.
+
+        """
+        for match in re.finditer(self._trigger, trigger):
+            if match.end() != len(trigger):
+                continue
+            else:
+                self._matched = trigger[match.start():match.end()]
+
+            self._last_re = match
+            return match
+        return False
+
+    def _context_match(self, visual_content):
+        # skip on empty buffer
+        if len(vim.current.buffer) == 1 and vim.current.buffer[0] == "":
+            return
+
+        locals = {
+            'context': None,
+            'visual_mode': '',
+            'visual_text': '',
+            'last_placeholder': None
+        }
+
+        if visual_content:
+            locals['visual_mode'] = visual_content.mode
+            locals['visual_text'] = visual_content.text
+            locals['last_placeholder'] = visual_content.placeholder
+
+        return self._eval_code('snip.context = ' + self._context_code,
+                               locals).context
+
+    def _eval_code(self, code, additional_locals={}):
+        code = "\n".join([
+            'import re, os, vim, string, random',
+            '\n'.join(self._globals.get('!p', [])).replace('\r\n', '\n'),
+            code
+        ])
+
+        current = vim.current
+
+        locals = {
+            'window': current.window,
+            'buffer': current.buffer,
+            'line': current.window.cursor[0]-1,
+            'column': current.window.cursor[1]-1,
+            'cursor': SnippetUtilCursor(current.window.cursor),
+        }
+
+        locals.update(additional_locals)
+
+        snip = SnippetUtilForAction(locals)
+
+        try:
+            exec(code, {'snip': snip})
+        except Exception as e:
+            self._make_debug_exception(e, code)
+            raise
+
+        return snip
+
+    def _execute_action(
+        self,
+        action,
+        context,
+        additional_locals={}
+    ):
+        mark_to_use = '`'
+        with _vim.save_mark(mark_to_use):
+            _vim.set_mark_from_pos(mark_to_use, _vim.get_cursor_pos())
+
+            cursor_line_before = _vim.buf.line_till_cursor
+
+            locals = {
+                'context': context,
+            }
+
+            locals.update(additional_locals)
+
+            snip = self._eval_code(action, locals)
+
+            if snip.cursor.is_set():
+                vim.current.window.cursor = snip.cursor.to_vim_cursor()
+            else:
+                new_mark_pos = _vim.get_mark_pos(mark_to_use)
+
+                cursor_invalid = False
+
+                if _vim._is_pos_zero(new_mark_pos):
+                    cursor_invalid = True
+                else:
+                    _vim.set_cursor_from_pos(new_mark_pos)
+                    if cursor_line_before != _vim.buf.line_till_cursor:
+                        cursor_invalid = True
+
+                if cursor_invalid:
+                    raise RuntimeError(
+                        'line under the cursor was modified, but ' +
+                        '"snip.cursor" variable is not set; either set set ' +
+                        '"snip.cursor" to new cursor position, or do not ' +
+                        'modify cursor line'
+                    )
+
+        return snip
+
+    def _make_debug_exception(self, e, code=''):
+        e.snippet_info = textwrap.dedent("""
+            Defined in: {}
+            Trigger: {}
+            Description: {}
+            Context: {}
+            Pre-expand: {}
+            Post-expand: {}
+        """).format(
+            self._location,
+            self._trigger,
+            self._description,
+            self._context_code if self._context_code else '<none>',
+            self._actions['pre_expand'] if 'pre_expand' in self._actions
+                else '<none>',
+            self._actions['post_expand'] if 'post_expand' in self._actions
+                else '<none>',
+            code,
+        )
+
+        e.snippet_code = code
+
+    def has_option(self, opt):
+        """Check if the named option is set."""
+        return opt in self._opts
+
+    @property
+    def description(self):
+        """Descriptive text for this snippet."""
+        return ('(%s) %s' % (self._trigger, self._description)).strip()
+
+    @property
+    def priority(self):
+        """The snippets priority, which defines which snippet will be preferred
+        over others with the same trigger."""
+        return self._priority
+
+    @property
+    def trigger(self):
+        """The trigger text for the snippet."""
+        return self._trigger
+
+    @property
+    def matched(self):
+        """The last text that matched this snippet in match() or
+        could_match()."""
+        return self._matched
+
+    @property
+    def location(self):
+        """Where this snippet was defined."""
+        return self._location
+
+    @property
+    def context(self):
+        """The matched context."""
+        return self._context
+
+    def matches(self, before, visual_content=None):
+        """Returns True if this snippet matches 'before'."""
+        # If user supplies both "w" and "i", it should perhaps be an
+        # error, but if permitted it seems that "w" should take precedence
+        # (since matching at word boundary and within a word == matching at word
+        # boundary).
+        self._matched = ''
+
+        words = _words_for_line(self._trigger, before)
+
+        if 'r' in self._opts:
+            try:
+                match = self._re_match(before)
+            except Exception as e:
+                self._make_debug_exception(e)
+                raise
+
+        elif 'w' in self._opts:
+            words_len = len(self._trigger)
+            words_prefix = words[:-words_len]
+            words_suffix = words[-words_len:]
+            match = (words_suffix == self._trigger)
+            if match and words_prefix:
+                # Require a word boundary between prefix and suffix.
+                boundary_chars = escape(words_prefix[-1:] +
+                                        words_suffix[:1], r'\"')
+                match = _vim.eval(
+                    '"%s" =~# "\\\\v.<."' %
+                    boundary_chars) != '0'
+        elif 'i' in self._opts:
+            match = words.endswith(self._trigger)
+        else:
+            match = (words == self._trigger)
+
+        # By default, we match the whole trigger
+        if match and not self._matched:
+            self._matched = self._trigger
+
+        # Ensure the match was on a word boundry if needed
+        if 'b' in self._opts and match:
+            text_before = before.rstrip()[:-len(self._matched)]
+            if text_before.strip(' \t') != '':
+                self._matched = ''
+                return False
+
+        self._context = None
+        if match and self._context_code:
+            self._context = self._context_match(visual_content)
+            if not self.context:
+                match = False
+
+        return match
+
+    def could_match(self, before):
+        """Return True if this snippet could match the (partial) 'before'."""
+        self._matched = ''
+
+        # List all on whitespace.
+        if before and before[-1] in (' ', '\t'):
+            before = ''
+        if before and before.rstrip() is not before:
+            return False
+
+        words = _words_for_line(self._trigger, before)
+
+        if 'r' in self._opts:
+            # Test for full match only
+            match = self._re_match(before)
+        elif 'w' in self._opts:
+            # Trim non-empty prefix up to word boundary, if present.
+            qwords = escape(words, r'\"')
+            words_suffix = _vim.eval(
+                'substitute("%s", "\\\\v^.+<(.+)", "\\\\1", "")' % qwords)
+            match = self._trigger.startswith(words_suffix)
+            self._matched = words_suffix
+
+            # TODO: list_snippets() function cannot handle partial-trigger
+            # matches yet, so for now fail if we trimmed the prefix.
+            if words_suffix != words:
+                match = False
+        elif 'i' in self._opts:
+            # TODO: It is hard to define when a inword snippet could match,
+            # therefore we check only for full-word trigger.
+            match = self._trigger.startswith(words)
+        else:
+            match = self._trigger.startswith(words)
+
+        # By default, we match the words from the trigger
+        if match and not self._matched:
+            self._matched = words
+
+        # Ensure the match was on a word boundry if needed
+        if 'b' in self._opts and match:
+            text_before = before.rstrip()[:-len(self._matched)]
+            if text_before.strip(' \t') != '':
+                self._matched = ''
+                return False
+
+        return match
+
+    def instantiate(self, snippet_instance, initial_text, indent):
+        """Parses the content of this snippet and brings the corresponding text
+        objects alive inside of Vim."""
+        raise NotImplementedError()
+
+    def do_pre_expand(self, visual_content, snippets_stack):
+        if 'pre_expand' in self._actions:
+            locals = {'buffer': _vim.buf, 'visual_content': visual_content}
+
+            snip = self._execute_action(
+                self._actions['pre_expand'], self._context, locals
+            )
+
+            self._context = snip.context
+
+            return snip.cursor.is_set()
+        else:
+            return False
+
+    def do_post_expand(self, start, end, snippets_stack):
+        if 'post_expand' in self._actions:
+            locals = {
+                'snippet_start': start,
+                'snippet_end': end,
+                'buffer': _vim.buf
+            }
+
+            snip = self._execute_action(
+                self._actions['post_expand'], snippets_stack[-1].context, locals
+            )
+
+            snippets_stack[-1].context = snip.context
+
+            return snip.cursor.is_set()
+        else:
+            return False
+
+    def do_post_jump(
+        self, tabstop_number, jump_direction, snippets_stack, current_snippet
+    ):
+        if 'post_jump' in self._actions:
+            start = current_snippet.start
+            end = current_snippet.end
+
+            locals = {
+                'tabstop': tabstop_number,
+                'jump_direction': jump_direction,
+                'tabstops': current_snippet.get_tabstops(),
+                'snippet_start': start,
+                'snippet_end': end,
+                'buffer': _vim.buf
+            }
+
+            snip = self._execute_action(
+                self._actions['post_jump'], current_snippet.context, locals
+            )
+
+            current_snippet.context = snip.context
+
+            return snip.cursor.is_set()
+        else:
+            return False
+
+
+    def launch(self, text_before, visual_content, parent, start, end):
+        """Launch this snippet, overwriting the text 'start' to 'end' and
+        keeping the 'text_before' on the launch line.
+
+        'Parent' is the parent snippet instance if any.
+
+        """
+        indent = self._INDENT.match(text_before).group(0)
+        lines = (self._value + '\n').splitlines()
+        ind_util = IndentUtil()
+
+        # Replace leading tabs in the snippet definition via proper indenting
+        initial_text = []
+        for line_num, line in enumerate(lines):
+            if 't' in self._opts:
+                tabs = 0
+            else:
+                tabs = len(self._TABS.match(line).group(0))
+            line_ind = ind_util.ntabs_to_proper_indent(tabs)
+            if line_num != 0:
+                line_ind = indent + line_ind
+
+            result_line = line_ind + line[tabs:]
+            if 'm' in self._opts:
+                result_line = result_line.rstrip()
+            initial_text.append(result_line)
+        initial_text = '\n'.join(initial_text)
+
+        snippet_instance = SnippetInstance(
+            self, parent, initial_text, start, end, visual_content,
+            last_re=self._last_re, globals=self._globals,
+            context=self._context)
+        self.instantiate(snippet_instance, initial_text, indent)
+
+        snippet_instance.update_textobjects()
+        return snippet_instance
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/snipmate.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/snipmate.py
new file mode 100644
index 0000000..8ab1e2a
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/snipmate.py
@@ -0,0 +1,22 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""A snipMate snippet after parsing."""
+
+from UltiSnips.snippet.definition._base import SnippetDefinition
+from UltiSnips.snippet.parsing.snipmate import parse_and_instantiate
+
+
+class SnipMateSnippetDefinition(SnippetDefinition):
+
+    """See module doc."""
+
+    SNIPMATE_SNIPPET_PRIORITY = -1000
+
+    def __init__(self, trigger, value, description, location):
+        SnippetDefinition.__init__(self, self.SNIPMATE_SNIPPET_PRIORITY,
+                                   trigger, value, description, '', {}, location,
+                                   None, {})
+
+    def instantiate(self, snippet_instance, initial_text, indent):
+        parse_and_instantiate(snippet_instance, initial_text, indent)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/ultisnips.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/ultisnips.py
new file mode 100644
index 0000000..5338a6a
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/definition/ultisnips.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""A UltiSnips snippet after parsing."""
+
+from UltiSnips.snippet.definition._base import SnippetDefinition
+from UltiSnips.snippet.parsing.ultisnips import parse_and_instantiate
+
+
+class UltiSnipsSnippetDefinition(SnippetDefinition):
+
+    """See module doc."""
+
+    def instantiate(self, snippet_instance, initial_text, indent):
+        return parse_and_instantiate(snippet_instance, initial_text, indent)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/__init__.py
new file mode 100644
index 0000000..ea46beb
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/__init__.py
@@ -0,0 +1 @@
+"""Code related to turning text into snippets."""
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_base.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_base.py
new file mode 100644
index 0000000..8c7f342
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_base.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Common functionality of the snippet parsing codes."""
+
+from UltiSnips.position import Position
+from UltiSnips.snippet.parsing._lexer import tokenize, TabStopToken
+from UltiSnips.text_objects import TabStop
+
+from UltiSnips.text_objects import  Mirror
+from UltiSnips.snippet.parsing._lexer import MirrorToken
+
+
+def resolve_ambiguity(all_tokens, seen_ts):
+    """$1 could be a Mirror or a TabStop.
+
+    This figures this out.
+
+    """
+    for parent, token in all_tokens:
+        if isinstance(token, MirrorToken):
+            if token.number not in seen_ts:
+                seen_ts[token.number] = TabStop(parent, token)
+            else:
+                Mirror(parent, seen_ts[token.number], token)
+
+
+def tokenize_snippet_text(snippet_instance, text, indent,
+                          allowed_tokens_in_text, allowed_tokens_in_tabstops,
+                          token_to_textobject):
+    """Turns 'text' into a stream of tokens and creates the text objects from
+    those tokens that are mentioned in 'token_to_textobject' assuming the
+    current 'indent'.
+
+    The 'allowed_tokens_in_text' define which tokens will be recognized
+    in 'text' while 'allowed_tokens_in_tabstops' are the tokens that
+    will be recognized in TabStop placeholder text.
+
+    """
+    seen_ts = {}
+    all_tokens = []
+
+    def _do_parse(parent, text, allowed_tokens):
+        """Recursive function that actually creates the objects."""
+        tokens = list(tokenize(text, indent, parent.start, allowed_tokens))
+        for token in tokens:
+            all_tokens.append((parent, token))
+            if isinstance(token, TabStopToken):
+                ts = TabStop(parent, token)
+                seen_ts[token.number] = ts
+                _do_parse(ts, token.initial_text,
+                          allowed_tokens_in_tabstops)
+            else:
+                klass = token_to_textobject.get(token.__class__, None)
+                if klass is not None:
+                    klass(parent, token)
+    _do_parse(snippet_instance, text, allowed_tokens_in_text)
+    return all_tokens, seen_ts
+
+
+def finalize(all_tokens, seen_ts, snippet_instance):
+    """Adds a tabstop 0 if non is in 'seen_ts' and brings the text of the
+    snippet instance into Vim."""
+    if 0 not in seen_ts:
+        mark = all_tokens[-1][1].end  # Last token is always EndOfText
+        m1 = Position(mark.line, mark.col)
+        TabStop(snippet_instance, 0, mark, m1)
+    snippet_instance.replace_initial_text()
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_lexer.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_lexer.py
new file mode 100644
index 0000000..60859fe
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/_lexer.py
@@ -0,0 +1,369 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Not really a lexer in the classical sense, but code to convert snippet
+definitions into logical units called Tokens."""
+
+import string
+import re
+
+from UltiSnips.compatibility import as_unicode
+from UltiSnips.position import Position
+from UltiSnips.text import unescape
+
+
+class _TextIterator(object):
+
+    """Helper class to make iterating over text easier."""
+
+    def __init__(self, text, offset):
+        self._text = as_unicode(text)
+        self._line = offset.line
+        self._col = offset.col
+
+        self._idx = 0
+
+    def __iter__(self):
+        """Iterator interface."""
+        return self
+
+    def __next__(self):
+        """Returns the next character."""
+        if self._idx >= len(self._text):
+            raise StopIteration
+
+        rv = self._text[self._idx]
+        if self._text[self._idx] in ('\n', '\r\n'):
+            self._line += 1
+            self._col = 0
+        else:
+            self._col += 1
+        self._idx += 1
+        return rv
+    next = __next__  # for python2
+
+    def peek(self, count=1):
+        """Returns the next 'count' characters without advancing the stream."""
+        if count > 1:  # This might return '' if nothing is found
+            return self._text[self._idx:self._idx + count]
+        try:
+            return self._text[self._idx]
+        except IndexError:
+            return None
+
+    @property
+    def pos(self):
+        """Current position in the text."""
+        return Position(self._line, self._col)
+
+
+def _parse_number(stream):
+    """Expects the stream to contain a number next, returns the number without
+    consuming any more bytes."""
+    rv = ''
+    while stream.peek() and stream.peek() in string.digits:
+        rv += next(stream)
+
+    return int(rv)
+
+
+def _parse_till_closing_brace(stream):
+    """
+    Returns all chars till a non-escaped } is found. Other
+    non escaped { are taken into account and skipped over.
+
+    Will also consume the closing }, but not return it
+    """
+    rv = ''
+    in_braces = 1
+    while True:
+        if EscapeCharToken.starts_here(stream, '{}'):
+            rv += next(stream) + next(stream)
+        else:
+            char = next(stream)
+            if char == '{':
+                in_braces += 1
+            elif char == '}':
+                in_braces -= 1
+            if in_braces == 0:
+                break
+            rv += char
+    return rv
+
+
+def _parse_till_unescaped_char(stream, chars):
+    """
+    Returns all chars till a non-escaped char is found.
+
+    Will also consume the closing char, but and return it as second
+    return value
+    """
+    rv = ''
+    while True:
+        escaped = False
+        for char in chars:
+            if EscapeCharToken.starts_here(stream, char):
+                rv += next(stream) + next(stream)
+                escaped = True
+        if not escaped:
+            char = next(stream)
+            if char in chars:
+                break
+            rv += char
+    return rv, char
+
+
+class Token(object):
+
+    """Represents a Token as parsed from a snippet definition."""
+
+    def __init__(self, gen, indent):
+        self.initial_text = as_unicode('')
+        self.start = gen.pos
+        self._parse(gen, indent)
+        self.end = gen.pos
+
+    def _parse(self, stream, indent):
+        """Parses the token from 'stream' with the current 'indent'."""
+        pass  # Does nothing
+
+
+class TabStopToken(Token):
+
+    """${1:blub}"""
+    CHECK = re.compile(r'^\${\d+[:}]')
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(10)) is not None
+
+    def _parse(self, stream, indent):
+        next(stream)  # $
+        next(stream)  # {
+
+        self.number = _parse_number(stream)
+
+        if stream.peek() == ':':
+            next(stream)
+        self.initial_text = _parse_till_closing_brace(stream)
+
+    def __repr__(self):
+        return 'TabStopToken(%r,%r,%r,%r)' % (
+            self.start, self.end, self.number, self.initial_text
+        )
+
+
+class VisualToken(Token):
+
+    """${VISUAL}"""
+    CHECK = re.compile(r"^\${VISUAL[:}/]")
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(10)) is not None
+
+    def _parse(self, stream, indent):
+        for _ in range(8):  # ${VISUAL
+            next(stream)
+
+        if stream.peek() == ':':
+            next(stream)
+        self.alternative_text, char = _parse_till_unescaped_char(stream, '/}')
+        self.alternative_text = unescape(self.alternative_text)
+
+        if char == '/':  # Transformation going on
+            try:
+                self.search = _parse_till_unescaped_char(stream, '/')[0]
+                self.replace = _parse_till_unescaped_char(stream, '/')[0]
+                self.options = _parse_till_closing_brace(stream)
+            except StopIteration:
+                raise RuntimeError(
+                    "Invalid ${VISUAL} transformation! Forgot to escape a '/'?")
+        else:
+            self.search = None
+            self.replace = None
+            self.options = None
+
+    def __repr__(self):
+        return 'VisualToken(%r,%r)' % (
+            self.start, self.end
+        )
+
+
+class TransformationToken(Token):
+
+    """${1/match/replace/options}"""
+
+    CHECK = re.compile(r'^\${\d+\/')
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(10)) is not None
+
+    def _parse(self, stream, indent):
+        next(stream)  # $
+        next(stream)  # {
+
+        self.number = _parse_number(stream)
+
+        next(stream)  # /
+
+        self.search = _parse_till_unescaped_char(stream, '/')[0]
+        self.replace = _parse_till_unescaped_char(stream, '/')[0]
+        self.options = _parse_till_closing_brace(stream)
+
+    def __repr__(self):
+        return 'TransformationToken(%r,%r,%r,%r,%r)' % (
+            self.start, self.end, self.number, self.search, self.replace
+        )
+
+
+class MirrorToken(Token):
+
+    """$1."""
+    CHECK = re.compile(r'^\$\d+')
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(10)) is not None
+
+    def _parse(self, stream, indent):
+        next(stream)  # $
+        self.number = _parse_number(stream)
+
+    def __repr__(self):
+        return 'MirrorToken(%r,%r,%r)' % (
+            self.start, self.end, self.number
+        )
+
+
+class EscapeCharToken(Token):
+
+    """\\n."""
+    @classmethod
+    def starts_here(cls, stream, chars=r'{}\$`'):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        cs = stream.peek(2)
+        if len(cs) == 2 and cs[0] == '\\' and cs[1] in chars:
+            return True
+
+    def _parse(self, stream, indent):
+        next(stream)  # \
+        self.initial_text = next(stream)
+
+    def __repr__(self):
+        return 'EscapeCharToken(%r,%r,%r)' % (
+            self.start, self.end, self.initial_text
+        )
+
+
+class ShellCodeToken(Token):
+
+    """`echo "hi"`"""
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return stream.peek(1) == '`'
+
+    def _parse(self, stream, indent):
+        next(stream)  # `
+        self.code = _parse_till_unescaped_char(stream, '`')[0]
+
+    def __repr__(self):
+        return 'ShellCodeToken(%r,%r,%r)' % (
+            self.start, self.end, self.code
+        )
+
+
+class PythonCodeToken(Token):
+
+    """`!p snip.rv = "Hi"`"""
+    CHECK = re.compile(r'^`!p\s')
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(4)) is not None
+
+    def _parse(self, stream, indent):
+        for _ in range(3):
+            next(stream)  # `!p
+        if stream.peek() in '\t ':
+            next(stream)
+
+        code = _parse_till_unescaped_char(stream, '`')[0]
+
+        # Strip the indent if any
+        if len(indent):
+            lines = code.splitlines()
+            self.code = lines[0] + '\n'
+            self.code += '\n'.join([l[len(indent):]
+                                    for l in lines[1:]])
+        else:
+            self.code = code
+        self.indent = indent
+
+    def __repr__(self):
+        return 'PythonCodeToken(%r,%r,%r)' % (
+            self.start, self.end, self.code
+        )
+
+
+class VimLCodeToken(Token):
+
+    """`!v g:hi`"""
+    CHECK = re.compile(r'^`!v\s')
+
+    @classmethod
+    def starts_here(cls, stream):
+        """Returns true if this token starts at the current position in
+        'stream'."""
+        return cls.CHECK.match(stream.peek(4)) is not None
+
+    def _parse(self, stream, indent):
+        for _ in range(4):
+            next(stream)  # `!v
+        self.code = _parse_till_unescaped_char(stream, '`')[0]
+
+    def __repr__(self):
+        return 'VimLCodeToken(%r,%r,%r)' % (
+            self.start, self.end, self.code
+        )
+
+
+class EndOfTextToken(Token):
+
+    """Appears at the end of the text."""
+
+    def __repr__(self):
+        return 'EndOfText(%r)' % self.end
+
+
+def tokenize(text, indent, offset, allowed_tokens):
+    """Returns an iterator of tokens of 'text'['offset':] which is assumed to
+    have 'indent' as the whitespace of the begging of the lines. Only
+    'allowed_tokens' are considered to be valid tokens."""
+    stream = _TextIterator(text, offset)
+    try:
+        while True:
+            done_something = False
+            for token in allowed_tokens:
+                if token.starts_here(stream):
+                    yield token(stream, indent)
+                    done_something = True
+                    break
+            if not done_something:
+                next(stream)
+    except StopIteration:
+        yield EndOfTextToken(stream, indent)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/snipmate.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/snipmate.py
new file mode 100644
index 0000000..8aaed53
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/snipmate.py
@@ -0,0 +1,38 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Parses a snipMate snippet definition and launches it into Vim."""
+
+from UltiSnips.snippet.parsing._base import tokenize_snippet_text, finalize, resolve_ambiguity
+from UltiSnips.snippet.parsing._lexer import EscapeCharToken, \
+    VisualToken, TabStopToken, MirrorToken, ShellCodeToken
+from UltiSnips.text_objects import EscapedChar, Mirror, VimLCode, Visual
+
+_TOKEN_TO_TEXTOBJECT = {
+    EscapeCharToken: EscapedChar,
+    VisualToken: Visual,
+    ShellCodeToken: VimLCode,  # `` is VimL in snipMate
+}
+
+__ALLOWED_TOKENS = [
+    EscapeCharToken, VisualToken, TabStopToken, MirrorToken, ShellCodeToken
+]
+
+__ALLOWED_TOKENS_IN_TABSTOPS = [
+    EscapeCharToken, VisualToken, MirrorToken, ShellCodeToken
+]
+
+
+def parse_and_instantiate(parent_to, text, indent):
+    """Parses a snippet definition in snipMate format from 'text' assuming the
+    current 'indent'.
+
+    Will instantiate all the objects and link them as children to
+    parent_to. Will also put the initial text into Vim.
+
+    """
+    all_tokens, seen_ts = tokenize_snippet_text(parent_to, text, indent,
+                                                __ALLOWED_TOKENS, __ALLOWED_TOKENS_IN_TABSTOPS,
+                                                _TOKEN_TO_TEXTOBJECT)
+    resolve_ambiguity(all_tokens, seen_ts)
+    finalize(all_tokens, seen_ts, parent_to)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/ultisnips.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/ultisnips.py
new file mode 100644
index 0000000..9bb6068
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/parsing/ultisnips.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Parses a UltiSnips snippet definition and launches it into Vim."""
+
+from UltiSnips.snippet.parsing._base import tokenize_snippet_text, finalize, resolve_ambiguity
+from UltiSnips.snippet.parsing._lexer import EscapeCharToken, \
+    VisualToken, TransformationToken, TabStopToken, MirrorToken, \
+    PythonCodeToken, VimLCodeToken, ShellCodeToken
+from UltiSnips.text_objects import EscapedChar, Mirror, PythonCode, \
+    ShellCode, TabStop, Transformation, VimLCode, Visual
+
+_TOKEN_TO_TEXTOBJECT = {
+    EscapeCharToken: EscapedChar,
+    VisualToken: Visual,
+    ShellCodeToken: ShellCode,
+    PythonCodeToken: PythonCode,
+    VimLCodeToken: VimLCode,
+}
+
+__ALLOWED_TOKENS = [
+    EscapeCharToken, VisualToken, TransformationToken, TabStopToken,
+    MirrorToken, PythonCodeToken, VimLCodeToken, ShellCodeToken
+]
+
+
+def _create_transformations(all_tokens, seen_ts):
+    """Create the objects that need to know about tabstops."""
+    for parent, token in all_tokens:
+        if isinstance(token, TransformationToken):
+            if token.number not in seen_ts:
+                raise RuntimeError(
+                    'Tabstop %i is not known but is used by a Transformation'
+                    % token.number)
+            Transformation(parent, seen_ts[token.number], token)
+
+
+def parse_and_instantiate(parent_to, text, indent):
+    """Parses a snippet definition in UltiSnips format from 'text' assuming the
+    current 'indent'.
+
+    Will instantiate all the objects and link them as children to
+    parent_to. Will also put the initial text into Vim.
+
+    """
+    all_tokens, seen_ts = tokenize_snippet_text(parent_to, text, indent,
+                                                __ALLOWED_TOKENS, __ALLOWED_TOKENS, _TOKEN_TO_TEXTOBJECT)
+    resolve_ambiguity(all_tokens, seen_ts)
+    _create_transformations(all_tokens, seen_ts)
+    finalize(all_tokens, seen_ts, parent_to)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/__init__.py
new file mode 100644
index 0000000..08c20ac
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/__init__.py
@@ -0,0 +1,10 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Sources of snippet definitions."""
+
+from UltiSnips.snippet.source._base import SnippetSource
+from UltiSnips.snippet.source.added import AddedSnippetsSource
+from UltiSnips.snippet.source.file.snipmate import SnipMateFileSource
+from UltiSnips.snippet.source.file.ultisnips import UltiSnipsFileSource, \
+    find_all_snippet_files, find_snippet_files
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_base.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_base.py
new file mode 100644
index 0000000..93ba5b0
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_base.py
@@ -0,0 +1,97 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Base class for snippet sources."""
+
+from collections import defaultdict
+
+from UltiSnips.snippet.source._snippet_dictionary import SnippetDictionary
+
+
+class SnippetSource(object):
+
+    """See module docstring."""
+
+    def __init__(self):
+        self._snippets = defaultdict(SnippetDictionary)
+        self._extends = defaultdict(set)
+
+    def ensure(self, filetypes, cached):
+        """Update/reload the snippets in the source when needed.
+
+        It makes sure that the snippets are not outdated.
+
+        """
+
+    def loaded(self, filetypes):
+        return len(self._snippets) > 0
+
+    def _get_existing_deep_extends(self, base_filetypes):
+        """Helper for get all existing filetypes extended by base filetypes."""
+        deep_extends = self.get_deep_extends(base_filetypes)
+        return [ft for ft in deep_extends if ft in self._snippets]
+
+    def get_snippets(self, filetypes, before, possible, autotrigger_only,
+            visual_content):
+        """Returns the snippets for all 'filetypes' (in order) and their
+        parents matching the text 'before'. If 'possible' is true, a partial
+        match is enough. Base classes can override this method to provide means
+        of creating snippets on the fly.
+
+        Returns a list of SnippetDefinition s.
+
+        """
+        result = []
+        for ft in self._get_existing_deep_extends(filetypes):
+            snips = self._snippets[ft]
+            result.extend(snips.get_matching_snippets(before, possible,
+                                                      autotrigger_only,
+                                                      visual_content))
+        return result
+
+    def get_clear_priority(self, filetypes):
+        """Get maximum clearsnippets priority without arguments for specified
+        filetypes, if any.
+
+        It returns None if there are no clearsnippets.
+
+        """
+        pri = None
+        for ft in self._get_existing_deep_extends(filetypes):
+            snippets = self._snippets[ft]
+            if pri is None or snippets._clear_priority > pri:
+                pri = snippets._clear_priority
+        return pri
+
+    def get_cleared(self, filetypes):
+        """Get a set of cleared snippets marked by clearsnippets with arguments
+        for specified filetypes."""
+        cleared = {}
+        for ft in self._get_existing_deep_extends(filetypes):
+            snippets = self._snippets[ft]
+            for key, value in snippets._cleared.items():
+                if key not in cleared or value > cleared[key]:
+                    cleared[key] = value
+        return cleared
+
+    def update_extends(self, child_ft, parent_fts):
+        """Update the extending relation by given child filetype and its parent
+        filetypes."""
+        self._extends[child_ft].update(parent_fts)
+
+    def get_deep_extends(self, base_filetypes):
+        """Get a list of filetypes that is either directed or indirected
+        extended by given base filetypes.
+
+        Note that the returned list include the root filetype itself.
+
+        """
+        seen = set(base_filetypes)
+        todo_fts = list(set(base_filetypes))
+        while todo_fts:
+            todo_ft = todo_fts.pop()
+            unseen_extends = set(
+                ft for ft in self._extends[todo_ft] if ft not in seen)
+            seen.update(unseen_extends)
+            todo_fts.extend(unseen_extends)
+        return seen
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_snippet_dictionary.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_snippet_dictionary.py
new file mode 100644
index 0000000..d695902
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/_snippet_dictionary.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Implements a container for parsed snippets."""
+
+class SnippetDictionary(object):
+
+    """See module docstring."""
+
+    def __init__(self):
+        self._snippets = []
+        self._cleared = {}
+        self._clear_priority = float("-inf")
+
+    def add_snippet(self, snippet):
+        """Add 'snippet' to this dictionary."""
+        self._snippets.append(snippet)
+
+    def get_matching_snippets(self, trigger, potentially, autotrigger_only,
+                              visual_content):
+        """Returns all snippets matching the given trigger.
+
+        If 'potentially' is true, returns all that could_match().
+
+        If 'autotrigger_only' is true, function will return only snippets which
+        are marked with flag 'A' (should be automatically expanded without
+        trigger key press).
+        It's handled specially to avoid walking down the list of all snippets,
+        which can be very slow, because function will be called on each change
+        made in insert mode.
+
+        """
+        all_snippets = self._snippets
+        if autotrigger_only:
+            all_snippets = [s for s in all_snippets if s.has_option('A')]
+
+        if not potentially:
+            return [s for s in all_snippets if s.matches(trigger,
+                                                         visual_content)]
+        else:
+            return [s for s in all_snippets if s.could_match(trigger)]
+
+    def clear_snippets(self, priority, triggers):
+        """Clear the snippets by mark them as cleared.
+
+        If trigger is None, it updates the value of clear priority
+        instead.
+
+        """
+        if not triggers:
+            if self._clear_priority is None or priority > self._clear_priority:
+                self._clear_priority = priority
+        else:
+            for trigger in triggers:
+                if (trigger not in self._cleared or
+                        priority > self._cleared[trigger]):
+                    self._cleared[trigger] = priority
+
+    def __len__(self):
+        return len(self._snippets)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/added.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/added.py
new file mode 100644
index 0000000..c410946
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/added.py
@@ -0,0 +1,15 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Handles manually added snippets UltiSnips_Manager.add_snippet()."""
+
+from UltiSnips.snippet.source._base import SnippetSource
+
+
+class AddedSnippetsSource(SnippetSource):
+
+    """See module docstring."""
+
+    def add_snippet(self, ft, snippet):
+        """Adds the given 'snippet' for 'ft'."""
+        self._snippets[ft].add_snippet(snippet)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/__init__.py
new file mode 100644
index 0000000..6abf472
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/__init__.py
@@ -0,0 +1 @@
+"""Snippet sources that are file based."""
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_base.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_base.py
new file mode 100644
index 0000000..daa3f1d
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_base.py
@@ -0,0 +1,112 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Code to provide access to UltiSnips files from disk."""
+
+from collections import defaultdict
+import hashlib
+import os
+
+from UltiSnips import _vim
+from UltiSnips import compatibility
+from UltiSnips.snippet.source._base import SnippetSource
+
+
+def _hash_file(path):
+    """Returns a hashdigest of 'path'."""
+    if not os.path.isfile(path):
+        return False
+    return hashlib.sha1(open(path, 'rb').read()).hexdigest()
+
+
+class SnippetSyntaxError(RuntimeError):
+
+    """Thrown when a syntax error is found in a file."""
+
+    def __init__(self, filename, line_index, msg):
+        RuntimeError.__init__(self, '%s in %s:%d' % (
+            msg, filename, line_index))
+
+
+class SnippetFileSource(SnippetSource):
+
+    """Base class that abstracts away 'extends' info and file hashes."""
+
+    def __init__(self):
+        SnippetSource.__init__(self)
+        self._files_for_ft = defaultdict(set)
+        self._file_hashes = defaultdict(lambda: None)
+        self._ensure_cached = False
+
+    def ensure(self, filetypes, cached):
+        if cached and self._ensure_cached:
+            return
+
+        for ft in self.get_deep_extends(filetypes):
+            if self._needs_update(ft):
+                self._load_snippets_for(ft)
+
+        self._ensure_cached = True
+
+    def _get_all_snippet_files_for(self, ft):
+        """Returns a set of all files that define snippets for 'ft'."""
+        raise NotImplementedError()
+
+    def _parse_snippet_file(self, filedata, filename):
+        """Parses 'filedata' as a snippet file and yields events."""
+        raise NotImplementedError()
+
+    def _needs_update(self, ft):
+        """Returns true if any files for 'ft' have changed and must be
+        reloaded."""
+        existing_files = self._get_all_snippet_files_for(ft)
+        if existing_files != self._files_for_ft[ft]:
+            self._files_for_ft[ft] = existing_files
+            return True
+
+        for filename in self._files_for_ft[ft]:
+            if _hash_file(filename) != self._file_hashes[filename]:
+                return True
+
+        return False
+
+    def _load_snippets_for(self, ft):
+        """Load all snippets for the given 'ft'."""
+        if ft in self._snippets:
+            del self._snippets[ft]
+            del self._extends[ft]
+        try:
+            for fn in self._files_for_ft[ft]:
+                self._parse_snippets(ft, fn)
+        except:
+            del self._files_for_ft[ft]
+            raise
+        # Now load for the parents
+        for parent_ft in self.get_deep_extends([ft]):
+            if parent_ft != ft and self._needs_update(parent_ft):
+                self._load_snippets_for(parent_ft)
+
+    def _parse_snippets(self, ft, filename):
+        """Parse the 'filename' for the given 'ft' and watch it for changes in
+        the future."""
+        self._file_hashes[filename] = _hash_file(filename)
+        file_data = compatibility.open_ascii_file(filename, 'r').read()
+        for event, data in self._parse_snippet_file(file_data, filename):
+            if event == 'error':
+                msg, line_index = data
+                filename = _vim.eval("""fnamemodify(%s, ":~:.")""" %
+                                     _vim.escape(filename))
+                raise SnippetSyntaxError(filename, line_index, msg)
+            elif event == 'clearsnippets':
+                priority, triggers = data
+                self._snippets[ft].clear_snippets(priority, triggers)
+            elif event == 'extends':
+                # TODO(sirver): extends information is more global
+                # than one snippet source.
+                filetypes, = data
+                self.update_extends(ft, filetypes)
+            elif event == 'snippet':
+                snippet, = data
+                self._snippets[ft].add_snippet(snippet)
+            else:
+                assert False, 'Unhandled %s: %r' % (event, data)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_common.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_common.py
new file mode 100644
index 0000000..d33281b
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/_common.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Common code for snipMate and UltiSnips snippet files."""
+
+
+def handle_extends(tail, line_index):
+    """Handles an extends line in a snippet."""
+    if tail:
+        return 'extends', ([p.strip() for p in tail.split(',')],)
+    else:
+        return 'error', ("'extends' without file types", line_index)
+
+
+def handle_action(head, tail, line_index):
+    if tail:
+        action = tail.strip('"').replace(r'\"', '"').replace(r'\\\\', r'\\')
+        return head, (action,)
+    else:
+        return 'error', ("'{}' without specified action".format(head),
+            line_index)
+
+
+def handle_context(tail, line_index):
+    if tail:
+        return 'context', tail.strip('"').replace(r'\"', '"')\
+            .replace(r'\\\\', r'\\')
+    else:
+        return 'error', ("'context' without body", line_index)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/snipmate.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/snipmate.py
new file mode 100644
index 0000000..1791243
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/snipmate.py
@@ -0,0 +1,127 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Parses snipMate files."""
+
+import os
+import glob
+
+from UltiSnips import _vim
+from UltiSnips.snippet.definition import SnipMateSnippetDefinition
+from UltiSnips.snippet.source.file._base import SnippetFileSource
+from UltiSnips.snippet.source.file._common import handle_extends
+from UltiSnips.text import LineIterator, head_tail
+
+
+def _splitall(path):
+    """Split 'path' into all its components."""
+    # From http://my.safaribooksonline.com/book/programming/
+    # python/0596001673/files/pythoncook-chp-4-sect-16
+    allparts = []
+    while True:
+        parts = os.path.split(path)
+        if parts[0] == path:  # sentinel for absolute paths
+            allparts.insert(0, parts[0])
+            break
+        elif parts[1] == path:  # sentinel for relative paths
+            allparts.insert(0, parts[1])
+            break
+        else:
+            path = parts[0]
+            allparts.insert(0, parts[1])
+    return allparts
+
+
+def snipmate_files_for(ft):
+    """Returns all snipMate files we need to look at for 'ft'."""
+    if ft == 'all':
+        ft = '_'
+    patterns = [
+        '%s.snippets' % ft,
+        os.path.join(ft, '*.snippets'),
+        os.path.join(ft, '*.snippet'),
+        os.path.join(ft, '*/*.snippet'),
+    ]
+    ret = set()
+    for rtp in _vim.eval('&runtimepath').split(','):
+        path = os.path.realpath(os.path.expanduser(
+            os.path.join(rtp, 'snippets')))
+        for pattern in patterns:
+            for fn in glob.glob(os.path.join(path, pattern)):
+                ret.add(fn)
+    return ret
+
+
+def _parse_snippet_file(content, full_filename):
+    """Parses 'content' assuming it is a .snippet file and yields events."""
+    filename = full_filename[:-len('.snippet')]  # strip extension
+    segments = _splitall(filename)
+    segments = segments[segments.index('snippets') + 1:]
+    assert len(segments) in (2, 3)
+
+    trigger = segments[1]
+    description = segments[2] if 2 < len(segments) else ''
+
+    # Chomp \n if any.
+    if content and content.endswith(os.linesep):
+        content = content[:-len(os.linesep)]
+    yield 'snippet', (SnipMateSnippetDefinition(trigger, content,
+                                                description, full_filename),)
+
+
+def _parse_snippet(line, lines, filename):
+    """Parse a snippet defintions."""
+    start_line_index = lines.line_index
+    trigger, description = head_tail(line[len('snippet'):].lstrip())
+    content = ''
+    while True:
+        next_line = lines.peek()
+        if next_line is None:
+            break
+        if next_line.strip() and not next_line.startswith('\t'):
+            break
+        line = next(lines)
+        if line[0] == '\t':
+            line = line[1:]
+        content += line
+    content = content[:-1]  # Chomp the last newline
+    return 'snippet', (SnipMateSnippetDefinition(
+        trigger, content, description, '%s:%i' % (filename, start_line_index)),)
+
+
+def _parse_snippets_file(data, filename):
+    """Parse 'data' assuming it is a .snippets file.
+
+    Yields events in the file.
+
+    """
+    lines = LineIterator(data)
+    for line in lines:
+        if not line.strip():
+            continue
+
+        head, tail = head_tail(line)
+        if head == 'extends':
+            yield handle_extends(tail, lines.line_index)
+        elif head in 'snippet':
+            snippet = _parse_snippet(line, lines, filename)
+            if snippet is not None:
+                yield snippet
+        elif head and not head.startswith('#'):
+            yield 'error', ('Invalid line %r' % line.rstrip(), lines.line_index)
+
+
+class SnipMateFileSource(SnippetFileSource):
+
+    """Manages all snipMate snippet definitions found in rtp."""
+
+    def _get_all_snippet_files_for(self, ft):
+        return snipmate_files_for(ft)
+
+    def _parse_snippet_file(self, filedata, filename):
+        if filename.lower().endswith('snippet'):
+            for event, data in _parse_snippet_file(filedata, filename):
+                yield event, data
+        else:
+            for event, data in _parse_snippets_file(filedata, filename):
+                yield event, data
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/ultisnips.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/ultisnips.py
new file mode 100644
index 0000000..fb66dab
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet/source/file/ultisnips.py
@@ -0,0 +1,187 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Parsing of snippet files."""
+
+from collections import defaultdict
+import glob
+import os
+
+from UltiSnips import _vim
+from UltiSnips.snippet.definition import UltiSnipsSnippetDefinition
+from UltiSnips.snippet.source.file._base import SnippetFileSource
+from UltiSnips.snippet.source.file._common import handle_extends, \
+    handle_action, handle_context
+from UltiSnips.text import LineIterator, head_tail
+
+
+def find_snippet_files(ft, directory):
+    """Returns all matching snippet files for 'ft' in 'directory'."""
+    patterns = ['%s.snippets', '%s_*.snippets', os.path.join('%s', '*')]
+    ret = set()
+    directory = os.path.expanduser(directory)
+    for pattern in patterns:
+        for fn in glob.glob(os.path.join(directory, pattern % ft)):
+            ret.add(os.path.realpath(fn))
+    return ret
+
+
+def find_all_snippet_files(ft):
+    """Returns all snippet files matching 'ft' in the given runtime path
+    directory."""
+    if _vim.eval("exists('b:UltiSnipsSnippetDirectories')") == '1':
+        snippet_dirs = _vim.eval('b:UltiSnipsSnippetDirectories')
+    else:
+        snippet_dirs = _vim.eval('g:UltiSnipsSnippetDirectories')
+    if len(snippet_dirs) == 1 and os.path.isabs(snippet_dirs[0]):
+        check_dirs = ['']
+    else:
+        check_dirs = _vim.eval('&runtimepath').split(',')
+    patterns = ['%s.snippets', '%s_*.snippets', os.path.join('%s', '*')]
+    ret = set()
+    for rtp in check_dirs:
+        for snippet_dir in snippet_dirs:
+            if snippet_dir == 'snippets':
+                raise RuntimeError(
+                    "You have 'snippets' in UltiSnipsSnippetDirectories. This "
+                    'directory is reserved for snipMate snippets. Use another '
+                    'directory for UltiSnips snippets.')
+            pth = os.path.realpath(os.path.expanduser(
+                os.path.join(rtp, snippet_dir)))
+            for pattern in patterns:
+                for fn in glob.glob(os.path.join(pth, pattern % ft)):
+                    ret.add(fn)
+    return ret
+
+
+def _handle_snippet_or_global(
+    filename, line, lines, python_globals, priority, pre_expand, context
+):
+    """Parses the snippet that begins at the current line."""
+    start_line_index = lines.line_index
+    descr = ''
+    opts = ''
+
+    # Ensure this is a snippet
+    snip = line.split()[0]
+
+    # Get and strip options if they exist
+    remain = line[len(snip):].strip()
+    words = remain.split()
+
+    if len(words) > 2:
+        # second to last word ends with a quote
+        if '"' not in words[-1] and words[-2][-1] == '"':
+            opts = words[-1]
+            remain = remain[:-len(opts) - 1].rstrip()
+
+    if 'e' in opts and not context:
+        left = remain[:-1].rfind('"')
+        if left != -1 and left != 0:
+            context, remain = remain[left:].strip('"'), remain[:left]
+
+    # Get and strip description if it exists
+    remain = remain.strip()
+    if len(remain.split()) > 1 and remain[-1] == '"':
+        left = remain[:-1].rfind('"')
+        if left != -1 and left != 0:
+            descr, remain = remain[left:], remain[:left]
+
+    # The rest is the trigger
+    trig = remain.strip()
+    if len(trig.split()) > 1 or 'r' in opts:
+        if trig[0] != trig[-1]:
+            return 'error', ("Invalid multiword trigger: '%s'" % trig,
+                             lines.line_index)
+        trig = trig[1:-1]
+    end = 'end' + snip
+    content = ''
+
+    found_end = False
+    for line in lines:
+        if line.rstrip() == end:
+            content = content[:-1]  # Chomp the last newline
+            found_end = True
+            break
+        content += line
+
+    if not found_end:
+        return 'error', ("Missing 'endsnippet' for %r" %
+                         trig, lines.line_index)
+
+    if snip == 'global':
+        python_globals[trig].append(content)
+    elif snip == 'snippet':
+        definition = UltiSnipsSnippetDefinition(
+            priority, trig, content,
+            descr, opts, python_globals,
+            '%s:%i' % (filename, start_line_index),
+            context, pre_expand)
+        return 'snippet', (definition,)
+    else:
+        return 'error', ("Invalid snippet type: '%s'" % snip, lines.line_index)
+
+
+def _parse_snippets_file(data, filename):
+    """Parse 'data' assuming it is a snippet file.
+
+    Yields events in the file.
+
+    """
+
+    python_globals = defaultdict(list)
+    lines = LineIterator(data)
+    current_priority = 0
+    actions = {}
+    context = None
+    for line in lines:
+        if not line.strip():
+            continue
+
+        head, tail = head_tail(line)
+        if head in ('snippet', 'global'):
+            snippet = _handle_snippet_or_global(
+                filename, line, lines,
+                python_globals,
+                current_priority,
+                actions,
+                context
+            )
+
+            actions = {}
+            context = None
+            if snippet is not None:
+                yield snippet
+        elif head == 'extends':
+            yield handle_extends(tail, lines.line_index)
+        elif head == 'clearsnippets':
+            yield 'clearsnippets', (current_priority, tail.split())
+        elif head == 'context':
+            head, context, = handle_context(tail, lines.line_index)
+            if head == 'error':
+                yield (head, tail)
+        elif head == 'priority':
+            try:
+                current_priority = int(tail.split()[0])
+            except (ValueError, IndexError):
+                yield 'error', ('Invalid priority %r' % tail, lines.line_index)
+        elif head in ['pre_expand', 'post_expand', 'post_jump']:
+            head, tail = handle_action(head, tail, lines.line_index)
+            if head == 'error':
+                yield (head, tail)
+            else:
+                actions[head], = tail
+        elif head and not head.startswith('#'):
+            yield 'error', ('Invalid line %r' % line.rstrip(), lines.line_index)
+
+
+class UltiSnipsFileSource(SnippetFileSource):
+
+    """Manages all snippets definitions found in rtp for ultisnips."""
+
+    def _get_all_snippet_files_for(self, ft):
+        return find_all_snippet_files(ft)
+
+    def _parse_snippet_file(self, filedata, filename):
+        for event, data in _parse_snippets_file(filedata, filename):
+            yield event, data
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/snippet_manager.py b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet_manager.py
new file mode 100644
index 0000000..3d2a2a5
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/snippet_manager.py
@@ -0,0 +1,869 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Contains the SnippetManager facade used by all Vim Functions."""
+
+from collections import defaultdict
+from functools import wraps
+import os
+import platform
+import traceback
+import sys
+import vim
+import re
+from contextlib import contextmanager
+
+from UltiSnips import _vim
+from UltiSnips import err_to_scratch_buffer
+from UltiSnips._diff import diff, guess_edit
+from UltiSnips.compatibility import as_unicode
+from UltiSnips.position import Position
+from UltiSnips.snippet.definition import UltiSnipsSnippetDefinition
+from UltiSnips.snippet.source import UltiSnipsFileSource, SnipMateFileSource, \
+    find_all_snippet_files, find_snippet_files, AddedSnippetsSource
+from UltiSnips.text import escape
+from UltiSnips.vim_state import VimState, VisualContentPreserver
+from UltiSnips.buffer_proxy import use_proxy_buffer, suspend_proxy_edits
+
+
+def _ask_user(a, formatted):
+    """Asks the user using inputlist() and returns the selected element or
+    None."""
+    try:
+        rv = _vim.eval('inputlist(%s)' % _vim.escape(formatted))
+        if rv is None or rv == '0':
+            return None
+        rv = int(rv)
+        if rv > len(a):
+            rv = len(a)
+        return a[rv - 1]
+    except _vim.error:
+        # Likely "invalid expression", but might be translated. We have no way
+        # of knowing the exact error, therefore, we ignore all errors silently.
+        return None
+    except KeyboardInterrupt:
+        return None
+
+
+def _ask_snippets(snippets):
+    """Given a list of snippets, ask the user which one they want to use, and
+    return it."""
+    display = [as_unicode('%i: %s (%s)') % (i + 1, escape(s.description, '\\'),
+                                            escape(s.location, '\\')) for i, s in enumerate(snippets)]
+    return _ask_user(snippets, display)
+
+
+# TODO(sirver): This class is still too long. It should only contain public
+# facing methods, most of the private methods should be moved outside of it.
+class SnippetManager(object):
+
+    """The main entry point for all UltiSnips functionality.
+
+    All Vim functions call methods in this class.
+
+    """
+
+    def __init__(self, expand_trigger, forward_trigger, backward_trigger):
+        self.expand_trigger = expand_trigger
+        self.forward_trigger = forward_trigger
+        self.backward_trigger = backward_trigger
+        self._inner_state_up = False
+        self._supertab_keys = None
+
+        self._csnippets = []
+        self._added_buffer_filetypes = defaultdict(lambda: [])
+
+        self._vstate = VimState()
+        self._visual_content = VisualContentPreserver()
+
+        self._snippet_sources = []
+
+        self._snip_expanded_in_action = False
+        self._inside_action = False
+
+        self._last_change = ('', 0)
+
+        self._added_snippets_source = AddedSnippetsSource()
+        self.register_snippet_source('ultisnips_files', UltiSnipsFileSource())
+        self.register_snippet_source('added', self._added_snippets_source)
+
+        enable_snipmate = '1'
+        if _vim.eval("exists('g:UltiSnipsEnableSnipMate')") == '1':
+            enable_snipmate = _vim.eval('g:UltiSnipsEnableSnipMate')
+        if enable_snipmate == '1':
+            self.register_snippet_source('snipmate_files',
+                                         SnipMateFileSource())
+
+        self._should_update_textobjects = False
+        self._should_reset_visual = False
+
+        self._reinit()
+
+    @err_to_scratch_buffer.wrap
+    def jump_forwards(self):
+        """Jumps to the next tabstop."""
+        _vim.command('let g:ulti_jump_forwards_res = 1')
+        _vim.command('let &undolevels = &undolevels')
+        if not self._jump():
+            _vim.command('let g:ulti_jump_forwards_res = 0')
+            return self._handle_failure(self.forward_trigger)
+
+    @err_to_scratch_buffer.wrap
+    def jump_backwards(self):
+        """Jumps to the previous tabstop."""
+        _vim.command('let g:ulti_jump_backwards_res = 1')
+        _vim.command('let &undolevels = &undolevels')
+        if not self._jump(True):
+            _vim.command('let g:ulti_jump_backwards_res = 0')
+            return self._handle_failure(self.backward_trigger)
+
+    @err_to_scratch_buffer.wrap
+    def expand(self):
+        """Try to expand a snippet at the current position."""
+        _vim.command('let g:ulti_expand_res = 1')
+        if not self._try_expand():
+            _vim.command('let g:ulti_expand_res = 0')
+            self._handle_failure(self.expand_trigger)
+
+    @err_to_scratch_buffer.wrap
+    def expand_or_jump(self):
+        """This function is used for people who wants to have the same trigger
+        for expansion and forward jumping.
+
+        It first tries to expand a snippet, if this fails, it tries to
+        jump forward.
+
+        """
+        _vim.command('let g:ulti_expand_or_jump_res = 1')
+        rv = self._try_expand()
+        if not rv:
+            _vim.command('let g:ulti_expand_or_jump_res = 2')
+            rv = self._jump()
+        if not rv:
+            _vim.command('let g:ulti_expand_or_jump_res = 0')
+            self._handle_failure(self.expand_trigger)
+
+    @err_to_scratch_buffer.wrap
+    def snippets_in_current_scope(self, searchAll):
+        """Returns the snippets that could be expanded to Vim as a global
+        variable."""
+        before =  '' if searchAll else _vim.buf.line_till_cursor
+        snippets = self._snips(before, True)
+
+        # Sort snippets alphabetically
+        snippets.sort(key=lambda x: x.trigger)
+        for snip in snippets:
+            description = snip.description[snip.description.find(snip.trigger) +
+                                           len(snip.trigger) + 2:]
+
+            location = snip.location if snip.location else ''
+
+            key = as_unicode(snip.trigger)
+            description = as_unicode(description)
+
+            # remove surrounding "" or '' in snippet description if it exists
+            if len(description) > 2:
+                if (description[0] == description[-1] and
+                        description[0] in "'\""):
+                    description = description[1:-1]
+
+            _vim.command(as_unicode(
+                "let g:current_ulti_dict['{key}'] = '{val}'").format(
+                    key=key.replace("'", "''"),
+                    val=description.replace("'", "''")))
+
+            if searchAll:
+                _vim.command(as_unicode(
+                    ("let g:current_ulti_dict_info['{key}'] = {{"
+                     "'description': '{description}',"
+                     "'location': '{location}',"
+                     "}}")).format(
+                        key=key.replace("'", "''"),
+                        location=location.replace("'", "''"),
+                        description=description.replace("'", "''")))
+
+
+
+    @err_to_scratch_buffer.wrap
+    def list_snippets(self):
+        """Shows the snippets that could be expanded to the User and let her
+        select one."""
+        before = _vim.buf.line_till_cursor
+        snippets = self._snips(before, True)
+
+        if len(snippets) == 0:
+            self._handle_failure(self.backward_trigger)
+            return True
+
+        # Sort snippets alphabetically
+        snippets.sort(key=lambda x: x.trigger)
+
+        if not snippets:
+            return True
+
+        snippet = _ask_snippets(snippets)
+        if not snippet:
+            return True
+
+        self._do_snippet(snippet, before)
+
+        return True
+
+    @err_to_scratch_buffer.wrap
+    def add_snippet(self, trigger, value, description,
+                    options, ft='all', priority=0, context=None, actions={}):
+        """Add a snippet to the list of known snippets of the given 'ft'."""
+        self._added_snippets_source.add_snippet(ft,
+            UltiSnipsSnippetDefinition(priority, trigger, value,
+                                       description, options, {}, 'added',
+                                       context, actions))
+
+    @err_to_scratch_buffer.wrap
+    def expand_anon(
+        self, value, trigger='', description='', options='',
+        context=None, actions={}
+    ):
+        """Expand an anonymous snippet right here."""
+        before = _vim.buf.line_till_cursor
+        snip = UltiSnipsSnippetDefinition(0, trigger, value, description,
+                                          options, {}, '', context, actions)
+
+        if not trigger or snip.matches(before, self._visual_content):
+            self._do_snippet(snip, before)
+            return True
+        else:
+            return False
+
+    def register_snippet_source(self, name, snippet_source):
+        """Registers a new 'snippet_source' with the given 'name'.
+
+        The given class must be an instance of SnippetSource. This
+        source will be queried for snippets.
+
+        """
+        self._snippet_sources.append((name, snippet_source))
+
+    def unregister_snippet_source(self, name):
+        """Unregister the source with the given 'name'.
+
+        Does nothing if it is not registered.
+
+        """
+        for index, (source_name, _) in enumerate(self._snippet_sources):
+            if name == source_name:
+                self._snippet_sources = self._snippet_sources[:index] + \
+                    self._snippet_sources[index + 1:]
+                break
+
+    def get_buffer_filetypes(self):
+        return (self._added_buffer_filetypes[_vim.buf.number] +
+                _vim.buf.filetypes + ['all'])
+
+    def add_buffer_filetypes(self, ft):
+        buf_fts = self._added_buffer_filetypes[_vim.buf.number]
+        idx = -1
+        for ft in ft.split('.'):
+            ft = ft.strip()
+            if not ft:
+                continue
+            try:
+                idx = buf_fts.index(ft)
+            except ValueError:
+                self._added_buffer_filetypes[_vim.buf.number].insert(idx + 1, ft)
+                idx += 1
+
+    @err_to_scratch_buffer.wrap
+    def _cursor_moved(self):
+        """Called whenever the cursor moved."""
+        self._should_update_textobjects = False
+
+        if not self._csnippets and self._inner_state_up:
+            self._teardown_inner_state()
+        self._vstate.remember_position()
+        if _vim.eval('mode()') not in 'in':
+            return
+
+
+        if self._ignore_movements:
+            self._ignore_movements = False
+            return
+
+        if self._csnippets:
+            cstart = self._csnippets[0].start.line
+            cend = self._csnippets[0].end.line + \
+                self._vstate.diff_in_buffer_length
+            ct = _vim.buf[cstart:cend + 1]
+            lt = self._vstate.remembered_buffer
+            pos = _vim.buf.cursor
+
+            lt_span = [0, len(lt)]
+            ct_span = [0, len(ct)]
+            initial_line = cstart
+
+            # Cut down on lines searched for changes. Start from behind and
+            # remove all equal lines. Then do the same from the front.
+            if lt and ct:
+                while (lt[lt_span[1] - 1] == ct[ct_span[1] - 1] and
+                        self._vstate.ppos.line < initial_line + lt_span[1] - 1 and
+                        pos.line < initial_line + ct_span[1] - 1 and
+                        (lt_span[0] < lt_span[1]) and
+                        (ct_span[0] < ct_span[1])):
+                    ct_span[1] -= 1
+                    lt_span[1] -= 1
+                while (lt_span[0] < lt_span[1] and
+                       ct_span[0] < ct_span[1] and
+                       lt[lt_span[0]] == ct[ct_span[0]] and
+                       self._vstate.ppos.line >= initial_line and
+                       pos.line >= initial_line):
+                    ct_span[0] += 1
+                    lt_span[0] += 1
+                    initial_line += 1
+            ct_span[0] = max(0, ct_span[0] - 1)
+            lt_span[0] = max(0, lt_span[0] - 1)
+            initial_line = max(cstart, initial_line - 1)
+
+            lt = lt[lt_span[0]:lt_span[1]]
+            ct = ct[ct_span[0]:ct_span[1]]
+
+            try:
+                rv, es = guess_edit(initial_line, lt, ct, self._vstate)
+                if not rv:
+                    lt = '\n'.join(lt)
+                    ct = '\n'.join(ct)
+                    es = diff(lt, ct, initial_line)
+                self._csnippets[0].replay_user_edits(es, self._ctab)
+            except IndexError:
+                # Rather do nothing than throwing an error. It will be correct
+                # most of the time
+                pass
+
+        self._check_if_still_inside_snippet()
+        if self._csnippets:
+            self._csnippets[0].update_textobjects()
+            self._vstate.remember_buffer(self._csnippets[0])
+
+    def _setup_inner_state(self):
+        """Map keys and create autocommands that should only be defined when a
+        snippet is active."""
+        if self._inner_state_up:
+            return
+        if self.expand_trigger != self.forward_trigger:
+            _vim.command('inoremap <buffer> <silent> ' + self.forward_trigger +
+                         ' <C-R>=UltiSnips#JumpForwards()<cr>')
+            _vim.command('snoremap <buffer> <silent> ' + self.forward_trigger +
+                         ' <Esc>:call UltiSnips#JumpForwards()<cr>')
+        _vim.command('inoremap <buffer> <silent> ' + self.backward_trigger +
+                     ' <C-R>=UltiSnips#JumpBackwards()<cr>')
+        _vim.command('snoremap <buffer> <silent> ' + self.backward_trigger +
+                     ' <Esc>:call UltiSnips#JumpBackwards()<cr>')
+
+        # Setup the autogroups.
+        _vim.command('augroup UltiSnips')
+        _vim.command('autocmd!')
+        _vim.command('autocmd CursorMovedI * call UltiSnips#CursorMoved()')
+        _vim.command('autocmd CursorMoved * call UltiSnips#CursorMoved()')
+
+        _vim.command(
+            'autocmd InsertLeave * call UltiSnips#LeavingInsertMode()')
+
+        _vim.command('autocmd BufLeave * call UltiSnips#LeavingBuffer()')
+        _vim.command(
+            'autocmd CmdwinEnter * call UltiSnips#LeavingBuffer()')
+        _vim.command(
+            'autocmd CmdwinLeave * call UltiSnips#LeavingBuffer()')
+
+        # Also exit the snippet when we enter a unite complete buffer.
+        _vim.command('autocmd Filetype unite call UltiSnips#LeavingBuffer()')
+
+        _vim.command('augroup END')
+
+        _vim.command('silent doautocmd <nomodeline> User UltiSnipsEnterFirstSnippet')
+        self._inner_state_up = True
+
+    def _teardown_inner_state(self):
+        """Reverse _setup_inner_state."""
+        if not self._inner_state_up:
+            return
+        try:
+            _vim.command('silent doautocmd <nomodeline> User UltiSnipsExitLastSnippet')
+            if self.expand_trigger != self.forward_trigger:
+                _vim.command('iunmap <buffer> %s' % self.forward_trigger)
+                _vim.command('sunmap <buffer> %s' % self.forward_trigger)
+            _vim.command('iunmap <buffer> %s' % self.backward_trigger)
+            _vim.command('sunmap <buffer> %s' % self.backward_trigger)
+            _vim.command('augroup UltiSnips')
+            _vim.command('autocmd!')
+            _vim.command('augroup END')
+            self._inner_state_up = False
+        except _vim.error:
+            # This happens when a preview window was opened. This issues
+            # CursorMoved, but not BufLeave. We have no way to unmap, until we
+            # are back in our buffer
+            pass
+
+    @err_to_scratch_buffer.wrap
+    def _save_last_visual_selection(self):
+        """This is called when the expand trigger is pressed in visual mode.
+        Our job is to remember everything between '< and '> and pass it on to.
+
+        ${VISUAL} in case it will be needed.
+
+        """
+        self._visual_content.conserve()
+
+    def _leaving_buffer(self):
+        """Called when the user switches tabs/windows/buffers.
+
+        It basically means that all snippets must be properly
+        terminated.
+
+        """
+        while len(self._csnippets):
+            self._current_snippet_is_done()
+        self._reinit()
+
+    def _reinit(self):
+        """Resets transient state."""
+        self._ctab = None
+        self._ignore_movements = False
+
+    def _check_if_still_inside_snippet(self):
+        """Checks if the cursor is outside of the current snippet."""
+        if self._cs and (
+            not self._cs.start <= _vim.buf.cursor <= self._cs.end
+        ):
+            self._current_snippet_is_done()
+            self._reinit()
+            self._check_if_still_inside_snippet()
+
+    def _current_snippet_is_done(self):
+        """The current snippet should be terminated."""
+        self._csnippets.pop()
+        if not self._csnippets:
+            self._teardown_inner_state()
+
+    def _jump(self, backwards=False):
+        """Helper method that does the actual jump."""
+        if self._should_update_textobjects:
+            self._should_reset_visual = False
+            self._cursor_moved()
+
+        # we need to set 'onemore' there, because of limitations of the vim
+        # API regarding cursor movements; without that test
+        # 'CanExpandAnonSnippetInJumpActionWhileSelected' will fail
+        with _vim.toggle_opt('ve', 'onemore'):
+            jumped = False
+
+            # We need to remember current snippets stack here because of
+            # post-jump action on the last tabstop should be able to access
+            # snippet instance which is ended just now.
+            stack_for_post_jump = self._csnippets[:]
+
+            # If next tab has length 1 and the distance between itself and
+            # self._ctab is 1 then there is 1 less CursorMove events.  We
+            # cannot ignore next movement in such case.
+            ntab_short_and_near = False
+
+            if self._cs:
+                snippet_for_action = self._cs
+            elif stack_for_post_jump:
+                snippet_for_action = stack_for_post_jump[-1]
+            else:
+                snippet_for_action = None
+
+            if self._cs:
+                ntab = self._cs.select_next_tab(backwards)
+                if ntab:
+                    if self._cs.snippet.has_option('s'):
+                        lineno = _vim.buf.cursor.line
+                        _vim.buf[lineno] = _vim.buf[lineno].rstrip()
+                    _vim.select(ntab.start, ntab.end)
+                    jumped = True
+                    if (self._ctab is not None
+                            and ntab.start - self._ctab.end == Position(0, 1)
+                            and ntab.end - ntab.start == Position(0, 1)):
+                        ntab_short_and_near = True
+
+                    self._ctab = ntab
+
+                    # Run interpolations again to update new placeholder
+                    # values, binded to currently newly jumped placeholder.
+                    self._visual_content.conserve_placeholder(self._ctab)
+                    self._cs.current_placeholder = \
+                        self._visual_content.placeholder
+                    self._should_reset_visual = False
+                    self._csnippets[0].update_textobjects()
+                    self._vstate.remember_buffer(self._csnippets[0])
+
+                    if ntab.number == 0 and self._csnippets:
+                        self._current_snippet_is_done()
+                else:
+                    # This really shouldn't happen, because a snippet should
+                    # have been popped when its final tabstop was used.
+                    # Cleanup by removing current snippet and recursing.
+                    self._current_snippet_is_done()
+                    jumped = self._jump(backwards)
+
+            if jumped:
+                if self._ctab:
+                    self._vstate.remember_position()
+                    self._vstate.remember_unnamed_register(self._ctab.current_text)
+                if not ntab_short_and_near:
+                    self._ignore_movements = True
+
+            if len(stack_for_post_jump) > 0 and ntab is not None:
+                with use_proxy_buffer(stack_for_post_jump, self._vstate):
+                    snippet_for_action.snippet.do_post_jump(
+                        ntab.number,
+                        -1 if backwards else 1,
+                        stack_for_post_jump,
+                        snippet_for_action
+                    )
+
+        return jumped
+
+    def _leaving_insert_mode(self):
+        """Called whenever we leave the insert mode."""
+        self._vstate.restore_unnamed_register()
+
+    def _handle_failure(self, trigger):
+        """Mainly make sure that we play well with SuperTab."""
+        if trigger.lower() == '<tab>':
+            feedkey = '\\' + trigger
+        elif trigger.lower() == '<s-tab>':
+            feedkey = '\\' + trigger
+        else:
+            feedkey = None
+        mode = 'n'
+        if not self._supertab_keys:
+            if _vim.eval("exists('g:SuperTabMappingForward')") != '0':
+                self._supertab_keys = (
+                    _vim.eval('g:SuperTabMappingForward'),
+                    _vim.eval('g:SuperTabMappingBackward'),
+                )
+            else:
+                self._supertab_keys = ['', '']
+
+        for idx, sttrig in enumerate(self._supertab_keys):
+            if trigger.lower() == sttrig.lower():
+                if idx == 0:
+                    feedkey = r"\<Plug>SuperTabForward"
+                    mode = 'n'
+                elif idx == 1:
+                    feedkey = r"\<Plug>SuperTabBackward"
+                    mode = 'p'
+                # Use remap mode so SuperTab mappings will be invoked.
+                break
+
+        if (feedkey == r"\<Plug>SuperTabForward" or
+                feedkey == r"\<Plug>SuperTabBackward"):
+            _vim.command('return SuperTab(%s)' % _vim.escape(mode))
+        elif feedkey:
+            _vim.command('return %s' % _vim.escape(feedkey))
+
+    def _snips(self, before, partial, autotrigger_only=False):
+        """Returns all the snippets for the given text before the cursor.
+
+        If partial is True, then get also return partial matches.
+
+        """
+        filetypes = self.get_buffer_filetypes()[::-1]
+        matching_snippets = defaultdict(list)
+        clear_priority = None
+        cleared = {}
+        for _, source in self._snippet_sources:
+            source.ensure(filetypes, cached=autotrigger_only)
+
+        # Collect cleared information from sources.
+        for _, source in self._snippet_sources:
+            sclear_priority = source.get_clear_priority(filetypes)
+            if sclear_priority is not None and (clear_priority is None
+                                                or sclear_priority > clear_priority):
+                clear_priority = sclear_priority
+            for key, value in source.get_cleared(filetypes).items():
+                if key not in cleared or value > cleared[key]:
+                    cleared[key] = value
+
+        for _, source in self._snippet_sources:
+            possible_snippets = source.get_snippets(
+                filetypes,
+                before,
+                partial,
+                autotrigger_only,
+                self._visual_content
+            )
+
+            for snippet in possible_snippets:
+                if ((clear_priority is None or snippet.priority > clear_priority)
+                        and (snippet.trigger not in cleared or
+                             snippet.priority > cleared[snippet.trigger])):
+                    matching_snippets[snippet.trigger].append(snippet)
+        if not matching_snippets:
+            return []
+
+        # Now filter duplicates and only keep the one with the highest
+        # priority.
+        snippets = []
+        for snippets_with_trigger in matching_snippets.values():
+            highest_priority = max(s.priority for s in snippets_with_trigger)
+            snippets.extend(s for s in snippets_with_trigger
+                            if s.priority == highest_priority)
+
+        # For partial matches we are done, but if we want to expand a snippet,
+        # we have to go over them again and only keep those with the maximum
+        # priority.
+        if partial:
+            return snippets
+
+        highest_priority = max(s.priority for s in snippets)
+        return [s for s in snippets if s.priority == highest_priority]
+
+    def _do_snippet(self, snippet, before):
+        """Expands the given snippet, and handles everything that needs to be
+        done with it."""
+        self._setup_inner_state()
+
+        self._snip_expanded_in_action = False
+        self._should_update_textobjects = False
+
+        # Adjust before, maybe the trigger is not the complete word
+        text_before = before
+        if snippet.matched:
+            text_before = before[:-len(snippet.matched)]
+
+        with use_proxy_buffer(self._csnippets, self._vstate):
+            with self._action_context():
+                cursor_set_in_action = snippet.do_pre_expand(
+                    self._visual_content.text,
+                    self._csnippets
+                )
+
+        if cursor_set_in_action:
+            text_before = _vim.buf.line_till_cursor
+            before = _vim.buf.line_till_cursor
+
+        with suspend_proxy_edits():
+            if self._cs:
+                start = Position(_vim.buf.cursor.line, len(text_before))
+                end = Position(_vim.buf.cursor.line, len(before))
+
+                # If cursor is set in pre-action, then action was modified
+                # cursor line, in that case we do not need to do any edits, it
+                # can break snippet
+                if not cursor_set_in_action:
+                    # It could be that our trigger contains the content of
+                    # TextObjects in our containing snippet. If this is indeed
+                    # the case, we have to make sure that those are properly
+                    # killed. We do this by pretending that the user deleted
+                    # and retyped the text that our trigger matched.
+                    edit_actions = [
+                        ('D', start.line, start.col, snippet.matched),
+                        ('I', start.line, start.col, snippet.matched),
+                    ]
+                    self._csnippets[0].replay_user_edits(edit_actions)
+
+                si = snippet.launch(text_before, self._visual_content,
+                    self._cs.find_parent_for_new_to(start),
+                    start, end
+                )
+            else:
+                start = Position(_vim.buf.cursor.line, len(text_before))
+                end = Position(_vim.buf.cursor.line, len(before))
+                si = snippet.launch(text_before, self._visual_content,
+                                    None, start, end)
+
+            self._visual_content.reset()
+            self._csnippets.append(si)
+
+            si.update_textobjects()
+
+            with use_proxy_buffer(self._csnippets, self._vstate):
+                with self._action_context():
+                    snippet.do_post_expand(
+                        si._start, si._end, self._csnippets
+                    )
+
+            self._vstate.remember_buffer(self._csnippets[0])
+
+            if not self._snip_expanded_in_action:
+                self._jump()
+            elif self._cs.current_text != '':
+                self._jump()
+            else:
+                self._current_snippet_is_done()
+
+            if self._inside_action:
+                self._snip_expanded_in_action = True
+
+
+    def _try_expand(self, autotrigger_only=False):
+        """Try to expand a snippet in the current place."""
+        before = _vim.buf.line_till_cursor
+        snippets = self._snips(before, False, autotrigger_only)
+        if snippets:
+            # prefer snippets with context if any
+            snippets_with_context = [s for s in snippets if s.context]
+            if snippets_with_context:
+                snippets = snippets_with_context
+        if not snippets:
+            # No snippet found
+            return False
+        _vim.command('let &undolevels = &undolevels')
+        if len(snippets) == 1:
+            snippet = snippets[0]
+        else:
+            snippet = _ask_snippets(snippets)
+            if not snippet:
+                return True
+        self._do_snippet(snippet, before)
+        _vim.command('let &undolevels = &undolevels')
+        return True
+
+    @property
+    def _cs(self):
+        """The current snippet or None."""
+        if not len(self._csnippets):
+            return None
+        return self._csnippets[-1]
+
+    def _file_to_edit(self, requested_ft, bang):
+        """Returns a file to be edited for the given requested_ft.
+
+        If 'bang' is
+        empty only private files in g:UltiSnipsSnippetsDir are considered,
+        otherwise all files are considered and the user gets to choose.
+
+        """
+
+        snippet_dir = ''
+        if _vim.eval("exists('g:UltiSnipsSnippetsDir')") == '1':
+            dir = _vim.eval('g:UltiSnipsSnippetsDir')
+            file = self._get_file_to_edit(dir, requested_ft, bang)
+            if file:
+                return file
+            snippet_dir = dir
+
+        if _vim.eval("exists('g:UltiSnipsSnippetDirectories')") == '1':
+            dirs = _vim.eval('g:UltiSnipsSnippetDirectories')
+            for dir in dirs:
+                file = self._get_file_to_edit(dir, requested_ft, bang)
+                if file:
+                    return file
+                if not snippet_dir:
+                    snippet_dir = dir
+
+        home = _vim.eval('$HOME')
+        if platform.system() == 'Windows':
+            dir = os.path.join(home, 'vimfiles', 'UltiSnips')
+            file = self._get_file_to_edit(dir, requested_ft, bang)
+            if file:
+                return file
+            if not snippet_dir:
+                snippet_dir = dir
+
+        if _vim.eval("has('nvim')") == '1':
+            xdg_home_config = _vim.eval('$XDG_CONFIG_HOME') or os.path.join(home, ".config")
+            dir = os.path.join(xdg_home_config, 'nvim', 'UltiSnips')
+            file = self._get_file_to_edit(dir, requested_ft, bang)
+            if file:
+                return file
+            if not snippet_dir:
+                snippet_dir = dir
+
+        dir = os.path.join(home, '.vim', 'UltiSnips')
+        file = self._get_file_to_edit(dir, requested_ft, bang)
+        if file:
+            return file
+        if not snippet_dir:
+            snippet_dir = dir
+
+        return self._get_file_to_edit(
+            snippet_dir, requested_ft, bang, True
+        )
+
+    def _get_file_to_edit(self, snippet_dir, requested_ft, bang,
+                          allow_empty=False): # pylint: disable=no-self-use
+        potentials = set()
+        filetypes = []
+        if requested_ft:
+            filetypes.append(requested_ft)
+        else:
+            if bang:
+                filetypes.extend(self.get_buffer_filetypes())
+            else:
+                filetypes.append(self.get_buffer_filetypes()[0])
+
+        for ft in filetypes:
+            potentials.update(find_snippet_files(ft, snippet_dir))
+            potentials.add(os.path.join(snippet_dir,
+                                        ft + '.snippets'))
+            if bang:
+                potentials.update(find_all_snippet_files(ft))
+
+        potentials = set(os.path.realpath(os.path.expanduser(p))
+                         for p in potentials)
+
+        if len(potentials) > 1:
+            files = sorted(potentials)
+            formatted = [as_unicode('%i: %s') % (i, escape(fn, '\\')) for
+                         i, fn in enumerate(files, 1)]
+            file_to_edit = _ask_user(files, formatted)
+            if file_to_edit is None:
+                return ''
+        else:
+            file_to_edit = potentials.pop()
+
+        if not allow_empty and not os.path.exists(file_to_edit):
+            return ''
+
+        dirname = os.path.dirname(file_to_edit)
+        if not os.path.exists(dirname):
+            os.makedirs(dirname)
+
+        return file_to_edit
+
+    @contextmanager
+    def _action_context(self):
+        try:
+            old_flag = self._inside_action
+            self._inside_action = True
+            yield
+        finally:
+            self._inside_action = old_flag
+
+    @err_to_scratch_buffer.wrap
+    def _track_change(self):
+        self._should_update_textobjects = True
+
+        try:
+            inserted_char = _vim.as_unicode(_vim.eval('v:char'))
+        except UnicodeDecodeError:
+            return
+
+        if sys.version_info >= (3, 0):
+            if isinstance(inserted_char, bytes):
+                return
+        else:
+            if not isinstance(inserted_char, unicode):
+                return
+
+        try:
+            if inserted_char == '':
+                before = _vim.buf.line_till_cursor
+
+                if before and before[-1] == self._last_change[0] or \
+                        self._last_change[1] != vim.current.window.cursor[0]:
+                    self._try_expand(autotrigger_only=True)
+        finally:
+            self._last_change = (inserted_char, vim.current.window.cursor[0])
+
+        if self._should_reset_visual and self._visual_content.mode == '':
+            self._visual_content.reset()
+
+        self._should_reset_visual = True
+
+
+UltiSnips_Manager = SnippetManager(  # pylint:disable=invalid-name
+    vim.eval('g:UltiSnipsExpandTrigger'),
+    vim.eval('g:UltiSnipsJumpForwardTrigger'),
+    vim.eval('g:UltiSnipsJumpBackwardTrigger'))
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/test_diff.py b/vim/plugins/ultisnips/pythonx/UltiSnips/test_diff.py
new file mode 100644
index 0000000..6d1d4f4
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/test_diff.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+# pylint: skip-file
+
+import unittest
+
+from _diff import diff, guess_edit
+from position import Position
+
+
+def transform(a, cmds):
+    buf = a.split('\n')
+
+    for cmd in cmds:
+        ctype, line, col, char = cmd
+        if ctype == 'D':
+            if char != '\n':
+                buf[line] = buf[line][:col] + buf[line][col + len(char):]
+            else:
+                buf[line] = buf[line] + buf[line + 1]
+                del buf[line + 1]
+        elif ctype == 'I':
+            buf[line] = buf[line][:col] + char + buf[line][col:]
+        buf = '\n'.join(buf).split('\n')
+    return '\n'.join(buf)
+
+
+import unittest
+
+# Test Guessing  {{{
+
+
+class _BaseGuessing(object):
+
+    def runTest(self):
+        rv, es = guess_edit(
+            self.initial_line, self.a, self.b, Position(*self.ppos), Position(*self.pos))
+        self.assertEqual(rv, True)
+        self.assertEqual(self.wanted, es)
+
+
+class TestGuessing_Noop0(_BaseGuessing, unittest.TestCase):
+    a, b = [], []
+    initial_line = 0
+    ppos, pos = (0, 6), (0, 7)
+    wanted = ()
+
+
+class TestGuessing_InsertOneChar(_BaseGuessing, unittest.TestCase):
+    a, b = ['Hello  World'], ['Hello   World']
+    initial_line = 0
+    ppos, pos = (0, 6), (0, 7)
+    wanted = (
+        ('I', 0, 6, ' '),
+    )
+
+
+class TestGuessing_InsertOneChar1(_BaseGuessing, unittest.TestCase):
+    a, b = ['Hello  World'], ['Hello   World']
+    initial_line = 0
+    ppos, pos = (0, 7), (0, 8)
+    wanted = (
+        ('I', 0, 7, ' '),
+    )
+
+
+class TestGuessing_BackspaceOneChar(_BaseGuessing, unittest.TestCase):
+    a, b = ['Hello  World'], ['Hello World']
+    initial_line = 0
+    ppos, pos = (0, 7), (0, 6)
+    wanted = (
+        ('D', 0, 6, ' '),
+    )
+
+
+class TestGuessing_DeleteOneChar(_BaseGuessing, unittest.TestCase):
+    a, b = ['Hello  World'], ['Hello World']
+    initial_line = 0
+    ppos, pos = (0, 5), (0, 5)
+    wanted = (
+        ('D', 0, 5, ' '),
+    )
+
+# End: Test Guessing  }}}
+
+
+class _Base(object):
+
+    def runTest(self):
+        es = diff(self.a, self.b)
+        tr = transform(self.a, es)
+        self.assertEqual(self.b, tr)
+        self.assertEqual(self.wanted, es)
+
+
+class TestEmptyString(_Base, unittest.TestCase):
+    a, b = '', ''
+    wanted = ()
+
+
+class TestAllMatch(_Base, unittest.TestCase):
+    a, b = 'abcdef', 'abcdef'
+    wanted = ()
+
+
+class TestLotsaNewlines(_Base, unittest.TestCase):
+    a, b = 'Hello', 'Hello\nWorld\nWorld\nWorld'
+    wanted = (
+        ('I', 0, 5, '\n'),
+        ('I', 1, 0, 'World'),
+        ('I', 1, 5, '\n'),
+        ('I', 2, 0, 'World'),
+        ('I', 2, 5, '\n'),
+        ('I', 3, 0, 'World'),
+    )
+
+
+class TestCrash(_Base, unittest.TestCase):
+    a = 'hallo Blah mitte=sdfdsfsd\nhallo kjsdhfjksdhfkjhsdfkh mittekjshdkfhkhsdfdsf'
+    b = 'hallo Blah mitte=sdfdsfsd\nhallo b mittekjshdkfhkhsdfdsf'
+    wanted = (
+        ('D', 1, 6, 'kjsdhfjksdhfkjhsdfkh'),
+        ('I', 1, 6, 'b'),
+    )
+
+
+class TestRealLife(_Base, unittest.TestCase):
+    a = 'hallo End Beginning'
+    b = 'hallo End t'
+    wanted = (
+        ('D', 0, 10, 'Beginning'),
+        ('I', 0, 10, 't'),
+    )
+
+
+class TestRealLife1(_Base, unittest.TestCase):
+    a = 'Vorne hallo Hinten'
+    b = 'Vorne hallo  Hinten'
+    wanted = (
+        ('I', 0, 11, ' '),
+    )
+
+
+class TestWithNewline(_Base, unittest.TestCase):
+    a = 'First Line\nSecond Line'
+    b = 'n'
+    wanted = (
+        ('D', 0, 0, 'First Line'),
+        ('D', 0, 0, '\n'),
+        ('D', 0, 0, 'Second Line'),
+        ('I', 0, 0, 'n'),
+    )
+
+
+class TestCheapDelete(_Base, unittest.TestCase):
+    a = 'Vorne hallo Hinten'
+    b = 'Vorne Hinten'
+    wanted = (
+        ('D', 0, 5, ' hallo'),
+    )
+
+
+class TestNoSubstring(_Base, unittest.TestCase):
+    a, b = 'abc', 'def'
+    wanted = (
+        ('D', 0, 0, 'abc'),
+        ('I', 0, 0, 'def'),
+    )
+
+
+class TestCommonCharacters(_Base, unittest.TestCase):
+    a, b = 'hasomelongertextbl', 'hol'
+    wanted = (
+        ('D', 0, 1, 'asomelongertextb'),
+        ('I', 0, 1, 'o'),
+    )
+
+
+class TestUltiSnipsProblem(_Base, unittest.TestCase):
+    a = 'this is it this is it this is it'
+    b = 'this is it a this is it'
+    wanted = (
+        ('D', 0, 11, 'this is it'),
+        ('I', 0, 11, 'a'),
+    )
+
+
+class MatchIsTooCheap(_Base, unittest.TestCase):
+    a = 'stdin.h'
+    b = 's'
+    wanted = (
+        ('D', 0, 1, 'tdin.h'),
+    )
+
+
+class MultiLine(_Base, unittest.TestCase):
+    a = 'hi first line\nsecond line first line\nsecond line world'
+    b = 'hi first line\nsecond line k world'
+
+    wanted = (
+        ('D', 1, 12, 'first line'),
+        ('D', 1, 12, '\n'),
+        ('D', 1, 12, 'second line'),
+        ('I', 1, 12, 'k'),
+    )
+
+
+if __name__ == '__main__':
+    unittest.main()
+    # k = TestEditScript()
+    # unittest.TextTestRunner().run(k)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/test_position.py b/vim/plugins/ultisnips/pythonx/UltiSnips/test_position.py
new file mode 100644
index 0000000..f980f4b
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/test_position.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+# pylint: skip-file
+
+import unittest
+
+from position import Position
+
+
+class _MPBase(object):
+
+    def runTest(self):
+        obj = Position(*self.obj)
+        for pivot, delta, wanted in self.steps:
+            obj.move(Position(*pivot), Position(*delta))
+            self.assertEqual(Position(*wanted), obj)
+
+
+class MovePosition_DelSameLine(_MPBase, unittest.TestCase):
+    # hello wor*ld -> h*ld -> hl*ld
+    obj = (0, 9)
+    steps = (
+        ((0, 1), (0, -8), (0, 1)),
+        ((0, 1), (0, 1), (0, 2)),
+    )
+
+
+class MovePosition_DelSameLine1(_MPBase, unittest.TestCase):
+    # hel*lo world -> hel*world -> hel*worl
+    obj = (0, 3)
+    steps = (
+        ((0, 4), (0, -3), (0, 3)),
+        ((0, 8), (0, -1), (0, 3)),
+    )
+
+
+class MovePosition_InsSameLine1(_MPBase, unittest.TestCase):
+    # hel*lo world -> hel*woresld
+    obj = (0, 3)
+    steps = (
+        ((0, 4), (0, -3), (0, 3)),
+        ((0, 6), (0, 2), (0, 3)),
+        ((0, 8), (0, -1), (0, 3))
+    )
+
+
+class MovePosition_InsSameLine2(_MPBase, unittest.TestCase):
+    # hello wor*ld -> helesdlo wor*ld
+    obj = (0, 9)
+    steps = (
+        ((0, 3), (0, 3), (0, 12)),
+    )
+
+
+class MovePosition_DelSecondLine(_MPBase, unittest.TestCase):
+    # hello world. sup   hello world.*a, was
+    # *a, was            ach nix
+    # ach nix
+    obj = (1, 0)
+    steps = (
+        ((0, 12), (0, -4), (1, 0)),
+        ((0, 12), (-1, 0), (0, 12)),
+    )
+
+
+class MovePosition_DelSecondLine1(_MPBase, unittest.TestCase):
+    # hello world. sup
+    # a, *was
+    # ach nix
+    # hello world.a*was
+    # ach nix
+    obj = (1, 3)
+    steps = (
+        ((0, 12), (0, -4), (1, 3)),
+        ((0, 12), (-1, 0), (0, 15)),
+        ((0, 12), (0, -3), (0, 12)),
+        ((0, 12), (0, 1), (0, 13)),
+    )
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text.py
new file mode 100644
index 0000000..165cddd
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text.py
@@ -0,0 +1,84 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Utilities to deal with text."""
+
+
+def unescape(text):
+    """Removes '\\' escaping from 'text'."""
+    rv = ''
+    i = 0
+    while i < len(text):
+        if i + 1 < len(text) and text[i] == '\\':
+            rv += text[i + 1]
+            i += 1
+        else:
+            rv += text[i]
+        i += 1
+    return rv
+
+
+def escape(text, chars):
+    """Escapes all characters in 'chars' in text using backspaces."""
+    rv = ''
+    for char in text:
+        if char in chars:
+            rv += '\\'
+        rv += char
+    return rv
+
+
+def fill_in_whitespace(text):
+    """Returns 'text' with escaped whitespace replaced through whitespaces."""
+    text = text.replace(r"\n", '\n')
+    text = text.replace(r"\t", '\t')
+    text = text.replace(r"\r", '\r')
+    text = text.replace(r"\a", '\a')
+    text = text.replace(r"\b", '\b')
+    return text
+
+
+def head_tail(line):
+    """Returns the first word in 'line' and the rest of 'line' or None if the
+    line is too short."""
+    generator = (t.strip() for t in line.split(None, 1))
+    head = next(generator).strip()
+    tail = ''
+    try:
+        tail = next(generator).strip()
+    except StopIteration:
+        pass
+    return head, tail
+
+
+class LineIterator(object):
+
+    """Convenience class that keeps track of line numbers in files."""
+
+    def __init__(self, text):
+        self._line_index = -1
+        self._lines = list(text.splitlines(True))
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        """Returns the next line."""
+        if self._line_index + 1 < len(self._lines):
+            self._line_index += 1
+            return self._lines[self._line_index]
+        raise StopIteration()
+    next = __next__  # for python2
+
+    @property
+    def line_index(self):
+        """The 1 based line index in the current file."""
+        return self._line_index + 1
+
+    def peek(self):
+        """Returns the next line (if there is any, otherwise None) without
+        advancing the iterator."""
+        try:
+            return self._lines[self._line_index + 1]
+        except IndexError:
+            return None
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/__init__.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/__init__.py
new file mode 100644
index 0000000..97e2252
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/__init__.py
@@ -0,0 +1,14 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Public facing classes for TextObjects."""
+
+from UltiSnips.text_objects._escaped_char import EscapedChar
+from UltiSnips.text_objects._mirror import Mirror
+from UltiSnips.text_objects._python_code import PythonCode
+from UltiSnips.text_objects._shell_code import ShellCode
+from UltiSnips.text_objects._snippet_instance import SnippetInstance
+from UltiSnips.text_objects._tabstop import TabStop
+from UltiSnips.text_objects._transformation import Transformation
+from UltiSnips.text_objects._viml_code import VimLCode
+from UltiSnips.text_objects._visual import Visual
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_base.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_base.py
new file mode 100644
index 0000000..6ee1745
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_base.py
@@ -0,0 +1,386 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Base classes for all text objects."""
+
+from UltiSnips import _vim
+from UltiSnips.position import Position
+
+
+def _calc_end(text, start):
+    """Calculate the end position of the 'text' starting at 'start."""
+    if len(text) == 1:
+        new_end = start + Position(0, len(text[0]))
+    else:
+        new_end = Position(start.line + len(text) - 1, len(text[-1]))
+    return new_end
+
+
+def _text_to_vim(start, end, text):
+    """Copy the given text to the current buffer, overwriting the span 'start'
+    to 'end'."""
+    lines = text.split('\n')
+
+    new_end = _calc_end(lines, start)
+
+    before = _vim.buf[start.line][:start.col]
+    after = _vim.buf[end.line][end.col:]
+
+    new_lines = []
+    if len(lines):
+        new_lines.append(before + lines[0])
+        new_lines.extend(lines[1:])
+        new_lines[-1] += after
+    _vim.buf[start.line:end.line + 1] = new_lines
+
+    # Open any folds this might have created
+    _vim.buf.cursor = start
+    _vim.command('normal! zv')
+
+    return new_end
+
+# These classes use their subclasses a lot and we really do not want to expose
+# their functions more globally.
+# pylint: disable=protected-access
+
+
+class TextObject(object):
+
+    """Represents any object in the text that has a span in any ways."""
+
+    def __init__(self, parent, token_or_start, end=None,
+                 initial_text='', tiebreaker=None):
+        self._parent = parent
+
+        if end is not None:  # Took 4 arguments
+            self._start = token_or_start
+            self._end = end
+            self._initial_text = initial_text
+        else:  # Initialize from token
+            self._start = token_or_start.start
+            self._end = token_or_start.end
+            self._initial_text = token_or_start.initial_text
+        self._tiebreaker = tiebreaker or Position(
+            self._start.line, self._end.line)
+        if parent is not None:
+            parent._add_child(self)
+
+    def _move(self, pivot, diff):
+        """Move this object by 'diff' while 'pivot' is the point of change."""
+        self._start.move(pivot, diff)
+        self._end.move(pivot, diff)
+
+    def __lt__(self, other):
+        me_tuple = (self.start.line, self.start.col,
+                    self._tiebreaker.line, self._tiebreaker.col)
+        other_tuple = (other._start.line, other._start.col,
+                       other._tiebreaker.line, other._tiebreaker.col)
+        return me_tuple < other_tuple
+
+    def __le__(self, other):
+        me_tuple = (self._start.line, self._start.col,
+                    self._tiebreaker.line, self._tiebreaker.col)
+        other_tuple = (other._start.line, other._start.col,
+                       other._tiebreaker.line, other._tiebreaker.col)
+        return me_tuple <= other_tuple
+
+    def __repr__(self):
+        ct = ''
+        try:
+            ct = self.current_text
+        except IndexError:
+            ct = '<err>'
+
+        return '%s(%r->%r,%r)' % (self.__class__.__name__,
+                                  self._start, self._end, ct)
+
+    @property
+    def current_text(self):
+        """The current text of this object."""
+        if self._start.line == self._end.line:
+            return _vim.buf[self._start.line][self._start.col:self._end.col]
+        else:
+            lines = [_vim.buf[self._start.line][self._start.col:]]
+            lines.extend(_vim.buf[self._start.line + 1:self._end.line])
+            lines.append(_vim.buf[self._end.line][:self._end.col])
+            return '\n'.join(lines)
+
+    @property
+    def start(self):
+        """The start position."""
+        return self._start
+
+    @property
+    def end(self):
+        """The end position."""
+        return self._end
+
+    def overwrite(self, gtext=None):
+        """Overwrite the text of this object in the Vim Buffer and update its
+        length information.
+
+        If 'gtext' is None use the initial text of this object.
+
+        """
+        # We explicitly do not want to move our children around here as we
+        # either have non or we are replacing text initially which means we do
+        # not want to mess with their positions
+        if self.current_text == gtext:
+            return
+        old_end = self._end
+        self._end = _text_to_vim(
+            self._start, self._end, gtext or self._initial_text)
+        if self._parent:
+            self._parent._child_has_moved(
+                self._parent._children.index(self), min(old_end, self._end),
+                self._end.delta(old_end)
+            )
+
+    def _update(self, done):
+        """Update this object inside the Vim Buffer.
+
+        Return False if you need to be called again for this edit cycle.
+        Otherwise return True.
+
+        """
+        raise NotImplementedError('Must be implemented by subclasses.')
+
+
+class EditableTextObject(TextObject):
+
+    """This base class represents any object in the text that can be changed by
+    the user."""
+
+    def __init__(self, *args, **kwargs):
+        TextObject.__init__(self, *args, **kwargs)
+        self._children = []
+        self._tabstops = {}
+
+    ##############
+    # Properties #
+    ##############
+    @property
+    def children(self):
+        """List of all children."""
+        return self._children
+
+    @property
+    def _editable_children(self):
+        """List of all children that are EditableTextObjects."""
+        return [child for child in self._children if
+                isinstance(child, EditableTextObject)]
+
+    ####################
+    # Public Functions #
+    ####################
+    def find_parent_for_new_to(self, pos):
+        """Figure out the parent object for something at 'pos'."""
+        for children in self._editable_children:
+            if children._start <= pos < children._end:
+                return children.find_parent_for_new_to(pos)
+            if children._start == pos and pos == children._end:
+                return children.find_parent_for_new_to(pos)
+        return self
+
+    ###############################
+    # Private/Protected functions #
+    ###############################
+    def _do_edit(self, cmd, ctab=None):
+        """Apply the edit 'cmd' to this object."""
+        ctype, line, col, text = cmd
+        assert ('\n' not in text) or (text == '\n')
+        pos = Position(line, col)
+
+        to_kill = set()
+        new_cmds = []
+        for child in self._children:
+            if ctype == 'I':  # Insertion
+                if (child._start < pos <
+                        Position(child._end.line, child._end.col) and
+                        isinstance(child, NoneditableTextObject)):
+                    to_kill.add(child)
+                    new_cmds.append(cmd)
+                    break
+                elif ((child._start <= pos <= child._end) and
+                        isinstance(child, EditableTextObject)):
+                    if pos == child.end and not child.children:
+                        try:
+                            if ctab.number != child.number:
+                                continue
+                        except AttributeError:
+                            pass
+                    child._do_edit(cmd, ctab)
+                    return
+            else:  # Deletion
+                delend = pos + Position(0, len(text)) if text != '\n' \
+                    else Position(line + 1, 0)
+                if ((child._start <= pos < child._end) and
+                        (child._start < delend <= child._end)):
+                    # this edit command is completely for the child
+                    if isinstance(child, NoneditableTextObject):
+                        to_kill.add(child)
+                        new_cmds.append(cmd)
+                        break
+                    else:
+                        child._do_edit(cmd, ctab)
+                        return
+                elif ((pos < child._start and child._end <= delend and
+                            child.start < delend) or
+                        (pos <= child._start and child._end < delend)):
+                    # Case: this deletion removes the child
+                    to_kill.add(child)
+                    new_cmds.append(cmd)
+                    break
+                elif (pos < child._start and
+                        (child._start < delend <= child._end)):
+                    # Case: partially for us, partially for the child
+                    my_text = text[:(child._start - pos).col]
+                    c_text = text[(child._start - pos).col:]
+                    new_cmds.append((ctype, line, col, my_text))
+                    new_cmds.append((ctype, line, col, c_text))
+                    break
+                elif (delend >= child._end and (
+                        child._start <= pos < child._end)):
+                    # Case: partially for us, partially for the child
+                    c_text = text[(child._end - pos).col:]
+                    my_text = text[:(child._end - pos).col]
+                    new_cmds.append((ctype, line, col, c_text))
+                    new_cmds.append((ctype, line, col, my_text))
+                    break
+
+        for child in to_kill:
+            self._del_child(child)
+        if len(new_cmds):
+            for child in new_cmds:
+                self._do_edit(child)
+            return
+
+        # We have to handle this ourselves
+        delta = Position(1, 0) if text == '\n' else Position(0, len(text))
+        if ctype == 'D':
+             # Makes no sense to delete in empty textobject
+            if self._start == self._end:
+                return
+            delta.line *= -1
+            delta.col *= -1
+        pivot = Position(line, col)
+        idx = -1
+        for cidx, child in enumerate(self._children):
+            if child._start < pivot <= child._end:
+                idx = cidx
+        self._child_has_moved(idx, pivot, delta)
+
+    def _move(self, pivot, diff):
+        TextObject._move(self, pivot, diff)
+
+        for child in self._children:
+            child._move(pivot, diff)
+
+    def _child_has_moved(self, idx, pivot, diff):
+        """Called when a the child with 'idx' has moved behind 'pivot' by
+        'diff'."""
+        self._end.move(pivot, diff)
+
+        for child in self._children[idx + 1:]:
+            child._move(pivot, diff)
+
+        if self._parent:
+            self._parent._child_has_moved(
+                self._parent._children.index(self), pivot, diff
+            )
+
+    def _get_next_tab(self, number):
+        """Returns the next tabstop after 'number'."""
+        if not len(self._tabstops.keys()):
+            return
+        tno_max = max(self._tabstops.keys())
+
+        possible_sol = []
+        i = number + 1
+        while i <= tno_max:
+            if i in self._tabstops:
+                possible_sol.append((i, self._tabstops[i]))
+                break
+            i += 1
+
+        child = [c._get_next_tab(number) for c in self._editable_children]
+        child = [c for c in child if c]
+
+        possible_sol += child
+
+        if not len(possible_sol):
+            return None
+
+        return min(possible_sol)
+
+    def _get_prev_tab(self, number):
+        """Returns the previous tabstop before 'number'."""
+        if not len(self._tabstops.keys()):
+            return
+        tno_min = min(self._tabstops.keys())
+
+        possible_sol = []
+        i = number - 1
+        while i >= tno_min and i > 0:
+            if i in self._tabstops:
+                possible_sol.append((i, self._tabstops[i]))
+                break
+            i -= 1
+
+        child = [c._get_prev_tab(number) for c in self._editable_children]
+        child = [c for c in child if c]
+
+        possible_sol += child
+
+        if not len(possible_sol):
+            return None
+
+        return max(possible_sol)
+
+    def _get_tabstop(self, requester, number):
+        """Returns the tabstop 'number'.
+
+        'requester' is the class that is interested in this.
+
+        """
+        if number in self._tabstops:
+            return self._tabstops[number]
+        for child in self._editable_children:
+            if child is requester:
+                continue
+            rv = child._get_tabstop(self, number)
+            if rv is not None:
+                return rv
+        if self._parent and requester is not self._parent:
+            return self._parent._get_tabstop(self, number)
+
+    def _update(self, done):
+        if all((child in done) for child in self._children):
+            assert self not in done
+            done.add(self)
+        return True
+
+    def _add_child(self, child):
+        """Add 'child' as a new child of this text object."""
+        self._children.append(child)
+        self._children.sort()
+
+    def _del_child(self, child):
+        """Delete this 'child'."""
+        child._parent = None
+        self._children.remove(child)
+
+        # If this is a tabstop, delete it. Might have been deleted already if
+        # it was nested.
+        try:
+            del self._tabstops[child.number]
+        except (AttributeError, KeyError):
+            pass
+
+
+class NoneditableTextObject(TextObject):
+
+    """All passive text objects that the user can't edit by hand."""
+
+    def _update(self, done):
+        return True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_escaped_char.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_escaped_char.py
new file mode 100644
index 0000000..3301a26
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_escaped_char.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""See module comment."""
+
+from UltiSnips.text_objects._base import NoneditableTextObject
+
+
+class EscapedChar(NoneditableTextObject):
+
+    r"""
+    This class is a escape char like \$. It is handled in a text object to make
+    sure that siblings are correctly moved after replacing the text.
+
+    This is a base class without functionality just to mark it in the code.
+    """
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_mirror.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_mirror.py
new file mode 100644
index 0000000..7f8c961
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_mirror.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""A Mirror object contains the same text as its related tabstop."""
+
+from UltiSnips.text_objects._base import NoneditableTextObject
+
+
+class Mirror(NoneditableTextObject):
+
+    """See module docstring."""
+
+    def __init__(self, parent, tabstop, token):
+        NoneditableTextObject.__init__(self, parent, token)
+        self._ts = tabstop
+
+    def _update(self, done):
+        if self._ts.is_killed:
+            self.overwrite('')
+            self._parent._del_child(self)   # pylint:disable=protected-access
+            return True
+
+        if self._ts not in done:
+            return False
+
+        self.overwrite(self._get_text())
+        return True
+
+    def _get_text(self):
+        """Returns the text used for mirroring.
+
+        Overwritten by base classes.
+
+        """
+        return self._ts.current_text
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_python_code.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_python_code.py
new file mode 100644
index 0000000..5404dca
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_python_code.py
@@ -0,0 +1,321 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Implements `!p ` interpolation."""
+
+import os
+from collections import namedtuple
+
+from UltiSnips import _vim
+from UltiSnips.compatibility import as_unicode
+from UltiSnips.indent_util import IndentUtil
+from UltiSnips.text_objects._base import NoneditableTextObject
+from UltiSnips.vim_state import _Placeholder
+import UltiSnips.snippet_manager
+
+
+class _Tabs(object):
+
+    """Allows access to tabstop content via t[] inside of python code."""
+
+    def __init__(self, to):
+        self._to = to
+
+    def __getitem__(self, no):
+        ts = self._to._get_tabstop(
+            self._to,
+            int(no))  # pylint:disable=protected-access
+        if ts is None:
+            return ''
+        return ts.current_text
+
+    def __setitem__(self, no, value):
+        ts = self._to._get_tabstop(
+            self._to,
+            int(no))  # pylint:disable=protected-access
+        if ts is None:
+            return
+        ts.overwrite(value)
+
+_VisualContent = namedtuple('_VisualContent', ['mode', 'text'])
+
+
+class SnippetUtilForAction(dict):
+    def __init__(self, *args, **kwargs):
+        super(SnippetUtilForAction, self).__init__(*args, **kwargs)
+        self.__dict__ = self
+
+    def expand_anon(self, *args, **kwargs):
+        UltiSnips.snippet_manager.UltiSnips_Manager.expand_anon(
+            *args, **kwargs
+        )
+        self.cursor.preserve()
+
+
+class SnippetUtilCursor(object):
+    def __init__(self, cursor):
+        self._cursor = [cursor[0] - 1, cursor[1]]
+        self._set = False
+
+    def preserve(self):
+        self._set = True
+        self._cursor = [
+            _vim.buf.cursor[0],
+            _vim.buf.cursor[1],
+        ]
+
+    def is_set(self):
+        return self._set
+
+    def set(self, line, column):
+        self.__setitem__(0, line)
+        self.__setitem__(1, column)
+
+    def to_vim_cursor(self):
+        return (self._cursor[0] + 1, self._cursor[1])
+
+    def __getitem__(self, index):
+        return self._cursor[index]
+
+    def __setitem__(self, index, value):
+        self._set = True
+        self._cursor[index] = value
+
+    def __len__(self):
+        return 2
+
+    def __str__(self):
+        return str((self._cursor[0], self._cursor[1]))
+
+
+class SnippetUtil(object):
+
+    """Provides easy access to indentation, etc.
+
+    This is the 'snip' object in python code.
+
+    """
+
+    def __init__(self, initial_indent, vmode, vtext, context, parent):
+        self._ind = IndentUtil()
+        self._visual = _VisualContent(vmode, vtext)
+        self._initial_indent = self._ind.indent_to_spaces(initial_indent)
+        self._reset('')
+        self._context = context
+        self._start = parent.start
+        self._end = parent.end
+        self._parent = parent
+
+    def _reset(self, cur):
+        """Gets the snippet ready for another update.
+
+        :cur: the new value for c.
+
+        """
+        self._ind.reset()
+        self._cur = cur
+        self._rv = ''
+        self._changed = False
+        self.reset_indent()
+
+    def shift(self, amount=1):
+        """Shifts the indentation level. Note that this uses the shiftwidth
+        because thats what code formatters use.
+
+        :amount: the amount by which to shift.
+
+        """
+        self.indent += ' ' * self._ind.shiftwidth * amount
+
+    def unshift(self, amount=1):
+        """Unshift the indentation level. Note that this uses the shiftwidth
+        because thats what code formatters use.
+
+        :amount: the amount by which to unshift.
+
+        """
+        by = -self._ind.shiftwidth * amount
+        try:
+            self.indent = self.indent[:by]
+        except IndexError:
+            self.indent = ''
+
+    def mkline(self, line='', indent=None):
+        """Creates a properly set up line.
+
+        :line: the text to add
+        :indent: the indentation to have at the beginning
+                 if None, it uses the default amount
+
+        """
+        if indent is None:
+            indent = self.indent
+            # this deals with the fact that the first line is
+            # already properly indented
+            if '\n' not in self._rv:
+                try:
+                    indent = indent[len(self._initial_indent):]
+                except IndexError:
+                    indent = ''
+            indent = self._ind.spaces_to_indent(indent)
+
+        return indent + line
+
+    def reset_indent(self):
+        """Clears the indentation."""
+        self.indent = self._initial_indent
+
+    # Utility methods
+    @property
+    def fn(self):  # pylint:disable=no-self-use,invalid-name
+        """The filename."""
+        return _vim.eval('expand("%:t")') or ''
+
+    @property
+    def basename(self):  # pylint:disable=no-self-use
+        """The filename without extension."""
+        return _vim.eval('expand("%:t:r")') or ''
+
+    @property
+    def ft(self):  # pylint:disable=invalid-name
+        """The filetype."""
+        return self.opt('&filetype', '')
+
+    @property
+    def rv(self):  # pylint:disable=invalid-name
+        """The return value.
+
+        The text to insert at the location of the placeholder.
+
+        """
+        return self._rv
+
+    @rv.setter
+    def rv(self, value):  # pylint:disable=invalid-name
+        """See getter."""
+        self._changed = True
+        self._rv = value
+
+    @property
+    def _rv_changed(self):
+        """True if rv has changed."""
+        return self._changed
+
+    @property
+    def c(self):  # pylint:disable=invalid-name
+        """The current text of the placeholder."""
+        return self._cur
+
+    @property
+    def v(self):  # pylint:disable=invalid-name
+        """Content of visual expansions."""
+        return self._visual
+
+    @property
+    def p(self):
+        if self._parent.current_placeholder:
+            return self._parent.current_placeholder
+        else:
+            return _Placeholder('', 0, 0)
+
+    @property
+    def context(self):
+        return self._context
+
+    def opt(self, option, default=None):  # pylint:disable=no-self-use
+        """Gets a Vim variable."""
+        if _vim.eval("exists('%s')" % option) == '1':
+            try:
+                return _vim.eval(option)
+            except _vim.error:
+                pass
+        return default
+
+    def __add__(self, value):
+        """Appends the given line to rv using mkline."""
+        self.rv += '\n'  # pylint:disable=invalid-name
+        self.rv += self.mkline(value)
+        return self
+
+    def __lshift__(self, other):
+        """Same as unshift."""
+        self.unshift(other)
+
+    def __rshift__(self, other):
+        """Same as shift."""
+        self.shift(other)
+
+    @property
+    def snippet_start(self):
+        """
+        Returns start of the snippet in format (line, column).
+        """
+        return self._start
+
+    @property
+    def snippet_end(self):
+        """
+        Returns end of the snippet in format (line, column).
+        """
+        return self._end
+
+    @property
+    def buffer(self):
+        return _vim.buf
+
+
+class PythonCode(NoneditableTextObject):
+
+    """See module docstring."""
+
+    def __init__(self, parent, token):
+
+        # Find our containing snippet for snippet local data
+        snippet = parent
+        while snippet:
+            try:
+                self._locals = snippet.locals
+                text = snippet.visual_content.text
+                mode = snippet.visual_content.mode
+                context = snippet.context
+                break
+            except AttributeError as e:
+                snippet = snippet._parent  # pylint:disable=protected-access
+        self._snip = SnippetUtil(token.indent, mode, text, context, snippet)
+
+        self._codes = ((
+            'import re, os, vim, string, random',
+            '\n'.join(snippet.globals.get('!p', [])).replace('\r\n', '\n'),
+            token.code.replace('\\`', '`')
+        ))
+        NoneditableTextObject.__init__(self, parent, token)
+
+    def _update(self, done):
+        path = _vim.eval('expand("%")') or ''
+        ct = self.current_text
+        self._locals.update({
+            't': _Tabs(self._parent),
+            'fn': os.path.basename(path),
+            'path': path,
+            'cur': ct,
+            'res': ct,
+            'snip': self._snip,
+        })
+        self._snip._reset(ct)  # pylint:disable=protected-access
+
+        for code in self._codes:
+            try:
+                exec(code, self._locals)  # pylint:disable=exec-used
+            except Exception as e:
+                e.snippet_code = code
+                raise
+
+        rv = as_unicode(
+            self._snip.rv if self._snip._rv_changed  # pylint:disable=protected-access
+            else as_unicode(self._locals['res'])
+        )
+
+        if ct != rv:
+            self.overwrite(rv)
+            return False
+        return True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_shell_code.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_shell_code.py
new file mode 100644
index 0000000..a7ad964
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_shell_code.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Implements `echo hi` shell code interpolation."""
+
+import os
+import platform
+from subprocess import Popen, PIPE
+import stat
+import tempfile
+
+from UltiSnips.compatibility import as_unicode
+from UltiSnips.text_objects._base import NoneditableTextObject
+
+
+def _chomp(string):
+    """Rather than rstrip(), remove only the last newline and preserve
+    purposeful whitespace."""
+    if len(string) and string[-1] == '\n':
+        string = string[:-1]
+    if len(string) and string[-1] == '\r':
+        string = string[:-1]
+    return string
+
+
+def _run_shell_command(cmd, tmpdir):
+    """Write the code to a temporary file."""
+    cmdsuf = ''
+    if platform.system() == 'Windows':
+        # suffix required to run command on windows
+        cmdsuf = '.bat'
+        # turn echo off
+        cmd = '@echo off\r\n' + cmd
+    handle, path = tempfile.mkstemp(text=True, dir=tmpdir, suffix=cmdsuf)
+    os.write(handle, cmd.encode('utf-8'))
+    os.close(handle)
+    os.chmod(path, stat.S_IRWXU)
+
+    # Execute the file and read stdout
+    proc = Popen(path, shell=True, stdout=PIPE, stderr=PIPE)
+    proc.wait()
+    stdout, _ = proc.communicate()
+    os.unlink(path)
+    return _chomp(as_unicode(stdout))
+
+
+def _get_tmp():
+    """Find an executable tmp directory."""
+    userdir = os.path.expanduser('~')
+    for testdir in [tempfile.gettempdir(), os.path.join(userdir, '.cache'),
+                    os.path.join(userdir, '.tmp'), userdir]:
+        if (not os.path.exists(testdir) or
+                not _run_shell_command('echo success', testdir) == 'success'):
+            continue
+        return testdir
+    return ''
+
+
+class ShellCode(NoneditableTextObject):
+
+    """See module docstring."""
+
+    def __init__(self, parent, token):
+        NoneditableTextObject.__init__(self, parent, token)
+        self._code = token.code.replace('\\`', '`')
+        self._tmpdir = _get_tmp()
+
+    def _update(self, done):
+        if not self._tmpdir:
+            output = \
+                'Unable to find executable tmp directory, check noexec on /tmp'
+        else:
+            output = _run_shell_command(self._code, self._tmpdir)
+        self.overwrite(output)
+        self._parent._del_child(self)  # pylint:disable=protected-access
+        return True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_snippet_instance.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_snippet_instance.py
new file mode 100644
index 0000000..60c1db1
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_snippet_instance.py
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""A Snippet instance is an instance of a Snippet Definition.
+
+That is, when the user expands a snippet, a SnippetInstance is created
+to keep track of the corresponding TextObjects. The Snippet itself is
+also a TextObject.
+
+"""
+
+from UltiSnips import _vim
+from UltiSnips.position import Position
+from UltiSnips.text_objects._base import EditableTextObject, \
+    NoneditableTextObject
+from UltiSnips.text_objects._tabstop import TabStop
+
+
+class SnippetInstance(EditableTextObject):
+
+    """See module docstring."""
+    # pylint:disable=protected-access
+
+    def __init__(self, snippet, parent, initial_text,
+                 start, end, visual_content, last_re, globals, context):
+        if start is None:
+            start = Position(0, 0)
+        if end is None:
+            end = Position(0, 0)
+        self.snippet = snippet
+        self._cts = 0
+
+        self.context = context
+        self.locals = {'match': last_re, 'context': context}
+        self.globals = globals
+        self.visual_content = visual_content
+        self.current_placeholder = None
+
+        EditableTextObject.__init__(self, parent, start, end, initial_text)
+
+    def replace_initial_text(self):
+        """Puts the initial text of all text elements into Vim."""
+        def _place_initial_text(obj):
+            """recurses on the children to do the work."""
+            obj.overwrite()
+            if isinstance(obj, EditableTextObject):
+                for child in obj._children:
+                    _place_initial_text(child)
+        _place_initial_text(self)
+
+    def replay_user_edits(self, cmds, ctab=None):
+        """Replay the edits the user has done to keep endings of our Text
+        objects in sync with reality."""
+        for cmd in cmds:
+            self._do_edit(cmd, ctab)
+
+    def update_textobjects(self):
+        """Update the text objects that should change automagically after the
+        users edits have been replayed.
+
+        This might also move the Cursor
+
+        """
+        vc = _VimCursor(self)
+        done = set()
+        not_done = set()
+
+        def _find_recursive(obj):
+            """Finds all text objects and puts them into 'not_done'."""
+            if isinstance(obj, EditableTextObject):
+                for child in obj._children:
+                    _find_recursive(child)
+            not_done.add(obj)
+        _find_recursive(self)
+
+        counter = 10
+        while (done != not_done) and counter:
+            # Order matters for python locals!
+            for obj in sorted(not_done - done):
+                if obj._update(done):
+                    done.add(obj)
+            counter -= 1
+        if not counter:
+            raise RuntimeError(
+                'The snippets content did not converge: Check for Cyclic '
+                'dependencies or random strings in your snippet. You can use '
+                "'if not snip.c' to make sure to only expand random output "
+                'once.')
+        vc.to_vim()
+        self._del_child(vc)
+
+    def select_next_tab(self, backwards=False):
+        """Selects the next tabstop or the previous if 'backwards' is True."""
+        if self._cts is None:
+            return
+
+        if backwards:
+            cts_bf = self._cts
+
+            res = self._get_prev_tab(self._cts)
+            if res is None:
+                self._cts = cts_bf
+                return self._tabstops.get(self._cts, None)
+            self._cts, ts = res
+            return ts
+        else:
+            res = self._get_next_tab(self._cts)
+            if res is None:
+                self._cts = None
+
+                ts = self._get_tabstop(self, 0)
+                if ts:
+                    return ts
+
+                # TabStop 0 was deleted. It was probably killed through some
+                # edit action. Recreate it at the end of us.
+                start = Position(self.end.line, self.end.col)
+                end = Position(self.end.line, self.end.col)
+                return TabStop(self, 0, start, end)
+            else:
+                self._cts, ts = res
+                return ts
+
+        return self._tabstops[self._cts]
+
+    def _get_tabstop(self, requester, no):
+        # SnippetInstances are completely self contained, therefore, we do not
+        # need to ask our parent for Tabstops
+        cached_parent = self._parent
+        self._parent = None
+        rv = EditableTextObject._get_tabstop(self, requester, no)
+        self._parent = cached_parent
+        return rv
+
+    def get_tabstops(self):
+        return self._tabstops
+
+
+class _VimCursor(NoneditableTextObject):
+
+    """Helper class to keep track of the Vim Cursor when text objects expand
+    and move."""
+
+    def __init__(self, parent):
+        NoneditableTextObject.__init__(
+            self, parent, _vim.buf.cursor, _vim.buf.cursor,
+            tiebreaker=Position(-1, -1))
+
+    def to_vim(self):
+        """Moves the cursor in the Vim to our position."""
+        assert self._start == self._end
+        _vim.buf.cursor = self._start
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_tabstop.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_tabstop.py
new file mode 100644
index 0000000..f113f75
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_tabstop.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""This is the most important TextObject.
+
+A TabStop is were the cursor comes to rest when the user taps through
+the Snippet.
+
+"""
+
+from UltiSnips.text_objects._base import EditableTextObject
+
+
+class TabStop(EditableTextObject):
+
+    """See module docstring."""
+
+    def __init__(self, parent, token, start=None, end=None):
+        if start is not None:
+            self._number = token
+            EditableTextObject.__init__(self, parent, start, end)
+        else:
+            self._number = token.number
+            EditableTextObject.__init__(self, parent, token)
+        parent._tabstops[
+            self._number] = self  # pylint:disable=protected-access
+
+    @property
+    def number(self):
+        """The tabstop number."""
+        return self._number
+
+    @property
+    def is_killed(self):
+        """True if this tabstop has been typed over and the user therefore can
+        no longer jump to it."""
+        return self._parent is None
+
+    def __repr__(self):
+        try:
+            text = self.current_text
+        except IndexError:
+            text = '<err>'
+        return 'TabStop(%s,%r->%r,%r)' % (self.number, self._start,
+                                          self._end, text)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_transformation.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_transformation.py
new file mode 100644
index 0000000..b9da88f
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_transformation.py
@@ -0,0 +1,174 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Implements TabStop transformations."""
+
+import re
+import sys
+
+from UltiSnips.text import unescape, fill_in_whitespace
+from UltiSnips.text_objects._mirror import Mirror
+
+
+def _find_closing_brace(string, start_pos):
+    """Finds the corresponding closing brace after start_pos."""
+    bracks_open = 1
+    escaped = False
+    for idx, char in enumerate(string[start_pos:]):
+        if char == '(':
+            if not escaped:
+                bracks_open += 1
+        elif char == ')':
+            if not escaped:
+                bracks_open -= 1
+            if not bracks_open:
+                return start_pos + idx + 1
+        if char == '\\':
+            escaped = not escaped
+        else:
+            escaped = False
+
+
+def _split_conditional(string):
+    """Split the given conditional 'string' into its arguments."""
+    bracks_open = 0
+    args = []
+    carg = ''
+    escaped = False
+    for idx, char in enumerate(string):
+        if char == '(':
+            if not escaped:
+                bracks_open += 1
+        elif char == ')':
+            if not escaped:
+                bracks_open -= 1
+        elif char == ':' and not bracks_open and not escaped:
+            args.append(carg)
+            carg = ''
+            escaped = False
+            continue
+        carg += char
+        if char == '\\':
+            escaped = not escaped
+        else:
+            escaped = False
+    args.append(carg)
+    return args
+
+
+def _replace_conditional(match, string):
+    """Replaces a conditional match in a transformation."""
+    conditional_match = _CONDITIONAL.search(string)
+    while conditional_match:
+        start = conditional_match.start()
+        end = _find_closing_brace(string, start + 4)
+        args = _split_conditional(string[start + 4:end - 1])
+        rv = ''
+        if match.group(int(conditional_match.group(1))):
+            rv = unescape(_replace_conditional(match, args[0]))
+        elif len(args) > 1:
+            rv = unescape(_replace_conditional(match, args[1]))
+        string = string[:start] + rv + string[end:]
+        conditional_match = _CONDITIONAL.search(string)
+    return string
+
+_ONE_CHAR_CASE_SWITCH = re.compile(r"\\([ul].)", re.DOTALL)
+_LONG_CASEFOLDINGS = re.compile(r"\\([UL].*?)\\E", re.DOTALL)
+_DOLLAR = re.compile(r"\$(\d+)", re.DOTALL)
+_CONDITIONAL = re.compile(r"\(\?(\d+):", re.DOTALL)
+
+
+class _CleverReplace(object):
+
+    """Mimics TextMates replace syntax."""
+
+    def __init__(self, expression):
+        self._expression = expression
+
+    def replace(self, match):
+        """Replaces 'match' through the correct replacement string."""
+        transformed = self._expression
+        # Replace all $? with capture groups
+        transformed = _DOLLAR.subn(
+            lambda m: match.group(int(m.group(1))), transformed)[0]
+
+        # Replace Case switches
+        def _one_char_case_change(match):
+            """Replaces one character case changes."""
+            if match.group(1)[0] == 'u':
+                return match.group(1)[-1].upper()
+            else:
+                return match.group(1)[-1].lower()
+        transformed = _ONE_CHAR_CASE_SWITCH.subn(
+            _one_char_case_change, transformed)[0]
+
+        def _multi_char_case_change(match):
+            """Replaces multi character case changes."""
+            if match.group(1)[0] == 'U':
+                return match.group(1)[1:].upper()
+            else:
+                return match.group(1)[1:].lower()
+        transformed = _LONG_CASEFOLDINGS.subn(
+            _multi_char_case_change, transformed)[0]
+        transformed = _replace_conditional(match, transformed)
+        return unescape(fill_in_whitespace(transformed))
+
+# flag used to display only one time the lack of unidecode
+UNIDECODE_ALERT_RAISED = False
+
+
+class TextObjectTransformation(object):
+
+    """Base class for Transformations and ${VISUAL}."""
+
+    def __init__(self, token):
+        self._convert_to_ascii = False
+
+        self._find = None
+        if token.search is None:
+            return
+
+        flags = 0
+        self._match_this_many = 1
+        if token.options:
+            if 'g' in token.options:
+                self._match_this_many = 0
+            if 'i' in token.options:
+                flags |= re.IGNORECASE
+            if 'm' in token.options:
+                flags |= re.MULTILINE
+            if 'a' in token.options:
+                self._convert_to_ascii = True
+
+        self._find = re.compile(token.search, flags | re.DOTALL)
+        self._replace = _CleverReplace(token.replace)
+
+    def _transform(self, text):
+        """Do the actual transform on the given text."""
+        global UNIDECODE_ALERT_RAISED  # pylint:disable=global-statement
+        if self._convert_to_ascii:
+            try:
+                import unidecode
+                text = unidecode.unidecode(text)
+            except Exception:  # pylint:disable=broad-except
+                if UNIDECODE_ALERT_RAISED == False:
+                    UNIDECODE_ALERT_RAISED = True
+                    sys.stderr.write(
+                        'Please install unidecode python package in order to '
+                        'be able to make ascii conversions.\n')
+        if self._find is None:
+            return text
+        return self._find.subn(
+            self._replace.replace, text, self._match_this_many)[0]
+
+
+class Transformation(Mirror, TextObjectTransformation):
+
+    """See module docstring."""
+
+    def __init__(self, parent, ts, token):
+        Mirror.__init__(self, parent, ts, token)
+        TextObjectTransformation.__init__(self, token)
+
+    def _get_text(self):
+        return self._transform(self._ts.current_text)
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_viml_code.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_viml_code.py
new file mode 100644
index 0000000..86329bf
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_viml_code.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Implements `!v ` VimL interpolation."""
+
+from UltiSnips import _vim
+from UltiSnips.text_objects._base import NoneditableTextObject
+
+
+class VimLCode(NoneditableTextObject):
+
+    """See module docstring."""
+
+    def __init__(self, parent, token):
+        self._code = token.code.replace('\\`', '`').strip()
+
+        NoneditableTextObject.__init__(self, parent, token)
+
+    def _update(self, done):
+        self.overwrite(_vim.eval(self._code))
+        return True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_visual.py b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_visual.py
new file mode 100644
index 0000000..0be64b3
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/text_objects/_visual.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""A ${VISUAL} placeholder that will use the text that was last visually
+selected and insert it here.
+
+If there was no text visually selected, this will be the empty string.
+
+"""
+
+import re
+import textwrap
+
+from UltiSnips import _vim
+from UltiSnips.indent_util import IndentUtil
+from UltiSnips.text_objects._transformation import TextObjectTransformation
+from UltiSnips.text_objects._base import NoneditableTextObject
+
+_REPLACE_NON_WS = re.compile(r"[^ \t]")
+
+
+class Visual(NoneditableTextObject, TextObjectTransformation):
+
+    """See module docstring."""
+
+    def __init__(self, parent, token):
+        # Find our containing snippet for visual_content
+        snippet = parent
+        while snippet:
+            try:
+                self._text = snippet.visual_content.text
+                self._mode = snippet.visual_content.mode
+                break
+            except AttributeError:
+                snippet = snippet._parent  # pylint:disable=protected-access
+        if not self._text:
+            self._text = token.alternative_text
+            self._mode = 'v'
+
+        NoneditableTextObject.__init__(self, parent, token)
+        TextObjectTransformation.__init__(self, token)
+
+    def _update(self, done):
+        if self._mode == 'v':  # Normal selection.
+            text = self._text
+        else:  # Block selection or line selection.
+            text_before = _vim.buf[self.start.line][:self.start.col]
+            indent = _REPLACE_NON_WS.sub(' ', text_before)
+            iu = IndentUtil()
+            indent = iu.indent_to_spaces(indent)
+            indent = iu.spaces_to_indent(indent)
+            text = ''
+            for idx, line in enumerate(textwrap.dedent(
+                    self._text).splitlines(True)):
+                if idx != 0:
+                    text += indent
+                text += line
+            text = text[:-1]  # Strip final '\n'
+
+        text = self._transform(text)
+        self.overwrite(text)
+        self._parent._del_child(self)  # pylint:disable=protected-access
+
+        return True
diff --git a/vim/plugins/ultisnips/pythonx/UltiSnips/vim_state.py b/vim/plugins/ultisnips/pythonx/UltiSnips/vim_state.py
new file mode 100644
index 0000000..18914ee
--- /dev/null
+++ b/vim/plugins/ultisnips/pythonx/UltiSnips/vim_state.py
@@ -0,0 +1,163 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+"""Some classes to conserve Vim's state for comparing over time."""
+
+from collections import deque, namedtuple
+
+from UltiSnips import _vim
+from UltiSnips.compatibility import as_unicode, byte2col
+from UltiSnips.position import Position
+
+_Placeholder = namedtuple('_FrozenPlaceholder', ['current_text', 'start', 'end'])
+
+class VimPosition(Position):
+
+    """Represents the current position in the buffer, together with some status
+    variables that might change our decisions down the line."""
+
+    def __init__(self):
+        pos = _vim.buf.cursor
+        self._mode = _vim.eval('mode()')
+        Position.__init__(self, pos.line, pos.col)
+
+    @property
+    def mode(self):
+        """Returns the mode() this position was created."""
+        return self._mode
+
+
+class VimState(object):
+
+    """Caches some state information from Vim to better guess what editing
+    tasks the user might have done in the last step."""
+
+    def __init__(self):
+        self._poss = deque(maxlen=5)
+        self._lvb = None
+
+        self._text_to_expect = ''
+        self._unnamed_reg_cached = False
+
+        # We store the cached value of the unnamed register in Vim directly to
+        # avoid any Unicode issues with saving and restoring the unnamed
+        # register across the Python bindings.  The unnamed register can contain
+        # data that cannot be coerced to Unicode, and so a simple vim.eval('@"')
+        # fails badly.  Keeping the cached value in Vim directly, sidesteps the
+        # problem.
+        _vim.command('let g:_ultisnips_unnamed_reg_cache = ""')
+
+    def remember_unnamed_register(self, text_to_expect):
+        """Save the unnamed register.
+
+        'text_to_expect' is text that we expect
+        to be contained in the register the next time this method is called -
+        this could be text from the tabstop that was selected and might have
+        been overwritten. We will not cache that then.
+
+        """
+        self._unnamed_reg_cached = True
+        escaped_text = self._text_to_expect.replace("'", "''")
+        res = int(_vim.eval('@" != ' + "'" + escaped_text + "'"))
+        if res:
+            _vim.command('let g:_ultisnips_unnamed_reg_cache = @"')
+        self._text_to_expect = text_to_expect
+
+    def restore_unnamed_register(self):
+        """Restores the unnamed register and forgets what we cached."""
+        if not self._unnamed_reg_cached:
+            return
+        _vim.command('let @" = g:_ultisnips_unnamed_reg_cache')
+        self._unnamed_reg_cached = False
+
+    def remember_position(self):
+        """Remember the current position as a previous pose."""
+        self._poss.append(VimPosition())
+
+    def remember_buffer(self, to):
+        """Remember the content of the buffer and the position."""
+        self._lvb = _vim.buf[to.start.line:to.end.line + 1]
+        self._lvb_len = len(_vim.buf)
+        self.remember_position()
+
+    @property
+    def diff_in_buffer_length(self):
+        """Returns the difference in the length of the current buffer compared
+        to the remembered."""
+        return len(_vim.buf) - self._lvb_len
+
+    @property
+    def pos(self):
+        """The last remembered position."""
+        return self._poss[-1]
+
+    @property
+    def ppos(self):
+        """The second to last remembered position."""
+        return self._poss[-2]
+
+    @property
+    def remembered_buffer(self):
+        """The content of the remembered buffer."""
+        return self._lvb[:]
+
+
+class VisualContentPreserver(object):
+
+    """Saves the current visual selection and the selection mode it was done in
+    (e.g. line selection, block selection or regular selection.)"""
+
+    def __init__(self):
+        self.reset()
+
+    def reset(self):
+        """Forget the preserved state."""
+        self._mode = ''
+        self._text = as_unicode('')
+        self._placeholder = None
+
+    def conserve(self):
+        """Save the last visual selection ond the mode it was made in."""
+        sl, sbyte = map(int,
+                        (_vim.eval("""line("'<")"""), _vim.eval("""col("'<")""")))
+        el, ebyte = map(int,
+                        (_vim.eval("""line("'>")"""), _vim.eval("""col("'>")""")))
+        sc = byte2col(sl, sbyte - 1)
+        ec = byte2col(el, ebyte - 1)
+        self._mode = _vim.eval('visualmode()')
+
+        _vim_line_with_eol = lambda ln: _vim.buf[ln] + '\n'
+
+        if sl == el:
+            text = _vim_line_with_eol(sl - 1)[sc:ec + 1]
+        else:
+            text = _vim_line_with_eol(sl - 1)[sc:]
+            for cl in range(sl, el - 1):
+                text += _vim_line_with_eol(cl)
+            text += _vim_line_with_eol(el - 1)[:ec + 1]
+        self._text = text
+
+    def conserve_placeholder(self, placeholder):
+        if placeholder:
+            self._placeholder = _Placeholder(
+                placeholder.current_text,
+                placeholder.start,
+                placeholder.end
+            )
+        else:
+            self._placeholder = None
+
+    @property
+    def text(self):
+        """The conserved text."""
+        return self._text
+
+    @property
+    def mode(self):
+        """The conserved visualmode()."""
+        return self._mode
+
+    @property
+    def placeholder(self):
+        """Returns latest selected placeholder."""
+        return self._placeholder
diff --git a/vim/plugins/ultisnips/rplugin/python3/deoplete/sources/ultisnips.py b/vim/plugins/ultisnips/rplugin/python3/deoplete/sources/ultisnips.py
new file mode 100644
index 0000000..ba35dfc
--- /dev/null
+++ b/vim/plugins/ultisnips/rplugin/python3/deoplete/sources/ultisnips.py
@@ -0,0 +1,21 @@
+from .base import Base
+
+class Source(Base):
+    def __init__(self, vim):
+        Base.__init__(self, vim)
+
+        self.name = 'ultisnips'
+        self.mark = '[US]'
+        self.rank = 8
+
+    def gather_candidates(self, context):
+        suggestions = []
+        snippets = self.vim.eval(
+            'UltiSnips#SnippetsInCurrentScope()')
+        for trigger in snippets:
+            suggestions.append({
+                'word': trigger,
+                'menu': self.mark + ' ' + snippets.get(trigger, ''),
+                'dup': 1
+            })
+        return suggestions
diff --git a/vim/plugins/ultisnips/syntax/snippets.vim b/vim/plugins/ultisnips/syntax/snippets.vim
new file mode 100644
index 0000000..acd6403
--- /dev/null
+++ b/vim/plugins/ultisnips/syntax/snippets.vim
@@ -0,0 +1,234 @@
+" Syntax highlighting for snippet files (used for UltiSnips.vim)
+" Revision: 26/03/11 19:53:33
+
+if exists("b:current_syntax")
+  finish
+endif
+
+if expand("%:p:h") =~ "snippets" && search("^endsnippet", "nw") == 0
+            \ && !exists("b:ultisnips_override_snipmate")
+    " this appears to be a snipmate file
+    " It's in a directory called snippets/ and there's no endsnippet keyword
+    " anywhere in the file.
+    source <sfile>:h/snippets_snipmate.vim
+    finish
+endif
+
+" Embedded Syntaxes {{{1
+
+try
+   syntax include @Python syntax/python.vim
+   unlet b:current_syntax
+   syntax include @Viml syntax/vim.vim
+   unlet b:current_syntax
+   syntax include @Shell syntax/sh.vim
+   unlet b:current_syntax
+catch /E403/
+   " Ignore errors about syntax files that can't be loaded more than once
+endtry
+
+" Syntax definitions {{{1
+
+" Comments {{{2
+
+syn match snipComment "^#.*" contains=snipTODO display
+syn keyword snipTODO contained display FIXME NOTE NOTES TODO XXX
+
+" Errors {{{2
+
+syn match snipLeadingSpaces "^\t* \+" contained
+
+" Extends {{{2
+
+syn match snipExtends "^extends\%(\s.*\|$\)" contains=snipExtendsKeyword display
+syn match snipExtendsKeyword "^extends" contained display
+
+" Definitions {{{2
+
+" snippet {{{3
+
+syn region snipSnippet start="^snippet\_s" end="^endsnippet\s*$" contains=snipSnippetHeader fold keepend
+syn match snipSnippetHeader "^.*$" nextgroup=snipSnippetBody,snipSnippetFooter skipnl contained contains=snipSnippetHeaderKeyword
+syn match snipSnippetHeaderKeyword "^snippet" contained nextgroup=snipSnippetTrigger skipwhite
+syn region snipSnippetBody start="\_." end="^\zeendsnippet\s*$" contained nextgroup=snipSnippetFooter contains=snipLeadingSpaces,@snipTokens
+syn match snipSnippetFooter "^endsnippet.*" contained contains=snipSnippetFooterKeyword
+syn match snipSnippetFooterKeyword "^endsnippet" contained
+
+" The current parser is a bit lax about parsing. For example, given this:
+"   snippet foo"bar"
+" it treats `foo"bar"` as the trigger. But with this:
+"   snippet foo"bar baz"
+" it treats `foo` as the trigger and "bar baz" as the description.
+" I think this is an accident. Instead, we'll assume the description must
+" be surrounded by spaces. That means we'll treat
+"   snippet foo"bar"
+" as a trigger `foo"bar"` and
+"   snippet foo"bar baz"
+" as an attempted multiword snippet `foo"bar baz"` that is invalid.
+" NB: UltiSnips parses right-to-left, which Vim doesn't support, so that makes
+" the following patterns very complicated.
+syn match snipSnippetTrigger "\S\+" contained nextgroup=snipSnippetDocString,snipSnippetTriggerInvalid skipwhite
+" We want to match a trailing " as the start of a doc comment, but we also
+" want to allow for using " as the delimiter in a multiword/pattern snippet.
+" So we have to define this twice, once in the general case that matches a
+" trailing " as the doc comment, and once for the case of the multiword
+" delimiter using " that has more constraints
+syn match snipSnippetTrigger ,".\{-}"\ze\%(\s\+"\%(\s*\S\)\@=[^"]*\%("\s\+[^"[:space:]]\+\|"\)\=\)\=\s*$, contained nextgroup=snipSnippetDocString skipwhite
+syn match snipSnippetTrigger ,\%(\(\S\).\{-}\1\|\S\+\)\ze\%(\s\+"[^"]*\%("\s\+\%("[^"]\+"\s\+[^"[:space:]]*e[^"[:space:]]*\)\|"\)\=\)\=\s*$, contained nextgroup=snipSnippetDocContextString skipwhite
+syn match snipSnippetTrigger ,\([^"[:space:]]\).\{-}\1\%(\s*$\)\@!\ze\%(\s\+"[^"]*\%("\s\+\%("[^"]\+"\s\+[^"[:space:]]*e[^"[:space:]]*\|[^"[:space:]]\+\)\|"\)\=\)\=\s*$, contained nextgroup=snipSnippetDocString skipwhite
+syn match snipSnippetTriggerInvalid ,\S\@=.\{-}\S\ze\%(\s\+"[^"]*\%("\s\+[^"[:space:]]\+\s*\|"\s*\)\=\|\s*\)$, contained nextgroup=snipSnippetDocString skipwhite
+syn match snipSnippetDocString ,"[^"]*", contained nextgroup=snipSnippetOptions skipwhite
+syn match snipSnippetDocContextString ,"[^"]*", contained nextgroup=snipSnippetContext skipwhite
+syn match snipSnippetContext ,"[^"]\+", contained skipwhite contains=snipSnippetContextP
+syn region snipSnippetContextP start=,"\@<=., end=,\ze", contained contains=@Python nextgroup=snipSnippetOptions skipwhite keepend
+syn match snipSnippetOptions ,\S\+, contained contains=snipSnippetOptionFlag
+syn match snipSnippetOptionFlag ,[biwrtsmxAe], contained
+
+" Command substitution {{{4
+
+syn region snipCommand keepend matchgroup=snipCommandDelim start="`" skip="\\[{}\\$`]" end="`" contained contains=snipPythonCommand,snipVimLCommand,snipShellCommand,snipCommandSyntaxOverride
+syn region snipShellCommand start="\ze\_." skip="\\[{}\\$`]" end="\ze`" contained contains=@Shell
+syn region snipPythonCommand matchgroup=snipPythonCommandP start="`\@<=!p\_s" skip="\\[{}\\$`]" end="\ze`" contained contains=@Python
+syn region snipVimLCommand matchgroup=snipVimLCommandV start="`\@<=!v\_s" skip="\\[{}\\$`]" end="\ze`" contained contains=@Viml
+syn cluster snipTokens add=snipCommand
+syn cluster snipTabStopTokens add=snipCommand
+
+" unfortunately due to the balanced braces parsing of commands, if a { occurs
+" in the command, we need to prevent the embedded syntax highlighting.
+" Otherwise, we can't track the balanced braces properly.
+
+syn region snipCommandSyntaxOverride start="\%(\\[{}\\$`]\|\_[^`"{]\)*\ze{" skip="\\[{}\\$`]" end="\ze`" contained contains=snipBalancedBraces transparent
+
+" Tab Stops {{{4
+
+syn match snipEscape "\\[{}\\$`]" contained
+syn cluster snipTokens add=snipEscape
+syn cluster snipTabStopTokens add=snipEscape
+
+syn match snipMirror "\$\d\+" contained
+syn cluster snipTokens add=snipMirror
+syn cluster snipTabStopTokens add=snipMirror
+
+syn region snipTabStop matchgroup=snipTabStop start="\${\d\+[:}]\@=" end="}" contained contains=snipTabStopDefault extend
+syn region snipTabStopDefault matchgroup=snipTabStop start=":" skip="\\[{}]" end="\ze}" contained contains=snipTabStopEscape,snipBalancedBraces,@snipTabStopTokens keepend
+syn match snipTabStopEscape "\\[{}]" contained
+syn region snipBalancedBraces start="{" end="}" contained transparent extend
+syn cluster snipTokens add=snipTabStop
+syn cluster snipTabStopTokens add=snipTabStop
+
+syn region snipVisual matchgroup=snipVisual start="\${VISUAL[:}/]\@=" end="}" contained contains=snipVisualDefault,snipTransformationPattern extend
+syn region snipVisualDefault matchgroup=snipVisual start=":" end="\ze[}/]" contained contains=snipTabStopEscape nextgroup=snipTransformationPattern
+syn cluster snipTokens add=snipVisual
+syn cluster snipTabStopTokens add=snipVisual
+
+syn region snipTransformation matchgroup=snipTransformation start="\${\d\/\@=" end="}" contained contains=snipTransformationPattern
+syn region snipTransformationPattern matchgroup=snipTransformationPatternDelim start="/" end="\ze/" contained contains=snipTransformationEscape nextgroup=snipTransformationReplace skipnl
+syn region snipTransformationReplace matchgroup=snipTransformationPatternDelim start="/" end="/" contained contains=snipTransformationEscape nextgroup=snipTransformationOptions skipnl
+syn region snipTransformationOptions start="\ze[^}]" end="\ze}" contained contains=snipTabStopEscape
+syn match snipTransformationEscape "\\/" contained
+syn cluster snipTokens add=snipTransformation
+syn cluster snipTabStopTokens add=snipTransformation
+
+" global {{{3
+
+" Generic (non-Python) {{{4
+
+syn region snipGlobal start="^global\_s" end="^\zeendglobal\s*$" contains=snipGlobalHeader nextgroup=snipGlobalFooter fold keepend
+syn match snipGlobalHeader "^.*$" nextgroup=snipGlobalBody,snipGlobalFooter skipnl contained contains=snipGlobalHeaderKeyword
+syn region snipGlobalBody start="\_." end="^\zeendglobal\s*$" contained contains=snipLeadingSpaces
+
+" Python (!p) {{{4
+
+syn region snipGlobal start=,^global\s\+!p\%(\s\+"[^"]*\%("\s\+[^"[:space:]]\+\|"\)\=\)\=\s*$, end=,^\zeendglobal\s*$, contains=snipGlobalPHeader nextgroup=snipGlobalFooter fold keepend
+syn match snipGlobalPHeader "^.*$" nextgroup=snipGlobalPBody,snipGlobalFooter skipnl contained contains=snipGlobalHeaderKeyword
+syn match snipGlobalHeaderKeyword "^global" contained nextgroup=snipSnippetTrigger skipwhite
+syn region snipGlobalPBody start="\_." end="^\zeendglobal\s*$" contained contains=@Python
+
+" Common {{{4
+
+syn match snipGlobalFooter "^endglobal.*" contained contains=snipGlobalFooterKeyword
+syn match snipGlobalFooterKeyword "^endglobal" contained
+
+" priority {{{3
+
+syn match snipPriority "^priority\%(\s.*\|$\)" contains=snipPriorityKeyword display
+syn match snipPriorityKeyword "^priority" contained nextgroup=snipPriorityValue skipwhite display
+syn match snipPriorityValue "-\?\d\+" contained display
+
+" context {{{3
+
+syn match snipContext "^context.*$" contains=snipContextKeyword display skipwhite
+syn match snipContextKeyword "context" contained nextgroup=snipContextValue skipwhite display
+syn match snipContextValue '"[^"]*"' contained contains=snipContextValueP
+syn region snipContextValueP start=,"\@<=., end=,\ze", contained contains=@Python skipwhite keepend
+
+" Actions {{{3
+
+syn match snipAction "^\%(pre_expand\|post_expand\|post_jump\).*$" contains=snipActionKeyword display skipwhite
+syn match snipActionKeyword "\%(pre_expand\|post_expand\|post_jump\)" contained nextgroup=snipActionValue skipwhite display
+syn match snipActionValue '"[^"]*"' contained contains=snipActionValueP
+syn region snipActionValueP start=,"\@<=., end=,\ze", contained contains=@Python skipwhite keepend
+
+" Snippt Clearing {{{2
+
+syn match snipClear "^clearsnippets\%(\s.*\|$\)" contains=snipClearKeyword display
+syn match snipClearKeyword "^clearsnippets" contained display
+
+" Highlight groups {{{1
+
+hi def link snipComment          Comment
+hi def link snipTODO             Todo
+hi def snipLeadingSpaces term=reverse ctermfg=15 ctermbg=4 gui=reverse guifg=#dc322f
+
+hi def link snipKeyword          Keyword
+
+hi def link snipExtendsKeyword   snipKeyword
+
+hi def link snipSnippetHeaderKeyword snipKeyword
+hi def link snipSnippetFooterKeyword snipKeyword
+
+hi def link snipSnippetTrigger        Identifier
+hi def link snipSnippetTriggerInvalid Error
+hi def link snipSnippetDocString      String
+hi def link snipSnippetDocContextString String
+hi def link snipSnippetOptionFlag     Special
+
+hi def link snipGlobalHeaderKeyword  snipKeyword
+hi def link snipGlobalFooterKeyword  snipKeyword
+
+hi def link snipCommand          Special
+hi def link snipCommandDelim     snipCommand
+hi def link snipShellCommand     snipCommand
+hi def link snipVimLCommand      snipCommand
+hi def link snipPythonCommandP   PreProc
+hi def link snipVimLCommandV     PreProc
+hi def link snipSnippetContext   String
+hi def link snipContext          String
+hi def link snipAction           String
+
+hi def link snipEscape                     Special
+hi def link snipMirror                     StorageClass
+hi def link snipTabStop                    Define
+hi def link snipTabStopDefault             String
+hi def link snipTabStopEscape              Special
+hi def link snipVisual                     snipTabStop
+hi def link snipVisualDefault              snipTabStopDefault
+hi def link snipTransformation             snipTabStop
+hi def link snipTransformationPattern      String
+hi def link snipTransformationPatternDelim Operator
+hi def link snipTransformationReplace      String
+hi def link snipTransformationEscape       snipEscape
+hi def link snipTransformationOptions      Operator
+
+hi def link snipContextKeyword  Keyword
+
+hi def link snipPriorityKeyword  Keyword
+hi def link snipPriorityValue    Number
+
+hi def link snipActionKeyword  Keyword
+
+hi def link snipClearKeyword     Keyword
+
+" }}}1
+
+let b:current_syntax = "snippets"
diff --git a/vim/plugins/ultisnips/syntax/snippets_snipmate.vim b/vim/plugins/ultisnips/syntax/snippets_snipmate.vim
new file mode 100644
index 0000000..aa55c1f
--- /dev/null
+++ b/vim/plugins/ultisnips/syntax/snippets_snipmate.vim
@@ -0,0 +1,47 @@
+" Syntax highlighting variant used for snipmate snippets files
+" The snippets.vim file sources this if it wants snipmate mode
+
+if exists("b:current_syntax")
+    finish
+endif
+
+" Embedded syntaxes {{{1
+
+" Re-include the original file so we can share some of its definitions
+let b:ultisnips_override_snipmate = 1
+syn include <sfile>:h/snippets.vim
+unlet b:current_syntax
+unlet b:ultisnips_override_snipmate
+
+syn cluster snipTokens contains=snipEscape,snipVisual,snipTabStop,snipMirror,snipmateCommand
+syn cluster snipTabStopTokens contains=snipVisual,snipMirror,snipEscape,snipmateCommand
+
+" Syntax definitions {{{1
+
+syn match snipmateComment "^#.*"
+
+syn match snipmateExtends "^extends\%(\s.*\|$\)" contains=snipExtendsKeyword display
+
+syn region snipmateSnippet start="^snippet\ze\%(\s\|$\)" end="^\ze[^[:tab:]]" contains=snipmateSnippetHeader keepend
+syn match snipmateSnippetHeader "^.*" contained contains=snipmateKeyword nextgroup=snipmateSnippetBody skipnl skipempty
+syn match snipmateKeyword "^snippet\ze\%(\s\|$\)" contained nextgroup=snipmateTrigger skipwhite
+syn match snipmateTrigger "\S\+" contained nextgroup=snipmateDescription skipwhite
+syn match snipmateDescription "\S.*" contained
+syn region snipmateSnippetBody start="^\t" end="^\ze[^[:tab:]]" contained contains=@snipTokens
+
+syn region snipmateCommand keepend matchgroup=snipCommandDelim start="`" skip="\\[{}\\$`]" end="`" contained contains=snipCommandSyntaxOverride,@Viml
+
+" Highlight groups {{{1
+
+hi def link snipmateComment snipComment
+
+hi def link snipmateSnippet snipSnippet
+hi def link snipmateKeyword snipKeyword
+hi def link snipmateTrigger snipSnippetTrigger
+hi def link snipmateDescription snipSnippetDocString
+
+hi def link snipmateCommand snipCommand
+
+" }}}1
+
+let b:current_syntax = "snippets"
diff --git a/vim/plugins/ultisnips/test/__init__.py b/vim/plugins/ultisnips/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/vim/plugins/ultisnips/test/constant.py b/vim/plugins/ultisnips/test/constant.py
new file mode 100644
index 0000000..0e795e0
--- /dev/null
+++ b/vim/plugins/ultisnips/test/constant.py
@@ -0,0 +1,24 @@
+import sys
+
+# Some constants for better reading
+BS = '\x7f'
+ESC = '\x1b'
+ARR_L = '\x1bOD'
+ARR_R = '\x1bOC'
+ARR_U = '\x1bOA'
+ARR_D = '\x1bOB'
+
+# multi-key sequences generating a single key press
+SEQUENCES = [ARR_L, ARR_R, ARR_U, ARR_D]
+
+# Defined Constants
+JF = '?'  # Jump forwards
+JB = '+'  # Jump backwards
+LS = '@'  # List snippets
+EX = '\t'  # EXPAND
+EA = '#'  # Expand anonymous
+
+COMPL_KW = chr(24) + chr(14)
+COMPL_ACCEPT = chr(25)
+
+PYTHON3 = sys.version_info >= (3, 0)
diff --git a/vim/plugins/ultisnips/test/test_AnonymousExpansion.py b/vim/plugins/ultisnips/test/test_AnonymousExpansion.py
new file mode 100644
index 0000000..f74d3ff
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_AnonymousExpansion.py
@@ -0,0 +1,67 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Anonymous Expansion  {{{#
+
+
+class _AnonBase(_VimTest):
+    args = ''
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('inoremap <silent> %s <C-R>=UltiSnips#Anon(%s)<cr>'
+                          % (EA, self.args))
+
+
+class Anon_NoTrigger_Simple(_AnonBase):
+    args = '"simple expand"'
+    keys = 'abc' + EA
+    wanted = 'abcsimple expand'
+
+
+class Anon_NoTrigger_AfterSpace(_AnonBase):
+    args = '"simple expand"'
+    keys = 'abc ' + EA
+    wanted = 'abc simple expand'
+
+
+class Anon_NoTrigger_BeginningOfLine(_AnonBase):
+    args = r"':latex:\`$1\`$0'"
+    keys = EA + 'Hello' + JF + 'World'
+    wanted = ':latex:`Hello`World'
+
+
+class Anon_NoTrigger_FirstCharOfLine(_AnonBase):
+    args = r"':latex:\`$1\`$0'"
+    keys = ' ' + EA + 'Hello' + JF + 'World'
+    wanted = ' :latex:`Hello`World'
+
+
+class Anon_NoTrigger_Multi(_AnonBase):
+    args = '"simple $1 expand $1 $0"'
+    keys = 'abc' + EA + '123' + JF + '456'
+    wanted = 'abcsimple 123 expand 123 456'
+
+
+class Anon_Trigger_Multi(_AnonBase):
+    args = '"simple $1 expand $1 $0", "abc"'
+    keys = '123 abc' + EA + '123' + JF + '456'
+    wanted = '123 simple 123 expand 123 456'
+
+
+class Anon_Trigger_Simple(_AnonBase):
+    args = '"simple expand", "abc"'
+    keys = 'abc' + EA
+    wanted = 'simple expand'
+
+
+class Anon_Trigger_Twice(_AnonBase):
+    args = '"simple expand", "abc"'
+    keys = 'abc' + EA + '\nabc' + EX
+    wanted = 'simple expand\nabc' + EX
+
+
+class Anon_Trigger_Opts(_AnonBase):
+    args = '"simple expand", ".*abc", "desc", "r"'
+    keys = 'blah blah abc' + EA
+    wanted = 'simple expand'
+# End: Anonymous Expansion  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Autocommands.py b/vim/plugins/ultisnips/test/test_Autocommands.py
new file mode 100644
index 0000000..bcb6a56
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Autocommands.py
@@ -0,0 +1,31 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Autocommands  {{{#
+
+class Autocommands(_VimTest):
+    snippets = ('test', '[ ${1:foo} ]')
+    args = ''
+    keys = 'test' + EX + 'test' + EX + 'bar' + JF + JF + ' done ' + ESC + \
+            ':execute "normal aM" . g:mapper_call_count . "\<Esc>"' + "\n" + \
+            ':execute "normal aU" . g:unmapper_call_count . "\<Esc>"' + "\n"
+    wanted = '[ [ bar ] ] done M1U1'
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('let g:mapper_call_count = 0')
+        vim_config.append('function! CustomMapper()')
+        vim_config.append('  let g:mapper_call_count += 1')
+        vim_config.append('endfunction')
+
+        vim_config.append('let g:unmapper_call_count = 0')
+        vim_config.append('function! CustomUnmapper()')
+        vim_config.append('  let g:unmapper_call_count += 1')
+        vim_config.append('endfunction')
+
+        vim_config.append('autocmd! User UltiSnipsEnterFirstSnippet')
+        vim_config.append('autocmd User UltiSnipsEnterFirstSnippet call CustomMapper()')
+        vim_config.append('autocmd! User UltiSnipsExitLastSnippet')
+        vim_config.append('autocmd User UltiSnipsExitLastSnippet call CustomUnmapper()')
+
+# end: Autocommands  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Autotrigger.py b/vim/plugins/ultisnips/test/test_Autotrigger.py
new file mode 100644
index 0000000..3605da5
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Autotrigger.py
@@ -0,0 +1,71 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+def check_required_vim_version(test):
+    if test.vim_flavor == 'neovim':
+        return None
+    if not test.vim.has_version(7, 4, 214):
+        return 'Vim newer than 7.4.214 is required'
+    else:
+        return None
+
+
+class Autotrigger_CanMatchSimpleTrigger(_VimTest):
+    skip_if = check_required_vim_version
+    files = { 'us/all.snippets': r"""
+        snippet a "desc" A
+        autotriggered
+        endsnippet
+        """}
+    keys = 'a'
+    wanted = 'autotriggered'
+
+
+class Autotrigger_CanMatchContext(_VimTest):
+    skip_if = check_required_vim_version
+    files = { 'us/all.snippets': r"""
+        snippet a "desc" "snip.line == 2" Ae
+        autotriggered
+        endsnippet
+        """}
+    keys = 'a\na'
+    wanted = 'autotriggered\na'
+
+
+class Autotrigger_CanExpandOnTriggerWithLengthMoreThanOne(_VimTest):
+    skip_if = check_required_vim_version
+    files = { 'us/all.snippets': r"""
+        snippet abc "desc" A
+        autotriggered
+        endsnippet
+        """}
+    keys = 'abc'
+    wanted = 'autotriggered'
+
+
+class Autotrigger_WillProduceNoExceptionWithVimLowerThan214(_VimTest):
+    skip_if = lambda self: 'Vim older than 7.4.214 is required' \
+        if self.vim.has_version(7, 4, 214) else None
+
+    files = { 'us/all.snippets': r"""
+        snippet abc "desc" A
+        autotriggered
+        endsnippet
+        """}
+    keys = 'abc'
+    wanted = 'abc'
+
+
+class Autotrigger_CanMatchPreviouslySelectedPlaceholder(_VimTest):
+    skip_if = check_required_vim_version
+
+    files = { 'us/all.snippets': r"""
+        snippet if "desc"
+        if ${1:var}: pass
+        endsnippet
+        snippet = "desc" "snip.last_placeholder" Ae
+        `!p snip.rv = snip.context.current_text` == nil
+        endsnippet
+        """}
+    keys = 'if' + EX + '=' + ESC + 'o='
+    wanted = 'if var == nil: pass\n='
diff --git a/vim/plugins/ultisnips/test/test_Chars.py b/vim/plugins/ultisnips/test/test_Chars.py
new file mode 100644
index 0000000..93d81ba
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Chars.py
@@ -0,0 +1,254 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+from test.util import running_on_windows
+
+# Quotes in Snippets  {{{#
+# Test for Bug #774917
+
+
+def _snip_quote(qt):
+    return (
+        ('te' + qt + 'st', 'Expand me' + qt + '!', 'test: ' + qt),
+        ('te', 'Bad', ''),
+    )
+
+
+class Snippet_With_SingleQuote(_VimTest):
+    snippets = _snip_quote("'")
+    keys = "te'st" + EX
+    wanted = "Expand me'!"
+
+
+class Snippet_With_SingleQuote_List(_VimTest):
+    snippets = _snip_quote("'")
+    keys = 'te' + LS + '2\n'
+    wanted = "Expand me'!"
+
+
+class Snippet_With_DoubleQuote(_VimTest):
+    snippets = _snip_quote('"')
+    keys = 'te"st' + EX
+    wanted = "Expand me\"!"
+
+
+class Snippet_With_DoubleQuote_List(_VimTest):
+    snippets = _snip_quote('"')
+    keys = 'te' + LS + '2\n'
+    wanted = "Expand me\"!"
+
+# End: Quotes in Snippets  #}}}
+
+# Trailing whitespace {{{#
+
+
+class RemoveTrailingWhitespace(_VimTest):
+    snippets = ('test', """Hello\t ${1:default}\n$2""", '', 's')
+    wanted = """Hello\nGoodbye"""
+    keys = 'test' + EX + BS + JF + 'Goodbye'
+
+class TrimSpacesAtEndOfLines(_VimTest):
+    snippets = ('test', """next line\n\nshould be empty""", '', 'm')
+    wanted = """\tnext line\n\n\tshould be empty"""
+    keys = '\ttest' + EX
+
+class DoNotTrimSpacesAtEndOfLinesByDefault(_VimTest):
+    snippets = ('test', """next line\n\nshould be empty""", '', '')
+    wanted = """\tnext line\n\t\n\tshould be empty"""
+    keys = '\ttest' + EX
+
+
+class LeaveTrailingWhitespace(_VimTest):
+    snippets = ('test', """Hello \t ${1:default}\n$2""")
+    wanted = """Hello \t \nGoodbye"""
+    keys = 'test' + EX + BS + JF + 'Goodbye'
+# End: Trailing whitespace #}}}
+
+# Newline in default text {{{#
+# Tests for bug 616315 #
+
+
+class TrailingNewline_TabStop_NLInsideStuffBehind(_VimTest):
+    snippets = ('test', r"""
+x${1:
+}<-behind1
+$2<-behind2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj<-behind1
+k<-behind2"""
+
+
+class TrailingNewline_TabStop_JustNL(_VimTest):
+    snippets = ('test', r"""
+x${1:
+}
+$2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k"""
+
+
+class TrailingNewline_TabStop_EndNL(_VimTest):
+    snippets = ('test', r"""
+x${1:a
+}
+$2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k"""
+
+
+class TrailingNewline_TabStop_StartNL(_VimTest):
+    snippets = ('test', r"""
+x${1:
+a}
+$2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k"""
+
+
+class TrailingNewline_TabStop_EndStartNL(_VimTest):
+    snippets = ('test', r"""
+x${1:
+a
+}
+$2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k"""
+
+
+class TrailingNewline_TabStop_NotEndStartNL(_VimTest):
+    snippets = ('test', r"""
+x${1:a
+a}
+$2""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k"""
+
+
+class TrailingNewline_TabStop_ExtraNL_ECR(_VimTest):
+    snippets = ('test', r"""
+x${1:a
+a}
+$2
+""")
+    keys = 'test' + EX + 'j' + JF + 'k'
+    wanted = """
+xj
+k
+"""
+
+
+class _MultiLineDefault(_VimTest):
+    snippets = ('test', r"""
+x${1:a
+b
+c
+d
+e
+f}
+$2""")
+
+
+class MultiLineDefault_Jump(_MultiLineDefault):
+    keys = 'test' + EX + JF + 'y'
+    wanted = """
+xa
+b
+c
+d
+e
+f
+y"""
+
+
+class MultiLineDefault_Type(_MultiLineDefault):
+    keys = 'test' + EX + 'z' + JF + 'y'
+    wanted = """
+xz
+y"""
+
+
+class MultiLineDefault_BS(_MultiLineDefault):
+    keys = 'test' + EX + BS + JF + 'y'
+    wanted = """
+x
+y"""
+
+# End: Newline in default text  #}}}
+
+# Umlauts and Special Chars  {{{#
+
+
+class _UmlautsBase(_VimTest):
+    # SendKeys can't send UTF characters
+    skip_if = lambda self: running_on_windows()
+
+
+class Snippet_With_Umlauts_List(_UmlautsBase):
+    snippets = _snip_quote('ü')
+    keys = 'te' + LS + '2\n'
+    wanted = 'Expand meü!'
+
+
+class Snippet_With_Umlauts(_UmlautsBase):
+    snippets = _snip_quote('ü')
+    keys = 'teüst' + EX
+    wanted = 'Expand meü!'
+
+
+class Snippet_With_Umlauts_TypeOn(_UmlautsBase):
+    snippets = ('ül', 'üüüüüßßßß')
+    keys = 'te ül' + EX + 'more text'
+    wanted = 'te üüüüüßßßßmore text'
+
+
+class Snippet_With_Umlauts_OverwriteFirst(_UmlautsBase):
+    snippets = ('ül', 'üü ${1:world} üü ${2:hello}ßß\nüüüü')
+    keys = 'te ül' + EX + 'more text' + JF + JF + 'end'
+    wanted = 'te üü more text üü helloßß\nüüüüend'
+
+
+class Snippet_With_Umlauts_OverwriteSecond(_UmlautsBase):
+    snippets = ('ül', 'üü ${1:world} üü ${2:hello}ßß\nüüüü')
+    keys = 'te ül' + EX + JF + 'more text' + JF + 'end'
+    wanted = 'te üü world üü more textßß\nüüüüend'
+
+
+class Snippet_With_Umlauts_OverwriteNone(_UmlautsBase):
+    snippets = ('ül', 'üü ${1:world} üü ${2:hello}ßß\nüüüü')
+    keys = 'te ül' + EX + JF + JF + 'end'
+    wanted = 'te üü world üü helloßß\nüüüüend'
+
+
+class Snippet_With_Umlauts_Mirrors(_UmlautsBase):
+    snippets = ('ül', 'üü ${1:world} üü $1')
+    keys = 'te ül' + EX + 'hello'
+    wanted = 'te üü hello üü hello'
+
+
+class Snippet_With_Umlauts_Python(_UmlautsBase):
+    snippets = ('ül', 'üü ${1:world} üü `!p snip.rv = len(t[1])*"a"`')
+    keys = 'te ül' + EX + 'hüüll'
+    wanted = 'te üü hüüll üü aaaaa'
+
+class UmlautsBeforeTriggerAndCharsAfter(_UmlautsBase):
+    snippets = ('trig', 'success')
+    keys = 'ööuu trig b' + 2 * ARR_L + EX
+    wanted = 'ööuu success b'
+
+class NoUmlautsBeforeTriggerAndCharsAfter(_UmlautsBase):
+    snippets = ('trig', 'success')
+    keys = 'oouu trig b' + 2 * ARR_L + EX
+    wanted = 'oouu success b'
+
+# End: Umlauts and Special Chars  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Completion.py b/vim/plugins/ultisnips/test/test_Completion.py
new file mode 100644
index 0000000..0d95c61
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Completion.py
@@ -0,0 +1,34 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Tab Completion of Words  {{{#
+
+
+class Completion_SimpleExample_ECR(_VimTest):
+    snippets = ('test', '$1 ${1:blah}')
+    keys = 'superkallifragilistik\ntest' + EX + 'sup' + COMPL_KW + \
+        COMPL_ACCEPT + ' some more'
+    wanted = 'superkallifragilistik\nsuperkallifragilistik some more ' \
+        'superkallifragilistik some more'
+
+# We need >2 different words with identical starts to create the
+# popup-menu:
+COMPLETION_OPTIONS = 'completion1\ncompletion2\n'
+
+
+class Completion_ForwardsJumpWithoutCOMPL_ACCEPT(_VimTest):
+    # completions should not be truncated when JF is activated without having
+    # pressed COMPL_ACCEPT (Bug #598903)
+    snippets = ('test', '$1 $2')
+    keys = COMPLETION_OPTIONS + 'test' + EX + 'com' + COMPL_KW + JF + 'foo'
+    wanted = COMPLETION_OPTIONS + 'completion1 foo'
+
+
+class Completion_BackwardsJumpWithoutCOMPL_ACCEPT(_VimTest):
+    # completions should not be truncated when JB is activated without having
+    # pressed COMPL_ACCEPT (Bug #598903)
+    snippets = ('test', '$1 $2')
+    keys = COMPLETION_OPTIONS + 'test' + EX + 'foo' + JF + 'com' + COMPL_KW + \
+        JB + 'foo'
+    wanted = COMPLETION_OPTIONS + 'foo completion1'
+# End: Tab Completion of Words  #}}}
diff --git a/vim/plugins/ultisnips/test/test_ContextSnippets.py b/vim/plugins/ultisnips/test/test_ContextSnippets.py
new file mode 100644
index 0000000..452b02c
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_ContextSnippets.py
@@ -0,0 +1,198 @@
+from test.constant import *
+from test.vim_test_case import VimTestCase as _VimTest
+
+
+class ContextSnippets_SimpleSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet a "desc" "True" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = 'abc'
+
+class ContextSnippets_ExpandOnTrue(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def check_context():
+            return True
+        endglobal
+
+        snippet a "desc" "check_context()" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = 'abc'
+
+
+class ContextSnippets_DoNotExpandOnFalse(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def check_context():
+            return False
+        endglobal
+
+        snippet a "desc" "check_context()" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = keys
+
+
+class ContextSnippets_UseContext(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def wrap(ins):
+            return "< " + ins + " >"
+        endglobal
+
+        snippet a "desc" "wrap(snip.buffer[snip.line])" e
+        { `!p snip.rv = context` }
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = '{ < a > }'
+
+
+class ContextSnippets_SnippetPriority(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet i "desc" "re.search('err :=', snip.buffer[snip.line-1])" e
+        if err != nil {
+            ${1:// pass}
+        }
+        endsnippet
+
+        snippet i
+        if ${1:true} {
+            ${2:// pass}
+        }
+        endsnippet
+        """}
+
+    keys = r"""
+        err := some_call()
+        i""" + EX + JF +  """
+        i""" + EX
+    wanted = r"""
+        err := some_call()
+        if err != nil {
+            // pass
+        }
+        if true {
+            // pass
+        }"""
+
+
+class ContextSnippets_PriorityKeyword(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet i "desc" "True" e
+        a
+        endsnippet
+
+        priority 100
+        snippet i
+        b
+        endsnippet
+        """}
+
+    keys = 'i' + EX
+    wanted = 'b'
+
+
+class ContextSnippets_ReportError(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet e "desc" "Tru" e
+        error
+        endsnippet
+        """}
+
+    keys = 'e' + EX
+    wanted = 'e' + EX
+    expected_error = r"NameError: name 'Tru' is not defined"
+
+
+class ContextSnippets_ReportErrorOnIndexOutOfRange(_VimTest):
+    # Working around: https://github.com/neovim/python-client/issues/128.
+    skip_if = lambda self: 'Bug in Neovim.' \
+            if self.vim_flavor == 'neovim' else None
+    files = { 'us/all.snippets': r"""
+        snippet e "desc" "snip.buffer[123]" e
+        error
+        endsnippet
+        """}
+
+    keys = 'e' + EX
+    wanted = 'e' + EX
+    expected_error = r"IndexError: line number out of range"
+
+
+class ContextSnippets_CursorIsZeroBased(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet e "desc" "snip.cursor" e
+        `!p snip.rv = str(snip.context)`
+        endsnippet
+        """}
+
+    keys = "e" + EX
+    wanted = "(2, 1)"
+
+
+class ContextSnippets_ContextIsClearedBeforeExpand(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.context = 1 if snip.context is None else 2"
+        snippet e "desc" w
+        `!p snip.rv = str(snip.context)`
+        endsnippet
+        """}
+
+    keys = "e" + EX + " " + "e" + EX
+    wanted = "1 1"
+
+class ContextSnippets_ContextHasAccessToVisual(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test "desc" "snip.visual_text == '123'" we
+        Yes
+        endsnippet
+
+        snippet test "desc" w
+        No
+        endsnippet
+        """}
+
+    keys = "123" + ESC + "vhh" + EX + "test" + EX + " zzz" + ESC + \
+        "vhh" + EX + "test" + EX
+    wanted = "Yes No"
+
+
+class ContextSnippets_Header_ExpandOnTrue(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def check_context():
+            return True
+        endglobal
+
+        context "check_context()"
+        snippet a "desc" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = 'abc'
+
+
+class ContextSnippets_Header_DoNotExpandOnFalse(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def check_context():
+            return False
+        endglobal
+
+        context "check_context()"
+        snippet a "desc" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = keys
diff --git a/vim/plugins/ultisnips/test/test_Editing.py b/vim/plugins/ultisnips/test/test_Editing.py
new file mode 100644
index 0000000..c7d60af
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Editing.py
@@ -0,0 +1,152 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+
+def check_required_vim_version(test):
+    if test.vim_flavor == 'neovim':
+        return None
+    if not test.vim.has_version(7, 4, 1):
+        return 'Vim newer than 7.4.1 is required'
+    else:
+        return None
+
+
+# Undo of Snippet insertion  {{{#
+
+
+class Undo_RemoveMultilineSnippet(_VimTest):
+    snippets = ('test', 'Hello\naaa ${1} bbb\nWorld')
+    keys = 'test' + EX + ESC + 'u'
+    wanted = 'test'
+
+
+class Undo_RemoveEditInTabstop(_VimTest):
+    snippets = ('test', '$1 Hello\naaa ${1} bbb\nWorld')
+    keys = 'hello test' + EX + 'upsi' + ESC + 'hh' + 'iabcdef' + ESC + 'u'
+    wanted = 'hello upsi Hello\naaa upsi bbb\nWorld'
+
+
+class Undo_RemoveWholeSnippet(_VimTest):
+    snippets = ('test', 'Hello\n${1:Hello}World')
+    keys = 'first line\n\n\n\n\n\nthird line' + \
+        ESC + '3k0itest' + EX + ESC + 'u6j'
+    wanted = 'first line\n\n\ntest\n\n\nthird line'
+
+
+class Undo_RemoveOneSnippetByTime(_VimTest):
+    snippets = ('i', 'if:\n\t$1')
+    keys = 'i' + EX + 'i' + EX + ESC + 'u'
+    wanted = 'if:\n\ti'
+
+
+class Undo_RemoveOneSnippetByTime2(_VimTest):
+    snippets = ('i', 'if:\n\t$1')
+    keys = 'i' + EX + 'i' + EX + ESC + 'uu'
+    wanted = 'if:\n\t'
+
+
+class Undo_ChangesInPlaceholder(_VimTest):
+    snippets = ('i', 'if $1:\n\t$2')
+    keys = 'i' + EX + 'asd' + JF + ESC + 'u'
+    wanted = 'if :\n\t'
+
+
+class Undo_CompletelyUndoSnippet(_VimTest):
+    snippets = ('i', 'if $1:\n\t$2')
+    # undo 'feh'
+    # undo 'asd'
+    # undo snippet expansion
+    # undo entering of 'i'
+    keys = 'i' + EX + 'asd' + JF + 'feh' + ESC + 'uuuu'
+    wanted = ''
+
+
+class JumpForward_DefSnippet(_VimTest):
+    snippets = (
+        'test',
+        "${1}\n`!p snip.rv = '\\n'.join(t[1].split())`\n\n${0:pass}")
+    keys = 'test' + EX+ 'a b c' + JF + 'shallnot'
+    wanted = 'a b c\na\nb\nc\n\nshallnot'
+
+
+class DeleteSnippetInsertion0(_VimTest):
+    snippets = ('test', '${1:hello} $1')
+    keys = 'test' + EX + ESC + 'Vkx' + 'i\nworld\n'
+    wanted = 'world'
+
+
+class DeleteSnippetInsertion1(_VimTest):
+    snippets = ('test', r"$1${1/(.*)/(?0::.)/}")
+    keys = 'test' + EX + ESC + 'u'
+    wanted = 'test'
+
+class DoNotCrashOnUndoAndJumpInNestedSnippet(_VimTest):
+    snippets = ('test', r"if $1: $2")
+    keys = 'test' + EX + 'a' + JF + 'test' + EX + ESC + 'u' + JF
+    wanted = 'if a: test'
+# End: Undo of Snippet insertion  #}}}
+
+# Normal mode editing  {{{#
+# Test for bug #927844
+
+
+class DeleteLastTwoLinesInSnippet(_VimTest):
+    snippets = ('test', '$1hello\nnice\nworld')
+    keys = 'test' + EX + ESC + 'j2dd'
+    wanted = 'hello'
+
+
+class DeleteCurrentTabStop1_JumpBack(_VimTest):
+    snippets = ('test', '${1:hi}\nend')
+    keys = 'test' + EX + ESC + 'ddi' + JB
+    wanted = 'end'
+
+
+class DeleteCurrentTabStop2_JumpBack(_VimTest):
+    snippets = ('test', '${1:hi}\n${2:world}\nend')
+    keys = 'test' + EX + JF + ESC + 'ddi' + JB + 'hello'
+    wanted = 'hello\nend'
+
+
+class DeleteCurrentTabStop3_JumpAround(_VimTest):
+    snippets = ('test', '${1:hi}\n${2:world}\nend')
+    keys = 'test' + EX + JF + ESC + 'ddkji' + JB + 'hello' + JF + 'world'
+    wanted = 'hello\nendworld'
+
+# End: Normal mode editing  #}}}
+
+# Pressing BS in TabStop  {{{#
+# Test for Bug #774917
+
+
+class Backspace_TabStop_Zero(_VimTest):
+    snippets = ('test', 'A${1:C} ${0:DDD}', 'This is Case 1')
+    keys = 'test' + EX + 'A' + JF + BS + 'BBB'
+    wanted = 'AA BBB'
+
+
+class Backspace_TabStop_NotZero(_VimTest):
+    snippets = ('test', 'A${1:C} ${2:DDD}', 'This is Case 1')
+    keys = 'test' + EX + 'A' + JF + BS + 'BBB'
+    wanted = 'AA BBB'
+# End: Pressing BS in TabStop  #}}}
+
+class UpdateModifiedSnippetWithoutCursorMove(_VimTest):
+    skip_if = check_required_vim_version
+    snippets = ('test', '${1:one}(${2:xxx})${3:three}')
+    keys = 'test' + EX + 'aaaaa' + JF + BS + JF + '3333'
+    wanted = 'aaaaa()3333'
+
+class UpdateModifiedSnippetWithoutCursorMove2(_VimTest):
+    skip_if = check_required_vim_version
+    snippets = ('test', '''\
+private function ${1:functionName}(${2:arguments}):${3:Void}
+{
+    ${VISUAL}$0
+}''')
+    keys = 'test' + EX + 'a' + JF + BS + JF + 'Int' + JF + 'body'
+    wanted = '''\
+private function a():Int
+{
+    body
+}'''
diff --git a/vim/plugins/ultisnips/test/test_Expand.py b/vim/plugins/ultisnips/test/test_Expand.py
new file mode 100644
index 0000000..d231838
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Expand.py
@@ -0,0 +1,73 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Simple Expands  {{{#
+
+
+class _SimpleExpands(_VimTest):
+    snippets = ('hallo', 'Hallo Welt!')
+
+
+class SimpleExpand_ExpectCorrectResult(_SimpleExpands):
+    keys = 'hallo' + EX
+    wanted = 'Hallo Welt!'
+
+
+class SimpleExpandTwice_ExpectCorrectResult(_SimpleExpands):
+    keys = 'hallo' + EX + '\nhallo' + EX
+    wanted = 'Hallo Welt!\nHallo Welt!'
+
+
+class SimpleExpandNewLineAndBackspae_ExpectCorrectResult(_SimpleExpands):
+    keys = 'hallo' + EX + '\nHallo Welt!\n\n\b\b\b\b\b'
+    wanted = 'Hallo Welt!\nHallo We'
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set backspace=eol,start')
+
+
+class SimpleExpandTypeAfterExpand_ExpectCorrectResult(_SimpleExpands):
+    keys = 'hallo' + EX + 'and again'
+    wanted = 'Hallo Welt!and again'
+
+
+class SimpleExpandTypeAndDelete_ExpectCorrectResult(_SimpleExpands):
+    keys = 'na du hallo' + EX + 'and again\b\b\b\b\bblub'
+    wanted = 'na du Hallo Welt!and blub'
+
+
+class DoNotExpandAfterSpace_ExpectCorrectResult(_SimpleExpands):
+    keys = 'hallo ' + EX
+    wanted = 'hallo ' + EX
+
+
+class ExitSnippetModeAfterTabstopZero(_VimTest):
+    snippets = ('test', 'SimpleText')
+    keys = 'test' + EX + EX
+    wanted = 'SimpleText' + EX
+
+
+class ExpandInTheMiddleOfLine_ExpectCorrectResult(_SimpleExpands):
+    keys = 'Wie hallo gehts' + ESC + 'bhi' + EX
+    wanted = 'Wie Hallo Welt! gehts'
+
+
+class MultilineExpand_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'Hallo Welt!\nUnd Wie gehts')
+    keys = 'Wie hallo gehts' + ESC + 'bhi' + EX
+    wanted = 'Wie Hallo Welt!\nUnd Wie gehts gehts'
+
+
+class MultilineExpandTestTyping_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'Hallo Welt!\nUnd Wie gehts')
+    wanted = 'Wie Hallo Welt!\nUnd Wie gehtsHuiui! gehts'
+    keys = 'Wie hallo gehts' + ESC + 'bhi' + EX + 'Huiui!'
+
+
+class SimpleExpandEndingWithNewline_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'Hallo Welt\n')
+    keys = 'hallo' + EX + '\nAnd more'
+    wanted = 'Hallo Welt\n\nAnd more'
+
+
+# End: Simple Expands  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Fixes.py b/vim/plugins/ultisnips/test/test_Fixes.py
new file mode 100644
index 0000000..5ceef5d
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Fixes.py
@@ -0,0 +1,84 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Test for bug 1251994  {{{#
+
+
+class Bug1251994(_VimTest):
+    snippets = ('test', '${2:#2} ${1:#1};$0')
+    keys = '  test' + EX + 'hello' + JF + 'world' + JF + 'blub'
+    wanted = '  world hello;blub'
+# End: 1251994  #}}}
+
+# Test for https://github.com/SirVer/ultisnips/issues/157 (virtualedit) {{{#
+
+
+class VirtualEdit(_VimTest):
+    snippets = ('pd', 'padding: ${1:0}px')
+    keys = '\t\t\tpd' + EX + '2'
+    wanted = '\t\t\tpadding: 2px'
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set virtualedit=all')
+        vim_config.append('set noexpandtab')
+# End: 1251994  #}}}
+
+# Test for Github Pull Request #134 - Retain unnamed register {{{#
+
+
+class RetainsTheUnnamedRegister(_VimTest):
+    snippets = ('test', '${1:hello} ${2:world} ${0}')
+    keys = 'yank' + ESC + 'by4lea test' + EX + 'HELLO' + JF + JF + ESC + 'p'
+    wanted = 'yank HELLO world yank'
+
+
+class RetainsTheUnnamedRegister_ButOnlyOnce(_VimTest):
+    snippets = ('test', '${1:hello} ${2:world} ${0}')
+    keys = 'blahfasel' + ESC + 'v' + 4 * ARR_L + \
+        'xotest' + EX + ESC + ARR_U + 'v0xo' + ESC + 'p'
+    wanted = '\nblah\nhello world '
+# End: Github Pull Request # 134 #}}}
+
+# Test to ensure that shiftwidth follows tabstop when it's set to zero post
+# version 7.3.693. Prior to that version a shiftwidth of zero effectively
+# removes tabs.
+
+
+class ShiftWidthZero(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config += [
+            "if exists('*shiftwidth')",
+            '  set shiftwidth=0',
+            'endif',
+        ]
+    snippets = ('test', '\t${1}${0}')
+    keys = 'test' + EX + 'foo'
+    wanted = '\tfoo'
+
+# Test for https://github.com/SirVer/ultisnips/issues/171 {{{#
+# Make sure that we don't crash when trying to save and restore the clipboard
+# when it contains data that we can't coerce into Unicode.
+
+
+class NonUnicodeDataInUnnamedRegister(_VimTest):
+    snippets = ('test', 'hello')
+    keys = 'test' + EX + ESC + \
+        '\n'.join([':redir @a',
+                   ':messages',
+                   ':redir END',
+                   (":if match(@a, 'Error') != -1 | " +
+                    "call setline('.', 'error detected') | " +
+                    '3put a | ' +
+                    'endif'),
+                   ''])
+    wanted = 'hello'
+
+    def _before_test(self):
+        # The string below was the one a user had on their clipboard when
+        # encountering the UnicodeDecodeError and could not be coerced into
+        # unicode.
+        self.vim.send_to_vim(
+            ':let @" = "\\x80kdI{\\x80@7 1},' +
+            '\\x80kh\\x80kh\\x80kd\\x80kdq\\x80kb\\x1b"\n')
+# End: #171  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Folding.py b/vim/plugins/ultisnips/test/test_Folding.py
new file mode 100644
index 0000000..3a31f77
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Folding.py
@@ -0,0 +1,51 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Folding Interaction  {{{#
+
+
+class FoldingEnabled_SnippetWithFold_ExpectNoFolding(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set foldlevel=0')
+        vim_config.append('set foldmethod=marker')
+    snippets = ('test', r"""Hello {{{
+${1:Welt} }}}""")
+    keys = 'test' + EX + 'Ball'
+    wanted = """Hello {{{
+Ball }}}"""
+
+
+class FoldOverwrite_Simple_ECR(_VimTest):
+    snippets = ('fold',
+                """# ${1:Description}  `!p snip.rv = vim.eval("&foldmarker").split(",")[0]`
+
+# End: $1  `!p snip.rv = vim.eval("&foldmarker").split(",")[1]`""")
+    keys = 'fold' + EX + 'hi'
+    wanted = '# hi  {{{\n\n# End: hi  }}}'
+
+
+class Fold_DeleteMiddleLine_ECR(_VimTest):
+    snippets = ('fold',
+                """# ${1:Description}  `!p snip.rv = vim.eval("&foldmarker").split(",")[0]`
+
+
+# End: $1  `!p snip.rv = vim.eval("&foldmarker").split(",")[1]`""")
+    keys = 'fold' + EX + 'hi' + ESC + 'jdd'
+    wanted = '# hi  {{{\n\n# End: hi  }}}'
+
+
+class PerlSyntaxFold(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set foldlevel=0')
+        vim_config.append('syntax enable')
+        vim_config.append('set foldmethod=syntax')
+        vim_config.append('let g:perl_fold = 1')
+        vim_config.append('so $VIMRUNTIME/syntax/perl.vim')
+    snippets = ('test', r"""package ${1:`!v printf('c%02d', 3)`};
+${0}
+1;""")
+    keys = 'test' + EX + JF + 'sub junk {}'
+    wanted = 'package c03;\nsub junk {}\n1;'
+# End: Folding Interaction  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Format.py b/vim/plugins/ultisnips/test/test_Format.py
new file mode 100644
index 0000000..905e77e
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Format.py
@@ -0,0 +1,157 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+from test.util import running_on_windows
+
+# ExpandTab  {{{#
+
+
+class _ExpandTabs(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set expandtab')
+
+
+class RecTabStopsWithExpandtab_SimpleExample_ECR(_ExpandTabs):
+    snippets = ('m', '\tBlaahblah \t\t  ')
+    keys = 'm' + EX
+    wanted = '   Blaahblah \t\t  '
+
+
+class RecTabStopsWithExpandtab_SpecialIndentProblem_ECR(_ExpandTabs):
+    # Windows indents the Something line after pressing return, though it
+    # shouldn't because it contains a manual indent. All other vim versions do
+    # not do this. Windows vim does not interpret the changes made by :py as
+    # changes made 'manually', while the other vim version seem to do so. Since
+    # the fault is not with UltiSnips, we simply skip this test on windows
+    # completely.
+    skip_if = lambda self: running_on_windows()
+    snippets = (
+        ('m1', 'Something'),
+        ('m', '\t$0'),
+    )
+    keys = 'm' + EX + 'm1' + EX + '\nHallo'
+    wanted = '   Something\n        Hallo'
+
+    def _extra_vim_config(self, vim_config):
+        _ExpandTabs._extra_vim_config(self, vim_config)
+        vim_config.append('set indentkeys=o,O,*<Return>,<>>,{,}')
+        vim_config.append('set indentexpr=8')
+# End: ExpandTab  #}}}
+
+# Proper Indenting  {{{#
+
+
+class ProperIndenting_SimpleCase_ECR(_VimTest):
+    snippets = ('test', 'for\n    blah')
+    keys = '    test' + EX + 'Hui'
+    wanted = '    for\n        blahHui'
+
+
+class ProperIndenting_SingleLineNoReindenting_ECR(_VimTest):
+    snippets = ('test', 'hui')
+    keys = '    test' + EX + 'blah'
+    wanted = '    huiblah'
+
+
+class ProperIndenting_AutoIndentAndNewline_ECR(_VimTest):
+    snippets = ('test', 'hui')
+    keys = '    test' + EX + '\n' + 'blah'
+    wanted = '    hui\n    blah'
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set autoindent')
+# Test for bug 1073816
+
+
+class ProperIndenting_FirstLineInFile_ECR(_VimTest):
+    text_before = ''
+    text_after = ''
+    files = { 'us/all.snippets': r"""
+global !p
+def complete(t, opts):
+  if t:
+    opts = [ m[len(t):] for m in opts if m.startswith(t) ]
+  if len(opts) == 1:
+    return opts[0]
+  elif len(opts) > 1:
+    return "(" + "|".join(opts) + ")"
+  else:
+    return ""
+endglobal
+
+snippet '^#?inc' "#include <>" !r
+#include <$1`!p snip.rv = complete(t[1], ['cassert', 'cstdio', 'cstdlib', 'cstring', 'fstream', 'iostream', 'sstream'])`>
+endsnippet
+        """}
+    keys = 'inc' + EX + 'foo'
+    wanted = '#include <foo>'
+
+
+class ProperIndenting_FirstLineInFileComplete_ECR(
+        ProperIndenting_FirstLineInFile_ECR):
+    keys = 'inc' + EX + 'cstdl'
+    wanted = '#include <cstdlib>'
+# End: Proper Indenting  #}}}
+
+# Format options tests  {{{#
+
+
+class _FormatoptionsBase(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set tw=20')
+        vim_config.append('set fo=lrqntc')
+
+
+class FOSimple_Break_ExpectCorrectResult(_FormatoptionsBase):
+    snippets = ('test', '${1:longer expand}\n$1\n$0', '', 'f')
+    keys = 'test' + EX + \
+        'This is a longer text that should wrap as formatoptions are  enabled' + \
+        JF + 'end'
+    wanted = 'This is a longer\ntext that should\nwrap as\nformatoptions are\nenabled\n' + \
+        'This is a longer\ntext that should\nwrap as\nformatoptions are\nenabled\n' + \
+        'end'
+
+
+class FOTextBeforeAndAfter_ExpectCorrectResult(_FormatoptionsBase):
+    snippets = ('test', 'Before${1:longer expand}After\nstart$1end')
+    keys = 'test' + EX + 'This is a longer text that should wrap'
+    wanted = \
+        """BeforeThis is a
+longer text that
+should wrapAfter
+startThis is a
+longer text that
+should wrapend"""
+
+
+# Tests for https://bugs.launchpad.net/bugs/719998
+class FOTextAfter_ExpectCorrectResult(_FormatoptionsBase):
+    snippets = ('test', '${1:longer expand}after\nstart$1end')
+    keys = ('test' + EX + 'This is a longer snippet that should wrap properly '
+            'and the mirror below should work as well')
+    wanted = \
+        """This is a longer
+snippet that should
+wrap properly and
+the mirror below
+should work as wellafter
+startThis is a longer
+snippet that should
+wrap properly and
+the mirror below
+should work as wellend"""
+
+
+class FOWrapOnLongWord_ExpectCorrectResult(_FormatoptionsBase):
+    snippets = ('test', '${1:longer expand}after\nstart$1end')
+    keys = ('test' + EX + 'This is a longersnippet that should wrap properly')
+    wanted = \
+        """This is a
+longersnippet that
+should wrap properlyafter
+startThis is a
+longersnippet that
+should wrap properlyend"""
+# End: Format options tests  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Interpolation.py b/vim/plugins/ultisnips/test/test_Interpolation.py
new file mode 100644
index 0000000..f51935b
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Interpolation.py
@@ -0,0 +1,491 @@
+# encoding: utf-8
+import os
+
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import EX, JF, ESC
+from test.util import running_on_windows
+
+# ShellCode Interpolation  {{{#
+
+
+class TabStop_Shell_SimpleExample(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', 'hi `echo hallo` you!')
+    keys = 'test' + EX + 'and more'
+    wanted = 'hi hallo you!and more'
+
+
+class TabStop_Shell_WithUmlauts(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', 'hi `echo höüäh` you!')
+    keys = 'test' + EX + 'and more'
+    wanted = 'hi höüäh you!and more'
+
+
+class TabStop_Shell_TextInNextLine(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', 'hi `echo hallo`\nWeiter')
+    keys = 'test' + EX + 'and more'
+    wanted = 'hi hallo\nWeiterand more'
+
+
+class TabStop_Shell_InDefValue_Leave(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', 'Hallo ${1:now `echo fromecho`} end')
+    keys = 'test' + EX + JF + 'and more'
+    wanted = 'Hallo now fromecho endand more'
+
+
+class TabStop_Shell_InDefValue_Overwrite(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', 'Hallo ${1:now `echo fromecho`} end')
+    keys = 'test' + EX + 'overwrite' + JF + 'and more'
+    wanted = 'Hallo overwrite endand more'
+
+
+class TabStop_Shell_TestEscapedChars_Overwrite(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', r"""`echo \`echo "\\$hi"\``""")
+    keys = 'test' + EX
+    wanted = '$hi'
+
+
+class TabStop_Shell_TestEscapedCharsAndShellVars_Overwrite(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', r"""`hi="blah"; echo \`echo "$hi"\``""")
+    keys = 'test' + EX
+    wanted = 'blah'
+
+
+class TabStop_Shell_ShebangPython(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = ('test', """Hallo ${1:now `#!/usr/bin/env %s
+print "Hallo Welt"
+`} end""" % (os.environ.get('PYTHON', 'python2'),))
+    keys = 'test' + EX + JF + 'and more'
+    wanted = 'Hallo now Hallo Welt endand more'
+# End: ShellCode Interpolation  #}}}
+# VimScript Interpolation  {{{#
+
+
+class TabStop_VimScriptInterpolation_SimpleExample(_VimTest):
+    snippets = ('test', """hi `!v indent(".")` End""")
+    keys = '    test' + EX
+    wanted = '    hi 4 End'
+# End: VimScript Interpolation  #}}}
+# PythonCode Interpolation  {{{#
+# Deprecated Implementation  {{{#
+
+
+class PythonCodeOld_SimpleExample(_VimTest):
+    snippets = ('test', """hi `!p res = "Hallo"` End""")
+    keys = 'test' + EX
+    wanted = 'hi Hallo End'
+
+
+class PythonCodeOld_ReferencePlaceholderAfter(_VimTest):
+    snippets = ('test', """${1:hi} `!p res = t[1]+".blah"` End""")
+    keys = 'test' + EX + 'ho'
+    wanted = 'ho ho.blah End'
+
+
+class PythonCodeOld_ReferencePlaceholderBefore(_VimTest):
+    snippets = ('test', """`!p res = len(t[1])*"#"`\n${1:some text}""")
+    keys = 'test' + EX + 'Hallo Welt'
+    wanted = '##########\nHallo Welt'
+
+
+class PythonCodeOld_TransformedBeforeMultiLine(_VimTest):
+    snippets = ('test', """${1/.+/egal/m} ${1:`!p
+res = "Hallo"`} End""")
+    keys = 'test' + EX
+    wanted = 'egal Hallo End'
+
+
+class PythonCodeOld_IndentedMultiline(_VimTest):
+    snippets = ('test', """start `!p a = 1
+b = 2
+if b > a:
+    res = "b isbigger a"
+else:
+    res = "a isbigger b"` end""")
+    keys = '    test' + EX
+    wanted = '    start b isbigger a end'
+# End: Deprecated Implementation  #}}}
+# New Implementation  {{{#
+
+
+class PythonCode_UseNewOverOld(_VimTest):
+    snippets = ('test', """hi `!p res = "Old"
+snip.rv = "New"` End""")
+    keys = 'test' + EX
+    wanted = 'hi New End'
+
+
+class PythonCode_SimpleExample(_VimTest):
+    snippets = ('test', """hi `!p snip.rv = "Hallo"` End""")
+    keys = 'test' + EX
+    wanted = 'hi Hallo End'
+
+
+class PythonCode_SimpleExample_ReturnValueIsEmptyString(_VimTest):
+    snippets = ('test', """hi`!p snip.rv = ""`End""")
+    keys = 'test' + EX
+    wanted = 'hiEnd'
+
+
+class PythonCode_ReferencePlaceholder(_VimTest):
+    snippets = ('test', """${1:hi} `!p snip.rv = t[1]+".blah"` End""")
+    keys = 'test' + EX + 'ho'
+    wanted = 'ho ho.blah End'
+
+
+class PythonCode_ReferencePlaceholderBefore(_VimTest):
+    snippets = ('test', """`!p snip.rv = len(t[1])*"#"`\n${1:some text}""")
+    keys = 'test' + EX + 'Hallo Welt'
+    wanted = '##########\nHallo Welt'
+
+
+class PythonCode_TransformedBeforeMultiLine(_VimTest):
+    snippets = ('test', """${1/.+/egal/m} ${1:`!p
+snip.rv = "Hallo"`} End""")
+    keys = 'test' + EX
+    wanted = 'egal Hallo End'
+
+
+class PythonCode_MultilineIndented(_VimTest):
+    snippets = ('test', """start `!p a = 1
+b = 2
+if b > a:
+    snip.rv = "b isbigger a"
+else:
+    snip.rv = "a isbigger b"` end""")
+    keys = '    test' + EX
+    wanted = '    start b isbigger a end'
+
+
+class PythonCode_SimpleAppend(_VimTest):
+    snippets = ('test', """hi `!p snip.rv = "Hallo1"
+snip += "Hallo2"` End""")
+    keys = 'test' + EX
+    wanted = 'hi Hallo1\nHallo2 End'
+
+
+class PythonCode_MultiAppend(_VimTest):
+    snippets = ('test', """hi `!p snip.rv = "Hallo1"
+snip += "Hallo2"
+snip += "Hallo3"` End""")
+    keys = 'test' + EX
+    wanted = 'hi Hallo1\nHallo2\nHallo3 End'
+
+
+class PythonCode_MultiAppendSimpleIndent(_VimTest):
+    snippets = ('test', """hi
+`!p snip.rv="Hallo1"
+snip += "Hallo2"
+snip += "Hallo3"`
+End""")
+    keys = """
+    test""" + EX
+    wanted = """
+    hi
+    Hallo1
+    Hallo2
+    Hallo3
+    End"""
+
+
+class PythonCode_SimpleMkline(_VimTest):
+    snippets = ('test', r"""hi
+`!p snip.rv="Hallo1\n"
+snip.rv += snip.mkline("Hallo2") + "\n"
+snip.rv += snip.mkline("Hallo3")`
+End""")
+    keys = """
+    test""" + EX
+    wanted = """
+    hi
+    Hallo1
+    Hallo2
+    Hallo3
+    End"""
+
+
+class PythonCode_MultiAppendShift(_VimTest):
+    snippets = ('test', r"""hi
+`!p snip.rv="i1"
+snip += "i1"
+snip >> 1
+snip += "i2"
+snip << 2
+snip += "i0"
+snip >> 3
+snip += "i3"`
+End""")
+    keys = """
+	test""" + EX
+    wanted = """
+	hi
+	i1
+	i1
+		i2
+i0
+			i3
+	End"""
+
+
+class PythonCode_MultiAppendShiftMethods(_VimTest):
+    snippets = ('test', r"""hi
+`!p snip.rv="i1\n"
+snip.rv += snip.mkline("i1\n")
+snip.shift(1)
+snip.rv += snip.mkline("i2\n")
+snip.unshift(2)
+snip.rv += snip.mkline("i0\n")
+snip.shift(3)
+snip.rv += snip.mkline("i3")`
+End""")
+    keys = """
+	test""" + EX
+    wanted = """
+	hi
+	i1
+	i1
+		i2
+i0
+			i3
+	End"""
+
+
+class PythonCode_ResetIndent(_VimTest):
+    snippets = ('test', r"""hi
+`!p snip.rv="i1"
+snip >> 1
+snip += "i2"
+snip.reset_indent()
+snip += "i1"
+snip << 1
+snip += "i0"
+snip.reset_indent()
+snip += "i1"`
+End""")
+    keys = """
+	test""" + EX
+    wanted = """
+	hi
+	i1
+		i2
+	i1
+i0
+	i1
+	End"""
+
+
+class PythonCode_IndentEtSw(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set expandtab')
+    snippets = ('test', r"""hi
+`!p snip.rv = "i1"
+snip >> 1
+snip += "i2"
+snip << 2
+snip += "i0"
+snip >> 1
+snip += "i1"
+`
+End""")
+    keys = """   test""" + EX
+    wanted = """   hi
+   i1
+      i2
+i0
+   i1
+   End"""
+
+
+class PythonCode_IndentEtSwOffset(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set expandtab')
+    snippets = ('test', r"""hi
+`!p snip.rv = "i1"
+snip >> 1
+snip += "i2"
+snip << 2
+snip += "i0"
+snip >> 1
+snip += "i1"
+`
+End""")
+    keys = """    test""" + EX
+    wanted = """    hi
+    i1
+       i2
+ i0
+    i1
+    End"""
+
+
+class PythonCode_IndentNoetSwTs(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set ts=4')
+    snippets = ('test', r"""hi
+`!p snip.rv = "i1"
+snip >> 1
+snip += "i2"
+snip << 2
+snip += "i0"
+snip >> 1
+snip += "i1"
+`
+End""")
+    keys = """   test""" + EX
+    wanted = """   hi
+   i1
+\t  i2
+i0
+   i1
+   End"""
+
+# Test using 'opt'
+
+
+class PythonCode_OptExists(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('let g:UStest="yes"')
+    snippets = (
+        'test',
+        r"""hi `!p snip.rv = snip.opt("g:UStest") or "no"` End""")
+    keys = """test""" + EX
+    wanted = """hi yes End"""
+
+
+class PythonCode_OptNoExists(_VimTest):
+    snippets = (
+        'test',
+        r"""hi `!p snip.rv = snip.opt("g:UStest") or "no"` End""")
+    keys = """test""" + EX
+    wanted = """hi no End"""
+
+
+class PythonCode_IndentProblem(_VimTest):
+    # A test case which is likely related to bug 719649
+    snippets = ('test', r"""hi `!p
+snip.rv = "World"
+` End""")
+    keys = ' ' * 8 + 'test' + EX  # < 8 works.
+    wanted = """        hi World End"""
+
+
+class PythonCode_TrickyReferences(_VimTest):
+    snippets = (
+        'test',
+        r"""${2:${1/.+/egal/}} ${1:$3} ${3:`!p snip.rv = "hi"`}""")
+    keys = 'ups test' + EX
+    wanted = 'ups egal hi hi'
+# locals
+
+
+class PythonCode_Locals(_VimTest):
+    snippets = ('test', r"""hi `!p a = "test"
+snip.rv = "nothing"` `!p snip.rv = a
+` End""")
+    keys = """test""" + EX
+    wanted = """hi nothing test End"""
+
+
+class PythonCode_LongerTextThanSource_Chars(_VimTest):
+    snippets = ('test', r"""hi`!p snip.rv = "a" * 100`end""")
+    keys = """test""" + EX + 'ups'
+    wanted = 'hi' + 100 * 'a' + 'endups'
+
+
+class PythonCode_LongerTextThanSource_MultiLine(_VimTest):
+    snippets = (
+        'test',
+        r"""hi`!p snip.rv = "a" * 100 + '\n'*100 + "a"*100`end""")
+    keys = """test""" + EX + 'ups'
+    wanted = 'hi' + 100 * 'a' + 100 * '\n' + 100 * 'a' + 'endups'
+
+
+class PythonCode_AccessKilledTabstop_OverwriteSecond(_VimTest):
+    snippets = (
+        'test',
+        r"`!p snip.rv = t[2].upper()`${1:h${2:welt}o}`!p snip.rv = t[2].upper()`")
+    keys = 'test' + EX + JF + 'okay'
+    wanted = 'OKAYhokayoOKAY'
+
+
+class PythonCode_AccessKilledTabstop_OverwriteFirst(_VimTest):
+    snippets = (
+        'test',
+        r"`!p snip.rv = t[2].upper()`${1:h${2:welt}o}`!p snip.rv = t[2].upper()`")
+    keys = 'test' + EX + 'aaa'
+    wanted = 'aaa'
+
+class PythonCode_CanOverwriteTabstop(_VimTest):
+    snippets = (
+        'test',
+        """$1`!p if len(t[1]) > 3 and len(t[2]) == 0:
+            t[2] = t[1][2:];
+            t[1] = t[1][:2] + '-\\n\\t';
+            vim.command('call feedkeys("\<End>", "n")');
+            `$2""")
+    keys = 'test' + EX + 'blah' + ', bah'
+    wanted = "bl-\n\tah, bah"
+
+
+class PythonVisual_NoVisualSelection_Ignore(_VimTest):
+    snippets = ('test', 'h`!p snip.rv = snip.v.mode + snip.v.text`b')
+    keys = 'test' + EX + 'abc'
+    wanted = 'hbabc'
+
+
+class PythonVisual_SelectOneWord(_VimTest):
+    snippets = ('test', 'h`!p snip.rv = snip.v.mode + snip.v.text`b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hvblablubb'
+
+
+class PythonVisual_LineSelect_Simple(_VimTest):
+    snippets = ('test', 'h`!p snip.rv = snip.v.mode + snip.v.text`b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'hVhello\nnice\nworld\nb'
+
+class PythonVisual_HasAccessToSelectedPlaceholders(_VimTest):
+    snippets = (
+        'test',
+        """${1:first} ${2:second} (`!p
+snip.rv = "placeholder: " + snip.p.current_text`)"""
+    )
+    keys = 'test' + EX + ESC + "otest" + EX + JF + ESC
+    wanted = """first second (placeholder: first)
+first second (placeholder: second)"""
+
+class PythonVisual_HasAccessToZeroPlaceholders(_VimTest):
+    snippets = (
+        'test',
+        """${1:first} ${2:second} (`!p
+snip.rv = "placeholder: " + snip.p.current_text`)"""
+    )
+    keys = 'test' + EX + ESC + "otest" + EX + JF + JF + JF + JF
+    wanted = """first second (placeholder: first second (placeholder: ))
+first second (placeholder: )"""
+
+# Tests for https://bugs.launchpad.net/bugs/1259349
+
+
+class Python_WeirdScoping_Error(_VimTest):
+    snippets = (
+        'test',
+        "h`!p import re; snip.rv = '%i' % len([re.search for i in 'aiiia'])`b")
+    keys = 'test' + EX
+    wanted = 'h5b'
+# End: New Implementation  #}}}
+# End: PythonCode Interpolation  #}}}
diff --git a/vim/plugins/ultisnips/test/test_ListSnippets.py b/vim/plugins/ultisnips/test/test_ListSnippets.py
new file mode 100644
index 0000000..4b54631
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_ListSnippets.py
@@ -0,0 +1,43 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# List Snippets  {{{#
+
+
+class _ListAllSnippets(_VimTest):
+    snippets = (('testblah', 'BLAAH', 'Say BLAH'),
+                ('test', 'TEST ONE', 'Say tst one'),
+                ('aloha', 'OHEEEE', 'Say OHEE'),
+                )
+
+
+class ListAllAvailable_NothingTyped_ExpectCorrectResult(_ListAllSnippets):
+    keys = '' + LS + '3\n'
+    wanted = 'BLAAH'
+
+
+class ListAllAvailable_SpaceInFront_ExpectCorrectResult(_ListAllSnippets):
+    keys = ' ' + LS + '3\n'
+    wanted = ' BLAAH'
+
+
+class ListAllAvailable_BraceInFront_ExpectCorrectResult(_ListAllSnippets):
+    keys = '} ' + LS + '3\n'
+    wanted = '} BLAAH'
+
+
+class ListAllAvailable_testtyped_ExpectCorrectResult(_ListAllSnippets):
+    keys = 'hallo test' + LS + '2\n'
+    wanted = 'hallo BLAAH'
+
+
+class ListAllAvailable_testtypedSecondOpt_ExpectCorrectResult(
+        _ListAllSnippets):
+    keys = 'hallo test' + LS + '1\n'
+    wanted = 'hallo TEST ONE'
+
+
+class ListAllAvailable_NonDefined_NoExpectionShouldBeRaised(_ListAllSnippets):
+    keys = 'hallo qualle' + LS + 'Hi'
+    wanted = 'hallo qualleHi'
+# End: List Snippets  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Mirror.py b/vim/plugins/ultisnips/test/test_Mirror.py
new file mode 100644
index 0000000..a6076bf
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Mirror.py
@@ -0,0 +1,272 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Mirrors  {{{#
+
+
+class TextTabStopTextAfterTab_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 Hinten\n$1')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo Hinten\nhallo'
+
+
+class TextTabStopTextBeforeTab_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'Vorne $1\n$1')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'Vorne hallo\nhallo'
+
+
+class TextTabStopTextSurroundedTab_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'Vorne $1 Hinten\n$1')
+    keys = 'test' + EX + 'hallo test'
+    wanted = 'Vorne hallo test Hinten\nhallo test'
+
+
+class TextTabStopTextBeforeMirror_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\nVorne $1')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo\nVorne hallo'
+
+
+class TextTabStopAfterMirror_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1 Hinten')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo\nhallo Hinten'
+
+
+class TextTabStopSurroundMirror_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\nVorne $1 Hinten')
+    keys = 'test' + EX + 'hallo welt'
+    wanted = 'hallo welt\nVorne hallo welt Hinten'
+
+
+class TextTabStopAllSurrounded_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ObenVorne $1 ObenHinten\nVorne $1 Hinten')
+    keys = 'test' + EX + 'hallo welt'
+    wanted = 'ObenVorne hallo welt ObenHinten\nVorne hallo welt Hinten'
+
+
+class MirrorBeforeTabstopLeave_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1:this is it} $1')
+    keys = 'test' + EX
+    wanted = 'this is it this is it this is it'
+
+
+class MirrorBeforeTabstopOverwrite_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1:this is it} $1')
+    keys = 'test' + EX + 'a'
+    wanted = 'a a a'
+
+
+class TextTabStopSimpleMirrorMultiline_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo\nhallo'
+
+
+class SimpleMirrorMultilineMany_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '    $1\n$1\na$1b\n$1\ntest $1 mich')
+    keys = 'test' + EX + 'hallo'
+    wanted = '    hallo\nhallo\nahallob\nhallo\ntest hallo mich'
+
+
+class MultilineTabStopSimpleMirrorMultiline_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n\n$1\n\n$1')
+    keys = 'test' + EX + 'hallo Du\nHi'
+    wanted = 'hallo Du\nHi\n\nhallo Du\nHi\n\nhallo Du\nHi'
+
+
+class MultilineTabStopSimpleMirrorMultiline1_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1\n$1')
+    keys = 'test' + EX + 'hallo Du\nHi'
+    wanted = 'hallo Du\nHi\nhallo Du\nHi\nhallo Du\nHi'
+
+
+class MultilineTabStopSimpleMirrorDeleteInLine_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1\n$1')
+    keys = 'test' + EX + 'hallo Du\nHi\b\bAch Blah'
+    wanted = 'hallo Du\nAch Blah\nhallo Du\nAch Blah\nhallo Du\nAch Blah'
+
+
+class TextTabStopSimpleMirrorMultilineMirrorInFront_ECR(_VimTest):
+    snippets = ('test', '$1\n${1:sometext}')
+    keys = 'test' + EX + 'hallo\nagain'
+    wanted = 'hallo\nagain\nhallo\nagain'
+
+
+class SimpleMirrorDelete_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1')
+    keys = 'test' + EX + 'hallo\b\b'
+    wanted = 'hal\nhal'
+
+
+class SimpleMirrorSameLine_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 $1')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo hallo'
+
+
+class SimpleMirrorSameLine_InText_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 $1')
+    keys = 'ups test blah' + ESC + '02f i' + EX + 'hallo'
+    wanted = 'ups hallo hallo blah'
+
+
+class SimpleMirrorSameLineBeforeTabDefVal_ECR(_VimTest):
+    snippets = ('test', '$1 ${1:replace me}')
+    keys = 'test' + EX + 'hallo foo'
+    wanted = 'hallo foo hallo foo'
+
+
+class SimpleMirrorSameLineBeforeTabDefVal_DelB4Typing_ECR(_VimTest):
+    snippets = ('test', '$1 ${1:replace me}')
+    keys = 'test' + EX + BS + 'hallo foo'
+    wanted = 'hallo foo hallo foo'
+
+
+class SimpleMirrorSameLineMany_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 $1 $1 $1')
+    keys = 'test' + EX + 'hallo du'
+    wanted = 'hallo du hallo du hallo du hallo du'
+
+
+class SimpleMirrorSameLineManyMultiline_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 $1 $1 $1')
+    keys = 'test' + EX + 'hallo du\nwie gehts'
+    wanted = 'hallo du\nwie gehts hallo du\nwie gehts hallo du\nwie gehts' \
+        ' hallo du\nwie gehts'
+
+
+class SimpleMirrorDeleteSomeEnterSome_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1\n$1')
+    keys = 'test' + EX + 'hallo\b\bhups'
+    wanted = 'halhups\nhalhups'
+
+
+class SimpleTabstopWithDefaultSimpelType_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:defa}\n$1')
+    keys = 'test' + EX + 'world'
+    wanted = 'ha world\nworld'
+
+
+class SimpleTabstopWithDefaultComplexType_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:default value} $1\nanother: $1 mirror')
+    keys = 'test' + EX + 'world'
+    wanted = 'ha world world\nanother: world mirror'
+
+
+class SimpleTabstopWithDefaultSimpelKeep_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:defa}\n$1')
+    keys = 'test' + EX
+    wanted = 'ha defa\ndefa'
+
+
+class SimpleTabstopWithDefaultComplexKeep_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:default value} $1\nanother: $1 mirror')
+    keys = 'test' + EX
+    wanted = 'ha default value default value\nanother: default value mirror'
+
+
+class TabstopWithMirrorManyFromAll_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $5 ${1:blub} $4 $0 ${2:$1.h} $1 $3 ${4:More}')
+    keys = 'test' + EX + 'hi' + JF + 'hu' + JF + 'hub' + JF + 'hulla' + \
+        JF + 'blah' + JF + 'end'
+    wanted = 'ha blah hi hulla end hu hi hub hulla'
+
+
+class TabstopWithMirrorInDefaultNoType_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:blub} ${2:$1.h}')
+    keys = 'test' + EX
+    wanted = 'ha blub blub.h'
+
+
+class TabstopWithMirrorInDefaultNoType1_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha ${1:blub} ${2:$1}')
+    keys = 'test' + EX
+    wanted = 'ha blub blub'
+
+
+class TabstopWithMirrorInDefaultTwiceAndExtra_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $1 ${2:$1.h $1.c}\ntest $1')
+    keys = 'test' + EX + 'stdin'
+    wanted = 'ha stdin stdin.h stdin.c\ntest stdin'
+
+
+class TabstopWithMirrorInDefaultMultipleLeave_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $1 ${2:snip} ${3:$1.h $2}')
+    keys = 'test' + EX + 'stdin'
+    wanted = 'ha stdin snip stdin.h snip'
+
+
+class TabstopWithMirrorInDefaultMultipleOverwrite_ExpectCorrectResult(
+        _VimTest):
+    snippets = ('test', 'ha $1 ${2:snip} ${3:$1.h $2}')
+    keys = 'test' + EX + 'stdin' + JF + 'do snap'
+    wanted = 'ha stdin do snap stdin.h do snap'
+
+
+class TabstopWithMirrorInDefaultOverwrite_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $1 ${2:$1.h}')
+    keys = 'test' + EX + 'stdin' + JF + 'overwritten'
+    wanted = 'ha stdin overwritten'
+
+
+class TabstopWithMirrorInDefaultOverwrite1_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $1 ${2:$1}')
+    keys = 'test' + EX + 'stdin' + JF + 'overwritten'
+    wanted = 'ha stdin overwritten'
+
+
+class TabstopWithMirrorInDefaultNoOverwrite1_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'ha $1 ${2:$1}')
+    keys = 'test' + EX + 'stdin' + JF + JF + 'end'
+    wanted = 'ha stdin stdinend'
+
+
+class MirrorRealLifeExample_ExpectCorrectResult(_VimTest):
+    snippets = (
+        ('for', 'for(size_t ${2:i} = 0; $2 < ${1:count}; ${3:++$2})'
+         '\n{\n\t${0:/* code */}\n}'),
+    )
+    keys = 'for' + EX + '100' + JF + 'avar\b\b\b\ba_variable' + JF + \
+        'a_variable *= 2' + JF + '// do nothing'
+    wanted = """for(size_t a_variable = 0; a_variable < 100; a_variable *= 2)
+{
+\t// do nothing
+}"""
+
+
+class Mirror_TestKill_InsertBefore_NoKill(_VimTest):
+    snippets = 'test', '$1 $1_'
+    keys = 'hallo test' + EX + 'auch' + ESC + \
+        'wihi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noauch hinoauch_end'
+
+
+class Mirror_TestKill_InsertAfter_NoKill(_VimTest):
+    snippets = 'test', '$1 $1_'
+    keys = 'hallo test' + EX + 'auch' + ESC + \
+        'eiab' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noauch noauchab_end'
+
+
+class Mirror_TestKill_InsertBeginning_Kill(_VimTest):
+    snippets = 'test', '$1 $1_'
+    keys = 'hallo test' + EX + 'auch' + ESC + \
+        'wahi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noauch ahiuch_end'
+
+
+class Mirror_TestKill_InsertEnd_Kill(_VimTest):
+    snippets = 'test', '$1 $1_'
+    keys = 'hallo test' + EX + 'auch' + ESC + \
+        'ehihi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noauch auchih_end'
+
+
+class Mirror_TestKillTabstop_Kill(_VimTest):
+    snippets = 'test', 'welt${1:welt${2:welt}welt} $2'
+    keys = 'hallo test' + EX + 'elt'
+    wanted = 'hallo weltelt '
+
+# End: Mirrors  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Movement.py b/vim/plugins/ultisnips/test/test_Movement.py
new file mode 100644
index 0000000..51b0c10
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Movement.py
@@ -0,0 +1,83 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Cursor Movement  {{{#
+
+
+class CursorMovement_Multiline_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1:a tab}")
+    keys = 'test' + EX + 'this is something\nvery nice\nnot' + JF + 'more text'
+    wanted = 'this is something\nvery nice\nnot ' \
+        'this is something\nvery nice\nnotmore text'
+
+
+class CursorMovement_BS_InEditMode(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set backspace=eol,indent,start')
+    snippets = ('<trh', '<tr>\n\t<th>$1</th>\n\t$2\n</tr>\n$3')
+    keys = '<trh' + EX + 'blah' + JF + BS + BS + JF + 'end'
+    wanted = '<tr>\n\t<th>blah</th>\n</tr>\nend'
+# End: Cursor Movement  #}}}
+# Insert Mode Moving  {{{#
+
+
+class IMMoving_CursorsKeys_ECR(_VimTest):
+    snippets = ('test', '${1:Some}')
+    keys = 'test' + EX + 'text' + 3 * ARR_U + 6 * ARR_D
+    wanted = 'text'
+
+
+class IMMoving_AcceptInputWhenMoved_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1:a tab}")
+    keys = 'test' + EX + 'this' + 2 * ARR_L + 'hallo\nwelt'
+    wanted = 'thhallo\nweltis thhallo\nweltis'
+
+
+class IMMoving_NoExiting_ECR(_VimTest):
+    snippets = ('test', r"$1 ${2:a tab} ${1:Tab}")
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + 7 * ARR_L + \
+        JF + 'hallo'
+    wanted = 'hello tab hallo tab this'
+
+
+class IMMoving_NoExitingEventAtEnd_ECR(_VimTest):
+    snippets = ('test', r"$1 ${2:a tab} ${1:Tab}")
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + JF + 'hallo'
+    wanted = 'hello tab hallo tab this'
+
+
+class IMMoving_ExitWhenOutsideRight_ECR(_VimTest):
+    snippets = ('test', r"$1 ${2:blub} ${1:Tab}")
+    keys = 'hello test this' + ESC + '02f i' + \
+        EX + 'tab' + ARR_R + JF + 'hallo'
+    wanted = 'hello tab blub tab ' + JF + 'hallothis'
+
+
+class IMMoving_NotExitingWhenBarelyOutsideLeft_ECR(_VimTest):
+    snippets = ('test', r"${1:Hi} ${2:blub}")
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + 3 * ARR_L + \
+        JF + 'hallo'
+    wanted = 'hello tab hallo this'
+
+
+class IMMoving_ExitWhenOutsideLeft_ECR(_VimTest):
+    snippets = ('test', r"${1:Hi} ${2:blub}")
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + 4 * ARR_L + \
+        JF + 'hallo'
+    wanted = 'hello' + JF + 'hallo tab blub this'
+
+
+class IMMoving_ExitWhenOutsideAbove_ECR(_VimTest):
+    snippets = ('test', '${1:Hi}\n${2:blub}')
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + 1 * ARR_U + '\n' + JF + \
+        'hallo'
+    wanted = JF + 'hallo\nhello tab\nblub this'
+
+
+class IMMoving_ExitWhenOutsideBelow_ECR(_VimTest):
+    snippets = ('test', '${1:Hi}\n${2:blub}')
+    keys = 'hello test this' + ESC + '02f i' + EX + 'tab' + 2 * ARR_D + JF + \
+        'testhallo\n'
+    wanted = 'hello tab\nblub this\n' + JF + 'testhallo'
+# End: Insert Mode Moving  #}}}
diff --git a/vim/plugins/ultisnips/test/test_MultipleMatches.py b/vim/plugins/ultisnips/test/test_MultipleMatches.py
new file mode 100644
index 0000000..b38bc67
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_MultipleMatches.py
@@ -0,0 +1,72 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Selecting Between Same Triggers  {{{#
+
+
+class _MultipleMatches(_VimTest):
+    snippets = (('test', 'Case1', 'This is Case 1'),
+                ('test', 'Case2', 'This is Case 2'))
+
+
+class Multiple_SimpleCaseSelectFirst_ECR(_MultipleMatches):
+    keys = 'test' + EX + '1\n'
+    wanted = 'Case1'
+
+
+class Multiple_SimpleCaseSelectSecond_ECR(_MultipleMatches):
+    keys = 'test' + EX + '2\n'
+    wanted = 'Case2'
+
+
+class Multiple_SimpleCaseSelectTooHigh_ESelectLast(_MultipleMatches):
+    keys = 'test' + EX + '5\n'
+    wanted = 'Case2'
+
+
+class Multiple_SimpleCaseSelectZero_EEscape(_MultipleMatches):
+    keys = 'test' + EX + '0\n' + 'hi'
+    wanted = 'testhi'
+
+
+class Multiple_SimpleCaseEscapeOut_ECR(_MultipleMatches):
+    keys = 'test' + EX + ESC + 'hi'
+    wanted = 'testhi'
+
+
+class Multiple_ManySnippetsOneTrigger_ECR(_VimTest):
+    # Snippet definition {{{#
+    snippets = (
+        ('test', 'Case1', 'This is Case 1'),
+        ('test', 'Case2', 'This is Case 2'),
+        ('test', 'Case3', 'This is Case 3'),
+        ('test', 'Case4', 'This is Case 4'),
+        ('test', 'Case5', 'This is Case 5'),
+        ('test', 'Case6', 'This is Case 6'),
+        ('test', 'Case7', 'This is Case 7'),
+        ('test', 'Case8', 'This is Case 8'),
+        ('test', 'Case9', 'This is Case 9'),
+        ('test', 'Case10', 'This is Case 10'),
+        ('test', 'Case11', 'This is Case 11'),
+        ('test', 'Case12', 'This is Case 12'),
+        ('test', 'Case13', 'This is Case 13'),
+        ('test', 'Case14', 'This is Case 14'),
+        ('test', 'Case15', 'This is Case 15'),
+        ('test', 'Case16', 'This is Case 16'),
+        ('test', 'Case17', 'This is Case 17'),
+        ('test', 'Case18', 'This is Case 18'),
+        ('test', 'Case19', 'This is Case 19'),
+        ('test', 'Case20', 'This is Case 20'),
+        ('test', 'Case21', 'This is Case 21'),
+        ('test', 'Case22', 'This is Case 22'),
+        ('test', 'Case23', 'This is Case 23'),
+        ('test', 'Case24', 'This is Case 24'),
+        ('test', 'Case25', 'This is Case 25'),
+        ('test', 'Case26', 'This is Case 26'),
+        ('test', 'Case27', 'This is Case 27'),
+        ('test', 'Case28', 'This is Case 28'),
+        ('test', 'Case29', 'This is Case 29'),
+    )  # }}}
+    keys = 'test' + EX + ' ' + ESC + ESC + 'ahi'
+    wanted = 'testhi'
+# End: Selecting Between Same Triggers  #}}}
diff --git a/vim/plugins/ultisnips/test/test_ParseSnippets.py b/vim/plugins/ultisnips/test/test_ParseSnippets.py
new file mode 100644
index 0000000..f9b4d3b
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_ParseSnippets.py
@@ -0,0 +1,316 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+
+class ParseSnippets_SimpleSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet testsnip "Test Snippet" b!
+        This is a test snippet!
+        endsnippet
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'This is a test snippet!'
+
+
+class ParseSnippets_MissingEndSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet testsnip "Test Snippet" b!
+        This is a test snippet!
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+    expected_error = r"Missing 'endsnippet' for 'testsnip' in \S+:4"
+
+
+class ParseSnippets_UnknownDirective(_VimTest):
+    files = { 'us/all.snippets': r"""
+        unknown directive
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+    expected_error = r"Invalid line 'unknown directive' in \S+:2"
+
+
+class ParseSnippets_InvalidPriorityLine(_VimTest):
+    files = { 'us/all.snippets': r"""
+        priority - 50
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+    expected_error = r"Invalid priority '- 50' in \S+:2"
+
+
+class ParseSnippets_InvalidPriorityLine1(_VimTest):
+    files = { 'us/all.snippets': r"""
+        priority
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+    expected_error = r"Invalid priority '' in \S+:2"
+
+
+class ParseSnippets_ExtendsWithoutFiletype(_VimTest):
+    files = { 'us/all.snippets': r"""
+        extends
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+    expected_error = r"'extends' without file types in \S+:2"
+
+
+class ParseSnippets_ClearAll(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet testsnip "Test snippet"
+        This is a test.
+        endsnippet
+
+        clearsnippets
+        """}
+    keys = 'testsnip' + EX
+    wanted = 'testsnip' + EX
+
+
+class ParseSnippets_ClearOne(_VimTest):
+    files = { 'us/all.snippets': r"""
+        clearsnippets toclear
+
+        snippet testsnip "Test snippet"
+        This is a test.
+        endsnippet
+
+        snippet toclear "Snippet to clear"
+        Do not expand.
+        endsnippet
+        """}
+    keys = 'toclear' + EX + '\n' + 'testsnip' + EX
+    wanted = 'toclear' + EX + '\n' + 'This is a test.'
+
+
+class ParseSnippets_ClearTwo(_VimTest):
+    files = { 'us/all.snippets': r"""
+        clearsnippets testsnip toclear
+
+        snippet testsnip "Test snippet"
+        This is a test.
+        endsnippet
+
+        snippet toclear "Snippet to clear"
+        Do not expand.
+        endsnippet
+        """}
+    keys = 'toclear' + EX + '\n' + 'testsnip' + EX
+    wanted = 'toclear' + EX + '\n' + 'testsnip' + EX
+
+
+class _ParseSnippets_MultiWord(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet /test snip/
+        This is a test.
+        endsnippet
+
+        snippet !snip test! "Another snippet"
+        This is another test.
+        endsnippet
+
+        snippet "snippet test" "Another snippet" b
+        This is yet another test.
+        endsnippet
+        """}
+
+
+class ParseSnippets_MultiWord_Simple(_ParseSnippets_MultiWord):
+    keys = 'test snip' + EX
+    wanted = 'This is a test.'
+
+
+class ParseSnippets_MultiWord_Description(_ParseSnippets_MultiWord):
+    keys = 'snip test' + EX
+    wanted = 'This is another test.'
+
+
+class ParseSnippets_MultiWord_Description_Option(_ParseSnippets_MultiWord):
+    keys = 'snippet test' + EX
+    wanted = 'This is yet another test.'
+
+
+class _ParseSnippets_MultiWord_RE(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet /[d-f]+/ "" r
+        az test
+        endsnippet
+
+        snippet !^(foo|bar)$! "" r
+        foo-bar test
+        endsnippet
+
+        snippet "(test ?)+" "" r
+        re-test
+        endsnippet
+        """}
+
+
+class ParseSnippets_MultiWord_RE1(_ParseSnippets_MultiWord_RE):
+    keys = 'abc def' + EX
+    wanted = 'abc az test'
+
+
+class ParseSnippets_MultiWord_RE2(_ParseSnippets_MultiWord_RE):
+    keys = 'foo' + EX + ' bar' + EX + '\nbar' + EX
+    wanted = 'foo-bar test bar\t\nfoo-bar test'
+
+
+class ParseSnippets_MultiWord_RE3(_ParseSnippets_MultiWord_RE):
+    keys = 'test test test' + EX
+    wanted = 're-test'
+
+
+class ParseSnippets_MultiWord_Quotes(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet "test snip"
+        This is a test.
+        endsnippet
+        """}
+    keys = 'test snip' + EX
+    wanted = 'This is a test.'
+
+
+class ParseSnippets_MultiWord_WithQuotes(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet !"test snip"!
+        This is a test.
+        endsnippet
+        """}
+    keys = '"test snip"' + EX
+    wanted = 'This is a test.'
+
+
+class ParseSnippets_MultiWord_NoContainer(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test snip
+        This is a test.
+        endsnippet
+        """}
+    keys = 'test snip' + EX
+    wanted = keys
+    expected_error = "Invalid multiword trigger: 'test snip' in \S+:2"
+
+
+class ParseSnippets_MultiWord_UnmatchedContainer(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet !inv snip/
+        This is a test.
+        endsnippet
+        """}
+    keys = 'inv snip' + EX
+    wanted = keys
+    expected_error = "Invalid multiword trigger: '!inv snip/' in \S+:2"
+
+
+class ParseSnippets_Global_Python(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def tex(ins):
+            return "a " + ins + " b"
+        endglobal
+
+        snippet ab
+        x `!p snip.rv = tex("bob")` y
+        endsnippet
+
+        snippet ac
+        x `!p snip.rv = tex("jon")` y
+        endsnippet
+        """}
+    keys = 'ab' + EX + '\nac' + EX
+    wanted = 'x a bob b y\nx a jon b y'
+
+
+class ParseSnippets_Global_Local_Python(_VimTest):
+    files = { 'us/all.snippets': r"""
+global !p
+def tex(ins):
+    return "a " + ins + " b"
+endglobal
+
+snippet ab
+x `!p first = tex("bob")
+snip.rv = "first"` `!p snip.rv = first` y
+endsnippet
+        """}
+    keys = 'ab' + EX
+    wanted = 'x first a bob b y'
+
+
+class ParseSnippets_PrintPythonStacktrace(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test
+        `!p abc()`
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = " > abc"
+
+
+class ParseSnippets_PrintPythonStacktraceMultiline(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test
+        `!p if True:
+            qwe()`
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = " > \s+qwe"
+
+
+class ParseSnippets_PrintErroneousSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test "asd()" e
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = "Trigger: test"
+
+
+class ParseSnippets_PrintErroneousSnippetContext(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test "asd()" e
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = "Context: asd"
+
+
+class ParseSnippets_PrintErroneousSnippetPreAction(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "asd()"
+        snippet test
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = "Pre-expand: asd"
+
+
+class ParseSnippets_PrintErroneousSnippetPostAction(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "asd()"
+        snippet test
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = "Post-expand: asd"
+
+class ParseSnippets_PrintErroneousSnippetLocation(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "asd()"
+        snippet test
+        endsnippet
+        """}
+    keys = 'test' + EX
+    wanted = keys
+    expected_error = "Defined in: .*/all.snippets"
diff --git a/vim/plugins/ultisnips/test/test_Plugin.py b/vim/plugins/ultisnips/test/test_Plugin.py
new file mode 100644
index 0000000..a93478f
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Plugin.py
@@ -0,0 +1,96 @@
+import sys
+
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+PYTHON3 = sys.version_info >= (3, 0)
+
+
+def python3():
+    if PYTHON3:
+        return 'Test does not work on python3.'
+
+# Plugin: YouCompleteMe  {{{#
+# TODO(sirver): disabled because it fails right now.
+# class Plugin_YouCompleteMe_IntegrationTest(_VimTest):
+    # def skip_if(self):
+        # r = python3()
+        # if r:
+        # return r
+        # if "7.4" not in self.version:
+        # return "Needs Vim 7.4."
+    # plugins = ["Valloric/YouCompleteMe"]
+    # snippets = ("superlongtrigger", "Hello")
+    # keys = "superlo\ty"
+    # wanted = "Hello"
+
+    # def _extra_vim_config(self, vim_config):
+        # # Not sure why, but I need to make a new tab for this to work.
+        # vim_config.append('let g:UltiSnipsExpandTrigger="y"')
+        # vim_config.append('tabnew')
+
+    # def _before_test(self):
+        # self.vim.send(":set ft=python\n")
+        # # Give ycm a chance to catch up.
+        # time.sleep(1)
+# End: Plugin: YouCompleteMe  #}}}
+# Plugin: Neocomplete {{{#
+# TODO(sirver): disabled because it fails right now.
+# class Plugin_Neocomplete_BugTest(_VimTest):
+    # Test for https://github.com/SirVer/ultisnips/issues/228
+
+    # def skip_if(self):
+        # if '+lua' not in self.version:
+            # return 'Needs +lua'
+    # plugins = ['Shougo/neocomplete.vim']
+    # snippets = ('t', 'Hello', '', 'w')
+    # keys = 'iab\\ t' + EX
+    # wanted = 'iab\\ Hello'
+
+    # def _extra_vim_config(self, vim_config):
+        # vim_config.append(r'set iskeyword+=\\ ')
+        # vim_config.append('let g:neocomplete#enable_at_startup = 1')
+        # vim_config.append('let g:neocomplete#enable_smart_case = 1')
+        # vim_config.append('let g:neocomplete#enable_camel_case = 1')
+        # vim_config.append('let g:neocomplete#enable_auto_delimiter = 1')
+        # vim_config.append('let g:neocomplete#enable_refresh_always = 1')
+# End: Plugin: Neocomplete  #}}}
+# Plugin: unite {{{#
+
+# TODO(sirver): Disable since it is flaky.
+# class Plugin_unite_BugTest(_VimTest):
+    # plugins = ['Shougo/unite.vim']
+    # snippets = ('t', 'Hello', '', 'w')
+    # keys = 'iab\\ t=UltiSnipsCallUnite()\n'
+    # wanted = 'iab\\ Hello '
+
+    # def _extra_vim_config(self, vim_config):
+        # vim_config.append(r'set iskeyword+=\\ ')
+        # vim_config.append('function! UltiSnipsCallUnite()')
+        # vim_config.append(
+            # '  Unite -start-insert -winheight=100 -immediately -no-empty ultisnips')
+        # vim_config.append('  return ""')
+        # vim_config.append('endfunction')
+# End: Plugin: unite  #}}}
+# Plugin: Supertab {{{#
+
+
+class Plugin_SuperTab_SimpleTest(_VimTest):
+    plugins = ['ervandew/supertab']
+    snippets = ('long', 'Hello', '', 'w')
+    keys = ('longtextlongtext\n' +
+            'longt' + EX + '\n' +  # Should complete word
+            'long' + EX)  # Should expand
+    wanted = 'longtextlongtext\nlongtextlongtext\nHello'
+
+    def _before_test(self):
+        # Make sure that UltiSnips has the keymap
+        self.vim.send_to_vim(':call UltiSnips#map_keys#MapKeys()\n')
+
+    def _extra_vim_config(self, vim_config):
+        assert EX == '\t'  # Otherwise this test needs changing.
+        vim_config.append('let g:SuperTabDefaultCompletionType = "<c-p>"')
+        vim_config.append('let g:SuperTabRetainCompletionDuration = "insert"')
+        vim_config.append('let g:SuperTabLongestHighlight = 1')
+        vim_config.append('let g:SuperTabCrMapping = 0')
+# End: Plugin: Supertab   #}}}
diff --git a/vim/plugins/ultisnips/test/test_Recursive.py b/vim/plugins/ultisnips/test/test_Recursive.py
new file mode 100644
index 0000000..5e93594
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Recursive.py
@@ -0,0 +1,265 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Recursive (Nested) Snippets  {{{#
+
+
+class RecTabStops_SimpleCase_ExpectCorrectResult(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'm' + EX + 'hello' + \
+        JF + 'world' + JF + 'ups' + JF + 'end'
+    wanted = '[ [ hello  world ]ups  end ]'
+
+
+class RecTabStops_SimpleCaseLeaveSecondSecond_ExpectCorrectResult(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'm' + EX + 'hello' + JF + 'world' + JF + JF + JF + 'end'
+    wanted = '[ [ hello  world ]  sec ]end'
+
+
+class RecTabStops_SimpleCaseLeaveFirstSecond_ExpectCorrectResult(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'm' + EX + 'hello' + JF + JF + JF + 'world' + JF + 'end'
+    wanted = '[ [ hello  sec ]  world ]end'
+
+
+class RecTabStops_InnerWOTabStop_ECR(_VimTest):
+    snippets = (
+        ('m1', 'Just some Text'),
+        ('m', '[ ${1:first}  ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'hi' + JF + 'two' + JF + 'end'
+    wanted = '[ Just some Texthi  two ]end'
+
+
+class RecTabStops_InnerWOTabStopTwiceDirectly_ECR(_VimTest):
+    snippets = (
+        ('m1', 'JST'),
+        ('m', '[ ${1:first}  ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm1' + EX + ' m1' + EX + 'hi' + JF + 'two' + JF + 'end'
+    wanted = '[ JST JSThi  two ]end'
+
+
+class RecTabStops_InnerWOTabStopTwice_ECR(_VimTest):
+    snippets = (
+        ('m1', 'JST'),
+        ('m', '[ ${1:first}  ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm1' + EX + JF + 'm1' + EX + 'hi' + JF + 'end'
+    wanted = '[ JST  JSThi ]end'
+
+
+class RecTabStops_OuterOnlyWithZeroTS_ECR(_VimTest):
+    snippets = (
+        ('m', 'A $0 B'),
+        ('m1', 'C $1 D $0 E'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'CD' + JF + 'DE'
+    wanted = 'A C CD D DE E B'
+
+
+class RecTabStops_OuterOnlyWithZero_ECR(_VimTest):
+    snippets = (
+        ('m', 'A $0 B'),
+        ('m1', 'C $1 D $0 E'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'CD' + JF + 'DE'
+    wanted = 'A C CD D DE E B'
+
+
+class RecTabStops_ExpandedInZeroTS_ECR(_VimTest):
+    snippets = (
+        ('m', 'A $0 B $1'),
+        ('m1', 'C $1 D $0 E'),
+    )
+    keys = 'm' + EX + 'hi' + JF + 'm1' + EX + 'CD' + JF + 'DE'
+    wanted = 'A C CD D DE E B hi'
+
+
+class RecTabStops_ExpandedInZeroTSTwice_ECR(_VimTest):
+    snippets = (
+        ('m', 'A $0 B $1'),
+        ('m1', 'C $1 D $0 E'),
+    )
+    keys = 'm' + EX + 'hi' + JF + 'm' + EX + 'again' + JF + 'm1' + \
+        EX + 'CD' + JF + 'DE'
+    wanted = 'A A C CD D DE E B again B hi'
+
+
+class RecTabStops_ExpandedInZeroTSSecondTime_ECR(_VimTest):
+    snippets = (
+        ('m', 'A $0 B $1'),
+        ('m1', 'C $1 D $0 E'),
+    )
+    keys = 'm' + EX + 'hi' + JF + 'm' + EX + \
+        'm1' + EX + 'CD' + JF + 'DE' + JF + 'AB'
+    wanted = 'A A AB B C CD D DE E B hi'
+
+
+class RecTabsStops_TypeInZero_ECR(_VimTest):
+    snippets = (
+        ('v', r"\vec{$1}", 'Vector', 'w'),
+        ('frac', r"\frac{${1:one}}${0:zero}{${2:two}}", 'Fractio', 'w'),
+    )
+    keys = 'v' + EX + 'frac' + EX + 'a' + JF + 'b' + JF + 'frac' + EX + 'aa' + JF + JF + 'cc' + JF + \
+        'hello frac' + EX + JF + JF + 'world'
+    wanted = r"\vec{\frac{a}\frac{aa}cc{two}{b}}hello \frac{one}world{two}"
+
+
+class RecTabsStops_TypeInZero2_ECR(_VimTest):
+    snippets = (
+        ('m', r"_${0:explicit zero}", 'snip', 'i'),
+    )
+    keys = 'm' + EX + 'hello m' + EX + 'world m' + EX + 'end'
+    wanted = r"_hello _world _end"
+
+
+class RecTabsStops_BackspaceZero_ECR(_VimTest):
+    snippets = (
+        ('m', r"${1:one}${0:explicit zero}${2:two}", 'snip', 'i'),
+    )
+    keys = 'm' + EX + JF + JF + BS + 'm' + EX
+    wanted = r"oneoneexplicit zerotwotwo"
+
+
+class RecTabStops_MirrorInnerSnippet_ECR(_VimTest):
+    snippets = (
+        ('m', '[ $1 $2 ] $1'),
+        ('m1', 'ASnip $1 ASnip $2 ASnip'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'Hallo' + JF + 'Hi' + \
+        JF + 'endone' + JF + 'two' + JF + 'totalend'
+    wanted = '[ ASnip Hallo ASnip Hi ASnipendone two ] ASnip Hallo ASnip Hi ASnipendonetotalend'
+
+
+class RecTabStops_NotAtBeginningOfTS_ExpectCorrectResult(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'hello m' + EX + 'hi' + JF + 'two' + JF + 'ups' + JF + 'three' + \
+        JF + 'end'
+    wanted = '[ hello [ hi  two ]ups  three ]end'
+
+
+class RecTabStops_InNewlineInTabstop_ExpectCorrectResult(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'hello\nm' + EX + 'hi' + JF + 'two' + JF + 'ups' + JF + 'three' + \
+        JF + 'end'
+    wanted = '[ hello\n[ hi  two ]ups  three ]end'
+
+
+class RecTabStops_InNewlineInTabstopNotAtBeginOfLine_ECR(_VimTest):
+    snippets = ('m', '[ ${1:first}  ${2:sec} ]')
+    keys = 'm' + EX + 'hello\nhello again m' + EX + 'hi' + JF + 'two' + \
+        JF + 'ups' + JF + 'three' + JF + 'end'
+    wanted = '[ hello\nhello again [ hi  two ]ups  three ]end'
+
+
+class RecTabStops_InNewlineMultiline_ECR(_VimTest):
+    snippets = ('m', 'M START\n$0\nM END')
+    keys = 'm' + EX + 'm' + EX
+    wanted = 'M START\nM START\n\nM END\nM END'
+
+
+class RecTabStops_InNewlineManualIndent_ECR(_VimTest):
+    snippets = ('m', 'M START\n$0\nM END')
+    keys = 'm' + EX + '    m' + EX + 'hi'
+    wanted = 'M START\n    M START\n    hi\n    M END\nM END'
+
+
+class RecTabStops_InNewlineManualIndentTextInFront_ECR(_VimTest):
+    snippets = ('m', 'M START\n$0\nM END')
+    keys = 'm' + EX + '    hallo m' + EX + 'hi'
+    wanted = 'M START\n    hallo M START\n    hi\n    M END\nM END'
+
+
+class RecTabStops_InNewlineMultilineWithIndent_ECR(_VimTest):
+    snippets = ('m', 'M START\n    $0\nM END')
+    keys = 'm' + EX + 'm' + EX + 'hi'
+    wanted = 'M START\n    M START\n        hi\n    M END\nM END'
+
+
+class RecTabStops_InNewlineMultilineWithNonZeroTS_ECR(_VimTest):
+    snippets = ('m', 'M START\n    $1\nM END -> $0')
+    keys = 'm' + EX + 'm' + EX + 'hi' + JF + 'hallo' + JF + 'end'
+    wanted = 'M START\n    M START\n        hi\n    M END -> hallo\n' \
+        'M END -> end'
+
+
+class RecTabStops_BarelyNotLeavingInner_ECR(_VimTest):
+    snippets = (
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm' + EX + 'a' + 3 * ARR_L + JF + 'hallo' + \
+        JF + 'ups' + JF + 'world' + JF + 'end'
+    wanted = '[ [ a hallo ]ups world ]end'
+
+
+class RecTabStops_LeavingInner_ECR(_VimTest):
+    snippets = (
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm' + EX + 'a' + 4 * ARR_L + JF + 'hallo' + \
+        JF + 'world'
+    wanted = '[ [ a sec ] hallo ]world'
+
+
+class RecTabStops_LeavingInnerInner_ECR(_VimTest):
+    snippets = (
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm' + EX + 'm' + EX + 'a' + 4 * ARR_L + JF + 'hallo' + \
+        JF + 'ups' + JF + 'world' + JF + 'end'
+    wanted = '[ [ [ a sec ] hallo ]ups world ]end'
+
+
+class RecTabStops_LeavingInnerInnerTwo_ECR(_VimTest):
+    snippets = (
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm' + EX + 'm' + EX + 'a' + 6 * ARR_L + JF + 'hallo' + \
+        JF + 'end'
+    wanted = '[ [ [ a sec ] sec ] hallo ]end'
+
+
+class RecTabStops_ZeroTSisNothingSpecial_ECR(_VimTest):
+    snippets = (
+        ('m1', '[ ${1:first} $0 ${2:sec} ]'),
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'one' + JF + 'two' + \
+        JF + 'three' + JF + 'four' + JF + 'end'
+    wanted = '[ [ one three two ] four ]end'
+
+
+class RecTabStops_MirroredZeroTS_ECR(_VimTest):
+    snippets = (
+        ('m1', '[ ${1:first} ${0:Year, some default text} $0 ${2:sec} ]'),
+        ('m', '[ ${1:first} ${2:sec} ]'),
+    )
+    keys = 'm' + EX + 'm1' + EX + 'one' + JF + 'two' + \
+        JF + 'three' + JF + 'four' + JF + 'end'
+    wanted = '[ [ one three three two ] four ]end'
+
+
+class RecTabStops_ChildTriggerContainsParentTextObjects(_VimTest):
+    # https://bugs.launchpad.net/bugs/1191617
+    files = { 'us/all.snippets': r"""
+global !p
+def complete(t, opts):
+ if t:
+   opts = [ q[len(t):] for q in opts if q.startswith(t) ]
+ if len(opts) == 0:
+   return ''
+ return opts[0] if len(opts) == 1 else "(" + '|'.join(opts) + ')'
+def autocomplete_options(t, string, attr=None):
+   return complete(t[1], [opt for opt in attr if opt not in string])
+endglobal
+snippet /form_for(.*){([^|]*)/ "form_for html options" rw!
+`!p
+auto = autocomplete_options(t, match.group(2), attr=["id: ", "class: ", "title:  "])
+snip.rv = "form_for" + match.group(1) + "{"`$1`!p if (snip.c != auto) : snip.rv=auto`
+endsnippet
+"""}
+    keys = 'form_for user, namespace: some_namespace, html: {i' + EX + 'i' + EX
+    wanted = 'form_for user, namespace: some_namespace, html: {(id: |class: |title:  )d: '
+# End: Recursive (Nested) Snippets  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Selection.py b/vim/plugins/ultisnips/test/test_Selection.py
new file mode 100644
index 0000000..6eeb3a9
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Selection.py
@@ -0,0 +1,125 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# Unmap SelectMode Mappings  {{{#
+# Test for bug 427298 #
+
+
+class _SelectModeMappings(_VimTest):
+    snippets = ('test', '${1:World}')
+    keys = 'test' + EX + 'Hello'
+    wanted = 'Hello'
+    maps = ('', '')
+    buffer_maps = ('', '')
+    do_unmapping = True
+    ignores = []
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append(
+            ':let g:UltiSnipsRemoveSelectModeMappings=%i' % int(
+                self.do_unmapping))
+        vim_config.append(
+            ':let g:UltiSnipsMappingsToIgnore=%s' %
+            repr(
+                self.ignores))
+
+        if not isinstance(self.maps[0], tuple):
+            self.maps = (self.maps,)
+        if not isinstance(self.buffer_maps[0], tuple):
+            self.buffer_maps = (self.buffer_maps,)
+
+        for key, m in self.maps:
+            if not len(key):
+                continue
+            vim_config.append(':smap %s %s' % (key, m))
+        for key, m in self.buffer_maps:
+            if not len(key):
+                continue
+            vim_config.append(':smap <buffer> %s %s' % (key, m))
+
+
+class SelectModeMappings_RemoveBeforeSelecting_ECR(_SelectModeMappings):
+    maps = ('H', 'x')
+    wanted = 'Hello'
+
+
+class SelectModeMappings_DisableRemoveBeforeSelecting_ECR(_SelectModeMappings):
+    do_unmapping = False
+    maps = ('H', 'x')
+    wanted = 'xello'
+
+
+class SelectModeMappings_IgnoreMappings_ECR(_SelectModeMappings):
+    ignores = ['e']
+    maps = ('H', 'x'), ('e', 'l')
+    wanted = 'Hello'
+
+
+class SelectModeMappings_IgnoreMappings1_ECR(_SelectModeMappings):
+    ignores = ['H']
+    maps = ('H', 'x'), ('e', 'l')
+    wanted = 'xello'
+
+
+class SelectModeMappings_IgnoreMappings2_ECR(_SelectModeMappings):
+    ignores = ['e', 'H']
+    maps = ('e', 'l'), ('H', 'x')
+    wanted = 'xello'
+
+
+class SelectModeMappings_BufferLocalMappings_ECR(_SelectModeMappings):
+    buffer_maps = ('H', 'blah')
+    wanted = 'Hello'
+# End: Unmap SelectMode Mappings  #}}}
+
+# Exclusive Selection  {{{#
+
+
+class _ES_Base(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set selection=exclusive')
+
+
+class ExclusiveSelection_SimpleTabstop_Test(_ES_Base):
+    snippets = ('test', 'h${1:blah}w $1')
+    keys = 'test' + EX + 'ui' + JF
+    wanted = 'huiw ui'
+
+
+class ExclusiveSelection_RealWorldCase_Test(_ES_Base):
+    snippets = ('for',
+                """for ($${1:i} = ${2:0}; $$1 < ${3:count}; $$1${4:++}) {
+	${5:// code}
+}""")
+    keys = 'for' + EX + 'k' + JF
+    wanted = """for ($k = 0; $k < count; $k++) {
+	// code
+}"""
+# End: Exclusive Selection  #}}}
+
+# Old Selection {{{#
+
+
+class _OS_Base(_VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set selection=old')
+
+
+class OldSelection_SimpleTabstop_Test(_OS_Base):
+    snippets = ('test', 'h${1:blah}w $1')
+    keys = 'test' + EX + 'ui' + JF
+    wanted = 'huiw ui'
+
+
+class OldSelection_RealWorldCase_Test(_OS_Base):
+    snippets = ('for',
+                """for ($${1:i} = ${2:0}; $$1 < ${3:count}; $$1${4:++}) {
+	${5:// code}
+}""")
+    keys = 'for' + EX + 'k' + JF
+    wanted = """for ($k = 0; $k < count; $k++) {
+	// code
+}"""
+# End: Old Selection #}}}
diff --git a/vim/plugins/ultisnips/test/test_SnipMate.py b/vim/plugins/ultisnips/test/test_SnipMate.py
new file mode 100644
index 0000000..c730354
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_SnipMate.py
@@ -0,0 +1,191 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# snipMate support  {{{#
+
+
+class snipMate_SimpleSnippet(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet hello
+\tThis is a test snippet
+\t# With a comment"""}
+    keys = 'hello' + EX
+    wanted = 'This is a test snippet\n# With a comment'
+
+class snipMate_Disabled(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet hello
+\tThis is a test snippet
+\t# With a comment"""}
+    keys = 'hello' + EX
+    wanted = 'hello' + EX
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append("let g:UltiSnipsEnableSnipMate=0");
+
+
+class snipMate_OtherFiletype(_VimTest):
+    files = { 'snippets/blubi.snippets': """
+snippet hello
+\tworked"""}
+    keys = 'hello' + EX + ESC + ':set ft=blubi\nohello' + EX
+    wanted = 'hello' + EX + '\nworked'
+
+
+class snipMate_MultiMatches(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet hello The first snippet."
+\tone
+snippet hello The second snippet.
+\ttwo"""}
+    keys = 'hello' + EX + '2\n'
+    wanted = 'two'
+
+
+class snipMate_SimpleSnippetSubDirectory(_VimTest):
+    files = { 'snippets/_/blub.snippets': """
+snippet hello
+\tThis is a test snippet"""}
+    keys = 'hello' + EX
+    wanted = 'This is a test snippet'
+
+
+class snipMate_SimpleSnippetInSnippetFile(_VimTest):
+    files = {
+        'snippets/_/hello.snippet': """This is a stand alone snippet""",
+        'snippets/_/hello1.snippet': """This is two stand alone snippet""",
+        'snippets/_/hello2/this_is_my_cool_snippet.snippet': """Three""",
+    }
+    keys = 'hello' + EX + '\nhello1' + EX + '\nhello2' + EX
+    wanted = 'This is a stand alone snippet\nThis is two stand alone snippet\nThree'
+
+
+class snipMate_Interpolation(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\tla`printf('c%02d', 3)`lu"""}
+    keys = 'test' + EX
+    wanted = 'lac03lu'
+
+
+class snipMate_InterpolationWithSystem(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\tla`system('echo -ne öäü')`lu"""}
+    keys = 'test' + EX
+    wanted = 'laöäülu'
+
+
+class snipMate_TestMirrors(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet for
+\tfor (${2:i}; $2 < ${1:count}; $1++) {
+\t\t${4}
+\t}"""}
+    keys = 'for' + EX + 'blub' + JF + 'j' + JF + 'hi'
+    wanted = 'for (j; j < blub; blub++) {\n\thi\n}'
+
+
+class snipMate_TestNoBraceTabstops(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\t$1 is $2"""}
+    keys = 'test' + EX + 'blub' + JF + 'blah'
+    wanted = 'blub is blah'
+
+
+class snipMate_TestNoBraceTabstopsAndMirrors(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\t$1 is $1, $2 is ${2}"""}
+    keys = 'test' + EX + 'blub' + JF + 'blah'
+    wanted = 'blub is blub, blah is blah'
+
+
+class snipMate_TestMirrorsInPlaceholders(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet opt
+\t<option value="${1:option}">${2:$1}</option>"""}
+    keys = 'opt' + EX + 'some' + JF + JF + 'ende'
+    wanted = """<option value="some">some</option>ende"""
+
+
+class snipMate_TestMirrorsInPlaceholders_Overwrite(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet opt
+\t<option value="${1:option}">${2:$1}</option>"""}
+    keys = 'opt' + EX + 'some' + JF + 'not' + JF + 'ende'
+    wanted = """<option value="some">not</option>ende"""
+
+
+class snipMate_Visual_Simple(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet v
+\th${VISUAL}b"""}
+    keys = 'blablub' + ESC + '0v6l' + EX + 'v' + EX
+    wanted = 'hblablubb'
+
+
+class snipMate_NoNestedTabstops(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\th$${1:${2:blub}}$$"""}
+    keys = 'test' + EX + JF + 'hi'
+    wanted = 'h$${2:blub}$$hi'
+
+
+class snipMate_Extends(_VimTest):
+    files = { 'snippets/a.snippets': """
+extends b
+snippet test
+\tblub""", 'snippets/b.snippets': """
+snippet test1
+\tblah"""
+              }
+    keys = ESC + ':set ft=a\n' + 'itest1' + EX
+    wanted = 'blah'
+
+
+class snipMate_EmptyLinesContinueSnippets(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet test
+\tblub
+
+\tblah
+
+snippet test1
+\ta"""
+              }
+    keys = 'test' + EX
+    wanted = 'blub\n\nblah\n'
+
+
+class snipMate_OverwrittenByRegExpTrigger(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet def
+\tsnipmate
+""",
+              'us/all.snippets': r"""
+snippet "(de)?f" "blub" r
+ultisnips
+endsnippet
+""" }
+    keys = 'def' + EX
+    wanted = 'ultisnips'
+# End: snipMate support  #}}}
+
+class snipMate_Issue658(_VimTest):
+    files = { 'snippets/_.snippets': """
+snippet /*
+\t/*
+\t * ${0}
+\t */
+"""}
+    keys = ESC + ':set fo=r\n' + 'i/*' + EX + '1\n2'
+    wanted = """/*
+ * 1
+ * 2
+ */
+""";
+# End: snipMate support  #}}}
diff --git a/vim/plugins/ultisnips/test/test_SnippetActions.py b/vim/plugins/ultisnips/test/test_SnippetActions.py
new file mode 100644
index 0000000..5fc0bdf
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_SnippetActions.py
@@ -0,0 +1,381 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+
+class SnippetActions_PreActionModifiesBuffer(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line:snip.line] = ['\n']"
+        snippet a "desc" "True" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = '\nabc'
+
+
+class SnippetActions_PostActionModifiesBuffer(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "snip.buffer[snip.line+1:snip.line+1] = ['\n']"
+        snippet a "desc" "True" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    wanted = 'abc\n'
+
+class SnippetActions_ErrorOnBufferModificationThroughCommand(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "vim.command('normal O')"
+        snippet a "desc" "True" e
+        abc
+        endsnippet
+        """}
+    keys = 'a' + EX
+    expected_error = 'changes are untrackable'
+
+
+class SnippetActions_ErrorOnModificationSnippetLine(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "vim.command('normal dd')"
+        snippet i "desc" "True" e
+        if:
+            $1
+        endsnippet
+        """}
+    keys = 'i' + EX
+    expected_error = 'line under the cursor was modified'
+
+
+class SnippetActions_EnsureIndent(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line] = ' '*4; snip.cursor[1] = 4"
+        snippet i "desc" "True" e
+        if:
+            $1
+        endsnippet
+        """}
+    keys = '\ni' + EX + 'i' + EX + 'x'
+    wanted = """
+    if:
+    if:
+        x"""
+
+
+class SnippetActions_PostActionCanUseSnippetRange(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def ensure_newlines(start, end):
+            snip.buffer[start[0]:start[0]] = ['\n'] * 2
+            snip.buffer[end[0]+1:end[0]+1] = ['\n'] * 1
+        endglobal
+
+        post_expand "ensure_newlines(snip.snippet_start, snip.snippet_end)"
+        snippet i "desc"
+        if
+            $1
+        else
+            $2
+        end
+        endsnippet
+        """}
+    keys = '\ni' + EX + 'x' + JF + 'y'
+    wanted = """
+
+
+if
+    x
+else
+    y
+end
+"""
+
+
+class SnippetActions_CanModifyParentBody(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def ensure_newlines(start, end):
+            snip.buffer[start[0]:start[0]] = ['\n'] * 2
+        endglobal
+
+        post_expand "ensure_newlines(snip.snippet_start, snip.snippet_end)"
+        snippet i "desc"
+        if
+            $1
+        else
+            $2
+        end
+        endsnippet
+        """}
+    keys = '\ni' + EX + 'i' + EX + 'x' + JF + 'y' + JF + JF + 'z'
+    wanted = """
+
+
+if
+
+
+    if
+        x
+    else
+        y
+    end
+else
+    z
+end"""
+
+
+class SnippetActions_MoveParentSnippetFromChildInPreAction(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def insert_import():
+            snip.buffer[2:2] = ['import smthing', '']
+        endglobal
+
+        pre_expand "insert_import()"
+        snippet p "desc"
+        print(smthing.traceback())
+        endsnippet
+
+        snippet i "desc"
+        if
+            $1
+        else
+            $2
+        end
+        endsnippet
+        """}
+    keys = 'i' + EX + 'p' + EX + JF + 'z'
+    wanted = """import smthing
+
+if
+    print(smthing.traceback())
+else
+    z
+end"""
+
+
+class SnippetActions_CanExpandSnippetInDifferentPlace(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def expand_after_if(snip):
+            snip.buffer[snip.line] = snip.buffer[snip.line][:snip.column] + \
+                snip.buffer[snip.line][snip.column+1:]
+            snip.cursor[1] = snip.buffer[snip.line].index('if ')+3
+        endglobal
+
+        pre_expand "expand_after_if(snip)"
+        snippet n "append not to if" w
+        not $0
+        endsnippet
+
+        snippet i "if cond" w
+        if $1: $2
+        endsnippet
+        """}
+    keys = 'i' + EX + 'blah' + JF + 'n' + EX + JF + 'pass'
+    wanted = """if not blah: pass"""
+
+
+class SnippetActions_MoveVisual(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def extract_method(snip):
+            del snip.buffer[snip.line]
+            snip.buffer[len(snip.buffer)-1:len(snip.buffer)-1] = ['']
+            snip.cursor.set(len(snip.buffer)-2, 0)
+        endglobal
+
+        pre_expand "extract_method(snip)"
+        snippet n "append not to if" w
+        def $1:
+            ${VISUAL}
+
+        endsnippet
+        """}
+
+    keys = """
+def a:
+    x()
+    y()
+    z()""" + ESC + 'kVk' + EX + 'n' + EX + 'b'
+
+    wanted = """
+def a:
+    z()
+
+def b:
+    x()
+    y()"""
+
+
+class SnippetActions_CanMirrorTabStopsOutsideOfSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_jump "snip.buffer[2] = 'debug({})'.format(snip.tabstops[1].current_text)"
+        snippet i "desc"
+        if $1:
+            $2
+        endsnippet
+        """}
+    keys = """
+---
+i""" + EX + "test(some(complex(cond(a))))" + JF + "x"
+    wanted = """debug(test(some(complex(cond(a)))))
+---
+if test(some(complex(cond(a)))):
+    x"""
+
+
+class SnippetActions_CanExpandAnonSnippetInJumpAction(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def expand_anon(snip):
+            if snip.tabstop == 0:
+                snip.expand_anon("a($2, $1)")
+        endglobal
+
+        post_jump "expand_anon(snip)"
+        snippet i "desc"
+        if ${1:cond}:
+            $0
+        endsnippet
+        """}
+    keys = "i" + EX + "x" + JF + "1" + JF + "2" + JF + ";"
+    wanted = """if x:
+    a(2, 1);"""
+
+
+class SnippetActions_CanExpandAnonSnippetInJumpActionWhileSelected(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def expand_anon(snip):
+            if snip.tabstop == 0:
+                snip.expand_anon(" // a($2, $1)")
+        endglobal
+
+        post_jump "expand_anon(snip)"
+        snippet i "desc"
+        if ${1:cond}:
+            ${2:pass}
+        endsnippet
+        """}
+    keys = "i" + EX + "x" + JF + JF + "1" + JF + "2" + JF + ";"
+    wanted = """if x:
+    pass // a(2, 1);"""
+
+
+class SnippetActions_CanUseContextFromContextMatch(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line:snip.line] = [snip.context]"
+        snippet i "desc" "'some context'" e
+        body
+        endsnippet
+        """}
+    keys = "i" + EX
+    wanted = """some context
+body"""
+
+class SnippetActions_CanExpandAnonSnippetOnFirstJump(_VimTest):
+    files = { 'us/all.snippets': r"""
+        global !p
+        def expand_new_snippet_on_first_jump(snip):
+            if snip.tabstop == 1:
+                snip.expand_anon("some_check($1, $2, $3)")
+        endglobal
+
+        post_jump "expand_new_snippet_on_first_jump(snip)"
+        snippet "test" "test new features" "True" bwre
+        if $1: $2
+        endsnippet
+        """}
+    keys = "test" + EX + "1" + JF + "2" + JF + "3" + JF + " or 4" + JF + "5"
+    wanted = """if some_check(1, 2, 3) or 4: 5"""
+
+class SnippetActions_CanExpandAnonOnPreExpand(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line] = ''; snip.expand_anon('totally_different($2, $1)')"
+        snippet test "test new features" wb
+        endsnippet
+        """}
+    keys = "test" + EX + "1" + JF + "2" + JF + "3"
+    wanted = """totally_different(2, 1)3"""
+
+class SnippetActions_CanEvenWrapSnippetInPreAction(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line] = ''; snip.expand_anon('some_wrapper($1): $2')"
+        snippet test "test new features" wb
+        wrapme($2, $1)
+        endsnippet
+        """}
+    keys = "test" + EX + "1" + JF + "2" + JF + "3" + JF + "4"
+    wanted = """some_wrapper(wrapme(2, 1)3): 4"""
+
+class SnippetActions_CanVisuallySelectFirstPlaceholderInAnonSnippetInPre(_VimTest):
+    files = { 'us/all.snippets': r"""
+        pre_expand "snip.buffer[snip.line] = ''; snip.expand_anon('${1:asd}, ${2:blah}')"
+        snippet test "test new features" wb
+        endsnippet
+        """}
+    keys = "test" + EX + "1" + JF + "2"
+    wanted = """1, 2"""
+
+class SnippetActions_UseCorrectJumpActions(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_jump "snip.buffer[-2:-2]=['a' + str(snip.tabstop)]"
+        snippet a "a" wb
+        $1 {
+        $2
+        }
+        endsnippet
+
+        snippet b "b" wb
+        bbb
+        endsnippet
+
+        post_jump "snip.buffer[-2:-2]=['c' + str(snip.tabstop)]"
+        snippet c "c" w
+        $1 : $2 : $3
+        endsnippet
+        """}
+    keys = "a" + EX + "1" + JF + "b" + EX + " c" + EX + "2" + JF + "3" + JF + "4" + JF + JF
+    wanted = """1 {
+bbb 2 : 3 : 4
+}
+a1
+a2
+c1
+c2
+c3
+c0
+a0"""
+
+class SnippetActions_PostActionModifiesCharAfterSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "snip.buffer[snip.snippet_end[0]] = snip.buffer[snip.snippet_end[0]][:-1]"
+        snippet a "desc" i
+        ($1)
+        endsnippet
+        """}
+    keys = '[]' + ARR_L + 'a' + EX + '1' + JF + '2'
+    wanted = '[(1)2'
+
+
+class SnippetActions_PostActionModifiesLineAfterSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "snip.buffer[snip.snippet_end[0]+1:snip.snippet_end[0]+2] = []"
+        snippet a "desc"
+        1: $1
+        $0
+        endsnippet
+        """}
+    keys = '\n3' + ARR_U + 'a' + EX + '1' + JF + '2'
+    wanted = '1: 1\n2'
+
+
+class SnippetActions_DoNotBreakCursorOnSingleLikeChange(_VimTest):
+    files = { 'us/all.snippets': r"""
+        post_expand "snip.buffer[snip.snippet_end[0]] = 'def'; snip.cursor.preserve()"
+        snippet a "desc"
+        asd
+        endsnippet
+        """}
+    keys = 'a' + EX + '123'
+    wanted = 'def123'
diff --git a/vim/plugins/ultisnips/test/test_SnippetOptions.py b/vim/plugins/ultisnips/test/test_SnippetOptions.py
new file mode 100644
index 0000000..cd18b6a
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_SnippetOptions.py
@@ -0,0 +1,357 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+from test.util import running_on_windows
+
+# Snippet Options  {{{#
+
+
+class SnippetOptions_OnlyExpandWhenWSInFront_Expand(_VimTest):
+    snippets = ('test', 'Expand me!', '', 'b')
+    keys = 'test' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_OnlyExpandWhenWSInFront_Expand2(_VimTest):
+    snippets = ('test', 'Expand me!', '', 'b')
+    keys = '   test' + EX
+    wanted = '   Expand me!'
+
+
+class SnippetOptions_OnlyExpandWhenWSInFront_DontExpand(_VimTest):
+    snippets = ('test', 'Expand me!', '', 'b')
+    keys = 'a test' + EX
+    wanted = 'a test' + EX
+
+
+class SnippetOptions_OnlyExpandWhenWSInFront_OneWithOneWO(_VimTest):
+    snippets = (
+        ('test', 'Expand me!', '', 'b'),
+        ('test', 'not at beginning', '', ''),
+    )
+    keys = 'a test' + EX
+    wanted = 'a not at beginning'
+
+
+class SnippetOptions_OnlyExpandWhenWSInFront_OneWithOneWOChoose(_VimTest):
+    snippets = (
+        ('test', 'Expand me!', '', 'b'),
+        ('test', 'not at beginning', '', ''),
+    )
+    keys = '  test' + EX + '1\n'
+    wanted = '  Expand me!'
+
+
+class SnippetOptions_ExpandInwordSnippets_SimpleExpand(_VimTest):
+    snippets = (('test', 'Expand me!', '', 'i'), )
+    keys = 'atest' + EX
+    wanted = 'aExpand me!'
+
+
+class SnippetOptions_ExpandInwordSnippets_ExpandSingle(_VimTest):
+    snippets = (('test', 'Expand me!', '', 'i'), )
+    keys = 'test' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_ExpandInwordSnippetsWithOtherChars_Expand(_VimTest):
+    snippets = (('test', 'Expand me!', '', 'i'), )
+    keys = '$test' + EX
+    wanted = '$Expand me!'
+
+
+class SnippetOptions_ExpandInwordSnippetsWithOtherChars_Expand2(_VimTest):
+    snippets = (('test', 'Expand me!', '', 'i'), )
+    keys = '-test' + EX
+    wanted = '-Expand me!'
+
+
+class SnippetOptions_ExpandInwordSnippetsWithOtherChars_Expand3(_VimTest):
+    skip_if = lambda self: running_on_windows()
+    snippets = (('test', 'Expand me!', '', 'i'), )
+    keys = 'ßßtest' + EX
+    wanted = 'ßßExpand me!'
+
+
+class _SnippetOptions_ExpandWordSnippets(_VimTest):
+    snippets = (('test', 'Expand me!', '', 'w'), )
+
+
+class SnippetOptions_ExpandWordSnippets_NormalExpand(
+        _SnippetOptions_ExpandWordSnippets):
+    keys = 'test' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_ExpandWordSnippets_NoExpand(
+        _SnippetOptions_ExpandWordSnippets):
+    keys = 'atest' + EX
+    wanted = 'atest' + EX
+
+
+class SnippetOptions_ExpandWordSnippets_ExpandSuffix(
+        _SnippetOptions_ExpandWordSnippets):
+    keys = 'a-test' + EX
+    wanted = 'a-Expand me!'
+
+
+class SnippetOptions_ExpandWordSnippets_ExpandSuffix2(
+        _SnippetOptions_ExpandWordSnippets):
+    keys = 'a(test' + EX
+    wanted = 'a(Expand me!'
+
+
+class SnippetOptions_ExpandWordSnippets_ExpandSuffix3(
+        _SnippetOptions_ExpandWordSnippets):
+    keys = '[[test' + EX
+    wanted = '[[Expand me!'
+
+
+class _No_Tab_Expand(_VimTest):
+    snippets = ('test', '\t\tExpand\tme!\t', '', 't')
+
+
+class No_Tab_Expand_Simple(_No_Tab_Expand):
+    keys = 'test' + EX
+    wanted = '\t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_Leading_Spaces(_No_Tab_Expand):
+    keys = '  test' + EX
+    wanted = '  \t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_Leading_Tabs(_No_Tab_Expand):
+    keys = '\ttest' + EX
+    wanted = '\t\t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_No_TS(_No_Tab_Expand):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set sts=3')
+    keys = 'test' + EX
+    wanted = '\t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_ET(_No_Tab_Expand):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set expandtab')
+    keys = 'test' + EX
+    wanted = '\t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_ET_Leading_Spaces(_No_Tab_Expand):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set expandtab')
+    keys = '  test' + EX
+    wanted = '  \t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_ET_SW(_No_Tab_Expand):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=8')
+        vim_config.append('set expandtab')
+    keys = 'test' + EX
+    wanted = '\t\tExpand\tme!\t'
+
+
+class No_Tab_Expand_ET_SW_TS(_No_Tab_Expand):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set sw=3')
+        vim_config.append('set sts=3')
+        vim_config.append('set ts=3')
+        vim_config.append('set expandtab')
+    keys = 'test' + EX
+    wanted = '\t\tExpand\tme!\t'
+
+
+class _TabExpand_RealWorld(object):
+    snippets = ('hi',
+                r"""hi
+`!p snip.rv="i1\n"
+snip.rv += snip.mkline("i1\n")
+snip.shift(1)
+snip.rv += snip.mkline("i2\n")
+snip.unshift(2)
+snip.rv += snip.mkline("i0\n")
+snip.shift(3)
+snip.rv += snip.mkline("i3")`
+snip.rv = repr(snip.rv)
+End""")
+
+
+class No_Tab_Expand_RealWorld(_TabExpand_RealWorld, _VimTest):
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set noexpandtab')
+    keys = '\t\thi' + EX
+    wanted = """\t\thi
+\t\ti1
+\t\ti1
+\t\t\ti2
+\ti0
+\t\t\t\ti3
+\t\tsnip.rv = repr(snip.rv)
+\t\tEnd"""
+
+
+class SnippetOptions_Regex_Expand(_VimTest):
+    snippets = ('(test)', 'Expand me!', '', 'r')
+    keys = 'test' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_Regex_WithSpace(_VimTest):
+    snippets = ('test ', 'Expand me!', '', 'r')
+    keys = 'test ' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_Regex_Multiple(_VimTest):
+    snippets = ('(test *)+', 'Expand me!', '', 'r')
+    keys = 'test test test' + EX
+    wanted = 'Expand me!'
+
+
+class _Regex_Self(_VimTest):
+    snippets = ('((?<=\W)|^)(\.)', 'self.', '', 'r')
+
+
+class SnippetOptions_Regex_Self_Start(_Regex_Self):
+    keys = '.' + EX
+    wanted = 'self.'
+
+
+class SnippetOptions_Regex_Self_Space(_Regex_Self):
+    keys = ' .' + EX
+    wanted = ' self.'
+
+
+class SnippetOptions_Regex_Self_TextAfter(_Regex_Self):
+    keys = ' .a' + EX
+    wanted = ' .a' + EX
+
+
+class SnippetOptions_Regex_Self_TextBefore(_Regex_Self):
+    keys = 'a.' + EX
+    wanted = 'a.' + EX
+
+
+class SnippetOptions_Regex_PythonBlockMatch(_VimTest):
+    snippets = (r"([abc]+)([def]+)", r"""`!p m = match
+snip.rv += m.group(2)
+snip.rv += m.group(1)
+`""", '', 'r')
+    keys = 'test cabfed' + EX
+    wanted = 'test fedcab'
+
+
+class SnippetOptions_Regex_PythonBlockNoMatch(_VimTest):
+    snippets = (r"cabfed", r"""`!p snip.rv =  match or "No match"`""")
+    keys = 'test cabfed' + EX
+    wanted = 'test No match'
+# Tests for Bug #691575
+
+
+class SnippetOptions_Regex_SameLine_Long_End(_VimTest):
+    snippets = ('(test.*)', 'Expand me!', '', 'r')
+    keys = 'test test abc' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_Regex_SameLine_Long_Start(_VimTest):
+    snippets = ('(.*test)', 'Expand me!', '', 'r')
+    keys = 'abc test test' + EX
+    wanted = 'Expand me!'
+
+
+class SnippetOptions_Regex_SameLine_Simple(_VimTest):
+    snippets = ('(test)', 'Expand me!', '', 'r')
+    keys = 'abc test test' + EX
+    wanted = 'abc test Expand me!'
+
+
+class MultiWordSnippet_Simple(_VimTest):
+    snippets = ('test me', 'Expand me!')
+    keys = 'test me' + EX
+    wanted = 'Expand me!'
+
+
+class MultiWord_SnippetOptions_OnlyExpandWhenWSInFront_Expand(_VimTest):
+    snippets = ('test it', 'Expand me!', '', 'b')
+    keys = 'test it' + EX
+    wanted = 'Expand me!'
+
+
+class MultiWord_SnippetOptions_OnlyExpandWhenWSInFront_Expand2(_VimTest):
+    snippets = ('test it', 'Expand me!', '', 'b')
+    keys = '   test it' + EX
+    wanted = '   Expand me!'
+
+
+class MultiWord_SnippetOptions_OnlyExpandWhenWSInFront_DontExpand(_VimTest):
+    snippets = ('test it', 'Expand me!', '', 'b')
+    keys = 'a test it' + EX
+    wanted = 'a test it' + EX
+
+
+class MultiWord_SnippetOptions_OnlyExpandWhenWSInFront_OneWithOneWO(_VimTest):
+    snippets = (
+        ('test it', 'Expand me!', '', 'b'),
+        ('test it', 'not at beginning', '', ''),
+    )
+    keys = 'a test it' + EX
+    wanted = 'a not at beginning'
+
+
+class MultiWord_SnippetOptions_OnlyExpandWhenWSInFront_OneWithOneWOChoose(
+        _VimTest):
+    snippets = (
+        ('test it', 'Expand me!', '', 'b'),
+        ('test it', 'not at beginning', '', ''),
+    )
+    keys = '  test it' + EX + '1\n'
+    wanted = '  Expand me!'
+
+
+class MultiWord_SnippetOptions_ExpandInwordSnippets_SimpleExpand(_VimTest):
+    snippets = (('test it', 'Expand me!', '', 'i'), )
+    keys = 'atest it' + EX
+    wanted = 'aExpand me!'
+
+
+class MultiWord_SnippetOptions_ExpandInwordSnippets_ExpandSingle(_VimTest):
+    snippets = (('test it', 'Expand me!', '', 'i'), )
+    keys = 'test it' + EX
+    wanted = 'Expand me!'
+
+
+class _MultiWord_SnippetOptions_ExpandWordSnippets(_VimTest):
+    snippets = (('test it', 'Expand me!', '', 'w'), )
+
+
+class MultiWord_SnippetOptions_ExpandWordSnippets_NormalExpand(
+        _MultiWord_SnippetOptions_ExpandWordSnippets):
+    keys = 'test it' + EX
+    wanted = 'Expand me!'
+
+
+class MultiWord_SnippetOptions_ExpandWordSnippets_NoExpand(
+        _MultiWord_SnippetOptions_ExpandWordSnippets):
+    keys = 'atest it' + EX
+    wanted = 'atest it' + EX
+
+
+class MultiWord_SnippetOptions_ExpandWordSnippets_ExpandSuffix(
+        _MultiWord_SnippetOptions_ExpandWordSnippets):
+    keys = 'a-test it' + EX
+    wanted = 'a-Expand me!'
+# Snippet Options  #}}}
diff --git a/vim/plugins/ultisnips/test/test_SnippetPriorities.py b/vim/plugins/ultisnips/test/test_SnippetPriorities.py
new file mode 100644
index 0000000..be595cc
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_SnippetPriorities.py
@@ -0,0 +1,158 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import EX, ESC
+
+# Snippet Priority  {{{#
+
+
+class SnippetPriorities_MultiWordTriggerOverwriteExisting(_VimTest):
+    snippets = (
+        ('test me', '${1:Hallo}', 'Types Hallo'),
+        ('test me', '${1:World}', 'Types World'),
+        ('test me', 'We overwrite', 'Overwrite the two', '', 1),
+    )
+    keys = 'test me' + EX
+    wanted = 'We overwrite'
+
+
+class SnippetPriorities_DoNotCareAboutNonMatchings(_VimTest):
+    snippets = (
+        ('test1', 'Hallo', 'Types Hallo'),
+        ('test2', 'We overwrite', 'Overwrite the two', '', 1),
+    )
+    keys = 'test1' + EX
+    wanted = 'Hallo'
+
+
+class SnippetPriorities_OverwriteExisting(_VimTest):
+    snippets = (
+        ('test', '${1:Hallo}', 'Types Hallo'),
+        ('test', '${1:World}', 'Types World'),
+        ('test', 'We overwrite', 'Overwrite the two', '', 1),
+    )
+    keys = 'test' + EX
+    wanted = 'We overwrite'
+
+
+class SnippetPriorities_OverwriteTwice_ECR(_VimTest):
+    snippets = (
+        ('test', '${1:Hallo}', 'Types Hallo'),
+        ('test', '${1:World}', 'Types World'),
+        ('test', 'We overwrite', 'Overwrite the two', '', 1),
+        ('test', 'again', 'Overwrite again', '', 2),
+    )
+    keys = 'test' + EX
+    wanted = 'again'
+
+
+class SnippetPriorities_OverwriteThenChoose_ECR(_VimTest):
+    snippets = (
+        ('test', '${1:Hallo}', 'Types Hallo'),
+        ('test', '${1:World}', 'Types World'),
+        ('test', 'We overwrite', 'Overwrite the two', '', 1),
+        ('test', 'No overwrite', 'Not overwritten', '', 1),
+    )
+    keys = 'test' + EX + '1\n\n' + 'test' + EX + '2\n'
+    wanted = 'We overwrite\nNo overwrite'
+
+
+class SnippetPriorities_AddedHasHigherThanFile(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test "Test Snippet" b
+        This is a test snippet
+        endsnippet
+        """}
+    snippets = (
+        ('test', 'We overwrite', 'Overwrite the two', '', 1),
+    )
+    keys = 'test' + EX
+    wanted = 'We overwrite'
+
+
+class SnippetPriorities_FileHasHigherThanAdded(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet test "Test Snippet" b
+        This is a test snippet
+        endsnippet
+        """}
+    snippets = (
+        ('test', 'We do not overwrite', 'Overwrite the two', '', -1),
+    )
+    keys = 'test' + EX
+    wanted = 'This is a test snippet'
+
+
+class SnippetPriorities_FileHasHigherThanAdded_neg_prio(_VimTest):
+    files = { 'us/all.snippets': r"""
+        priority -3
+        snippet test "Test Snippet" b
+        This is a test snippet
+        endsnippet
+        """}
+    snippets = (
+        ('test', 'We overwrite', 'Overwrite the two', '', -5),
+    )
+    keys = 'test' + EX
+    wanted = 'This is a test snippet'
+
+
+class SnippetPriorities_SimpleClear(_VimTest):
+    files = {
+        'us/all.snippets': r"""
+        priority 1
+        clearsnippets
+        priority -1
+        snippet test "Test Snippet"
+        Should not expand to this.
+        endsnippet
+        """
+    }
+    keys = 'test' + EX
+    wanted = 'test' + EX
+
+
+class SnippetPriorities_SimpleClear2(_VimTest):
+    files = {
+        'us/all.snippets': r"""
+        clearsnippets
+        snippet test "Test snippet"
+        Should not expand to this.
+        endsnippet
+        """
+    }
+    keys = 'test' + EX
+    wanted = 'test' + EX
+
+
+class SnippetPriorities_ClearedByParent(_VimTest):
+    files = {
+        'us/p.snippets': r"""
+        clearsnippets
+        """,
+        'us/c.snippets': r"""
+        extends p
+        snippet test "Test snippets"
+        Should not expand to this.
+        endsnippet
+        """
+    }
+    keys = ESC + ':set ft=c\n' + 'itest' + EX
+    wanted = 'test' + EX
+
+
+class SnippetPriorities_ClearedByChild(_VimTest):
+    files = {
+        'us/p.snippets': r"""
+        snippet test "Test snippets"
+        Should only expand in p.
+        endsnippet
+        """,
+        'us/c.snippets': r"""
+        extends p
+        clearsnippets
+        """
+    }
+    keys = (ESC + ':set ft=p\n' + 'itest' + EX + '\n' +
+            ESC + ':set ft=c\n' + 'itest' + EX + ESC + ':set ft=p')
+    wanted = 'Should only expand in p.\ntest' + EX
+
+# End: Snippet Priority  #}}}
diff --git a/vim/plugins/ultisnips/test/test_TabStop.py b/vim/plugins/ultisnips/test/test_TabStop.py
new file mode 100644
index 0000000..c9e7648
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_TabStop.py
@@ -0,0 +1,408 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+
+class TabStopSimpleReplace_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo ${0:End} ${1:Beginning}')
+    keys = 'hallo' + EX + 'na' + JF + 'Du Nase'
+    wanted = 'hallo Du Nase na'
+
+
+class TabStopSimpleReplaceZeroLengthTabstops_ExpectCorrectResult(_VimTest):
+    snippets = ('test', r":latex:\`$1\`$0")
+    keys = 'test' + EX + 'Hello' + JF + 'World'
+    wanted = ':latex:`Hello`World'
+
+
+class TabStopSimpleReplaceReversed_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo ${1:End} ${0:Beginning}')
+    keys = 'hallo' + EX + 'na' + JF + 'Du Nase'
+    wanted = 'hallo na Du Nase'
+
+
+class TabStopSimpleReplaceSurrounded_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo ${0:End} a small feed')
+    keys = 'hallo' + EX + 'Nase'
+    wanted = 'hallo Nase a small feed'
+
+
+class TabStopSimpleReplaceSurrounded1_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo $0 a small feed')
+    keys = 'hallo' + EX + 'Nase'
+    wanted = 'hallo Nase a small feed'
+
+
+class TabStop_Exit_ExpectCorrectResult(_VimTest):
+    snippets = ('echo', '$0 run')
+    keys = 'echo' + EX + 'test'
+    wanted = 'test run'
+
+
+class TabStopNoReplace_ExpectCorrectResult(_VimTest):
+    snippets = ('echo', 'echo ${1:Hallo}')
+    keys = 'echo' + EX
+    wanted = 'echo Hallo'
+
+
+class TabStop_EscapingCharsBackticks(_VimTest):
+    snippets = ('test', r"snip \` literal")
+    keys = 'test' + EX
+    wanted = 'snip ` literal'
+
+
+class TabStop_EscapingCharsDollars(_VimTest):
+    snippets = ('test', r"snip \$0 $$0 end")
+    keys = 'test' + EX + 'hi'
+    wanted = 'snip $0 $hi end'
+
+
+class TabStop_EscapingCharsDollars1(_VimTest):
+    snippets = ('test', r"a\${1:literal}")
+    keys = 'test' + EX
+    wanted = 'a${1:literal}'
+
+
+class TabStop_EscapingCharsDollars_BeginningOfLine(_VimTest):
+    snippets = ('test', '\n\\${1:literal}')
+    keys = 'test' + EX
+    wanted = '\n${1:literal}'
+
+
+class TabStop_EscapingCharsDollars_BeginningOfDefinitionText(_VimTest):
+    snippets = ('test', '\\${1:literal}')
+    keys = 'test' + EX
+    wanted = '${1:literal}'
+
+
+class TabStop_EscapingChars_Backslash(_VimTest):
+    snippets = ('test', r"This \ is a backslash!")
+    keys = 'test' + EX
+    wanted = 'This \\ is a backslash!'
+
+
+class TabStop_EscapingChars_Backslash2(_VimTest):
+    snippets = ('test', r"This is a backslash \\ done")
+    keys = 'test' + EX
+    wanted = r"This is a backslash \ done"
+
+
+class TabStop_EscapingChars_Backslash3(_VimTest):
+    snippets = ('test', r"These are two backslashes \\\\ done")
+    keys = 'test' + EX
+    wanted = r"These are two backslashes \\ done"
+
+
+class TabStop_EscapingChars_Backslash4(_VimTest):
+    # Test for bug 746446
+    snippets = ('test', r"\\$1{$2}")
+    keys = 'test' + EX + 'hello' + JF + 'world'
+    wanted = r"\hello{world}"
+
+
+class TabStop_EscapingChars_RealLife(_VimTest):
+    snippets = ('test', r"usage: \`basename \$0\` ${1:args}")
+    keys = 'test' + EX + '[ -u -v -d ]'
+    wanted = 'usage: `basename $0` [ -u -v -d ]'
+
+
+class TabStopEscapingWhenSelected_ECR(_VimTest):
+    snippets = ('test', 'snip ${1:default}')
+    keys = 'test' + EX + ESC + '0ihi'
+    wanted = 'hisnip default'
+
+
+class TabStopEscapingWhenSelectedSingleCharTS_ECR(_VimTest):
+    snippets = ('test', 'snip ${1:i}')
+    keys = 'test' + EX + ESC + '0ihi'
+    wanted = 'hisnip i'
+
+
+class TabStopEscapingWhenSelectedNoCharTS_ECR(_VimTest):
+    snippets = ('test', 'snip $1')
+    keys = 'test' + EX + ESC + '0ihi'
+    wanted = 'hisnip '
+
+
+class TabStopWithOneChar_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'nothing ${1:i} hups')
+    keys = 'hallo' + EX + 'ship'
+    wanted = 'nothing ship hups'
+
+
+class TabStopTestJumping_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo ${2:End} mitte ${1:Beginning}')
+    keys = 'hallo' + EX + JF + 'Test' + JF + 'Hi'
+    wanted = 'hallo Test mitte BeginningHi'
+
+
+class TabStopTestJumping2_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo $2 $1')
+    keys = 'hallo' + EX + JF + 'Test' + JF + 'Hi'
+    wanted = 'hallo Test Hi'
+
+
+class TabStopTestJumpingRLExampleWithZeroTab_ExpectCorrectResult(_VimTest):
+    snippets = ('test', 'each_byte { |${1:byte}| $0 }')
+    keys = 'test' + EX + JF + 'Blah'
+    wanted = 'each_byte { |byte| Blah }'
+
+
+class TabStopTestJumpingDontJumpToEndIfThereIsTabZero_ExpectCorrectResult(
+        _VimTest):
+    snippets = ('hallo', 'hallo $0 $1')
+    keys = 'hallo' + EX + 'Test' + JF + 'Hi' + JF + JF + 'du'
+    wanted = 'hallo Hi' + 2 * JF + 'du Test'
+
+
+class TabStopTestBackwardJumping_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo ${2:End} mitte${1:Beginning}')
+    keys = 'hallo' + EX + 'Somelengthy Text' + JF + 'Hi' + JB + \
+        'Lets replace it again' + JF + 'Blah' + JF + JB * 2 + JF
+    wanted = 'hallo Blah mitteLets replace it again' + JB * 2 + JF
+
+
+class TabStopTestBackwardJumping2_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo $2 $1')
+    keys = 'hallo' + EX + 'Somelengthy Text' + JF + 'Hi' + JB + \
+        'Lets replace it again' + JF + 'Blah' + JF + JB * 2 + JF
+    wanted = 'hallo Blah Lets replace it again' + JB * 2 + JF
+
+
+class TabStopTestMultilineExpand_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'hallo $0\nnice $1 work\n$3 $2\nSeem to work')
+    keys = 'test hallo World' + ESC + '02f i' + EX + 'world' + JF + 'try' + \
+        JF + 'test' + JF + 'one more' + JF
+    wanted = 'test hallo one more' + JF + '\nnice world work\n' \
+        'test try\nSeem to work World'
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteNone_ECR(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $0\n</div>""")
+    keys = 'test' + EX
+    wanted = """<div id="some_id">\n  \n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteFirst_NoJumpBack(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $0\n</div>""")
+    keys = 'test' + EX + ' blah' + JF + 'Hallo'
+    wanted = """<div blah>\n  Hallo\n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_DeleteFirst(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $0\n</div>""")
+    keys = 'test' + EX + BS + JF + 'Hallo'
+    wanted = """<div>\n  Hallo\n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteFirstJumpBack(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $3  $0\n</div>""")
+    keys = 'test' + EX + 'Hi' + JF + 'Hallo' + JB + 'SomethingElse' + JF + \
+        'Nupl' + JF + 'Nox'
+    wanted = """<divSomethingElse>\n  Nupl  Nox\n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteSecond(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $0\n</div>""")
+    keys = 'test' + EX + JF + 'no' + JF + 'End'
+    wanted = """<div id="no">\n  End\n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteSecondTabBack(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $3 $0\n</div>""")
+    keys = 'test' + EX + JF + 'no' + JF + 'End' + JB + 'yes' + JF + 'Begin' \
+        + JF + 'Hi'
+    wanted = """<div id="yes">\n  Begin Hi\n</div>"""
+
+
+class TabStop_TSInDefaultTextRLExample_OverwriteSecondTabBackTwice(_VimTest):
+    snippets = ('test', """<div${1: id="${2:some_id}"}>\n  $3 $0\n</div>""")
+    keys = 'test' + EX + JF + 'no' + JF + 'End' + JB + 'yes' + JB + \
+        ' allaway' + JF + 'Third' + JF + 'Last'
+    wanted = """<div allaway>\n  Third Last\n</div>"""
+
+
+class TabStop_TSInDefaultText_ZeroLengthNested_OverwriteSecond(_VimTest):
+    snippets = ('test', """h${1:a$2b}l""")
+    keys = 'test' + EX + JF + 'ups' + JF + 'End'
+    wanted = """haupsblEnd"""
+
+
+class TabStop_TSInDefaultText_ZeroLengthZerothTabstop(_VimTest):
+    snippets = ('test', """Test: ${1:snippet start\nNested tabstop: $0\nsnippet end}\nTrailing text""")
+    keys = 'test' + EX + JF + 'hello'
+    wanted = "Test: snippet start\nNested tabstop: hello\nsnippet end\nTrailing text"
+
+class TabStop_TSInDefaultText_ZeroLengthZerothTabstop_Override(_VimTest):
+    snippets = ('test', """Test: ${1:snippet start\nNested tabstop: $0\nsnippet end}\nTrailing text""")
+    keys = 'test' + EX + 'blub' + JF + 'hello'
+    wanted = "Test: blub\nTrailing texthello"
+
+class TabStop_TSInDefaultText_ZeroLengthNested_OverwriteFirst(_VimTest):
+    snippets = ('test', """h${1:a$2b}l""")
+    keys = 'test' + EX + 'ups' + JF + 'End'
+    wanted = """hupslEnd"""
+
+
+class TabStop_TSInDefaultText_ZeroLengthNested_OverwriteSecondJumpBackOverwrite(
+        _VimTest):
+    snippets = ('test', """h${1:a$2b}l""")
+    keys = 'test' + EX + JF + 'longertext' + JB + 'overwrite' + JF + 'End'
+    wanted = """hoverwritelEnd"""
+
+
+class TabStop_TSInDefaultText_ZeroLengthNested_OverwriteSecondJumpBackAndForward0(
+        _VimTest):
+    snippets = ('test', """h${1:a$2b}l""")
+    keys = 'test' + EX + JF + 'longertext' + JB + JF + 'overwrite' + JF + 'End'
+    wanted = """haoverwriteblEnd"""
+
+
+class TabStop_TSInDefaultText_ZeroLengthNested_OverwriteSecondJumpBackAndForward1(
+        _VimTest):
+    snippets = ('test', """h${1:a$2b}l""")
+    keys = 'test' + EX + JF + 'longertext' + JB + JF + JF + 'End'
+    wanted = """halongertextblEnd"""
+
+
+class TabStop_TSInDefaultNested_OverwriteOneJumpBackToOther(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second ${3:third}}} $4')
+    keys = 'test' + EX + JF + 'Hallo' + JF + 'Ende'
+    wanted = 'hi this Hallo Ende'
+
+
+class TabStop_TSInDefaultNested_OverwriteOneJumpToThird(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second ${3:third}}} $4')
+    keys = 'test' + EX + JF + JF + 'Hallo' + JF + 'Ende'
+    wanted = 'hi this second Hallo Ende'
+
+
+class TabStop_TSInDefaultNested_OverwriteOneJumpAround(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second ${3:third}}} $4')
+    keys = 'test' + EX + JF + JF + 'Hallo' + JB + JB + 'Blah' + JF + 'Ende'
+    wanted = 'hi Blah Ende'
+
+
+class TabStop_TSInDefault_MirrorsOutside_DoNothing(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second}} $2')
+    keys = 'test' + EX
+    wanted = 'hi this second second'
+
+
+class TabStop_TSInDefault_MirrorsOutside_OverwriteSecond(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second}} $2')
+    keys = 'test' + EX + JF + 'Hallo'
+    wanted = 'hi this Hallo Hallo'
+
+
+class TabStop_TSInDefault_MirrorsOutside_Overwrite0(_VimTest):
+    snippets = ('test', 'hi ${1:this ${2:second}} $2')
+    keys = 'test' + EX + 'Hallo'
+    wanted = 'hi Hallo '
+
+
+class TabStop_TSInDefault_MirrorsOutside_Overwrite1(_VimTest):
+    snippets = ('test', "$1: ${1:'${2:second}'} $2")
+    keys = 'test' + EX + 'Hallo'
+    wanted = 'Hallo: Hallo '
+
+
+class TabStop_TSInDefault_MirrorsOutside_OverwriteSecond1(_VimTest):
+    snippets = ('test', "$1: ${1:'${2:second}'} $2")
+    keys = 'test' + EX + JF + 'Hallo'
+    wanted = "'Hallo': 'Hallo' Hallo"
+
+
+class TabStop_TSInDefault_MirrorsOutside_OverwriteFirstSwitchNumbers(_VimTest):
+    snippets = ('test', "$2: ${2:'${1:second}'} $1")
+    keys = 'test' + EX + 'Hallo'
+    wanted = "'Hallo': 'Hallo' Hallo"
+
+
+class TabStop_TSInDefault_MirrorsOutside_OverwriteFirst_RLExample(_VimTest):
+    snippets = (
+        'test',
+        """`!p snip.rv = t[1].split('/')[-1].lower().strip("'")` = require(${1:'${2:sys}'})""")
+    keys = 'test' + EX + 'WORLD' + JF + 'End'
+    wanted = 'world = require(WORLD)End'
+
+
+class TabStop_TSInDefault_MirrorsOutside_OverwriteSecond_RLExample(_VimTest):
+    snippets = (
+        'test',
+        """`!p snip.rv = t[1].split('/')[-1].lower().strip("'")` = require(${1:'${2:sys}'})""")
+    keys = 'test' + EX + JF + 'WORLD' + JF + 'End'
+    wanted = "world = require('WORLD')End"
+
+
+class TabStop_Multiline_Leave(_VimTest):
+    snippets = ('test', 'hi ${1:first line\nsecond line} world')
+    keys = 'test' + EX
+    wanted = 'hi first line\nsecond line world'
+
+
+class TabStop_Multiline_Overwrite(_VimTest):
+    snippets = ('test', 'hi ${1:first line\nsecond line} world')
+    keys = 'test' + EX + 'Nothing'
+    wanted = 'hi Nothing world'
+
+
+class TabStop_Multiline_MirrorInFront_Leave(_VimTest):
+    snippets = ('test', 'hi $1 ${1:first line\nsecond line} world')
+    keys = 'test' + EX
+    wanted = 'hi first line\nsecond line first line\nsecond line world'
+
+
+class TabStop_Multiline_MirrorInFront_Overwrite(_VimTest):
+    snippets = ('test', 'hi $1 ${1:first line\nsecond line} world')
+    keys = 'test' + EX + 'Nothing'
+    wanted = 'hi Nothing Nothing world'
+
+
+class TabStop_Multiline_DelFirstOverwriteSecond_Overwrite(_VimTest):
+    snippets = ('test', 'hi $1 $2 ${1:first line\nsecond line} ${2:Hi} world')
+    keys = 'test' + EX + BS + JF + 'Nothing'
+    wanted = 'hi  Nothing  Nothing world'
+
+
+class TabStopNavigatingInInsertModeSimple_ExpectCorrectResult(_VimTest):
+    snippets = ('hallo', 'Hallo ${1:WELT} ups')
+    keys = 'hallo' + EX + 'haselnut' + 2 * ARR_L + 'hips' + JF + 'end'
+    wanted = 'Hallo haselnhipsut upsend'
+
+
+class TabStop_CROnlyOnSelectedNear(_VimTest):
+    snippets = ('test', 't$1t${2: }t{\n\t$0\n}')
+    keys = 'test' + EX + JF + '\n' + JF + 't'
+    wanted = 'tt\nt{\n\tt\n}'
+
+
+class TabStop_AdjacentTabStopAddText_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '[ $1$2 ] $1')
+    keys = 'test' + EX + 'Hello' + JF + 'World' + JF
+    wanted = '[ HelloWorld ] Hello'
+
+
+class TabStop_KeepCorrectJumpListOnOverwriteOfPartOfSnippet(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet i
+        ia$1: $2
+        endsnippet
+
+        snippet ia
+        ia($1, $2)
+        endsnippet"""}
+    keys = 'i' + EX + EX + '1' + JF + '2' + JF + ' after' + JF + '3'
+    wanted = 'ia(1, 2) after: 3'
+
+
+class TabStop_KeepCorrectJumpListOnOverwriteOfPartOfSnippetRE(_VimTest):
+    files = { 'us/all.snippets': r"""
+        snippet i
+        ia$1: $2
+        endsnippet
+
+        snippet "^ia" "regexp" r
+        ia($1, $2)
+        endsnippet"""}
+    keys = 'i' + EX + EX + '1' + JF + '2' + JF + ' after' + JF + '3'
+    wanted = 'ia(1, 2) after: 3'
diff --git a/vim/plugins/ultisnips/test/test_Transformation.py b/vim/plugins/ultisnips/test/test_Transformation.py
new file mode 100644
index 0000000..433750e
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Transformation.py
@@ -0,0 +1,269 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+from test.util import no_unidecode_available
+
+# Transformations  {{{#
+
+
+class Transformation_SimpleCase_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/foo/batzl/}')
+    keys = 'test' + EX + 'hallo foo boy'
+    wanted = 'hallo foo boy hallo batzl boy'
+
+
+class Transformation_SimpleCaseNoTransform_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/foo/batzl/}')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo hallo'
+
+
+class Transformation_SimpleCaseTransformInFront_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '${1/foo/batzl/} $1')
+    keys = 'test' + EX + 'hallo foo'
+    wanted = 'hallo batzl hallo foo'
+
+
+class Transformation_SimpleCaseTransformInFrontDefVal_ECR(_VimTest):
+    snippets = ('test', '${1/foo/batzl/} ${1:replace me}')
+    keys = 'test' + EX + 'hallo foo'
+    wanted = 'hallo batzl hallo foo'
+
+
+class Transformation_MultipleTransformations_ECR(_VimTest):
+    snippets = ('test', '${1:Some Text}${1/.+/\\U$0\E/}\n${1/.+/\L$0\E/}')
+    keys = 'test' + EX + 'SomE tExt '
+    wanted = 'SomE tExt SOME TEXT \nsome text '
+
+
+class Transformation_TabIsAtEndAndDeleted_ECR(_VimTest):
+    snippets = ('test', '${1/.+/is something/}${1:some}')
+    keys = 'hallo test' + EX + 'some\b\b\b\b\b'
+    wanted = 'hallo '
+
+
+class Transformation_TabIsAtEndAndDeleted1_ECR(_VimTest):
+    snippets = ('test', '${1/.+/is something/}${1:some}')
+    keys = 'hallo test' + EX + 'some\b\b\b\bmore'
+    wanted = 'hallo is somethingmore'
+
+
+class Transformation_TabIsAtEndNoTextLeave_ECR(_VimTest):
+    snippets = ('test', '${1/.+/is something/}${1}')
+    keys = 'hallo test' + EX
+    wanted = 'hallo '
+
+
+class Transformation_TabIsAtEndNoTextType_ECR(_VimTest):
+    snippets = ('test', '${1/.+/is something/}${1}')
+    keys = 'hallo test' + EX + 'b'
+    wanted = 'hallo is somethingb'
+
+
+class Transformation_InsideTabLeaveAtDefault_ECR(_VimTest):
+    snippets = ('test', r"$1 ${2:${1/.+/(?0:defined $0)/}}")
+    keys = 'test' + EX + 'sometext' + JF
+    wanted = 'sometext defined sometext'
+
+
+class Transformation_InsideTabOvertype_ECR(_VimTest):
+    snippets = ('test', r"$1 ${2:${1/.+/(?0:defined $0)/}}")
+    keys = 'test' + EX + 'sometext' + JF + 'overwrite'
+    wanted = 'sometext overwrite'
+
+
+class Transformation_Backreference_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/([ab])oo/$1ull/}')
+    keys = 'test' + EX + 'foo boo aoo'
+    wanted = 'foo boo aoo foo bull aoo'
+
+
+class Transformation_BackreferenceTwice_ExpectCorrectResult(_VimTest):
+    snippets = ('test', r"$1 ${1/(dead) (par[^ ]*)/this $2 is a bit $1/}")
+    keys = 'test' + EX + 'dead parrot'
+    wanted = 'dead parrot this parrot is a bit dead'
+
+
+class Transformation_CleverTransformUpercaseChar_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(.)/\\u$1/}')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo Hallo'
+
+
+class Transformation_CleverTransformLowercaseChar_ExpectCorrectResult(
+        _VimTest):
+    snippets = ('test', '$1 ${1/(.*)/\l$1/}')
+    keys = 'test' + EX + 'Hallo'
+    wanted = 'Hallo hallo'
+
+
+class Transformation_CleverTransformLongUpper_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(.*)/\\U$1\E/}')
+    keys = 'test' + EX + 'hallo'
+    wanted = 'hallo HALLO'
+
+
+class Transformation_CleverTransformLongLower_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(.*)/\L$1\E/}')
+    keys = 'test' + EX + 'HALLO'
+    wanted = 'HALLO hallo'
+
+
+class Transformation_SimpleCaseAsciiResult(_VimTest):
+    skip_if = lambda self: no_unidecode_available()
+    snippets = ('ascii', '$1 ${1/(.*)/$1/a}')
+    keys = 'ascii' + EX + 'éèàçôïÉÈÀÇÔÏ€'
+    wanted = 'éèàçôïÉÈÀÇÔÏ€ eeacoiEEACOIEU'
+
+
+class Transformation_LowerCaseAsciiResult(_VimTest):
+    skip_if = lambda self: no_unidecode_available()
+    snippets = ('ascii', '$1 ${1/(.*)/\L$1\E/a}')
+    keys = 'ascii' + EX + 'éèàçôïÉÈÀÇÔÏ€'
+    wanted = 'éèàçôïÉÈÀÇÔÏ€ eeacoieeacoieu'
+
+
+class Transformation_ConditionalInsertionSimple_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(^a).*/(?0:began with an a)/}')
+    keys = 'test' + EX + 'a some more text'
+    wanted = 'a some more text began with an a'
+
+
+class Transformation_CIBothDefinedNegative_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(?:(^a)|(^b)).*/(?1:yes:no)/}')
+    keys = 'test' + EX + 'b some'
+    wanted = 'b some no'
+
+
+class Transformation_CIBothDefinedPositive_ExpectCorrectResult(_VimTest):
+    snippets = ('test', '$1 ${1/(?:(^a)|(^b)).*/(?1:yes:no)/}')
+    keys = 'test' + EX + 'a some'
+    wanted = 'a some yes'
+
+
+class Transformation_ConditionalInsertRWEllipsis_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/(\w+(?:\W+\w+){,7})\W*(.+)?/$1(?2:...)/}")
+    keys = 'test' + EX + 'a b  c d e f ghhh h oha'
+    wanted = 'a b  c d e f ghhh h oha a b  c d e f ghhh h...'
+
+
+class Transformation_ConditionalInConditional_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}")
+    keys = 'test' + EX + 'hallo' + ESC + '$a\n' + \
+           'test' + EX + 'hallo-' + ESC + '$a\n' + \
+           'test' + EX + 'hallo->'
+    wanted = 'hallo .\nhallo- >\nhallo-> '
+
+
+class Transformation_CINewlines_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/, */\n/}")
+    keys = 'test' + EX + 'test, hallo'
+    wanted = 'test, hallo test\nhallo'
+
+
+class Transformation_CITabstop_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/, */\t/}")
+    keys = 'test' + EX + 'test, hallo'
+    wanted = 'test, hallo test\thallo'
+
+
+class Transformation_CIEscapedParensinReplace_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/hal((?:lo)|(?:ul))/(?1:ha\($1\))/}")
+    keys = 'test' + EX + 'test, halul'
+    wanted = 'test, halul test, ha(ul)'
+
+
+class Transformation_OptionIgnoreCase_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/test/blah/i}")
+    keys = 'test' + EX + 'TEST'
+    wanted = 'TEST blah'
+
+
+class Transformation_OptionMultiline_ECR(_VimTest):
+    snippets = ('test', r"${VISUAL/^/* /mg}")
+    keys = 'test\ntest\ntest' + ESC + 'V2k' + EX + 'test' + EX
+    wanted = '* test\n* test\n* test'
+
+
+class Transformation_OptionReplaceGlobal_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/, */-/g}")
+    keys = 'test' + EX + 'a, nice, building'
+    wanted = 'a, nice, building a-nice-building'
+
+
+class Transformation_OptionReplaceGlobalMatchInReplace_ECR(_VimTest):
+    snippets = ('test', r"$1 ${1/, */, /g}")
+    keys = 'test' + EX + 'a, nice,   building'
+    wanted = 'a, nice,   building a, nice, building'
+
+
+class TransformationUsingBackspaceToDeleteDefaultValueInFirstTab_ECR(_VimTest):
+    snippets = ('test', 'snip ${1/.+/(?0:m1)/} ${2/.+/(?0:m2)/} '
+                '${1:default} ${2:def}')
+    keys = 'test' + EX + BS + JF + 'hi'
+    wanted = 'snip  m2  hi'
+
+
+class TransformationUsingBackspaceToDeleteDefaultValueInSecondTab_ECR(
+        _VimTest):
+    snippets = ('test', 'snip ${1/.+/(?0:m1)/} ${2/.+/(?0:m2)/} '
+                '${1:default} ${2:def}')
+    keys = 'test' + EX + 'hi' + JF + BS
+    wanted = 'snip m1  hi '
+
+
+class TransformationUsingBackspaceToDeleteDefaultValueTypeSomethingThen_ECR(
+        _VimTest):
+    snippets = ('test', 'snip ${1/.+/(?0:matched)/} ${1:default}')
+    keys = 'test' + EX + BS + 'hallo'
+    wanted = 'snip matched hallo'
+
+
+class TransformationUsingBackspaceToDeleteDefaultValue_ECR(_VimTest):
+    snippets = ('test', 'snip ${1/.+/(?0:matched)/} ${1:default}')
+    keys = 'test' + EX + BS
+    wanted = 'snip  '
+
+
+class Transformation_TestKill_InsertBefore_NoKill(_VimTest):
+    snippets = 'test', r"$1 ${1/.*/\L$0$0\E/}_"
+    keys = 'hallo test' + EX + 'AUCH' + ESC + \
+        'wihi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noAUCH hinoauchnoauch_end'
+
+
+class Transformation_TestKill_InsertAfter_NoKill(_VimTest):
+    snippets = 'test', r"$1 ${1/.*/\L$0$0\E/}_"
+    keys = 'hallo test' + EX + 'AUCH' + ESC + \
+        'eiab' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noAUCH noauchnoauchab_end'
+
+
+class Transformation_TestKill_InsertBeginning_Kill(_VimTest):
+    snippets = 'test', r"$1 ${1/.*/\L$0$0\E/}_"
+    keys = 'hallo test' + EX + 'AUCH' + ESC + \
+        'wahi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noAUCH ahiuchauch_end'
+
+
+class Transformation_TestKill_InsertEnd_Kill(_VimTest):
+    snippets = 'test', r"$1 ${1/.*/\L$0$0\E/}_"
+    keys = 'hallo test' + EX + 'AUCH' + ESC + \
+        'ehihi' + ESC + 'bb' + 'ino' + JF + 'end'
+    wanted = 'hallo noAUCH auchauchih_end'
+
+class Transformation_ConditionalWithEscapedDelimiter(_VimTest):
+    snippets = 'test', r"$1 ${1/(aa)|.*/(?1:yes\:no\))/}"
+    keys = 'test' + EX + 'aa'
+    wanted = 'aa yes:no)'
+
+class Transformation_ConditionalWithBackslashBeforeDelimiter(_VimTest):
+    snippets = 'test', r"$1 ${1/(aa)|.*/(?1:yes\\:no)/}"
+    keys = 'test' + EX + 'aa'
+    wanted = 'aa yes\\'
+
+class Transformation_ConditionalWithBackslashBeforeDelimiter1(_VimTest):
+    snippets = 'test', r"$1 ${1/(aa)|.*/(?1:yes:no\\)/}"
+    keys = 'test' + EX + 'ab'
+    wanted = 'ab no\\'
+# End: Transformations  #}}}
diff --git a/vim/plugins/ultisnips/test/test_UltiSnipFunc.py b/vim/plugins/ultisnips/test/test_UltiSnipFunc.py
new file mode 100644
index 0000000..fda3372
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_UltiSnipFunc.py
@@ -0,0 +1,171 @@
+# encoding: utf-8
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+from test.util import running_on_windows
+
+# AddSnippet Function  {{{#
+
+
+class _AddFuncBase(_VimTest):
+    args = ''
+
+    def _before_test(self):
+        self.vim.send_to_vim(':call UltiSnips#AddSnippetWithPriority(%s)\n' % self.args)
+
+
+class AddFunc_Simple(_AddFuncBase):
+    args = '"test", "simple expand", "desc", "", "all", 0'
+    keys = 'abc test' + EX
+    wanted = 'abc simple expand'
+
+
+class AddFunc_Opt(_AddFuncBase):
+    args = '".*test", "simple expand", "desc", "r", "all", 0'
+    keys = 'abc test' + EX
+    wanted = 'simple expand'
+# End: AddSnippet Function  #}}}
+
+# Langmap Handling  {{{#
+# Test for bug 501727 #
+
+
+class TestNonEmptyLangmap_ExpectCorrectResult(_VimTest):
+    snippets = ('testme',
+                """my snipped ${1:some_default}
+and a mirror: $1
+$2...$3
+$0""")
+    keys = 'testme' + EX + 'hi1' + JF + 'hi2' + JF + 'hi3' + JF + 'hi4'
+    wanted = """my snipped hi1
+and a mirror: hi1
+hi2...hi3
+hi4"""
+
+    def _extra_vim_config(self, vim_config):
+        vim_config.append('set langmap=dj,rk,nl,ln,jd,kr,DJ,RK,NL,LN,JD,KR')
+
+# Test for https://bugs.launchpad.net/bugs/501727 #
+
+
+class TestNonEmptyLangmapWithSemi_ExpectCorrectResult(_VimTest):
+    snippets = ('testme',
+                """my snipped ${1:some_default}
+and a mirror: $1
+$2...$3
+$0""")
+    keys = 'testme' + EX + 'hi;' + JF + 'hi2' + \
+        JF + 'hi3' + JF + 'hi4' + ESC + ';Hello'
+    wanted = """my snipped hi;
+and a mirror: hi;
+hi2...hi3
+hi4Hello"""
+
+    def _before_test(self):
+        self.vim.send_to_vim(':set langmap=\\\\;;A\n')
+
+# Test for bug 871357 #
+
+
+class TestLangmapWithUtf8_ExpectCorrectResult(_VimTest):
+    # SendKeys can't send UTF characters
+    skip_if = lambda self: running_on_windows()
+    snippets = ('testme',
+                """my snipped ${1:some_default}
+and a mirror: $1
+$2...$3
+$0""")
+    keys = 'testme' + EX + 'hi1' + JF + 'hi2' + JF + 'hi3' + JF + 'hi4'
+    wanted = """my snipped hi1
+and a mirror: hi1
+hi2...hi3
+hi4"""
+
+    def _before_test(self):
+        self.vim.send_to_vim(
+            ":set langmap=йq,цw,уe,кr,еt,нy,гu,шi,щo,зp,х[,ъ],фa,ыs,вd,аf,пg,рh,оj,лk,дl,ж\\;,э',яz,чx,сc,мv,иb,тn,ьm,ю.,ё',ЙQ,ЦW,УE,КR,ЕT,НY,ГU,ШI,ЩO,ЗP,Х\{,Ъ\},ФA,ЫS,ВD,АF,ПG,РH,ОJ,ЛK,ДL,Ж\:,Э\",ЯZ,ЧX,СC,МV,ИB,ТN,ЬM,Б\<,Ю\>\n")
+
+# End: Langmap Handling  #}}}
+
+# SnippetsInCurrentScope  {{{#
+
+
+class VerifyVimDict1(_VimTest):
+
+    """check:
+    correct type (4 means vim dictionary)
+    correct length of dictionary (in this case we have on element if the use same prefix, dictionary should have 1 element)
+    correct description (including the apostrophe)
+    if the prefix is mismatched no resulting dict should have 0 elements
+    """
+
+    snippets = ('testâ', 'abc123ά', '123\'êabc')
+    keys = ('test=(type(UltiSnips#SnippetsInCurrentScope()) . len(UltiSnips#SnippetsInCurrentScope()) . ' +
+            'UltiSnips#SnippetsInCurrentScope()["testâ"]' + ')\n' +
+            '=len(UltiSnips#SnippetsInCurrentScope())\n')
+
+    wanted = 'test41123\'êabc0'
+
+
+class VerifyVimDict2(_VimTest):
+
+    """check:
+    can use " in trigger
+    """
+
+    snippets = ('te"stâ', 'abc123ά', '123êabc')
+    akey = "'te{}stâ'".format('"')
+    keys = (
+        'te"=(UltiSnips#SnippetsInCurrentScope()[{}]'.format(akey) + ')\n')
+    wanted = 'te"123êabc'
+
+
+class VerifyVimDict3(_VimTest):
+
+    """check:
+    can use ' in trigger
+    """
+
+    snippets = ("te'stâ", 'abc123ά', '123êabc')
+    akey = '"te{}stâ"'.format("'")
+    keys = (
+        "te'=(UltiSnips#SnippetsInCurrentScope()[{}]".format(akey) + ')\n')
+    wanted = "te'123êabc"
+# End: SnippetsInCurrentScope  #}}}
+
+# Snippet Source  {{{#
+
+
+class AddNewSnippetSource(_VimTest):
+    keys = ('blumba' + EX + ESC +
+            ':%(python)s UltiSnips_Manager.register_snippet_source(' +
+            "'temp', MySnippetSource())\n" +
+            'oblumba' + EX + ESC +
+            ":%(python)s UltiSnips_Manager.unregister_snippet_source('temp')\n" +
+            'oblumba' + EX) % {'python': 'py3' if PYTHON3 else 'py'}
+    wanted = (
+        'blumba' + EX + '\n' +
+        'this is a dynamic snippet' + '\n' +
+        'blumba' + EX
+    )
+
+    def _extra_vim_config(self, vim_config):
+        self._create_file('snippet_source.py', """
+from UltiSnips.snippet.source import SnippetSource
+from UltiSnips.snippet.definition import UltiSnipsSnippetDefinition
+
+class MySnippetSource(SnippetSource):
+  def get_snippets(self, filetypes, before, possible, autotrigger_only,
+                   visual_content):
+    if before.endswith('blumba') and autotrigger_only == False:
+      return [
+          UltiSnipsSnippetDefinition(
+              -100, "blumba", "this is a dynamic snippet", "", "", {}, "blub",
+              None, {})
+        ]
+    return []
+""")
+        pyfile = 'py3file' if PYTHON3 else 'pyfile'
+        vim_config.append(
+            '%s %s' %
+            (pyfile, self.name_temp('snippet_source.py')))
+# End: Snippet Source  #}}}
diff --git a/vim/plugins/ultisnips/test/test_Visual.py b/vim/plugins/ultisnips/test/test_Visual.py
new file mode 100644
index 0000000..d6d9d8a
--- /dev/null
+++ b/vim/plugins/ultisnips/test/test_Visual.py
@@ -0,0 +1,204 @@
+from test.vim_test_case import VimTestCase as _VimTest
+from test.constant import *
+
+# ${VISUAL}  {{{#
+
+
+class Visual_NoVisualSelection_Ignore(_VimTest):
+    snippets = ('test', 'h${VISUAL}b')
+    keys = 'test' + EX + 'abc'
+    wanted = 'hbabc'
+
+
+class Visual_SelectOneWord(_VimTest):
+    snippets = ('test', 'h${VISUAL}b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hblablubb'
+
+
+class Visual_SelectOneWord_ProblemAfterTab(_VimTest):
+    snippets = ('test', 'h${VISUAL}b', '', 'i')
+    keys = '\tblablub' + ESC + '5hv3l' + EX + 'test' + EX
+    wanted = '\tbhlablbub'
+
+
+class VisualWithDefault_ExpandWithoutVisual(_VimTest):
+    snippets = ('test', 'h${VISUAL:world}b')
+    keys = 'test' + EX + 'hi'
+    wanted = 'hworldbhi'
+
+
+class VisualWithDefaultWithSlashes_ExpandWithoutVisual(_VimTest):
+    snippets = ('test', r"h${VISUAL:\/\/ body}b")
+    keys = 'test' + EX + 'hi'
+    wanted = 'h// bodybhi'
+
+
+class VisualWithDefault_ExpandWithVisual(_VimTest):
+    snippets = ('test', 'h${VISUAL:world}b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hblablubb'
+
+
+class Visual_ExpandTwice(_VimTest):
+    snippets = ('test', 'h${VISUAL}b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX + '\ntest' + EX
+    wanted = 'hblablubb\nhb'
+
+
+class Visual_SelectOneWord_TwiceVisual(_VimTest):
+    snippets = ('test', 'h${VISUAL}b${VISUAL}a')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hblablubbblabluba'
+
+
+class Visual_SelectOneWord_Inword(_VimTest):
+    snippets = ('test', 'h${VISUAL}b', 'Description', 'i')
+    keys = 'blablub' + ESC + '0lv4l' + EX + 'test' + EX
+    wanted = 'bhlablubb'
+
+
+class Visual_SelectOneWord_TillEndOfLine(_VimTest):
+    snippets = ('test', 'h${VISUAL}b', 'Description', 'i')
+    keys = 'blablub' + ESC + '0v$' + EX + 'test' + EX + ESC + 'o'
+    wanted = 'hblablub\nb'
+
+
+class Visual_SelectOneWordWithTabstop_TillEndOfLine(_VimTest):
+    snippets = ('test', 'h${2:ahh}${VISUAL}${1:ups}b', 'Description', 'i')
+    keys = 'blablub' + ESC + '0v$' + EX + 'test' + \
+        EX + 'mmm' + JF + 'n' + JF + 'done' + ESC + 'o'
+    wanted = 'hnblablub\nmmmbdone'
+
+
+class Visual_InDefaultText_SelectOneWord_NoOverwrite(_VimTest):
+    snippets = ('test', 'h${1:${VISUAL}}b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX + JF + 'hello'
+    wanted = 'hblablubbhello'
+
+
+class Visual_InDefaultText_SelectOneWord(_VimTest):
+    snippets = ('test', 'h${1:${VISUAL}}b')
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX + 'hello'
+    wanted = 'hhellob'
+
+
+class Visual_CrossOneLine(_VimTest):
+    snippets = ('test', 'h${VISUAL}b')
+    keys = 'bla blub\n  helloi' + ESC + '0k4lvjll' + EX + 'test' + EX
+    wanted = 'bla hblub\n  hellobi'
+
+
+class Visual_LineSelect_Simple(_VimTest):
+    snippets = ('test', 'h${VISUAL}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'hhello\n nice\n worldb'
+
+
+class Visual_InDefaultText_LineSelect_NoOverwrite(_VimTest):
+    snippets = ('test', 'h${1:bef${VISUAL}aft}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX + JF + 'hi'
+    wanted = 'hbefhello\n    nice\n    worldaftbhi'
+
+
+class Visual_InDefaultText_LineSelect_Overwrite(_VimTest):
+    snippets = ('test', 'h${1:bef${VISUAL}aft}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + \
+        EX + 'test' + EX + 'jup' + JF + 'hi'
+    wanted = 'hjupbhi'
+
+
+class Visual_LineSelect_CheckIndentSimple(_VimTest):
+    snippets = ('test', 'beg\n\t${VISUAL}\nend')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'beg\n\thello\n\tnice\n\tworld\nend'
+
+
+class Visual_LineSelect_CheckIndentTwice(_VimTest):
+    snippets = ('test', 'beg\n\t${VISUAL}\nend')
+    keys = '    hello\n    nice\n\tworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'beg\n\t    hello\n\t    nice\n\t\tworld\nend'
+
+
+class Visual_InDefaultText_IndentSpacesToTabstop_NoOverwrite(_VimTest):
+    snippets = ('test', 'h${1:beforea${VISUAL}aft}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX + JF + 'hi'
+    wanted = 'hbeforeahello\n\tnice\n\tworldaftbhi'
+
+
+class Visual_InDefaultText_IndentSpacesToTabstop_Overwrite(_VimTest):
+    snippets = ('test', 'h${1:beforea${VISUAL}aft}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + \
+        EX + 'test' + EX + 'ups' + JF + 'hi'
+    wanted = 'hupsbhi'
+
+
+class Visual_InDefaultText_IndentSpacesToTabstop_NoOverwrite1(_VimTest):
+    snippets = ('test', 'h${1:beforeaaa${VISUAL}aft}b')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX + JF + 'hi'
+    wanted = 'hbeforeaaahello\n\t  nice\n\t  worldaftbhi'
+
+
+class Visual_InDefaultText_IndentBeforeTabstop_NoOverwrite(_VimTest):
+    snippets = ('test', 'hello\n\t ${1:${VISUAL}}\nend')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX + JF + 'hi'
+    wanted = 'hello\n\t hello\n\t nice\n\t world\nendhi'
+
+
+class Visual_LineSelect_WithTabStop(_VimTest):
+    snippets = ('test', 'beg\n\t${VISUAL}\n\t${1:here_we_go}\nend')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + \
+        EX + 'test' + EX + 'super' + JF + 'done'
+    wanted = 'beg\n\thello\n\tnice\n\tworld\n\tsuper\nenddone'
+
+
+class Visual_LineSelect_CheckIndentWithTS_NoOverwrite(_VimTest):
+    snippets = ('test', 'beg\n\t${0:${VISUAL}}\nend')
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'beg\n\thello\n\tnice\n\tworld\nend'
+
+
+class Visual_LineSelect_DedentLine(_VimTest):
+    snippets = ('if', 'if {\n\t${VISUAL}$0\n}')
+    keys = 'if' + EX + 'one\n\ttwo\n\tthree' + ESC + \
+        ARR_U * 2 + 'V' + ARR_D + EX + '\tif' + EX
+    wanted = 'if {\n\tif {\n\t\tone\n\t\ttwo\n\t}\n\tthree\n}'
+
+
+class VisualTransformation_SelectOneWord(_VimTest):
+    snippets = ('test', r"h${VISUAL/./\U$0\E/g}b")
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hBLABLUBb'
+
+
+class VisualTransformationWithDefault_ExpandWithoutVisual(_VimTest):
+    snippets = ('test', r"h${VISUAL:world/./\U$0\E/g}b")
+    keys = 'test' + EX + 'hi'
+    wanted = 'hWORLDbhi'
+
+
+class VisualTransformationWithDefault_ExpandWithVisual(_VimTest):
+    snippets = ('test', r"h${VISUAL:world/./\U$0\E/g}b")
+    keys = 'blablub' + ESC + '0v6l' + EX + 'test' + EX
+    wanted = 'hBLABLUBb'
+
+
+class VisualTransformation_LineSelect_Simple(_VimTest):
+    snippets = ('test', r"h${VISUAL/./\U$0\E/g}b")
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX
+    wanted = 'hHELLO\n NICE\n WORLDb'
+
+
+class VisualTransformation_InDefaultText_LineSelect_NoOverwrite(_VimTest):
+    snippets = ('test', r"h${1:bef${VISUAL/./\U$0\E/g}aft}b")
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + EX + 'test' + EX + JF + 'hi'
+    wanted = 'hbefHELLO\n    NICE\n    WORLDaftbhi'
+
+
+class VisualTransformation_InDefaultText_LineSelect_Overwrite(_VimTest):
+    snippets = ('test', r"h${1:bef${VISUAL/./\U$0\E/g}aft}b")
+    keys = 'hello\nnice\nworld' + ESC + 'Vkk' + \
+        EX + 'test' + EX + 'jup' + JF + 'hi'
+    wanted = 'hjupbhi'
+
+# End: ${VISUAL}  #}}}
diff --git a/vim/plugins/ultisnips/test/util.py b/vim/plugins/ultisnips/test/util.py
new file mode 100644
index 0000000..74d8d5b
--- /dev/null
+++ b/vim/plugins/ultisnips/test/util.py
@@ -0,0 +1,17 @@
+import platform
+
+try:
+    import unidecode
+    UNIDECODE_IMPORTED = True
+except ImportError:
+    UNIDECODE_IMPORTED = False
+
+
+def running_on_windows():
+    if platform.system() == 'Windows':
+        return 'Does not work on Windows.'
+
+
+def no_unidecode_available():
+    if not UNIDECODE_IMPORTED:
+        return 'unidecode is not available.'
diff --git a/vim/plugins/ultisnips/test/vim_interface.py b/vim/plugins/ultisnips/test/vim_interface.py
new file mode 100644
index 0000000..cecc270
--- /dev/null
+++ b/vim/plugins/ultisnips/test/vim_interface.py
@@ -0,0 +1,283 @@
+# encoding: utf-8
+
+import os
+import re
+import shutil
+import subprocess
+import tempfile
+import textwrap
+import time
+
+from test.constant import (ARR_D, ARR_L, ARR_R, ARR_U, BS, ESC, PYTHON3,
+                           SEQUENCES)
+
+
+def wait_until_file_exists(file_path, times=None, interval=0.01):
+    while times is None or times:
+        if os.path.exists(file_path):
+            return True
+        time.sleep(interval)
+        if times is not None:
+            times -= 1
+    return False
+
+
+def read_text_file(filename):
+    """Reads the contens of a text file."""
+    if PYTHON3:
+        return open(filename, 'r', encoding='utf-8').read()
+    else:
+        return open(filename, 'r').read()
+
+
+def is_process_running(pid):
+    """Returns true if a process with pid is running, false otherwise."""
+    # from
+    # http://stackoverflow.com/questions/568271/how-to-check-if-there-exists-a-process-with-a-given-pid
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        return False
+    else:
+        return True
+
+
+def silent_call(cmd):
+    """Calls 'cmd' and returns the exit value."""
+    return subprocess.call(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+
+
+def create_directory(dirname):
+    """Creates 'dirname' and its parents if it does not exist."""
+    try:
+        os.makedirs(dirname)
+    except OSError:
+        pass
+
+
+class TempFileManager(object):
+
+    def __init__(self, name=''):
+        self._temp_dir = tempfile.mkdtemp(prefix='UltiSnipsTest_' + name)
+
+    def name_temp(self, file_path):
+        return os.path.join(self._temp_dir, file_path)
+
+    def write_temp(self, file_path, content):
+        abs_path = self.name_temp(file_path)
+        create_directory(os.path.dirname(abs_path))
+        if PYTHON3:
+            with open(abs_path, 'w', encoding='utf-8') as f:
+                f.write(content)
+        else:
+            with open(abs_path, 'w') as f:
+                f.write(content)
+        return abs_path
+
+    def unique_name_temp(self, suffix='', prefix=''):
+        file_handler, abspath = tempfile.mkstemp(
+            suffix, prefix, self._temp_dir)
+        os.close(file_handler)
+        os.remove(abspath)
+        return abspath
+
+    def clear_temp(self):
+        shutil.rmtree(self._temp_dir)
+        create_directory(self._temp_dir)
+
+
+class VimInterface(TempFileManager):
+
+    def __init__(self, vim_executable, name):
+        TempFileManager.__init__(self, name)
+        self._vim_executable = vim_executable
+        self._version = None
+
+    def has_version(self, major, minor, patchlevel):
+        if self._version is None:
+            output = subprocess.check_output([
+                self._vim_executable, "--version"
+            ])
+
+            _major = 0
+            _minor = 0
+            _patch = 0
+            for line in output.decode('utf-8').split("\n"):
+                if line.startswith("VIM - Vi IMproved"):
+                    _major, _minor = map(int, line.split()[4].split('.'))
+                if line.startswith("Included patches:"):
+                    _patch = int(line.split('-')[1])
+            self._version = (_major, _minor, _patch)
+
+        return self._version >= (major, minor, patchlevel)
+
+    def get_buffer_data(self):
+        buffer_path = self.unique_name_temp(prefix='buffer_')
+        self.send_to_vim(ESC + ':w! %s\n' % buffer_path)
+        if wait_until_file_exists(buffer_path, 50):
+            return read_text_file(buffer_path)[:-1]
+
+    def send_to_terminal(self, s):
+        """Types 's' into the terminal."""
+        raise NotImplementedError()
+
+    def send_to_vim(self, s):
+        """Types 's' into the vim instance under test."""
+        raise NotImplementedError()
+
+    def launch(self, config=[]):
+        """Returns the python version in Vim as a string, e.g. '2.7'"""
+        pid_file = self.name_temp('vim.pid')
+        done_file = self.name_temp('loading_done')
+        if os.path.exists(done_file):
+            os.remove(done_file)
+
+        post_config = []
+        post_config.append('%s << EOF' % ('py3' if PYTHON3 else 'py'))
+        post_config.append('import vim, sys')
+        post_config.append(
+            "with open('%s', 'w') as pid_file: pid_file.write(vim.eval('getpid()'))" %
+            pid_file)
+        post_config.append("with open('%s', 'w') as done_file:" % done_file)
+        post_config.append("    done_file.write('%i.%i.%i' % sys.version_info[:3])")
+        post_config.append('EOF')
+
+        config_path = self.write_temp('vim_config.vim',
+                                      textwrap.dedent(os.linesep.join(config + post_config) + '\n'))
+
+        # Note the space to exclude it from shell history. Also we always set
+        # NVIM_LISTEN_ADDRESS, even when running vanilla Vim, because it will
+        # just not care.
+        self.send_to_terminal(""" NVIM_LISTEN_ADDRESS=/tmp/nvim %s -u %s\r\n""" % (
+            self._vim_executable, config_path))
+        wait_until_file_exists(done_file)
+        self._vim_pid = int(read_text_file(pid_file))
+        return read_text_file(done_file).strip()
+
+    def leave_with_wait(self):
+        self.send_to_vim(3 * ESC + ':qa!\n')
+        while is_process_running(self._vim_pid):
+            time.sleep(.2)
+
+
+class VimInterfaceTmux(VimInterface):
+
+    def __init__(self, vim_executable, session):
+        VimInterface.__init__(self, vim_executable, 'Tmux')
+        self.session = session
+        self._check_version()
+
+    def _send(self, s):
+        # I did not find any documentation on what needs escaping when sending
+        # to tmux, but it seems like this is all that is needed for now.
+        s = s.replace(';', r'\;')
+
+        if PYTHON3:
+            s = s.encode('utf-8')
+        silent_call(['tmux', 'send-keys', '-t', self.session, '-l', s])
+
+    def send_to_terminal(self, s):
+        return self._send(s)
+
+    def send_to_vim(self, s):
+        return self._send(s)
+
+    def _check_version(self):
+        stdout, _ = subprocess.Popen(['tmux', '-V'],
+                                     stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+        if PYTHON3:
+            stdout = stdout.decode('utf-8')
+        m = re.match(r"tmux (\d+).(\d+)", stdout)
+        if not m or not (int(m.group(1)), int(m.group(2))) >= (1, 8):
+            raise RuntimeError(
+                'Need at least tmux 1.8, you have %s.' %
+                stdout.strip())
+
+class VimInterfaceTmuxNeovim(VimInterfaceTmux):
+
+    def __init__(self, vim_executable, session):
+        VimInterfaceTmux.__init__(self, vim_executable, session)
+        self._nvim = None
+
+    def send_to_vim(self, s):
+        if s == ARR_L:
+            s = "<Left>"
+        elif s == ARR_R:
+            s = "<Right>"
+        elif s == ARR_U:
+            s = "<Up>"
+        elif s == ARR_D:
+            s = "<Down>"
+        elif s == BS:
+            s = "<bs>"
+        elif s == ESC:
+            s = "<esc>"
+        elif s == "<":
+            s = "<lt>"
+        self._nvim.input(s)
+
+    def launch(self, config=[]):
+        import neovim
+        rv = VimInterfaceTmux.launch(self, config)
+        self._nvim = neovim.attach('socket', path='/tmp/nvim')
+        return rv
+
+class VimInterfaceWindows(VimInterface):
+    BRACES = re.compile('([}{])')
+    WIN_ESCAPES = ['+', '^', '%', '~', '[', ']', '<', '>', '(', ')']
+    WIN_REPLACES = [
+        (BS, '{BS}'),
+        (ARR_L, '{LEFT}'),
+        (ARR_R, '{RIGHT}'),
+        (ARR_U, '{UP}'),
+        (ARR_D, '{DOWN}'),
+        ('\t', '{TAB}'),
+        ('\n', '~'),
+        (ESC, '{ESC}'),
+
+        # On my system ` waits for a second keystroke, so `+SPACE = "`".  On
+        # most systems, `+Space = "` ". I work around this, by sending the host
+        # ` as `+_+BS. Awkward, but the only way I found to get this working.
+        ('`', '`_{BS}'),
+        ('´', '´_{BS}'),
+        ('{^}', '{^}_{BS}'),
+    ]
+
+    def __init__(self):
+        # import windows specific modules
+        import win32com.client
+        import win32gui
+        self.win32gui = win32gui
+        self.shell = win32com.client.Dispatch('WScript.Shell')
+
+    def is_focused(self, title=None):
+        cur_title = self.win32gui.GetWindowText(
+            self.win32gui.GetForegroundWindow())
+        if (title or '- GVIM') in cur_title:
+            return True
+        return False
+
+    def focus(self, title=None):
+        if not self.shell.AppActivate(title or '- GVIM'):
+            raise Exception('Failed to switch to GVim window')
+        time.sleep(1)
+
+    def convert_keys(self, keys):
+        keys = self.BRACES.sub(r"{\1}", keys)
+        for k in self.WIN_ESCAPES:
+            keys = keys.replace(k, '{%s}' % k)
+        for f, r in self.WIN_REPLACES:
+            keys = keys.replace(f, r)
+        return keys
+
+    def send(self, keys):
+        keys = self.convert_keys(keys)
+
+        if not self.is_focused():
+            time.sleep(2)
+            self.focus()
+        if not self.is_focused():
+            # This is the only way I can find to stop test execution
+            raise KeyboardInterrupt('Failed to focus GVIM')
+
+        self.shell.SendKeys(keys)
diff --git a/vim/plugins/ultisnips/test/vim_test_case.py b/vim/plugins/ultisnips/test/vim_test_case.py
new file mode 100644
index 0000000..f3a6e08
--- /dev/null
+++ b/vim/plugins/ultisnips/test/vim_test_case.py
@@ -0,0 +1,208 @@
+# encoding: utf-8
+
+# pylint: skip-file
+
+import os
+import subprocess
+import tempfile
+import textwrap
+import time
+import unittest
+
+from test.constant import PYTHON3, SEQUENCES, EX
+from test.vim_interface import create_directory, TempFileManager
+
+
+def plugin_cache_dir():
+    """The directory that we check out our bundles to."""
+    return os.path.join(tempfile.gettempdir(), 'UltiSnips_test_vim_plugins')
+
+
+class VimTestCase(unittest.TestCase, TempFileManager):
+    snippets = ()
+    files = {}
+    text_before = ' --- some text before --- \n\n'
+    text_after = '\n\n --- some text after --- '
+    expected_error = ''
+    wanted = ''
+    keys = ''
+    sleeptime = 0.00
+    output = ''
+    plugins = []
+    # Skip this test for the given reason or None for not skipping it.
+    skip_if = lambda self: None
+    version = None  # Will be set to vim --version output
+    maxDiff = None  # Show all diff output, always.
+    vim_flavor = None # will be 'vim' or 'neovim'.
+    expected_python_version = None # If set, we need to check that our Vim is running this python version.
+
+    def __init__(self, *args, **kwargs):
+        unittest.TestCase.__init__(self, *args, **kwargs)
+        TempFileManager.__init__(self, 'Case')
+
+    def runTest(self):
+        if self.expected_python_version:
+            self.assertEqual(self.in_vim_python_version, self.expected_python_version)
+
+        # Only checks the output. All work is done in setUp().
+        wanted = self.text_before + self.wanted + self.text_after
+        for i in range(self.retries):
+            if self.output and self.expected_error:
+                self.assertRegexpMatches(self.output, self.expected_error)
+                return
+            if self.output != wanted or self.output is None:
+                # Redo this, but slower
+                self.sleeptime += 0.15
+                self.tearDown()
+                self.setUp()
+        self.assertMultiLineEqual(self.output, wanted)
+
+    def _extra_vim_config(self, vim_config):
+        """Adds extra lines to the vim_config list."""
+
+    def _before_test(self):
+        """Send these keys before the test runs.
+
+        Used for buffer local variables and other options.
+
+        """
+
+    def _create_file(self, file_path, content):
+        """Creates a file in the runtimepath that is created for this test.
+
+        Returns the absolute path to the file.
+
+        """
+        return self.write_temp(file_path, textwrap.dedent(content + '\n'))
+
+    def _link_file(self, source, relative_destination):
+        """Creates a link from 'source' to the 'relative_destination' in our
+        temp dir."""
+        absdir = self.name_temp(relative_destination)
+        create_directory(absdir)
+        os.symlink(source, os.path.join(absdir, os.path.basename(source)))
+
+    def setUp(self):
+        # TODO(sirver): this uses 'vim', but must use --vim from the commandline.
+        if not VimTestCase.version:
+            VimTestCase.version, _ = subprocess.Popen(['vim', '--version'],
+                                                      stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()
+            if PYTHON3:
+                VimTestCase.version = VimTestCase.version.decode('utf-8')
+
+        if self.plugins and not self.test_plugins:
+            return self.skipTest('Not testing integration with other plugins.')
+        reason_for_skipping = self.skip_if()
+        if reason_for_skipping is not None:
+            return self.skipTest(reason_for_skipping)
+
+        vim_config = []
+        vim_config.append('set nocompatible')
+        vim_config.append('set runtimepath=$VIMRUNTIME,%s,%s' % (
+            os.path.dirname(os.path.dirname(__file__)), self._temp_dir))
+
+        if self.plugins:
+            self._link_file(
+                os.path.join(
+                    plugin_cache_dir(),
+                    'vim-pathogen',
+                    'autoload'),
+                '.')
+            for plugin in self.plugins:
+                self._link_file(
+                    os.path.join(
+                        plugin_cache_dir(),
+                        os.path.basename(plugin)),
+                    'bundle')
+            vim_config.append('execute pathogen#infect()')
+
+        # Some configurations are unnecessary for vanilla Vim, but Neovim
+        # defines some defaults differently.
+        vim_config.append('syntax on')
+        vim_config.append('filetype plugin indent on')
+        vim_config.append('set nosmarttab')
+        vim_config.append('set noautoindent')
+        vim_config.append('set backspace=""')
+        vim_config.append('set clipboard=""')
+        vim_config.append('set encoding=utf-8')
+        vim_config.append('set fileencoding=utf-8')
+        vim_config.append('set buftype=nofile')
+        vim_config.append('set shortmess=at')
+        vim_config.append('let @" = ""')
+        assert EX == "\t"  # Otherwise you need to change the next line
+        vim_config.append('let g:UltiSnipsExpandTrigger="<tab>"')
+        vim_config.append('let g:UltiSnipsJumpForwardTrigger="?"')
+        vim_config.append('let g:UltiSnipsJumpBackwardTrigger="+"')
+        vim_config.append('let g:UltiSnipsListSnippets="@"')
+        vim_config.append(
+            'let g:UltiSnipsUsePythonVersion="%i"' %
+            (3 if PYTHON3 else 2))
+        vim_config.append('let g:UltiSnipsSnippetDirectories=["us"]')
+        if self.python_host_prog:
+            vim_config.append('let g:python_host_prog="%s"' % self.python_host_prog)
+        if self.python3_host_prog:
+            vim_config.append('let g:python3_host_prog="%s"' % self.python3_host_prog)
+
+        self._extra_vim_config(vim_config)
+
+        # Finally, add the snippets and some configuration for the test.
+        vim_config.append('%s << EOF' % ('py3' if PYTHON3 else 'py'))
+        vim_config.append('from UltiSnips import UltiSnips_Manager\n')
+
+        if len(self.snippets) and not isinstance(self.snippets[0], tuple):
+            self.snippets = (self.snippets, )
+        for s in self.snippets:
+            sv, content = s[:2]
+            description = ''
+            options = ''
+            priority = 0
+            if len(s) > 2:
+                description = s[2]
+            if len(s) > 3:
+                options = s[3]
+            if len(s) > 4:
+                priority = s[4]
+            vim_config.append('UltiSnips_Manager.add_snippet(%r, %r, %r, %r, priority=%i)' % (
+                sv, content, description, options, priority))
+
+        # fill buffer with default text and place cursor in between.
+        prefilled_text = (self.text_before + self.text_after).splitlines()
+        vim_config.append('import vim\n')
+        vim_config.append('vim.current.buffer[:] = %r\n' % prefilled_text)
+        vim_config.append(
+            'vim.current.window.cursor = (max(len(vim.current.buffer)//2, 1), 0)')
+
+        # End of python stuff.
+        vim_config.append('EOF')
+
+        for name, content in self.files.items():
+            self._create_file(name, content)
+
+        self.in_vim_python_version = self.vim.launch(vim_config)
+
+        self._before_test()
+
+        if not self.interrupt:
+            # Go into insert mode and type the keys but leave Vim some time to
+            # react.
+            text = 'i' + self.keys
+            while text:
+                to_send = None
+                for seq in SEQUENCES:
+                    if text.startswith(seq):
+                        to_send = seq
+                        break
+                to_send = to_send or text[0]
+                self.vim.send_to_vim(to_send)
+                time.sleep(self.sleeptime)
+                text = text[len(to_send):]
+            self.output = self.vim.get_buffer_data()
+
+    def tearDown(self):
+        if self.interrupt:
+            print('Working directory: %s' % (self._temp_dir))
+            return
+        self.vim.leave_with_wait()
+        self.clear_temp()
+
+# vim:fileencoding=utf-8:foldmarker={{{#,#}}}:
diff --git a/vim/plugins/ultisnips/test_all.py b/vim/plugins/ultisnips/test_all.py
new file mode 100755
index 0000000..7819e02
--- /dev/null
+++ b/vim/plugins/ultisnips/test_all.py
@@ -0,0 +1,185 @@
+#!/usr/bin/env python
+# encoding: utf-8
+#
+# To execute this test requires two terminals, one for running Vim and one
+# for executing the test script. Both terminals should have their current
+# working directories set to this directory (the one containing this
+# test_all.py script).
+#
+# In one terminal, launch a tmux session named ``vim``:
+#   $ tmux new -s vim
+#
+# Now, from another terminal, launch the testsuite:
+#    $ ./test_all.py
+#
+# Note: if you want to use Vim against the Python 3 bindings, you must launch the
+# test suite using Python 3.  For example:
+#    $ python3 ./test_all.py
+#
+# For each test, the test_all.py script will launch vim with a vimrc, run the
+# test, compare the output and exit vim again. The keys are send using tmux send-keys.
+#
+# To limit the tests that are executed, specify a pattern to be used to match
+# the beginning of the test name.  For instance, the following will execute all
+# tests that start with "SimpleExpand":
+#    $ ./test_all.py SimpleExpand
+#
+# NOTE: The test suite is not working under Windows right now as I have no
+# access to a windows system for fixing it. Volunteers welcome. Here are some
+# comments from the last time I got the test suite running under windows.
+#
+# Under windows, COM's SendKeys is used to send keystrokes to the gvim window.
+# Note that Gvim must use english keyboard input (choose in windows registry)
+# for this to work properly as SendKeys is a piece of chunk. (i.e. it sends
+# <F13> when you send a | symbol while using german key mappings)
+
+# pylint: skip-file
+
+import os
+import platform
+import subprocess
+import unittest
+from test.vim_interface import (
+    create_directory, tempfile, VimInterfaceTmux, VimInterfaceTmuxNeovim)
+
+
+def plugin_cache_dir():
+    """The directory that we check out our bundles to."""
+    return os.path.join(tempfile.gettempdir(), 'UltiSnips_test_vim_plugins')
+
+
+def clone_plugin(plugin):
+    """Clone the given plugin into our plugin directory."""
+    dirname = os.path.join(plugin_cache_dir(), os.path.basename(plugin))
+    print('Cloning %s -> %s' % (plugin, dirname))
+    if os.path.exists(dirname):
+        print('Skip cloning of %s. Already there.' % plugin)
+        return
+    create_directory(dirname)
+    subprocess.call(['git', 'clone', '--recursive',
+                     '--depth', '1', 'https://github.com/%s' % plugin, dirname])
+
+    if plugin == 'Valloric/YouCompleteMe':
+        # CLUTCH: this plugin needs something extra.
+        subprocess.call(os.path.join(dirname, './install.sh'), cwd=dirname)
+
+
+def setup_other_plugins(all_plugins):
+    """Creates /tmp/UltiSnips_test_vim_plugins and clones all plugins into
+    this."""
+    clone_plugin('tpope/vim-pathogen')
+    for plugin in all_plugins:
+        clone_plugin(plugin)
+
+if __name__ == '__main__':
+    import optparse
+    import sys
+
+    def parse_args():
+        p = optparse.OptionParser('%prog [OPTIONS] <test case names to run>')
+
+        p.set_defaults(session='vim', interrupt=False,
+                       verbose=False, retries=4, plugins=False)
+
+        p.add_option('-v', '--verbose', dest='verbose', action='store_true',
+                     help='print name of tests as they are executed')
+        p.add_option('--clone-plugins', action='store_true',
+                     help='Only clones dependant plugins and exits the test runner.')
+        p.add_option('--plugins', action='store_true',
+                     help='Run integration tests with other Vim plugins.')
+        p.add_option('-s', '--session', dest='session', metavar='SESSION',
+                     help='session parameters for the terminal multiplexer SESSION [%default]')
+        p.add_option('-i', '--interrupt', dest='interrupt',
+                     action='store_true',
+                     help='Stop after defining the snippet. This allows the user '
+                     'to interactively test the snippet in vim. You must give '
+                     'exactly one test case on the cmdline. The test will always fail.'
+                     )
+        p.add_option('-r', '--retries', dest='retries', type=int,
+                     help='How often should each test be retried before it is '
+                     'considered failed. Works around flakyness in the terminal '
+                     'multiplexer and race conditions in writing to the file system.')
+        p.add_option('-x', '--exitfirst', dest='exitfirst', action='store_true',
+                     help='exit instantly on first error or failed test.')
+        p.add_option('--vim', dest='vim', type=str, default='vim',
+                     help='executable to run when launching vim.')
+        p.add_option('--interface', dest='interface', type=str, default='tmux',
+                     help="Interface to use. Use 'tmux' with vanilla Vim and 'tmux_nvim' "
+                     'with Neovim.')
+        p.add_option('--python-host-prog', dest='python_host_prog', type=str, default='',
+                     help='Neovim needs a variable to tell it which python interpretor to use for '
+                     'py blocks. This needs to be set to point to the correct python interpretor. '
+                     'It is ignored for vanilla Vim.')
+        p.add_option('--python3-host-prog', dest='python3_host_prog', type=str, default='',
+                     help='See --python-host-prog.')
+        p.add_option('--expected-python-version', dest='expected_python_version', type=str, default='',
+                     help='If set, each test will check sys.version inside of vim to '
+                     'verify we are testing against the expected Python version.')
+
+        o, args = p.parse_args()
+        return o, args
+
+    def flatten_test_suite(suite):
+        flatten = unittest.TestSuite()
+        for test in suite:
+            if isinstance(test, unittest.TestSuite):
+                flatten.addTests(flatten_test_suite(test))
+            else:
+                flatten.addTest(test)
+        return flatten
+
+    def main():
+        options, selected_tests = parse_args()
+
+        all_test_suites = unittest.defaultTestLoader.discover(start_dir='test')
+
+        vim = None
+        vim_flavor = 'vim'
+        if options.interface == 'tmux':
+            vim = VimInterfaceTmux(options.vim, options.session)
+            vim_flavor = 'vim'
+        else:
+            vim = VimInterfaceTmuxNeovim(options.vim, options.session)
+            vim_flavor = 'neovim'
+
+        if not options.clone_plugins and platform.system() == 'Windows':
+            raise RuntimeError(
+                'TODO: TestSuite is broken under windows. Volunteers wanted!.')
+            # vim = VimInterfaceWindows()
+            # vim.focus()
+
+        all_other_plugins = set()
+
+        tests = set()
+        suite = unittest.TestSuite()
+
+        for test in flatten_test_suite(all_test_suites):
+            test.interrupt = options.interrupt
+            test.retries = options.retries
+            test.test_plugins = options.plugins
+            test.python_host_prog = options.python_host_prog
+            test.python3_host_prog = options.python3_host_prog
+            test.expected_python_version = options.expected_python_version
+            test.vim = vim
+            test.vim_flavor = vim_flavor
+            all_other_plugins.update(test.plugins)
+
+            if len(selected_tests):
+                id = test.id().split('.')[1]
+                if not any([id.startswith(t) for t in selected_tests]):
+                    continue
+            tests.add(test)
+        suite.addTests(tests)
+
+        if options.plugins or options.clone_plugins:
+            setup_other_plugins(all_other_plugins)
+            if options.clone_plugins:
+                return
+
+        v = 2 if options.verbose else 1
+        successfull = unittest.TextTestRunner(verbosity=v,
+                                              failfast=options.exitfirst).run(suite).wasSuccessful()
+        return 0 if successfull else 1
+    sys.exit(main())
+
+# vim:fileencoding=utf-8:foldmarker={{{#,#}}}:
diff --git a/vim/plugins/ultisnips/travis_install.sh b/vim/plugins/ultisnips/travis_install.sh
new file mode 100755
index 0000000..da42e38
--- /dev/null
+++ b/vim/plugins/ultisnips/travis_install.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+
+# Installs a known version of vim in the travis test runner.
+
+set -ex
+
+PYTHON="python${TRAVIS_PYTHON_VERSION}"
+
+build_vanilla_vim () {
+   mkdir ~/vim_build
+   pushd ~/vim_build
+
+   if [[ $VIM_VERSION == "74" ]]; then
+      until curl ftp://ftp.vim.org/pub/vim/unix/vim-7.4.tar.bz2 -o vim.tar.bz2; do sleep 10; done
+      tar xjf vim.tar.bz2
+      cd vim${VIM_VERSION}
+   elif [[ $VIM_VERSION == "git" ]]; then
+      git clone https://github.com/vim/vim
+      cd vim
+   fi
+
+   local PYTHON_CONFIG_DIR=$(dirname $(find $($PYTHON-config --prefix)/lib -iname 'config.c') | grep $TRAVIS_PYTHON_VERSION)
+   local PYTHON_BUILD_CONFIG=""
+   if [[ $TRAVIS_PYTHON_VERSION =~ ^2\. ]]; then
+      PYTHON_BUILD_CONFIG="--enable-pythoninterp --with-python-config-dir=${PYTHON_CONFIG_DIR}"
+   else
+      PYTHON_BUILD_CONFIG="--enable-python3interp --with-python3-config-dir=${PYTHON_CONFIG_DIR}"
+   fi
+   export LDFLAGS="$($PYTHON-config --ldflags) -L$($PYTHON-config --prefix)/lib"
+   export CFLAGS="$($PYTHON-config --cflags)"
+
+   # This is needed so that vim finds the shared libraries it was build against
+   # - they are not on the regular path.
+   export LD_LIBRARY_PATH="$($PYTHON-config --prefix)/lib"
+
+   echo $LDFLAGS
+   echo $CFLAGS
+   ./configure \
+      --prefix=${HOME} \
+      --disable-nls \
+      --disable-sysmouse \
+      --disable-gpm \
+      --enable-gui=no \
+      --enable-multibyte \
+      --with-features=huge \
+      --with-tlib=ncurses \
+      --without-x \
+      ${PYTHON_BUILD_CONFIG} || cat $(find . -name 'config.log')
+
+   make install
+   popd
+
+   rm -rf vim_build
+}
+
+if [[ $VIM_VERSION = "74" || $VIM_VERSION = "git" ]]; then
+   build_vanilla_vim
+elif [[ $VIM_VERSION == "NEOVIM" ]]; then
+   PIP=$(which pip)
+   $PIP install neovim
+else
+   echo "Unknown VIM_VERSION: $VIM_VERSION"
+   exit 1
+fi
+
+# Clone the dependent plugins we want to use.
+PYTHON_CMD="$(which $PYTHON)"
+$PYTHON_CMD ./test_all.py --clone-plugins
diff --git a/vim/plugins/ultisnips/travis_test.sh b/vim/plugins/ultisnips/travis_test.sh
new file mode 100755
index 0000000..d9dcd46
--- /dev/null
+++ b/vim/plugins/ultisnips/travis_test.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+set -ex
+
+PYTHON="python${TRAVIS_PYTHON_VERSION}"
+PYTHON_CMD="$(which ${PYTHON})"
+
+if [[ $VIM_VERSION = "74" || $VIM_VERSION = "git" ]]; then
+   INTERFACE="--interface tmux"
+   VIM="${HOME}/bin/vim"
+   # This is needed so that vim finds the shared libraries it was build against -
+   # they are not on the regular path.
+   export LD_LIBRARY_PATH="$($PYTHON-config --prefix)/lib"
+
+elif [[ $VIM_VERSION == "NEOVIM" ]]; then
+   VIM="$(which nvim)"
+   if [[ $TRAVIS_PYTHON_VERSION =~ ^2\. ]]; then
+      INTERFACE="--interface tmux_nvim --python-host-prog=$PYTHON_CMD"
+   else
+      INTERFACE="--interface tmux_nvim --python3-host-prog=$PYTHON_CMD"
+   fi
+else
+   echo "Unknown VIM_VERSION: $VIM_VERSION"
+   exit 1
+fi
+
+PYTHON_VERSION=$($PYTHON_CMD -c 'import sys;print(sys.version.split()[0])')
+echo "Using python from: $PYTHON_CMD Version: $PYTHON_VERSION"
+echo "Using vim from: $VIM. Version: $($VIMn)"
+
+tmux new -d -s vim
+
+$PYTHON_CMD ./test_all.py \
+   -v \
+   --plugins \
+   --session vim \
+   --vim $VIM \
+   $INTERFACE \
+   --expected-python-version $PYTHON_VERSION
diff --git a/vim/plugins/ultisnips/utils/get_tm_snippets.py b/vim/plugins/ultisnips/utils/get_tm_snippets.py
new file mode 100755
index 0000000..eb2481d
--- /dev/null
+++ b/vim/plugins/ultisnips/utils/get_tm_snippets.py
@@ -0,0 +1,161 @@
+#!/usr/bin/env python
+# encoding: utf-8
+
+import urllib
+import re
+from xml.etree import ElementTree
+from xml.parsers.expat import ExpatError
+import htmlentitydefs
+import os
+import glob
+
+
+_UNESCAPE = re.compile(ur'&\w+?;', re.UNICODE)
+
+
+def unescape(s):
+    if s is None:
+        return ''
+
+    def fixup(m):
+        ent = m.group(0)[1:-1]
+        return unichr(htmlentitydefs.name2codepoint[ent])
+    try:
+        return _UNESCAPE.sub(fixup, s)
+    except:
+        print 'unescape failed: %s' % repr(s)
+        raise
+
+
+class UnknownVariable(Exception):
+    pass
+
+
+class UnsupportedVariableExpression(Exception):
+    pass
+
+
+def replace_vars(m):
+    """Replace vars in 'content' portion.
+
+    :m: match object
+    :returns: string
+
+    """
+    var = m.group(1)
+    default = m.group(2)
+
+    if not re.match(r'\w+$', var):
+        raise UnsupportedVariableExpression(var)
+
+    translate_vars = {
+        'TM_PHP_OPEN_TAG_WITH_ECHO': 'g:UltiSnipsOpenTagWithEcho',
+        'TM_PHP_OPEN_TAG': 'g:UltiSnipsOpenTag',
+        'PHPDOC_AUTHOR': 'g:snips_author',
+    }
+    # TODO: TM_SELECTED_TEXT/([\t ]*).*/$1/m
+
+    if var in translate_vars:
+        newvar = translate_vars[var]
+    else:
+        # TODO: this could be autogenerated
+        raise UnknownVariable(var)
+
+    return "`!v exists('%s') ? %s : '%s'`" % (newvar, newvar, default)
+
+
+def parse_content(c):
+    try:
+        data = ElementTree.fromstring(c)[0]
+
+        rv = {}
+        for k, v in zip(data[::2], data[1::2]):
+            rv[k.text] = unescape(v.text)
+
+        if re.search(r'\$\{\D', rv['content']):
+            rv['content'] = re.sub(
+                r'\$\{([^\d}][^}:]*)(?::([^}]*))?\}',
+                replace_vars,
+                rv['content'])
+
+        return rv
+    except (ExpatError, ElementTree.ParseError) as detail:
+        print '   Syntax Error: %s' % (detail,)
+        print c
+        return None
+    except UnknownVariable as detail:
+        print '   Unknown variable: %s' % (detail,)
+        return None
+    except UnsupportedVariableExpression as detail:
+        print '   Unsupported variable expression: %s' % (detail,)
+        return None
+
+
+def fetch_snippets_from_svn(name):
+    base_url = 'http://svn.textmate.org/trunk/Bundles/' + name + '.tmbundle/'
+    snippet_idx = base_url + 'Snippets/'
+
+    idx_list = urllib.urlopen(snippet_idx).read()
+
+    rv = []
+    for link in re.findall('<li>(.*?)</li>', idx_list):
+        m = re.match(r'<a\s*href="(.*)"\s*>(.*)</a>', link)
+        link, name = m.groups()
+        if name == '..':
+            continue
+
+        name = unescape(name.rsplit('.', 1)[0])  # remove Extension
+        print "Fetching data for Snippet '%s'" % name
+        content = urllib.urlopen(snippet_idx + link).read()
+
+        cont = parse_content(content)
+        if cont:
+            rv.append((name, cont))
+
+    return rv
+
+
+def fetch_snippets_from_dir(path):
+    """Fetch snippets from a given path."""
+
+    rv = []
+    for filename in glob.glob(os.path.join(path, '*.tmSnippet')):
+        print 'Reading file %s' % filename
+        f = open(filename)
+        content = f.read()
+
+        cont = parse_content(content)
+        if cont:
+            name = os.path.splitext(os.path.basename(filename))[0]
+            rv.append((name, cont))
+    return rv
+
+
+def write_snippets(snip_descr, f):
+
+    for name, d in snip_descr:
+        if 'tabTrigger' not in d:
+            continue
+
+        if 'content' not in d or d['content'] is None:
+            print 'SKIP: %s (no content)' % (d,)
+            continue
+
+        f.write('snippet %s "%s"\n' % (d['tabTrigger'], name))
+        f.write(d['content'].encode('utf-8') + '\n')
+        f.write('endsnippet\n\n')
+
+
+if __name__ == '__main__':
+    import sys
+
+    bundle = sys.argv[1]
+
+    if os.path.isdir(bundle):
+        name = sys.argv[2]
+        rv = fetch_snippets_from_dir(bundle)
+    else:
+        rv = fetch_snippets_from_svn(bundle)
+        name = bundle.lower()
+
+    write_snippets(rv, open('tm_' + name + '.snippets', 'w'))
diff --git a/vim/plugins/vim-airline-themes/.gitignore b/vim/plugins/vim-airline-themes/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/vim-airline-themes/LICENSE b/vim/plugins/vim-airline-themes/LICENSE
new file mode 100644
index 0000000..b8f4e6b
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (C) 2013-2016 Bailey Ling & Contributors.
+
+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/vim-airline-themes/README.md b/vim/plugins/vim-airline-themes/README.md
new file mode 100644
index 0000000..e09ecd9
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/README.md
@@ -0,0 +1,58 @@
+# vim-airline-themes
+
+This is the official theme repository for [vim-airline](https://github.com/vim-airline/vim-airline).
+
+# Installation
+
+This plugin follows the standard runtime path structure, and as such it can be installed with a variety of plugin managers:
+
+*  [Pathogen][4]
+    *  `git clone https://github.com/vim-airline/vim-airline-themes ~/.vim/bundle/vim-airline-themes`
+    *  Remember to run `:Helptags` to generate help tags
+*  [NeoBundle][5]
+    *  `NeoBundle 'vim-airline/vim-airline-themes'`
+*  [Vundle][6]
+    *  `Plugin 'vim-airline/vim-airline-themes'`
+*  [Plug][7]
+    *  `Plug 'vim-airline/vim-airline-themes'`
+*  manual
+    *  copy all of the files into your `~/.vim` directory
+
+
+# Using a Theme
+
+Once installed, use  `:AirlineTheme <theme>` to set the theme, e.g. `:AirlineTheme simple`
+
+To set in .vimrc, use `let g:airline_theme='<theme>'`, e.g. `let g:airline_theme='simple'`
+
+
+# Contribution Guidelines
+
+## New themes
+
+* Pull requests for new themes are welcome.  Please be sure to include a screenshot.  You can paste an image into issue [#1](https://github.com/vim-airline/vim-airline-themes/issues/1), and then editing the post to reveal the uploaded image URL.
+
+## Modifications to existing themes
+
+* Themes are subjective, so if you are going to make modifications to an existing theme, please expose a configurable variable to allow users to choose how the theme will react.
+
+# Screenshots
+
+Screenshots are in the process of being migrated here.  In the meantime you can find screenshots in the existing repository's [Wiki](https://github.com/vim-airline/vim-airline/wiki/Screenshots).
+
+# Maintenance
+
+If you are interested in becoming the official maintainer of this project, please contact [**@bling**][1], [**@chrisbra**][2], or [**@mhartington**][3].
+
+# License
+
+MIT License. Copyright (c) 2013-2016 Bailey Ling & Contributors.
+
+
+[1]: https://github.com/bling
+[2]: https://github.com/chrisbra
+[3]: https://github.com/mhartington
+[4]: https://github.com/tpope/vim-pathogen
+[5]: https://github.com/Shougo/neobundle.vim
+[6]: https://github.com/gmarik/vundle
+[7]: https://github.com/junegunn/vim-plug
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/alduin.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/alduin.vim
new file mode 100644
index 0000000..0599653
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/alduin.vim
@@ -0,0 +1,93 @@
+" Author:   Danilo Augusto
+" Script:   Alduin (vim-airline version)
+" License:  MIT
+
+let s:gui00 = "#1c1c1c" " ANSI Black
+let s:gui01 = "#af8787" " ANSI Red
+let s:gui02 = "#dfaf87" " ANSI Green
+let s:gui03 = "#878787" " ANSI Yellow
+let s:gui04 = "#af5f5f" " ANSI Blue
+let s:gui05 = "#875f5f" " ANSI Magenta
+let s:gui06 = "#87afaf" " ANSI Cyan
+let s:gui07 = "#ffdf87" " ANSI White
+let s:gui08 = "#87875f"
+let s:gui09 = "#af1600"
+let s:gui0A = "#af875f"
+let s:gui0B = "#878787"
+let s:gui0C = "#af5f00"
+let s:gui0D = "#5f5f87"
+let s:gui0E = "#afd7d7"
+let s:gui0F = "#dfdfaf"
+
+let s:cterm00 = "234"
+let s:cterm01 = "138"
+let s:cterm02 = "180"
+let s:cterm03 = "102"
+let s:cterm04 = "131"
+let s:cterm05 = "95"
+let s:cterm06 = "109"
+let s:cterm07 = "222"
+let s:cterm08 = "101"
+let s:cterm09 = "138"
+let s:cterm0A = "180"
+let s:cterm0B = "102"
+let s:cterm0C = "130"
+let s:cterm0D = "60"
+let s:cterm0E = "152"
+let s:cterm0F = "187"
+
+let s:guiWhite = "#ffffff"
+let s:guiGray = "#666666"
+let s:guiDarkGray = "#545454"
+let s:guiAlmostBlack = "#2a2a2a"
+let s:ctermWhite = "231"
+let s:ctermGray = "243"
+let s:ctermDarkGray = "240"
+let s:ctermAlmostBlack = "235"
+
+let g:airline#themes#alduin#palette = {}
+let s:modified = { 'airline_c': [s:gui07, '', s:cterm07, '', ''] }
+
+" Normal mode
+let s:N1 = [s:gui07, s:gui0D, s:cterm07, s:cterm0D]
+let s:N2 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let s:N3 = [s:gui02, s:guiDarkGray, s:cterm02, s:ctermDarkGray]
+let g:airline#themes#alduin#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#alduin#palette.normal_modified = s:modified
+
+" Insert mode
+let s:I1 = [s:guiWhite, s:gui0B, s:ctermWhite, s:cterm0B]
+let s:I2 = s:N2
+let s:I3 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let g:airline#themes#alduin#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#alduin#palette.insert_modified = s:modified
+
+" Visual mode
+let s:V1 = [s:guiWhite, s:gui08, s:ctermWhite, s:cterm08]
+let s:V2 = s:N2
+let s:V3 = s:I3
+let g:airline#themes#alduin#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#alduin#palette.visual_modified = s:modified
+
+" Replace mode
+let s:R1 = [s:gui08, s:gui00, s:cterm08, s:cterm00]
+let s:R2 = s:N2
+let s:R3 = s:I3
+let g:airline#themes#alduin#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#alduin#palette.replace_modified = s:modified
+
+" Inactive mode
+let s:IN1 = [s:guiGray, s:gui01, s:ctermGray, s:cterm01]
+let s:IN2 = [s:gui02, s:guiAlmostBlack, s:cterm02, s:ctermAlmostBlack]
+let s:IN3 = [s:gui02, s:guiAlmostBlack, s:cterm02, s:ctermAlmostBlack]
+let g:airline#themes#alduin#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3)
+let g:airline#themes#alduin#palette.inactive_modified = s:modified
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+    finish
+endif
+
+let s:CP1 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let s:CP2 = [s:guiWhite, s:gui03, s:ctermWhite, s:cterm01]
+let s:CP3 = [s:guiWhite, s:gui0D, s:ctermWhite, s:cterm0D]
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/aurora.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/aurora.vim
new file mode 100644
index 0000000..d85dd39
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/aurora.vim
@@ -0,0 +1,52 @@
+" Normal mode
+let s:N1 = [ '#ffffff' , '#5f00af' , 231 , 55  ]
+let s:N2 = [ '#ffffff' , '#875fd7' , 231 , 98  ]
+let s:N3 = [ '#333333' , '#efefef' , 59  , 255 ]
+
+" Insert mode
+let s:I1 = [ '#ffffff' , '#005fff' , 231 , 27  ]
+let s:I2 = [ '#ffffff' , '#00afff' , 231 , 39  ]
+let s:I3 = [ '#333333' , '#efefef' , 59  , 255 ]
+
+" Visual mode
+let s:V1 = [ '#121212' , '#ff5f00' , 233 , 202 ]
+let s:V2 = [ '#121212' , '#ffaf00' , 233 , 214 ]
+let s:V3 = [ '#333333' , '#efefef' , 59  , 255 ]
+
+" Replace mode
+let s:R1 = [ '#ffffff' , '#ff0000' , 231 , 196 ]
+let s:R2 = [ '#ffffff' , '#ff5f5f' , 231 , 203 ]
+let s:R3 = [ '#333333' , '#efefef' , 59  , 255 ]
+
+let g:airline#themes#aurora#palette = {}
+let g:airline#themes#aurora#palette.normal  = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#aurora#palette.insert  = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#aurora#palette.visual  = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#aurora#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+" Inactive mode
+let s:IN1 = [ '#9e9e9e' , '#9e9e9e' , 247 , 247 ]
+let s:IN2 = [ '#efefef' , '#efefef' , 255 , 255 ]
+
+let s:IA = [ s:IN1[1] , s:IN2[1] , s:IN1[3] , s:IN2[3] , '' ]
+let g:airline#themes#aurora#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:CP1 =  [ '#ffffff' , '#5f00af' , 231 , 55  ]
+let s:CP2 =  [ '#ffffff' , '#875fd7' , 231 , 98  ]
+let s:CP3 =  [ '#5f00af' , '#ffffff' , 55  , 231 ]
+
+let g:airline#themes#aurora#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3)
+
+" Tabline
+let g:airline#themes#aurora#palette.tabline = {
+      \ 'airline_tab':     [ '#ffffff' , '#5f00af' , 231 , 55  , '' ],
+      \ 'airline_tabsel':  [ '#ffffff' , '#875fd7' , 231 , 98  , '' ],
+      \ 'airline_tabtype': [ '#ffffff' , '#875fd7' , 231 , 98  , '' ],
+      \ 'airline_tabfill': [ '#ffffff' , '#121212' , 231 , 16  , '' ],
+      \ 'airline_tabmod':  [ '#ffffff' , '#ff5f5f' , 231 , 203 , '' ]
+      \ }
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/badcat.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/badcat.vim
new file mode 100644
index 0000000..5247e99
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/badcat.vim
@@ -0,0 +1,82 @@
+" Vim Airline theme.
+"
+" Repository: https://github.com/idlua/badcat
+" Author:     Luan Vicente <hi[at]idlua.me>
+
+
+" COLOR PALETTE -------------------------------------------------------------{{{
+let g:airline#themes#badcat#palette = {}
+
+let s:guiBlack       = "#080808"
+let s:guiGray        = "#262626"
+let s:guiLightgray   = "#6c6c6c"
+let s:guiWhite       = "#e4e4e4"
+let s:guiRed         = "#ff5f5f"
+let s:guiGreen       = "#afd787"
+let s:guiBlue        = "#5fafd7"
+let s:guiOrange      = "#ffaf5f"
+
+let s:ctermBlack     = "232"
+let s:ctermGray      = "235"
+let s:ctermLightgray = "242"
+let s:ctermWhite     = "254"
+let s:ctermRed       = "203"
+let s:ctermGreen     = "150"
+let s:ctermBlue      = "074"
+let s:ctermOrange    = "215"
+" }}}
+" BASICS --------------------------------------------------------------------{{{
+let s:modified = { 'airline_c': [ '#ffb964', '', s:ctermRed, '', '' ] }
+" }}}
+
+
+" MODES SUPPORT
+" NORMAL MODE ---------------------------------------------------------------{{{
+let s:N1 = [ s:guiWhite     , s:guiBlack , s:ctermWhite     , s:ctermGray ]
+let s:N2 = [ s:guiLightgray , s:guiGray  , s:ctermLightgray , s:ctermGray  ]
+let s:N3 = [ s:guiWhite     , s:guiBlack , s:ctermWhite     , s:ctermBlack ]
+let g:airline#themes#badcat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#badcat#palette.normal_modified = s:modified
+" }}}
+" INSERT MODE ---------------------------------------------------------------{{{
+let s:I1 = [ s:guiGreen , s:guiBlack , s:ctermGreen , s:ctermBlack ]
+let s:I2 = [ s:guiBlack , s:guiGreen , s:ctermBlack , s:ctermGreen ]
+let s:I3 = [ s:guiGreen , s:guiBlack , s:ctermGreen , s:ctermBlack ]
+let g:airline#themes#badcat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#badcat#palette.insert_modified = s:modified
+" }}}
+" VISUAL MODE ---------------------------------------------------------------{{{
+let s:V1 = [ s:guiBlue  , s:guiBlack , s:ctermBlue  , s:ctermBlack ]
+let s:V2 = [ s:guiBlack , s:guiBlue  , s:ctermBlack , s:ctermBlue  ]
+let s:V3 = [ s:guiBlue  , s:guiBlack , s:ctermBlue  , s:ctermBlack ]
+let g:airline#themes#badcat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#badcat#palette.visual_modified = s:modified
+" }}}
+" REPLACE MODE --------------------------------------------------------------{{{
+let s:R1 = [ s:guiOrange , s:guiBlack  , s:ctermOrange , s:ctermBlack  ]
+let s:R2 = [ s:guiBlack  , s:guiOrange , s:ctermBlack  , s:ctermOrange ]
+let s:R3 = [ s:guiOrange , s:guiBlack  , s:ctermOrange , s:ctermBlack  ]
+let g:airline#themes#badcat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#badcat#palette.replace_modified = s:modified
+" }}}
+" INACTIVE MODE -------------------------------------------------------------{{{
+let s:IN1 = [ s:guiBlack     , s:guiGray  , s:ctermBlack      , s:ctermGray  ]
+let s:IN2 = [ s:guiLightgray , s:guiBlack , s:ctermLightgray , s:ctermBlack ]
+let s:IN3 = [ s:guiLightgray , s:guiBlack , s:ctermLightgray , s:ctermBlack ]
+let g:airline#themes#badcat#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3)
+let g:airline#themes#badcat#palette.inactive_modified = s:modified
+" }}}
+
+
+" SPECIFIC PLUGIN SUPPORT
+" CtrlP ---------------------------------------------------------------------{{{
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:CP1 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:ctermGray  ]
+let s:CP2 = [ s:guiWhite , s:gui03 , s:ctermWhite , s:ctermGray  ]
+let s:CP3 = [ s:guiWhite , s:gui0D , s:ctermWhite , s:ctermBlack ]
+
+let g:airline#themes#badcat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3)
+" }}}
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/badwolf.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/badwolf.vim
new file mode 100644
index 0000000..e2b9006
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/badwolf.vim
@@ -0,0 +1,52 @@
+let s:N1 = [ '#141413' , '#aeee00' , 232 , 154 ] " blackestgravel & lime
+let s:N2 = [ '#f4cf86' , '#45413b' , 222 , 238 ] " dirtyblonde    & deepgravel
+let s:N3 = [ '#8cffba' , '#242321' , 121 , 235 ] " saltwatertaffy & darkgravel
+let s:N4 = [ '#666462' , 241 ]                   " mediumgravel
+
+let s:I1 = [ '#141413' , '#0a9dff' , 232 , 39  ] " blackestgravel & tardis
+let s:I2 = [ '#f4cf86' , '#005fff' , 222 , 27  ] " dirtyblonde    & facebook
+let s:I3 = [ '#0a9dff' , '#242321' , 39  , 235 ] " tardis         & darkgravel
+
+let s:V1 = [ '#141413' , '#ffa724' , 232 , 214 ] " blackestgravel & orange
+let s:V2 = [ '#000000' , '#fade3e' , 16  , 221 ] " coal           & dalespale
+let s:V3 = [ '#000000' , '#b88853' , 16  , 137 ] " coal           & toffee
+let s:V4 = [ '#c7915b' , 173 ]                   " coffee
+
+let s:PA = [ '#f4cf86' , 222 ]                   " dirtyblonde
+let s:RE = [ '#ff9eb8' , 211 ]                   " dress
+
+let s:IA = [ s:N3[1] , s:N2[1] , s:N3[3] , s:N2[3] , '' ]
+
+let g:airline#themes#badwolf#palette = {}
+
+let g:airline#themes#badwolf#palette.accents = {
+      \ 'red': [ '#ff2c4b' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#badwolf#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#badwolf#palette.normal_modified = {
+      \ 'airline_b': [ s:N2[0]   , s:N4[0]   , s:N2[2]   , s:N4[1]   , ''     ] ,
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#badwolf#palette.insert_modified = {
+      \ 'airline_c': [ s:V1[1]   , s:N2[1]   , s:V1[3]   , s:N2[3]   , ''     ] }
+let g:airline#themes#badwolf#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , s:PA[0]   , s:I1[2]   , s:PA[1]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.replace = copy(airline#themes#badwolf#palette.insert)
+let g:airline#themes#badwolf#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#badwolf#palette.replace_modified = g:airline#themes#badwolf#palette.insert_modified
+
+
+let g:airline#themes#badwolf#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#badwolf#palette.visual_modified = {
+      \ 'airline_c': [ s:V3[0]   , s:V4[0]   , s:V3[2]   , s:V4[1]   , ''     ] }
+
+
+let g:airline#themes#badwolf#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#badwolf#palette.inactive_modified = {
+      \ 'airline_c': [ s:V1[1]   , ''        , s:V1[3]   , ''        , ''     ] }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16.vim
new file mode 100644
index 0000000..031489a
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16.vim
@@ -0,0 +1,181 @@
+let s:improved_contrast = get(g:, 'airline_base16_improved_contrast', 0)
+
+" Color palette
+let s:gui_dark_gray = '#202020'
+let s:cterm_dark_gray = 234
+let s:gui_med_gray_hi = '#303030'
+let s:cterm_med_gray_hi = 236
+let s:gui_med_gray_lo = '#3a3a3a'
+let s:cterm_med_gray_lo = 237
+let s:gui_light_gray = '#505050'
+let s:cterm_light_gray = 239
+let s:gui_lightlight_gray = '#8A8A8A'
+let s:cterm_lightlight_gray = 245
+let s:gui_green = '#99cc99'
+let s:cterm_green = 151
+let s:gui_blue = '#6a9fb5'
+let s:cterm_blue = 67
+let s:gui_purple = '#aa759f'
+let s:cterm_purple = 139
+let s:gui_orange = '#d28445'
+let s:cterm_orange = 173
+let s:gui_red = '#ac4142'
+let s:cterm_red = 131
+let s:gui_pink = '#d7afd7'
+let s:cterm_pink = 182
+
+if get(g:, 'airline#themes#base16#constant', 0)
+  let g:airline#themes#base16#palette = {}
+
+  " Normal mode
+  let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
+  if s:improved_contrast
+    let s:N2 = [s:gui_lightlight_gray, s:gui_med_gray_lo, s:cterm_lightlight_gray, s:cterm_med_gray_lo]
+  else
+
+    let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
+  endif
+  let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#base16#palette.normal_modified = {
+        \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
+        \ }
+
+  " Insert mode
+  let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
+  let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
+  let g:airline#themes#base16#palette.insert_modified = copy(g:airline#themes#base16#palette.normal_modified)
+  let g:airline#themes#base16#palette.insert_paste = {
+        \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
+        \ }
+
+  " Replace mode
+  let g:airline#themes#base16#palette.replace = {
+        \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
+        \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
+        \ }
+  let g:airline#themes#base16#palette.replace_modified = copy(g:airline#themes#base16#palette.insert_modified)
+
+  " Visual mode
+  let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
+  let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
+  let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
+  let g:airline#themes#base16#palette.visual_modified = copy(g:airline#themes#base16#palette.insert_modified)
+
+  " Inactive window
+  if s:improved_contrast
+    let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_lightlight_gray, s:cterm_med_gray_hi, '']
+  else
+    let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:cterm_light_gray, s:cterm_med_gray_hi, '']
+  endif
+  let g:airline#themes#base16#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#base16#palette.inactive_modified = {
+        \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+        \ }
+else
+  function! airline#themes#base16#refresh()
+    let g:airline#themes#base16#palette = {}
+
+    let g:airline#themes#base16#palette.accents = {
+          \ 'red': airline#themes#get_highlight('Constant'),
+          \ }
+
+    let s:N1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffText', 'fg'], 'bold')
+    let s:N2 = airline#themes#get_highlight2(['Visual', 'fg'], ['Visual', 'bg'])
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#base16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let group = airline#themes#get_highlight('vimCommand')
+    let g:airline#themes#base16#palette.normal_modified = {
+          \ 'statusline': [ group[0], '', group[2], '', '' ]
+          \ }
+
+    let s:I1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['DiffAdded', 'fg'], 'bold')
+    let s:I2 = airline#themes#get_highlight2(['DiffAdded', 'fg'], ['Normal', 'bg'])
+    let s:I3 = s:N3
+    let g:airline#themes#base16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#base16#palette.insert_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:R1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['WarningMsg', 'fg'], 'bold')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#base16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#base16#palette.replace_modified = g:airline#themes#base16#palette.normal_modified
+
+    let s:V1 = airline#themes#get_highlight2(['DiffText', 'bg'], ['Constant', 'fg'], 'bold')
+    let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
+    let s:V3 = s:N3
+    let g:airline#themes#base16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#base16#palette.visual_modified = g:airline#themes#base16#palette.normal_modified
+
+    " Use VertSplit's bg and default fg (reversed) for inactive statusline.
+    let s:VS = airline#themes#get_highlight('VertSplit')
+    if s:improved_contrast
+      let s:IA = [ s:VS[1], 'NONE', s:VS[2], s:cterm_lightlight_gray, 'reverse']
+    else
+      let s:IA = [ s:VS[1], 'NONE', s:VS[2], 'NONE', 'reverse']
+    endif
+    let g:airline#themes#base16#palette.inactive =
+          \ airline#themes#generate_color_map(s:IA, s:IA, s:IA, s:IA, s:IA, s:IA)
+    let s:IM = [ s:VS[1], 'NONE', s:VS[2], 'NONE', 'reverse']
+    let g:airline#themes#base16#palette.inactive_modified =
+          \ airline#themes#generate_color_map(s:IM, s:IM, s:IM, s:IM, s:IM, s:IM)
+
+    " Warnings
+    let s:WI = airline#themes#get_highlight2(['WarningMsg', 'bg'], ['WarningMsg', 'fg'], 'bold')
+    let g:airline#themes#base16#palette.normal.airline_warning = [
+         \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+         \ ]
+
+    let g:airline#themes#base16#palette.normal_modified.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.insert.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.insert_modified.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.visual.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.visual_modified.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.replace.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    let g:airline#themes#base16#palette.replace_modified.airline_warning =
+        \ g:airline#themes#base16#palette.normal.airline_warning
+
+    " Errors
+    let s:ER = airline#themes#get_highlight2(['ErrorMsg', 'bg'], ['ErrorMsg', 'fg'], 'bold')
+    let g:airline#themes#base16#palette.normal.airline_error = [
+         \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
+         \ ]
+
+    let g:airline#themes#base16#palette.normal_modified.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.insert.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.insert_modified.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.visual.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.visual_modified.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.replace.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+    let g:airline#themes#base16#palette.replace_modified.airline_error =
+        \ g:airline#themes#base16#palette.normal.airline_error
+
+  endfunction
+  call airline#themes#base16#refresh()
+endif
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_3024.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_3024.vim
new file mode 100644
index 0000000..f4e318a
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_3024.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 3024 Scheme by Jan T. Sott (http://github.com/idleberg)
+let g:airline#themes#base16_3024#palette = {}
+let s:gui00 = "#090300"
+let s:gui01 = "#3a3432"
+let s:gui02 = "#4a4543"
+let s:gui03 = "#5c5855"
+let s:gui04 = "#807d7c"
+let s:gui05 = "#a5a2a2"
+let s:gui06 = "#d6d5d4"
+let s:gui07 = "#f7f7f7"
+let s:gui08 = "#db2d20"
+let s:gui09 = "#e8bbd0"
+let s:gui0A = "#fded02"
+let s:gui0B = "#01a252"
+let s:gui0C = "#b5e4f4"
+let s:gui0D = "#01a0e4"
+let s:gui0E = "#a16a94"
+let s:gui0F = "#cdab53"
+
+let s:cterm00 = 0
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 182
+let s:cterm0A = 11
+let s:cterm0B = 35
+let s:cterm0C = 153
+let s:cterm0D = 38
+let s:cterm0E = 132
+let s:cterm0F = 179
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_3024#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_3024#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_3024#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_3024#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_3024#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_3024#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_apathy.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_apathy.vim
new file mode 100644
index 0000000..85a9584
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_apathy.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Apathy Scheme by Jannik Siebert (https://github.com/janniks)
+let g:airline#themes#base16_apathy#palette = {}
+let s:gui00 = "#031A16"
+let s:gui01 = "#0B342D"
+let s:gui02 = "#184E45"
+let s:gui03 = "#2B685E"
+let s:gui04 = "#5F9C92"
+let s:gui05 = "#81B5AC"
+let s:gui06 = "#A7CEC8"
+let s:gui07 = "#D2E7E4"
+let s:gui08 = "#3E9688"
+let s:gui09 = "#3E7996"
+let s:gui0A = "#3E4C96"
+let s:gui0B = "#883E96"
+let s:gui0C = "#963E4C"
+let s:gui0D = "#96883E"
+let s:gui0E = "#4C963E"
+let s:gui0F = "#3E965B"
+
+let s:cterm00 = 0
+let s:cterm01 = 22
+let s:cterm02 = 23
+let s:cterm03 = 23
+let s:cterm04 = 72
+let s:cterm05 = 109
+let s:cterm06 = 152
+let s:cterm07 = 188
+let s:cterm08 = 66
+let s:cterm09 = 66
+let s:cterm0A = 60
+let s:cterm0B = 96
+let s:cterm0C = 95
+let s:cterm0D = 101
+let s:cterm0E = 65
+let s:cterm0F = 65
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_apathy#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_apathy#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_apathy#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_apathy#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_apathy#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_apathy#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ashes.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ashes.vim
new file mode 100644
index 0000000..a162c67
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ashes.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Ashes Scheme by Jannik Siebert (https://github.com/janniks)
+let g:airline#themes#base16_ashes#palette = {}
+let s:gui00 = "#1C2023"
+let s:gui01 = "#393F45"
+let s:gui02 = "#565E65"
+let s:gui03 = "#747C84"
+let s:gui04 = "#ADB3BA"
+let s:gui05 = "#C7CCD1"
+let s:gui06 = "#DFE2E5"
+let s:gui07 = "#F3F4F5"
+let s:gui08 = "#C7AE95"
+let s:gui09 = "#C7C795"
+let s:gui0A = "#AEC795"
+let s:gui0B = "#95C7AE"
+let s:gui0C = "#95AEC7"
+let s:gui0D = "#AE95C7"
+let s:gui0E = "#C795AE"
+let s:gui0F = "#C79595"
+
+let s:cterm00 = 0
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 180
+let s:cterm09 = 186
+let s:cterm0A = 150
+let s:cterm0B = 115
+let s:cterm0C = 110
+let s:cterm0D = 140
+let s:cterm0E = 175
+let s:cterm0F = 174
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ashes#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ashes#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ashes#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ashes#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_ashes#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_ashes#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierdune.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierdune.vim
new file mode 100644
index 0000000..94cfacd
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierdune.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Atelier Dune Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune)
+let g:airline#themes#base16_atelierdune#palette = {}
+let s:gui00 = "#20201d"
+let s:gui01 = "#292824"
+let s:gui02 = "#6e6b5e"
+let s:gui03 = "#7d7a68"
+let s:gui04 = "#999580"
+let s:gui05 = "#a6a28c"
+let s:gui06 = "#e8e4cf"
+let s:gui07 = "#fefbec"
+let s:gui08 = "#d73737"
+let s:gui09 = "#b65611"
+let s:gui0A = "#cfb017"
+let s:gui0B = "#60ac39"
+let s:gui0C = "#1fad83"
+let s:gui0D = "#6684e1"
+let s:gui0E = "#b854d4"
+let s:gui0F = "#d43552"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 101
+let s:cterm04 = 102
+let s:cterm05 = 144
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 130
+let s:cterm0A = 178
+let s:cterm0B = 71
+let s:cterm0C = 36
+let s:cterm0D = 68
+let s:cterm0E = 134
+let s:cterm0F = 167
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierdune#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierdune#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierdune#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierdune#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_atelierdune#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_atelierdune#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierforest.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierforest.vim
new file mode 100644
index 0000000..70c23de
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierforest.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Atelier Forest Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/forest)
+let g:airline#themes#base16_atelierforest#palette = {}
+let s:gui00 = "#1b1918"
+let s:gui01 = "#2c2421"
+let s:gui02 = "#68615e"
+let s:gui03 = "#766e6b"
+let s:gui04 = "#9c9491"
+let s:gui05 = "#a8a19f"
+let s:gui06 = "#e6e2e0"
+let s:gui07 = "#f1efee"
+let s:gui08 = "#f22c40"
+let s:gui09 = "#df5320"
+let s:gui0A = "#d5911a"
+let s:gui0B = "#5ab738"
+let s:gui0C = "#00ad9c"
+let s:gui0D = "#407ee7"
+let s:gui0E = "#6666ea"
+let s:gui0F = "#c33ff3"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 138
+let s:cterm05 = 145
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 197
+let s:cterm09 = 166
+let s:cterm0A = 172
+let s:cterm0B = 71
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 62
+let s:cterm0F = 135
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierforest#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierforest#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierforest#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierforest#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_atelierforest#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_atelierforest#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierheath.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierheath.vim
new file mode 100644
index 0000000..20179c7
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierheath.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Atelier Heath Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath)
+let g:airline#themes#base16_atelierheath#palette = {}
+let s:gui00 = "#1b181b"
+let s:gui01 = "#292329"
+let s:gui02 = "#695d69"
+let s:gui03 = "#776977"
+let s:gui04 = "#9e8f9e"
+let s:gui05 = "#ab9bab"
+let s:gui06 = "#d8cad8"
+let s:gui07 = "#f7f3f7"
+let s:gui08 = "#ca402b"
+let s:gui09 = "#a65926"
+let s:gui0A = "#bb8a35"
+let s:gui0B = "#379a37"
+let s:gui0C = "#159393"
+let s:gui0D = "#516aec"
+let s:gui0E = "#7b59c0"
+let s:gui0F = "#cc33cc"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 96
+let s:cterm04 = 139
+let s:cterm05 = 139
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 166
+let s:cterm09 = 130
+let s:cterm0A = 137
+let s:cterm0B = 65
+let s:cterm0C = 30
+let s:cterm0D = 12
+let s:cterm0E = 97
+let s:cterm0F = 170
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierheath#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierheath#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierheath#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierheath#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_atelierheath#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_atelierheath#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierlakeside.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierlakeside.vim
new file mode 100644
index 0000000..0d1e758
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierlakeside.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Atelier Lakeside Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/lakeside/)
+let g:airline#themes#base16_atelierlakeside#palette = {}
+let s:gui00 = "#161b1d"
+let s:gui01 = "#1f292e"
+let s:gui02 = "#516d7b"
+let s:gui03 = "#5a7b8c"
+let s:gui04 = "#7195a8"
+let s:gui05 = "#7ea2b4"
+let s:gui06 = "#c1e4f6"
+let s:gui07 = "#ebf8ff"
+let s:gui08 = "#d22d72"
+let s:gui09 = "#935c25"
+let s:gui0A = "#8a8a0f"
+let s:gui0B = "#568c3b"
+let s:gui0C = "#2d8f6f"
+let s:gui0D = "#257fad"
+let s:gui0E = "#5d5db1"
+let s:gui0F = "#b72dd2"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 67
+let s:cterm05 = 109
+let s:cterm06 = 153
+let s:cterm07 = 195
+let s:cterm08 = 161
+let s:cterm09 = 94
+let s:cterm0A = 100
+let s:cterm0B = 65
+let s:cterm0C = 29
+let s:cterm0D = 31
+let s:cterm0E = 61
+let s:cterm0F = 5
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierlakeside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierlakeside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierlakeside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierlakeside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_atelierlakeside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_atelierlakeside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierseaside.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierseaside.vim
new file mode 100644
index 0000000..0314ea2
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_atelierseaside.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Atelier Seaside Scheme by Bram de Haan (http://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/)
+let g:airline#themes#base16_atelierseaside#palette = {}
+let s:gui00 = "#131513"
+let s:gui01 = "#242924"
+let s:gui02 = "#5e6e5e"
+let s:gui03 = "#687d68"
+let s:gui04 = "#809980"
+let s:gui05 = "#8ca68c"
+let s:gui06 = "#cfe8cf"
+let s:gui07 = "#f0fff0"
+let s:gui08 = "#e6193c"
+let s:gui09 = "#87711d"
+let s:gui0A = "#c3c322"
+let s:gui0B = "#29a329"
+let s:gui0C = "#1999b3"
+let s:gui0D = "#3d62f5"
+let s:gui0E = "#ad2bee"
+let s:gui0F = "#e619c3"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 65
+let s:cterm04 = 102
+let s:cterm05 = 108
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 161
+let s:cterm09 = 94
+let s:cterm0A = 3
+let s:cterm0B = 2
+let s:cterm0C = 31
+let s:cterm0D = 12
+let s:cterm0E = 129
+let s:cterm0F = 5
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierseaside#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierseaside#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierseaside#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_atelierseaside#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_atelierseaside#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_atelierseaside#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bespin.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bespin.vim
new file mode 100644
index 0000000..b4f3523
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bespin.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Bespin Scheme by Jan T. Sott
+let g:airline#themes#base16_bespin#palette = {}
+let s:gui00 = "#28211c"
+let s:gui01 = "#36312e"
+let s:gui02 = "#5e5d5c"
+let s:gui03 = "#666666"
+let s:gui04 = "#797977"
+let s:gui05 = "#8a8986"
+let s:gui06 = "#9d9b97"
+let s:gui07 = "#baae9e"
+let s:gui08 = "#cf6a4c"
+let s:gui09 = "#cf7d34"
+let s:gui0A = "#f9ee98"
+let s:gui0B = "#54be0d"
+let s:gui0C = "#afc4db"
+let s:gui0D = "#5ea6ea"
+let s:gui0E = "#9b859d"
+let s:gui0F = "#937121"
+
+let s:cterm00 = 0
+let s:cterm01 = 58
+let s:cterm02 = 59
+let s:cterm03 = 241
+let s:cterm04 = 102
+let s:cterm05 = 102
+let s:cterm06 = 138
+let s:cterm07 = 145
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 228
+let s:cterm0B = 70
+let s:cterm0C = 152
+let s:cterm0D = 74
+let s:cterm0E = 103
+let s:cterm0F = 94
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bespin#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bespin#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bespin#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bespin#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_bespin#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_bespin#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_brewer.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_brewer.vim
new file mode 100644
index 0000000..0164677
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_brewer.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Brewer Scheme by Timothée Poisot (http://github.com/tpoisot)
+let g:airline#themes#base16_brewer#palette = {}
+let s:gui00 = "#0c0d0e"
+let s:gui01 = "#2e2f30"
+let s:gui02 = "#515253"
+let s:gui03 = "#737475"
+let s:gui04 = "#959697"
+let s:gui05 = "#b7b8b9"
+let s:gui06 = "#dadbdc"
+let s:gui07 = "#fcfdfe"
+let s:gui08 = "#e31a1c"
+let s:gui09 = "#e6550d"
+let s:gui0A = "#dca060"
+let s:gui0B = "#31a354"
+let s:gui0C = "#80b1d3"
+let s:gui0D = "#3182bd"
+let s:gui0E = "#756bb1"
+let s:gui0F = "#b15928"
+
+let s:cterm00 = 0
+let s:cterm01 = 17
+let s:cterm02 = 59
+let s:cterm03 = 66
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 166
+let s:cterm0A = 179
+let s:cterm0B = 71
+let s:cterm0C = 110
+let s:cterm0D = 67
+let s:cterm0E = 97
+let s:cterm0F = 130
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_brewer#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_brewer#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_brewer#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_brewer#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_brewer#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_brewer#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bright.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bright.vim
new file mode 100644
index 0000000..23c7432
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_bright.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Bright Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_bright#palette = {}
+let s:gui00 = "#000000"
+let s:gui01 = "#303030"
+let s:gui02 = "#505050"
+let s:gui03 = "#b0b0b0"
+let s:gui04 = "#d0d0d0"
+let s:gui05 = "#e0e0e0"
+let s:gui06 = "#f5f5f5"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#fb0120"
+let s:gui09 = "#fc6d24"
+let s:gui0A = "#fda331"
+let s:gui0B = "#a1c659"
+let s:gui0C = "#76c7b7"
+let s:gui0D = "#6fb3d2"
+let s:gui0E = "#d381c3"
+let s:gui0F = "#be643c"
+
+let s:cterm00 = 0
+let s:cterm01 = 236
+let s:cterm02 = 239
+let s:cterm03 = 249
+let s:cterm04 = 252
+let s:cterm05 = 253
+let s:cterm06 = 15
+let s:cterm07 = 15
+let s:cterm08 = 9
+let s:cterm09 = 202
+let s:cterm0A = 215
+let s:cterm0B = 149
+let s:cterm0C = 115
+let s:cterm0D = 74
+let s:cterm0E = 175
+let s:cterm0F = 131
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bright#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bright#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bright#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_bright#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_bright#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_bright#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_chalk.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_chalk.vim
new file mode 100644
index 0000000..d0345a9
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_chalk.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Chalk Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_chalk#palette = {}
+let s:gui00 = "#151515"
+let s:gui01 = "#202020"
+let s:gui02 = "#303030"
+let s:gui03 = "#505050"
+let s:gui04 = "#b0b0b0"
+let s:gui05 = "#d0d0d0"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#f5f5f5"
+let s:gui08 = "#fb9fb1"
+let s:gui09 = "#eda987"
+let s:gui0A = "#ddb26f"
+let s:gui0B = "#acc267"
+let s:gui0C = "#12cfc0"
+let s:gui0D = "#6fc2ef"
+let s:gui0E = "#e1a3ee"
+let s:gui0F = "#deaf8f"
+
+let s:cterm00 = 233
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 217
+let s:cterm09 = 216
+let s:cterm0A = 179
+let s:cterm0B = 143
+let s:cterm0C = 6
+let s:cterm0D = 75
+let s:cterm0E = 183
+let s:cterm0F = 180
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_chalk#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_chalk#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_chalk#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_chalk#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_chalk#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_chalk#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_codeschool.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_codeschool.vim
new file mode 100644
index 0000000..f9cf956
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_codeschool.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Codeschool Scheme by brettof86
+let g:airline#themes#base16_codeschool#palette = {}
+let s:gui00 = "#232c31"
+let s:gui01 = "#1c3657"
+let s:gui02 = "#2a343a"
+let s:gui03 = "#3f4944"
+let s:gui04 = "#84898c"
+let s:gui05 = "#9ea7a6"
+let s:gui06 = "#a7cfa3"
+let s:gui07 = "#b5d8f6"
+let s:gui08 = "#2a5491"
+let s:gui09 = "#43820d"
+let s:gui0A = "#a03b1e"
+let s:gui0B = "#237986"
+let s:gui0C = "#b02f30"
+let s:gui0D = "#484d79"
+let s:gui0E = "#c59820"
+let s:gui0F = "#c98344"
+
+let s:cterm00 = 17
+let s:cterm01 = 23
+let s:cterm02 = 23
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 151
+let s:cterm07 = 153
+let s:cterm08 = 24
+let s:cterm09 = 64
+let s:cterm0A = 130
+let s:cterm0B = 30
+let s:cterm0C = 125
+let s:cterm0D = 60
+let s:cterm0E = 172
+let s:cterm0F = 173
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_codeschool#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_codeschool#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_codeschool#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_codeschool#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_codeschool#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_codeschool#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_colors.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_colors.vim
new file mode 100644
index 0000000..d65442d
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_colors.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Colors Scheme by mrmrs (http://clrs.cc)
+let g:airline#themes#base16_colors#palette = {}
+let s:gui00 = "#111111"
+let s:gui01 = "#333333"
+let s:gui02 = "#555555"
+let s:gui03 = "#777777"
+let s:gui04 = "#999999"
+let s:gui05 = "#bbbbbb"
+let s:gui06 = "#dddddd"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#ff4136"
+let s:gui09 = "#ff851b"
+let s:gui0A = "#ffdc00"
+let s:gui0B = "#2ecc40"
+let s:gui0C = "#7fdbff"
+let s:gui0D = "#0074d9"
+let s:gui0E = "#b10dc9"
+let s:gui0F = "#85144b"
+
+let s:cterm00 = 233
+let s:cterm01 = 236
+let s:cterm02 = 240
+let s:cterm03 = 243
+let s:cterm04 = 246
+let s:cterm05 = 250
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 203
+let s:cterm09 = 208
+let s:cterm0A = 220
+let s:cterm0B = 41
+let s:cterm0C = 117
+let s:cterm0D = 32
+let s:cterm0E = 128
+let s:cterm0F = 89
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_colors#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_colors#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_colors#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_colors#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_colors#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_colors#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_default.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_default.vim
new file mode 100644
index 0000000..841c12e
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_default.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Default Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_default#palette = {}
+let s:gui00 = "#181818"
+let s:gui01 = "#282828"
+let s:gui02 = "#383838"
+let s:gui03 = "#585858"
+let s:gui04 = "#b8b8b8"
+let s:gui05 = "#d8d8d8"
+let s:gui06 = "#e8e8e8"
+let s:gui07 = "#f8f8f8"
+let s:gui08 = "#ab4642"
+let s:gui09 = "#dc9656"
+let s:gui0A = "#f7ca88"
+let s:gui0B = "#a1b56c"
+let s:gui0C = "#86c1b9"
+let s:gui0D = "#7cafc2"
+let s:gui0E = "#ba8baf"
+let s:gui0F = "#a16946"
+
+let s:cterm00 = 233
+let s:cterm01 = 235
+let s:cterm02 = 237
+let s:cterm03 = 240
+let s:cterm04 = 249
+let s:cterm05 = 253
+let s:cterm06 = 254
+let s:cterm07 = 15
+let s:cterm08 = 131
+let s:cterm09 = 173
+let s:cterm0A = 222
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 131
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_default#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_default#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_default#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_default#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_default#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_default#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_eighties.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_eighties.vim
new file mode 100644
index 0000000..7161e39
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_eighties.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Eighties Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_eighties#palette = {}
+let s:gui00 = "#2d2d2d"
+let s:gui01 = "#393939"
+let s:gui02 = "#515151"
+let s:gui03 = "#747369"
+let s:gui04 = "#a09f93"
+let s:gui05 = "#d3d0c8"
+let s:gui06 = "#e8e6df"
+let s:gui07 = "#f2f0ec"
+let s:gui08 = "#f2777a"
+let s:gui09 = "#f99157"
+let s:gui0A = "#ffcc66"
+let s:gui0B = "#99cc99"
+let s:gui0C = "#66cccc"
+let s:gui0D = "#6699cc"
+let s:gui0E = "#cc99cc"
+let s:gui0F = "#d27b53"
+
+let s:cterm00 = 236
+let s:cterm01 = 237
+let s:cterm02 = 239
+let s:cterm03 = 95
+let s:cterm04 = 144
+let s:cterm05 = 188
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 210
+let s:cterm09 = 209
+let s:cterm0A = 221
+let s:cterm0B = 114
+let s:cterm0C = 80
+let s:cterm0D = 68
+let s:cterm0E = 176
+let s:cterm0F = 173
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_eighties#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_eighties#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_eighties#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_eighties#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_eighties#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_eighties#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_embers.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_embers.vim
new file mode 100644
index 0000000..0c26076
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_embers.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Embers Scheme by Jannik Siebert (https://github.com/janniks)
+let g:airline#themes#base16_embers#palette = {}
+let s:gui00 = "#16130F"
+let s:gui01 = "#2C2620"
+let s:gui02 = "#433B32"
+let s:gui03 = "#5A5047"
+let s:gui04 = "#8A8075"
+let s:gui05 = "#A39A90"
+let s:gui06 = "#BEB6AE"
+let s:gui07 = "#DBD6D1"
+let s:gui08 = "#826D57"
+let s:gui09 = "#828257"
+let s:gui0A = "#6D8257"
+let s:gui0B = "#57826D"
+let s:gui0C = "#576D82"
+let s:gui0D = "#6D5782"
+let s:gui0E = "#82576D"
+let s:gui0F = "#825757"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 138
+let s:cterm06 = 145
+let s:cterm07 = 188
+let s:cterm08 = 95
+let s:cterm09 = 101
+let s:cterm0A = 65
+let s:cterm0B = 65
+let s:cterm0C = 60
+let s:cterm0D = 60
+let s:cterm0E = 95
+let s:cterm0F = 95
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_embers#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_embers#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_embers#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_embers#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_embers#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_embers#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_flat.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_flat.vim
new file mode 100644
index 0000000..aa4f5cf
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_flat.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Flat Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_flat#palette = {}
+let s:gui00 = "#2C3E50"
+let s:gui01 = "#34495E"
+let s:gui02 = "#7F8C8D"
+let s:gui03 = "#95A5A6"
+let s:gui04 = "#BDC3C7"
+let s:gui05 = "#e0e0e0"
+let s:gui06 = "#f5f5f5"
+let s:gui07 = "#ECF0F1"
+let s:gui08 = "#E74C3C"
+let s:gui09 = "#E67E22"
+let s:gui0A = "#F1C40F"
+let s:gui0B = "#2ECC71"
+let s:gui0C = "#1ABC9C"
+let s:gui0D = "#3498DB"
+let s:gui0E = "#9B59B6"
+let s:gui0F = "#be643c"
+
+let s:cterm00 = 23
+let s:cterm01 = 59
+let s:cterm02 = 102
+let s:cterm03 = 109
+let s:cterm04 = 146
+let s:cterm05 = 253
+let s:cterm06 = 15
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 172
+let s:cterm0A = 220
+let s:cterm0B = 41
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 97
+let s:cterm0F = 131
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_flat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_flat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_flat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_flat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_flat#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_flat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_google.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_google.vim
new file mode 100644
index 0000000..f20da8c
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_google.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Google Scheme by Seth Wright (http://sethawright.com)
+let g:airline#themes#base16_google#palette = {}
+let s:gui00 = "#1d1f21"
+let s:gui01 = "#282a2e"
+let s:gui02 = "#373b41"
+let s:gui03 = "#969896"
+let s:gui04 = "#b4b7b4"
+let s:gui05 = "#c5c8c6"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#CC342B"
+let s:gui09 = "#F96A38"
+let s:gui0A = "#FBA922"
+let s:gui0B = "#198844"
+let s:gui0C = "#3971ED"
+let s:gui0D = "#3971ED"
+let s:gui0E = "#A36AC7"
+let s:gui0F = "#3971ED"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 166
+let s:cterm09 = 203
+let s:cterm0A = 214
+let s:cterm0B = 29
+let s:cterm0C = 12
+let s:cterm0D = 12
+let s:cterm0E = 134
+let s:cterm0F = 12
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_google#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_google#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_google#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_google#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_google#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_google#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_grayscale.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_grayscale.vim
new file mode 100644
index 0000000..bf60eb3
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_grayscale.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Grayscale Scheme by Alexandre Gavioli (https://github.com/Alexx2/)
+let g:airline#themes#base16_grayscale#palette = {}
+let s:gui00 = "#101010"
+let s:gui01 = "#252525"
+let s:gui02 = "#464646"
+let s:gui03 = "#525252"
+let s:gui04 = "#ababab"
+let s:gui05 = "#b9b9b9"
+let s:gui06 = "#e3e3e3"
+let s:gui07 = "#f7f7f7"
+let s:gui08 = "#7c7c7c"
+let s:gui09 = "#999999"
+let s:gui0A = "#a0a0a0"
+let s:gui0B = "#8e8e8e"
+let s:gui0C = "#868686"
+let s:gui0D = "#686868"
+let s:gui0E = "#747474"
+let s:gui0F = "#5e5e5e"
+
+let s:cterm00 = 233
+let s:cterm01 = 235
+let s:cterm02 = 238
+let s:cterm03 = 239
+let s:cterm04 = 248
+let s:cterm05 = 250
+let s:cterm06 = 254
+let s:cterm07 = 15
+let s:cterm08 = 243
+let s:cterm09 = 246
+let s:cterm0A = 247
+let s:cterm0B = 245
+let s:cterm0C = 244
+let s:cterm0D = 241
+let s:cterm0E = 243
+let s:cterm0F = 240
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_grayscale#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_grayscale#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_grayscale#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_grayscale#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_grayscale#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_grayscale#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_greenscreen.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_greenscreen.vim
new file mode 100644
index 0000000..b460449
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_greenscreen.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Green Screen Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_greenscreen#palette = {}
+let s:gui00 = "#001100"
+let s:gui01 = "#003300"
+let s:gui02 = "#005500"
+let s:gui03 = "#007700"
+let s:gui04 = "#009900"
+let s:gui05 = "#00bb00"
+let s:gui06 = "#00dd00"
+let s:gui07 = "#00ff00"
+let s:gui08 = "#007700"
+let s:gui09 = "#009900"
+let s:gui0A = "#007700"
+let s:gui0B = "#00bb00"
+let s:gui0C = "#005500"
+let s:gui0D = "#009900"
+let s:gui0E = "#00bb00"
+let s:gui0F = "#005500"
+
+let s:cterm00 = 0
+let s:cterm01 = 22
+let s:cterm02 = 22
+let s:cterm03 = 28
+let s:cterm04 = 28
+let s:cterm05 = 34
+let s:cterm06 = 40
+let s:cterm07 = 10
+let s:cterm08 = 28
+let s:cterm09 = 28
+let s:cterm0A = 28
+let s:cterm0B = 34
+let s:cterm0C = 22
+let s:cterm0D = 28
+let s:cterm0E = 34
+let s:cterm0F = 22
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_greenscreen#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_greenscreen#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_greenscreen#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_greenscreen#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_greenscreen#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_greenscreen#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_harmonic16.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_harmonic16.vim
new file mode 100644
index 0000000..9700a04
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_harmonic16.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 harmonic16 Scheme by Jannik Siebert (https://github.com/janniks)
+let g:airline#themes#base16_harmonic16#palette = {}
+let s:gui00 = "#0b1c2c"
+let s:gui01 = "#223b54"
+let s:gui02 = "#405c79"
+let s:gui03 = "#627e99"
+let s:gui04 = "#aabcce"
+let s:gui05 = "#cbd6e2"
+let s:gui06 = "#e5ebf1"
+let s:gui07 = "#f7f9fb"
+let s:gui08 = "#bf8b56"
+let s:gui09 = "#bfbf56"
+let s:gui0A = "#8bbf56"
+let s:gui0B = "#56bf8b"
+let s:gui0C = "#568bbf"
+let s:gui0D = "#8b56bf"
+let s:gui0E = "#bf568b"
+let s:gui0F = "#bf5656"
+
+let s:cterm00 = 0
+let s:cterm01 = 23
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 146
+let s:cterm05 = 188
+let s:cterm06 = 189
+let s:cterm07 = 15
+let s:cterm08 = 137
+let s:cterm09 = 143
+let s:cterm0A = 107
+let s:cterm0B = 72
+let s:cterm0C = 67
+let s:cterm0D = 97
+let s:cterm0E = 132
+let s:cterm0F = 131
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_harmonic16#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_harmonic16#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_harmonic16#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_harmonic16#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_harmonic16#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_harmonic16#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_hopscotch.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_hopscotch.vim
new file mode 100644
index 0000000..0e78688
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_hopscotch.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Hopscotch Scheme by Jan T. Sott
+let g:airline#themes#base16_hopscotch#palette = {}
+let s:gui00 = "#322931"
+let s:gui01 = "#433b42"
+let s:gui02 = "#5c545b"
+let s:gui03 = "#797379"
+let s:gui04 = "#989498"
+let s:gui05 = "#b9b5b8"
+let s:gui06 = "#d5d3d5"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#dd464c"
+let s:gui09 = "#fd8b19"
+let s:gui0A = "#fdcc59"
+let s:gui0B = "#8fc13e"
+let s:gui0C = "#149b93"
+let s:gui0D = "#1290bf"
+let s:gui0E = "#c85e7c"
+let s:gui0F = "#b33508"
+
+let s:cterm00 = 53
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 96
+let s:cterm04 = 102
+let s:cterm05 = 145
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 208
+let s:cterm0A = 221
+let s:cterm0B = 107
+let s:cterm0C = 30
+let s:cterm0D = 31
+let s:cterm0E = 168
+let s:cterm0F = 130
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_hopscotch#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_hopscotch#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_hopscotch#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_hopscotch#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_hopscotch#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_hopscotch#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_isotope.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_isotope.vim
new file mode 100644
index 0000000..aa5e0bd
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_isotope.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Isotope Scheme by Jan T. Sott
+let g:airline#themes#base16_isotope#palette = {}
+let s:gui00 = "#000000"
+let s:gui01 = "#404040"
+let s:gui02 = "#606060"
+let s:gui03 = "#808080"
+let s:gui04 = "#c0c0c0"
+let s:gui05 = "#d0d0d0"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#ff0000"
+let s:gui09 = "#ff9900"
+let s:gui0A = "#ff0099"
+let s:gui0B = "#33ff00"
+let s:gui0C = "#00ffff"
+let s:gui0D = "#0066ff"
+let s:gui0E = "#cc00ff"
+let s:gui0F = "#3300ff"
+
+let s:cterm00 = 0
+let s:cterm01 = 237
+let s:cterm02 = 241
+let s:cterm03 = 244
+let s:cterm04 = 250
+let s:cterm05 = 252
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 9
+let s:cterm09 = 208
+let s:cterm0A = 198
+let s:cterm0B = 82
+let s:cterm0C = 14
+let s:cterm0D = 27
+let s:cterm0E = 165
+let s:cterm0F = 57
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_isotope#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_isotope#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_isotope#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_isotope#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_isotope#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_isotope#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_londontube.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_londontube.vim
new file mode 100644
index 0000000..b228e23
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_londontube.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 London Tube Scheme by Jan T. Sott
+let g:airline#themes#base16_londontube#palette = {}
+let s:gui00 = "#231f20"
+let s:gui01 = "#1c3f95"
+let s:gui02 = "#5a5758"
+let s:gui03 = "#737171"
+let s:gui04 = "#959ca1"
+let s:gui05 = "#d9d8d8"
+let s:gui06 = "#e7e7e8"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#ee2e24"
+let s:gui09 = "#f386a1"
+let s:gui0A = "#ffd204"
+let s:gui0B = "#00853e"
+let s:gui0C = "#85cebc"
+let s:gui0D = "#009ddc"
+let s:gui0E = "#98005d"
+let s:gui0F = "#b06110"
+
+let s:cterm00 = 0
+let s:cterm01 = 24
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 109
+let s:cterm05 = 188
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 211
+let s:cterm0A = 220
+let s:cterm0B = 29
+let s:cterm0C = 115
+let s:cterm0D = 38
+let s:cterm0E = 89
+let s:cterm0F = 130
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_londontube#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_londontube#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_londontube#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_londontube#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_londontube#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_londontube#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_marrakesh.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_marrakesh.vim
new file mode 100644
index 0000000..e6cd459
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_marrakesh.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Marrakesh Scheme by Alexandre Gavioli (http://github.com/Alexx2/)
+let g:airline#themes#base16_marrakesh#palette = {}
+let s:gui00 = "#201602"
+let s:gui01 = "#302e00"
+let s:gui02 = "#5f5b17"
+let s:gui03 = "#6c6823"
+let s:gui04 = "#86813b"
+let s:gui05 = "#948e48"
+let s:gui06 = "#ccc37a"
+let s:gui07 = "#faf0a5"
+let s:gui08 = "#c35359"
+let s:gui09 = "#b36144"
+let s:gui0A = "#a88339"
+let s:gui0B = "#18974e"
+let s:gui0C = "#75a738"
+let s:gui0D = "#477ca1"
+let s:gui0E = "#8868b3"
+let s:gui0F = "#b3588e"
+
+let s:cterm00 = 0
+let s:cterm01 = 52
+let s:cterm02 = 58
+let s:cterm03 = 58
+let s:cterm04 = 101
+let s:cterm05 = 101
+let s:cterm06 = 180
+let s:cterm07 = 229
+let s:cterm08 = 131
+let s:cterm09 = 131
+let s:cterm0A = 137
+let s:cterm0B = 29
+let s:cterm0C = 107
+let s:cterm0D = 67
+let s:cterm0E = 97
+let s:cterm0F = 132
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_marrakesh#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_marrakesh#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_marrakesh#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_marrakesh#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_marrakesh#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_marrakesh#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_mocha.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_mocha.vim
new file mode 100644
index 0000000..1097c95
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_mocha.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Mocha Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_mocha#palette = {}
+let s:gui00 = "#3B3228"
+let s:gui01 = "#534636"
+let s:gui02 = "#645240"
+let s:gui03 = "#7e705a"
+let s:gui04 = "#b8afad"
+let s:gui05 = "#d0c8c6"
+let s:gui06 = "#e9e1dd"
+let s:gui07 = "#f5eeeb"
+let s:gui08 = "#cb6077"
+let s:gui09 = "#d28b71"
+let s:gui0A = "#f4bc87"
+let s:gui0B = "#beb55b"
+let s:gui0C = "#7bbda4"
+let s:gui0D = "#8ab3b5"
+let s:gui0E = "#a89bb9"
+let s:gui0F = "#bb9584"
+
+let s:cterm00 = 58
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 188
+let s:cterm07 = 230
+let s:cterm08 = 168
+let s:cterm09 = 173
+let s:cterm0A = 216
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 138
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_mocha#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_mocha#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_mocha#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_mocha#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_mocha#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_mocha#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_monokai.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_monokai.vim
new file mode 100644
index 0000000..fe1b774
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_monokai.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Monokai Scheme by Wimer Hazenberg (http://www.monokai.nl)
+let g:airline#themes#base16_monokai#palette = {}
+let s:gui00 = "#272822"
+let s:gui01 = "#383830"
+let s:gui02 = "#49483e"
+let s:gui03 = "#75715e"
+let s:gui04 = "#a59f85"
+let s:gui05 = "#f8f8f2"
+let s:gui06 = "#f5f4f1"
+let s:gui07 = "#f9f8f5"
+let s:gui08 = "#f92672"
+let s:gui09 = "#fd971f"
+let s:gui0A = "#f4bf75"
+let s:gui0B = "#a6e22e"
+let s:gui0C = "#a1efe4"
+let s:gui0D = "#66d9ef"
+let s:gui0E = "#ae81ff"
+let s:gui0F = "#cc6633"
+
+let s:cterm00 = 0
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 144
+let s:cterm05 = 15
+let s:cterm06 = 15
+let s:cterm07 = 15
+let s:cterm08 = 197
+let s:cterm09 = 208
+let s:cterm0A = 216
+let s:cterm0B = 3
+let s:cterm0C = 158
+let s:cterm0D = 81
+let s:cterm0E = 141
+let s:cterm0F = 167
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_monokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_monokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_monokai#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_monokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_monokai#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_monokai#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ocean.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ocean.vim
new file mode 100644
index 0000000..b1a76dd
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_ocean.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Ocean Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_ocean#palette = {}
+let s:gui00 = "#2b303b"
+let s:gui01 = "#343d46"
+let s:gui02 = "#4f5b66"
+let s:gui03 = "#65737e"
+let s:gui04 = "#a7adba"
+let s:gui05 = "#c0c5ce"
+let s:gui06 = "#dfe1e8"
+let s:gui07 = "#eff1f5"
+let s:gui08 = "#bf616a"
+let s:gui09 = "#d08770"
+let s:gui0A = "#ebcb8b"
+let s:gui0B = "#a3be8c"
+let s:gui0C = "#96b5b4"
+let s:gui0D = "#8fa1b3"
+let s:gui0E = "#b48ead"
+let s:gui0F = "#ab7967"
+
+let s:cterm00 = 23
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 60
+let s:cterm04 = 145
+let s:cterm05 = 152
+let s:cterm06 = 188
+let s:cterm07 = 15
+let s:cterm08 = 131
+let s:cterm09 = 173
+let s:cterm0A = 186
+let s:cterm0B = 144
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 137
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ocean#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ocean#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ocean#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_ocean#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_ocean#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_ocean#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_oceanicnext.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_oceanicnext.vim
new file mode 100644
index 0000000..c5e9edf
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_oceanicnext.vim
@@ -0,0 +1,83 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Oceanic Next Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_oceanicnext#palette = {}
+let s:gui00 = "#1b2b34"
+let s:gui01 = "#343d46"
+let s:gui02 = "#4f5b66"
+let s:gui03 = "#65737e"
+let s:gui04 = "#a7adba"
+let s:gui05 = "#c0c5ce"
+let s:gui06 = "#cdd3de"
+let s:gui07 = "#d8dee9"
+let s:gui08 = "#ec5f67"
+let s:gui09 = "#f99157"
+let s:gui0A = "#fac863"
+let s:gui0B = "#99c794"
+let s:gui0C = "#5fb3b3"
+let s:gui0D = "#6699cc"
+let s:gui0E = "#c594c5"
+let s:gui0F = "#ab7967"
+
+" Terminal color definitions
+let s:cterm00 = 00
+let s:cterm03 = 08
+let s:cterm05 = 07
+let s:cterm07 = 15
+let s:cterm08 = 01
+let s:cterm0A = 03
+let s:cterm0B = 02
+let s:cterm0C = 06
+let s:cterm0D = 04
+let s:cterm0E = 05
+if exists('base16colorspace') && base16colorspace == "256"
+  let s:cterm01 = 18
+  let s:cterm02 = 19
+  let s:cterm04 = 20
+  let s:cterm06 = 21
+  let s:cterm09 = 16
+  let s:cterm0F = 17
+else
+  let s:cterm01 = 10
+  let s:cterm02 = 11
+  let s:cterm04 = 12
+  let s:cterm06 = 13
+  let s:cterm09 = 09
+  let s:cterm0F = 14
+endif
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_oceanicnext#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_oceanicnext#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_oceanicnext#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_oceanicnext#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_oceanicnext#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_oceanicnext#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_paraiso.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_paraiso.vim
new file mode 100644
index 0000000..1277b31
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_paraiso.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Paraiso Scheme by Jan T. Sott
+let g:airline#themes#base16_paraiso#palette = {}
+let s:gui00 = "#2f1e2e"
+let s:gui01 = "#41323f"
+let s:gui02 = "#4f424c"
+let s:gui03 = "#776e71"
+let s:gui04 = "#8d8687"
+let s:gui05 = "#a39e9b"
+let s:gui06 = "#b9b6b0"
+let s:gui07 = "#e7e9db"
+let s:gui08 = "#ef6155"
+let s:gui09 = "#f99b15"
+let s:gui0A = "#fec418"
+let s:gui0B = "#48b685"
+let s:gui0C = "#5bc4bf"
+let s:gui0D = "#06b6ef"
+let s:gui0E = "#815ba4"
+let s:gui0F = "#e96ba8"
+
+let s:cterm00 = 0
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 95
+let s:cterm04 = 102
+let s:cterm05 = 144
+let s:cterm06 = 145
+let s:cterm07 = 188
+let s:cterm08 = 203
+let s:cterm09 = 208
+let s:cterm0A = 220
+let s:cterm0B = 72
+let s:cterm0C = 79
+let s:cterm0D = 39
+let s:cterm0E = 97
+let s:cterm0F = 169
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_paraiso#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_paraiso#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_paraiso#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_paraiso#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_paraiso#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_paraiso#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_pop.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_pop.vim
new file mode 100644
index 0000000..0888703
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_pop.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Pop Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_pop#palette = {}
+let s:gui00 = "#000000"
+let s:gui01 = "#202020"
+let s:gui02 = "#303030"
+let s:gui03 = "#505050"
+let s:gui04 = "#b0b0b0"
+let s:gui05 = "#d0d0d0"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#eb008a"
+let s:gui09 = "#f29333"
+let s:gui0A = "#f8ca12"
+let s:gui0B = "#37b349"
+let s:gui0C = "#00aabb"
+let s:gui0D = "#0e5a94"
+let s:gui0E = "#b31e8d"
+let s:gui0F = "#7a2d00"
+
+let s:cterm00 = 0
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 162
+let s:cterm09 = 209
+let s:cterm0A = 220
+let s:cterm0B = 71
+let s:cterm0C = 37
+let s:cterm0D = 24
+let s:cterm0E = 126
+let s:cterm0F = 88
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_pop#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_pop#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_pop#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_pop#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_pop#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_pop#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_railscasts.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_railscasts.vim
new file mode 100644
index 0000000..771a5b1
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_railscasts.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Railscasts Scheme by Ryan Bates (http://railscasts.com)
+let g:airline#themes#base16_railscasts#palette = {}
+let s:gui00 = "#2b2b2b"
+let s:gui01 = "#272935"
+let s:gui02 = "#3a4055"
+let s:gui03 = "#5a647e"
+let s:gui04 = "#d4cfc9"
+let s:gui05 = "#e6e1dc"
+let s:gui06 = "#f4f1ed"
+let s:gui07 = "#f9f7f3"
+let s:gui08 = "#da4939"
+let s:gui09 = "#cc7833"
+let s:gui0A = "#ffc66d"
+let s:gui0B = "#a5c261"
+let s:gui0C = "#519f50"
+let s:gui0D = "#6d9cbe"
+let s:gui0E = "#b6b3eb"
+let s:gui0F = "#bc9458"
+
+let s:cterm00 = 235
+let s:cterm01 = 17
+let s:cterm02 = 59
+let s:cterm03 = 60
+let s:cterm04 = 188
+let s:cterm05 = 188
+let s:cterm06 = 15
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 221
+let s:cterm0B = 143
+let s:cterm0C = 71
+let s:cterm0D = 73
+let s:cterm0E = 146
+let s:cterm0F = 137
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_railscasts#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_railscasts#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_railscasts#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_railscasts#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_railscasts#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_railscasts#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_seti.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_seti.vim
new file mode 100644
index 0000000..b152add
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_seti.vim
@@ -0,0 +1,76 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base16 Seti UI by 
+
+let g:airline#themes#base16_seti ui#palette = {}
+let s:gui00 = "#151718"
+let s:gui01 = "#8ec43d"
+let s:gui02 = "#3B758C"
+let s:gui03 = "#41535B"
+let s:gui04 = "#43a5d5"
+let s:gui05 = "#d6d6d6"
+let s:gui06 = "#eeeeee"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#Cd3f45"
+let s:gui09 = "#db7b55"
+let s:gui0A = "#e6cd69"
+let s:gui0B = "#9fca56"
+let s:gui0C = "#55dbbe"
+let s:gui0D = "#55b5db"
+let s:gui0E = "#a074c4"
+let s:gui0F = "#8a553f"
+
+
+let s:cterm00 = 0
+let s:cterm01 = 18
+let s:cterm02 = 19
+let s:cterm03 = 8
+let s:cterm04 = 20
+let s:cterm05 = 7
+let s:cterm06 = 21
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 16
+let s:cterm0A = 3
+let s:cterm0B = 2
+let s:cterm0C = 6
+let s:cterm0D = 4
+let s:cterm0E = 5
+let s:cterm0F = 17
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_seti ui#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_seti ui#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_seti ui#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_seti ui#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_seti ui#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_seti ui#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shapeshifter.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shapeshifter.vim
new file mode 100644
index 0000000..a518265
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shapeshifter.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 shapeshifter Scheme by Tyler Benziger (http://tybenz.com)
+let g:airline#themes#base16_shapeshifter#palette = {}
+let s:gui00 = "#000000"
+let s:gui01 = "#040404"
+let s:gui02 = "#102015"
+let s:gui03 = "#343434"
+let s:gui04 = "#555555"
+let s:gui05 = "#ababab"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#f9f9f9"
+let s:gui08 = "#e92f2f"
+let s:gui09 = "#e09448"
+let s:gui0A = "#dddd13"
+let s:gui0B = "#0ed839"
+let s:gui0C = "#23edda"
+let s:gui0D = "#3b48e3"
+let s:gui0E = "#f996e2"
+let s:gui0F = "#69542d"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 0
+let s:cterm03 = 236
+let s:cterm04 = 240
+let s:cterm05 = 248
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 173
+let s:cterm0A = 3
+let s:cterm0B = 41
+let s:cterm0C = 50
+let s:cterm0D = 12
+let s:cterm0E = 212
+let s:cterm0F = 58
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_shapeshifter#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_shapeshifter#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_shapeshifter#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_shapeshifter#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_shapeshifter#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_shapeshifter#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shell.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shell.vim
new file mode 100644
index 0000000..d04e4d5
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_shell.vim
@@ -0,0 +1,99 @@
+let s:improved_contrast = get(g:, 'airline_base16_improved_contrast', 0)
+let s:solarized         = get(g:, 'airline_base16_solarized', 0)
+
+" Base16 term color palette
+let s:base00_black   = 0
+let s:base08_red     = 1
+let s:base0B_green   = 2
+let s:base0A_yellow  = 3
+let s:base0D_blue    = 4
+let s:base0E_magenta = 5
+let s:base0C_cyan    = 6
+let s:base05_white   = 7
+let s:base03_brblack = 8
+let s:base09         = 16
+let s:base0F         = 17
+let s:base01         = 18
+let s:base02         = 19
+let s:base04         = 20
+let s:base06         = 21
+
+" Gui color palette
+let s:gui_dark_gray       = '#202020'
+let s:gui_med_gray_lo     = '#3a3a3a'
+let s:gui_med_gray_hi     = '#303030'
+let s:gui_light_gray      = '#505050'
+let s:gui_lightlight_gray = '#8A8A8A'
+let s:gui_green           = '#99cc99'
+let s:gui_blue            = '#6a9fb5'
+let s:gui_purple          = '#aa759f'
+let s:gui_orange          = '#d28445'
+let s:gui_red             = '#ac4142'
+let s:gui_pink            = '#d7afd7'
+
+let g:airline#themes#base16_shell#palette = {}
+
+" Normal mode
+let s:N1 = [s:gui_dark_gray, s:gui_green, s:base00_black, s:base0B_green]
+let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:base04, s:base02]
+let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:base0B_green, s:base01]
+
+if s:improved_contrast
+    let s:N2 = [s:gui_lightlight_gray, s:gui_med_gray_lo, s:base05_white, s:base02]
+endif
+
+if s:solarized
+    let s:N1 = [s:gui_dark_gray, s:gui_green, s:base01, s:base04]
+    let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:base00_black, s:base02]
+    let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:base04, s:base01]
+endif
+
+let g:airline#themes#base16_shell#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16_shell#palette.normal_modified = {
+            \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:base09, s:base01, ''],
+            \ }
+
+" Insert mode
+let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:base01, s:base0D_blue]
+let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:base0D_blue, s:base01]
+let g:airline#themes#base16_shell#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
+
+if s:solarized
+    let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:base01, s:base0A_yellow]
+    let g:airline#themes#base16_shell#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:N3)
+endif
+
+let g:airline#themes#base16_shell#palette.insert_modified = copy(g:airline#themes#base16_shell#palette.normal_modified)
+
+" Replace mode
+let s:R1 = [s:gui_dark_gray, s:gui_red, s:base01, s:base08_red]
+let s:R3 = [s:gui_red, s:gui_med_gray_hi, s:base08_red, s:base01]
+let g:airline#themes#base16_shell#palette.replace = airline#themes#generate_color_map(s:R1, s:N2, s:R3)
+
+if s:solarized
+    let s:R1 = [s:gui_dark_gray, s:gui_red, s:base01, s:base09]
+    let g:airline#themes#base16_shell#palette.replace = airline#themes#generate_color_map(s:R1, s:N2, s:N3)
+endif
+
+let g:airline#themes#base16_shell#palette.replace_modified = copy(g:airline#themes#base16_shell#palette.normal_modified)
+
+" Visual mode
+let s:V1 = [s:gui_dark_gray, s:gui_pink, s:base01, s:base0E_magenta]
+let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:base0E_magenta, s:base01]
+let g:airline#themes#base16_shell#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
+
+if s:solarized
+  let s:V1 = [s:gui_dark_gray, s:gui_pink, s:base01, s:base0F]
+  let g:airline#themes#base16_shell#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:N3)
+endif
+
+" Inactive window
+if s:improved_contrast
+    let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:base04, s:base01, '']
+else
+    let s:IA = [s:gui_dark_gray, s:gui_med_gray_hi, s:base03_brblack, s:base01, '']
+endif
+let g:airline#themes#base16_shell#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#base16_shell#palette.inactive_modified = {
+            \ 'airline_c': [s:gui_orange, '', s:base09, '', ''],
+            \ }
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_solarized.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_solarized.vim
new file mode 100644
index 0000000..81edd56
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_solarized.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Solarized Scheme by Ethan Schoonover (http://ethanschoonover.com/solarized)
+let g:airline#themes#base16_solarized#palette = {}
+let s:gui00 = "#002b36"
+let s:gui01 = "#073642"
+let s:gui02 = "#586e75"
+let s:gui03 = "#657b83"
+let s:gui04 = "#839496"
+let s:gui05 = "#93a1a1"
+let s:gui06 = "#eee8d5"
+let s:gui07 = "#fdf6e3"
+let s:gui08 = "#dc322f"
+let s:gui09 = "#cb4b16"
+let s:gui0A = "#b58900"
+let s:gui0B = "#859900"
+let s:gui0C = "#2aa198"
+let s:gui0D = "#268bd2"
+let s:gui0E = "#6c71c4"
+let s:gui0F = "#d33682"
+
+let s:cterm00 = 17
+let s:cterm01 = 23
+let s:cterm02 = 60
+let s:cterm03 = 66
+let s:cterm04 = 102
+let s:cterm05 = 109
+let s:cterm06 = 224
+let s:cterm07 = 230
+let s:cterm08 = 166
+let s:cterm09 = 166
+let s:cterm0A = 136
+let s:cterm0B = 100
+let s:cterm0C = 36
+let s:cterm0D = 32
+let s:cterm0E = 12
+let s:cterm0F = 168
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_solarized#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_solarized#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_solarized#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_solarized#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_solarized#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_solarized#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_spacemacs.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_spacemacs.vim
new file mode 100644
index 0000000..eb10669
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_spacemacs.vim
@@ -0,0 +1,142 @@
+" vim-airline base16-spacemacs theme by Peter Meehan (http://github.com/22a)
+" Base16 Spacemacs by Chris Kempson (http://chriskempson.com)
+" Spacemacs scheme by Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)
+
+let s:gui00 = "#1f2022"
+let s:gui01 = "#282828"
+let s:gui02 = "#444155"
+let s:gui03 = "#585858"
+let s:gui04 = "#b8b8b8"
+let s:gui05 = "#a3a3a3"
+let s:gui06 = "#e8e8e8"
+let s:gui07 = "#f8f8f8"
+let s:gui08 = "#f2241f"
+let s:gui09 = "#ffa500"
+let s:gui0A = "#b1951d"
+let s:gui0B = "#67b11d"
+let s:gui0C = "#2d9574"
+let s:gui0D = "#4f97d7"
+let s:gui0E = "#a31db1"
+let s:gui0F = "#b03060"
+
+let s:cterm00 = 0
+let s:cterm01 = 18
+let s:cterm02 = 19
+let s:cterm03 = 8
+let s:cterm04 = 20
+let s:cterm05 = 7
+let s:cterm06 = 21
+let s:cterm07 = 15
+let s:cterm08 = 1
+let s:cterm09 = 16
+let s:cterm0A = 3
+let s:cterm0B = 2
+let s:cterm0C = 6
+let s:cterm0D = 4
+let s:cterm0E = 5
+let s:cterm0F = 17
+
+let g:airline#themes#base16_spacemacs#palette = {}
+
+" Background for branch and file format blocks
+let s:cterm_termbg    = s:cterm02
+let s:gui_termbg      = s:gui02
+" Foreground for branch and file format blocks
+let s:cterm_termfg    = s:cterm06
+let s:gui_termfg      = s:gui06
+
+
+" Background for middle block
+let s:cterm_termbg2   = s:cterm00
+let s:gui_termbg2     = s:gui00
+" Foreground for middle block
+let s:cterm_termfg2   = s:cterm06
+let s:gui_termfg2     = s:gui06
+
+
+" Background for normal mode and file position blocks
+let s:cterm_normalbg  = s:cterm0D
+let s:gui_normalbg    = s:gui0D
+" Foreground for normal mode and file position blocks
+let s:cterm_normalfg  = s:cterm07
+let s:gui_normalfg    = s:gui07
+
+
+" Background for insert mode and file position blocks
+let s:cterm_insertbg  = s:cterm0B
+let s:gui_insertbg    = s:gui0B
+" Foreground for insert mode and file position blocks
+let s:cterm_insertfg  = s:cterm07
+let s:gui_insertfg    = s:gui07
+
+
+" Background for visual mode and file position blocks
+let s:cterm_visualbg  = s:cterm09
+let s:gui_visualbg    = s:gui09
+" Foreground for visual mode and file position blocks
+let s:cterm_visualfg  = s:cterm07
+let s:gui_visualfg    = s:gui07
+
+
+" Background for replace mode and file position blocks
+let s:cterm_replacebg = s:cterm08
+let s:gui_replacebg   = s:gui08
+" Foreground for replace mode and file position blocks
+let s:cterm_replacefg = s:cterm07
+let s:gui_replacefg   = s:gui07
+
+
+" Background for inactive mode
+let s:cterm_inactivebg = s:cterm02
+let s:gui_inactivebg   = s:gui02
+" Foreground for inactive mode
+let s:cterm_inactivefg = s:cterm04
+let s:gui_inactivefg   = s:gui04
+
+
+" Modified file alert color
+let s:cterm_alert     = s:cterm0E
+let s:gui_alert       = s:gui0E
+
+
+" Branch and file format
+let s:BB = [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg] " Branch and file format blocks
+
+" Normal mode
+let s:N1 = [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg] " Outside blocks in normal mode
+let s:N2 = [s:gui_termfg2, s:gui_termbg2, s:cterm_normalbg, s:cterm_termbg2]     " Middle block
+let g:airline#themes#base16_spacemacs#palette.normal = airline#themes#generate_color_map(s:N1, s:BB, s:N2)
+let g:airline#themes#base16_spacemacs#palette.normal_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Insert mode
+let s:I1 = [s:gui_insertfg, s:gui_insertbg, s:cterm_insertfg, s:cterm_insertbg] " Outside blocks in insert mode
+let s:I2 = [s:gui_insertbg, s:gui_termbg2, s:cterm_insertbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#base16_spacemacs#palette.insert = airline#themes#generate_color_map(s:I1, s:BB, s:I2)
+let g:airline#themes#base16_spacemacs#palette.insert_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Replace mode
+let s:R1 = [s:gui_replacefg, s:gui_replacebg, s:cterm_replacefg, s:cterm_replacebg]  " Outside blocks in replace mode
+let s:R2 = [s:gui_termfg, s:gui_termbg2, s:cterm_termfg, s:cterm_termbg2]            " Middle block
+let g:airline#themes#base16_spacemacs#palette.replace = airline#themes#generate_color_map(s:R1, s:BB, s:R2)
+let g:airline#themes#base16_spacemacs#palette.replace_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Visual mode
+let s:V1 = [s:gui_visualfg, s:gui_visualbg, s:cterm_visualfg, s:cterm_visualbg] " Outside blocks in visual mode
+let s:V2 = [s:gui_visualbg, s:gui_termbg2, s:cterm_visualbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#base16_spacemacs#palette.visual = airline#themes#generate_color_map(s:V1, s:BB, s:V2)
+let g:airline#themes#base16_spacemacs#palette.visual_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Inactive mode
+let s:IA1 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA2 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA3 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let g:airline#themes#base16_spacemacs#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" CtrlP plugin colors
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#base16_spacemacs#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg, ''],
+      \ [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg, ''],
+      \ [s:gui_termfg2, s:gui_termbg2, s:cterm_termfg2, s:cterm_termbg2, 'bold'])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_summerfruit.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_summerfruit.vim
new file mode 100644
index 0000000..4bafd59
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_summerfruit.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Summerfruit Scheme by Christopher Corley (http://cscorley.github.io/)
+let g:airline#themes#base16_summerfruit#palette = {}
+let s:gui00 = "#151515"
+let s:gui01 = "#202020"
+let s:gui02 = "#303030"
+let s:gui03 = "#505050"
+let s:gui04 = "#B0B0B0"
+let s:gui05 = "#D0D0D0"
+let s:gui06 = "#E0E0E0"
+let s:gui07 = "#FFFFFF"
+let s:gui08 = "#FF0086"
+let s:gui09 = "#FD8900"
+let s:gui0A = "#ABA800"
+let s:gui0B = "#00C918"
+let s:gui0C = "#1faaaa"
+let s:gui0D = "#3777E6"
+let s:gui0E = "#AD00A1"
+let s:gui0F = "#cc6633"
+
+let s:cterm00 = 233
+let s:cterm01 = 234
+let s:cterm02 = 236
+let s:cterm03 = 239
+let s:cterm04 = 249
+let s:cterm05 = 252
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 198
+let s:cterm09 = 208
+let s:cterm0A = 142
+let s:cterm0B = 2
+let s:cterm0C = 37
+let s:cterm0D = 68
+let s:cterm0E = 127
+let s:cterm0F = 167
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_summerfruit#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_summerfruit#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_summerfruit#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_summerfruit#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_summerfruit#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_summerfruit#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_tomorrow.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_tomorrow.vim
new file mode 100644
index 0000000..f8128bc
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_tomorrow.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Tomorrow Scheme by Chris Kempson (http://chriskempson.com)
+let g:airline#themes#base16_tomorrow#palette = {}
+let s:gui00 = "#1d1f21"
+let s:gui01 = "#282a2e"
+let s:gui02 = "#373b41"
+let s:gui03 = "#969896"
+let s:gui04 = "#b4b7b4"
+let s:gui05 = "#c5c8c6"
+let s:gui06 = "#e0e0e0"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#cc6666"
+let s:gui09 = "#de935f"
+let s:gui0A = "#f0c674"
+let s:gui0B = "#b5bd68"
+let s:gui0C = "#8abeb7"
+let s:gui0D = "#81a2be"
+let s:gui0E = "#b294bb"
+let s:gui0F = "#a3685a"
+
+let s:cterm00 = 0
+let s:cterm01 = 0
+let s:cterm02 = 59
+let s:cterm03 = 102
+let s:cterm04 = 145
+let s:cterm05 = 188
+let s:cterm06 = 253
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 173
+let s:cterm0A = 222
+let s:cterm0B = 143
+let s:cterm0C = 109
+let s:cterm0D = 109
+let s:cterm0E = 139
+let s:cterm0F = 131
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_tomorrow#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_twilight.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_twilight.vim
new file mode 100644
index 0000000..fa82418
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16_twilight.vim
@@ -0,0 +1,73 @@
+" vim-airline template by chartoin (http://github.com/chartoin)
+" Base 16 Twilight Scheme by David Hart (http://hart-dev.com)
+let g:airline#themes#base16_twilight#palette = {}
+let s:gui00 = "#1e1e1e"
+let s:gui01 = "#323537"
+let s:gui02 = "#464b50"
+let s:gui03 = "#5f5a60"
+let s:gui04 = "#838184"
+let s:gui05 = "#a7a7a7"
+let s:gui06 = "#c3c3c3"
+let s:gui07 = "#ffffff"
+let s:gui08 = "#cf6a4c"
+let s:gui09 = "#cda869"
+let s:gui0A = "#f9ee98"
+let s:gui0B = "#8f9d6a"
+let s:gui0C = "#afc4db"
+let s:gui0D = "#7587a6"
+let s:gui0E = "#9b859d"
+let s:gui0F = "#9b703f"
+
+let s:cterm00 = 234
+let s:cterm01 = 59
+let s:cterm02 = 59
+let s:cterm03 = 59
+let s:cterm04 = 102
+let s:cterm05 = 248
+let s:cterm06 = 251
+let s:cterm07 = 15
+let s:cterm08 = 167
+let s:cterm09 = 179
+let s:cterm0A = 228
+let s:cterm0B = 107
+let s:cterm0C = 152
+let s:cterm0D = 103
+let s:cterm0E = 103
+let s:cterm0F = 95
+
+let s:N1   = [ s:gui01, s:gui0B, s:cterm01, s:cterm0B ]
+let s:N2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:N3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_twilight#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let s:I1   = [ s:gui01, s:gui0D, s:cterm01, s:cterm0D ]
+let s:I2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:I3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_twilight#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+
+let s:R1   = [ s:gui01, s:gui08, s:cterm01, s:cterm08 ]
+let s:R2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:R3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_twilight#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+let s:V1   = [ s:gui01, s:gui0E, s:cterm01, s:cterm0E ]
+let s:V2   = [ s:gui06, s:gui02, s:cterm06, s:cterm02 ]
+let s:V3   = [ s:gui09, s:gui01, s:cterm09, s:cterm01 ]
+let g:airline#themes#base16_twilight#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+
+let s:IA1   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA2   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let s:IA3   = [ s:gui05, s:gui01, s:cterm05, s:cterm01 ]
+let g:airline#themes#base16_twilight#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" 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#base16_twilight#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui07, s:gui02, s:cterm07, s:cterm02, '' ],
+      \ [ s:gui07, s:gui04, s:cterm07, s:cterm04, '' ],
+      \ [ s:gui05, s:gui01, s:cterm05, s:cterm01, 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/base16color.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16color.vim
new file mode 100644
index 0000000..6c0a1d7
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/base16color.vim
@@ -0,0 +1,77 @@
+" Normal mode
+"          [ guifg, guibg, ctermfg, ctermbg, opts ]
+let s:N1 = [ '#141413' , '#CAE682' ,  232 , 'green' ] " mode
+let s:N2 = [ '#CAE682' , '#32322F' , 'green' , 235 ]  " info
+let s:N3 = [ '#CAE682' , '#242424' , 'green' , 234 ]  " statusline
+let s:N4 = [ '#86CD74' , 'DarkGreen' ]                " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 'yellow' ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 'yellow' , 235 ]
+let s:I3 = [ '#FDE76E' , '#242424' , 'yellow' , 234 ]
+let s:I4 = [ '#FADE3E' , 'yellow' ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 'blue' ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 'blue' , 235 ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 'blue' , 234 ]
+let s:V4 = [ '#7CB0E6' , 'blue' ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 'red' ]
+let s:R2 = [ '#E5786D' , '#32322F' , 'red' , 235 ]
+let s:R3 = [ '#E5786D' , '#242424' , 'red' , 234 ]
+let s:R4 = [ '#E55345' , 'red' ]
+
+" Paste mode
+let s:PA = [ '#94E42C' , 005 ]
+
+" Info modified
+let s:IM = [ '#40403C' , 236 ]
+
+" Inactive mode
+let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
+
+let g:airline#themes#base16color#palette = {}
+
+let g:airline#themes#base16color#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
+
+let g:airline#themes#base16color#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#base16color#palette.normal_modified = {
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#base16color#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#base16color#palette.insert_modified = {
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#base16color#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#base16color#palette.visual_modified = {
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#base16color#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#base16color#palette.replace_modified = {
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#base16color#palette.insert_paste = {
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#base16color#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#base16color#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/behelit.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/behelit.vim
new file mode 100644
index 0000000..77f551c
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/behelit.vim
@@ -0,0 +1,58 @@
+let g:airline#themes#behelit#palette = {}
+
+" Normal mode
+let s:N1 = [ '#121212', '#5f87ff', 233, 69  ]
+let s:N2 = [ '#5f87ff', '#262626', 69 , 235 ]
+let s:N3 = [ '#5f87ff', '#1c1c1c', 69 , 234, 'bold' ]
+let g:airline#themes#behelit#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#behelit#palette.normal_modified = {
+      \ 'airline_c': [ '#d7005f', '#1c1c1c', 161, 234, 'bold' ],
+      \ }
+
+" Insert mode
+let s:I1 = [ '#121212', '#00ff87', 233, 48  ]
+let s:I2 = s:N2
+let s:I3 = s:N3
+let g:airline#themes#behelit#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#behelit#palette.insert_modified = g:airline#themes#behelit#palette.normal_modified
+let g:airline#themes#behelit#palette.insert_paste = {
+      \ 'airline_a': [ "#121212", "#5f5faf", 233, 61, '' ],
+      \ }
+
+" Replace mode
+let g:airline#themes#behelit#palette.replace = copy(g:airline#themes#behelit#palette.insert)
+let g:airline#themes#behelit#palette.replace.airline_a = [ s:I1[0], '#d70057', s:I1[2], 161, '' ]
+let g:airline#themes#behelit#palette.replace_modified = g:airline#themes#behelit#palette.insert_modified
+
+" Visual mode
+let s:V1 = [ '#121212', '#5fff5f', 233, 83 ]
+let s:V2 = s:N2
+let s:V3 = s:N3
+let g:airline#themes#behelit#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#behelit#palette.visual_modified = g:airline#themes#behelit#palette.normal_modified
+
+" Inactive window
+let s:IA1 = [ '#4e4e4e', '#1c1c1c', 239, 234, '' ]
+let s:IA2 = [ '#4e4e4e', '#262626', 239, 235, '' ]
+let s:IA3 = [ '#4e4e4e', '#1c1c1c', 239, 234, 'bold' ]
+let g:airline#themes#behelit#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#behelit#palette.inactive_modified = {
+      \ 'airline_c': [ '#5f5f87', '#1c1c1c', 60, 234, 'bold' ],
+      \ }
+
+" Accents
+let g:airline#themes#behelit#palette.accents = {
+      \ 'red': [ '#d7005f', '', 161, '' ]
+      \ }
+
+" Warnings
+let s:WI = [ '#121212', '#d7005f', 233, 161 ]
+let g:airline#themes#behelit#palette.normal.airline_warning = s:WI
+let g:airline#themes#behelit#palette.normal_modified.airline_warning = s:WI
+let g:airline#themes#behelit#palette.insert.airline_warning = s:WI
+let g:airline#themes#behelit#palette.insert_modified.airline_warning = s:WI
+let g:airline#themes#behelit#palette.insert_paste.airline_warning = s:WI
+let g:airline#themes#behelit#palette.visual.airline_warning = s:WI
+let g:airline#themes#behelit#palette.visual_modified.airline_warning = s:WI
+let g:airline#themes#behelit#palette.replace.airline_warning = s:WI
+let g:airline#themes#behelit#palette.replace_modified.airline_warning = s:WI
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/bubblegum.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/bubblegum.vim
new file mode 100644
index 0000000..f2378ce
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/bubblegum.vim
@@ -0,0 +1,70 @@
+" Color palette
+let s:gui_dark_gray = '#303030'
+let s:cterm_dark_gray = 236
+let s:gui_med_gray_hi = '#444444'
+let s:cterm_med_gray_hi = 238
+let s:gui_med_gray_lo = '#3a3a3a'
+let s:cterm_med_gray_lo = 237
+let s:gui_light_gray = '#b2b2b2'
+let s:cterm_light_gray = 249
+let s:gui_green = '#afd787'
+let s:cterm_green = 150
+let s:gui_blue = '#87afd7'
+let s:cterm_blue = 110
+let s:gui_purple = '#afafd7'
+let s:cterm_purple = 146
+let s:gui_orange = '#d7af5f'
+let s:cterm_orange = 179
+let s:gui_red = '#d78787'
+let s:cterm_red = 174
+let s:gui_pink = '#d7afd7'
+let s:cterm_pink = 182
+
+let g:airline#themes#bubblegum#palette = {}
+
+" Normal mode
+let s:N1 = [s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green]
+let s:N2 = [s:gui_light_gray, s:gui_med_gray_lo, s:cterm_light_gray, s:cterm_med_gray_lo]
+let s:N3 = [s:gui_green, s:gui_med_gray_hi, s:cterm_green, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#bubblegum#palette.normal_modified = {
+      \ 'airline_c': [s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, ''],
+      \ }
+
+" Insert mode
+let s:I1 = [s:gui_med_gray_hi, s:gui_blue, s:cterm_med_gray_hi, s:cterm_blue]
+let s:I3 = [s:gui_blue, s:gui_med_gray_hi, s:cterm_blue, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:I3)
+let g:airline#themes#bubblegum#palette.insert_modified = copy(g:airline#themes#bubblegum#palette.normal_modified)
+let g:airline#themes#bubblegum#palette.insert_paste = {
+      \ 'airline_a': [s:gui_dark_gray, s:gui_orange, s:cterm_dark_gray, s:cterm_orange, ''],
+      \ }
+
+" Replace mode
+let g:airline#themes#bubblegum#palette.replace = {
+      \ 'airline_a': [s:gui_dark_gray, s:gui_red, s:cterm_dark_gray, s:cterm_red, ''],
+      \ 'airline_c': [s:gui_red, s:gui_med_gray_hi, s:cterm_red, s:cterm_med_gray_hi, ''],
+      \ }
+let g:airline#themes#bubblegum#palette.replace_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
+
+" Visual mode
+let s:V1 = [s:gui_dark_gray, s:gui_pink, s:cterm_dark_gray, s:cterm_pink]
+let s:V3 = [s:gui_pink, s:gui_med_gray_hi, s:cterm_pink, s:cterm_med_gray_hi]
+let g:airline#themes#bubblegum#palette.visual = airline#themes#generate_color_map(s:V1, s:N2, s:V3)
+let g:airline#themes#bubblegum#palette.visual_modified = copy(g:airline#themes#bubblegum#palette.insert_modified)
+
+" Inactive window
+let s:IA = [s:gui_light_gray, s:gui_med_gray_hi, s:cterm_light_gray, s:cterm_med_gray_hi, '']
+let g:airline#themes#bubblegum#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#bubblegum#palette.inactive_modified = {
+      \ 'airline_c': [s:gui_orange, '', s:cterm_orange, '', ''],
+      \ }
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#bubblegum#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ s:gui_orange, s:gui_med_gray_hi, s:cterm_orange, s:cterm_med_gray_hi, '' ] ,
+      \ [ s:gui_orange, s:gui_med_gray_lo, s:cterm_orange, s:cterm_med_gray_lo, '' ] ,
+      \ [ s:gui_dark_gray, s:gui_green, s:cterm_dark_gray, s:cterm_green, 'bold' ] )
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/cobalt2.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/cobalt2.vim
new file mode 100644
index 0000000..b156924
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/cobalt2.vim
@@ -0,0 +1,100 @@
+
+
+" vim-airline cobalt2 replication
+" (https://github.com/g-kanoufi/vim-airline-cobalt2)
+
+let g:airline#themes#cobalt2#palette = {}
+
+let g:airline#themes#cobalt2#palette.accents = {
+      \ 'red': [ '#b42839' , '' , 231 , '' , '' ],
+      \ }
+
+
+let s:N1 = [ '#ffffff' , '#1f7ad8' , 231  , 36 ]
+let s:N2 = [ '#ffffff' , '#8cc2fd' , 231 , 29 ]
+let s:N3 = [ '#ffffff' , '#204458' , 231  , 23 ]
+let g:airline#themes#cobalt2#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#cobalt2#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#1f7ad8' , 231     , 52      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#666d51' , '#fee533' , 231 , 106 ]
+let s:I2 = [ '#ffffff' , '#8cc2fd' , 231 , 29  ]
+let s:I3 = [ '#ffffff' , '#204458' , 231 , 23  ]
+let g:airline#themes#cobalt2#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#cobalt2#palette.insert_modified = {
+      \ 'airline_c': [ '#666d51' , '#fee533' , 255     , 52      , ''     ] ,
+      \ }
+let g:airline#themes#cobalt2#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#fee533' , s:I1[2] , 106     , ''     ] ,
+      \ }
+
+
+let s:R1 = [ '#ffffff' , '#ea9299' , 231 , 106 ]
+let s:R2 = [ '#ffffff' , '#8cc2fd' , 88 , 29 ]
+let s:R3 = [ '#ffffff' , '#204458' , 231  , 23  ]
+let g:airline#themes#cobalt2#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#cobalt2#palette.replace_modified = {
+      \ 'airline_c': [ '#ffffff' , '#ea9299' , 231     , 52      , ''     ] ,
+      \ }
+
+let s:V1 = [ '#ffff9a' , '#ff9d00' , 222 , 208 ]
+let s:V2 = [ '#ffffff' , '#8cc2fd' , 231 , 29 ]
+let s:V3 = [ '#ffffff' , '#204458' , 231  , 23  ]
+let g:airline#themes#cobalt2#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#cobalt2#palette.visual_modified = {
+      \ 'airline_c': [ '#ffff9a' , '#ff9d00' , 231     , 52      , ''     ] ,
+      \ }
+
+let s:IA = [ '#4e4e4e' , '#204458' , 59 , 23 , '' ]
+let g:airline#themes#cobalt2#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#cobalt2#palette.inactive_modified = {
+      \ 'airline_c': [ '#b42839' , ''        , 166      , ''      , ''     ] ,
+      \ }
+
+let g:airline#themes#cobalt2#palette.tabline = {
+      \ 'airline_tab':  ['#1780e9', '#1a3548',  231, 29, ''],
+      \ 'airline_tabsel':  ['#ffffff', '#46dd3c',  231, 36, ''],
+      \ 'airline_tabtype':  ['#ffffff', '#1f7ad8',  231, 36, ''],
+      \ 'airline_tabfill':  ['#ffffff', '#204458',  231, 23, ''],
+      \ 'airline_tabmod':  ['#666d51', '#fee533',  231, 88, ''],
+      \ }
+
+let s:WI = [ '#204458', '#ffffff', 231, 88 ]
+let g:airline#themes#cobalt2#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#cobalt2#palette.normal_modified.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.insert.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.insert_modified.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.visual.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.visual_modified.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.replace.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+let g:airline#themes#cobalt2#palette.replace_modified.airline_warning =
+    \ g:airline#themes#cobalt2#palette.normal.airline_warning
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#cobalt2#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#ffffff' , '#204458' , 231 , 23 , ''     ] ,
+      \ [ '#ffffff' , '#1f7ad8' , 231 , 36 , ''     ] ,
+      \ [ '#666d51' , '#fee533' , 231 , 95 , ''     ] )
+
+
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/cool.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/cool.vim
new file mode 100644
index 0000000..83abdb1
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/cool.vim
@@ -0,0 +1,65 @@
+let g:airline#themes#cool#palette = {}
+
+" NORMAL
+let s:N1   = [ '#585858' , '#E4E4E4' , 59  , 188 ]
+let s:N2   = [ '#E4E4E4' , '#0087AF' , 188 , 31 ]
+let s:N3   = [ '#EEEEEE' , '#005F87' , 231  , 24]
+let g:airline#themes#cool#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+"let g:airline#themes#cool#palette.normal_modified = {
+      "\ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      "\ }
+
+" INSERT
+let s:I1 = [ '#585858' , '#E4E4E4' , 59  , 188  ]
+let s:I2 = [ '#E4E4E4' , '#47AF00' , 188 , 70  ]
+let s:I3 = [ '#EEEEEE' , '#2E8700' , 231  , 28 ]
+let g:airline#themes#cool#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+"let g:airline#themes#cool#palette.insert_modified = {
+      "\ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      "\ }
+"let g:airline#themes#cool#palette.insert_paste = {
+      "\ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      "\ }
+
+" REPLACE
+let s:R1 = [ '#585858' , '#E4E4E4' , 59  , 188  ]
+let s:R2 = [ '#E4E4E4' , '#AF5F00' , 188 , 130  ]
+let s:R3 = [ '#EEEEEE' , '#875300' , 231  , 94  ]
+let g:airline#themes#cool#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+"let g:airline#themes#cool#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+"let g:airline#themes#cool#palette.replace_modified = g:airline#themes#cool#palette.insert_modified
+
+" VISUAL
+let s:V1 = [ '#585858' , '#E4E4E4' , 59 , 188 ]
+let s:V2 = [ '#E4E4E4' , '#AF2800' , 188 , 124 ]
+let s:V3 = [ '#EEEEEE' , '#872800' , 231  , 88  ]
+let g:airline#themes#cool#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+"let g:airline#themes#cool#palette.visual_modified = {
+      "\ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      "\ }
+
+" INACTIVE
+let s:IA1 = [ '#585858' , '#E4E4E4' , 59 , 188 , '' ]
+let s:IA2 = [ '#E4E4E4' , '#466D79' , 188 , 60 , '' ]
+let s:IA3 = [ '#EEEEEE' , '#324E59' , 231 , 59 , '' ]
+let g:airline#themes#cool#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+"let g:airline#themes#cool#palette.inactive_modified = {
+      "\ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      "\ }
+
+
+let g:airline#themes#cool#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 196 , ''  ]
+      \ }
+
+" CTRLP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#cool#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#E4E4E4' , '#00AFA2' , 188 , 37  , ''     ],
+      \ [ '#EEEEEE' , '#008787' , 231  , 30 , ''     ],
+      \ [ '#585858' , '#E4E4E4' , 59 , 188  , ''     ])
+
+
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/distinguished.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/distinguished.vim
new file mode 100644
index 0000000..0d65f4c
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/distinguished.vim
@@ -0,0 +1,59 @@
+" vim-airline companion theme of distinguished
+" (https://github.com/Lokaltog/vim-distinguished)
+" I have nothing to do with the original
+" distinguished theme other than being a big fan.
+" this theme was shamelessly created by modifying
+" the Ubaryd airline theme.
+
+let s:gray    = [245, '#8a8a8a']
+let s:golden  = [143, '#afaf5f']
+let s:pink    = [131, '#af5f5f']
+let s:blue    = [ 67, '#5f87af']
+let s:orange  = [166, '#d75f00']
+let s:outerfg = [ 16, '#000000']
+let s:innerbg = [234, '#1c1c1c']
+let s:middle  = ['#bcbcbc', '#444444', 250, 238]
+
+" Normal mode
+let s:N1 = [s:outerfg[1], s:gray[1], s:outerfg[0], s:gray[0]]
+let s:N3 = [s:gray[1], s:innerbg[1], s:gray[0], s:innerbg[0]]
+
+" Insert mode
+let s:I1 = [s:outerfg[1], s:golden[1], s:outerfg[0], s:golden[0]]
+let s:I3 = [s:golden[1], s:innerbg[1], s:golden[0], s:innerbg[0]]
+
+" Visual mode
+let s:V1 = [s:outerfg[1], s:pink[1], s:outerfg[0], s:pink[0]]
+let s:V3 = [s:pink[1], s:innerbg[1], s:pink[0], s:innerbg[0]]
+
+" Replace mode
+let s:R1 = [s:outerfg[1], s:blue[1], s:outerfg[0], s:blue[0]]
+let s:R3 = [s:blue[1], s:innerbg[1], s:blue[0], s:innerbg[0]]
+
+" Inactive pane
+let s:IA = [s:middle[1], s:innerbg[1], s:middle[3], s:innerbg[0]]
+
+let g:airline#themes#distinguished#palette = {}
+let g:airline#themes#distinguished#palette.accents = {
+    \ 'red': ['#d70000', '', 160, '', '']}
+
+let g:airline#themes#distinguished#palette.inactive = {
+    \ 'airline_a': s:IA,
+    \ 'airline_b': s:IA,
+    \ 'airline_c': s:IA}
+
+let g:airline#themes#distinguished#palette.normal = airline#themes#generate_color_map(s:N1, s:middle, s:N3)
+let g:airline#themes#distinguished#palette.normal_modified = {
+    \ 'airline_a': ['', s:orange[1], '', s:orange[0], ''],
+    \ 'airline_c': [s:orange[1], '', s:orange[0], '', ''],
+    \ 'airline_x': [s:orange[1], '', s:orange[0], '', ''],
+    \ 'airline_z': ['', s:orange[1], '', s:orange[0], '']}
+
+let g:airline#themes#distinguished#palette.insert = airline#themes#generate_color_map(s:I1, s:middle, s:I3)
+let g:airline#themes#distinguished#palette.insert_modified = {}
+
+let g:airline#themes#distinguished#palette.replace = airline#themes#generate_color_map(s:R1, s:middle, s:R3)
+let g:airline#themes#distinguished#palette.replace_modified = {}
+
+let g:airline#themes#distinguished#palette.visual = airline#themes#generate_color_map(s:V1, s:middle, s:V3)
+let g:airline#themes#distinguished#palette.visual_modified = {}
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/durant.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/durant.vim
new file mode 100644
index 0000000..cb844d4
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/durant.vim
@@ -0,0 +1,62 @@
+let g:airline#themes#durant#palette = {}
+
+
+let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ]
+let s:N2 = [ '#93a1a1' , '#586e75' , 245 , 240 ]
+let s:N3 = [ '#93a1a1' , '#073642' , 240 , 233 ]
+let g:airline#themes#durant#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+
+let g:airline#themes#durant#normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+
+
+
+let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#9e9e9e' , '#303030' , 247 , 236 ]
+let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ]
+let g:airline#themes#durant#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#durant#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#5f005f' , 255     , 53      , ''     ] ,
+      \ }
+let g:airline#themes#durant#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.replace = copy(g:airline#themes#durant#palette.insert)
+let g:airline#themes#durant#palette.replace.airline_a = [ s:I2[0]   , '#af0000' , s:I2[2] , 124     , ''     ]
+
+let g:airline#themes#durant#palette.replace_modified = g:airline#themes#durant#palette.insert_modified
+
+let s:V1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ]
+let s:V2 = [ '#ffffff' , '#44403a' , 255, 238 ]
+let s:V3 = [ '#90a680' , '#2e2d2a' , 64, 235 ]
+let g:airline#themes#durant#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#durant#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#durant#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#durant#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#durant#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+  let g:airline#themes#durant#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/vim-airline-themes/autoload/airline/themes/hybrid.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/hybrid.vim
new file mode 100644
index 0000000..b9bd20b
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/hybrid.vim
@@ -0,0 +1,52 @@
+" vim-airline companion theme of Hybrid
+" (https://github.com/w0ng/vim-hybrid)
+
+let g:airline#themes#hybrid#palette = {}
+
+function! airline#themes#hybrid#refresh()
+    let s:N1 = airline#themes#get_highlight('DiffAdd')
+    let s:N2 = airline#themes#get_highlight('CursorLine')
+    let s:N3 = airline#themes#get_highlight('PMenu')
+    let g:airline#themes#hybrid#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+    let g:airline#themes#hybrid#palette.normal_modified = {}
+
+    let warning_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.normal.airline_warning = warning_group
+    let g:airline#themes#hybrid#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffText', 'bg'], 'bold')
+    let s:I2 = s:N2
+    let s:I3 = s:N3
+    let g:airline#themes#hybrid#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#hybrid#palette.insert_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.insert.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.insert_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#hybrid#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let replace_group = airline#themes#get_highlight('SpellRare')
+    let g:airline#themes#hybrid#palette.replace_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.replace.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.replace_modified.airline_warning = g:airline#themes#hybrid#palette.replace_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight2(['Text', 'fg'], ['DiffDelete', 'bg'], 'bold')
+    let s:V2 = s:N2
+    let s:V3 = s:N3
+    let g:airline#themes#hybrid#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#hybrid#palette.visual_modified = g:airline#themes#hybrid#palette.normal_modified
+    let g:airline#themes#hybrid#palette.visual.airline_warning = g:airline#themes#hybrid#palette.normal.airline_warning
+    let g:airline#themes#hybrid#palette.visual_modified.airline_warning = g:airline#themes#hybrid#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#hybrid#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#hybrid#palette.inactive_modified = g:airline#themes#hybrid#palette.normal_modified
+
+    let g:airline#themes#hybrid#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+endfunction
+
+call airline#themes#hybrid#refresh()
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/hybridline.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/hybridline.vim
new file mode 100644
index 0000000..84729c1
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/hybridline.vim
@@ -0,0 +1,34 @@
+" vim-airline theme based on vim-hybrid and powerline
+" (https://github.com/w0ng/vim-hybrid)
+" (https://github.com/Lokaltog/powerline)
+
+let g:airline#themes#hybridline#palette = {}
+
+let s:N1 = [ '#282a2e' , '#c5c8c6' , 'black' , 15      ]
+let s:N2 = [ '#c5c8c6' , '#373b41' , 15      , 8       ]
+let s:N3 = [ '#ffffff' , '#282a2e' , 255     , 'black' ]
+let g:airline#themes#hybridline#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#hybridline#palette.normal.airline_a = ['#005f00', '#b5bd68', 22, 10, '']
+
+let s:I1 = [ '#005f5f' , '#8abeb7' , 23  , 14 ]
+let s:I2 = [ '#c5c8c6' , '#0087af' , 15  , 31 ]
+let s:I3 = [ '#ffffff' , '#005f87' , 255 , 24 ]
+let g:airline#themes#hybridline#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#hybridline#palette.insert_paste = {
+            \ 'airline_a': ['#000000', '#ac4142', 16 , 1, ''] ,
+            \ }
+
+let g:airline#themes#hybridline#palette.replace = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#hybridline#palette.replace.airline_a = ['#000000', '#CC6666', 16, 9]
+
+let g:airline#themes#hybridline#palette.visual = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#hybridline#palette.visual.airline_a = ['#000000', '#de935f', 16, 3]
+
+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#hybridline#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+let g:airline#themes#hybridline#palette.accents = {
+      \ 'red': [ '#ff0000' , '' , 160 , ''  ]
+      \ }
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/jellybeans.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/jellybeans.vim
new file mode 100644
index 0000000..3b72a1f
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/jellybeans.vim
@@ -0,0 +1,88 @@
+" Color palette
+let s:gui00 = "#151515"
+let s:gui01 = "#262626"
+let s:gui02 = "#4f5b66"
+let s:gui03 = "#65737e"
+let s:gui04 = "#a7adba"
+let s:gui05 = "#c0c5ce"
+let s:gui06 = "#cdd3de"
+let s:gui07 = "#d8dee9"
+let s:gui08 = "#870000"
+let s:gui09 = "#f99157"
+let s:gui0A = "#fac863"
+let s:gui0B = "#437019"
+let s:gui0C = "#5fb3b3"
+let s:gui0D = "#0d61ac"
+let s:gui0E = "#c594c5"
+let s:gui0F = "#ab7967"
+
+let s:cterm00 = "233"
+let s:cterm01 = "235"
+let s:cterm02 = "59"
+let s:cterm03 = "66"
+let s:cterm04 = "145"
+let s:cterm05 = "152"
+let s:cterm06 = "188"
+let s:cterm07 = "189"
+let s:cterm08 = "88"
+let s:cterm09 = "209"
+let s:cterm0A = "221"
+let s:cterm0B = "22"
+let s:cterm0C = "73"
+let s:cterm0D = "25"
+let s:cterm0E = "176"
+let s:cterm0F = "137"
+
+let s:guiWhite = "#ffffff"
+let s:guiGray = "#666666"
+let s:ctermWhite = "231"
+let s:ctermGray = "243"
+
+let g:airline#themes#jellybeans#palette = {}
+let s:modified = { 'airline_c': [ '#ffb964', '', 215, '', '' ] }
+
+" Normal mode
+let s:N1 = [ s:gui07 , s:gui0D , s:cterm07 , s:cterm0D  ]
+let s:N2 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm01  ]
+let s:N3 = [ s:gui02 , s:gui00 , s:cterm02 , s:cterm00  ]
+let g:airline#themes#jellybeans#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#jellybeans#palette.normal_modified = s:modified
+
+" Insert mode
+let s:I1 = [ s:guiWhite , s:gui0B , s:ctermWhite , s:cterm0B  ]
+let s:I2 = s:N2
+let s:I3 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm00  ]
+let g:airline#themes#jellybeans#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#jellybeans#palette.insert_modified = s:modified
+
+" Visual mode
+let s:V1 = [ s:guiWhite , s:gui08 , s:ctermWhite , s:cterm08 ]
+let s:V2 = s:N2
+let s:V3 = s:I3
+let g:airline#themes#jellybeans#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#jellybeans#palette.visual_modified = s:modified
+
+" Replace mode
+let s:R1 = [ s:gui08 , s:gui01 , s:cterm08, s:cterm00 ]
+let s:R2 = s:N2
+let s:R3 = s:I3
+let g:airline#themes#jellybeans#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#jellybeans#palette.replace_modified = s:modified
+
+" Inactive mode
+let s:IN1 = [ s:guiGray , s:gui01 , s:ctermGray , s:cterm01 ]
+let s:IN2 = [ s:gui02 , s:gui00 , s:cterm02 , s:cterm00 ]
+let s:IN3 = [ s:gui02 , s:gui00 , s:cterm02 , s:cterm00 ]
+let g:airline#themes#jellybeans#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3)
+let g:airline#themes#jellybeans#palette.inactive_modified = s:modified
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:CP1 = [ s:guiWhite , s:gui01 , s:ctermWhite , s:cterm01  ]
+let s:CP2 = [ s:guiWhite , s:gui03 , s:ctermWhite , s:cterm01  ]
+let s:CP3 = [ s:guiWhite , s:gui0D , s:ctermWhite , s:cterm0D  ]
+
+let g:airline#themes#jellybeans#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3)
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/kalisi.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/kalisi.vim
new file mode 100644
index 0000000..78504fa
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/kalisi.vim
@@ -0,0 +1,70 @@
+"
+" Colorscheme: Kalisi for airline. Inspired by powerline.
+" Arthur Jaron
+" hifreeo@gmail.com
+" 24.10.2014 
+ 
+" Visual mode                                   
+let s:V1 = [ '#0087ff' , '#ffffff','33','231']
+let s:V2 = [ '#005faf' , '#5fafff','25','75']
+let s:V3 = [ '#87d7ff' , '#005faf','117','25']
+
+" Replace mode
+let s:R1 = [ '#d75fff' , '#ffffff','171','231']
+let s:R2 = [ '#5f005f' , '#d75fff','53','171']
+let s:R3 = [ '#ff87ff' , '#8700af','213','91']
+
+let g:airline#themes#kalisi#palette = {}
+
+
+function! airline#themes#kalisi#refresh()
+
+  let s:StatusLine = airline#themes#get_highlight('StatusLine')
+  let s:StatusLineNC = airline#themes#get_highlight('StatusLineNC')
+
+  " Insert mode                                    
+  let s:I1 = [ '#ffffff' , '#e80000','231','160']
+  let s:I2 = [ '#ff0000' , '#5f0000','196','52']
+  let s:I3 = s:StatusLine
+
+  " Normal mode
+  let s:N1 = [ '#005f00' , '#afd700','22','148'] 
+  let s:N2 = [ '#afd700' , '#005f00','148','22'] 
+  let s:N3 = s:StatusLine
+
+  " Tabline Plugin
+  let g:airline#themes#kalisi#palette.tabline = {
+        \ 'airline_tab':    ['#bcbcbc', '#005f00','250','22'],
+        \ 'airline_tabsel': ['#404042', '#A6DB29','238','148'],
+        \ 'airline_tabtype':['#afd700', '#204d20','148','22'],
+        \ 'airline_tabfill': s:StatusLine,
+        \ 'airline_tabhid': ['#c5c5c5', '#404042','251','238'],
+        \ 'airline_tabmod': ['#d7ff00', '#afd700','190','148'],
+        \ 'airline_tabmod_unsel':  ['#d7ff00', '#005f00','190','22']
+        \ }
+
+  let g:airline#themes#kalisi#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let g:airline#themes#kalisi#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#kalisi#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#kalisi#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+
+  " Inactive Mode
+  let s:IA = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#kalisi#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#kalisi#palette.inactive_modified = {
+        \ 'airline_c':  ['#d7ff00', s:IA[1],'190',s:IA[3]],
+        \ }
+
+endfunction
+
+call airline#themes#kalisi#refresh()
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#kalisi#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ s:StatusLine,
+      \ ['#afd700', '#005f00','148','22'],
+      \ [ '#005f00' , '#afd700' , '22','148']
+      \)
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/kolor.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/kolor.vim
new file mode 100644
index 0000000..e61f56f
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/kolor.vim
@@ -0,0 +1,59 @@
+let g:airline#themes#kolor#palette = {}
+
+let s:N1 = [ '#e2e2e2' , '#4f3598' , 254 , 56  ]
+let s:N2 = [ '#ff5fd7' , '#242322' , 206 , 234 ]
+let s:N3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+
+let g:airline#themes#kolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#kolor#palette.normal_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#4f3598' , 254     , 56      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#242322' , '#7eaefd' , 234 , 111 ]
+let s:I2 = [ '#75d7d8' , '#242322' , 80  , 234 ]
+let s:I3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#kolor#palette.insert_modified = {
+      \ 'airline_c': [ '#242322' , '#7eaefd' , 234     , 111     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.replace = copy(g:airline#themes#kolor#palette.insert)
+let g:airline#themes#kolor#palette.replace.airline_a = [ s:I2[0]   , '#005154' , s:I2[2] , 23      , ''     ]
+let g:airline#themes#kolor#palette.replace_modified = {
+      \ 'airline_c': [ '#e2e2e2' , '#005154' , 254 , 23  , '' ] ,
+      \ }
+
+
+let s:V1 = [ '#242322' , '#e6987a' , 234 , 180 ]
+let s:V2 = [ '#dbc570' , '#242322' , 186 , 234 ]
+let s:V3 = [ '#e2e2e2' , '#4a4a4a' , 254 , 238 ]
+let g:airline#themes#kolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#kolor#palette.visual_modified = {
+      \ 'airline_c': [ '#242322' , '#e6987a' , 234     , 180      , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let s:IA2 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 ]
+let s:IA3 = [ '#b2b2b2' , '#4a4a4a' , 247 , 238 , '' ]
+let g:airline#themes#kolor#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#kolor#palette.inactive_modified = {
+      \ 'airline_c': [ '#875faf' , '' , 97 , '' , '' ] ,
+      \ }
+
+
+let g:airline#themes#kolor#palette.accents = {
+      \ 'red': [ '#d96e8a' , '' , 168 , ''  ]
+      \ }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#kolor#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#e2e2e2' , '#4a4a4a' , 254 , 238 , ''     ],
+      \ [ '#e2e2e2' , '#242322' , 254 , 234 , ''     ],
+      \ [ '#e2e2e2' , '#4f3598' , 254 , 56  , 'bold' ])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/laederon.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/laederon.vim
new file mode 100644
index 0000000..115c107
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/laederon.vim
@@ -0,0 +1,62 @@
+" vim-airline companion theme of Laederon
+" (https://github.com/Donearm/Laederon)
+
+" Normal mode
+let s:N1 = [ '#1a1a18' , '#ffffff' , 232 , 255 ] " blackestgravel & snow
+let s:N2 = [ '#ffffff' , '#44403a' , 255, 238 ] " snow & deepgravel
+let s:N3 = [ '#90a680' , '#2e2d2a' , 64, 235 ] " dilutedpaint & darkgravel
+let s:N4 = [ '#777470' , 240 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#1693a5' , 232 , 62 ] " blackestgravel & crystallake
+let s:I2 = [ '#515744' , '#44403a' , 101 , 238 ] " lichen & deepgravel
+let s:I3 = [ '#1693a5' , '#2e2d2a' , 39 , 235 ] " crystallake & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1a1a18' , '#ab3e5d' , 232 , 161 ] " blackestgravel & raspberry
+let s:V2 = [ '#000000' , '#908571' , 16 , 252 ] " coal & winterterrain
+let s:V3 = [ '#ab3e5d' , '#8c7f77' , 161 , 245 ] " raspberry & wetcoldterrain
+let s:V4 = [ '#515744' , 101 ] " lichen
+
+" Replace mode
+let s:RE = [ '#233e09' , 22 ] " oakleaf
+
+" Paste mode
+let s:PA = [ '#ab3e5d' , 161 ] " raspberry
+
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3], s:N3[3] , '' ]
+
+
+let g:airline#themes#laederon#palette = {}
+
+let g:airline#themes#laederon#palette.accents = {
+      \ 'red': [ '#ef393d' , '' , 196 , '' , '' ]
+      \ }
+
+let g:airline#themes#laederon#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#laederon#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#laederon#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#laederon#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#laederon#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#laederon#palette.replace = copy(airline#themes#laederon#palette.insert)
+let g:airline#themes#laederon#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#laederon#palette.replace_modified = g:airline#themes#laederon#palette.insert_modified
+
+
+let g:airline#themes#laederon#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#laederon#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+
+let g:airline#themes#laederon#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#laederon#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/light.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/light.vim
new file mode 100644
index 0000000..d9fe844
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/light.vim
@@ -0,0 +1,45 @@
+let g:airline#themes#light#palette = {}
+
+let s:N1 = [ '#ffffff' , '#005fff' , 255 , 27  ]
+let s:N2 = [ '#000087' , '#00dfff' , 18  , 45  ]
+let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
+let g:airline#themes#light#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#light#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#ffffff' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#005f00' , '#00df87' , 22  , 42  ]
+let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
+let g:airline#themes#light#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#light#palette.insert_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+let g:airline#themes#light#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#light#palette.replace = copy(g:airline#themes#light#palette.insert)
+let g:airline#themes#light#palette.replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
+let g:airline#themes#light#palette.replace_modified = g:airline#themes#light#palette.insert_modified
+
+
+let s:V1 = [ '#ffffff' , '#ff5f00' , 255 , 202 ]
+let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
+let s:V3 = [ '#df5f00' , '#ffff87' , 166 , 228 ]
+let g:airline#themes#light#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#light#palette.visual_modified = {
+      \ 'airline_c': [ '#df0000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#666666' , '#b2b2b2' , 242 , 249 , '' ]
+let s:IA2 = [ '#8a8a8a' , '#d0d0d0' , 245 , 252 , '' ]
+let s:IA3 = [ '#a8a8a8' , '#ffffff' , 248 , 255 , '' ]
+let g:airline#themes#light#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#light#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000' , ''        , 160     , ''      , ''     ] ,
+      \ }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/lucius.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/lucius.vim
new file mode 100644
index 0000000..c6db8b6
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/lucius.vim
@@ -0,0 +1,62 @@
+let g:airline#themes#lucius#palette = {}
+
+function! airline#themes#lucius#refresh()
+
+    let s:N1 = airline#themes#get_highlight('StatusLine')
+    let s:N2 = airline#themes#get_highlight('Folded')
+    let s:N3 = airline#themes#get_highlight('CursorLine')
+    let g:airline#themes#lucius#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+    let modified_group = airline#themes#get_highlight('Statement')
+    let g:airline#themes#lucius#palette.normal_modified = {
+                \ 'airline_c': [modified_group[0], '', modified_group[2], '', '']
+                \ }
+
+    let warning_group = airline#themes#get_highlight('DiffDelete')
+    let g:airline#themes#lucius#palette.normal.airline_warning = warning_group
+    let g:airline#themes#lucius#palette.normal_modified.airline_warning = warning_group
+
+    let s:I1 = airline#themes#get_highlight('DiffAdd')
+    let s:I2 = s:N2
+    let s:I3 = s:N3
+    let g:airline#themes#lucius#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+    let g:airline#themes#lucius#palette.insert_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.insert.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.insert_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:R1 = airline#themes#get_highlight('DiffChange')
+    let s:R2 = s:N2
+    let s:R3 = s:N3
+    let g:airline#themes#lucius#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+    let g:airline#themes#lucius#palette.replace_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.replace.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.replace_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:V1 = airline#themes#get_highlight('Cursor')
+    let s:V2 = s:N2
+    let s:V3 = s:N3
+    let g:airline#themes#lucius#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+    let g:airline#themes#lucius#palette.visual_modified = g:airline#themes#lucius#palette.normal_modified
+    let g:airline#themes#lucius#palette.visual.airline_warning = g:airline#themes#lucius#palette.normal.airline_warning
+    let g:airline#themes#lucius#palette.visual_modified.airline_warning = g:airline#themes#lucius#palette.normal_modified.airline_warning
+
+    let s:IA = airline#themes#get_highlight('StatusLineNC')
+    let g:airline#themes#lucius#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+    let g:airline#themes#lucius#palette.inactive_modified = {
+                \ 'airline_c': [ modified_group[0], '', modified_group[2], '', '' ]
+                \ }
+
+    let g:airline#themes#lucius#palette.accents = {
+                \ 'red': airline#themes#get_highlight('Constant'),
+                \ }
+
+    " Extra tabline colors
+    let s:TS = airline#themes#get_highlight('TabLineSel')
+    let g:airline#themes#lucius#palette.tabline = {}
+    let g:airline#themes#lucius#palette.tabline.airline_tabsel = s:TS
+    let g:airline#themes#lucius#palette.tabline.airline_tabsel_right = s:TS
+
+endfunction
+
+call airline#themes#lucius#refresh()
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/luna.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/luna.vim
new file mode 100644
index 0000000..879d862
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/luna.vim
@@ -0,0 +1,92 @@
+" vim-airline companion theme of Luna
+" (https://github.com/Pychimp/vim-luna)
+
+let g:airline#themes#luna#palette = {}
+
+let g:airline#themes#luna#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
+
+
+let s:N1 = [ '#ffffff' , '#005252' , 231  , 36 ]
+let s:N2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
+let s:N3 = [ '#ffffff' , '#002b2b' , 231  , 23 ]
+let g:airline#themes#luna#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#luna#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#ffffff' , '#789f00' , 231 , 106 ]
+let s:I2 = [ '#ffffff' , '#003f3f' , 231 , 29  ]
+let s:I3 = [ '#ffffff' , '#002b2b' , 231 , 23  ]
+let g:airline#themes#luna#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#luna#palette.insert_modified = {
+      \ 'airline_c': [ '#ffffff' , '#005e5e' , 255     , 52      , ''     ] ,
+      \ }
+let g:airline#themes#luna#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#789f00' , s:I1[2] , 106     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#luna#palette.replace = copy(g:airline#themes#luna#palette.insert)
+let g:airline#themes#luna#palette.replace.airline_a = [ s:I2[0]   , '#920000' , s:I2[2] , 88     , ''     ]
+let g:airline#themes#luna#palette.replace_modified = g:airline#themes#luna#palette.insert_modified
+
+let s:V1 = [ '#ffff9a' , '#ff8036' , 222 , 208 ]
+let s:V2 = [ '#ffffff' , '#003f3f' , 231 , 29 ]
+let s:V3 = [ '#ffffff' , '#002b2b' , 231  , 23  ]
+let g:airline#themes#luna#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#luna#palette.visual_modified = {
+      \ 'airline_c': [ '#ffffff' , '#450000' , 231     , 52      , ''     ] ,
+      \ }
+
+let s:IA = [ '#4e4e4e' , '#002b2b' , 59 , 23 , '' ]
+let g:airline#themes#luna#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#luna#palette.inactive_modified = {
+      \ 'airline_c': [ '#e20000' , ''        , 166      , ''      , ''     ] ,
+      \ }
+
+let g:airline#themes#luna#palette.tabline = {
+      \ 'airline_tab':  ['#2aa198', '#003f3f',  231, 29, ''],
+      \ 'airline_tabsel':  ['#ffffff', '#2e8b57',  231, 36, ''],
+      \ 'airline_tabtype':  ['#ffffff', '#005252',  231, 36, ''],
+      \ 'airline_tabfill':  ['#ffffff', '#002b2b',  231, 23, ''],
+      \ 'airline_tabmod':  ['#ffffff', '#780000',  231, 88, ''],
+      \ }
+
+let s:WI = [ '#ffffff', '#5f0000', 231, 88 ]
+let g:airline#themes#luna#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#luna#palette.normal_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.insert_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.visual_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+let g:airline#themes#luna#palette.replace_modified.airline_warning =
+    \ g:airline#themes#luna#palette.normal.airline_warning
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#luna#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#ffffff' , '#002b2b' , 231 , 23 , ''     ] ,
+      \ [ '#ffffff' , '#005252' , 231 , 36 , ''     ] ,
+      \ [ '#ffffff' , '#973d45' , 231 , 95 , ''     ] )
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/minimalist.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/minimalist.vim
new file mode 100644
index 0000000..2f9309b
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/minimalist.vim
@@ -0,0 +1,64 @@
+" Minimalist Airline - A Material Colorscheme Darker
+"
+" Author:       Diki Ananta <diki1aap@gmail.com>
+" Repository:   https://github.com/dikiaap/minimalist
+" Version:      1.3
+" License:      MIT
+
+" Normal Mode
+let s:N1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ]
+let s:N2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
+let s:N3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
+
+" Insert Mode
+let s:I1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ]
+let s:I2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
+let s:I3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
+
+" Visual Mode
+let s:V1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ]
+let s:V2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
+let s:V3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
+
+" Replace Mode
+let s:R1 = [ '#E4E4E4' , '#3A3A3A' , 254 , 237 ]
+let s:R2 = [ '#E4E4E4' , '#4E4E4E' , 254 , 239 ]
+let s:R3 = [ '#EEEEEE' , '#262626' , 255 , 235 ]
+
+" Inactive Mode
+let s:IA = [ '#666666' , '#262626' , 242 , 235 , '' ]
+
+let g:airline#themes#minimalist#palette = {}
+let g:airline#themes#minimalist#palette.normal  = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#minimalist#palette.insert  = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#minimalist#palette.visual  = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#minimalist#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#minimalist#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+
+" Warning Mode
+let s:WI = [ '#1C1C1C' , '#FFAF5F' , 234 , 215 , '' ]
+let g:airline#themes#minimalist#palette.normal.airline_warning = [
+        \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+        \ ]
+let g:airline#themes#minimalist#palette.insert.airline_warning  = g:airline#themes#minimalist#palette.normal.airline_warning
+let g:airline#themes#minimalist#palette.visual.airline_warning  = g:airline#themes#minimalist#palette.normal.airline_warning
+let g:airline#themes#minimalist#palette.replace.airline_warning = g:airline#themes#minimalist#palette.normal.airline_warning
+
+" Error Mode
+let s:ER = [ '#1C1C1C' , '#D75F5F' , 234 , 167 , '' ]
+let g:airline#themes#minimalist#palette.normal.airline_error = [
+        \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
+        \ ]
+let g:airline#themes#minimalist#palette.insert.airline_error    = g:airline#themes#minimalist#palette.normal.airline_error
+let g:airline#themes#minimalist#palette.visual.airline_error    = g:airline#themes#minimalist#palette.normal.airline_error
+let g:airline#themes#minimalist#palette.replace.airline_error   = g:airline#themes#minimalist#palette.normal.airline_error
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let g:airline#themes#minimalist#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+        \ [ '#E4E4E4' , '#262626' , 254 , 235 , ''     ] ,
+        \ [ '#E4E4E4' , '#4E4E4E' , 254 , 239 , ''     ] ,
+        \ [ '#585858' , '#E4E4E4' , 240 , 254 , 'bold' ] )
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/molokai.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/molokai.vim
new file mode 100644
index 0000000..1998f00
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/molokai.vim
@@ -0,0 +1,65 @@
+let g:airline#themes#molokai#palette = {}
+
+let g:airline#themes#molokai#palette.accents = {
+      \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
+      \ }
+
+
+" Normal mode
+let s:N1 = [ '#080808' , '#e6db74' , 232 , 144 ] " mode
+let s:N2 = [ '#f8f8f0' , '#232526' , 253 , 16  ] " info
+let s:N3 = [ '#f8f8f0' , '#465457' , 253 , 67  ] " statusline
+
+let g:airline#themes#molokai#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#molokai#palette.normal_modified = {
+      \ 'airline_c': [ '#080808' , '#e6db74' , 232 , 144 , '' ] ,
+      \ }
+
+
+" Insert mode
+let s:I1 = [ '#080808' , '#66d9ef' , 232 , 81 ]
+let s:I2 = [ '#f8f8f0' , '#232526' , 253 , 16 ]
+let s:I3 = [ '#f8f8f0' , '#465457' , 253 , 67 ]
+
+let g:airline#themes#molokai#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#molokai#palette.insert_modified = {
+      \ 'airline_c': [ '#080808' , '#66d9ef' , 232 , 81 , '' ] ,
+      \ }
+
+
+" Replace mode
+let g:airline#themes#molokai#palette.replace = copy(g:airline#themes#molokai#palette.insert)
+let g:airline#themes#molokai#palette.replace.airline_a = [ s:I1[0]   , '#ef5939' , s:I1[2] , 166     , ''     ]
+let g:airline#themes#molokai#palette.replace_modified = {
+      \ 'airline_c': [ '#080808' , '#ef5939' , 232 , 166 , '' ] ,
+      \ }
+
+
+" Visual mode
+let s:V1 = [ '#080808' , '#fd971f' , 232 , 208 ]
+let s:V2 = [ '#f8f8f0' , '#232526' , 253 , 16  ]
+let s:V3 = [ '#f8f8f0' , '#465457' , 253 , 67  ]
+
+let g:airline#themes#molokai#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#molokai#palette.visual_modified = {
+      \ 'airline_c': [ '#080808' , '#fd971f' , 232 , 208 , '' ] ,
+      \ }
+
+
+" Inactive
+let s:IA = [ '#1b1d1e' , '#465457' , 233 , 67 , '' ]
+let g:airline#themes#molokai#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#molokai#palette.inactive_modified = {
+      \ 'airline_c': [ '#f8f8f0' , ''        , 253 , ''  , '' ] ,
+      \ }
+
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#molokai#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#f8f8f0' , '#465457' , 253 , 67  , ''     ] ,
+      \ [ '#f8f8f0' , '#232526' , 253 , 16  , ''     ] ,
+      \ [ '#080808' , '#e6db74' , 232 , 144 , 'bold' ] )
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/monochrome.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/monochrome.vim
new file mode 100644
index 0000000..7dd1a17
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/monochrome.vim
@@ -0,0 +1,15 @@
+let g:airline#themes#monochrome#palette = {}
+
+function! airline#themes#monochrome#refresh()
+  let s:SL = airline#themes#get_highlight('StatusLine')
+  let g:airline#themes#monochrome#palette.normal = airline#themes#generate_color_map(s:SL, s:SL, s:SL)
+  let g:airline#themes#monochrome#palette.insert = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.replace = g:airline#themes#monochrome#palette.normal
+  let g:airline#themes#monochrome#palette.visual = g:airline#themes#monochrome#palette.normal
+
+  let s:SLNC = airline#themes#get_highlight('StatusLineNC')
+  let g:airline#themes#monochrome#palette.inactive = airline#themes#generate_color_map(s:SLNC, s:SLNC, s:SLNC)
+endfunction
+
+call airline#themes#monochrome#refresh()
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/murmur.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/murmur.vim
new file mode 100644
index 0000000..08e4757
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/murmur.vim
@@ -0,0 +1,82 @@
+let g:airline#themes#murmur#palette = {}
+
+" Color palette
+let s:cterm_termbg    = 237  " Background for branch and file format blocks
+let s:gui_termbg      = '#5F5F5F'
+let s:cterm_termfg    = 144  " Foreground for branch and file format blocks
+let s:gui_termfg      = '#AFAF87'
+
+let s:cterm_termbg2   = 234  " Background for middle block
+let s:gui_termbg2     = '#1C1C1C'
+let s:cterm_termfg2   = 39   " Foreground for middle block
+let s:gui_termfg2     = '#F5F5F5'
+
+let s:cterm_normalbg  = 27   " Background for normal mode and file position blocks
+let s:gui_normalbg    = '#5F87FF'
+let s:cterm_normalfg  = 15   " Foreground for normal mode and file position blocks
+let s:gui_normalfg    = '#FFFFFF'
+
+let s:cterm_insertbg  = 70   " Background for insert mode and file position blocks
+let s:gui_insertbg    = '#87AF5F'
+let s:cterm_insertfg  = 15   " Foreground for insert mode and file position blocks
+let s:gui_insertfg    = '#FFFFFF'
+
+let s:cterm_visualbg  = 166  " Background for visual mode and file position blocks
+let s:gui_visualbg    = '#ff8c00'
+let s:cterm_visualfg  = 15   " Foreground for visual mode and file position blocks
+let s:gui_visualfg    = '#FFFFFF'
+
+let s:cterm_replacebg = 88   " Background for replace mode and file position blocks
+let s:gui_replacebg   = '#870000'
+let s:cterm_replacefg = 15   " Foreground for replace mode and file position blocks
+let s:gui_replacefg   = '#FFFFFF'
+
+let s:cterm_alert     = 88   " Modified file alert color
+let s:gui_alert       = '#870000'
+
+let s:cterm_inactivebg = 234 " Background for inactive mode
+let s:gui_inactivebg   = '#1C1C1C'
+let s:cterm_inactivefg = 239 " Foreground for inactive mode
+let s:gui_inactivefg   = '#4E4E4E'
+
+" Branch and file format
+let s:BB = [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg] " Branch and file format blocks
+
+" Normal mode
+let s:N1 = [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg] " Outside blocks in normal mode
+let s:N2 = [s:gui_termfg2, s:gui_termbg2, s:cterm_normalbg, s:cterm_termbg2]     " Middle block
+let g:airline#themes#murmur#palette.normal = airline#themes#generate_color_map(s:N1, s:BB, s:N2)
+let g:airline#themes#murmur#palette.normal_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Insert mode
+let s:I1 = [s:gui_insertfg, s:gui_insertbg, s:cterm_insertfg, s:cterm_insertbg] " Outside blocks in insert mode
+let s:I2 = [s:gui_insertbg, s:gui_termbg2, s:cterm_insertbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#murmur#palette.insert = airline#themes#generate_color_map(s:I1, s:BB, s:I2)
+let g:airline#themes#murmur#palette.insert_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Replace mode
+let s:R1 = [s:gui_replacefg, s:gui_replacebg, s:cterm_replacefg, s:cterm_replacebg]  " Outside blocks in replace mode
+let s:R2 = [s:gui_termfg, s:gui_termbg2, s:cterm_termfg, s:cterm_termbg2]            " Middle block
+let g:airline#themes#murmur#palette.replace = airline#themes#generate_color_map(s:R1, s:BB, s:R2)
+let g:airline#themes#murmur#palette.replace_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Visual mode
+let s:V1 = [s:gui_visualfg, s:gui_visualbg, s:cterm_visualfg, s:cterm_visualbg] " Outside blocks in visual mode
+let s:V2 = [s:gui_visualbg, s:gui_termbg2, s:cterm_visualbg, s:cterm_termbg2]   " Middle block
+let g:airline#themes#murmur#palette.visual = airline#themes#generate_color_map(s:V1, s:BB, s:V2)
+let g:airline#themes#murmur#palette.visual_modified = {'airline_c': [s:gui_alert, s:gui_termbg2, s:cterm_alert, s:cterm_termbg2, 'bold'] ,}
+
+" Inactive mode
+let s:IA1 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA2 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let s:IA3 = [s:gui_inactivefg, s:gui_inactivebg, s:cterm_inactivefg, s:cterm_inactivebg, '']
+let g:airline#themes#murmur#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+
+" CtrlP plugin colors
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#murmur#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [s:gui_normalfg, s:gui_normalbg, s:cterm_normalfg, s:cterm_normalbg, ''],
+      \ [s:gui_termfg, s:gui_termbg, s:cterm_termfg, s:cterm_termbg, ''],
+      \ [s:gui_termfg2, s:gui_termbg2, s:cterm_termfg2, s:cterm_termbg2, 'bold'])
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/onedark.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/onedark.vim
new file mode 100644
index 0000000..26a925f
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/onedark.vim
@@ -0,0 +1,129 @@
+" [onedark.vim](https://github.com/joshdick/onedark.vim/)
+
+" This is a [vim-airline](https://github.com/vim-airline/vim-airline) theme for use with
+" the [onedark.vim](https://github.com/joshdick/onedark.vim) colorscheme.
+
+" It is based on vim-airline's ["tomorrow" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/tomorrow.vim).
+function! airline#themes#onedark#refresh()
+
+  if get(g:, 'onedark_termcolors', 256) == 16
+    let s:term_red = 1
+    let s:term_green = 2
+    let s:term_yellow = 3
+    let s:term_blue = 4
+    let s:term_purple = 5
+    let s:term_white = 7
+    let s:term_black = 0
+    let s:term_grey = 8
+  else
+    let s:term_red = 204
+    let s:term_green = 114
+    let s:term_yellow = 180
+    let s:term_blue = 39
+    let s:term_purple = 170
+    let s:term_white = 145
+    let s:term_black = 235
+    let s:term_grey = 236
+  endif
+
+  let g:airline#themes#onedark#palette = {}
+
+  let g:airline#themes#onedark#palette.accents = {
+        \ 'red': [ '#E06C75', '', s:term_red, 0 ]
+        \ }
+
+  let s:N1 = [ '#282C34', '#98C379', s:term_black, s:term_green ]
+  let s:N2 = [ '#ABB2BF', '#3E4452', s:term_white, s:term_grey ]
+  let s:N3 = [ '#98C379', '#282C34', s:term_green, '' ]
+  let g:airline#themes#onedark#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+  let group = airline#themes#get_highlight('vimCommand')
+  let g:airline#themes#onedark#palette.normal_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+
+  let s:I1 = [ '#282C34', '#61AFEF', s:term_black, s:term_blue ]
+  let s:I2 = s:N2
+  let s:I3 = [ '#61AFEF', '#282C34', s:term_blue, '' ]
+  let g:airline#themes#onedark#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#onedark#palette.insert_modified = g:airline#themes#onedark#palette.normal_modified
+
+  let s:R1 = [ '#282C34', '#E06C75', s:term_black, s:term_red ]
+  let s:R2 = s:N2
+  let s:R3 = [ '#E06C75', '#282C34', s:term_red, '' ]
+  let g:airline#themes#onedark#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#onedark#palette.replace_modified = g:airline#themes#onedark#palette.normal_modified
+
+  let s:V1 = [ '#282C34', '#C678DD', s:term_black, s:term_purple ]
+  let s:V2 = s:N2
+  let s:V3 = [ '#C678DD', '#282C34', s:term_purple, '' ]
+  let g:airline#themes#onedark#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#onedark#palette.visual_modified = g:airline#themes#onedark#palette.normal_modified
+
+  let s:IA1 = [ '#282C34', '#ABB2BF', s:term_black, s:term_white ]
+  let s:IA2 = [ '#ABB2BF', '#3E4452', s:term_white, s:term_grey ]
+  let s:IA3 = s:N2
+  let g:airline#themes#onedark#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+  let g:airline#themes#onedark#palette.inactive_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+
+  " Warning/Error styling code from vim-airline's ["base16" theme](https://github.com/vim-airline/vim-airline-themes/blob/master/autoload/airline/themes/base16.vim)
+
+  " Warnings
+  let s:WI = [ '#282C34', '#E5C07B', s:term_black, s:term_yellow ]
+  let g:airline#themes#onedark#palette.normal.airline_warning = [
+       \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+       \ ]
+
+  let g:airline#themes#onedark#palette.normal_modified.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.insert.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.insert_modified.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.visual.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.visual_modified.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.replace.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  let g:airline#themes#onedark#palette.replace_modified.airline_warning =
+      \ g:airline#themes#onedark#palette.normal.airline_warning
+
+  " Errors
+  let s:ER = [ '#282C34', '#E06C75', s:term_black, s:term_red ]
+  let g:airline#themes#onedark#palette.normal.airline_error = [
+       \ s:ER[0], s:ER[1], s:ER[2], s:ER[3]
+       \ ]
+
+  let g:airline#themes#onedark#palette.normal_modified.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.insert.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.insert_modified.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.visual.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.visual_modified.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.replace.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+  let g:airline#themes#onedark#palette.replace_modified.airline_error =
+      \ g:airline#themes#onedark#palette.normal.airline_error
+
+endfunction
+
+call airline#themes#onedark#refresh()
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/papercolor.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/papercolor.vim
new file mode 100644
index 0000000..fb8022b
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/papercolor.vim
@@ -0,0 +1,65 @@
+let g:airline#themes#papercolor#palette = {}
+
+let g:airline#themes#papercolor#palette.accents = {
+      \ 'red': [ '#66d9ef' , '' , 81 , '' , '' ],
+      \ }
+
+" Normal Mode:
+let s:N1 = [ '#585858' , '#e4e4e4' , 240 , 254 ] " Mode
+let s:N2 = [ '#e4e4e4' , '#0087af' , 254 , 31  ] " Info
+let s:N3 = [ '#eeeeee' , '#005f87' , 255 , 24  ] " StatusLine
+
+
+let g:airline#themes#papercolor#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#papercolor#palette.normal_modified = {
+      \ 'airline_c': [ '#eeeeee' , '#005f87' , 255 , 24 , '' ] ,
+      \ }
+
+
+" Insert Mode:
+let s:I1 = [ '#585858' , '#e4e4e4' , 240 , 254 ] " Mode
+let s:I2 = [ '#e4e4e4' , '#0087af' , 254 , 31  ] " Info
+let s:I3 = [ '#eeeeee' , '#005f87' , 255 , 24  ] " StatusLine
+
+
+let g:airline#themes#papercolor#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#papercolor#palette.insert_modified = {
+      \ 'airline_c': [ '#eeeeee' , '#005f87' , 255 , 24 , '' ] ,
+      \ }
+
+
+" Replace Mode:
+let g:airline#themes#papercolor#palette.replace = copy(g:airline#themes#papercolor#palette.insert)
+let g:airline#themes#papercolor#palette.replace.airline_a = [ '#d7005f'   , '#e4e4e4' , 161 , 254, ''     ]
+let g:airline#themes#papercolor#palette.replace_modified = {
+      \ 'airline_c': [ '#eeeeee' , '#005f87' , 255 , 24 , '' ] ,
+      \ }
+
+
+" Visual Mode:
+let s:V1 = [ '#005f87', '#e4e4e4', 24,  254 ]
+let s:V2 = [ '',        '#0087af', '',  31  ]
+let s:V3 = [ '#e4e4e4', '#005f87', 254, 24  ]
+
+let g:airline#themes#papercolor#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#papercolor#palette.visual_modified = {
+      \ 'airline_c': [ '#e4e4e4', '#005f87', 254, 24  ] ,
+      \ }
+
+" Inactive:
+let s:IA = [ '#585858' , '#e4e4e4' , 240 , 254 , '' ]
+let g:airline#themes#papercolor#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#papercolor#palette.inactive_modified = {
+      \ 'airline_c': [ '#585858' , '#e4e4e4' , 240 , 254 , '' ] ,
+      \ }
+
+
+" CtrlP:
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#papercolor#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#e4e4e4' , '#005f87' , 254 , 24  , ''     ] ,
+      \ [ '#e4e4e4' , '#0087af' , 254 , 31  , ''     ] ,
+      \ [ '#585858' , '#e4e4e4' , 240 , 254 , 'bold' ] )
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/powerlineish.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/powerlineish.vim
new file mode 100644
index 0000000..48eb1ec
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/powerlineish.vim
@@ -0,0 +1,46 @@
+" Theme to mimic the default colorscheme of powerline
+" Not 100% the same so it's powerline... ish.
+"
+" Differences from default powerline:
+" * Paste indicator isn't colored different
+" * Far right hand section matches the color of the mode indicator
+"
+" Differences from other airline themes:
+" * No color differences when you're in a modified buffer
+" * Visual mode only changes the mode section. Otherwise
+"   it appears the same as normal mode
+
+" Normal mode                                    " fg             & bg
+let s:N1 = [ '#005f00' , '#afd700' , 22  , 148 ] " darkestgreen   & brightgreen
+let s:N2 = [ '#9e9e9e' , '#303030' , 247 , 236 ] " gray8          & gray2
+let s:N3 = [ '#ffffff' , '#121212' , 231 , 233 ] " white          & gray4
+
+" Insert mode                                    " fg             & bg
+let s:I1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] " darkestcyan    & white
+let s:I2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] " darkcyan       & darkblue
+let s:I3 = [ '#87d7ff' , '#005f87' , 117 , 24  ] " mediumcyan     & darkestblue
+
+" Visual mode                                    " fg             & bg
+let s:V1 = [ '#080808' , '#ffaf00' , 232 , 214 ] " gray3          & brightestorange
+
+" Replace mode                                   " fg             & bg
+let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
+
+let g:airline#themes#powerlineish#palette = {}
+
+let g:airline#themes#powerlineish#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#powerlineish#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#powerlineish#palette.insert_replace = {
+      \ 'airline_a': [ s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
+
+let g:airline#themes#powerlineish#palette.visual = {
+      \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
+
+let g:airline#themes#powerlineish#palette.replace = copy(airline#themes#powerlineish#palette.normal)
+let g:airline#themes#powerlineish#palette.replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
+
+
+let s:IA = [ s:N2[0] , s:N3[1] , s:N2[2] , s:N3[3] , '' ]
+let g:airline#themes#powerlineish#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/qwq.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/qwq.vim
new file mode 100644
index 0000000..c028aca
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/qwq.vim
@@ -0,0 +1,61 @@
+" github: https://github.com/LuciusChen
+scriptencoding utf-8
+
+let g:airline#themes#qwq#palette = {}
+
+" normalmode
+let s:N1   = [ '#0E3B4F' , '#FFEEE5' , 17  , 190 ]
+let s:N2   = [ '#0E3B4F' , '#FFD3CB' , 255 , 238 ]
+let s:N3   = [ '#ffffff' , '#F7846E' , 85  , 234 ]
+let s:N4   = [ '#ffffff' , '#FF5D4F' , 255 , 53  ]
+let g:airline#themes#qwq#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#qwq#palette.normal_modified = { 'airline_c': [ s:N4[0], s:N4[1], s:N4[2], s:N4[3], '' ], }
+
+" insertmode
+let s:I1 = [ '#0E3B4F' , '#FFF5D9' , 17  , 45 ]
+let s:I2 = [ '#0E3B4F' , '#DDE58E' , 255 , 27 ]
+let s:I3 = [ '#ffffff' , '#9ED47B' , 15  , 17 ]
+let s:I4 = [ '#ffffff' , '#6BAD3F' , 255 , 53 ]
+let s:I5 = [ '#ffffff' , '#6BAD3F' , 17  , 172 ]
+let g:airline#themes#qwq#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#qwq#palette.insert_modified = { 'airline_c': [ s:I4[0], s:I4[1], s:I4[2], s:I4[3], '' ], }
+let g:airline#themes#qwq#palette.insert_paste = { 'airline_a': [ s:I5[0], s:I5[2], s:I5[2], s:I5[3], '' ], }
+
+" replacemode
+let s:R1 = [ '#0E3B4F' , '#C1F9CD' , 17  , 45  ]
+let s:R2 = [ '#0E3B4F' , '#8BEFC7' , 255 , 27  ]
+let s:R3 = [ '#ffffff' , '#04BEC3' , 15  , 17  ]
+let s:R4 = [ '#ffffff' , '#008492' , 255 , 53  ]
+let g:airline#themes#qwq#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#qwq#palette.replace.airline_a = [ s:R1[0], s:R1[1], s:R2[2], 124, '']
+let g:airline#themes#qwq#palette.replace_modified = { 'airline_c': [ s:R4[0], s:R4[1], s:R4[2], s:R4[3], '' ], }
+
+
+" visualmode
+let s:V1 = [ '#0E3B4F' , '#FFEEE5' , 232 , 214 ]
+let s:V2 = [ '#0E3B4F' , '#FF9DA5' , 232 , 202 ]
+let s:V3 = [ '#ffffff' , '#FF5B6F' , 15  , 52  ]
+let s:V4 = [ '#ffffff' , '#FF003F' , 255  , 53  ]
+let g:airline#themes#qwq#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#qwq#palette.visual_modified = { 'airline_c': [ s:V4[0], s:V4[1], s:V4[2], s:V4[3], '' ], }
+
+" inactive
+let s:IA1 = [ '#0E3B4F' , '#FEFCF9' , 239 , 234 , '' ]
+let s:IA2 = [ '#0E3B4F' , '#DDC6AF' , 239 , 235 , '' ]
+let s:IA3 = [ '#ffffff' , '#A28E79' , 239 , 236 , '' ]
+let g:airline#themes#qwq#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#qwq#palette.inactive_modified = { 'airline_c': [ '#ffffff', '', 97, '', '' ], }
+
+let g:airline#themes#qwq#palette.accents = { 'red': [ '#ffffff', '', 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 s:C1 = [ '#0E3B4F' , '#FEFCF9' , 189 , 55  , '' ]
+let s:C2 = [ '#0E3B4F' , '#DDC6AF' , 231 , 98  , '' ]
+let s:C3 = [ '#ffffff' , '#B9A695' , 55  , 231 , '' ]
+let g:airline#themes#qwq#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:C1, s:C2, s:C3)
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/raven.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/raven.vim
new file mode 100644
index 0000000..02bfd73
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/raven.vim
@@ -0,0 +1,85 @@
+let g:airline#themes#raven#palette = {}
+
+let g:airline#themes#raven#palette.accents = {
+      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let s:N2 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let s:N3 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ]
+let g:airline#themes#raven#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#raven#palette.normal_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+
+let s:I1 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let s:I2 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let s:I3 = [ '#11c279' , '#2e2e2e' , 36 , 235 ]
+let g:airline#themes#raven#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#raven#palette.insert_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+let g:airline#themes#raven#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#2e2e2e' , s:I1[2] , 235 , '' ] ,
+      \ }
+
+let g:airline#themes#raven#palette.replace = copy(g:airline#themes#raven#palette.insert)
+let g:airline#themes#raven#palette.replace.airline_a = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
+let g:airline#themes#raven#palette.replace.airline_z = [ '#e60000' , s:I1[1] , 160 , s:I1[3] , '' ]
+let g:airline#themes#raven#palette.replace_modified = g:airline#themes#raven#palette.insert_modified
+
+let s:V1 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let s:V2 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let s:V3 = [ '#6565ff' , '#2e2e2e' , 63 , 235 ]
+let g:airline#themes#raven#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#raven#palette.visual_modified = {
+      \ 'airline_c': [ '#e25000' , '#2e2e2e' , 166 , 235 , '' ] ,
+      \ }
+
+let s:IA = [ '#5e5e5e' , '#222222' , 59 , 235 , '' ]
+let g:airline#themes#raven#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#raven#palette.inactive_modified = {
+      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#raven#palette.tabline = {
+      \ 'airline_tab':      ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabsel':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
+      \ 'airline_tabtype':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabfill':  ['#c8c8c8' , '#2e2e2e' , 188 , 235 , '' ],
+      \ 'airline_tabmod':   ['#2e2e2e' , '#a4c639' , 235 , 149 , '' ],
+      \ }
+
+let s:WI = [ '#ff0000', '#2e2e2e', 196, 235 ]
+let g:airline#themes#raven#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#raven#palette.normal_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.insert.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.insert_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.visual.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.visual_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.replace.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+let g:airline#themes#raven#palette.replace_modified.airline_warning =
+    \ g:airline#themes#raven#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#raven#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
+      \ [ '#c8c8c8' , '#2e2e2e' , 188 , 235 , ''     ] ,
+      \ [ '#2e2e2e' , '#a4c639' , 235 , 149 , ''     ] )
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/ravenpower.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/ravenpower.vim
new file mode 100644
index 0000000..0f244ca
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/ravenpower.vim
@@ -0,0 +1,36 @@
+" Pretty much powerlineish clone, and some
+" of the hex colours was borrowed from raven
+
+" Normal mode                                    " fg             & bg
+let s:N1 = [ '#005f00' , '#1d1f21' , 7  , 8 ]    " darkestgreen   & brightgreen
+let s:N2 = [ '#9e9e9e' , '#303030' , 247 , 236 ] " gray8          & gray2
+let s:N3 = [ '#c8c8c8' , '#2e2e2e' , 188 , 235 ] " white          & gray4
+
+" Insert mode                                    " fg             & bg
+"let s:I1 = [ '#005f5f' , '#ffffff' , 23  , 231 ] " darkestcyan    & white
+"let s:I2 = [ '#5fafd7' , '#0087af' , 74  , 31  ] " darkcyan       & darkblue
+let s:I1 = [ '#87d7ff' , '#1d1f21' , 7   , 24  ] " mediumcyan     & darkestblue
+
+" Visual mode                                    " fg             & bg
+let s:V1 = [ '#080808' , '#ffaf00' , 232 , 214 ] " gray3          & brightestorange
+
+" Replace mode                                   " fg             & bg
+let s:RE = [ '#ffffff' , '#d70000' , 231 , 160 ] " white          & brightred
+
+let g:airline#themes#ravenpower#palette = {}
+
+let g:airline#themes#ravenpower#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+let g:airline#themes#ravenpower#palette.insert = airline#themes#generate_color_map(s:I1, s:N2, s:N3)
+let g:airline#themes#ravenpower#palette.insert_replace = {
+      \ 'airline_a': [  s:RE[0]   , s:I1[1]   , s:RE[1]   , s:I1[3]   , ''     ] }
+
+let g:airline#themes#ravenpower#palette.visual = {
+      \ 'airline_a': [ s:V1[0]   , s:V1[1]   , s:V1[2]   , s:V1[3]   , ''     ] }
+
+let g:airline#themes#ravenpower#palette.replace = copy(airline#themes#ravenpower#palette.normal)
+let g:airline#themes#ravenpower#palette.replace.airline_a = [ s:RE[0] , s:RE[1] , s:RE[2] , s:RE[3] , '' ]
+
+
+let s:IA = [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ]
+let g:airline#themes#ravenpower#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/serene.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/serene.vim
new file mode 100644
index 0000000..9191c07
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/serene.vim
@@ -0,0 +1,41 @@
+let g:airline#themes#serene#palette = {}
+
+let s:guibg = '#080808'
+let s:termbg = 232
+let s:termsep = 236
+let s:guisep = '#303030'
+
+let s:N1 = [ '#00dfff' , s:guibg , 45  , s:termbg ]
+let s:N2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:N3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+
+let g:airline#themes#serene#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#serene#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ }
+
+let s:I1 = [ '#5fff00' , s:guibg , 82  , s:termbg ]
+let s:I2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:I3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+let g:airline#themes#serene#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#serene#palette.insert_modified = copy(g:airline#themes#serene#palette.normal_modified)
+let g:airline#themes#serene#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+let g:airline#themes#serene#palette.replace = {
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ }
+let g:airline#themes#serene#palette.replace_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:V1 = [ '#dfdf00' , s:guibg , 184 , s:termbg ]
+let s:V2 = [ '#ff5f00' , s:guibg , 202 , s:termbg ]
+let s:V3 = [ '#767676' , s:guibg , 7   , s:termbg ]
+let g:airline#themes#serene#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#serene#palette.visual_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
+let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
+let s:IA2 = [ '#4e4e4e' , s:guisep , 239 , s:termsep , '' ]
+let g:airline#themes#serene#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
+let g:airline#themes#serene#palette.inactive_modified = copy(g:airline#themes#serene#palette.normal_modified)
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/sierra.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/sierra.vim
new file mode 100644
index 0000000..d736459
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/sierra.vim
@@ -0,0 +1,94 @@
+" File: sierra.vim
+" Author: Danilo Augusto <daniloaugusto.ita16@gmail.com>
+" Date: 2017-02-26
+" License:  MIT
+
+let s:gui00 = "#303030" " ANSI Black
+let s:gui01 = "#af5f5f" " ANSI Red
+let s:gui02 = "#d75f5f" " ANSI Green
+let s:gui03 = "#afd7d7" " ANSI Yellow
+let s:gui04 = "#af8787" " ANSI Blue
+let s:gui05 = "#dfaf87" " ANSI Magenta
+let s:gui06 = "#ffafaf" " ANSI Cyan
+let s:gui07 = "#f7e4c0" " ANSI White
+let s:gui08 = "#686868"
+let s:gui09 = "#af5f5f"
+let s:gui0A = "#d75f5f"
+let s:gui0B = "#afd7d7"
+let s:gui0C = "#af8787"
+let s:gui0D = "#dfaf87"
+let s:gui0E = "#ffb2af"
+let s:gui0F = "#ffffff"
+
+let s:cterm00 = "236"
+let s:cterm01 = "131"
+let s:cterm02 = "167"
+let s:cterm03 = "152"
+let s:cterm04 = "138"
+let s:cterm05 = "180"
+let s:cterm06 = "217"
+let s:cterm07 = "222"
+let s:cterm08 = "242"
+let s:cterm09 = "131"
+let s:cterm0A = "167"
+let s:cterm0B = "152"
+let s:cterm0C = "138"
+let s:cterm0D = "180"
+let s:cterm0E = "217"
+let s:cterm0F = "231"
+
+let s:guiWhite = "#ffffff"
+let s:guiGray = "#666666"
+let s:guiDarkGray = "#545454"
+let s:guiAlmostBlack = "#2a2a2a"
+let s:ctermWhite = "231"
+let s:ctermGray = "243"
+let s:ctermDarkGray = "240"
+let s:ctermAlmostBlack = "235"
+
+let g:airline#themes#sierra#palette = {}
+let s:modified = { 'airline_c': [s:gui07, '', s:cterm07, '', ''] }
+
+" Normal mode
+let s:N1 = [s:guiWhite, s:gui0D, s:ctermWhite, s:cterm0D]
+let s:N2 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let s:N3 = [s:gui02, s:guiDarkGray, s:cterm02, s:ctermDarkGray]
+let g:airline#themes#sierra#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#sierra#palette.normal_modified = s:modified
+
+" Insert mode
+let s:I1 = [s:guiWhite, s:gui0B, s:ctermWhite, s:cterm0B]
+let s:I2 = s:N2
+let s:I3 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let g:airline#themes#sierra#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#sierra#palette.insert_modified = s:modified
+
+" Visual mode
+let s:V1 = [s:guiWhite, s:gui08, s:ctermWhite, s:cterm08]
+let s:V2 = s:N2
+let s:V3 = s:I3
+let g:airline#themes#sierra#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#sierra#palette.visual_modified = s:modified
+
+" Replace mode
+let s:R1 = [s:gui08, s:gui00, s:cterm08, s:cterm00]
+let s:R2 = s:N2
+let s:R3 = s:I3
+let g:airline#themes#sierra#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#sierra#palette.replace_modified = s:modified
+
+" Inactive mode
+let s:IN1 = [s:guiGray, s:gui01, s:ctermGray, s:cterm01]
+let s:IN2 = [s:gui02, s:guiAlmostBlack, s:cterm02, s:ctermAlmostBlack]
+let s:IN3 = [s:gui02, s:guiAlmostBlack, s:cterm02, s:ctermAlmostBlack]
+let g:airline#themes#sierra#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3)
+let g:airline#themes#sierra#palette.inactive_modified = s:modified
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+    finish
+endif
+
+let s:CP1 = [s:guiWhite, s:gui01, s:ctermWhite, s:cterm01]
+let s:CP2 = [s:guiWhite, s:gui03, s:ctermWhite, s:cterm01]
+let s:CP3 = [s:guiWhite, s:gui0D, s:ctermWhite, s:cterm0D]
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/silver.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/silver.vim
new file mode 100644
index 0000000..fd85edb
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/silver.vim
@@ -0,0 +1,85 @@
+let g:airline#themes#silver#palette = {}
+
+let g:airline#themes#silver#palette.accents = {
+      \ 'red': [ '#ff2121' , '' , 196 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let s:N2 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let s:N3 = [ '#414141' , '#e1e1e1' , 59 , 188 ]
+let g:airline#themes#silver#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#silver#palette.normal_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+
+let s:I1 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let s:I2 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let s:I3 = [ '#0d935c' , '#e1e1e1' , 29 , 188 ]
+let g:airline#themes#silver#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#silver#palette.insert_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+let g:airline#themes#silver#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#e1e1e1' , s:I1[2] , 188 , '' ] ,
+      \ }
+
+let g:airline#themes#silver#palette.replace = copy(g:airline#themes#silver#palette.insert)
+let g:airline#themes#silver#palette.replace.airline_a = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
+let g:airline#themes#silver#palette.replace.airline_z = [ '#b30000' , s:I1[1] , 124 , s:I1[3] , '' ]
+let g:airline#themes#silver#palette.replace_modified = g:airline#themes#silver#palette.insert_modified
+
+let s:V1 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let s:V2 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let s:V3 = [ '#0000b3' , '#e1e1e1' , 19 , 188 ]
+let g:airline#themes#silver#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#silver#palette.visual_modified = {
+      \ 'airline_c': [ '#e25000' , '#e1e1e1' , 166 , 188 , '' ] ,
+      \ }
+
+let s:IA = [ '#a1a1a1' , '#dddddd' , 145 , 188 , '' ]
+let g:airline#themes#silver#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#silver#palette.inactive_modified = {
+      \ 'airline_c': [ '#e25000' , '' , 166 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#silver#palette.tabline = {
+      \ 'airline_tab':      ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabsel':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
+      \ 'airline_tabtype':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabfill':  ['#414141' , '#e1e1e1' , 59  , 188 , '' ],
+      \ 'airline_tabmod':   ['#e1e1e1' , '#007599' , 188 , 30  , '' ],
+      \ }
+
+let s:WI = [ '#ff0000', '#e1e1e1', 196, 188 ]
+let g:airline#themes#silver#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#silver#palette.normal_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.insert.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.insert_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.visual.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.visual_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.replace.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+let g:airline#themes#silver#palette.replace_modified.airline_warning =
+    \ g:airline#themes#silver#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#silver#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
+      \ [ '#414141' , '#e1e1e1' , 59  , 188 , ''     ] ,
+      \ [ '#e1e1e1' , '#007599' , 188 , 30  , ''     ] )
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/simple.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/simple.vim
new file mode 100644
index 0000000..a111a1c
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/simple.vim
@@ -0,0 +1,46 @@
+let g:airline#themes#simple#palette = {}
+
+let s:guibg = '#080808'
+let s:guibg2 = '#1c1c1c'
+let s:termbg = 232
+let s:termbg2= 234
+
+let s:N1 = [ s:guibg , '#00dfff' , s:termbg , 45 ]
+let s:N2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:N3 = [ '#767676' , s:guibg, 243 , s:termbg]
+let g:airline#themes#simple#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#simple#palette.normal_modified = {
+      \ 'airline_c': [ '#df0000' , s:guibg, 160     , s:termbg    , ''     ] ,
+      \ }
+
+
+let s:I1 = [ s:guibg, '#5fff00' , s:termbg , 82 ]
+let s:I2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:I3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let g:airline#themes#simple#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#simple#palette.insert_modified = copy(g:airline#themes#simple#palette.normal_modified)
+let g:airline#themes#simple#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#simple#palette.replace = {
+      \ 'airline_a': [ s:I1[0]   , '#af0000' , s:I1[2] , 124     , ''     ] ,
+      \ }
+let g:airline#themes#simple#palette.replace_modified = copy(g:airline#themes#simple#palette.normal_modified)
+
+
+let s:V1 = [ s:guibg, '#dfdf00' , s:termbg , 184 ]
+let s:V2 = [ '#ff5f00' , s:guibg2, 202 , s:termbg2 ]
+let s:V3 = [ '#767676' , s:guibg, 243 , s:termbg ]
+let g:airline#themes#simple#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#simple#palette.visual_modified = copy(g:airline#themes#simple#palette.normal_modified)
+
+
+let s:IA  = [ '#4e4e4e' , s:guibg  , 239 , s:termbg  , '' ]
+let s:IA2 = [ '#4e4e4e' , s:guibg2 , 239 , s:termbg2 , '' ]
+let g:airline#themes#simple#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA2, s:IA2)
+let g:airline#themes#simple#palette.inactive_modified = {
+      \ 'airline_c': [ '#df0000', '', 160, '', '' ] ,
+      \ }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/sol.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/sol.vim
new file mode 100644
index 0000000..89ea505
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/sol.vim
@@ -0,0 +1,90 @@
+" vim-airline companion theme of Sol
+" (https://github.com/Pychimp/vim-sol)
+
+let g:airline#themes#sol#palette = {}
+
+let g:airline#themes#sol#palette.accents = {
+      \ 'red': [ '#ffffff' , '' , 231 , '' , '' ],
+      \ }
+
+let s:N1 = [ '#343434' , '#a0a0a0' , 237 , 248 ]
+let s:N2 = [ '#343434' , '#b3b3b3' , 237 , 250 ]
+let s:N3 = [ '#343434' , '#c7c7c7' , 237 , 252 ]
+let g:airline#themes#sol#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#sol#palette.normal_modified = {
+      \ 'airline_c': [ '#ffffff' , '#ff6868' , 237 , 209 , '' ] ,
+      \ }
+
+
+let s:I1 = [ '#eeeeee' , '#09643f' , 255 , 30  ]
+let s:I2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:I3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#sol#palette.insert_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+let g:airline#themes#sol#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#09643f' , s:I1[2] , 30 , '' ] ,
+      \ }
+
+
+let g:airline#themes#sol#palette.replace = copy(g:airline#themes#sol#palette.insert)
+let g:airline#themes#sol#palette.replace.airline_a = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace.airline_z = [ s:I1[0] , '#ff2121' , s:I1[2] , 196 , '' ]
+let g:airline#themes#sol#palette.replace_modified = g:airline#themes#sol#palette.insert_modified
+
+let s:V1 = [ '#ffff9a' , '#ff6003' , 222 , 202 ]
+let s:V2 = [ '#343434' , '#a3a3a3' , 237 , 249 ]
+let s:V3 = [ '#343434' , '#b0b0b0' , 237 , 250 ]
+let g:airline#themes#sol#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#sol#palette.visual_modified = {
+      \ 'airline_c': [ '#343434' , '#ffdbc7' , 237 , 216 , '' ] ,
+      \ }
+
+let s:IA = [ '#777777' , '#c7c7c7' , 244 , 251 , '' ]
+let g:airline#themes#sol#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#sol#palette.inactive_modified = {
+      \ 'airline_c': [ '#ff3535' , '' , 203 , '' , '' ] ,
+       \ }
+
+let g:airline#themes#sol#palette.tabline = {
+      \ 'airline_tab':      ['#343434', '#b3b3b3',  237, 250, ''],
+      \ 'airline_tabsel':   ['#ffffff', '#004b9a',  231, 31 , ''],
+      \ 'airline_tabtype':  ['#343434', '#a0a0a0',  237, 248, ''],
+      \ 'airline_tabfill':  ['#343434', '#c7c7c7',  237, 251, ''],
+      \ 'airline_tabmod':   ['#343434', '#ffdbc7',  237, 216, ''],
+      \ }
+
+let s:WI = [ '#eeeeee', '#e33900', 255, 166 ]
+let g:airline#themes#sol#palette.normal.airline_warning = [
+     \ s:WI[0], s:WI[1], s:WI[2], s:WI[3]
+     \ ]
+
+let g:airline#themes#sol#palette.normal_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.insert_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.visual_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+let g:airline#themes#sol#palette.replace_modified.airline_warning =
+    \ g:airline#themes#sol#palette.normal.airline_warning
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#sol#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#343434' , '#c7c7c7' , 237 , 251 , ''     ] ,
+      \ [ '#343434' , '#b3b3b3' , 237 , 250 , ''     ] ,
+      \ [ '#eeeeee' , '#007fff' , 255 , 27  , ''     ] )
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/solarized.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/solarized.vim
new file mode 100644
index 0000000..b88e1a4
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/solarized.vim
@@ -0,0 +1,207 @@
+let g:airline#themes#solarized#palette = {}
+
+function! airline#themes#solarized#refresh()
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Options
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  let s:background           = get(g:, 'airline_solarized_bg', &background)
+  let s:ansi_colors          = get(g:, 'solarized_termcolors', 16) != 256 && &t_Co >= 16 ? 1 : 0
+  let s:use_green            = get(g:, 'airline_solarized_normal_green', 0)
+  let s:dark_inactive_border = get(g:, 'airline_solarized_dark_inactive_border', 0)
+  let s:tty                  = &t_Co == 8
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Colors
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Base colors
+  " Extended base16 support by @cuviper.
+  " Via https://github.com/blueyed/vim-colors-solarized/commit/92f2f994 /
+  " https://github.com/cuviper/vim-colors-solarized.
+  if s:ansi_colors && get(g:, 'solarized_base16', 0)
+    let s:base03  = {'t': 0,  'g': "#002b36"}  " Base 00
+    let s:base02  = {'t': 18, 'g': "#073642"}  " Base 01
+    let s:base01  = {'t': 19, 'g': "#586e75"}  " Base 02
+    let s:base00  = {'t': 8,  'g': "#657b83"}  " Base 03
+    let s:base0   = {'t': 20, 'g': "#839496"}  " Base 04
+    let s:base1   = {'t': 7,  'g': "#93a1a1"}  " Base 05
+    let s:base2   = {'t': 21, 'g': "#eee8d5"}  " Base 06
+    let s:base3   = {'t': 15, 'g': "#fdf6e3"}  " Base 07
+    let s:yellow  = {'t': 3,  'g': "#dc322f"}  " Base 0A
+    let s:orange  = {'t': 16, 'g': "#cb4b16"}  " Base 09
+    let s:red     = {'t': 1,  'g': "#b58900"}  " Base 08
+    let s:magenta = {'t': 17, 'g': "#859900"}  " Base 0F
+    let s:violet  = {'t': 5,  'g': "#2aa198"}  " Base 0E
+    let s:blue    = {'t': 4,  'g': "#268bd2"}  " Base 0D
+    let s:cyan    = {'t': 6,  'g': "#6c71c4"}  " Base 0C
+    let s:green   = {'t': 2,  'g': "#d33682"}  " Base 0B
+  else
+    let s:base03  = {'t': s:ansi_colors ?   8 : (s:tty ? '0' : 234), 'g': '#002b36'}
+    let s:base02  = {'t': s:ansi_colors ? '0' : (s:tty ? '0' : 235), 'g': '#073642'}
+    let s:base01  = {'t': s:ansi_colors ?  10 : (s:tty ? '0' : 240), 'g': '#586e75'}
+    let s:base00  = {'t': s:ansi_colors ?  11 : (s:tty ? '7' : 241), 'g': '#657b83'}
+    let s:base0   = {'t': s:ansi_colors ?  12 : (s:tty ? '7' : 244), 'g': '#839496'}
+    let s:base1   = {'t': s:ansi_colors ?  14 : (s:tty ? '7' : 245), 'g': '#93a1a1'}
+    let s:base2   = {'t': s:ansi_colors ?   7 : (s:tty ? '7' : 254), 'g': '#eee8d5'}
+    let s:base3   = {'t': s:ansi_colors ?  15 : (s:tty ? '7' : 230), 'g': '#fdf6e3'}
+    let s:yellow  = {'t': s:ansi_colors ?   3 : (s:tty ? '3' : 136), 'g': '#b58900'}
+    let s:orange  = {'t': s:ansi_colors ?   9 : (s:tty ? '1' : 166), 'g': '#cb4b16'}
+    let s:red     = {'t': s:ansi_colors ?   1 : (s:tty ? '1' : 160), 'g': '#dc322f'}
+    let s:magenta = {'t': s:ansi_colors ?   5 : (s:tty ? '5' : 125), 'g': '#d33682'}
+    let s:violet  = {'t': s:ansi_colors ?  13 : (s:tty ? '5' : 61 ), 'g': '#6c71c4'}
+    let s:blue    = {'t': s:ansi_colors ?   4 : (s:tty ? '4' : 33 ), 'g': '#268bd2'}
+    let s:cyan    = {'t': s:ansi_colors ?   6 : (s:tty ? '6' : 37 ), 'g': '#2aa198'}
+    let s:green   = {'t': s:ansi_colors ?   2 : (s:tty ? '2' : 64 ), 'g': '#859900'}
+  endif
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Simple mappings
+  " NOTE: These are easily tweakable mappings. The actual mappings get
+  " the specific gui and terminal colors from the base color dicts.
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Normal mode
+  if s:background == 'dark'
+    let s:N1 = [s:base3, (s:use_green ? s:green : s:base1), 'bold']
+    let s:N2 = [s:base2, (s:tty ? s:base01 : s:base00), '']
+    let s:N3 = [s:base01, s:base02, '']
+  else
+    let s:N1 = [s:base2, (s:use_green ? s:green : s:base00), 'bold']
+    let s:N2 = [(s:tty ? s:base01 : s:base2), s:base1, '']
+    let s:N3 = [s:base1, s:base2, '']
+  endif
+  let s:NF = [s:orange, s:N3[1], '']
+  let s:NW = [s:base3, s:orange, '']
+  if s:background == 'dark'
+    let s:NM = [s:base1, s:N3[1], '']
+    let s:NMi = [s:base2, s:N3[1], '']
+  else
+    let s:NM = [s:base01, s:N3[1], '']
+    let s:NMi = [s:base02, s:N3[1], '']
+  endif
+
+  " Insert mode
+  let s:I1 = [s:N1[0], s:yellow, 'bold']
+  let s:I2 = s:N2
+  let s:I3 = s:N3
+  let s:IF = s:NF
+  let s:IM = s:NM
+
+  " Visual mode
+  let s:V1 = [s:N1[0], s:magenta, 'bold']
+  let s:V2 = s:N2
+  let s:V3 = s:N3
+  let s:VF = s:NF
+  let s:VM = s:NM
+
+  " Replace mode
+  let s:R1 = [s:N1[0], s:red, '']
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let s:RM = s:NM
+  let s:RF = s:NF
+
+  " Inactive, according to VertSplit in solarized
+  " (bg dark: base00; bg light: base0)
+  if s:background == 'dark'
+    if s:dark_inactive_border
+      let s:IA = [s:base01, s:base02, '']
+    else
+      let s:IA = [s:base02, s:base00, '']
+    endif
+  else
+    let s:IA = [s:base2, s:base0, '']
+  endif
+
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  " Actual mappings
+  " WARNING: Don't modify this section unless necessary.
+  """"""""""""""""""""""""""""""""""""""""""""""""
+  let s:NFa = [s:NF[0].g, s:NF[1].g, s:NF[0].t, s:NF[1].t, s:NF[2]]
+  let s:IFa = [s:IF[0].g, s:IF[1].g, s:IF[0].t, s:IF[1].t, s:IF[2]]
+  let s:VFa = [s:VF[0].g, s:VF[1].g, s:VF[0].t, s:VF[1].t, s:VF[2]]
+  let s:RFa = [s:RF[0].g, s:RF[1].g, s:RF[0].t, s:RF[1].t, s:RF[2]]
+
+  let g:airline#themes#solarized#palette.accents = {
+        \ 'red': s:NFa,
+        \ }
+
+  let g:airline#themes#solarized#palette.inactive = airline#themes#generate_color_map(
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]],
+        \ [s:IA[0].g, s:IA[1].g, s:IA[0].t, s:IA[1].t, s:IA[2]])
+  let g:airline#themes#solarized#palette.inactive_modified = {
+        \ 'airline_c': [s:NMi[0].g, '', s:NMi[0].t, '', s:NMi[2]]}
+
+  let g:airline#themes#solarized#palette.normal = airline#themes#generate_color_map(
+        \ [s:N1[0].g, s:N1[1].g, s:N1[0].t, s:N1[1].t, s:N1[2]],
+        \ [s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]],
+        \ [s:N3[0].g, s:N3[1].g, s:N3[0].t, s:N3[1].t, s:N3[2]])
+
+  let g:airline#themes#solarized#palette.normal.airline_warning = [
+        \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
+
+  let g:airline#themes#solarized#palette.normal.airline_error = [
+        \ s:NW[0].g, s:NW[1].g, s:NW[0].t, s:NW[1].t, s:NW[2]]
+
+  let g:airline#themes#solarized#palette.normal_modified = {
+        \ 'airline_c': [s:NM[0].g, s:NM[1].g,
+        \ s:NM[0].t, s:NM[1].t, s:NM[2]]}
+
+  let g:airline#themes#solarized#palette.normal_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.insert = airline#themes#generate_color_map(
+        \ [s:I1[0].g, s:I1[1].g, s:I1[0].t, s:I1[1].t, s:I1[2]],
+        \ [s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]],
+        \ [s:I3[0].g, s:I3[1].g, s:I3[0].t, s:I3[1].t, s:I3[2]])
+
+  let g:airline#themes#solarized#palette.insert.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.insert_modified = {
+        \ 'airline_c': [s:IM[0].g, s:IM[1].g,
+        \ s:IM[0].t, s:IM[1].t, s:IM[2]]}
+
+  let g:airline#themes#solarized#palette.insert_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.visual = airline#themes#generate_color_map(
+        \ [s:V1[0].g, s:V1[1].g, s:V1[0].t, s:V1[1].t, s:V1[2]],
+        \ [s:V2[0].g, s:V2[1].g, s:V2[0].t, s:V2[1].t, s:V2[2]],
+        \ [s:V3[0].g, s:V3[1].g, s:V3[0].t, s:V3[1].t, s:V3[2]])
+
+  let g:airline#themes#solarized#palette.visual.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.visual_modified = {
+        \ 'airline_c': [s:VM[0].g, s:VM[1].g,
+        \ s:VM[0].t, s:VM[1].t, s:VM[2]]}
+
+  let g:airline#themes#solarized#palette.visual_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace = airline#themes#generate_color_map(
+        \ [s:R1[0].g, s:R1[1].g, s:R1[0].t, s:R1[1].t, s:R1[2]],
+        \ [s:R2[0].g, s:R2[1].g, s:R2[0].t, s:R2[1].t, s:R2[2]],
+        \ [s:R3[0].g, s:R3[1].g, s:R3[0].t, s:R3[1].t, s:R3[2]])
+
+  let g:airline#themes#solarized#palette.replace.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.replace_modified = {
+        \ 'airline_c': [s:RM[0].g, s:RM[1].g,
+        \ s:RM[0].t, s:RM[1].t, s:RM[2]]}
+
+  let g:airline#themes#solarized#palette.replace_modified.airline_warning =
+        \ g:airline#themes#solarized#palette.normal.airline_warning
+
+  let g:airline#themes#solarized#palette.tabline = {}
+
+  let g:airline#themes#solarized#palette.tabline.airline_tab = [
+        \ s:I2[0].g, s:I2[1].g, s:I2[0].t, s:I2[1].t, s:I2[2]]
+
+  let g:airline#themes#solarized#palette.tabline.airline_tabtype = [
+        \ s:N2[0].g, s:N2[1].g, s:N2[0].t, s:N2[1].t, s:N2[2]]
+endfunction
+
+call airline#themes#solarized#refresh()
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/term.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/term.vim
new file mode 100644
index 0000000..288ca6a
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/term.vim
@@ -0,0 +1,92 @@
+
+" vim-airline 'term' theme
+" it is using current terminal colorscheme
+" and in gvim i left colors from 'wombat' theme but i am not using it anyway
+
+" Normal mode
+"          [ guifg, guibg, ctermfg, ctermbg, opts ]
+let s:N1 = [ '#141413' , '#CAE682' , 232 , 2 ] " mode
+let s:N2 = [ '#CAE682' , '#32322F' , 2 , 'black' ] " info
+let s:N3 = [ '#CAE682' , '#242424' , 2 , 233 ] " statusline
+let s:N4 = [ '#86CD74' , 10 ]                   " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 3 ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 3 , 'black' ]
+let s:I3 = [ '#FDE76E' , '#242424' , 3 , 233 ]
+let s:I4 = [ '#FADE3E' , 11 ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 4 ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 4 , 'black' ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 4 , 233 ]
+let s:V4 = [ '#7CB0E6' , 12 ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 1 ]
+let s:R2 = [ '#E5786D' , '#32322F' , 1 , 'black' ]
+let s:R3 = [ '#E5786D' , '#242424' , 1 , 233 ]
+let s:R4 = [ '#E55345' , 9 ]
+
+" Paste mode
+let s:PA = [ '#94E42C' , 6 ]
+
+" Info modified
+let s:IM = [ '#40403C' , 238 ]
+
+" Inactive mode
+let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
+
+let g:airline#themes#term#palette = {}
+
+let g:airline#themes#term#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
+
+let g:airline#themes#term#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#term#palette.normal_modified = {
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#term#palette.insert_modified = {
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#term#palette.visual_modified = {
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#term#palette.replace_modified = {
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.insert_paste = {
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#term#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#term#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#term#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
+      \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
+      \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/tomorrow.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/tomorrow.vim
new file mode 100644
index 0000000..f382fc1
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/tomorrow.vim
@@ -0,0 +1,44 @@
+let g:airline#themes#tomorrow#palette = {}
+
+function! airline#themes#tomorrow#refresh()
+  let g:airline#themes#tomorrow#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let s:N1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Directory', 'fg'], 'bold')
+  let s:N2 = airline#themes#get_highlight('Pmenu')
+  let s:N3 = airline#themes#get_highlight('CursorLine')
+  let g:airline#themes#tomorrow#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+
+  let group = airline#themes#get_highlight('vimCommand')
+  let g:airline#themes#tomorrow#palette.normal_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+
+  let s:I1 = airline#themes#get_highlight2(['Normal', 'bg'], ['MoreMsg', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['MoreMsg', 'fg'], ['Normal', 'bg'])
+  let s:I3 = s:N3
+  let g:airline#themes#tomorrow#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#tomorrow#palette.insert_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight('Error', 'bold')
+  let s:R2 = s:N2
+  let s:R3 = s:N3
+  let g:airline#themes#tomorrow#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#tomorrow#palette.replace_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:V1 = airline#themes#get_highlight2(['Normal', 'bg'], ['Constant', 'fg'], 'bold')
+  let s:V2 = airline#themes#get_highlight2(['Constant', 'fg'], ['Normal', 'bg'])
+  let s:V3 = s:N3
+  let g:airline#themes#tomorrow#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#tomorrow#palette.visual_modified = g:airline#themes#tomorrow#palette.normal_modified
+
+  let s:IA = airline#themes#get_highlight2(['NonText', 'fg'], ['CursorLine', 'bg'])
+  let g:airline#themes#tomorrow#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#tomorrow#palette.inactive_modified = {
+        \ 'airline_c': [ group[0], '', group[2], '', '' ]
+        \ }
+endfunction
+
+call airline#themes#tomorrow#refresh()
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/ubaryd.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/ubaryd.vim
new file mode 100644
index 0000000..70232ef
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/ubaryd.vim
@@ -0,0 +1,64 @@
+" vim-airline companion theme of Ubaryd
+" (https://github.com/Donearm/Ubaryd)
+
+" Normal mode
+let s:N1 = [ '#141413' , '#c7b386' , 232 , 252 ] " blackestgravel & bleaksand
+let s:N2 = [ '#c7b386' , '#45413b' , 252, 238 ] " bleaksand & deepgravel
+let s:N3 = [ '#b88853' , '#242321' , 137, 235 ] " toffee & darkgravel
+let s:N4 = [ '#857f78' , 243 ] " gravel
+
+" Insert mode
+let s:I1 = [ '#1a1a18' , '#fade3e' , 232 , 221 ] " blackestgravel & warmcorn
+let s:I2 = [ '#c7b386' , '#45413b' , 252 , 238 ] " bleaksand & deepgravel
+let s:I3 = [ '#f4cf86' , '#242321' , 222 , 235 ] " lighttannedskin & darkgravel
+
+" Visual mode
+let s:V1 = [ '#1c1b1a' , '#9a4820' , 233 , 88 ] " blackgravel & warmadobe
+let s:V2 = [ '#000000' , '#88633f' , 16 , 95 ] " coal & cappuccino
+let s:V3 = [ '#88633f' , '#c7b386' , 95 , 252 ] " cappuccino & bleaksand
+let s:V4 = [ '#c14c3d' , 160 ] " tannedumbrella
+
+" Replace mode
+let s:RE = [ '#c7915b' , 173 ] " nut
+
+" Paste mode
+let s:PA = [ '#f9ef6d' , 154 ] " bleaklemon
+
+let s:IA = [ s:N2[1], s:N3[1], s:N2[3], s:N3[3], '' ]	
+
+let g:airline#themes#ubaryd#palette = {}
+
+let g:airline#themes#ubaryd#palette.accents = {
+      \ 'red': [ '#ff7400' , '' , 196 , '' , '' ],
+      \ }
+
+let g:airline#themes#ubaryd#palette.inactive = {
+      \ 'airline_a' : [ s:N2[1] , s:N3[1] , s:N2[3] , s:N3[3] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#ubaryd#palette.normal_modified = {
+      \ 'airline_a' : [ s:N2[0] , s:N4[0] , s:N2[2] , s:N4[1] , '' ] ,
+      \ 'airline_c' : [ s:V1[1] , s:N2[1] , s:V1[3] , s:N2[3] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#ubaryd#palette.insert_modified = {
+      \ 'airline_c' : [ s:V2[1] , s:N2[1] , s:V2[3] , s:N2[3] , '' ] }
+let g:airline#themes#ubaryd#palette.insert_paste = {
+      \ 'airline_a' : [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , '' ] }
+
+
+let g:airline#themes#ubaryd#palette.replace = copy(airline#themes#ubaryd#palette.insert)
+let g:airline#themes#ubaryd#palette.replace.airline_a = [ s:I1[0] , s:RE[0] , s:I1[2] , s:RE[1] , '' ]
+let g:airline#themes#ubaryd#palette.replace_modified = g:airline#themes#ubaryd#palette.insert_modified
+
+
+let g:airline#themes#ubaryd#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#ubaryd#palette.visual_modified = {
+      \ 'airline_c' : [ s:V3[0] , s:V4[0] , s:V3[2] , s:V4[1] , '' ] }
+
+let g:airline#themes#ubaryd#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#ubaryd#palette.inactive_modified = {
+      \ 'airline_c' : [ s:V1[1] , ''      , s:V1[3] , ''      , '' ] }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/understated.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/understated.vim
new file mode 100644
index 0000000..b3e7917
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/understated.vim
@@ -0,0 +1,43 @@
+let g:airline#themes#understated#palette = {}
+
+let s:N1 = ['#FFFFFF', '#5F87FF', 15, 69]  " Outside blocks in normal mode (mode and file position)
+let s:N2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:N3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+
+let g:airline#themes#understated#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#understated#palette.normal_modified = {'airline_c': ['#ffffff', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:I1 = ['#FFFFFF', '#87AF5F', 15, 107] " Outside blocks in normal mode (mode and file position)
+let s:I2 = ['#AFAF87', '#5F5F5F', 144, 59] " Next blocks inside (branch and file format)
+let s:I3 = ['#AFAF87', '#5F5F5F', 144, 59] " The middle block
+let g:airline#themes#understated#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.insert_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+let g:airline#themes#understated#palette.insert_paste = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, ''] ,}
+
+let g:airline#themes#understated#palette.replace = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#understated#palette.replace.airline_a = ['#FFFFFF', '#870000', 15, 88, '']
+let g:airline#themes#understated#palette.replace_modified = {'airline_c': ['#AFAF87', '#5F5F5F', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#FFFFFF', '#AF5F00', 15, 130]
+let s:V2 = ['#AFAF87', '#5F5F5F', 144, 59]
+let s:V3 = ['#AFAF87', '#5F5F5F', 144, 59]
+let g:airline#themes#understated#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#understated#palette.visual_modified = {'airline_c': [ '#AFAF87', '#5f005f', 144, 59, 'bold'] ,}
+
+let s:V1 = ['#080808', '#FFAF00', 232, 214]
+let s:IA1 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA2 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let s:IA3 = ['#4E4E4E', '#1C1C1C', 239, 234, '']
+let g:airline#themes#understated#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#understated#palette.inactive_modified = {'airline_c': ['#4E4E4E', '', 239, '', 'bold'] ,}
+
+let g:airline#themes#understated#palette.accents = {'red': ['#FF0000', '', 88, '']}
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#understated#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ ['#FFFFFF', '#1C1C1C', 15, 234, '' ],
+      \ ['#FFFFFF', '#262626', 15, 235, '' ],
+      \ ['#FFFFFF', '#303030', 15, 236, 'bold'])
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/vice.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/vice.vim
new file mode 100644
index 0000000..7f88f6d
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/vice.vim
@@ -0,0 +1,72 @@
+" Color definitions
+let s:white = [231, "#ffffff"]
+let s:grey0 = [102, "#878787"] "lightest grey
+let s:grey1 = [238, "#444444"] "mid grey
+let s:grey2 = [235, "#303030"] "darkest grey
+
+let s:pink = [212, "#ff87d7"]
+let s:light_pink = [218, "#ffafdf"]
+let s:hot_pink = [201, "#ff00ff" ]
+
+let s:red = [197, "#ff005f" ]
+
+let s:teal = [123, "#87ffff"]
+let s:light_blue = [159, "#afffff"]
+
+let s:light_yellow = [229, "#ffffaf"]
+
+let s:mint = [158, "#afffd7"]
+let s:dark_mint = [49, "#87af87"]
+
+let s:lavender = [183, "#dfafff"]
+let s:gray_purple = [146, "#afafd7"]
+let s:dark_lavender = [97, "#875faf"]
+
+let s:modified = { 'airline_c': [s:dark_mint[1], s:grey2[1], s:dark_mint[0], s:grey2[0] ] }
+
+let g:airline#themes#vice#palette = {}
+" Normal mode
+let s:N1 = [s:grey1[1], s:teal[1], s:grey1[0], s:teal[0] ]
+let s:N2 = [s:white[1], s:grey2[1], s:white[0], s:grey2[0] ]
+let s:N3 = [s:mint[1], s:grey2[1], s:mint[0], s:grey2[0] ]
+let g:airline#themes#vice#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#vice#palette.normal_modified = s:modified
+
+" Insert mode
+let s:I1 = [s:grey1[1], s:mint[1], s:grey1[0], s:mint[0] ]
+let s:I2 = s:N2
+let s:I3 = s:N3
+let g:airline#themes#vice#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#vice#palette.insert_modified = s:modified
+
+" Visual mode
+let s:V1 = [s:grey1[1], s:pink[1], s:grey1[0], s:pink[0] ]
+let s:V2 = s:N2
+let s:V3 = s:I3
+let g:airline#themes#vice#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#vice#palette.visual_modified = s:modified
+
+" Replace mode
+let s:R1 = [s:hot_pink[1], s:grey2[1], s:hot_pink[0], s:grey2[0] ]
+let s:R2 = s:N2
+let s:R3 = s:I3
+let g:airline#themes#vice#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#vice#palette.replace_modified = s:modified
+
+" Inactive mode
+let s:IN1 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ]
+let s:IN2 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ]
+let s:IN3 = [s:grey0[1], s:grey1[1], s:grey0[0], s:grey1[0] ]
+let g:airline#themes#vice#palette.inactive = airline#themes#generate_color_map(s:IN1, s:IN2, s:IN3)
+let g:airline#themes#vice#palette.inactive_modified = s:modified
+
+" CtrlP
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+
+let s:CP1 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ]
+let s:CP2 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ]
+let s:CP3 = [s:white[1], s:grey1[1], s:white[0], s:grey1[0] ]
+
+let g:airline#themes#vice#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(s:CP1, s:CP2, s:CP3)
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/wombat.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/wombat.vim
new file mode 100644
index 0000000..622683f
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/wombat.vim
@@ -0,0 +1,90 @@
+" vim-airline companion theme of Wombat
+" looks great with wombat256 vim colorscheme
+
+" Normal mode
+"          [ guifg, guibg, ctermfg, ctermbg, opts ]
+let s:N1 = [ '#141413' , '#CAE682' , 232 , 192 ] " mode
+let s:N2 = [ '#CAE682' , '#32322F' , 192 , 238 ] " info
+let s:N3 = [ '#CAE682' , '#242424' , 192 , 235 ] " statusline
+let s:N4 = [ '#86CD74' , 113 ]                   " mode modified
+
+" Insert mode
+let s:I1 = [ '#141413' , '#FDE76E' , 232 , 227 ]
+let s:I2 = [ '#FDE76E' , '#32322F' , 227 , 238 ]
+let s:I3 = [ '#FDE76E' , '#242424' , 227 , 235 ]
+let s:I4 = [ '#FADE3E' , 221 ]
+
+" Visual mode
+let s:V1 = [ '#141413' , '#B5D3F3' , 232 , 153 ]
+let s:V2 = [ '#B5D3F3' , '#32322F' , 153 , 238 ]
+let s:V3 = [ '#B5D3F3' , '#242424' , 153 , 235 ]
+let s:V4 = [ '#7CB0E6' , 111 ]
+
+" Replace mode
+let s:R1 = [ '#141413' , '#E5786D' , 232 , 173 ]
+let s:R2 = [ '#E5786D' , '#32322F' , 173 , 238 ]
+let s:R3 = [ '#E5786D' , '#242424' , 173 , 235 ]
+let s:R4 = [ '#E55345' , 203 ]
+
+" Paste mode
+let s:PA = [ '#94E42C' , 47 ]
+
+" Info modified
+let s:IM = [ '#40403C' , 238 ]
+
+" Inactive mode
+let s:IA = [ '#767676' , s:N3[1] , 243 , s:N3[3] , '' ]
+
+let g:airline#themes#wombat#palette = {}
+
+let g:airline#themes#wombat#palette.accents = {
+      \ 'red': [ '#E5786D' , '' , 203 , '' , '' ],
+      \ }
+
+let g:airline#themes#wombat#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#wombat#palette.normal_modified = {
+    \ 'airline_a': [ s:N1[0] , s:N4[0] , s:N1[2] , s:N4[1] , ''     ] ,
+    \ 'airline_b': [ s:N4[0] , s:IM[0] , s:N4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:N4[0] , s:N3[1] , s:N4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#wombat#palette.insert_modified = {
+    \ 'airline_a': [ s:I1[0] , s:I4[0] , s:I1[2] , s:I4[1] , ''     ] ,
+    \ 'airline_b': [ s:I4[0] , s:IM[0] , s:I4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:I4[0] , s:N3[1] , s:I4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#wombat#palette.visual_modified = {
+    \ 'airline_a': [ s:V1[0] , s:V4[0] , s:V1[2] , s:V4[1] , ''     ] ,
+    \ 'airline_b': [ s:V4[0] , s:IM[0] , s:V4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:V4[0] , s:N3[1] , s:V4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+let g:airline#themes#wombat#palette.replace_modified = {
+    \ 'airline_a': [ s:R1[0] , s:R4[0] , s:R1[2] , s:R4[1] , ''     ] ,
+    \ 'airline_b': [ s:R4[0] , s:IM[0] , s:R4[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:R4[0] , s:N3[1] , s:R4[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.insert_paste = {
+    \ 'airline_a': [ s:I1[0] , s:PA[0] , s:I1[2] , s:PA[1] , ''     ] ,
+    \ 'airline_b': [ s:PA[0] , s:IM[0] , s:PA[1] , s:IM[1] , ''     ] ,
+    \ 'airline_c': [ s:PA[0] , s:N3[1] , s:PA[1] , s:N3[3] , ''     ] }
+
+
+let g:airline#themes#wombat#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+let g:airline#themes#wombat#palette.inactive_modified = {
+    \ 'airline_c': [ s:N4[0] , ''      , s:N4[1] , ''      , ''     ] }
+
+
+if !get(g:, 'loaded_ctrlp', 0)
+  finish
+endif
+let g:airline#themes#wombat#palette.ctrlp = airline#extensions#ctrlp#generate_color_map(
+      \ [ '#DADADA' , '#242424' , 253 , 234 , ''     ] ,
+      \ [ '#DADADA' , '#40403C' , 253 , 238 , ''     ] ,
+      \ [ '#141413' , '#DADADA' , 232 , 253 , 'bold' ] )
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/xtermlight.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/xtermlight.vim
new file mode 100644
index 0000000..21d349e
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/xtermlight.vim
@@ -0,0 +1,45 @@
+let g:airline#themes#xtermlight#palette = {}
+
+let s:N1 = [ '#eeeeee' , '#005fff' , 255 , 27  ]
+let s:N2 = [ '#000087' , '#00d7ff' , 18  , 45  ]
+let s:N3 = [ '#005fff' , '#afffff' , 27  , 159 ]
+let g:airline#themes#xtermlight#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+let g:airline#themes#xtermlight#palette.normal_modified = {
+      \ 'airline_c': [ '#d70000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:I1 = [ '#eeeeee' , '#00875f' , 255 , 29  ]
+let s:I2 = [ '#005f00' , '#00d787' , 22  , 42  ]
+let s:I3 = [ '#005f5f' , '#afff87' , 23  , 156 ]
+let g:airline#themes#xtermlight#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+let g:airline#themes#xtermlight#palette.insert_modified = {
+      \ 'airline_c': [ '#d70000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+let g:airline#themes#xtermlight#palette.insert_paste = {
+      \ 'airline_a': [ s:I1[0]   , '#d78700' , s:I1[2] , 172     , ''     ] ,
+      \ }
+
+
+let g:airline#themes#xtermlight#palette.replace = copy(g:airline#themes#xtermlight#palette.insert)
+let g:airline#themes#xtermlight#palette.replace.airline_a = [ s:I2[0]   , '#ff0000' , s:I1[2] , 196     , ''     ]
+let g:airline#themes#xtermlight#palette.replace_modified = g:airline#themes#xtermlight#palette.insert_modified
+
+
+let s:V1 = [ '#eeeeee' , '#ff5f00' , 255 , 202 ]
+let s:V2 = [ '#5f0000' , '#ffaf00' , 52  , 214 ]
+let s:V3 = [ '#d75f00' , '#ffff87' , 166 , 228 ]
+let g:airline#themes#xtermlight#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+let g:airline#themes#xtermlight#palette.visual_modified = {
+      \ 'airline_c': [ '#d70000' , '#ffdfdf' , 160     , 224     , ''     ] ,
+      \ }
+
+
+let s:IA1 = [ '#6c6c6c' , '#b2b2b2' , 242 , 249 , '' ]
+let s:IA2 = [ '#8a8a8a' , '#d0d0d0' , 245 , 252 , '' ]
+let s:IA3 = [ '#a8a8a8' , '#eeeeee' , 248 , 255 , '' ]
+let g:airline#themes#xtermlight#palette.inactive = airline#themes#generate_color_map(s:IA1, s:IA2, s:IA3)
+let g:airline#themes#xtermlight#palette.inactive_modified = {
+      \ 'airline_c': [ '#d70000' , ''        , 160     , ''      , ''     ] ,
+      \ }
+
diff --git a/vim/plugins/vim-airline-themes/autoload/airline/themes/zenburn.vim b/vim/plugins/vim-airline-themes/autoload/airline/themes/zenburn.vim
new file mode 100644
index 0000000..9883c21
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/autoload/airline/themes/zenburn.vim
@@ -0,0 +1,44 @@
+let g:airline#themes#zenburn#palette = {}
+
+function! airline#themes#zenburn#refresh()
+  let g:airline#themes#zenburn#palette.accents = {
+        \ 'red': airline#themes#get_highlight('Constant'),
+        \ }
+
+  let s:N1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Folded', 'fg'], 'bold')
+  let s:N2 = airline#themes#get_highlight('Folded')
+  let s:N3 = airline#themes#get_highlight('NonText')
+
+  let g:airline#themes#zenburn#palette.normal = airline#themes#generate_color_map(s:N1, s:N2, s:N3)
+  let s:Nmod = airline#themes#get_highlight('Comment')
+  let g:airline#themes#zenburn#palette.normal_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+
+  let s:I1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['String', 'fg'], 'bold')
+  let s:I2 = airline#themes#get_highlight2(['String', 'fg'], ['Folded', 'bg'])
+  let s:I3 = s:N3
+  let g:airline#themes#zenburn#palette.insert = airline#themes#generate_color_map(s:I1, s:I2, s:I3)
+  let g:airline#themes#zenburn#palette.insert_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:R1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Comment', 'fg'], 'bold')
+  let s:R2 = airline#themes#get_highlight2(['Comment', 'fg'], ['Folded', 'bg'])
+  let s:R3 = s:N3
+  let g:airline#themes#zenburn#palette.replace = airline#themes#generate_color_map(s:R1, s:R2, s:R3)
+  let g:airline#themes#zenburn#palette.replace_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:V1 = airline#themes#get_highlight2(['DbgCurrent', 'bg'], ['Identifier', 'fg'], 'bold')
+  let s:V2 = airline#themes#get_highlight2(['Identifier', 'fg'], ['Folded', 'bg'])
+  let s:V3 = s:N3
+  let g:airline#themes#zenburn#palette.visual = airline#themes#generate_color_map(s:V1, s:V2, s:V3)
+  let g:airline#themes#zenburn#palette.visual_modified = g:airline#themes#zenburn#palette.normal_modified
+
+  let s:IA = airline#themes#get_highlight('NonText')
+  let g:airline#themes#zenburn#palette.inactive = airline#themes#generate_color_map(s:IA, s:IA, s:IA)
+  let g:airline#themes#zenburn#palette.inactive_modified = {
+        \ 'airline_c': s:Nmod
+        \ }
+endfunction
+
+call airline#themes#zenburn#refresh()
+
diff --git a/vim/plugins/vim-airline-themes/doc/airline-themes.txt b/vim/plugins/vim-airline-themes/doc/airline-themes.txt
new file mode 100644
index 0000000..b0f52fc
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/doc/airline-themes.txt
@@ -0,0 +1,223 @@
+*airline-themes.txt*  Themes for vim-airline
+                   _                       _      _ _                        ~
+            __   _(_)_ __ ___         __ _(_)_ __| (_)_ __   ___             ~
+            \ \ / / | '_ ` _ \ _____ / _` | | '__| | | '_ \ / _ \            ~
+             \ V /| | | | | | |_____| (_| | | |  | | | | | |  __/            ~
+              \_/ |_|_| |_| |_|      \__,_|_|_|  |_|_|_| |_|\___|            ~
+                                                                             ~
+==============================================================================
+CONTENTS                                           *airline-theme-contents*
+
+   01. Intro ........................................ |airline-themes-intro|
+   02. Features ........................................... |airline-themes|
+   03. Configuration ........................ |airline-themes-configuration|
+   04. Contributions ........................ |airline-themes-contributions|
+   05. License .................................... |airline-themes-license|
+
+==============================================================================
+INTRODUCTION                                         *airline-themes-intro*
+
+This is a plugin for vim-airline and provides several themes to be used in
+conjuction with |vim-airline|
+
+==============================================================================
+FEATURES                                              *airline-themes-list*
+
+Currently this repository contains the following themes:
+
+    * alduin
+    * aurora
+    * badcat
+    * badwolf
+    * base16 (|airline-theme-base16|)
+    * base16_shell (|airline-theme-base16_shell|)
+    * base16_3024
+    * base16_apathy
+    * base16_ashes
+    * base16_atelierdune
+    * base16_atelierforest
+    * base16_atelierheath
+    * base16_atelierlakeside
+    * base16_atelierseaside
+    * base16_bespin
+    * base16_brewer
+    * base16_bright
+    * base16_chalk
+    * base16_codeschool
+    * base16_colors
+    * base16_default
+    * base16_eighties
+    * base16_embers
+    * base16_flat
+    * base16_google
+    * base16_grayscale
+    * base16_greenscreen
+    * base16_harmonic16
+    * base16_hopscotch
+    * base16_isotope
+    * base16_londontube
+    * base16_marrakesh
+    * base16_mocha
+    * base16_monokai
+    * base16_ocean
+    * base16_oceanicnext
+    * base16_paraiso
+    * base16_pop
+    * base16_railscasts
+    * base16_seti
+    * base16_shapeshifter
+    * base16_solarized
+    * base16_spacemacs
+    * base16_summerfruit
+    * base16_tomorrow
+    * base16_twilight
+    * base16color
+    * behelit
+    * bubblegum
+    * cobalt2
+    * cool
+    * dark
+    * distinguished
+    * durant
+    * hybrid
+    * hybridline
+    * jay
+    * jellybeans
+    * kalisi
+    * kolor
+    * laederon
+    * light
+    * lucius
+    * luna
+    * minimalist
+    * molokai
+    * monochrome
+    * murmur
+    * onedark (|airline-theme-onedark|)
+    * papercolor
+    * powerlineish
+    * qwq
+    * raven
+    * ravenpower
+    * serene
+    * sierra
+    * silver
+    * simple
+    * sol
+    * solarized (|airline-theme-solarized|)
+    * term
+    * tomorrow
+    * ubaryd
+    * understated
+    * vice
+    * wombat
+    * xtermlight
+    * zenburn
+
+==============================================================================
+NAME                                         *airline-themes-configuration*
+
+						    *g:airline_theme*
+
+To define a theme to be used by vim-airline you can set the variable
+g:airline_theme in your |.vimrc|  like this: >
+
+    :let g:airline_theme='dark'
+<
+                                                  *airline-theme-solarized*
+*g:solarized_base16*
+
+Base16 has a Solarized theme with the usual colors, but mapped in the
+terminal differently.  The main difference is that the bright colors,
+Ansi 9-15, are left the same as their Ansi 1-7 counterparts.  The
+remaining solarized colors are mapped into higher indexes by using
+Base16 Shell.  To enable it:
+>
+    let g:solarized_base16 = 1
+>
+See also https://github.com/blueyed/vim-colors-solarized/commit/92f2f994.
+
+*g:airline_solarized_normal_green*
+
+Turns the outer-most section of the statusline Solarized green, making it
+look more like classic powerline in normal mode. To enable it:
+>
+    let g:airline_solarized_normal_green = 1
+<
+
+*g:airline_solarized_dark_inactive_border*
+
+Changes inactive window panes to have a dark bottom border instead
+of light by default. To enable it:
+>
+    let g:airline_solarized_dark_inactive_border = 1
+<
+                                                    *airline-theme-base16*
+Base16 is a popular theme from Chris Kempson
+(https://github.com/chriskempson/base16-vim)
+
+The default theme is base16, all other base16-themes have been generated and
+might not support all options.
+
+*g:airline_base16_improved_contrast*
+
+Improves the contrast for the inactive statusline. To enable it: >
+
+    let g:airline_base16_improved_contrast = 1
+<
+
+*airline#themes#base16#constant*
+
+Uses a predefined colorpalette for defining the colors, instead of guessing
+the values from other highlight groups. To enable it: >
+
+    let g:airline#themes#base16#constant = 1
+<
+                                                  *airline-theme-base16-shell*
+
+base16_shell theme for vim-airline matches your active Base16 Shell theme.
+
+It should be used in combination with Base16 Shell, which sets the correct
+colors in the terminal: (https://github.com/chriskempson/base16-shell). The
+colors used in this theme are within the 21 term colors set by Base16 Shell.
+The theme supports 2 options described below.
+
+*g:airline_base16_oceanicnext*
+
+Allow 256 color use of the base16_oceanicnext theme. Without this setting
+base16_oceanicnext may look incorrect in 256 color mode. To enable it: >
+
+    let base16colorspace = 256
+
+*g:airline_base16_solarized*
+
+Adjusts the colors to match base16_solarized shell theme. You may also try to
+use it with other Base16 Shell themes. To enable it: >
+
+    let g:airline_base16_solarized = 1
+<
+                                                       *airline-theme-onedark*
+
+*g:onedark_termcolors*
+
+Set to 256 for 256-color mode (the default), or 16 for 16-color mode.
+Has no effect if using true/24-bit color. To enable 16-color mode: >
+
+    let g:onedark_termcolors = 16
+<
+
+16-color mode is intended to be used with specific terminal colors as
+described in the installation notes for the joshdick/onedark.vim colorscheme:
+(https://github.com/joshdick/onedark.vim#installation)
+
+==============================================================================
+CONTRIBUTIONS                                *airline-themes-contributions*
+
+Contributions and pull requests are welcome.
+
+==============================================================================
+LICENSE                                            *airline-themes-license*
+
+MIT License.  Copyright © 2013-2016 Bailey Ling, et al
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/vim-airline-themes/plugin/airline-themes.vim b/vim/plugins/vim-airline-themes/plugin/airline-themes.vim
new file mode 100644
index 0000000..1be6b47
--- /dev/null
+++ b/vim/plugins/vim-airline-themes/plugin/airline-themes.vim
@@ -0,0 +1,7 @@
+" MIT License. Copyright (c) 2013-2016 Bailey Ling & Contributors.
+" vim: et ts=2 sts=2 sw=2
+
+if (exists('g:loaded_airline_themes') && g:loaded_airline_themes)
+  finish
+endif
+let g:loaded_airline_themes = 1
diff --git a/vim/plugins/vim-airline/.gitignore b/vim/plugins/vim-airline/.gitignore
new file mode 100644
index 0000000..38ec5a0
--- /dev/null
+++ b/vim/plugins/vim-airline/.gitignore
@@ -0,0 +1,4 @@
+doc/tags
+*.lock
+.vim-flavor
+*.swp
diff --git a/vim/plugins/vim-airline/.travis.yml b/vim/plugins/vim-airline/.travis.yml
new file mode 100644
index 0000000..54deccf
--- /dev/null
+++ b/vim/plugins/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/vim-airline/CHANGELOG.md b/vim/plugins/vim-airline/CHANGELOG.md
new file mode 100644
index 0000000..b37ee18
--- /dev/null
+++ b/vim/plugins/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/vim-airline/CONTRIBUTING.md b/vim/plugins/vim-airline/CONTRIBUTING.md
new file mode 100644
index 0000000..f97699e
--- /dev/null
+++ b/vim/plugins/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/vim-airline/Gemfile b/vim/plugins/vim-airline/Gemfile
new file mode 100644
index 0000000..088f22e
--- /dev/null
+++ b/vim/plugins/vim-airline/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'vim-flavor', '~> 1.1'
diff --git a/vim/plugins/vim-airline/ISSUE_TEMPLATE.md b/vim/plugins/vim-airline/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..a0a1a05
--- /dev/null
+++ b/vim/plugins/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/vim-airline/LICENSE b/vim/plugins/vim-airline/LICENSE
new file mode 100644
index 0000000..875acca
--- /dev/null
+++ b/vim/plugins/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/vim-airline/README.md b/vim/plugins/vim-airline/README.md
new file mode 100644
index 0000000..ca38646
--- /dev/null
+++ b/vim/plugins/vim-airline/README.md
@@ -0,0 +1,259 @@
+# 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], [vimagit][50], [denite][51] 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)
+
+#### [denite.nvim][51]
+![image](https://cloud.githubusercontent.com/assets/246230/23939717/f65bce6e-099c-11e7-85c3-918dbc839392.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)
+
+#### [vimagit][50]
+![vim-airline-vimagit-demo](https://cloud.githubusercontent.com/assets/533068/22107273/2ea85ba0-de4d-11e6-9fa8-331103b88df4.gif)
+
+#### [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)
+
+#### [xkb-switch][48]/[xkb-layout][49]
+![image](https://cloud.githubusercontent.com/assets/5715281/22061422/347e7842-ddb8-11e6-8bdb-7abbd418653c.gif)
+
+#### [vimtex][53]
+![image](https://cloud.githubusercontent.com/assets/1798172/25799740/e77d5c2e-33ee-11e7-8660-d34ce4c5f13f.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:
+
+| Plugin Manager | Install with... |
+| ------------- | ------------- |
+| [Pathogen][11] | `git clone https://github.com/vim-airline/vim-airline ~/.vim/bundle/vim-airline`<br/>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' ])` |
+| [Dein][52] | `call dein#add('vim-airline/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
+[48]: https://github.com/ierton/xkb-switch
+[49]: https://github.com/vovkasm/input-source-switcher
+[50]: https://github.com/jreybert/vimagit
+[51]: https://github.com/Shougo/denite.nvim
+[52]: https://github.com/Shougo/dein.vim
+[53]: https://github.com/lervag/vimtex
diff --git a/vim/plugins/vim-airline/Rakefile b/vim/plugins/vim-airline/Rakefile
new file mode 100644
index 0000000..741cfc2
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline.vim b/vim/plugins/vim-airline/autoload/airline.vim
new file mode 100644
index 0000000..23d7fc7
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/builder.vim b/vim/plugins/vim-airline/autoload/airline/builder.vim
new file mode 100644
index 0000000..d87ddfe
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/builder.vim
@@ -0,0 +1,210 @@
+" 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
+
+  " only check, if airline#skip_empty_sections == 1
+  if get(w:, 'airline_skip_empty_sections', -1) == 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/vim-airline/autoload/airline/debug.vim b/vim/plugins/vim-airline/autoload/airline/debug.vim
new file mode 100644
index 0000000..18fc126
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions.vim b/vim/plugins/vim-airline/autoload/airline/extensions.vim
new file mode 100644
index 0000000..a3c05be
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions.vim
@@ -0,0 +1,340 @@
+" 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 get(g:, 'loaded_denite', 0)
+    call airline#extensions#denite#init(s:ext)
+    call add(loaded_ext, 'denite')
+  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#vimagit#enabled', 1)
+        \ && (exists('g:loaded_magit'))
+    call airline#extensions#vimagit#init(s:ext)
+    call add(loaded_ext, 'vimagit')
+  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#xkblayout#enabled', 1) && exists('g:XkbSwitchLib'))
+    call airline#extensions#xkblayout#init(s:ext)
+    call add(loaded_ext, 'xkblayout')
+  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
+
+  runtime autoload/vimtex.vim
+  if (get(g:, 'airline#extensions#vimtex#enabled', 1)) && exists('*vimtex#init')
+   call airline#extensions#vimtex#init(s:ext)
+   call add(loaded_ext, 'vimtex')
+  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/vim-airline/autoload/airline/extensions/ale.vim b/vim/plugins/vim-airline/autoload/airline/extensions/ale.vim
new file mode 100644
index 0000000..84b1b36
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/branch.vim b/vim/plugins/vim-airline/autoload/airline/extensions/branch.vim
new file mode 100644
index 0000000..aa66457
--- /dev/null
+++ b/vim/plugins/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('LC_ALL=C 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
+    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/vim-airline/autoload/airline/extensions/bufferline.vim b/vim/plugins/vim-airline/autoload/airline/extensions/bufferline.vim
new file mode 100644
index 0000000..8ca825f
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/capslock.vim b/vim/plugins/vim-airline/autoload/airline/extensions/capslock.vim
new file mode 100644
index 0000000..d79c24e
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/commandt.vim b/vim/plugins/vim-airline/autoload/airline/extensions/commandt.vim
new file mode 100644
index 0000000..93c6572
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/csv.vim b/vim/plugins/vim-airline/autoload/airline/extensions/csv.vim
new file mode 100644
index 0000000..b95aacd
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/ctrlp.vim b/vim/plugins/vim-airline/autoload/airline/extensions/ctrlp.vim
new file mode 100644
index 0000000..3781108
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/ctrlspace.vim b/vim/plugins/vim-airline/autoload/airline/extensions/ctrlspace.vim
new file mode 100644
index 0000000..57183d7
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/default.vim b/vim/plugins/vim-airline/autoload/airline/extensions/default.vim
new file mode 100644
index 0000000..7c209a1
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/denite.vim b/vim/plugins/vim-airline/autoload/airline/extensions/denite.vim
new file mode 100644
index 0000000..672efbd
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/denite.vim
@@ -0,0 +1,44 @@
+" MIT License. Copyright (c) 2017 Thomas Dy
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !get(g:, 'loaded_denite', 0)
+  finish
+endif
+
+" Denite does not use vim's built-in modal editing but has a custom prompt
+" that implements its own insert/normal mode so we have to handle changing the
+" highlight
+function! airline#extensions#denite#check_denite_mode(bufnr)
+  let l:mode = split(denite#get_status_mode(), ' ')
+  let l:mode = tolower(l:mode[1])
+  call airline#highlighter#highlight([l:mode], a:bufnr)
+  return ''
+endfunction
+
+function! airline#extensions#denite#apply(...)
+  if &ft == 'denite'
+    let w:airline_skip_empty_sections = 0
+    call a:1.add_section('airline_a', ' Denite %{airline#extensions#denite#check_denite_mode('.a:2['bufnr'].')}')
+    call a:1.add_section('airline_c', ' %{denite#get_status_sources()}')
+    call a:1.split()
+    call a:1.add_section('airline_y', ' %{denite#get_status_path()} ')
+    call a:1.add_section('airline_z', ' %{denite#get_status_linenr()} ')
+    return 1
+  endif
+endfunction
+
+function! airline#extensions#denite#init(ext)
+  call denite#custom#option('_', 'statusline', 0)
+  call a:ext.add_statusline_func('airline#extensions#denite#apply')
+
+  " airline#extensions#denite#apply normally gets called only after the
+  " denite window gets closed, so we have to call airline#update_statusline
+  " ourselves to make sure it's applied when the window is opened.
+  augroup airline_denite
+    autocmd!
+    autocmd FileType denite call airline#update_statusline()
+  augroup END
+endfunction
+
diff --git a/vim/plugins/vim-airline/autoload/airline/extensions/eclim.vim b/vim/plugins/vim-airline/autoload/airline/extensions/eclim.vim
new file mode 100644
index 0000000..44f1bb5
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/example.vim b/vim/plugins/vim-airline/autoload/airline/extensions/example.vim
new file mode 100644
index 0000000..c81f6c3
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/hunks.vim b/vim/plugins/vim-airline/autoload/airline/extensions/hunks.vim
new file mode 100644
index 0000000..02a8ff4
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/neomake.vim b/vim/plugins/vim-airline/autoload/airline/extensions/neomake.vim
new file mode 100644
index 0000000..6587f87
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/netrw.vim b/vim/plugins/vim-airline/autoload/airline/extensions/netrw.vim
new file mode 100644
index 0000000..7af76d6
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/nrrwrgn.vim b/vim/plugins/vim-airline/autoload/airline/extensions/nrrwrgn.vim
new file mode 100644
index 0000000..4629915
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/obsession.vim b/vim/plugins/vim-airline/autoload/airline/extensions/obsession.vim
new file mode 100644
index 0000000..ca0fc16
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/po.vim b/vim/plugins/vim-airline/autoload/airline/extensions/po.vim
new file mode 100644
index 0000000..6536436
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/po.vim
@@ -0,0 +1,93 @@
+" 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
+    if has_key(s:jobs, self.file)
+      call remove(s:jobs, self.file)
+    endif
+    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/vim-airline/autoload/airline/extensions/promptline.vim b/vim/plugins/vim-airline/autoload/airline/extensions/promptline.vim
new file mode 100644
index 0000000..9b76a1a
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/quickfix.vim b/vim/plugins/vim-airline/autoload/airline/extensions/quickfix.vim
new file mode 100644
index 0000000..3441c3d
--- /dev/null
+++ b/vim/plugins/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 && get(dict[0], 'quickfix', 0) && !get(dict[0], 'loclist', 0)
+      return g:airline#extensions#quickfix#quickfix_text
+    elseif len(dict) > 0 && get(dict[0], 'quickfix', 0) && get(dict[0], 'loclist', 0)
+      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/vim-airline/autoload/airline/extensions/syntastic.vim b/vim/plugins/vim-airline/autoload/airline/extensions/syntastic.vim
new file mode 100644
index 0000000..adf5460
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline.vim
new file mode 100644
index 0000000..cadb399
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/autoshow.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/autoshow.vim
new file mode 100644
index 0000000..a6782a8
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/buffers.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/buffers.vim
new file mode 100644
index 0000000..31ad4da
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/buflist.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/buflist.vim
new file mode 100644
index 0000000..f49eabc
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/ctrlspace.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/ctrlspace.vim
new file mode 100644
index 0000000..e2a1032
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/formatters/default.vim
new file mode 100644
index 0000000..1ecce32
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail.vim
new file mode 100644
index 0000000..d9c7d6a
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/formatters/unique_tail_improved.vim
new file mode 100644
index 0000000..e860bd8
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tabline/tabs.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tabline/tabs.vim
new file mode 100644
index 0000000..63beee1
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tagbar.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tagbar.vim
new file mode 100644
index 0000000..7e7665a
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/tmuxline.vim b/vim/plugins/vim-airline/autoload/airline/extensions/tmuxline.vim
new file mode 100644
index 0000000..078d5dc
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/undotree.vim b/vim/plugins/vim-airline/autoload/airline/extensions/undotree.vim
new file mode 100644
index 0000000..36f8b9b
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/unicode.vim b/vim/plugins/vim-airline/autoload/airline/extensions/unicode.vim
new file mode 100644
index 0000000..30cb796
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/unite.vim b/vim/plugins/vim-airline/autoload/airline/extensions/unite.vim
new file mode 100644
index 0000000..9467a7d
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/vimagit.vim b/vim/plugins/vim-airline/autoload/airline/extensions/vimagit.vim
new file mode 100644
index 0000000..400792e
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/vimagit.vim
@@ -0,0 +1,30 @@
+" MIT License. Copyright (c) 2016 Jerome Reybert
+" vim: et ts=2 sts=2 sw=2
+
+" This plugin replace the whole section_a when in vimagit buffer
+scriptencoding utf-8
+
+if !get(g:, 'loaded_magit', 0)
+  finish
+endif
+
+function! airline#extensions#vimagit#init(ext)
+  call a:ext.add_statusline_func('airline#extensions#vimagit#apply')
+endfunction
+
+function! airline#extensions#vimagit#get_mode()
+	if ( b:magit_current_commit_mode == '' )
+		return "STAGING"
+	elseif ( b:magit_current_commit_mode == 'CC' )
+		return "COMMIT"
+	elseif ( b:magit_current_commit_mode == 'CA' )
+		return "AMEND"
+	else
+		return "???"
+endfunction
+
+function! airline#extensions#vimagit#apply(...)
+  if ( &filetype == 'magit' )
+    let w:airline_section_a = '%{airline#extensions#vimagit#get_mode()}'
+  endif
+endfunction
diff --git a/vim/plugins/vim-airline/autoload/airline/extensions/vimtex.vim b/vim/plugins/vim-airline/autoload/airline/extensions/vimtex.vim
new file mode 100644
index 0000000..ed44795
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/vimtex.vim
@@ -0,0 +1,81 @@
+scriptencoding utf-8
+
+let s:spc = g:airline_symbols.space
+
+function! s:SetDefault(var, val)
+  if !exists(a:var)
+    execute 'let ' . a:var . '=' . string(a:val)
+  endif
+endfunction
+
+" Left and right delimiters (added only when status string is not empty)
+call s:SetDefault( 'g:airline#extensions#vimtex#left',       "{")
+call s:SetDefault( 'g:airline#extensions#vimtex#right',      "}")
+
+" The current tex file is the main project file
+call s:SetDefault( 'g:airline#extensions#vimtex#main',       "" )
+"
+" The current tex file is a subfile of the project
+" and the compilation is set for the main file
+call s:SetDefault( 'g:airline#extensions#vimtex#sub_main',   "m")
+"
+" The current tex file is a subfile of the project
+" and the compilation is set for this subfile
+call s:SetDefault( 'g:airline#extensions#vimtex#sub_local',  "l")
+"
+" Compilation is running and continuous compilation is off
+call s:SetDefault( 'g:airline#extensions#vimtex#compiled',   "c₁")
+
+" Compilation is running and continuous compilation is on
+call s:SetDefault( 'g:airline#extensions#vimtex#continuous', "c")
+
+" Viewer is opened
+call s:SetDefault( 'g:airline#extensions#vimtex#viewer',     "v")
+
+function! airline#extensions#vimtex#init(ext)
+  call airline#parts#define_raw('vimtex', '%{airline#extensions#vimtex#get_scope()}')
+  call a:ext.add_statusline_func('airline#extensions#vimtex#apply')
+endfunction
+
+function! airline#extensions#vimtex#apply(...)
+  if exists("b:vimtex")
+    let w:airline_section_x = get(w:, 'airline_section_x', g:airline_section_x)
+    let w:airline_section_x.=s:spc.g:airline_left_alt_sep.s:spc.'%{airline#extensions#vimtex#get_scope()}'
+  endif
+endfunction
+
+function! airline#extensions#vimtex#get_scope()
+  let l:status = ''
+
+  let vt_local = get(b:, 'vimtex_local', {})
+  if empty(vt_local)
+    let l:status .= g:airline#extensions#vimtex#main
+  else
+    if get(vt_local, 'active')
+      let l:status .= g:airline#extensions#vimtex#sub_local
+    else
+      let l:status .= g:airline#extensions#vimtex#sub_main
+    endif
+  endif
+
+  if get(get(get(b:, 'vimtex', {}), 'viewer', {}), 'xwin_id')
+    let l:status .= g:airline#extensions#vimtex#viewer
+  endif
+
+  let l:compiler = get(get(b:, 'vimtex', {}), 'compiler', {})
+  if !empty(l:compiler)
+    if has_key(l:compiler, 'is_running') && b:vimtex.compiler.is_running()
+      if get(l:compiler, 'continuous')
+        let l:status .= g:airline#extensions#vimtex#continuous
+      else
+        let l:status .= g:airline#extensions#vimtex#compiled
+      endif
+    endif
+  endif
+
+  if !empty(l:status)
+    let l:status = g:airline#extensions#vimtex#left . l:status . g:airline#extensions#vimtex#right
+  endif
+  return l:status
+endfunction
+
diff --git a/vim/plugins/vim-airline/autoload/airline/extensions/virtualenv.vim b/vim/plugins/vim-airline/autoload/airline/extensions/virtualenv.vim
new file mode 100644
index 0000000..0364434
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/whitespace.vim b/vim/plugins/vim-airline/autoload/airline/extensions/whitespace.vim
new file mode 100644
index 0000000..861fb28
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/whitespace.vim
@@ -0,0 +1,163 @@
+" 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', '[%s]trailing')
+let s:mixed_indent_format = get(g:, 'airline#extensions#whitespace#mixed_indent_format', '[%s]mixed-indent')
+let s:long_format = get(g:, 'airline#extensions#whitespace#long_format', '[%s]long')
+let s:mixed_indent_file_format = get(g:, 'airline#extensions#whitespace#mixed_indent_file_format', '[%s]mix-indent-file')
+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#disable()
+  if s:enabled
+    call airline#extensions#whitespace#toggle()
+  endif
+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/vim-airline/autoload/airline/extensions/windowswap.vim b/vim/plugins/vim-airline/autoload/airline/extensions/windowswap.vim
new file mode 100644
index 0000000..fde010d
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/wordcount.vim b/vim/plugins/vim-airline/autoload/airline/extensions/wordcount.vim
new file mode 100644
index 0000000..4227769
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/wordcount/formatters/default.vim b/vim/plugins/vim-airline/autoload/airline/extensions/wordcount/formatters/default.vim
new file mode 100644
index 0000000..bb49c3f
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/extensions/xkblayout.vim b/vim/plugins/vim-airline/autoload/airline/extensions/xkblayout.vim
new file mode 100644
index 0000000..a9aef83
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/extensions/xkblayout.vim
@@ -0,0 +1,25 @@
+" MIT License. Copyright (c) 2017 YoungHoon Rhiu.
+" vim: et ts=2 sts=2 sw=2
+
+scriptencoding utf-8
+
+if !exists('g:XkbSwitchLib')
+  finish
+endif
+
+function! airline#extensions#xkblayout#status()
+  let keyboard_layout = libcall(g:XkbSwitchLib, 'Xkb_Switch_getXkbLayout', '')
+  let keyboard_layout = split(keyboard_layout, '\.')[-1]
+  let short_codes = {'2SetKorean': 'KR', 'Chinese': 'CN', 'Japanese': 'JP'}
+
+  if has_key(short_codes, keyboard_layout)
+    let keyboard_layout = short_codes[keyboard_layout]
+  endif
+
+  return keyboard_layout
+endfunction
+
+function! airline#extensions#xkblayout#init(ext)
+  call airline#parts#define_function('xkblayout', 'airline#extensions#xkblayout#status')
+endfunction
+
diff --git a/vim/plugins/vim-airline/autoload/airline/extensions/ycm.vim b/vim/plugins/vim-airline/autoload/airline/extensions/ycm.vim
new file mode 100644
index 0000000..a254b4b
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/highlighter.vim b/vim/plugins/vim-airline/autoload/airline/highlighter.vim
new file mode 100644
index 0000000..16ae66e
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/highlighter.vim
@@ -0,0 +1,225 @@
+" 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 = ''
+  if hlexists(a:group)
+    let color = synIDattr(synIDtrans(hlID(a:group)), a:what, g:airline_gui_mode)
+  endif
+  if empty(color) || color == -1
+    " should always exists
+    let color = synIDattr(synIDtrans(hlID('Normal')), a:what, g:airline_gui_mode)
+    " however, just in case
+    if empty(color) || color == -1
+      let color = 'NONE'
+    endif
+  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
+  let colors = s:CheckDefined(colors)
+  if old_hi != colors || !hlexists(a:group)
+    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:CheckDefined(colors)
+  " Checks, whether the definition of the colors is valid and is not empty or NONE
+  " e.g. if the colors would expand to this:
+  " hi airline_c ctermfg=NONE ctermbg=NONE
+  " that means to clear that highlighting group, therefore, fallback to Normal
+  " highlighting group for the cterm values
+
+  " This only works, if the Normal highlighting group is actually defined, so
+  " return early, if it has been cleared
+  if !exists("g:airline#highlighter#normal_fg_hi")
+    let g:airline#highlighter#normal_fg_hi = synIDattr(synIDtrans(hlID('Normal')), 'fg', 'cterm')
+  endif
+  if empty(g:airline#highlighter#normal_fg_hi) || g:airline#highlighter#normal_fg_hi < 0
+    return a:colors
+  endif
+
+  for val in a:colors
+    if !empty(val) && val !=# 'NONE'
+      return a:colors
+    endif
+  endfor
+  " this adds the bold attribute to the term argument of the :hi command,
+  " but at least this makes sure, the group will be defined
+  let fg = g:airline#highlighter#normal_fg_hi
+  let bg = synIDattr(synIDtrans(hlID('Normal')), 'bg', 'cterm')
+  if bg < 0
+    " in case there is no background color defined for Normal
+    let bg = a:colors[3]
+  endif
+  return a:colors[0:1] + [fg, bg] + [a:colors[4]]
+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/vim-airline/autoload/airline/init.vim b/vim/plugins/vim-airline/autoload/airline/init.vim
new file mode 100644
index 0000000..67d4436
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/init.vim
@@ -0,0 +1,197 @@
+" 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
+
+  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_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())
+
+  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', {})
+  " First define the symbols,
+  " that are common in Powerline/Unicode/ASCII mode,
+  " then add specific symbols for either mode
+  call extend(g:airline_symbols, {
+          \ 'paste': 'PASTE',
+          \ 'spell': 'SPELL',
+          \ 'modified': '+',
+          \ 'space': ' '
+          \  }, 'keep')
+
+  if get(g:, 'airline_powerline_fonts', 0)
+    " Symbols for Powerline terminals
+    call s:check_defined('g:airline_left_sep', "\ue0b0")      " 
+    call s:check_defined('g:airline_left_alt_sep', "\ue0b1")  " 
+    call s:check_defined('g:airline_right_sep', "\ue0b2")     " 
+    call s:check_defined('g:airline_right_alt_sep', "\ue0b3") " 
+    " ro=, ws=☲, lnr=☰, mlnr=, br=, nx=Ɇ, crypt=🔒
+    call extend(g:airline_symbols, {
+          \ 'readonly': "\ue0a2",
+          \ 'whitespace': "\u2632",
+          \ 'linenr': "\u2630 ",
+          \ 'maxlinenr': " \ue0a1",
+          \ 'branch': "\ue0a0",
+          \ 'notexists': "\u0246",
+          \ 'crypt': nr2char(0x1F512),
+          \ }, 'keep')
+  elseif &encoding==?'utf-8' && !get(g:, "airline_symbols_ascii", 0)
+    " Symbols for Unicode terminals
+    call s:check_defined('g:airline_left_sep', "")
+    call s:check_defined('g:airline_left_alt_sep', "")
+    call s:check_defined('g:airline_right_sep', "")
+    call s:check_defined('g:airline_right_alt_sep', "")
+    " ro=⊝, ws=☲, lnr=☰, mlnr=㏑, br=ᚠ, nx=Ɇ, crypt=🔒
+    call extend(g:airline_symbols, {
+          \ 'readonly': "\u229D",
+          \ 'whitespace': "\u2632",
+          \ 'linenr': "\u2630 ",
+          \ 'maxlinenr': " \u33D1",
+          \ 'branch': "\u16A0",
+          \ 'notexists': "\u0246",
+          \ 'crypt': nr2char(0x1F512),
+          \ }, 'keep')
+  else
+    " Symbols for ASCII terminals
+    call s:check_defined('g:airline_left_sep', "")
+    call s:check_defined('g:airline_left_alt_sep', "")
+    call s:check_defined('g:airline_right_sep', "")
+    call s:check_defined('g:airline_right_alt_sep', "")
+    call extend(g:airline_symbols, {
+          \ 'readonly': 'RO',
+          \ 'whitespace': '!',
+          \ 'linenr': 'ln ',
+          \ 'maxlinenr': ' :',
+          \ 'branch': '',
+          \ 'notexists': '?',
+          \ 'crypt': 'cr',
+          \ }, 'keep')
+  endif
+
+  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}%4l',
+        \ 'accent': 'bold'})
+  call airline#parts#define('maxlinenr', {
+        \ 'raw': '/%L%{g:airline_symbols.maxlinenr}',
+        \ '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', '')
+  call airline#parts#define_text('xkblayout', '')
+
+  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', 'xkblayout', '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/vim-airline/autoload/airline/msdos.vim b/vim/plugins/vim-airline/autoload/airline/msdos.vim
new file mode 100644
index 0000000..0757de5
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/parts.vim b/vim/plugins/vim-airline/autoload/airline/parts.vim
new file mode 100644
index 0000000..f7b56fb
--- /dev/null
+++ b/vim/plugins/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) < 90 && 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/vim-airline/autoload/airline/section.vim b/vim/plugins/vim-airline/autoload/airline/section.vim
new file mode 100644
index 0000000..8d08230
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/themes.vim b/vim/plugins/vim-airline/autoload/airline/themes.vim
new file mode 100644
index 0000000..75c2f40
--- /dev/null
+++ b/vim/plugins/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/vim-airline/autoload/airline/themes/dark.vim b/vim/plugins/vim-airline/autoload/airline/themes/dark.vim
new file mode 100644
index 0000000..c242d7b
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/themes/dark.vim
@@ -0,0 +1,103 @@
+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)
+  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' ])
+endif
+
diff --git a/vim/plugins/vim-airline/autoload/airline/util.vim b/vim/plugins/vim-airline/autoload/airline/util.vim
new file mode 100644
index 0000000..4246ccd
--- /dev/null
+++ b/vim/plugins/vim-airline/autoload/airline/util.vim
@@ -0,0 +1,113 @@
+" 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
+    if get(a:000, 0, 0)
+      " shorten from tail
+      return '…'.matchstr(a:text, '.\{'.a:minwidth.'}$')
+    else
+      " shorten from beginning of string
+      return matchstr(a:text, '^.\{'.a:minwidth.'}').'…'
+    endif
+  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/vim-airline/doc/airline.txt b/vim/plugins/vim-airline/doc/airline.txt
new file mode 100644
index 0000000..52b3dc5
--- /dev/null
+++ b/vim/plugins/vim-airline/doc/airline.txt
@@ -0,0 +1,1213 @@
+*airline.txt*  Lean and mean status/tabline that's light as air
+*airline* *vim-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.
+
+When the plugin is correctly loaded, and Vim is configured for drawing a
+'statusline' (set 'laststatus' to 2, to always display the airline
+statusline) Vim will draw a nice statusline at the bottom of each window.
+
+That line consists of several sections, each one displaying some piece of
+information. By default (without configuration) this line will look like this: >
+
++-----------------------------------------------------------------------------+
+|~                                                                            |
+|~                                                                            |
+|~                     VIM - Vi IMproved                                      |
+|~                                                                            |
+|~                       version 8.0                                          |
+|~                    by Bram Moolenaar et al.                                |
+|~           Vim is open source and freely distributable                      |
+|~                                                                            |
+|~           type :h :q<Enter>          to exit                               |
+|~           type :help<Enter> or <F1>  for on-line help                      |
+|~           type :help version8<Enter> for version info                      |
+|~                                                                            |
+|~                                                                            |
++-----------------------------------------------------------------------------+
+| A | B |                     C                            X | Y | Z |  [...] |
++-----------------------------------------------------------------------------+
+
+The statusline is the colored line at the bottom, which contains the sections
+(possibly in different colors):
+
+section  meaning (example)~
+--------------------------
+  A      displays the mode + additional flags like crypt/spell/paste (INSERT)
+  B      VCS information (branch, hunk summary) (master)
+  C      filename + read-only flag (~/.vim/vimrc RO)
+  X      filetype  (vim)
+  Y      file encoding[fileformat] (utf-8[unix])
+  Z      current position in the file
+           percentage % ☰ current line/number of lines ln : column
+           So this: 10% ☰ 10/100 ln : 20   means: >
+              10%     - 10 percent
+              ☰ 10    - current line 10
+              /100 ln - of 100 lines
+              : 20    - current column 20
+<
+  [...]  additional sections (warning/errors/statistics)
+         from external plugins (e.g. YCM/syntastic/...)
+
+For a better look, those sections can be colored differently, depending on the mode and
+whether the current file is 'modified'
+
+Additionally, several extensions exists, that can provide additional feature (e.g. the
+tabline extension provides an extra statusline on the top of the Vim window and can
+display loaded buffers and tabs in the current Vim session).
+
+Most of this is customizable and the default sections can be configured using the vim
+variables g:airline_section_<name> (see |airline-default-sections|)
+
+==============================================================================
+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
+<
+* By default, airline will use unicode symbols if your encoding matches
+  utf-8. If you want the powerline symbols set this variable: >
+  let g:airline_powerline_fonts = 1
+<
+  If you want to use plain ascii symbols, set this variable: >
+  let g:airline_symbols_ascii = 1
+<
+* 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
+<
+  This variable can be overriden by setting a window-local variable with
+  the same name (in the correct window): >
+  let w:airline_skip_empty_sections = 0
+<
+==============================================================================
+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.
+                                                    |airline-default-sections|
+>
+  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-vimagit*
+vimagit <https://github.com/jreybert/vimagit>
+
+* enable/disable vimagit integration >
+  let g:airline#extensions#vimagit#enabled = 1
+<
+-------------------------------------                        *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
+<
+* disable detection of whitespace errors. >
+  " useful to call for particular file types (e.g., in "ftplugin/*")
+  silent! call airline#extensions#whitespace#disable()
+<
+* 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)
+  (only supported for ctrlspace plugin). >
+  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-xkblayout*
+vim-xkblayout
+
+* enable/disable vim-xkblayout extension >
+  let g:airline#extensions#xkblayout#enabled = 1
+
+* define path to the backend switcher library
+  Linux (Install https://github.com/ierton/xkb-switch):
+   let g:XkbSwitchLib = '/usr/local/lib/libxkbswitch.so'
+  macOS (Install https://github.com/vovkasm/input-source-switcher):
+   let g:XkbSwitchLib = '/usr/local/lib/libInputSourceSwitcher.dylib'
+
+-------------------------------------                   *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
+
+-------------------------------------                          *airline-vimtex*
+vimtex <https://github.com/lervag/vimtex>
+
+Shows the current file's vimtex related info.
+
+* enable/disable vimtex integration >
+  let g:airline#extensions#vimtex#enabled = 1
+<
+* left and right delimiters (shown only when status string is not empty)
+  let g:airline#extensions#vimtex#left = "{"
+  let g:airline#extensions#vimtex#right = "}"
+
+State indicators:
+
+* the current tex file is the main project file (nothing is shown by default)
+  let g:airline#extensions#vimtex#main = ""
+
+* the current tex file is a subfile of the project 
+  and the compilation is set for the main file
+  let g:airline#extensions#vimtex#sub_main = "m"
+
+* the current tex file is a subfile of the project
+  and the compilation is set for this subfile
+  let g:airline#extensions#vimtex#sub_local = "l"
+
+* single compilation is running
+  let g:airline#extensions#vimtex#compiled = "c₁"
+
+* continuousr compilation is running
+  let g:airline#extensions#vimtex#continuous = "c"
+
+* viewer is opened
+  let g:airline#extensions#vimtex#viewer = "v"
+
+==============================================================================
+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
+* `path`           displays the filename (absolute path) and modifier indicator
+* `linenr`         displays the current line number
+* `maxlinenr`      dispalys the number of lines in the buffer
+* `ffenc`          displays the file format and encoding
+
+And the following are defined for their respective extensions:
+
+`ale_error_count``ale_warning_count``branch``eclim``hunks`
+`neomake_error_count``neomake_warning_count``obsession``syntastic`
+`tagbar``whitespace``windowswap``ycm_error_count``ycm_warning_count`
+
+-------------------------------------                      *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 |User| is important, because most extensions are lazily
+loaded, so we must give them a chance to define their parts before we can use
+them. Also this autocommand is only triggered, after the airline functions are
+actually available on startup.
+
+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-2017 Bailey Ling, Christian Brabandt
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/vim-airline/plugin/airline.vim b/vim/plugins/vim-airline/plugin/airline.vim
new file mode 100644
index 0000000..3cbb998
--- /dev/null
+++ b/vim/plugins/vim-airline/plugin/airline.vim
@@ -0,0 +1,150 @@
+" 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(), &ft]
+  if get(g:, 'airline_last_window_changed', []) == l:key
+        \ && &stl is# '%!airline#statusline('.winnr().')'
+        \ && &ft !~? 'gitcommit'
+    " fugitive is special, it changes names and filetypes several times,
+    " make sure the caching does not get into its way
+    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()
+  unlet! g:airline#highlighter#normal_fg_hi
+  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 VimEnter,WinEnter,BufWinEnter,FileType,BufUnload *
+            \ call <sid>on_window_changed()
+      if exists('#CompleteDone')
+        autocmd CompleteDone * call <sid>on_window_changed()
+      endif
+
+      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/vim-airline/t/airline.vim b/vim/plugins/vim-airline/t/airline.vim
new file mode 100644
index 0000000..6e66aec
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/builder.vim b/vim/plugins/vim-airline/t/builder.vim
new file mode 100644
index 0000000..d3b0092
--- /dev/null
+++ b/vim/plugins/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#helloworld'
+  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#hellohello'
+  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/vim-airline/t/commands.vim b/vim/plugins/vim-airline/t/commands.vim
new file mode 100644
index 0000000..0f4bcb6
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/extensions_default.vim b/vim/plugins/vim-airline/t/extensions_default.vim
new file mode 100644
index 0000000..e60d651
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/highlighter.vim b/vim/plugins/vim-airline/t/highlighter.vim
new file mode 100644
index 0000000..a1ed490
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/init.vim b/vim/plugins/vim-airline/t/init.vim
new file mode 100644
index 0000000..acb9f19
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/parts.vim b/vim/plugins/vim-airline/t/parts.vim
new file mode 100644
index 0000000..ee7c92e
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/section.vim b/vim/plugins/vim-airline/t/section.vim
new file mode 100644
index 0000000..d692f5d
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/themes.vim b/vim/plugins/vim-airline/t/themes.vim
new file mode 100644
index 0000000..5a13993
--- /dev/null
+++ b/vim/plugins/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/vim-airline/t/util.vim b/vim/plugins/vim-airline/t/util.vim
new file mode 100644
index 0000000..14c1d91
--- /dev/null
+++ b/vim/plugins/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/vim-better-whitespace/.gitignore b/vim/plugins/vim-better-whitespace/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/vim-better-whitespace/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/vim-better-whitespace/README.md b/vim/plugins/vim-better-whitespace/README.md
new file mode 100644
index 0000000..5d0551a
--- /dev/null
+++ b/vim/plugins/vim-better-whitespace/README.md
@@ -0,0 +1,241 @@
+#Vim Better Whitespace Plugin
+
+This plugin causes all trailing whitespace characters (see [Supported Whitespace Characters](#supported-whitespace-characters) below) to be
+highlighted. Whitespace for the current line will not be highlighted
+while in insert mode. It is possible to disable current line highlighting while in other
+modes as well (see options below). A helper function `:StripWhitespace` is also provided
+to make whitespace cleaning painless.
+
+Here is a screenshot of this plugin at work:
+![Example Screenshot](http://i.imgur.com/St7yHth.png)
+
+##Installation
+There are a few ways you can go about installing this plugin:
+
+1.  If you have [Vundle](https://github.com/gmarik/Vundle.vim) you can simply add:
+    ```
+    Plugin 'ntpeters/vim-better-whitespace'
+    ```
+    to your `.vimrc` file then run:
+    ```
+    :PluginInstall
+    ```
+2.  If you are using [Pathogen](https://github.com/tpope/vim-pathogen), you can just run the following command:
+    ```
+    git clone git://github.com/ntpeters/vim-better-whitespace.git ~/.vim/bundle/vim-better-whitespace
+    ```
+3.  While this plugin can also be installed by copying its contents into your `~/.vim/` directory, I would highly recommend using one of the above methods as they make managing your Vim plugins painless.
+
+##Usage
+Whitespace highlighting is enabled by default, with a highlight color of red.
+
+*  To set a custom highlight color, just call:
+    ```
+    highlight ExtraWhitespace ctermbg=<desired_color>
+    ```
+
+*  To toggle whitespace highlighting on/off, call:
+    ```
+    :ToggleWhitespace
+    ```
+
+*  To disable highlighting for the current line in normal mode call:
+    ```
+    :CurrentLineWhitespaceOff <level>
+    ```
+    Where `<level>` is either `hard` or `soft`.
+
+    *  The level `hard` will maintain whitespace highlighting as it is, but may
+        cause a slow down in Vim since it uses the CursorMoved event to detect and
+        exclude the current line.
+
+    *  The level `soft` will use syntax based highlighting, so there shouldn't be
+        a performance hit like with the `hard` option.  The drawback is that this
+        highlighting will have a lower priority and may be overwritten by higher
+        priority highlighting.
+
+*  To re-enable highlighting for the current line in normal mode:
+    ```
+    :CurrentLineWhitespaceOn
+    ```
+
+*  To clean extra whitespace, call:
+    ```
+    :StripWhitespace
+    ```
+    By default this operates on the entire file. To restrict the portion of
+    the file that it cleans, either give it a range or select a group of lines
+    in visual mode and then execute it.
+
+*  To enable/disable stripping of extra whitespace on file save, call:
+    ```
+    :ToggleStripWhitespaceOnSave
+    ```
+    This will strip all trailing whitespace everytime you save the file for all file types.
+
+    *  If you want this behaviour by default for all filetypes, add the following to your `~/.vimrc`:
+
+        ```
+        autocmd BufEnter * EnableStripWhitespaceOnSave
+        ```
+
+        For exceptions of all see ```g:better_whitespace_filetypes_blacklist```.
+
+    *  If you would prefer to only strip whitespace for certain filetypes, add
+        the following to your `~/.vimrc`:
+
+        ```
+        autocmd FileType <desired_filetypes> autocmd BufEnter <buffer> EnableStripWhitespaceOnSave
+        ```
+
+        where `<desired_filetypes>` is a comma separated list of the file types you want
+        to be stripped of whitespace on file save ( ie. `javascript,c,cpp,java,html,ruby` )
+        Note that `<buffer>` is a keyword here denoting operation on the current buffer and
+        should stay just as it appears in the line above.
+
+*  To disable this plugin for specific file types, add the following to your `~/.vimrc`:
+    ```
+    let g:better_whitespace_filetypes_blacklist=['<filetype1>', '<filetype2>', '<etc>']
+    ```
+    This replaces the filetypes from the default list of blacklisted filetypes. The
+    default types that are blacklisted are:
+    ```
+    ['diff', 'gitcommit', 'unite', 'qf', 'help', 'markdown']
+    ```
+    If you do not want any of these filetypes unignored, simply include them in the
+    blacklist:
+    ```
+    let g:better_whitespace_filetypes_blacklist=['<filetype1>', '<filetype2>', '<etc>',
+                                            'diff', 'gitcommit', 'unite', 'qf', 'help']
+    ```
+
+*  To enable verbose output for each command, set verbosity in your `.vimrc`:
+    ```
+    let g:better_whitespace_verbosity=1
+    ```
+
+##Supported Whitespace Characters
+Due to the fact that the built-in whitespace character class for patterns (`\s`)
+only matches against tabs and spaces, this plugin defines its own list of
+horizontal whitepsace characters to match for both highlighting and stripping.
+
+This is list should match against all ASCII and Unicode horizontal whitespace
+characters:
+```
+    U+0009   TAB
+    U+0020   SPACE
+    U+00A0   NO-BREAK SPACE
+    U+1680   OGHAM SPACE MARK
+    U+180E   MONGOLIAN VOWEL SEPARATOR
+    U+2000   EN QUAD
+    U+2001   EM QUAD
+    U+2002   EN SPACE
+    U+2003   EM SPACE
+    U+2004   THREE-PER-EM SPACE
+    U+2005   FOUR-PER-EM SPACE
+    U+2006   SIX-PER-EM SPACE
+    U+2007   FIGURE SPACE
+    U+2008   PUNCTUATION SPACE
+    U+2009   THIN SPACE
+    U+200A   HAIR SPACE
+    U+200B   ZERO WIDTH SPACE
+    U+202F   NARROW NO-BREAK SPACE
+    U+205F   MEDIUM MATHEMATICAL SPACE
+    U+3000   IDEOGRAPHIC SPACE
+    U+FEFF   ZERO WIDTH NO-BREAK SPACE
+```
+
+A file is provided with samples of each of these characters to check the plugin
+working with them: whitespace_examples.txt
+
+If you encounter any additional whitespace characters I have missed here,
+please submit a pull request.
+
+##Screenshots
+Here are a couple more screenshots of the plugin at work.
+
+This screenshot shows the current line not being highlighted in insert mode:
+![Insert Screenthot](http://i.imgur.com/RNHR9KX.png)
+
+This screenshot shows the current line not being highlighted in normal mode( `CurrentLineWhitespaceOff hard` ):
+![Normal Screenshot](http://i.imgur.com/o888Z7b.png)
+
+This screenshot shows that highlighting works fine for spaces, tabs, and a mixture of both:
+![Tabs Screenshot](http://i.imgur.com/bbsVRUf.png)
+
+##Frequently Asked Questions
+Hopefully some of the most common questions will be answered here.  If you still have a question
+that I have failed to address, please open an issue and ask it!
+
+**Q:  Why is trailing whitespace such a big deal?**
+
+A:  In most cases it is not a syntactical issue, but rather is a common annoyance among
+    programmers.
+
+
+**Q:  Why not just use `listchars` with `SpecialKey` highlighting?**
+
+A:  I tried using `listchars` to show trail characters with `SpecialKey` highlighting applied.
+    Using this method the characters would still show on the current line for me even when the
+    `SpecialKey` foreground highlight matched the `CursorLine` background highlight.
+
+
+**Q:  Okay, so `listchars` doesn't do exactly what you want, why not just use a `match` in your `vimrc`?**
+
+A:  I am using `match` in this plugin, but I've also added a way to exclude the current line in
+    insert mode and/or normal mode.
+
+
+**Q:  If you just want to exclude the current line, why not just use syntax-based highlight rather
+    than using `match` and `CursorMoved` events?**
+
+A:  Syntax-based highlighting is an option in this plugin.  It is used to omit the current line when
+    using `CurrentLineWhitespaceOff soft`. The only issue with this method is that `match` highlighing
+    takes higher priorty than syntax highlighting. For example, when using a plugin such as
+    [Indent Guides](https://github.com/nathanaelkane/vim-indent-guides), syntax-based highlighting of
+    extra whitespace will not highlight additional white space on emtpy lines.
+
+
+**Q:  I already have my own method of removing white space, why is the method used in this plugin better?**
+
+A:  It may not be, depending on the method you are using. The method used in this plugin strips extra
+    white space and then restores the cursor position and last search history.
+
+
+**Q:  Most of this is pretty easy to just add to users' `vimrc` files. Why make it a plugin?**
+
+A:  It is true that a large part of this is fairly simple to make a part of an individuals
+    configuration in their `vimrc`.  I wanted to provide something that is easy to setup and use
+    for both those new to Vim and others who don't want to mess around setting up this
+    functionality in their `vimrc`.
+
+**Q:  Can you add indentation highlighting for spaces/tabs? Can you add highlighting for other
+    types of white space?**
+
+A:  No, and no.  Sorry, but both are outside the scope of this plugin.  The purpose of this plugin
+    is to provide a better experience for showing and dealing with extra white space.  There is
+    already an amazing plugin for showing indentation in Vim called [Indent Guides](https://github.com/nathanaelkane/vim-indent-guides).
+    For other types of white space highlighting, [listchars](http://vimdoc.sourceforge.net/htmldoc/options.html#'listchars') should be sufficient.
+
+**Q:  I have a better way to do something in this plugin. OR You're doing something stupid/wrong/bad.**
+
+A:  If you know of a better way to do something I am attempting in this plugin, or if I am doing
+    something improperly/not reccomended then let me know! Please either open an issue informing
+    me or make the changes yourself and open a pull request. If I am doing something that is bad
+    or can be improved, I more than willing to hear about it!
+
+##Promotion
+If you like this plugin, please star it on Github and vote it up at Vim.org!
+
+Repository exists at: http://github.com/ntpeters/vim-better-whitespace
+
+Plugin also hosted at: http://www.vim.org/scripts/script.php?script_id=4859
+
+##Credits
+Originally inspired by: https://github.com/bronson/vim-trailing-whitespace
+
+Based on:
+
+http://sartak.org/2011/03/end-of-line-whitespace-in-vim.html
+
+http://vim.wikia.com/wiki/Highlight_unwanted_spaces
diff --git a/vim/plugins/vim-better-whitespace/doc/better-whitespace.txt b/vim/plugins/vim-better-whitespace/doc/better-whitespace.txt
new file mode 100644
index 0000000..7afed4b
--- /dev/null
+++ b/vim/plugins/vim-better-whitespace/doc/better-whitespace.txt
@@ -0,0 +1,65 @@
+*better-whitespace.txt*      better-whitespace
+
+
+This plugin causes all trailing whitespace characters (spaces and tabs) to be
+highlighted. Whitespace for the current line will not be highlighted while in
+insert mode. It is possible to disable current line highlighting while in other
+modes as well (see options below).
+
+To blacklist certain filetypes, set 'g:better_whitespace_filetypes_blacklist'
+to a list of the desired filetypes.
+
+
+                                                *ToggleWhitespace*
+
+Call :ToggleWhitespace to toggle whitespace highlighting on/off.
+
+                                                *EnableWhitespace*
+
+To enable whitespace highlighting, call :EnableWhitespace. This will enable
+highlighting of extraneous whitespace for the entire file.
+
+                                                *DisableWhitespace*
+
+To disable whitespace highlighting, call :DisableWhitespace. This will disable
+highlighting of extraneous whitespace for the entire file.
+
+                                                *StripWhitespace*
+
+To remove extra whitespace, just call :StripWhitespace.By default this
+operates on the entire file. To restrict the portion of the file that it
+cleans, either give it a range or select a group of lines in visual mode
+and then execute it.
+
+                                                *ToggleStripWhitespaceOnSave*
+
+This enables/disables stripping of extra whitespace on file save.
+
+                                                *CurrentLineWhitespaceOff*
+
+Calling :CurrentLineWhitespaceOff with the option either 'hard' or 'soft' will
+disable whitespace highlighting for the currentline.
+
+If 'hard' option is used, then all highlighting remains the same except that
+the current line is not highlighted.
+WARNING: Since this uses CursorMoved events to prevent highlighting of the
+current line there is a chance this can cause a significant slow down of Vim,
+especially with regard to large files.
+
+If the 'soft' option is used, then highlighting will have a lower priority
+potentially causing this highlighting to be overwritten by other, higher
+priority highlighting.  The benefit is that there should be no slowdown with
+this option.
+
+                                                *CurrentLineWhitespaceOn
+
+Call :CurrentLineWhitespaceOn to enable whitespace highlighting for the current
+line. Highlighting is still disabled for the current line while in inserte mode.
+
+Repository exists at: http://github.com/ntpeters/vim-better-whitespace
+
+Originally inspired by: https://github.com/bronson/vim-trailing-whitespace
+
+Based on:
+http://sartak.org/2011/03/end-of-line-whitespace-in-vim.html
+http://vim.wikia.com/wiki/Highlight_unwanted_spaces
diff --git a/vim/plugins/vim-better-whitespace/plugin/better-whitespace.vim b/vim/plugins/vim-better-whitespace/plugin/better-whitespace.vim
new file mode 100644
index 0000000..27e0c17
--- /dev/null
+++ b/vim/plugins/vim-better-whitespace/plugin/better-whitespace.vim
@@ -0,0 +1,295 @@
+" Author: Nate Peterson
+" Repository: https://github.com/ntpeters/vim-better-whitespace
+
+" Prevent loading the plugin multiple times
+if exists('g:loaded_better_whitespace_plugin')
+    finish
+endif
+let g:loaded_better_whitespace_plugin = 1
+
+" Initializes a given variable to a given value. The variable is only
+" initialized if it does not exist prior.
+function! s:InitVariable(var, value)
+    if !exists(a:var)
+        execute 'let ' . a:var . ' = ' . string(a:value)
+    endif
+endfunction
+
+" Set this to enable/disable whitespace highlighting
+call s:InitVariable('g:better_whitespace_enabled', 1)
+
+" Set this to disable highlighting on the current line in all modes
+" WARNING: This checks for current line on cursor move, which can significantly
+"          impact the performance of Vim (especially on large files)
+call s:InitVariable('g:current_line_whitespace_disabled_hard', 0)
+
+" Set this to disable highlighting of the current line in all modes
+" This setting will not have the performance impact of the above, but
+" highlighting throughout the file may be overridden by other highlight
+" patterns with higher priority.
+call s:InitVariable('g:current_line_whitespace_disabled_soft', 0)
+
+" Set this to enable stripping whitespace on file save
+call s:InitVariable('g:strip_whitespace_on_save', 0)
+
+" Set this to blacklist specific filetypes
+let default_blacklist=['diff', 'gitcommit', 'unite', 'qf', 'help', 'markdown']
+call s:InitVariable('g:better_whitespace_filetypes_blacklist', default_blacklist)
+
+" Disable verbosity by default
+call s:InitVariable('g:better_whitespace_verbosity', 0)
+
+" Define custom whitespace character group to include all horizontal unicode
+" whitespace characters. Vim's '\s' class only includes ASCII spaces and tabs.
+let s:whitespace_group='[\u0009\u0020\u00a0\u1680\u180e\u2000-\u200b\u202f\u205f\u3000\ufeff]'
+let s:eol_whitespace_pattern = s:whitespace_group . '\+$'
+
+" Only init once
+let s:better_whitespace_initialized = 0
+
+" Like windo but restore the current window.
+function! s:Windo(command)
+    let currwin=winnr()
+    execute 'windo ' . a:command
+    execute currwin . 'wincmd w'
+endfunction
+
+" Like tabdo but restore the current tab.
+function! s:Tabdo(command)
+    let currTab=tabpagenr()
+    execute 'tabdo ' . a:command
+    execute 'tabn ' . currTab
+endfunction
+
+" Execute command in all windows (across tabs).
+function! s:InAllWindows(command)
+    call s:Tabdo("call s:Windo('".substitute(a:command, "'", "''", 'g')."')")
+endfunction
+
+" Ensure the 'ExtraWhitespace' highlight group has been defined
+function! s:WhitespaceInit()
+    " Check if the user has already defined highlighting for this group
+    if hlexists("ExtraWhitespace") == 0 || synIDattr(synIDtrans(hlID("ExtraWhitespace")), "bg") == -1
+        highlight ExtraWhitespace ctermbg = red guibg = #FF0000
+    endif
+    let s:better_whitespace_initialized = 1
+endfunction
+
+" Like 'echo', but only outputs the message when verbosity is enabled
+function! s:Echo(message)
+    if g:better_whitespace_verbosity == 1
+        echo a:message
+    endif
+endfunction
+
+" Enable the whitespace highlighting
+function! s:EnableWhitespace()
+    if b:better_whitespace_enabled == 0
+        let b:better_whitespace_enabled = 1
+        call <SID>WhitespaceInit()
+        call <SID>SetupAutoCommands()
+        call <SID>Echo("Whitespace Highlighting: Enabled")
+    endif
+endfunction
+
+" Disable the whitespace highlighting
+function! s:DisableWhitespace()
+    if b:better_whitespace_enabled == 1
+        let b:better_whitespace_enabled = 0
+        call <SID>SetupAutoCommands()
+        call <SID>Echo("Whitespace Highlighting: Disabled")
+    endif
+endfunction
+
+" Toggle whitespace highlighting on/off
+function! s:ToggleWhitespace()
+    if b:better_whitespace_enabled == 1
+        call <SID>DisableWhitespace()
+    else
+        call <SID>EnableWhitespace()
+    endif
+endfunction
+
+" This disabled whitespace highlighting on the current line in all modes
+" Options:
+" hard - Disables highlighting for current line and maintains high priority
+"        highlighting for the entire file. Caution: may cause slowdown in Vim!
+" soft - No potential slowdown as with 'hard' option, but other highlighting
+"        rules of higher priority may overwrite these whitespace highlights.
+function! s:CurrentLineWhitespaceOff( level )
+    if g:better_whitespace_enabled == 1
+        " Set current line whitespace level
+        if a:level == 'hard'
+            let g:current_line_whitespace_disabled_hard = 1
+            let g:current_line_whitespace_disabled_soft = 0
+            call s:InAllWindows('syn clear ExtraWhitespace | match ExtraWhitespace "' . s:eol_whitespace_pattern . '"')
+            call <SID>Echo("Current Line Hightlight Off (hard)")
+        elseif a:level == 'soft'
+            let g:current_line_whitespace_disabled_soft = 1
+            let g:current_line_whitespace_disabled_hard = 0
+            call s:InAllWindows("match ExtraWhitespace ''")
+            call <SID>Echo("Current Line Hightlight Off (soft)")
+        endif
+        " Re-run auto commands with the new settings
+        call <SID>SetupAutoCommands()
+    endif
+endfunction
+
+" Enables whitespace highlighting for the current line
+function! s:CurrentLineWhitespaceOn()
+    if g:better_whitespace_enabled == 1
+        let g:current_line_whitespace_disabled_hard = 0
+        let g:current_line_whitespace_disabled_soft = 0
+        call <SID>SetupAutoCommands()
+        call s:InAllWindows('syn clear ExtraWhitespace | match ExtraWhitespace "' . s:eol_whitespace_pattern . '"')
+        call <SID>Echo("Current Line Hightlight On")
+    endif
+endfunction
+
+" Removes all extraneous whitespace in the file
+function! s:StripWhitespace( line1, line2 )
+    " Save the current search and cursor position
+    let _s=@/
+    let l = line(".")
+    let c = col(".")
+
+    " Strip the whitespace
+    silent! execute ':' . a:line1 . ',' . a:line2 . 's/' . s:eol_whitespace_pattern . '//e'
+
+    " Restore the saved search and cursor position
+    let @/=_s
+    call cursor(l, c)
+endfunction
+
+" Strip whitespace on file save
+function! s:EnableStripWhitespaceOnSave()
+    let g:strip_whitespace_on_save = 1
+    call <SID>Echo("Strip Whitespace On Save: Enabled")
+    call <SID>SetupAutoCommands()
+endfunction
+
+" Don't strip whitespace on file save
+function! s:DisableStripWhitespaceOnSave()
+    let g:strip_whitespace_on_save = 0
+    call <SID>Echo("Strip Whitespace On Save: Disabled")
+    call <SID>SetupAutoCommands()
+endfunction
+
+" Strips whitespace on file save
+function! s:ToggleStripWhitespaceOnSave()
+    if g:strip_whitespace_on_save == 1
+        call <SID>DisableStripWhitespaceOnSave()
+    else
+        call <SID>EnableStripWhitespaceOnSave()
+    endif
+endfunction
+
+" Determines if whitespace highlighting should currently be skipped
+function! s:ShouldSkipHighlight()
+    return &buftype == 'nofile' || index(g:better_whitespace_filetypes_blacklist, &ft) >= 0
+endfunction
+
+" Run :StripWhitespace to remove end of line whitespace
+command! -range=% StripWhitespace call <SID>StripWhitespace( <line1>, <line2> )
+" Run :EnableStripWhitespaceOnSave to enable whitespace stripping on save
+command! EnableStripWhitespaceOnSave call <SID>EnableStripWhitespaceOnSave()
+" Run :DisableStripWhitespaceOnSave to disable whitespace stripping on save
+command! DisableStripWhitespaceOnSave call <SID>DisableStripWhitespaceOnSave()
+" Run :ToggleStripWhitespaceOnSave to enable/disable whitespace stripping on save
+command! ToggleStripWhitespaceOnSave call <SID>ToggleStripWhitespaceOnSave()
+" Run :EnableWhitespace to enable whitespace highlighting
+command! EnableWhitespace call <SID>EnableWhitespace()
+" Run :DisableWhitespace to disable whitespace highlighting
+command! DisableWhitespace call <SID>DisableWhitespace()
+" Run :ToggleWhitespace to toggle whitespace highlighting on/off
+command! ToggleWhitespace call <SID>ToggleWhitespace()
+" Run :CurrentLineWhitespaceOff(level) to disable highlighting for the current
+" line. Levels are: 'hard' and 'soft'
+command! -nargs=* CurrentLineWhitespaceOff call <SID>CurrentLineWhitespaceOff( <f-args> )
+" Run :CurrentLineWhitespaceOn to turn on whitespace for the current line
+command! CurrentLineWhitespaceOn call <SID>CurrentLineWhitespaceOn()
+
+" Process auto commands upon load, update local enabled on filetype change
+autocmd FileType * let b:better_whitespace_enabled = !<SID>ShouldSkipHighlight() | call <SID>SetupAutoCommands()
+autocmd WinEnter,BufWinEnter * call <SID>SetupAutoCommands()
+autocmd ColorScheme * call <SID>WhitespaceInit()
+
+function! s:PerformMatchHighlight(pattern)
+    call s:InitVariable('b:better_whitespace_enabled', !<SID>ShouldSkipHighlight())
+    if b:better_whitespace_enabled == 1
+        exe 'match ExtraWhitespace "' . a:pattern . '"'
+    else
+        match ExtraWhitespace ''
+    endif
+endfunction
+
+function! s:PerformSyntaxHighlight(pattern)
+    syn clear ExtraWhitespace
+    call s:InitVariable('b:better_whitespace_enabled', !<SID>ShouldSkipHighlight())
+    if b:better_whitespace_enabled == 1
+        exe 'syn match ExtraWhitespace excludenl "' . a:pattern . '"'
+    endif
+endfunction
+
+function! s:HighlightEOLWhitespace(type)
+    if (a:type == 'match')
+        call s:PerformMatchHighlight(s:eol_whitespace_pattern)
+    elseif (a:type == 'syntax')
+        call s:PerformSyntaxHighlight(s:eol_whitespace_pattern)
+    endif
+endfunction
+
+function! s:HighlightEOLWhitespaceExceptCurrentLine(type)
+    let a:exclude_current_line_eol_whitespace_pattern = '\%<' . line(".") .  'l' . s:eol_whitespace_pattern . '\|\%>' . line(".") .  'l' . s:eol_whitespace_pattern
+    if (a:type == 'match')
+        call s:PerformMatchHighlight(a:exclude_current_line_eol_whitespace_pattern)
+    elseif (a:type == 'syntax')
+        call s:PerformSyntaxHighlight(a:exclude_current_line_eol_whitespace_pattern)
+    endif
+endfunction
+
+" Executes all auto commands
+function! <SID>SetupAutoCommands()
+    " Auto commands group
+    augroup better_whitespace
+        autocmd!
+
+        if g:better_whitespace_enabled == 1
+            if s:better_whitespace_initialized == 0
+                call <SID>WhitespaceInit()
+            endif
+
+
+            " Check if current line is disabled softly
+            if g:current_line_whitespace_disabled_soft == 0
+                " Highlight all whitespace upon entering buffer
+                call <SID>PerformMatchHighlight(s:eol_whitespace_pattern)
+                " Check if current line highglighting is disabled
+                if g:current_line_whitespace_disabled_hard == 1
+                    " Never highlight whitespace on current line
+                    autocmd InsertEnter,CursorMoved,CursorMovedI * call <SID>HighlightEOLWhitespaceExceptCurrentLine('match')
+                else
+                    " When in insert mode, do not highlight whitespace on the current line
+                    autocmd InsertEnter,CursorMovedI * call <SID>HighlightEOLWhitespaceExceptCurrentLine('match')
+                endif
+                " Highlight all whitespace when exiting insert mode
+                autocmd InsertLeave,BufReadPost * call <SID>HighlightEOLWhitespace('match')
+                " Clear whitespace highlighting when leaving buffer
+                autocmd BufWinLeave * match ExtraWhitespace ''
+            else
+                " Highlight extraneous whitespace at the end of lines, but not the
+                " current line.
+                call <SID>HighlightEOLWhitespace('syntax')
+                autocmd InsertEnter * call <SID>HighlightEOLWhitespaceExceptCurrentLine('syntax')
+                autocmd InsertLeave,BufReadPost * call <SID>HighlightEOLWhitespace('syntax')
+            endif
+        endif
+
+        " Strip whitespace on save if enabled
+        if g:strip_whitespace_on_save == 1
+            autocmd BufWritePre * call <SID>StripWhitespace( 0, line("$") )
+        endif
+
+    augroup END
+endfunction
+
diff --git a/vim/plugins/vim-better-whitespace/whitespace_examples.txt b/vim/plugins/vim-better-whitespace/whitespace_examples.txt
new file mode 100644
index 0000000..1f468d2
--- /dev/null
+++ b/vim/plugins/vim-better-whitespace/whitespace_examples.txt
@@ -0,0 +1,21 @@
+U+0009	TAB:	
+U+0020	SPACE: 
+U+00A0	NO-BREAK SPACE: 
+U+1680	OGHAM SPACE MARK: 
+U+180E	MONGOLIAN VOWEL SEPARATOR:᠎
+U+2000	EN QUAD: 
+U+2001	EM QUAD: 
+U+2002	EN SPACE: 
+U+2003	EM SPACE: 
+U+2004	THREE-PER-EM SPACE: 
+U+2005	FOUR-PER-EM SPACE: 
+U+2006	SIX-PER-EM SPACE: 
+U+2007	FIGURE SPACE: 
+U+2008	PUNCTUATION SPACE: 
+U+2009	THIN SPACE: 
+U+200A	HAIR SPACE: 
+U+200B	ZERO WIDTH SPACE:​
+U+202F	NARROW NO-BREAK SPACE: 
+U+205F	MEDIUM MATHEMATICAL SPACE: 
+U+3000	IDEOGRAPHIC SPACE:　
+U+FEFF	ZERO WIDTH NO-BREAK SPACE:
diff --git a/vim/plugins/vim-easymotion/.gitignore b/vim/plugins/vim-easymotion/.gitignore
new file mode 100644
index 0000000..5d0b4ff
--- /dev/null
+++ b/vim/plugins/vim-easymotion/.gitignore
@@ -0,0 +1,4 @@
+doc/tags
+tmp*
+*.lock
+.vim-flavor
diff --git a/vim/plugins/vim-easymotion/.travis.yml b/vim/plugins/vim-easymotion/.travis.yml
new file mode 100644
index 0000000..09f727d
--- /dev/null
+++ b/vim/plugins/vim-easymotion/.travis.yml
@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+    - 2.0.0
+before_script:
+    - bundle install
+    - bundle show
+script:
+    - rake ci
+install:
+    - git clone https://github.com/kana/vim-vspec.git
diff --git a/vim/plugins/vim-easymotion/Gemfile b/vim/plugins/vim-easymotion/Gemfile
new file mode 100644
index 0000000..c562fee
--- /dev/null
+++ b/vim/plugins/vim-easymotion/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem 'vim-flavor', '~> 1.1'
+gem 'rake'
diff --git a/vim/plugins/vim-easymotion/README.md b/vim/plugins/vim-easymotion/README.md
new file mode 100644
index 0000000..709652c
--- /dev/null
+++ b/vim/plugins/vim-easymotion/README.md
@@ -0,0 +1,395 @@
+Vim motion on speed!
+=====
+[![Build Status](https://travis-ci.org/easymotion/vim-easymotion.svg?branch=master)](https://travis-ci.org/easymotion/vim-easymotion)
+
+![Animated demonstration](https://f.cloud.github.com/assets/3797062/2039359/a8e938d6-899f-11e3-8789-60025ea83656.gif)
+
+About the authors
+=====
+
+| Authors          |                               |
+|------------------|-------------------------------|
+| Kim Silkebækken | https://github.com/Lokaltog   |
+| haya14busa       | https://github.com/haya14busa |
+
+The EasyMotion project, revived!
+======
+
+Starting from version 2.0 [haya14busa](https://github.com/haya14busa) will be
+taking over the project from [Lokaltog](https://github.com/Lokaltog). He's
+improved the default motions, implemented many useful new features, and fixed
+some bugs.
+
+EasyMotion is now completely:
+
+- **Well-behaved**: It's consistent with the default motions of Vim and works
+  well in all modes. And it now supports repeating with the dot operator.
+- **Configurable**: You can easily configure its behavior and map it to any key
+- **Sophisticated**: Provide flawless, smooth and fast motions with minimal keystrokes
+
+Even though some default behaviors were modified and many new features were
+added, I carefully considered backward compatibility. So those of you updating
+from older versions can do so without worry and start benefiting immediately
+from all the new features!
+
+Introduction
+=====
+
+EasyMotion provides a much simpler way to use some motions in vim. It
+takes the `<number>` out of `<number>w` or `<number>f{char}` by
+highlighting all possible choices and allowing you to press one key to
+jump directly to the target.
+
+When one of the available motions is triggered, all visible text
+preceding or following the cursor is faded, and motion targets are
+highlighted.
+
+EasyMotion is triggered by the provided mappings. This readme only covers the
+basics; please refer to
+[`:help easymotion.txt`](https://github.com/easymotion/vim-easymotion/blob/master/doc/easymotion.txt#L86)
+to see all the available mappings.
+
+Important notes
+=====
+
+### Default bindings
+
+**The default leader has been changed to `<Leader><Leader>` to avoid
+conflicts with other plugins you may have installed.** This can easily be
+changed back to pre-1.3 behavior by rebinding the leader in your vimrc:
+
+```vim
+map <Leader> <Plug>(easymotion-prefix)
+```
+
+All motions will then be triggered with `<Leader>` by default, e.g.
+`<Leader>s`, `<Leader>gE`.
+
+### For users of the forked version
+
+SelectLines and SelectPhrase are not actually *motions*, so I've moved them into
+separate plugins.
+
+- https://github.com/haya14busa/vim-easyoperator-line
+- https://github.com/haya14busa/vim-easyoperator-phrase
+
+Usage example for the base features
+=====
+
+	<cursor>Lorem ipsum dolor sit amet.
+
+Type `<Leader><Leader>w`(`<Plug>(easymotion-w)`) to trigger the word motion `w`.
+When the motion is triggered, the text is updated (no braces are actually added,
+the text is highlighted in red by default):
+
+	<cursor>Lorem {a}psum {b}olor {c}it {d}met.
+
+Press `c` to jump to the beginning of the word "sit":
+
+	Lorem ipsum dolor <cursor>sit amet.
+
+Similarly, if you're looking for an "o", you can use the `f` motion.
+Type `<Leader><Leader>fo`, and all "o" characters are highlighted:
+
+	<cursor>L{a}rem ipsum d{b}l{c}r sit amet.
+
+Press `b` to jump to the second "o":
+
+	Lorem ipsum d<cursor>olor sit amet.
+
+Jeffrey Way of Nettuts+ has also [written
+a tutorial](http://net.tutsplus.com/tutorials/other/vim-essential-plugin-easymotion/)
+about EasyMotion.
+
+New features in version 3.0
+====
+
+### Overwin motions
+![](https://raw.githubusercontent.com/haya14busa/i/2753bd4dd1dfdf5962dbdbffabf24244e4e14243/easymotion/overwin-motions.gif)
+
+EasyMotion now supports moving cursor across/over window.
+Since it doesn't make sense that moving cursor to other window while Visual or
+Operator-pending mode, overwin motions only provides mappings for Normal
+mode.  Please use `nmap` to use overwin motions. Overwin motions only
+supports bi-directional motions.
+
+#### Example configuration
+
+```vim
+" <Leader>f{char} to move to {char}
+map  <Leader>f <Plug>(easymotion-bd-f)
+nmap <Leader>f <Plug>(easymotion-overwin-f)
+
+" s{char}{char} to move to {char}{char}
+nmap s <Plug>(easymotion-overwin-f2)
+
+" Move to line
+map <Leader>L <Plug>(easymotion-bd-jk)
+nmap <Leader>L <Plug>(easymotion-overwin-line)
+
+" Move to word
+map  <Leader>w <Plug>(easymotion-bd-w)
+nmap <Leader>w <Plug>(easymotion-overwin-w)
+```
+
+#### Integration with incsearch.vim
+- [haya14busa/incsearch.vim](https://github.com/haya14busa/incsearch.vim)
+- [haya14busa/incsearch-easymotion.vim](https://github.com/haya14busa/incsearch-easymotion.vim)
+
+```vim
+" You can use other keymappings like <C-l> instead of <CR> if you want to
+" use these mappings as default search and somtimes want to move cursor with
+" EasyMotion.
+function! s:incsearch_config(...) abort
+  return incsearch#util#deepextend(deepcopy({
+  \   'modules': [incsearch#config#easymotion#module({'overwin': 1})],
+  \   'keymap': {
+  \     "\<CR>": '<Over>(easymotion)'
+  \   },
+  \   'is_expr': 0
+  \ }), get(a:, 1, {}))
+endfunction
+
+noremap <silent><expr> /  incsearch#go(<SID>incsearch_config())
+noremap <silent><expr> ?  incsearch#go(<SID>incsearch_config({'command': '?'}))
+noremap <silent><expr> g/ incsearch#go(<SID>incsearch_config({'is_stay': 1}))
+```
+
+### Bonus fuzzy-search with EasyMotion
+
+![](https://raw.githubusercontent.com/haya14busa/i/eab1d12a8bd322223d551956a4fd8a21d5c4bfe9/easymotion/fuzzy-incsearch-easymotion.gif)
+
+- [haya14busa/incsearch.vim](https://github.com/haya14busa/incsearch.vim)
+- [haya14busa/incsearch-fuzzy.vim](https://github.com/haya14busa/incsearch-fuzzy.vim)
+- [haya14busa/incsearch-easymotion.vim](https://github.com/haya14busa/incsearch-easymotion.vim)
+
+```vim
+function! s:config_easyfuzzymotion(...) abort
+  return extend(copy({
+  \   'converters': [incsearch#config#fuzzyword#converter()],
+  \   'modules': [incsearch#config#easymotion#module({'overwin': 1})],
+  \   'keymap': {"\<CR>": '<Over>(easymotion)'},
+  \   'is_expr': 0,
+  \   'is_stay': 1
+  \ }), get(a:, 1, {}))
+endfunction
+
+noremap <silent><expr> <Space>/ incsearch#go(<SID>config_easyfuzzymotion())
+```
+
+New features in version 2.0
+====
+
+### Two key highlighting
+
+When EasyMotion runs out of single characters to highlight movement targets, it
+immediately shows you the keys you have to press.
+
+In previous versions you could not see the next character you would need to
+press until you entered the first one. This made movement over long distances
+less fluid. Now you can see at a glance exactly which characters to select to
+get to your destination.
+
+### Bidirectional motions
+
+All motions now come in a bidirectional variants (e.g. `<Plug>(easymotion-s)`,
+`<Plug>(easymotion-bd-w)` and so forth).
+By default, you can already jump forward or backward with `<Leader>s`. A useful
+trick is to map `nmap s <Plug>(easymotion-s)` to use `s` instead and save one
+keystroke!
+
+### 2-character search motion
+
+You can now also perform a 2-character search, similar to [vim-seek](https://github.com/goldfeld/vim-seek)/[vim-sneak](https://github.com/justinmk/vim-sneak) with `<Plug>(easymotion-s2)`. For example you can highlight all words that start with `fu`.
+
+![2-key-find-motion](https://f.cloud.github.com/assets/3797062/2039612/7cafcec8-89a5-11e3-8f2c-5f26a6b83efd.gif)
+
+```vim
+" Gif config
+nmap s <Plug>(easymotion-s2)
+nmap t <Plug>(easymotion-t2)
+```
+
+### n-character search motion
+
+You can also search for `n` characters, which can be used to replace the default search of Vim.
+It supports incremental highlighting and you can use `<Tab>` and `<S-Tab>` to scroll down/up a page. If you press
+`<CR>`, you get the usual EasyMotion highlighting and can jump to any matching target destination with a
+single keystroke.
+
+What sounds complicated should become clear if you look at the following examples.
+
+![n-key-motion-scroll](https://f.cloud.github.com/assets/3797062/2039254/4fbf7276-899e-11e3-9bf3-1e446cabc097.gif)
+
+![replace-search](https://f.cloud.github.com/assets/3797062/2039751/64b72bd8-89a8-11e3-80ea-2a6b578040b2.gif)
+
+```vim
+" Gif config
+map  / <Plug>(easymotion-sn)
+omap / <Plug>(easymotion-tn)
+
+" These `n` & `N` mappings are options. You do not have to map `n` & `N` to EasyMotion.
+" Without these mappings, `n` & `N` works fine. (These mappings just provide
+" different highlight method and have some other features )
+map  n <Plug>(easymotion-next)
+map  N <Plug>(easymotion-prev)
+```
+
+### Within line motion
+
+Every motion also has variants that are restricted to just the current line
+(e.g. `<Plug>(easymotion-sl)`, `<Plug>(easymotion-bd-wl)`, etc...). This can be
+helpful if you find the full search distracting or slows down vim.
+
+### hjkl motions
+
+EasyMotion can be configured to avoid repetitive use of the `h` `j` `k` and
+`l` keys.
+
+![hjkl-motion](https://f.cloud.github.com/assets/3797062/2039413/d8b32ab2-89a0-11e3-894f-3e81db084cfd.gif)
+
+```vim
+" Gif config
+map <Leader>l <Plug>(easymotion-lineforward)
+map <Leader>j <Plug>(easymotion-j)
+map <Leader>k <Plug>(easymotion-k)
+map <Leader>h <Plug>(easymotion-linebackward)
+
+let g:EasyMotion_startofline = 0 " keep cursor column when JK motion
+```
+
+### Smartcase & Smartsign
+
+This setting makes EasyMotion work similarly to Vim's `smartcase` option for
+global searches.
+
+```vim
+let g:EasyMotion_smartcase = 1
+```
+
+With this option set, `v` will match both `v` and `V`, but `V` will match `V`
+only. Default: 0.
+
+```vim
+let g:EasyMotion_use_smartsign_us = 1 " US layout
+" or
+let g:EasyMotion_use_smartsign_jp = 1 " JP layout
+```
+
+This applies the same concept, but for symbols and numerals. `1` will match `1`
+and `!`; `!` matches `!` only. Default: 0.
+
+
+### Migemo feature (for Japanese user)
+
+```vim
+let g:EasyMotion_use_migemo = 1
+```
+
+
+Easymotion can match multibyte Japanese characters with alphabetical input.
+For example, `<Leader><Leader>sa` can search 'あ'.
+This feature doesn't require cmigemo because Easymotion includes regex
+patterns generated by cmigemo. However, installing `cmigemo` will make
+2-character and n-character search motions to also support the migemo feature.
+Default:0
+
+
+### Repeat motions
+
+#### Repeat the last motion
+
+`<Plug>(easymotion-repeat)`
+
+#### Repeat the last find motion
+
+In a find motion (e.g. `<Plug>(easymotion-s)`), type `<CR>` without
+input characters to find the last motion again.
+
+#### Jump to next/previous match (even on next/previous page)
+
+* `<Plug>(easymotion-next)`
+* `<Plug>(easymotion-prev)`
+
+#### Support for dot repeat
+
+This requires https://github.com/tpope/vim-repeat.
+
+You can use EasyMotion with operators and press `.` to repeat!
+It is well-behaved, and consistent with the default behavior of Vim.
+
+![repeat-motion](https://f.cloud.github.com/assets/3797062/2039538/0aef66aa-89a4-11e3-8242-c27a5208cfca.gif)
+
+```vim
+" Gif config
+
+" Require tpope/vim-repeat to enable dot repeat support
+" Jump to anywhere with only `s{char}{target}`
+" `s<CR>` repeat last find motion.
+nmap s <Plug>(easymotion-s)
+" Bidirectional & within line 't' motion
+omap t <Plug>(easymotion-bd-tl)
+" Use uppercase target labels and type as a lower case
+let g:EasyMotion_use_upper = 1
+ " type `l` and match `l`&`L`
+let g:EasyMotion_smartcase = 1
+" Smartsign (type `3` and match `3`&`#`)
+let g:EasyMotion_use_smartsign_us = 1
+```
+
+
+Installation
+------------
+### Pathogen (https://github.com/tpope/vim-pathogen)
+```
+git clone https://github.com/easymotion/vim-easymotion ~/.vim/bundle/vim-easymotion
+```
+
+### Vundle (https://github.com/gmarik/vundle)
+```
+Plugin 'easymotion/vim-easymotion'
+```
+
+### NeoBundle (https://github.com/Shougo/neobundle.vim)
+```
+NeoBundle 'easymotion/vim-easymotion'
+```
+
+Minimal Configuration Tutorial
+------------------------------
+**I recommend configuring and map keys by yourself if you are true Vimmer.**
+
+**Please do not be satisfied with just installing vim-easymotion, configuring it yourself boost your productivity more and more!**
+
+Default `<Leader><Leader>` prefix isn't easy to press, and I leave them just for backwards compatibility.
+You should at least change the prefix key like this `map <Leader> <Plug>(easymotion-prefix)`
+
+Minimal but useful vimrc example:
+
+```vim
+let g:EasyMotion_do_mapping = 0 " Disable default mappings
+
+" Jump to anywhere you want with minimal keystrokes, with just one key binding.
+" `s{char}{label}`
+nmap s <Plug>(easymotion-overwin-f)
+" or
+" `s{char}{char}{label}`
+" Need one more keystroke, but on average, it may be more comfortable.
+nmap s <Plug>(easymotion-overwin-f2)
+
+" Turn on case insensitive feature
+let g:EasyMotion_smartcase = 1
+
+" JK motions: Line motions
+map <Leader>j <Plug>(easymotion-j)
+map <Leader>k <Plug>(easymotion-k)
+```
+Now, all you need to remember is `s` and JK motions bindings, and it's good enough to boost your cursor speed!
+
+**`s`** is bidirectional find motion, you can move to anywhere with it.
+
+**`<Leader>j`** & **`<Leader>k`** make it easy to move to the lines.
+
+Of course you can use any key you want instead of `s` such as `<Space>`, `<Leader>s`, etc...
+
+If you want to use more useful mappings, please see [:h easymotion.txt](https://github.com/easymotion/vim-easymotion/blob/master/doc/easymotion.txt) for more detail.
diff --git a/vim/plugins/vim-easymotion/Rakefile b/vim/plugins/vim-easymotion/Rakefile
new file mode 100644
index 0000000..63a3a36
--- /dev/null
+++ b/vim/plugins/vim-easymotion/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/vim-easymotion/autoload/EasyMotion.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion.vim
new file mode 100644
index 0000000..df39bf2
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion.vim
@@ -0,0 +1,1629 @@
+scriptencoding utf-8
+" EasyMotion - Vim motions on speed!
+"
+" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
+"         haya14busa <hayabusa1419@gmail.com>
+" Source: https://github.com/easymotion/vim-easymotion
+"=============================================================================
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+let s:TRUE = !0
+let s:FALSE = 0
+let s:DIRECTION = { 'forward': 0, 'backward': 1, 'bidirection': 2}
+
+
+" Init: {{{
+let s:loaded = s:FALSE
+function! EasyMotion#init()
+    if s:loaded
+        return
+    endif
+    let s:loaded = s:TRUE
+    call EasyMotion#highlight#load()
+    " Store previous motion info
+    let s:previous = {}
+    " Store previous operator-pending motion info for '.' repeat
+    let s:dot_repeat = {}
+    " Prepare 1-key Migemo Dictionary
+    let s:migemo_dicts = {}
+    let s:EasyMotion_is_active = 0
+    call EasyMotion#reset()
+    " Anywhere regular expression: {{{
+    let re = '\v' .
+        \    '(<.|^$)' . '|' .
+        \    '(.>|^$)' . '|' .
+        \    '(\l)\zs(\u)' . '|' .
+        \    '(_\zs.)' . '|' .
+        \    '(#\zs.)'
+    " 1. word
+    " 2. end of word
+    " 3. CamelCase
+    " 4. after '_' hoge_foo
+    " 5. after '#' hoge#foo
+    let g:EasyMotion_re_anywhere = get(g:, 'EasyMotion_re_anywhere', re)
+
+    " Anywhere regular expression within line:
+    let re = '\v' .
+        \    '(<.|^$)' . '|' .
+        \    '(.>|^$)' . '|' .
+        \    '(\l)\zs(\u)' . '|' .
+        \    '(_\zs.)' . '|' .
+        \    '(#\zs.)'
+    let g:EasyMotion_re_line_anywhere = get(g:, 'EasyMotion_re_line_anywhere', re)
+    "}}}
+    " For other plugin
+    let s:EasyMotion_is_cancelled = 0
+    " 0 -> Success
+    " 1 -> Cancel
+    let g:EasyMotion_ignore_exception = 0
+    return ""
+endfunction
+"}}}
+" Reset: {{{
+function! EasyMotion#reset()
+    let s:flag = {
+        \ 'within_line' : 0,
+        \ 'dot_repeat' : 0,
+        \ 'regexp' : 0,
+        \ 'bd_t' : 0,
+        \ 'find_bd' : 0,
+        \ 'linewise' : 0,
+        \ 'count_dot_repeat' : 0,
+        \ }
+        " regexp: -> regular expression
+        "   This value is used when multi input find motion. If this values is
+        "   1, input text is treated as regexp.(Default: escaped)
+        " bd_t: -> bi-directional 't' motion
+        "   This value is used to re-define regexp only for bi-directional 't'
+        "   motion
+        " find_bd: -> bi-directional find motion
+        "   This value is used to recheck the motion is inclusive or exclusive
+        "   because 'f' & 't' forward find motion is inclusive, but 'F' & 'T'
+        "   backward find motion is exclusive
+        " count_dot_repeat: -> dot repeat with count
+        "   https://github.com/easymotion/vim-easymotion/issues/164
+    let s:current = {
+        \ 'is_operator' : 0,
+        \ 'is_search' : 0,
+        \ 'dot_repeat_target_cnt' : 0,
+        \ 'dot_prompt_user_cnt' : 0,
+        \ 'changedtick' : 0,
+        \ }
+        " \ 'start_position' : [],
+        " \ 'cursor_position' : [],
+
+        " is_operator:
+        "   Store is_operator value first because mode(1) value will be
+        "   changed by some operation.
+        " dot_* :
+        "   These values are used when '.' repeat for automatically
+        "   select marker/label characters.(Using count avoid recursive
+        "   prompt)
+        " changedtick:
+        "   :h b:changedtick
+        "   This value is used to avoid side effect of overwriting buffer text
+        "   which will change b:changedtick value. To overwrite g:repeat_tick
+        "   value(defined tpope/vim-repeat), I can avoid this side effect of
+        "   conflicting with tpope/vim-repeat
+        " start_position:
+        "   Original, start cursor position.
+        " cursor_position:
+        "   Usually, this values is same with start_position, but in
+        "   visualmode and 'n' key motion, this value could be different.
+    return ""
+endfunction "}}}
+
+" Motion Functions: {{{
+" -- Find Motion -------------------------
+" Note: {{{
+" num_strokes:
+"   The number of input characters. Currently provide 1, 2, or -1.
+"   '-1' means no limit.
+" visualmode:
+"   Vim script couldn't detect the function is called in visual mode by
+"   mode(1), so tell whether it is in visual mode by argument explicitly
+" direction:
+"   0 -> forward
+"   1 -> backward
+"   2 -> bi-direction (handle forward & backward at the same time) }}}
+function! EasyMotion#S(num_strokes, visualmode, direction) " {{{
+    if a:direction == 1
+        let is_inclusive = 0
+    else
+        " Note: Handle bi-direction later because 'f' motion is inclusive but
+        " 'F' motion is exclusive
+        let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+    endif
+    let s:flag.find_bd = a:direction == 2 ? 1 : 0
+    let re = s:findMotion(a:num_strokes, a:direction)
+    if s:handleEmpty(re, a:visualmode) | return | endif
+    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#OverwinF(num_strokes) " {{{
+    let re = s:findMotion(a:num_strokes, s:DIRECTION.bidirection)
+    call EasyMotion#reset()
+    if re isnot# ''
+        return EasyMotion#overwin#move(re)
+    endif
+endfunction "}}}
+function! EasyMotion#T(num_strokes, visualmode, direction) " {{{
+    if a:direction == 1
+        let is_inclusive = 0
+    else
+        " Note: Handle bi-direction later because 't' motion is inclusive but
+        " 'T' motion is exclusive
+        let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+    endif
+    let s:flag.find_bd = a:direction == 2 ? 1 : 0
+    let re = s:findMotion(a:num_strokes, a:direction)
+    if s:handleEmpty(re, a:visualmode) | return | endif
+    if a:direction == 2
+        let s:flag.bd_t = 1
+    elseif a:direction == 1
+        let re = s:convert_t_regexp(re, 1) " backward
+    else
+        let re = s:convert_t_regexp(re, 0) " forward
+    endif
+    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- Word Motion -------------------------
+function! EasyMotion#WB(visualmode, direction) " {{{
+    "FIXME: inconsistent with default vim motion
+    "FIXED: -> EasyMotion#WBK()
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    call s:EasyMotion('\(\<.\|^$\)', a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#WBW(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let regex_without_file_ends = '\v(^|\s)\zs\S|^$'
+    let regex = l:regex_without_file_ends
+                \ . (a:direction == 1 ? '' : '|%$')
+                \ . (a:direction == 0 ? '' : '|%^')
+    call s:EasyMotion(l:regex, a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#WBK(visualmode, direction) " {{{
+    " vim's iskeyword style word motion
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let regex_without_file_ends = '\v<|^\S|\s\zs\S|>\zs\S|^$'
+    let regex = l:regex_without_file_ends
+                \ . (a:direction == 1 ? '' : '|%$')
+                \ . (a:direction == 0 ? '' : '|%^')
+    call s:EasyMotion(l:regex, a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#E(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+    call s:EasyMotion('\(.\>\|^$\)', a:direction, a:visualmode ? visualmode() : '', is_inclusive)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#EW(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+    " Note: The stopping positions for 'E' and 'gE' differs. Thus, the regex
+    " for direction==2 cannot be the same in both directions. This will be
+    " ignored.
+    let regex_stub = '\v\S(\s|$)'
+    let regex = l:regex_stub
+                \ . (a:direction == 0 ? '' : '|^$|%^')
+                \ . (a:direction == 1 ? '' : '|%$')
+    call s:EasyMotion(l:regex, a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#EK(visualmode, direction) " {{{
+    " vim's iskeyword style word motion
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+    " Note: The stopping positions for 'e' and 'ge' differs. Thus, the regex
+    " for direction==2 cannot be the same in both directions. This will be
+    " ignored.
+    let regex_stub = '\v.\ze>|\S\ze\s*$|\S\ze\s|\k\zs>\S\ze|\S<'
+    let regex = l:regex_stub
+                \ . (a:direction == 0 ? '' : '|^$|%^')
+                \ . (a:direction == 1 ? '' : '|%$')
+    call s:EasyMotion(l:regex, a:direction, a:visualmode ? visualmode() : '', 0)
+
+
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- JK Motion ---------------------------
+function! EasyMotion#JK(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let s:flag.linewise = 1
+
+    if g:EasyMotion_startofline
+        call s:EasyMotion('^\(\w\|\s*\zs\|$\)', a:direction, a:visualmode ? visualmode() : '', 0)
+    else
+        let vcol  = EasyMotion#helper#vcol('.')
+        let pattern = printf('^.\{-}\zs\(\%%<%dv.\%%>%dv\|$\)', vcol + 1, vcol)
+        call s:EasyMotion(pattern, a:direction, a:visualmode ? visualmode() : '', 0)
+    endif
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#Sol(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let s:flag.linewise = 1
+    call s:EasyMotion('^\(.\|$\)', a:direction, a:visualmode ? visualmode() : '', '')
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#Eol(visualmode, direction) " {{{
+    let s:flag.linewise = 1
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    call s:EasyMotion('\(\w\|\s*\zs\|.\|^\)$', a:direction, a:visualmode ? visualmode() : '', '')
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- Search Motion -----------------------
+function! EasyMotion#Search(visualmode, direction, respect_direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let search_direction = a:respect_direction ?
+    \   (a:direction == 1 ? v:searchforward : 1-v:searchforward) :
+    \   (a:direction)
+    call s:EasyMotion(@/, search_direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- JumpToAnywhere Motion ---------------
+function! EasyMotion#JumpToAnywhere(visualmode, direction) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    call s:EasyMotion( g:EasyMotion_re_anywhere, a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- Line Motion -------------------------
+function! EasyMotion#SL(num_strokes, visualmode, direction) " {{{
+    let s:flag.within_line = 1
+    call EasyMotion#S(a:num_strokes, a:visualmode, a:direction)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#TL(num_strokes, visualmode, direction) " {{{
+    let s:flag.within_line = 1
+    call EasyMotion#T(a:num_strokes, a:visualmode, a:direction)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#WBL(visualmode, direction) " {{{
+    let s:flag.within_line = 1
+    call EasyMotion#WBK(a:visualmode, a:direction)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#EL(visualmode, direction) " {{{
+    let s:flag.within_line = 1
+    call EasyMotion#EK(a:visualmode, a:direction)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#LineAnywhere(visualmode, direction) " {{{
+    let s:flag.within_line = 1
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let re = g:EasyMotion_re_line_anywhere
+    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', 0)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- User Motion -------------------------
+let s:config = {
+\   'pattern': '',
+\   'visualmode': s:FALSE,
+\   'direction': s:DIRECTION.forward,
+\   'inclusive': s:FALSE,
+\   'accept_cursor_pos': s:FALSE,
+\   'overwin': s:FALSE
+\ }
+
+function! s:default_config() abort
+    let c = copy(s:config)
+    let m = mode(1)
+    let c.inclusive = m ==# 'no' ? s:TRUE : s:FALSE
+    return c
+endfunction
+
+function! EasyMotion#go(...) abort
+    let c = extend(s:default_config(), get(a:, 1, {}))
+    if c.overwin
+        return EasyMotion#overwin#move(c.pattern)
+    else
+        let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+        call s:EasyMotion(c.pattern, c.direction, c.visualmode ? visualmode() : '', c.inclusive, c)
+        return s:EasyMotion_is_cancelled
+    endif
+endfunction
+function! EasyMotion#User(pattern, visualmode, direction, inclusive, ...) " {{{
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    let is_inclusive = mode(1) ==# 'no' ? a:inclusive : 0
+    let re = a:pattern
+    call s:EasyMotion(re, a:direction, a:visualmode ? visualmode() : '', is_inclusive, get(a:, 1, {}))
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" -- Repeat Motion -----------------------
+function! EasyMotion#Repeat(visualmode) " {{{
+    " Repeat previous motion with previous targets
+    if !has_key(s:previous, 'regexp')
+        call s:Message("Previous targets doesn't exist")
+        let s:EasyMotion_is_cancelled = 1
+        return s:EasyMotion_is_cancelled
+    endif
+    let re = s:previous.regexp
+    let direction = s:previous.direction
+    let s:flag.within_line = s:previous.line_flag
+    let s:flag.bd_t = s:previous.bd_t_flag
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    " FIXME: is_inclusive value is inappropriate but handling this value is
+    " difficult and priorities is low because this motion maybe used usually
+    " as a 'normal' motion.
+    let is_inclusive = mode(1) ==# 'no' ? 1 : 0
+
+    call s:EasyMotion(re, direction, a:visualmode ? visualmode() : '', is_inclusive)
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#DotRepeat() " {{{
+    let cnt = v:count1 " avoid overwriting
+
+    " Repeat previous '.' motion with previous targets and operator
+    if !has_key(s:dot_repeat, 'regexp')
+        call s:Message("Previous motion doesn't exist")
+        let s:EasyMotion_is_cancelled = 1
+        return s:EasyMotion_is_cancelled
+    endif
+
+    let re = s:dot_repeat.regexp
+    let direction = s:dot_repeat.direction
+    let is_inclusive = s:dot_repeat.is_inclusive
+
+    for i in range(cnt)
+        " s:EasyMotion() always call reset s:flag & s:current
+        let s:flag.dot_repeat = 1
+        let s:flag.within_line = s:dot_repeat.line_flag
+        let s:flag.bd_t = s:dot_repeat.bd_t_flag
+        let s:current.is_operator = 1
+
+        let s:flag.count_dot_repeat = (i > 0 ? 1 : 0)
+        silent call s:EasyMotion(re, direction, 0, is_inclusive)
+    endfor
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+function! EasyMotion#NextPrevious(visualmode, direction) " {{{
+    " Move next/previous destination using previous motion regexp
+    let cnt = v:count1 " avoid overwriting
+    if !has_key(s:previous, 'regexp')
+        call s:Message("Previous targets doesn't exist")
+        let s:EasyMotion_is_cancelled = 1
+        return s:EasyMotion_is_cancelled
+    endif
+    let re = s:previous.regexp
+    let search_direction = (a:direction == 1 ? 'b' : '')
+
+    if g:EasyMotion_move_highlight
+        call EasyMotion#highlight#attach_autocmd()
+        call EasyMotion#highlight#add_highlight(re, g:EasyMotion_hl_move)
+    endif
+
+    if ! empty(a:visualmode)
+        " FIXME: blink highlight
+        silent exec 'normal! gv'
+    endif
+
+    " Mark jump-list
+    if cnt > 1
+        " Consider Next/Previous motions as jump motion :h jump-motion
+        " Note: It should add jumplist even if the count isn't given
+        "       considering vim's default behavior of `n` & `N`, but just
+        "       I don't want to do it without the count. Should I add a
+        "       option?
+        normal! m`
+    endif
+
+    " Jump
+    " @vimlint(EVL102, 1, l:_)
+    for _ in range(cnt)
+        keepjumps call searchpos(re, search_direction)
+    endfor
+
+    normal! zv
+
+    call EasyMotion#reset()
+    " -- Activate EasyMotion ----------------- {{{
+    let s:EasyMotion_is_active = 1
+    call EasyMotion#attach_active_autocmd() "}}}
+    return s:EasyMotion_is_cancelled
+endfunction " }}}
+" }}}
+" Helper Functions: {{{
+" -- Message -----------------------------
+function! s:Message(message) " {{{
+    if g:EasyMotion_verbose
+        echo 'EasyMotion: ' . a:message
+    else
+        " Make the current message dissapear
+        echo ''
+        " redraw
+    endif
+endfunction " }}}
+function! s:Prompt(message) " {{{
+    echohl Question
+    echo a:message . ': '
+    echohl None
+endfunction " }}}
+function! s:Throw(message) "{{{
+    throw 'EasyMotion: ' . a:message
+endfunction "}}}
+
+" -- Save & Restore values ---------------
+function! s:SaveValue() "{{{
+    if ! s:current.is_search
+        call EasyMotion#helper#VarReset('&scrolloff', 0)
+    endif
+    call EasyMotion#helper#VarReset('&modified', 0)
+    call EasyMotion#helper#VarReset('&modifiable', 1)
+    call EasyMotion#helper#VarReset('&readonly', 0)
+    call EasyMotion#helper#VarReset('&spell', 0)
+    call EasyMotion#helper#VarReset('&virtualedit', '')
+    " if &foldmethod !=# 'expr'
+        call EasyMotion#helper#VarReset('&foldmethod', 'manual')
+    " endif
+endfunction "}}}
+function! s:RestoreValue() "{{{
+    call EasyMotion#helper#VarReset('&scrolloff')
+    call EasyMotion#helper#VarReset('&modified')
+    call EasyMotion#helper#VarReset('&modifiable')
+    call EasyMotion#helper#VarReset('&readonly')
+    call EasyMotion#helper#VarReset('&spell')
+    call EasyMotion#helper#VarReset('&virtualedit')
+    " if &foldmethod !=# 'expr'
+        call EasyMotion#helper#VarReset('&foldmethod')
+    " endif
+endfunction "}}}
+function! s:turn_off_hl_error() "{{{
+    let s:error_hl = EasyMotion#highlight#capture('Error')
+    call EasyMotion#highlight#turn_off(s:error_hl)
+    let s:matchparen_hl = EasyMotion#highlight#capture('MatchParen')
+    call EasyMotion#highlight#turn_off(s:matchparen_hl)
+endfunction "}}}
+function! s:turn_on_hl_error() "{{{
+    if exists('s:error_hl')
+        call EasyMotion#highlight#turn_on(s:error_hl)
+        unlet s:error_hl
+    endif
+
+    if exists('s:matchparen_hl')
+        call EasyMotion#highlight#turn_on(s:matchparen_hl)
+        unlet s:matchparen_hl
+    endif
+endfunction "}}}
+
+" -- Draw --------------------------------
+function! s:SetLines(lines, key) " {{{
+    for [line_num, line] in a:lines
+        keepjumps call setline(line_num, line[a:key])
+    endfor
+endfunction " }}}
+
+" -- Get characters from user input ------
+function! s:GetChar(...) abort "{{{
+    let mode = get(a:, 1, 0)
+    while 1
+        " Workaround for https://github.com/osyo-manga/vital-over/issues/53
+        try
+            let char = call('getchar', a:000)
+        catch /^Vim:Interrupt$/
+            let char = 3 " <C-c>
+        endtry
+        if char == 27 || char == 3
+            " Escape or <C-c> key pressed
+            redraw
+            call s:Message('Cancelled')
+            return ''
+        endif
+        " Workaround for the <expr> mappings
+        if string(char) !=# "\x80\xfd`"
+            return mode == 1 ? !!char
+            \    : type(char) == type(0) ? nr2char(char) : char
+        endif
+    endwhile
+endfunction "}}}
+
+" -- Find Motion Helper ------------------
+function! s:findMotion(num_strokes, direction) "{{{
+    " Find Motion: S,F,T
+    let s:current.is_operator = mode(1) ==# 'no' ? 1: 0
+    " store cursor pos because 'n' key find motion could be jump to offscreen
+    let s:current.original_position = [line('.'), col('.')]
+    let s:current.is_search = a:num_strokes == -1 ? 1: 0
+    let s:flag.regexp = a:num_strokes == -1 ? 1 : 0 " TODO: remove?
+
+    if g:EasyMotion_add_search_history && a:num_strokes == -1
+        let s:previous['input'] = @/
+    else
+        let s:previous['input'] = get(s:previous, 'input', '')
+    endif
+    let input = EasyMotion#command_line#GetInput(
+                    \ a:num_strokes, s:previous.input, a:direction)
+    let s:previous['input'] = input
+
+    " Check that we have an input char
+    if empty(input)
+        return ''
+    endif
+
+    let re = s:convertRegep(input)
+
+    if g:EasyMotion_add_search_history && a:num_strokes == -1
+        let history_re = substitute(re, '\\c\|\\C', '', '')
+        let @/ = history_re "For textobject: 'gn'
+        call histadd('search', history_re)
+    endif
+
+    return re
+endfunction "}}}
+function! s:convertRegep(input) "{{{
+    " 1. regexp
+    " 2. migemo
+    " 3. smartsign
+    " 4. smartcase
+    let use_migemo = s:should_use_migemo(a:input)
+    let re = use_migemo || s:should_use_regexp() ? a:input : s:escape_regexp_char(a:input)
+
+    " Convert space to match only start of spaces
+    if re ==# ' '
+        let re = '\s\+'
+    endif
+
+    if use_migemo
+        let re = s:convertMigemo(re)
+    endif
+
+    if s:should_use_smartsign(a:input)
+        let r = s:convertSmartsign(a:input)
+        if use_migemo
+            let re = re . '\m\|' . r
+        else
+            let re = r
+        endif
+    endif
+
+    let case_flag = EasyMotion#helper#should_case_sensitive(
+                        \ a:input, s:current.is_search) ? '\c' : '\C'
+    let re = case_flag . re
+    return re
+endfunction "}}}
+function! s:convertMigemo(re) "{{{
+    let re = a:re
+
+    if len(re) > 1
+        " System cmigemo
+        return EasyMotion#cmigemo#getMigemoPattern(re)
+    endif
+
+    " EasyMotion migemo one key dict
+    if ! has_key(s:migemo_dicts, &l:encoding)
+        let s:migemo_dicts[&l:encoding] = EasyMotion#helper#load_migemo_dict()
+    endif
+    return get(s:migemo_dicts[&l:encoding], re, a:re)
+endfunction "}}}
+function! s:convertSmartsign(chars) "{{{
+    " Convert given chars to smartsign string
+    " Example: 12 -> [1!][2@]
+    "          a] -> a[]}]
+
+    " Load smartsign dictionary
+    let smart_dict = s:load_smart_dict()
+    " Prepare converted string
+    let converted_str = ''
+    " Get `upper_sign` for each given chars
+    " Split chars into list
+    for char in split(a:chars, '\zs')
+        let upper_sign = s:get_escaped_group_char(smart_dict, char)
+        if upper_sign ==# ''
+            let converted_str .= s:escape_regexp_char(char)
+        else
+            " [1!]
+            let converted_str .= '[' . char . upper_sign . ']'
+        endif
+    endfor
+    return converted_str
+endfunction "}}}
+function! s:get_escaped_group_char(dict, char) "{{{
+    " Get escaped char from given dictionary
+    " return '' if char is not find
+    " Used inside `[]`
+    return escape(get(a:dict, a:char, ''), '^')
+endfunction "}}}
+function! s:escape_regexp_char(char) "{{{
+    return escape(a:char, '.$^~\[]*')
+endfunction "}}}
+function! s:convertSmartcase(re, char) "{{{
+    let re = a:re
+    if a:char =~# '\U' "nonuppercase
+        return '\c' . re
+    else "uppercase
+        return '\C' . re
+    endif
+endfunction "}}}
+function! s:should_use_regexp() "{{{
+    return g:EasyMotion_use_regexp == 1 && s:flag.regexp == 1
+endfunction "}}}
+function! s:should_use_migemo(char) "{{{
+    if ! g:EasyMotion_use_migemo || match(a:char, '[^!-~]') != -1
+        return 0
+    endif
+
+    " TODO: use direction to improve
+    if s:flag.within_line == 1
+        let first_line = line('.')
+        let end_line = line('.')
+    else
+        let first_line = line('w0')
+        let end_line = line('w$')
+    endif
+
+    " Skip folded line and check if text include multibyte characters
+    for line in range(first_line, end_line)
+        if EasyMotion#helper#is_folded(line)
+            continue
+        endif
+
+        if EasyMotion#helper#include_multibyte_char(getline(line)) == 1
+            return 1
+        endif
+    endfor
+
+    return 0
+endfunction "}}}
+function! s:should_use_smartsign(char) "{{{
+    " Smartsign Dictionary exists?
+    " \A: non-alphabetic character
+    " Do not use smartsign for n-key find search motions
+    if (exists('g:EasyMotion_use_smartsign_us')  ||
+    \   exists('g:EasyMotion_use_smartsign_jp')) &&
+    \  match(a:char, '\A') != -1 &&
+    \ exists('s:current.is_search') && s:current.is_search == 0
+        return 1
+    else
+        return 0
+    endif
+endfunction "}}}
+function! s:convert_t_regexp(re, direction) "{{{
+    if a:direction == 0 "forward
+        return '\_.\ze\('.a:re.'\)'
+    elseif a:direction == 1 "backward
+        return '\('.a:re.'\)\@<=\_.'
+    endif
+endfunction "}}}
+
+" -- Handle Visual Mode ------------------
+function! s:GetVisualStartPosition(c_pos, v_start, v_end, search_direction) "{{{
+    let vmode = mode(1)
+    if vmode !~# "^[Vv\<C-v>]"
+        call s:Throw('Unkown visual mode:'.vmode)
+    endif
+
+    if vmode ==# 'V' "line-wise Visual
+        " Line-wise Visual {{{
+        if a:v_start[0] == a:v_end[0]
+            if a:search_direction == ''
+                return a:v_start
+            elseif a:search_direction == 'b'
+                return a:v_end
+            else
+                call s:throw('Unkown search_direction')
+            endif
+        else
+            if a:c_pos[0] == a:v_start[0]
+                return a:v_end
+            elseif a:c_pos[0] == a:v_end[0]
+                return a:v_start
+            endif
+        endif
+        "}}}
+    else
+        " Character-wise or Block-wise Visual"{{{
+        if a:c_pos == a:v_start
+            return a:v_end
+        elseif a:c_pos == a:v_end
+            return a:v_start
+        endif
+
+        " virtualedit
+        if a:c_pos[0] == a:v_start[0]
+            return a:v_end
+        elseif a:c_pos[0] == a:v_end[0]
+            return a:v_start
+        elseif EasyMotion#helper#is_greater_coords(a:c_pos, a:v_start) == 1
+            return a:v_end
+        else
+            return a:v_start
+        endif
+        "}}}
+    endif
+endfunction "}}}
+
+" -- Others ------------------------------
+function! s:is_cmdwin() "{{{
+  return bufname('%') ==# '[Command Line]'
+endfunction "}}}
+function! s:should_use_wundo() "{{{
+    " wundu cannot use in command-line window and
+    " unless undolist is not empty
+    return ! s:is_cmdwin() && undotree().seq_last != 0
+endfunction "}}}
+function! s:handleEmpty(input, visualmode) "{{{
+    " if empty, reselect and return 1
+    if empty(a:input)
+        if ! empty(a:visualmode)
+            silent exec 'normal! gv'
+        endif
+        let s:EasyMotion_is_cancelled = 1 " Cancel
+        return 1
+    endif
+    return 0
+endfunction "}}}
+function! s:load_smart_dict() "{{{
+    if exists('g:EasyMotion_use_smartsign_us')
+        return g:EasyMotion#sticky_table#us
+    elseif exists('g:EasyMotion_use_smartsign_jp')
+        return g:EasyMotion#sticky_table#jp
+    else
+        return {}
+    endif
+endfunction "}}}
+function! EasyMotion#attach_active_autocmd() "{{{
+    " Reference: https://github.com/justinmk/vim-sneak
+    augroup plugin-easymotion-active
+        autocmd!
+        autocmd InsertEnter,WinLeave,BufLeave <buffer>
+            \ let s:EasyMotion_is_active = 0
+            \  | autocmd! plugin-easymotion-active * <buffer>
+        autocmd CursorMoved <buffer>
+            \ autocmd plugin-easymotion-active CursorMoved <buffer>
+            \ let s:EasyMotion_is_active = 0
+            \  | autocmd! plugin-easymotion-active * <buffer>
+    augroup END
+endfunction "}}}
+function! EasyMotion#is_active() "{{{
+    return s:EasyMotion_is_active
+endfunction "}}}
+function! EasyMotion#activate(is_visual) "{{{
+    let s:EasyMotion_is_active = 1
+    call EasyMotion#attach_active_autocmd()
+    call EasyMotion#highlight#add_highlight(s:previous.regexp,
+                                          \ g:EasyMotion_hl_move)
+    call EasyMotion#highlight#attach_autocmd()
+    if a:is_visual == 1
+        normal! gv
+    endif
+endfunction "}}}
+function! s:restore_cursor_state(visualmode) "{{{
+    " -- Restore original cursor position/selection
+    if ! empty(a:visualmode)
+        silent exec 'normal! gv'
+        keepjumps call cursor(s:current.cursor_position)
+    else
+        keepjumps call cursor(s:current.original_position)
+    endif
+endfunction " }}}
+" Grouping Algorithms: {{{
+let s:grouping_algorithms = {
+\   1: 'SCTree'
+\ , 2: 'Original'
+\ }
+" -- Single-key/closest target priority tree {{{
+" This algorithm tries to assign one-key jumps to all the targets closest to the cursor.
+" It works recursively and will work correctly with as few keys as two.
+function! s:GroupingAlgorithmSCTree(targets, keys) "{{{
+    " Prepare variables for working
+    let targets_len = len(a:targets)
+    let keys_len = len(a:keys)
+
+    let groups = {}
+
+    let keys = reverse(copy(a:keys))
+
+    " Semi-recursively count targets {{{
+        " We need to know exactly how many child nodes (targets) this branch will have
+        " in order to pass the correct amount of targets to the recursive function.
+
+        " Prepare sorted target count list {{{
+            " This is horrible, I know. But dicts aren't sorted in vim, so we need to
+            " work around that. That is done by having one sorted list with key counts,
+            " and a dict which connects the key with the keys_count list.
+
+            let keys_count = []
+            let keys_count_keys = {}
+
+            let i = 0
+            for key in keys
+                call add(keys_count, 0)
+
+                let keys_count_keys[key] = i
+
+                let i += 1
+            endfor
+        " }}}
+
+        let targets_left = targets_len
+        let level = 0
+        let i = 0
+
+        while targets_left > 0
+            " Calculate the amount of child nodes based on the current level
+            let childs_len = (level == 0 ? 1 : (keys_len - 1) )
+
+            for key in keys
+                " Add child node count to the keys_count array
+                let keys_count[keys_count_keys[key]] += childs_len
+
+                " Subtract the child node count
+                let targets_left -= childs_len
+
+                if targets_left <= 0
+                    " Subtract the targets left if we added too many too
+                    " many child nodes to the key count
+                    let keys_count[keys_count_keys[key]] += targets_left
+
+                    break
+                endif
+
+                let i += 1
+            endfor
+
+            let level += 1
+        endwhile
+    " }}}
+    " Create group tree {{{
+        let i = 0
+        let key = 0
+
+        call reverse(keys_count)
+
+        for key_count in keys_count
+            if key_count > 1
+                " We need to create a subgroup
+                " Recurse one level deeper
+                let groups[a:keys[key]] = s:GroupingAlgorithmSCTree(a:targets[i : i + key_count - 1], a:keys)
+            elseif key_count == 1
+                " Assign single target key
+                let groups[a:keys[key]] = a:targets[i]
+            else
+                " No target
+                continue
+            endif
+
+            let key += 1
+            let i += key_count
+        endfor
+    " }}}
+
+    " Finally!
+    return groups
+endfunction "}}}
+" }}}
+" -- Original ---------------------------- {{{
+function! s:GroupingAlgorithmOriginal(targets, keys)
+    " Split targets into groups (1 level)
+    let targets_len = len(a:targets)
+    " let keys_len = len(a:keys)
+
+    let groups = {}
+
+    let i = 0
+    let root_group = 0
+    try
+        while root_group < targets_len
+            let groups[a:keys[root_group]] = {}
+
+            for key in a:keys
+                let groups[a:keys[root_group]][key] = a:targets[i]
+
+                let i += 1
+            endfor
+
+            let root_group += 1
+        endwhile
+    catch | endtry
+
+    " Flatten the group array
+    if len(groups) == 1
+        let groups = groups[a:keys[0]]
+    endif
+
+    return groups
+endfunction
+" }}}
+
+" -- Coord/key dictionary creation ------- {{{
+function! s:CreateCoordKeyDict(groups, ...)
+    " Dict structure:
+    " 1,2 : a
+    " 2,3 : b
+    let sort_list = []
+    let coord_keys = {}
+    let group_key = a:0 == 1 ? a:1 : ''
+
+    for [key, item] in items(a:groups)
+        let key = group_key . key
+        "let key = ( ! empty(group_key) ? group_key : key)
+
+        if type(item) == type([]) " List
+            " Destination coords
+
+            " The key needs to be zero-padded in order to
+            " sort correctly
+            let dict_key = printf('%05d,%05d', item[0], item[1])
+            let coord_keys[dict_key] = key
+
+            " We need a sorting list to loop correctly in
+            " PromptUser, dicts are unsorted
+            call add(sort_list, dict_key)
+        else
+            " Item is a dict (has children)
+            let coord_key_dict = s:CreateCoordKeyDict(item, key)
+
+            " Make sure to extend both the sort list and the
+            " coord key dict
+            call extend(sort_list, coord_key_dict[0])
+            call extend(coord_keys, coord_key_dict[1])
+        endif
+
+        unlet item
+    endfor
+
+    return [sort_list, coord_keys]
+endfunction
+" }}}
+" }}}
+"}}}
+" Core Functions: {{{
+function! s:PromptUser(groups) "{{{
+    " Recursive
+    let group_values = values(a:groups)
+
+    " -- If only one possible match, jump directly to it {{{
+    if len(group_values) == 1
+        if mode(1) ==# 'no'
+            " Consider jump to first match
+            " NOTE: matchstr() handles multibyte characters.
+            let s:dot_repeat['target'] = matchstr(g:EasyMotion_keys, '^.')
+        endif
+        redraw
+        return group_values[0]
+    endif
+    " }}}
+
+    " -- Prepare marker lines ---------------- {{{
+    let lines = {}
+
+    let coord_key_dict = s:CreateCoordKeyDict(a:groups)
+
+    let prev_col_num = 0
+    for dict_key in sort(coord_key_dict[0])
+        " NOTE: {{{
+        " let g:EasyMotion_keys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        " Perform <Plug>(easymotion-w)
+        "
+        " lines[line_num]['orig']:
+        "   Lorem ipsum dolor sit amet consectetur adipisicing
+        "
+        " {target_char}:
+        "   {L}orem {i}psum {d}olor {s}it {a}met {c}onsectetur {a}dipisicing
+        "
+        " lines[line_num]['marker'], {marker_chars}:
+        "   {A}orem {B}psum {C}olor {D}it {E}met {F}onsectetur {G}dipisicing
+        "   2-key-combo: {marker_chars} could be 1 or 2 chars like {AB}
+        "
+        " }}}
+
+        " Prepare original line and marker line {{{
+        let [line_num, col_num] = split(dict_key, ',')
+
+        let line_num = str2nr(line_num)
+        let col_num = str2nr(col_num)
+        if ! has_key(lines, line_num)
+            let current_line = getline(line_num)
+            let lines[line_num] = {
+                \ 'orig': current_line,
+                \ 'marker': current_line,
+                \ 'mb_compensation': 0,
+                \ }
+            " mb_compensation -> multibyte compensation
+            let prev_col_num = 0
+        endif "}}}
+
+        " Multibyte Compensation: {{{
+        " Solve multibyte issues by matching the byte column
+        " number instead of the visual column
+        " Compensate for byte difference between marker
+        " character and target character
+        "
+        " This has to be done in order to match the correct
+        " column; \%c matches the byte column and not display
+        " column.
+        let col_num = max([prev_col_num + 1,
+                        \  col_num - lines[line_num]['mb_compensation']])
+        let prev_col_num = col_num
+        "}}}
+
+        " Prepare marker characters {{{
+        let marker_chars = coord_key_dict[1][dict_key]
+        let marker_chars_len = EasyMotion#helper#strchars(marker_chars)
+        "}}}
+
+        " Replace {target} with {marker} & Highlight {{{
+        let col_add = 0 " Column add byte length
+        " Disable two-key-combo feature?
+        let marker_max_length = g:EasyMotion_disable_two_key_combo == 1
+                                \ ? 1 : 2
+        for i in range(min([marker_chars_len, marker_max_length]))
+            let marker_char = split(marker_chars, '\zs')[i]
+            " EOL {{{
+            if strlen(lines[line_num]['marker']) < col_num + col_add
+                " Append marker chars if target is EOL
+                let lines[line_num]['marker'] .= ' '
+            endif "}}}
+
+            let target_col_regexp = '\%' . (col_num + col_add) . 'c.'
+            let target_char = matchstr(lines[line_num]['marker'],
+                                      \ target_col_regexp)
+            let space_len = strdisplaywidth(target_char)
+                        \ - strdisplaywidth(marker_char)
+            " Substitute marker character
+            let substitute_expr = marker_char . repeat(' ', space_len)
+
+            let lines[line_num]['marker'] = substitute(
+                \ lines[line_num]['marker'],
+                \ target_col_regexp,
+                \ escape(substitute_expr,'&'),
+                \ '')
+
+            " Highlight targets {{{
+            let _hl_group =
+            \   (marker_chars_len == 1) ? g:EasyMotion_hl_group_target
+            \   : (i == 0) ? g:EasyMotion_hl2_first_group_target
+            \   : g:EasyMotion_hl2_second_group_target
+
+            if exists('*matchaddpos')
+                call EasyMotion#highlight#add_pos_highlight(
+                            \ line_num, col_num + col_add, _hl_group)
+            else
+                call EasyMotion#highlight#add_highlight(
+                    \ '\%' . line_num . 'l' . target_col_regexp,
+                    \ _hl_group)
+            endif
+            "}}}
+
+            " Add marker/target length difference for multibyte compensation
+            let lines[line_num]['mb_compensation'] +=
+                \ strlen(target_char) - strlen(substitute_expr)
+            " Shift column
+            let col_add += strlen(marker_char)
+        endfor
+        "}}}
+    endfor
+
+    let lines_items = items(lines)
+    " }}}
+
+    " -- Put labels on targets & Get User Input & Restore all {{{
+    " Save undo tree {{{
+    let s:undo_file = tempname()
+    if s:should_use_wundo()
+        execute "wundo" s:undo_file
+    endif
+    "}}}
+    try
+        " Set lines with markers {{{
+        call s:SetLines(lines_items, 'marker')
+        redraw "}}}
+
+        " Get target character {{{
+        call s:Prompt('Target key')
+        let char = s:GetChar()
+        "}}}
+
+        " Convert uppercase {{{
+        if g:EasyMotion_use_upper == 1 && match(g:EasyMotion_keys, '\l') == -1
+            let char = toupper(char)
+        endif "}}}
+
+        " Jump first target when Enter or Space key is pressed "{{{
+        if (char ==# "\<CR>" && g:EasyMotion_enter_jump_first == 1) ||
+        \  (char ==# "\<Space>" && g:EasyMotion_space_jump_first == 1)
+            " NOTE: matchstr() is multibyte aware.
+            let char = matchstr(g:EasyMotion_keys, '^.')
+        endif "}}}
+
+        " For dot repeat {{{
+        if mode(1) ==# 'no'
+            " Store previous target when operator pending mode
+            if s:current.dot_prompt_user_cnt == 0
+                " Store
+                let s:dot_repeat['target'] = char
+            else
+                " Append target chars
+                let s:dot_repeat['target'] .= char
+            endif
+        endif "}}}
+
+    finally
+        " Restore original lines
+        call s:SetLines(lines_items, 'orig')
+
+        " Un-highlight targets {{{
+        call EasyMotion#highlight#delete_highlight(
+            \ g:EasyMotion_hl_group_target,
+            \ g:EasyMotion_hl2_first_group_target,
+            \ g:EasyMotion_hl2_second_group_target,
+            \ )
+        " }}}
+
+        " Restore undo tree {{{
+        if s:should_use_wundo() && filereadable(s:undo_file)
+            silent execute "rundo" s:undo_file
+            call delete(s:undo_file)
+            unlet s:undo_file
+        else
+            " Break undo history (undobreak)
+            let old_undolevels = &undolevels
+            set undolevels=-1
+            keepjumps call setline('.', getline('.'))
+            let &undolevels = old_undolevels
+            unlet old_undolevels
+            " FIXME: Error occur by GundoToggle for undo number 2 is empty
+            keepjumps call setline('.', getline('.'))
+        endif "}}}
+
+        redraw
+    endtry "}}}
+
+    " -- Check if we have an input char ------ {{{
+    if empty(char)
+        call s:Throw('Cancelled')
+    endif
+    " }}}
+    " -- Check if the input char is valid ---- {{{
+    if ! has_key(a:groups, char)
+        call s:Throw('Invalid target')
+    endif
+    " }}}
+
+    let target = a:groups[char]
+
+    if type(target) == type([])
+        " Return target coordinates
+        return target
+    else
+        " Prompt for new target character
+        let s:current.dot_prompt_user_cnt += 1
+        return s:PromptUser(target)
+    endif
+endfunction "}}}
+function! s:DotPromptUser(groups) "{{{
+    " Get char from previous target
+    let char = s:dot_repeat.target[s:current.dot_repeat_target_cnt]
+    " For dot repeat target chars
+    let s:current.dot_repeat_target_cnt += 1
+
+    let target = a:groups[char]
+
+    if type(target) == type([])
+        " Return target coordinates
+        return target
+    else
+        " Prompt for new target character
+        return s:PromptUser(target)
+    endif
+endfunction "}}}
+
+function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
+    let config = extend(s:default_config(), get(a:, 1, {}))
+    " Store s:current original_position & cursor_position {{{
+    " current cursor pos.
+    let s:current.cursor_position = [line('.'), col('.')]
+    " original start position.  This value could be changed later in visual
+    " mode
+    let s:current.original_position =
+        \ get(s:current, 'original_position', s:current.cursor_position)
+    "}}}
+
+    let win_first_line = line('w0') " visible first line num
+    let win_last_line  = line('w$') " visible last line num
+
+    " Store the target positions list
+    " e.g. targets = [ [line, col], [line2, col2], ...]
+    let targets = []
+
+    " Store info for Repeat motion {{{
+    if s:flag.dot_repeat != 1
+        " Store Regular Expression
+        let s:previous['regexp'] = a:regexp
+        let s:previous['direction'] = a:direction
+        let s:previous['operator'] = v:operator
+
+        " Note: 'is_inclusive' value could be changed later when
+        " bi-directional find motion depend on 'true' direction the cursor
+        " will move.
+        let s:previous['is_inclusive'] = a:is_inclusive
+
+        " For special motion flag
+        let s:previous['line_flag'] = s:flag.within_line
+        let s:previous['bd_t_flag'] = s:flag.bd_t " bi-directional t motion
+    endif "}}}
+
+    " To avoid side effect of overwriting buffer for tpope/repeat
+    " store current b:changedtick. Use this value later
+    let s:current.changedtick = b:changedtick
+
+    try
+        " -- Reset properties -------------------- {{{
+        " Save original value and set new value
+        call s:SaveValue()
+        call s:turn_off_hl_error()
+        " }}}
+        " Setup searchpos args {{{
+        let search_direction = (a:direction == 1 ? 'b' : '')
+        let search_stopline = a:direction == 1 ? win_first_line : win_last_line
+
+        if s:flag.within_line == 1
+            let search_stopline = s:current.original_position[0]
+        endif
+        "}}}
+
+        " Handle visual mode {{{
+        if ! empty(a:visualmode)
+            " Decide at where visual mode start {{{
+            normal! gv
+            let v_start = [line("'<"),col("'<")] " visual_start_position
+            let v_end   = [line("'>"),col("'>")] " visual_end_position
+
+            let v_original_pos = s:GetVisualStartPosition(
+                \ s:current.cursor_position, v_start, v_end, search_direction)
+            "}}}
+
+            " Reselect visual text {{{
+            keepjumps call cursor(v_original_pos)
+            exec "normal! " . a:visualmode
+            keepjumps call cursor(s:current.cursor_position)
+            "}}}
+            " Update s:current.original_position
+            " overwrite original start position
+            let s:current.original_position = v_original_pos
+        endif "}}}
+
+        " Handle bi-directional t motion {{{
+        if s:flag.bd_t == 1
+            let regexp = s:convert_t_regexp(a:regexp, 0) "forward
+        else
+            let regexp = a:regexp
+        endif
+        "}}}
+
+        " Handle dot repeat with count
+        if s:flag.count_dot_repeat
+            let cursor_char = EasyMotion#helper#get_char_by_coord(s:current.cursor_position)
+            if cursor_char =~# regexp
+                call add(targets, s:current.cursor_position)
+            endif
+        endif
+
+        " Construct match dict {{{
+        " Note: searchpos() has side effect which jump cursor position.
+        "       You can disable this side effect by add 'n' flags,
+        "       but in this case, it's better to allows jump side effect
+        "       to gathering matched targets coordinates.
+        let pos = searchpos(regexp, search_direction . (config.accept_cursor_pos ? 'c' : ''), search_stopline)
+        while 1
+            " Reached end of search range
+            if pos == [0, 0]
+                break
+            endif
+
+            " Skip folded lines {{{
+            if EasyMotion#helper#is_folded(pos[0])
+                if search_direction ==# 'b'
+                    " FIXME: Hmm... I should use filter()
+                    " keepjumps call cursor(foldclosed(pos[0]), 0)
+                else
+                    keepjumps call cursor(foldclosedend(pos[0]+1), 0)
+                endif
+            else
+                call add(targets, pos)
+            endif
+            "}}}
+            let pos = searchpos(regexp, search_direction, search_stopline)
+        endwhile
+        "}}}
+
+        " Handle bidirection "{{{
+        " For bi-directional t motion {{{
+        if s:flag.bd_t == 1
+            let regexp = s:convert_t_regexp(a:regexp, 1) "backward
+        endif
+        "}}}
+        " Reconstruct match dict
+        if a:direction == 2
+            " Backward
+
+            " Jump back cursor_position
+            keepjumps call cursor(s:current.cursor_position[0],
+                                \ s:current.cursor_position[1])
+
+            let targets2 = []
+            if s:flag.within_line == 0
+                let search_stopline = win_first_line
+            else
+                let search_stopline = s:current.cursor_position[0]
+            endif
+            while 1
+                " TODO: refactoring
+                let pos = searchpos(regexp, 'b', search_stopline)
+                " Reached end of search range
+                if pos == [0, 0]
+                    break
+                endif
+
+                " Skip folded lines {{{
+                if EasyMotion#helper#is_folded(pos[0])
+                    " keepjumps call cursor(foldclosedend(pos[0]+1), 0)
+                    continue
+                endif
+                "}}}
+
+                call add(targets2, pos)
+            endwhile
+            " Merge match target dict"{{{
+            let t1 = 0 " forward
+            let t2 = 0 " backward
+            let targets3 = []
+            while t1 < len(targets) || t2 < len(targets2)
+                " Forward -> Backward -> F -> B -> ...
+                if t1 < len(targets)
+                    call add(targets3, targets[t1])
+                    let t1 += 1
+                endif
+                if t2 < len(targets2)
+                    call add(targets3, targets2[t2])
+                    let t2 += 1
+                endif
+            endwhile
+            let targets = targets3
+            "}}}
+        endif
+        "}}}
+        " Handle no match"{{{
+        let targets_len = len(targets)
+        if targets_len == 0
+            call s:Throw('No matches')
+        endif
+        "}}}
+
+        " Attach specific key as marker to gathered matched coordinates
+        let GroupingFn = function('s:GroupingAlgorithm' . s:grouping_algorithms[g:EasyMotion_grouping])
+        let groups = GroupingFn(targets, split(g:EasyMotion_keys, '\zs'))
+
+        " -- Shade inactive source --------------- {{{
+        if g:EasyMotion_do_shade && targets_len != 1 && s:flag.dot_repeat != 1
+            if a:direction == 1 " Backward
+                let shade_hl_re = s:flag.within_line
+                                \ ? '^.*\%#'
+                                \ : '\%'. win_first_line .'l\_.*\%#'
+            elseif a:direction == 0 " Forward
+                let shade_hl_re = s:flag.within_line
+                                \ ? '\%#.*$'
+                                \ : '\%#\_.*\%'. win_last_line .'l'
+            else " Both directions
+                let shade_hl_re = s:flag.within_line
+                                \ ? '^.*\%#.*$'
+                                \ : '\_.*'
+            endif
+
+            call EasyMotion#highlight#add_highlight(
+                \ shade_hl_re, g:EasyMotion_hl_group_shade)
+            if g:EasyMotion_cursor_highlight
+                let cursor_hl_re = '\%#'
+                call EasyMotion#highlight#add_highlight(cursor_hl_re,
+                    \ g:EasyMotion_hl_inc_cursor)
+            endif
+        endif
+        " }}}
+
+        " -- Jump back before prompt for visual scroll {{{
+        " Because searchpos() change current cursor position and
+        " if you just use cursor(s:current.cursor_position) to jump back,
+        " current line will become middle of line window
+        if ! empty(a:visualmode)
+            keepjumps call winrestview({'lnum' : s:current.cursor_position[0], 'topline' : win_first_line})
+        else
+            " for adjusting cursorline
+            keepjumps call cursor(s:current.cursor_position)
+        endif
+        "}}}
+
+        " -- Prompt user for target group/character {{{
+        if s:flag.dot_repeat != 1
+            let coords = s:PromptUser(groups)
+        else
+            let coords = s:DotPromptUser(groups)
+        endif
+        "}}}
+
+        " -- Update cursor position -------------- {{{
+        " First, jump back cursor to original position
+        keepjumps call cursor(s:current.original_position)
+
+        " Consider EasyMotion as jump motion :h jump-motion
+        normal! m`
+
+        " Update selection for visual mode {{{
+        if ! empty(a:visualmode)
+            exec 'normal! ' . a:visualmode
+        endif
+        " }}}
+
+        " For bi-directional motion, checking again whether the motion is
+        " inclusive is necessary. This value will might be updated later
+        let is_inclusive_check = a:is_inclusive
+        " For bi-directional motion, store 'true' direction for dot repeat
+        " to handling inclusive/exclusive motion
+        if a:direction == 2
+            let true_direction =
+                \ EasyMotion#helper#is_greater_coords(
+                \   s:current.original_position, coords) > 0 ?
+                \ 0 : 1
+                " forward : backward
+        else
+            let true_direction = a:direction
+        endif
+
+        if s:flag.dot_repeat == 1
+            " support dot repeat {{{
+            " Use visual mode to emulate dot repeat
+            normal! v
+
+            " Deal with exclusive {{{
+            if s:dot_repeat.is_inclusive == 0
+                " exclusive
+                if s:dot_repeat.true_direction == 0 "Forward
+                    let coords[1] -= 1
+                elseif s:dot_repeat.true_direction == 1 "Backward
+                    " Shift visual selection to left by making cursor one key
+                    " left.
+                    normal! hoh
+                endif
+            endif "}}}
+
+            " Jump to destination
+            keepjumps call cursor(coords[0], coords[1])
+
+            " Execute previous operator
+            let cmd = s:dot_repeat.operator
+            if s:dot_repeat.operator ==# 'c'
+                let cmd .= getreg('.')
+            endif
+            exec 'normal! ' . cmd
+            "}}}
+        else
+            " Handle inclusive & exclusive {{{
+            " Overwrite inclusive flag for special case {{{
+            if s:flag.find_bd == 1 && true_direction == 1
+                " Note: For bi-directional find motion s(f) & t
+                " If true_direction is backward, the motion is 'exclusive'
+                let is_inclusive_check = 0 " overwrite
+                let s:previous.is_inclusive = 0 " overwrite
+            endif "}}}
+            if is_inclusive_check
+                " Note: {{{
+                " Inclusive motion requires that we eat one more
+                " character to the right by forcing the motion to inclusive
+                " if we're using a forward motion because
+                " > :h exclusive
+                " > Note that when using ':' any motion becomes characterwise
+                " > exclusive.
+                " and EasyMotion use ':'
+                " See: h: o_v }}}
+                normal! v
+            endif " }}}
+
+            if s:current.is_operator && s:flag.linewise
+                " TODO: Is there better solution?
+                " Maike it linewise
+                normal! V
+            endif
+
+            " Adjust screen especially for visual scroll & offscreen search {{{
+            " Otherwise, cursor line will move middle line of window
+            keepjumps call winrestview({'lnum' : win_first_line, 'topline' : win_first_line})
+
+            " Jump to destination
+            keepjumps call cursor(coords[0], coords[1])
+
+            " To avoid side effect of overwriting buffer {{{
+            " for tpope/vim-repeat
+            " See: :h b:changedtick
+            if exists('g:repeat_tick')
+                if g:repeat_tick == s:current.changedtick
+                    let g:repeat_tick = b:changedtick
+                endif
+            endif "}}}
+        endif
+
+        " Set tpope/vim-repeat {{{
+        if s:current.is_operator == 1 &&
+                \ !(v:operator ==# 'y' && match(&cpo, 'y') == -1)
+            " Store previous info for dot repeat {{{
+            let s:dot_repeat.regexp = a:regexp
+            let s:dot_repeat.direction = a:direction
+            let s:dot_repeat.line_flag = s:flag.within_line
+            let s:dot_repeat.is_inclusive = is_inclusive_check
+            let s:dot_repeat.operator = v:operator
+            let s:dot_repeat.bd_t_flag = s:flag.bd_t " Bidirectional t motion
+            let s:dot_repeat.true_direction = true_direction " Check inclusive
+            "}}}
+            silent! call repeat#set("\<Plug>(easymotion-dotrepeat)")
+        endif "}}}
+
+        " Highlight all the matches by n-key find motions {{{
+        if s:current.is_search == 1 && s:current.is_operator == 0 && g:EasyMotion_add_search_history
+            " It seems let &hlsearch=&hlsearch doesn't work when called
+            " in script, so use :h feedkeys() instead.
+            " Ref: :h v:hlsearch
+            " FIXME: doesn't work with `c` operator
+            call EasyMotion#helper#silent_feedkeys(
+                                    \ ":let &hlsearch=&hlsearch\<CR>",
+                                    \ 'hlsearch', 'n')
+        endif "}}}
+
+        call s:Message('Jumping to [' . coords[0] . ', ' . coords[1] . ']')
+        let s:EasyMotion_is_cancelled = 0 " Success
+        "}}}
+    catch /^EasyMotion:.*/
+        redraw
+
+        " Show exception message
+        " The verbose option will take precedence
+        if g:EasyMotion_verbose == 1 && g:EasyMotion_ignore_exception != 1
+            echo v:exception
+        endif
+
+        let s:previous['regexp'] = a:regexp
+        " -- Activate EasyMotion ----------------- {{{
+        let s:EasyMotion_is_active = 1
+        call EasyMotion#attach_active_autocmd() "}}}
+
+        call s:restore_cursor_state(a:visualmode)
+        let s:EasyMotion_is_cancelled = 1 " Cancel
+    catch
+        call s:Message(v:exception . ' : ' . v:throwpoint)
+        call s:restore_cursor_state(a:visualmode)
+        let s:EasyMotion_is_cancelled = 1 " Cancel
+    finally
+        " -- Restore properties ------------------ {{{
+        call s:RestoreValue()
+        call s:turn_on_hl_error()
+        call EasyMotion#reset()
+        " }}}
+        " -- Remove shading ---------------------- {{{
+        call EasyMotion#highlight#delete_highlight()
+        " }}}
+
+        if s:EasyMotion_is_cancelled == 0 " Success
+            " -- Landing Highlight ------------------- {{{
+            if g:EasyMotion_landing_highlight
+                call EasyMotion#highlight#add_highlight(a:regexp,
+                                                      \ g:EasyMotion_hl_move)
+                call EasyMotion#highlight#attach_autocmd()
+            endif "}}}
+            " -- Activate EasyMotion ----------------- {{{
+            let s:EasyMotion_is_active = 1
+            call EasyMotion#attach_active_autocmd() "}}}
+        endif
+    endtry
+endfunction " }}}
+"}}}
+" }}}
+
+call EasyMotion#init()
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim
new file mode 100644
index 0000000..9a53361
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/cmigemo.vim
@@ -0,0 +1,117 @@
+"=============================================================================
+" FILE: autoload/EasyMotion/cmigemo.vim
+" AUTHOR: haya14busa
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+scriptencoding utf-8
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+function! s:has_vimproc() "{{{
+  if !exists('s:exists_vimproc')
+    try
+      silent call vimproc#version()
+      let s:exists_vimproc = 1
+    catch
+      let s:exists_vimproc = 0
+    endtry
+  endif
+
+  return s:exists_vimproc
+endfunction "}}}
+
+function! EasyMotion#cmigemo#system(...) "{{{
+    return call(s:has_vimproc() ? 'vimproc#system' : 'system', a:000)
+endfunction "}}}
+
+function! s:SearchDict2(name) "{{{
+    let path = $VIM . ',' . &runtimepath
+    let dict = globpath(path, "dict/".a:name)
+    if dict == ''
+        let dict = globpath(path, a:name)
+    endif
+    if dict == ''
+        for path in [
+                \ '/usr/local/share/migemo/',
+                \ '/usr/local/share/cmigemo/',
+                \ '/usr/local/share/',
+                \ '/usr/share/cmigemo/',
+                \ '/usr/share/',
+                \ ]
+            let path = path . a:name
+            if filereadable(path)
+                let dict = path
+                break
+            endif
+        endfor
+    endif
+    let dict = matchstr(dict, "^[^\<NL>]*")
+    return dict
+endfunction "}}}
+
+function! s:SearchDict() "{{{
+  for path in [
+        \ 'migemo/'.&encoding.'/migemo-dict',
+        \ &encoding.'/migemo-dict',
+        \ 'migemo-dict',
+        \ ]
+    let dict = s:SearchDict2(path)
+    if dict != ''
+      return dict
+    endif
+  endfor
+  echoerr 'a dictionary for migemo is not found'
+  echoerr 'your encoding is '.&encoding
+endfunction "}}}
+
+function! EasyMotion#cmigemo#getMigemoPattern(input) "{{{
+    if !exists('s:migemodict')
+        let s:migemodict = s:SearchDict()
+    endif
+
+    if has('migemo')
+        " Use migemo().
+        if &migemodict !=# ''
+            return migemo(a:input)
+        endif
+        let &migemodict = s:migemodict
+        try
+            return migemo(a:input)
+        finally
+            let &migemodict = ''
+        endtry
+    elseif executable('cmigemo')
+        " Use cmigemo.
+        return EasyMotion#cmigemo#system('cmigemo -v -w "'.a:input.'" -d "'.s:migemodict.'"')
+    else
+        " Not supported
+        return a:input
+    endif
+endfunction "}}}
+
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/command_line.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/command_line.vim
new file mode 100644
index 0000000..18ad282
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/command_line.vim
@@ -0,0 +1,283 @@
+"=============================================================================
+" FILE: autoload/EasyMotion/command_line.vim
+" AUTHOR: haya14busa
+" Reference: https://github.com/osyo-manga/vim-over
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+scriptencoding utf-8
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+" CommandLine:
+let s:V = vital#easymotion#new()
+let s:cmdline = s:V.import('Over.Commandline.Base')
+let s:modules = s:V.import("Over.Commandline.Modules")
+let s:search = s:cmdline.make()
+let s:search.highlights.prompt = 'Question'
+
+" Add Module: {{{
+call s:search.connect('Exit')
+call s:search.connect('Cancel')
+call s:search.connect('Redraw')
+call s:search.connect('DrawCommandline')
+call s:search.connect('Delete')
+call s:search.connect('CursorMove')
+call s:search.connect('Paste')
+call s:search.connect('BufferComplete')
+call s:search.connect('InsertRegister')
+call s:search.connect('ExceptionExit')
+call s:search.connect(s:modules.get('ExceptionMessage').make('EasyMotion: ', 'echom'))
+call s:search.connect(s:modules.get('History').make('/'))
+call s:search.connect(s:modules.get('NoInsert').make_special_chars())
+call s:search.connect(s:modules.get('KeyMapping').make_emacs())
+call s:search.connect(s:modules.get('Doautocmd').make('EMCommandLine'))
+
+let s:module = {
+\   "name" : "EasyMotion",
+\}
+function! s:module.on_char_pre(cmdline)
+    if a:cmdline.is_input("<Over>(em-scroll-f)")
+        call s:scroll(0)
+        call a:cmdline.setchar('')
+    elseif a:cmdline.is_input("<Over>(em-scroll-b)")
+        call s:scroll(1)
+        call a:cmdline.setchar('')
+    elseif a:cmdline.is_input("<Over>(em-jumpback)")
+        keepjumps call setpos('.', s:save_orig_pos)
+        let s:orig_pos = s:save_orig_pos
+        let s:orig_line_start = getpos('w0')
+        let s:orig_line_end = getpos('w$')
+        let s:direction = s:save_direction
+        call a:cmdline.setchar('')
+    elseif a:cmdline.is_input("<Over>(em-openallfold)")
+        " TODO: better solution
+        normal! zR
+        call a:cmdline.setchar('')
+    endif
+endfunction
+call s:search.connect(s:module)
+"}}}
+
+" CommandLine Keymap: {{{
+" .keymapping() won't be remapped by user defined KeyMappings.
+function! s:search.keymapping() "{{{
+    return {
+\       "\<CR>"   : {
+\           "key" : "<Over>(exit)",
+\           "noremap" : 1,
+\           "lock" : 1,
+\       },
+\   }
+endfunction "}}}
+
+call s:search.cnoremap("\<C-l>", '<Over>(buffer-complete)')
+call s:search.cnoremap("\<Tab>", '<Over>(em-scroll-f)')
+call s:search.cnoremap("\<S-Tab>", '<Over>(em-scroll-b)')
+call s:search.cnoremap("\<C-o>", '<Over>(em-jumpback)')
+call s:search.cnoremap("\<C-z>", '<Over>(em-openallfold)')
+
+" Fins Motion CommandLine Mapping Command: {{{
+function! EasyMotion#command_line#cmap(args)
+    let lhs = s:as_keymapping(a:args[0])
+    let rhs = s:as_keymapping(a:args[1])
+    call s:search.cmap(lhs, rhs)
+endfunction
+function! EasyMotion#command_line#cnoremap(args)
+    let lhs = s:as_keymapping(a:args[0])
+    let rhs = s:as_keymapping(a:args[1])
+    call s:search.cnoremap(lhs, rhs)
+endfunction
+function! EasyMotion#command_line#cunmap(lhs)
+    let lhs = s:as_keymapping(a:lhs)
+    call s:search.cunmap(lhs)
+endfunction
+function! s:as_keymapping(key)
+    execute 'let result = "' . substitute(a:key, '\(<.\{-}>\)', '\\\1', 'g') . '"'
+    return result
+endfunction
+"}}}
+"}}}
+
+" Event: {{{
+function! s:search.on_enter(cmdline) "{{{
+    if s:num_strokes == -1
+        call EasyMotion#highlight#delete_highlight()
+        call EasyMotion#helper#VarReset('&scrolloff', 0)
+        if g:EasyMotion_do_shade
+            call EasyMotion#highlight#add_highlight('\_.*',
+                                                \ g:EasyMotion_hl_group_shade)
+        endif
+    endif
+    if g:EasyMotion_cursor_highlight
+        call EasyMotion#highlight#add_highlight('\%#',
+                                              \ g:EasyMotion_hl_inc_cursor)
+    endif
+endfunction "}}}
+function! s:search.on_leave(cmdline) "{{{
+    if s:num_strokes == -1
+        call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_inc_search)
+        if g:EasyMotion_do_shade
+            call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_group_shade)
+        endif
+    endif
+    if g:EasyMotion_cursor_highlight
+        call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_inc_cursor)
+    endif
+endfunction "}}}
+function! s:search.on_char(cmdline) "{{{
+    if s:num_strokes == -1
+        let re = s:search.getline()
+        if EasyMotion#helper#should_case_sensitive(re, 1)
+            let case_flag = '\c'
+        else
+            let case_flag = '\C'
+        endif
+        let re .= case_flag
+        if g:EasyMotion_inc_highlight
+            call s:inc_highlight(re)
+        endif
+        if g:EasyMotion_off_screen_search
+            call s:off_screen_search(re)
+        endif
+    elseif s:search.line.length() >=  s:num_strokes
+        call s:search.exit()
+    endif
+endfunction "}}}
+"}}}
+
+" Main:
+function! EasyMotion#command_line#GetInput(num_strokes, prev, direction) "{{{
+    let s:num_strokes = a:num_strokes
+
+    let s:prompt_base = s:getPromptMessage(a:num_strokes)
+    call s:search.set_prompt(s:prompt_base)
+
+    " Screen: cursor position, first and last line
+    let s:orig_pos = getpos('.')
+    let s:orig_line_start = getpos('w0')
+    let s:orig_line_end = getpos('w$')
+    let s:save_orig_pos = deepcopy(s:orig_pos)
+
+    " Direction:
+    let s:direction = a:direction == 1 ? 'b' : ''
+    let s:save_direction = deepcopy(s:direction)
+
+    let input = s:search.get()
+    if input == '' && ! s:search.exit_code()
+        return a:prev
+    elseif s:search.exit_code() == 1 || s:search.exit_code() == -1
+        call s:Cancell()
+        return ''
+    else
+        return input
+    endif
+endfunction "}}}
+
+" Helper:
+function! s:Cancell() " {{{
+    call EasyMotion#highlight#delete_highlight()
+    call EasyMotion#helper#VarReset('&scrolloff')
+    keepjumps call setpos('.', s:save_orig_pos)
+    if g:EasyMotion_verbose
+        echo 'EasyMotion: Cancelled'
+    endif
+    return ''
+endfunction " }}}
+function! s:getPromptMessage(num_strokes) "{{{
+    if a:num_strokes == 1
+        let prompt = substitute(
+            \ substitute(g:EasyMotion_prompt,'{n}', a:num_strokes, 'g'),
+            \ '(s)', '', 'g')
+    elseif a:num_strokes == -1
+        let prompt = substitute(
+            \ substitute(g:EasyMotion_prompt, '{n}\s\{0,1}', '', 'g'),
+            \ '(s)', 's', 'g')
+    else
+        let prompt = substitute(
+            \ substitute(g:EasyMotion_prompt,'{n}', a:num_strokes, 'g'),
+            \ '(s)', 's', 'g')
+    endif
+    return prompt
+endfunction "}}}
+
+function! s:off_screen_search(re) "{{{
+    " First: search within visible screen range
+    call s:adjust_screen()
+    " Error occur when '\zs' without '!'
+    silent! let pos = searchpos(a:re, s:direction . 'n', s:orig_line_end[1])
+    if pos != [0, 0]
+        " Restore cursor posision
+        keepjumps call setpos('.', s:orig_pos)
+    else
+        " Second: if there were no much, search off screen
+        silent! let pos = searchpos(a:re, s:direction)
+        if pos != [0, 0]
+            " Match
+            keepjumps call setpos('.', pos)
+            " Move cursor
+            if s:save_direction != 'b'
+                normal! zzH0
+            else
+                normal! zzL0
+            endif
+        else
+            " No much
+            call s:adjust_screen()
+            keepjumps call setpos('.', s:orig_pos)
+        endif
+    endif
+    " redraw
+endfunction "}}}
+function! s:adjust_screen() "{{{
+    if s:save_direction != 'b'
+        " Forward
+        keepjumps call setpos('.', s:orig_line_start)
+        normal! zt
+    else
+        " Backward
+        keepjumps call setpos('.', s:orig_line_end)
+        normal! zb
+    endif
+endfunction "}}}
+function! s:scroll(direction) "{{{
+    " direction: 0 -> forward, 1 -> backward
+    exec a:direction == 0 ? "normal! \<C-f>" : "normal! \<C-b>"
+    let s:orig_pos = getpos('.')
+    let s:orig_line_start = getpos('w0')
+    let s:orig_line_end = getpos('w$')
+    let s:direction = a:direction == 0 ? '' : 'b'
+endfunction "}}}
+function! s:inc_highlight(re) "{{{
+    call EasyMotion#highlight#delete_highlight(g:EasyMotion_hl_inc_search)
+    if s:search.line.length() > 0
+        " Error occur when '\zs' without '!'
+        silent! call EasyMotion#highlight#add_highlight(a:re, g:EasyMotion_hl_inc_search)
+    endif
+endfunction "}}}
+
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/helper.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/helper.vim
new file mode 100644
index 0000000..4926566
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/helper.vim
@@ -0,0 +1,185 @@
+"=============================================================================
+" FILE: autoload/EasyMotion/helper.vim
+" AUTHOR: haya14busa
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+scriptencoding utf-8
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+function! EasyMotion#helper#mode(flag) "{{{
+    return mode(a:flag) == "\<C-v>" ? "C-v" : mode(a:flag)
+endfunction "}}}
+
+function! EasyMotion#helper#get_char_by_coord(coord) "{{{
+    " @param coord: [lnum, col] or [bufnum, lnum, col, off]
+    if len(a:coord) == 4
+        let [line_num, col_num] = [a:coord[1], a:coord[2]]
+    else
+        let [line_num, col_num] = a:coord
+    endif
+    let target_col_regexp = '\%' . (col_num) . 'c.'
+    return matchstr(getline(line_num), target_col_regexp)
+endfunction "}}}
+
+function! EasyMotion#helper#is_greater_coords(coords1, coords2) "{{{
+    " [line_num, col_num] < [line_num, col_num]
+    "
+    " coords1 < coords2  : return 1
+    " coords1 > coords2  : return -1
+    " coords1 == coords2 : return 0
+    if a:coords1 == a:coords2 | return 0 | endif
+
+    if a:coords1[0] < a:coords2[0]
+        return 1
+    elseif a:coords1[0] > a:coords2[0]
+        return -1
+    endif
+
+    " Same line
+    if a:coords1[1] < a:coords2[1]
+        return 1
+    elseif a:coords1[1] > a:coords2[1]
+        return -1
+    endif
+endfunction "}}}
+
+function! EasyMotion#helper#is_folded(line) "{{{
+    " Return false if g:EasyMotion_skipfoldedline == 1
+    " and line is start of folded lines
+    let _foldclosed = foldclosed(a:line)
+    return _foldclosed != -1 &&
+        \ (g:EasyMotion_skipfoldedline == 1 || a:line != _foldclosed)
+endfunction "}}}
+function! EasyMotion#helper#should_case_sensitive(input, is_search) "{{{
+    if !a:is_search
+        if g:EasyMotion_smartcase == 0
+            return 0
+        else
+            " return 1 if input didn't match uppercase letter
+            return match(a:input, '\u') == -1
+        endif
+    endif
+
+    if (g:EasyMotion_smartcase == 1 && match(a:input, '\u') == -1) ||
+    \  (&ignorecase && &smartcase && match(a:input, '\u') == -1) ||
+    \  (&ignorecase && !&smartcase)
+        return 1
+    endif
+    return 0
+endfunction "}}}
+function! EasyMotion#helper#silent_feedkeys(expr, name, ...) "{{{
+    " Ref:
+    " https://github.com/osyo-manga/vim-over/blob/d51b028c29661d4a5f5b79438ad6d69266753711/autoload/over.vim#L6
+    let mode = get(a:, 1, "m")
+    let name = "easymotion-" . a:name
+    let map = printf("<Plug>(%s)", name)
+    if mode == "n"
+        let command = "nnoremap"
+    else
+        let command = "nmap"
+    endif
+    execute command "<silent>" map printf("%s:nunmap %s<CR>", a:expr, map)
+    if mode(1) !=# 'ce'
+        " FIXME: mode(1) !=# 'ce' exists only for the test
+        "        :h feedkeys() doesn't work while runnning a test script
+        "        https://github.com/kana/vim-vspec/issues/27
+        call feedkeys(printf("\<Plug>(%s)", name))
+    endif
+endfunction "}}}
+function! EasyMotion#helper#VarReset(var, ...) "{{{
+    if ! exists('s:var_reset')
+        let s:var_reset = {}
+    endif
+
+    if a:0 == 0 && has_key(s:var_reset, a:var)
+        " Reset var to original value
+        " setbufvar( or bufname): '' or '%' can be used for the current buffer
+        call setbufvar('%', a:var, s:var_reset[a:var])
+    elseif a:0 == 1
+        " Save original value and set new var value
+
+        let new_value = a:0 == 1 ? a:1 : ''
+
+        " Store original value
+        let s:var_reset[a:var] = getbufvar("", a:var)
+
+        " Set new var value
+        call setbufvar('%', a:var, new_value)
+    endif
+endfunction "}}}
+
+" Migemo {{{
+function! EasyMotion#helper#load_migemo_dict() "{{{
+    let enc = &l:encoding
+    if enc ==# 'utf-8'
+        return EasyMotion#migemo#utf8#load_dict()
+    elseif enc ==# 'cp932'
+        return EasyMotion#migemo#cp932#load_dict()
+    elseif enc ==# 'euc-jp'
+        return EasyMotion#migemo#eucjp#load_dict()
+    else
+        let g:EasyMotion_use_migemo = 0
+        throw "Error: ".enc." is not supported. Migemo is made disabled."
+    endif
+endfunction "}}}
+
+" EasyMotion#helper#strchars() {{{
+if exists('*strchars')
+    function! EasyMotion#helper#strchars(str)
+        return strchars(a:str)
+    endfunction
+else
+    function! EasyMotion#helper#strchars(str)
+        return strlen(substitute(a:str, ".", "x", "g"))
+    endfunction
+endif "}}}
+function! EasyMotion#helper#include_multibyte_char(str) "{{{
+    return strlen(a:str) != EasyMotion#helper#strchars(a:str)
+endfunction "}}}
+
+function! EasyMotion#helper#vcol(expr) abort
+    let col_num = col(a:expr)
+    let line = getline(a:expr)
+    let before_line = col_num > 2 ? line[: col_num - 2]
+    \   : col_num is# 2 ? line[0]
+    \   : ''
+    let vcol_num = 1
+    for c in split(before_line, '\zs')
+        let vcol_num += c is# "\t" ? s:_virtual_tab2spacelen(vcol_num) : len(c)
+    endfor
+    return vcol_num
+endfunction
+
+function! s:_virtual_tab2spacelen(col_num) abort
+    return &tabstop - ((a:col_num - 1) % &tabstop)
+endfunction
+
+"}}}
+
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/highlight.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/highlight.vim
new file mode 100644
index 0000000..fa915a6
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/highlight.vim
@@ -0,0 +1,251 @@
+"=============================================================================
+" FILE: highlight.vim
+" AUTHOR: haya14busa
+" Reference: https://github.com/t9md/vim-smalls
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+scriptencoding utf-8
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+function! EasyMotion#highlight#load()
+   "load
+endfunction
+
+" -- Default highlighting ---------------- {{{
+let g:EasyMotion_hl_group_target         = get(g:,
+    \ 'EasyMotion_hl_group_target', 'EasyMotionTarget')
+let g:EasyMotion_hl2_first_group_target  = get(g:,
+    \ 'EasyMotion_hl2_first_group_target', 'EasyMotionTarget2First')
+let g:EasyMotion_hl2_second_group_target = get(g:,
+    \ 'EasyMotion_hl2_second_group_target', 'EasyMotionTarget2Second')
+let g:EasyMotion_hl_group_shade          = get(g:,
+    \ 'EasyMotion_hl_group_shade', 'EasyMotionShade')
+
+let g:EasyMotion_hl_inc_search     = get(g:,
+    \ 'EasyMotion_hl_inc_search', 'EasyMotionIncSearch')
+let g:EasyMotion_hl_inc_cursor     = get(g:,
+    \ 'EasyMotion_hl_inc_cursor', 'EasyMotionIncCursor')
+let g:EasyMotion_hl_move           = get(g:,
+    \ 'EasyMotion_hl_move', 'EasyMotionMoveHL')
+
+let s:target_hl_defaults = {
+    \   'gui'     : ['NONE', '#ff0000' , 'bold']
+    \ , 'cterm256': ['NONE', '196'     , 'bold']
+    \ , 'cterm'   : ['NONE', 'red'     , 'bold']
+    \ }
+
+let s:target_hl2_first_defaults = {
+    \   'gui'     : ['NONE', '#ffb400' , 'bold']
+    \ , 'cterm256': ['NONE', '11'      , 'bold']
+    \ , 'cterm'   : ['NONE', 'yellow'  , 'bold']
+    \ }
+
+let s:target_hl2_second_defaults = {
+    \   'gui'     : ['NONE', '#b98300' , 'bold']
+    \ , 'cterm256': ['NONE', '3'       , 'bold']
+    \ , 'cterm'   : ['NONE', 'yellow'  , 'bold']
+    \ }
+
+let s:shade_hl_defaults = {
+    \   'gui'     : ['NONE', '#777777' , 'NONE']
+    \ , 'cterm256': ['NONE', '242'     , 'NONE']
+    \ , 'cterm'   : ['NONE', 'grey'    , 'NONE']
+    \ }
+
+let s:shade_hl_line_defaults = {
+    \   'gui'     : ['red' , '#FFFFFF' , 'NONE']
+    \ , 'cterm256': ['red' , '242'     , 'NONE']
+    \ , 'cterm'   : ['red' , 'grey'    , 'NONE']
+    \ }
+
+let s:target_hl_inc = {
+    \   'gui'     : ['NONE', '#7fbf00' , 'bold']
+    \ , 'cterm256': ['NONE', '40'   , 'bold']
+    \ , 'cterm'   : ['NONE', 'green'   , 'bold']
+    \ }
+let s:target_hl_inc_cursor = {
+    \   'gui'     : ['#ACDBDA', '#121813' , 'bold']
+    \ , 'cterm256': ['cyan'   , '232'   , 'bold']
+    \ , 'cterm'   : ['cyan'   , 'black'   , 'bold']
+    \ }
+let s:target_hl_move = {
+    \   'gui'     : ['#7fbf00', '#121813' , 'bold']
+    \ , 'cterm256': ['green'  , '15'   , 'bold']
+    \ , 'cterm'   : ['green'  , 'white'   , 'bold']
+    \ }
+" }}}
+function! EasyMotion#highlight#InitHL(group, colors) " {{{
+    let group_default = a:group . 'Default'
+
+    " Prepare highlighting variables
+    let guihl = printf('guibg=%s guifg=%s gui=%s', a:colors.gui[0], a:colors.gui[1], a:colors.gui[2])
+    let ctermhl = &t_Co == 256
+        \ ? printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm256[0], a:colors.cterm256[1], a:colors.cterm256[2])
+        \ : printf('ctermbg=%s ctermfg=%s cterm=%s', a:colors.cterm[0], a:colors.cterm[1], a:colors.cterm[2])
+
+    " Create default highlighting group
+    execute printf('hi default %s %s %s', group_default, guihl, ctermhl)
+
+    " Check if the hl group exists
+    if hlexists(a:group)
+        redir => hlstatus | exec 'silent hi ' . a:group | redir END
+
+        " Return if the group isn't cleared
+        if hlstatus !~ 'cleared'
+            return
+        endif
+    endif
+
+    " No colors are defined for this group, link to defaults
+    execute printf('hi default link %s %s', a:group, group_default)
+endfunction " }}}
+function! EasyMotion#highlight#init() "{{{
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_group_shade,  s:shade_hl_defaults)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor)
+    call EasyMotion#highlight#InitHL(g:EasyMotion_hl_move, s:target_hl_move)
+    if exists(':CSApprox') == 2 && g:EasyMotion_force_csapprox
+        "TODO: better solution or remove completly
+        CSApprox!
+    endif
+endfunction "}}}
+
+" Reset highlighting after loading a new color scheme {{{
+augroup EasyMotionInitHL
+    autocmd!
+    autocmd ColorScheme * call EasyMotion#highlight#init()
+augroup end
+" }}}
+
+call EasyMotion#highlight#init()
+" Init: {{{
+let s:h = {}
+let s:h.ids = {}
+let s:priorities = {
+    \  g:EasyMotion_hl_group_target : 100,
+    \  g:EasyMotion_hl2_first_group_target : 100,
+    \  g:EasyMotion_hl2_second_group_target : 100,
+    \  g:EasyMotion_hl_group_shade : 0,
+    \  g:EasyMotion_hl_inc_search : 1,
+    \  g:EasyMotion_hl_inc_cursor : 2,
+    \  g:EasyMotion_hl_move : 0,
+    \ }
+for s:group in keys(s:priorities)
+    let s:h.ids[s:group] = []
+endfor
+unlet s:group
+"}}}
+
+function! EasyMotion#highlight#delete_highlight(...) "{{{
+    let groups = !empty(a:000) ? a:000 : keys(s:priorities)
+    for group in groups
+        for id in s:h.ids[group]
+            silent! call matchdelete(id)
+        endfor
+        let s:h.ids[group] = []
+    endfor
+endfunction "}}}
+function! EasyMotion#highlight#add_highlight(re, group) "{{{
+    call add(s:h.ids[a:group], matchadd(a:group, a:re, s:priorities[a:group]))
+endfunction "}}}
+function! EasyMotion#highlight#add_pos_highlight(line_num, col_num, group) "{{{
+    call add(s:h.ids[a:group], matchaddpos(a:group, [[a:line_num, a:col_num]], s:priorities[a:group]))
+endfunction "}}}
+function! EasyMotion#highlight#attach_autocmd() "{{{
+    " Reference: https://github.com/justinmk/vim-sneak
+    augroup plugin-easymotion
+        autocmd!
+        autocmd InsertEnter,WinLeave,BufLeave <buffer>
+            \ silent! call EasyMotion#highlight#delete_highlight()
+            \  | autocmd! plugin-easymotion * <buffer>
+        autocmd CursorMoved <buffer>
+            \ autocmd plugin-easymotion CursorMoved <buffer>
+            \ silent! call EasyMotion#highlight#delete_highlight()
+            \  | autocmd! plugin-easymotion * <buffer>
+    augroup END
+endfunction "}}}
+function! EasyMotion#highlight#add_color_group(new_groups) "{{{
+    let s:priorities = extend(deepcopy(s:priorities), a:new_groups)
+    for group in keys(a:new_groups)
+        let s:h.ids[group] = []
+    endfor
+endfunction "}}}
+
+function! EasyMotion#highlight#capture(hlname) "{{{
+    " Based On: https://github.com/t9md/vim-ezbar
+    "           https://github.com/osyo-manga/vital-over
+    let hlname = a:hlname
+    if !hlexists(hlname)
+        return
+    endif
+    while 1
+        let save_verbose = &verbose
+        let &verbose = 0
+        try
+            redir => HL_SAVE
+            execute 'silent! highlight ' . hlname
+            redir END
+        finally
+            let &verbose = save_verbose
+        endtry
+        if !empty(matchstr(HL_SAVE, 'xxx cleared$'))
+            return ''
+        endif
+        " follow highlight link
+        let ml = matchlist(HL_SAVE, 'links to \zs.*')
+        if !empty(ml)
+            let hlname = ml[0]
+            continue
+        endif
+        break
+    endwhile
+    let HL_SAVE = substitute(matchstr(HL_SAVE, 'xxx \zs.*'),
+                           \ '[ \t\n]\+', ' ', 'g')
+    return [hlname, HL_SAVE]
+endfunction "}}}
+function! EasyMotion#highlight#turn_off(hl) "{{{
+    if type(a:hl) != type([])
+        return
+    endif
+    execute 'highlight ' . a:hl[0] . ' NONE'
+endfunction "}}}
+function! EasyMotion#highlight#turn_on(hl) "{{{
+    if type(a:hl) != type([])
+        return
+    endif
+    execute 'highlight ' . a:hl[0] . ' ' . a:hl[1]
+endfunction "}}}
+
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" __END__  {{{
+" vim: expandtab softtabstop=4 shiftwidth=4
+" vim: foldmethod=marker
+" }}}
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim
new file mode 100644
index 0000000..4db547b
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/cp932.vim
@@ -0,0 +1,97 @@
+function! EasyMotion#migemo#cp932#load_dict()
+    return {
+      \ '!' : '\%([���I!]\|��\_s*�Q\_s*��\)',
+      \ '"' : '[�h���g�V"]',
+      \ '#' : '[��#]',
+      \ '$' : '[������\$]',
+      \ '%' : '\%([����%]\|�p\_s*�[\_s*�Z\_s*��\_s*�g\)',
+      \ '&' : '\%([��&]\|�A\_s*��\_s*\%(�h\|�p\_s*�T\_s*��\_s*�h\)\)',
+      \ "'" : '\%([�Y�h���e���L�f'']\|�A\_s*�|\_s*�X\_s*�g\_s*��\_s*�t\_s*�B\)',
+      \ '(' : '[�i�k�y�w�m(]',
+      \ ')' : '[�z�x�j�n)]',
+      \ '*' : '[���~��\*]',
+      \ '+' : '[�}�����{����+]',
+      \ ',' : '[�C�A,]',
+      \ '-' : '\%([��������\�|���[�]�`��-]\|�}\_s*�C\_s*�i\_s*�X\| \_s*�c\_s* \)',
+      \ '.' : '\%([�d�B�D�E�c\.]\|�h\_s*�b\_s*�g\_s*\%(�l\_s*�b\_s*�g\|�R\_s*��\)\)',
+      \ '/' : '\%([�����^\/]\|s\_s*l\_s*a\_s*s\_s*h\_s*d\_s*o\_s*t\|�X\_s*��\_s*\%(�h\|�b\_s*�V\_s*��\_s*�h\_s*�b\_s*�g\)\)',
+      \ '0' : '\%([�Z�O��0]\|�[\_s*��\|z\_s*e\_s*r\_s*o\)',
+      \ '1' : '\%([�\�S��GMKhYZEPTn��mcyzdafp�똟���P1]\|�V\_s*�b\_s*�N\_s*�X\_s*�e\_s*�B\_s*�[\_s*��\|s\_s*\%(e\_s*v\_s*e\_s*n\_s*t\_s*e\_s*e\_s*n\|i\_s*x\_s*t\_s*e\_s*e\_s*n\)\|�g\_s*�E\_s*�F\_s*��\_s*[�u��]\|�C\_s*��\_s*\%(�u\_s*��\|��\_s*��\)\|�n\_s*��\_s*�h\_s*��\_s*�b\_s*�h\|�T\_s*\%(�[\_s*�e\_s*�B\_s*�[\_s*��\|�E\_s*�U\_s*��\_s*�h\)\|g\_s*i\_s*g\_s*a\|�M\_s*�K\|��\_s*�K\|k\_s*i\_s*l\_s*o\|�L\_s*��\|�w\_s*�N\_s*�g\|e\_s*\%(i\_s*g\_s*h\_s*t\_s*e\_s*e\_s*n\|l\_s*e\_s*v\_s*e\_s*n\|x\_s*a\)\|�G\_s*\%(�C\_s*�e\_s*�B\_s*�[\_s*��\|�N\_s*�T\)\|�y\_s*�^\|t\_s*\%(w\_s*e\_s*l\_s*v\_s*e\|h\_s*\%(i\_s*r\_s*t\_s*e\_s*e\_s*n\|o\_s*u\_s*s\_s*a\_s*n\_s*d\)\|e\_s*\%(n\|r\_s*a\)\)\|�e\_s*[����]\|�i\_s*\%(�m\|�C\_s*��\_s*�e\_s*�B\_s*�[\_s*��\)\|�}\_s*�C\_s*�N\_s*��\|�~\_s*\%(��\|�N\_s*��\)\|�Z\_s*\%(��\_s*��\_s*�e\_s*�B\_s*�[\_s*��\|�u\_s*��\_s*�e\_s*�B\_s*�[\_s*��\|��\_s*�`\)\|��\_s*\%(�^\|�N\_s*�g\)\|�[\_s*\%(�^\|�v\_s*�g\)\|�f\_s*[�J�V]\|�A\_s*�g\|�s\_s*�R\|�t\_s*\%(�B\_s*�t\_s*�e\_s*�B\_s*�[\_s*��\|�H\_s*�[\_s*�e\_s*�B\_s*�[\_s*��\|�F\_s*��\_s*�g\|�@\_s*�[\_s*�X\_s*�g\)\|��\_s*��\|o\_s*n\_s*e\)',
+      \ '2' : '\%([���Q��2]\|�g\_s*�E\_s*�F\_s*��\_s*�e\_s*�B\|�Z\_s*�J\_s*��\_s*�h\|t\_s*w\_s*\%(o\|e\_s*n\_s*t\_s*y\)\|�c\_s*�[\)',
+      \ '3' : '\%([�O�R3]\|�E\_s*�E\_s*�E\|��\_s* \_s*��\_s* \_s*��\|�T\_s*�[\_s*\%(�h\|�e\_s*�B\)\|�X\_s*��\_s*�[\|t\_s*h\_s*\%(i\_s*r\_s*t\_s*y\|r\_s*e\_s*e\)\)',
+      \ '4' : '\%([�l�S4]\|f\_s*o\_s*u\_s*r\|�t\_s*�H\_s*�[\)',
+      \ '5' : '\%([�T��5]\|f\_s*i\_s*\%(f\_s*t\_s*y\|v\_s*e\)\|�t\_s*\%(�B\_s*�t\_s*\%(�X\|�e\_s*�B\)\|�@\_s*�C\_s*�u\)\)',
+      \ '6' : '\%([�Z�U6]\|s\_s*i\_s*x\|�V\_s*�b\_s*�N\_s*�X\)',
+      \ '7' : '\%([�V��7]\|�Z\_s*�u\_s*��\|s\_s*e\_s*v\_s*e\_s*n\)',
+      \ '8' : '\%([�W��8]\|�G\_s*�C\_s*\%([�X�g]\|�e\_s*�B\)\|e\_s*i\_s*g\_s*h\_s*t\)',
+      \ '9' : '\%([��X9]\|�i\_s*�C\_s*��\|n\_s*i\_s*n\_s*e\)',
+      \ ':' : '[�����c�F:]',
+      \ ';' : '[�G;]',
+      \ '<' : '[��<]',
+      \ '=' : '[���������߁�=]',
+      \ '>' : '[��>]',
+      \ '?' : '[�H?]',
+      \ '@' : '[��@]',
+      \ 'A' : '\%([��ݕ��N��Ҋ{�b���]毛^�������w�܏����o�@�C�����糕ӓ����J�l���V�Ȍl�ˆ��^���؜��{�����Q����z鸈��W�E�B���{���M榏Q�k�w�{ꁋ\�����N�}�H���o���{���t����V�p�������A�֔\���H�Փ��a�S�N���[��ړ��a�W���o㻓֏��~�ĔM���ؒg��禈������Ŋ��������N�[���Ύ��ѕ��Қ��a�e��}�R�y�������v�X���I���\����॑��Ő��V�a�z���\�e���X�E�V�~�d�����Y�эʊ늿�ߎӕT��瑀������剎��Օ��P����]��J�ÓV���������쉐�˖ԋY�͈����b�������������般�HꙌ�卋������ǖ����s�����N�𗺌��摏�����L���[�j��P�N�������z���ӟ�E�D���ɏ͏����W���쏺�H�V������q��������襞B���\���͈��ԑ�����~㪌Z����Q�ōs���}�ĈLj���ƈ�����풩�����@��r�b�����~�`���q���g���ݝю鈩�[���ޝ�脋ōC����K���\�ؐԐ���z�Đ��•Ɉ����Œ��������}�����ራ�S�ݑ��Y�K�򗁍r�g�Ҙa�𞓍��G�������c���L�J�}���숢�j���������ޜ����O�[�㝧���������ȁ����_&�ڋ��͈�󁨁����ˁ��́܌�W���āN�L�M�O�f���`�`���p���@�A��A]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*�q\|��\_s*��\|�E\_s*�n\|��\_s*��\|�f\_s*��\|�M\_s*�V\_s*��\|��\_s*�T\|��\_s*��\|�Z\_s*�q\|��\_s*��\|�l\_s*��\|��\_s*��\|�^\_s*��\|��\_s*��\|��\_s*��\|��\_s*�w\|��\_s*[����]\|��\_s*�p\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*�{\|��\_s*\%(��\|��\_s*�q\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\|�H\_s*�a\_s*�b\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*�F\|��\_s*��\|��\_s*�`\|�^\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�D\_s*�`\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|��\_s*[�������K]\|��\_s*�G\|��\_s*[�m�F]\|�\_s*�x\|��\_s*��\|��\_s*��\|��\_s*��\|�p\_s*\%([�ۓc]\|��\_s*�p\|��\_s*��\)\|��\_s*[�ɁX]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|�h\_s*\%(�o\_s*�d\_s*�b\|�b\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(�d\_s*�b\|�A\_s*�h\_s*��\_s*�X\)\|D\_s*�J\_s*�[\_s*�h\|C\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|��\_s*�~\|��\_s*��\|�c\_s*��\|�n\_s*��\_s*��\|�C\_s*[�^���m�l���]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*�a\_s*��\|��\_s*��\|��\_s*�n\|��\_s*[�nꆖ�]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|�g\_s*��\_s*�v\_s*��\_s*A\| \_s*�A\_s*�N\_s*�V\_s*�A\_s*��\|��\_s*��\|��\_s*�f\|�q\_s*�f\|��\_s*�s\_s*��\_s*�x\_s*�Z\_s*�p\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�Y\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�@\|�a\_s*��\_s*��\_s*�@\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�Z\_s*��\_s*�g\_s*�L\_s*�b\_s*�c\_s*�l\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�p\_s*��\_s*�\\|�g\_s*�p\_s*��\_s*�\\|�Z\_s*�@\|��\_s*��\_s*��\_s*��\|�I\_s*\%(��\|�M\_s*��\_s*�X\_s*�^\_s*��\|�h\_s*��\_s*�C\|��\_s*�O\_s*�X\_s*�g\_s*��\_s*�[\_s*��\|��\_s*\%(�g\_s*�L\_s*�[\|�^\_s*\%([�[�i]\|�l\_s*\%(�[\_s*�g\|�C\_s*�g\)\)\)\|�[\_s*\%([�N�K�T�g����]\|�j\_s*��\_s*�O\|�L\_s*�V\_s*��\|�u\_s*��\_s*�[\|�o\_s*�[\_s*�h\|�x\_s*��\_s*�W\_s*��\|�M\_s*��\_s*�X\_s*\%(�g\|�^\_s*��\)\|�]\_s*��\_s*�k\|�X\_s*\%(�`\_s*��\|�e\_s*�B\_s*��\|�^\_s*�[\|�g\_s*\%(��\_s*�A\|��\_s*��\_s*�A\)\)\|�h\_s*��\_s*�[\|�W\_s*\%([�F�[]\|�I\_s*��\_s*�W\)\|�f\_s*�B\_s*\%(�I\|�G\_s*��\_s*�X\|�V\_s*��\_s*��\|�g\_s*��\_s*�A\_s*��\)\|�^\_s*��\|�\\_s*\%(��\_s*�e\_s*�B\|��\_s*�C\_s*�Y\)\|�Z\_s*��\_s*�e\_s*�B\_s*�b\_s*�N\|��\_s*��\)\)\|�z\_s*��\|�o\_s*�C\_s*�g\|�n\_s*��\_s*�}\_s*�Q\_s*�h\_s*��\|��\_s*��\|�l\_s*�H\_s*\%(��\_s*��\_s*��\|�m\_s*�\\)\|�C\_s*\%(�[\_s*�W\_s*�X\|�I\_s*��\|�\\_s*�b\_s*�v\)\|�}\_s*��\_s*�h\_s*�D\_s*�[\_s*�N\|��\_s*\%(�z\_s*��\|��\_s*��\|��\_s*�p\)\|�t\_s*�^\|��\_s*�p\|�G\_s*\%([�j���A�[�C]\|�b\_s*�`\|��\_s*\%(�h\_s*��\_s*��\|�W\_s*�F\_s*\%(��\|��\_s*�b\_s*�N\)\|�[\_s*��\)\|��\_s*�A\|�I\_s*��\_s*�A\|�X\_s*�e\|�v\_s*��\_s*��\)\)',
+      \ 'B' : '\%([���ݍ����x�f��t���ݖv�{�}�~�Ϟ��r�s�����`�����p�ؖn�l�m�q��������������K䛖e�㤝ԕ��O�R�E廖b�ӖQ������g��Ԝ�R���W�a�X��Z�U�`���Y��N��ϙ˛��S�c�]�f�h�T�^�d�����@�G�ە�덛�͕��d��敕������W�J���V��_����K�럑�k㰋Йp�g���ꈕ̕����ѝV燙��ę��ܛ~���A�ᾙj�וؕى•��粂בD�[�k�u�q�J�ڟ����������������ܐ[�W��᳓ؐߕ��ܖܘŕ��h�ᕷ���F���������ᕑ�o���F�x���~�w���򐁕��������ŐU�����@���s�ԕ�捐l�L�J�x�ʕT�C�Z�z�[�m��㢛����ߕp�C�ޜ��r�F��{���q�n��蓕S焛唒��I�a�l�L�[�߁��e��Ὗە��d�c�b�`�_�a���e����������r�o�������Z�����g���]�X�Δ��z���ۓ���є��䊑����ы������s�I�������������[�@���bV�������U�㭔����j�A�c���U���P�����������W�����є��m���\�����e���}���t�S���̔��i��䕜ޔ|��ꀊL�����������{�~�}�����Ŕ����f���\�Ҕ��Ԗ_�J���m�ה”d���H����ݔ֔ӔՔԔؖ��따������������\�n���m���t��H�����Ŕl�n�����y�k�΁g�������ےꉺ�~�|�a�b�_�攞�{�o�n�m�p�o�a�u�r���A�q���xB]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�{�x�u�r�o]\|��\_s*[�ڂׂԂт�]\|�\_s*�\|��\_s*��\|�A\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*�Z\|��\_s*��\|�r\_s*�r\|��\_s*��\|�\_s*�\|��\_s*�_\|��\_s*�_\|��\_s*��\|�E\_s*��\|�\_s*�\|��\_s*�C\|��\_s*��\|�X\_s*[���j]\|�R\_s*��\_s*�O\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|�z\_s*�c\|�\_s*��\|�u\_s*\%(��\|�l\_s*�b\_s*�N\|�V\_s*�l\_s*�}\)\|��\_s*�q\|�t\_s*�q\|��\_s*��\|�L\_s*[�O��]\|�\_s*�\|�V\_s*�A\_s*�O\|��\_s*[�ĘU]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|�\\_s*�D\|��\_s*[���D]\|��\_s*��\|�o\_s*��\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|�h\_s*��\|��\_s*[�q�@]\|��\_s*[�Žq]\|�\\_s*��\|�\_s*�\|��\_s*��\|��\_s*�q\|�c\_s*��\_s*��\_s*��\|�b\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�K\_s*�N\|��\_s*�q\|��\_s*\%([�јJ�y]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[���]\|�\_s*��\|�f\_s*��\_s*��\|�v\_s*��\_s*�R\_s*�M\|��\_s*��\_s*��\|�I\_s*�[\_s*�g\_s*�o\_s*�C\|��\_s*[�b��]\|�t\_s*�@\_s*�S\_s*�b\_s*�g\|�w\_s*�i\|�k\_s*��\|�y\_s*\%(�L\_s*��\|�e\_s*��\_s*�M\_s*�E\_s*�X\)\|�L\_s*�f\|�C\_s*�M\_s*��\_s*�X\|��\_s*�f\|�z\_s*�E\_s*�f\)',
+      \ 'C' : '\%([��a�������|�Ҝ��D����ޏn�s���}���Ĝl���a��ʗ���ۗ���ᶐs�Д������f�����َ�����řb���I���z���iꑍ����C���麌Z欉��䓚৐��}���əY���`�n�����X�����M�ٍ��Ȝk�ύ������������ߌ������������匣���Ӎ����������e�W�����B�L�ݖ����ϙi���Ҕ��Q�b������m��秋��t����R���K�{���}�����`肍��L琍f�ݚJ��k�i���Q�硟��L��������s���J�������𔸙��l���E�H���n�r������੘m��t����൙��{�X�������E���R�n㝍h�����}����H�y�ߝK�朑�����n�K�}��֞��\��@囍y��ෙ��΍[��⠍x����u�X�S�e倘������J�i�^���’@�V���A�W����썄�G�D�T����ᩍ`�p��᧍B�����]�P���I���z���t�_���k�O�j�R�w�u�P�I�a�|�q�F�X�Z�s�m���c�D�r�����J�L�ޛ��ܝ��w�l�������������������W�g������V�����ڞ����������ׁ܋��Z�X�čᑆ���ՙs�|�˙�Z�����e�،؝s�Z���hⰍ��������ٕ֒��]�ی�㨏����h��ן�z�Ë��П�绌�ꉍ�����烜��������ٌnj��@�u�x�삱����N�Ë��Z��驉k�����ş��Q�L�����T�G�i�L������↝B�ގE���ِېߐ��C���G��А��������ዙ����[�T�����אɐ͐ȐǞ���N����������d�Ϟ��囡�p�ә�㙟�㚘j���A䦈��a�_���t�b�A���A���b�����x�����a�H�柞�����E�C���J�⤑G�S���L⒑W�s�r���������D�J�A�L��񙒐�枙@�ۑM���H�����l�F�K�����D�B�@�G��h�ǐ坡�N�������d�D�������I�����R��Ŗ��|���˝��������ō�����v��⫝�ꎍΐ����y���H�����������`�Ր������}�����U�ҙ������[���ǐ�������z���z�M�K����ⱟJ��㖍������I�����H���E���b�z�o�����x�A�ܗ��ϕ��D�B��ӏ��~���������B䱌s���Z�Yᯙ������Ӟ�ᮛ��M�֌N���v������K�@����{���^���Z��퐾�^�����č���鶔�ňʈ��U�Ñq�������C�~���V�W�R�U�S�X�T�܉_�w�o�^�������鿌~���G�F䇚��`�p�̃��Y�������۞����ƌI����Әޚ��P�M�����u���������o�Ӟ������c�������苟���m�����痈�q��H�M�῍C��​晠�J���{��v�v�͘Ҋ�X�ɜ��g�ˍg��ܜ����|�E���؋������捃����B�A������P������D���Y���`�������L���Z������连x���Z������l���W�������ȓ��������G�F�a�Ǝb����乗��M�E�����s�C�F���n���D�㈵㦃Ƌs�����]�Ŗl⚑^����潔A���g���ߞΖ�儞����b���ɖΕݜ�臐w�p��玬�d����쎹���g��[��諎����^���G�������N���H���˒��ΐÎ������ᕹ���R����������K�\�ސˌ�K�Ž��������K���򛍉����t�o���q������������ϔ����O���ӎ��͚��͟��̍��b�y�P��᪎������j�A�ϐ֙��̎ݐ���┐��^�܎ېΎގڎ����Y�ώՎˎΎɎԎߎЈޝ��i�S�C�G����ဎ���f�z���t�W�V������题�������f��������E��i�g�l�h�k�{��������蜕婙��o�J�蕘�Ꟛ�V���h��娔��h�K�q�����F榚S�Q�F�T��酝����n������������S�X�K�U��ڏM�G�j���E�a�N�����O�D�C�A�L�R�T�W�I���B�H�@���M᭜��\����貚я�忏w�{���v�x�s�⡏u�r�f�ݐ��p���u���V�y�J�U�����Z���]����j�P�曚A���՜�����f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�N�f�d��C�k���X�L�������T�Q�W�i�R�[�M�e�b�I�\�S�^�V���Ώ��n�Z��勋o����|�ב_�䓏��w����򏎏��������v���ߓɚ��[�m�������יЎK�О_�c�R���u����B���䐠�Ϟ�Ɛ����L���Ҝћ�辛����頔��I���׏����[縜��B����䀙����n������␏���K♏����яҁ������u���i�œϏ]疏֏Ӑ��Ԛ��А�躐���Ϗ����U���J���n�ސ��Ŝ܏��ߏ���������ُ����G�����Ꮷ��ଏ����������������������������͏Ǐ����ɏ������Џ��ˏ���暏��ďΏƏ����͏ڏ؏ɏ��������\�p���l���T���e����g�ߐ@�C�ܑ������D�I����冐B�����G���A�H�E�u�o���w�ʕE��e�y�򚬞��@�h�џ��|������X������ꏎ��ю}�ؗ�⿎l�o�Ŏ����~�����d���s�t�w�ћ���L�y�p�i�n���Îk�䍟��������߁Y�`�o�m�o���{�j����`�V���@�m�@���i�y�����I�ِy�n�����X�����n�B�g�~���v�s�Ў����o���������N������᎒���Z���u���i�U���抎����f���]���K�j�����{��������J�{��r���˙��藂������y���NJ��r���݊��j���ƌy�����Ĉ�呁��e�A���i������������M��ꝕr�P�T�M�v�����ᚃ��ȍ��f�j�s�e�h�o�q�g�p�t�r����鹜��NJ����D�R���U�ğd�z��ᥕ���p�ȌڋA���Ԏ��‹_雔B�ߗ��ދȋ�\�����Ί����ۖ͋w�d�T��e�z�J�x���Ō`�ӕ��^�������Ȕ��H�����X�R�C���P���t������qK�Š�������閔������@�ϞJ���{���������嶔��㹊������|�ؙ��^������歒S�������e顊��j舊��������s���Fጐ��d�P�}���g�����y�a�`�f����S�W���m�����e��O��ݑ��]�ڛ��̊��ňה����@���쁨�F�`�����O���P���[�\铐g����ಉG�h���󓂞Њ����~�y�ۉ������}�q�����ɐ��͘����V�،����~ऐ����c���͌��b���u�w��v�x�X�i�Õ��L����ꖊ��ƓK�G�̜S�R魓C���Ј����ߕK�v���֓S哑t�������ݓk�����䡞��S���湝���誜����vᙊd�n�]�Q��L�ڒ�������I跏ʜ������h���\�f�r�l�y�m�z�n�k�k�g�c�s�t�i�o�݉B�v�d�ߝ��j�l�g�q�u�p�m�G�d觛��Z��嵙��j珚����Ԙ��B�i�W�q�����r���[���~�����D䠊^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�F���׊@��E�m�����L�G���D�ŊA���������K���J����C���`���՚Q�ɟ��I�W錟a��檚��A洚��j��b�a�Y���ホe�⻞�䯙��q���T�㻛f�p�����N��㼝��c���㣎���V�늬���M������ϊ�䅟��j���F�r�����������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�g������|���}�����ۊ��@�يΞ��؊��󊩐��Ҋ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������š^�׊Ċ��ÊԊ��Պ��NJ����֊��͊������ϊ��w����x�s�q�P�g�ӊe�����h���ӏ�Չɉ���Չ܃��`���͉��ތ��F㞉��S�˚Z���Q����草ؚm�׊]�����͉Ȍ�嗉��e�D��v�q������Ҏx�T�|�~���o戟ω̉ߍ��ю딃�̉ƞg��������`�ϙ�֑��d�U�������ݙJ�Ǝ��a������͉ۉ��я������ÚКk旓��z�Њ��|䑉�嘉�������㟉��q�ČC�����a�����{����斎�����҉ǟ��뛺��◉Ή։���l���E�c���‹���ā����ى����U�C�D�@�w�A���z�t�x���G�N�{�v�H���^���T�S�r�R�_���[�`�F�L�I�~�����q�B�}�M�V�]�E���p�u���P�K�Z���Y�������\�����O�Q�y�|�s���J���􄾄��~���������������ԃ��q�X�����W�ہA�C�F�N�Ջ��\�Ȑ��ߕϐڃJ�������������������R�V�Z�b����C]\|�\_s*[�����]\|�b\_s*[�R�Z�N�V�J]\|��\_s*[�q����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�m\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*�C\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|��\_s*�@\|�O\_s*[�ȍ�]\|��\_s*[�U��]\|�P\_s*�y\|��\_s*��\|��\_s*[���ρX]\|�~\_s*��\|�\_s*��\|�S\_s*[�Z��]\|��\_s*�h\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�V\_s*��\|�]\_s*��\|�f\_s*[���l��]\|��\_s*�A\|�s\_s*[�m�E]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*�_\|��\_s*��\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|�]\_s*[�]�X]\|�\_s*\%([�Ɨ���u�ʑ��Ɏ茓��]\|��\_s*��\|�[\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|�V\_s*��\|7\_s*��\|��\_s*��\|�S\_s*[����]\|4\_s*��\|�R\_s*�{\|�\_s*�\|�h\_s*�t\|��\_s*[�ʈ�]\|��\_s*��\|�O\_s*\%(��\|��\_s*��\)\|�|\_s*[�“�]\|�A\_s*[�o��]\|��\_s*��\|B\_s*r\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|�Q\_s*��\|��\_s*�Y\|�b\_s*��\|�c\_s*�e\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*�Z\|��\_s*�q\|�\_s*�\|�z\_s*��\|�R\_s*\%(�C\_s*�o\|��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�r\_s*�C\|�b\_s*[����]\|��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*�r\|�|\_s*��\|�]\_s*��\|�\\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|�y\_s*��\|�A\_s*�g\|�k\_s*�k\|�@\_s*��\|��\_s*�t\_s*��\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[���r]\|��\_s*\%([���_]\|�C\_s*��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|�C\_s*[���G]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|�_\_s*�o\|��\_s*�\|�B\_s*��\|�A\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*�u\|��\_s*��\_s*��\_s*�e\_s*�N\_s*�m\_s*�T\_s*�C\_s*�G\_s*��\_s*�X\|��\_s*��\|�X\_s*��\_s*�[\_s*�Y\|��\_s*�e\|�g\_s*��\_s*��\_s*�v\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|��\_s*[�{���v��]\|��\_s*�G\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|�T\_s*\%(��\_s*�`\_s*�[\_s*��\|�G\_s*��\|�C\_s*\%(�g\_s*�J\_s*�C\_s*��\|��\_s*�X\|�N\_s*\%([����]\|��\_s*\%(��\|�b\_s*�N\)\)\|�{\_s*\%(�E\_s*�Y\|�[\_s*�O\)\|�o\_s*\%(�[\|�l\_s*�e\_s*�B\_s*\%(�b\_s*�N\|�N\_s*�X\)\)\|��\_s*��\_s*�[\_s*��\|�_\_s*�[\|�t\_s*�@\_s*�[\|�l\_s*��\_s*�A\)\|�[\_s*\%(�e\_s*�B\_s*�t\_s*�B\_s*�P\_s*�[\_s*�V\_s*��\_s*��\|�N\_s*��\|�J\_s*\%(�X\|��\_s*�X\_s*�N\_s*\%(��\_s*�C\_s*�u\|��\_s*�v\_s*�V\_s*��\_s*��\)\)\|�L\_s*\%(��\_s*\%(��\_s*�[\|��\_s*�[\_s*\%(�^\_s*�[\|�V\_s*��\_s*��\)\)\|�b\_s*�g\)\)\)\|�}\_s*�h\_s*��\_s*�X\|��\_s*�\|�P\_s*\%([���A�C]\|�t\_s*�F\_s*�E\_s*�X\|�v\_s*�X\_s*�g\_s*��\_s*[����]\|�`\_s*��\_s*�b\_s*�v\|��\_s*\%(�^\_s*�E\_s*\%(��\|��\_s*�X\)\|�u\_s*��\_s*�b\_s*�W\)\|�[\_s*\%([�L�W�u�v�X��]\|�N\_s*�E\_s*�H\_s*�[\_s*�N\|�\\_s*��\|�^\_s*��\_s*��\_s*�O\|�p\_s*\%(�[\|�r\_s*��\_s*�e\_s*�B\)\|�V\_s*��\_s*�O\|��\_s*�[\)\|��\_s*\%(�g\|�x\_s*��\_s*�X\|�e\_s*�B\_s*�b\_s*�N\|�r\_s*\%(��\|�[\_s*�j\)\)\|�~\_s*\%(�J\_s*��\|�X\_s*�g\)\)\|�L\_s*\%(��\_s*�m\_s*��\|�v\_s*��\_s*�X\|�P\_s*��\|��\_s*\%([�C�[�A]\|��\_s*�F\|�r\_s*\%(�Y\_s*��\|�X\_s*��\)\|��\_s*\%(�X\|�b\_s*�g\)\|��\_s*�[\_s*�^\_s*�[\|��\_s*�\\_s*�[\|��\_s*\%(�[\|�E\_s*��\|�A\_s*�X\|�I\_s*�V\_s*�e\_s*�B\)\)\|�A\_s*\%(��\|�[\_s*��\|��\_s*�e\_s*�B\)\|�`\_s*��\|�g\_s*�T\_s*��\|��\_s*��\|�}\_s*�C\_s*��\|�b\_s*�J\|��\_s*�[\_s*�g\|��\_s*\%([�h�p�X�u����]\|�f\_s*\%(�B\|��\_s*�b\_s*�N\)\|�r\_s*\%([�A���l]\|�e\_s*\%(�B\|�[\_s*�V\_s*��\_s*��\)\)\|�x\_s*�c\|�o\_s*\%(��\_s*[�G�A]\|��\_s*�[\)\|�g\_s*��\|�V\_s*�[\|�T\_s*��\_s*��\|�^\_s*�s\_s*��\|�s\_s*\%(�g\_s*��\|�^\_s*\%(��\|��\_s*�Y\_s*��\)\)\|�v\_s*\%(��\|�V\_s*��\_s*��\|�e\_s*��\|�`\_s*��\)\|�Z\_s*\%(�C\|��\_s*�[\_s*��\)\|�b\_s*\%([�c�g�`�v]\|�T\_s*�o\|�X\_s*��\|�V\_s*\%(��\|��\_s*�O\|��\_s*\%(�[\|�u\_s*��\)\)\)\|�j\_s*\%(�I\_s*��\|�X\_s*�^\_s*�[\)\|�i\_s*��\|�m\_s*\%(��\|�[\_s*��\|�s\_s*�[\)\|�~\_s*�\\_s*�[\_s*��\|��\_s*\%(��\|��\_s*\%(��\|�b\_s*�g\)\)\|��\_s*\%(��\|�E\_s*�F\_s*�C\|��\_s*��\|��\_s*�C\_s*[���i]\|�b\_s*�g\)\|��\_s*�b\_s*�g\|��\_s*\%([�R�[�A]\|�o\_s*�[\|�u\_s*��\_s*�[\_s*�V\_s*��\_s*��\|�b\_s*�W\|��\_s*�O\)\|�Y\_s*��\)\|��\_s*\%(�R\|�X\_s*�g\|�V\_s*�^\_s*��\)\)\|��\_s*�p\|�`\_s*\%([�^�����}�A]\|��\_s*��\|��\_s*�[\|��\_s*�h\|��\_s*�j\_s*�[\|�R\_s*��\|�b\_s*\%([�v�N]\|�e\_s*��\_s*�I\|�^\_s*�S\_s*��\)\|�L\_s*\%(��\|�[\_s*�^\)\|��\_s*\%(�A\_s*�u\_s*��\|�[\_s*�C\_s*��\_s*�K\_s*��\)\|�[\_s*\%([�t�g�v�N�Y]\|�p\_s*�[\|�^\_s*�[\)\|�F\_s*\%([���X�J�R�A��]\|�U\_s*\%(��\|�[\_s*��\)\|��\_s*\%(�j\_s*�[\|�V\_s*�[\|�m\_s*�u\_s*�C\_s*��\)\|��\_s*\%(�[\|�X\_s*�g\|�b\_s*�V\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*�^\|��\_s*�R\_s*�t\)\|�r\_s*�`\_s*�F\_s*�t\|�_\_s*�[\|�`\_s*�F\_s*��\|�b\_s*\%([�g�N�J]\|�L\_s*��\_s*�O\)\|�C\_s*\%([�X��]\|�j\_s*�[\|�T\_s*�[\|�V\_s*��\_s*�O\)\|�[\_s*\%(��\|�U\_s*��\|�z\_s*�t\)\)\|��\_s*\%([�I�t�h�C���R���E]\|�c\_s*�l\|�N\_s*��\|�v\_s*�^\_s*�[\|�p\_s*�e\_s*�B\|�y\_s*\%(��\|�b\_s*�N\)\|�`\_s*��\|�l\_s*\%(��\|��\_s*�[\|��\_s*��\_s*�O\)\|�b\_s*\%([�N�g]\|�s\_s*�[\|�v\_s*\%(�}\_s*��\|��\_s*��\)\)\|�^\_s*\%(��\_s*[�C�[]\|��\_s*��\_s*�O\)\|��\_s*�}\_s*�[\_s*�X\|��\_s*��\_s*�W\|��\_s*��\|�[\_s*\%([�`�^�g���W]\|�r\_s*��\|�~\_s*\%(�[\|��\_s*�O\)\|��\_s*�[\|��\_s*\%([�Y�X]\|�g\_s*��\)\)\|��\_s*��\_s*�S\)\|��\_s*\%([���R]\|�C\_s*�X\|��\_s*�X\_s*�L\_s*�[\|�[\_s*\%(�N\|�T\_s*�[\|�J\_s*�[\|�L\_s*��\_s*�O\)\|�S\_s*��\|�b\_s*\%(�v\|�s\_s*�[\|�p\_s*�[\)\|��\_s*�\\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\|��\_s*\%(��\|�Y\_s*��\_s*�`\_s*��\)\|�p\_s*��\|�c\_s*\%(�@\_s*�[\|�B\_s*��\_s*��\|�F\_s*\%(�[\|��\_s*�j\_s*�[\|��\_s*��\)\)\|�Y\_s*�f\)',
+      \ 'D' : '\%([�다�h�b���r�a�����Ǐ������B�t�N���{�����c�j���ۓ��Ó��̊���椓�����ՓœǙI���^�ӛk���N�������U�˒��~���}�X������駁߁̓��ԓ����ӓ��W�V���������֓����g�˓z�ގ���{�y�m���w�^���~�x�W�Z�v�ǎ��F≓��B����H�D�s�M�����u����������b�\�B�a�d�ƂŃd�ߐh���ȍj�Γ`���������s�����ˌ��n��g�A�t�ːϒ݋l�ВÐ}�ނÃa���ߗ͎����n����I�L���֓|�ʔZ睏����J���N��M���ҋ��ʍ��x�J�_�يڒ|�Ԋx���������F�ڒD�E���N璑ДU�Ւ��i�����n�m���聄�������Г̓�ْU���[�g�h�k�i�f�c���d�e�j�ƑǑʎ��P��[�S�֚֝\�ǐ�������Ȑ����əT�����P��䶗��c�ĕ���k�ř[�яo�������C���A�D\.�d�E�c���h�g�������\���B�����Ƃc�h�������_�W�D�t���ƒf��D]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�h�f�d�a�_]\|��\_s*[�ǂłÂ���]\|�\_s*�\|�s\_s*�X\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*�V\_s*��\|��\_s*��\|�@\_s*��\|�\_s*�\|�Y\_s*��\|�S\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�t��]\|�\_s*��\|�\_s*�\|��\_s*[�I��]\|�\_s*�\|�m\_s*�b\|�x\_s*��\|��\_s*�q\|��\_s*�q\|�\_s*�\|��\_s*�K\|��\_s*�\|��\_s*�B\|�R\_s*��\|��\_s*��\|��\_s*�k\_s*�B\_s*��\|��\_s*\%([���Ɍ�]\|��\_s*�L\|��\_s*�V\_s*�c\|��\_s*\%(��\|��\_s*�b\)\)\|�T\_s*[���B]\|��\_s*��\|��\_s*�|\|��\_s*\%(��\_s*��\|�\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\)\|�R\_s*��\_s*��\_s*�r\_s*�A\|�Y\_s*\%(��\_s*�[\_s*�X\|�b\_s*�N\)\|�C\_s*��\_s*�J\|��\_s*��\|��\_s*�m\|��\_s*��\|�s\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|�n\_s*�[\_s*�O\|��\_s*��\_s*��\_s*��\_s*��\|�j\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*�q\|�L\_s*�q\_s*�q\|�\\_s*�i\_s*��\|�[\_s*�b\_s*�P\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|��\_s*��\)',
+      \ 'E' : '\%([�ኙ����P�G���ҋ�`�ܐ�ݑ����傉��滌ӏ^�Λ����������x�V�x�{�y��㈔���t厚�z郉u�Չv���w�t鴝o�H�H�ў����́����d���v������ꁊ_脚��ঢ়��Q���������`腖��b膞Ł܉���⥟��}�������|��������叉��͉�����������������l�����U�������~�����������I�t�o����k�����������㗚Țz�o�i�͉j�o�ĉb�l��g�s�d�m繉e�r�f�h�n�c�i�}��I�߈ˉ|㉙d���G�q���`�Ή�b�l���d�ʉ`�d���a�]��Ε��������������������������U���߁́����Q���}�M�N���p�Ύ��I�Ń��d���R�L�|�Ä^���G��E]\|A\_s*\%([�ʔ��^��]\|V\_s*\%(�@\_s*��\|��\_s*�D\)\|B\_s*\%(�^\|C\_s*��\)\)\|�`\_s*\%([�ʔ��^��]\|�u\_s*\%(�@\_s*��\|��\_s*�D\)\|�a\_s*�^\)\|��\_s*\%(��\|��\_s*��\)\|�O\_s*��\_s*��\|M\_s*�T\_s*�C\_s*�Y\|�l\_s*�T\_s*�C\_s*�Y\|�G\_s*�X\_s*�q\|��\_s*��\|�g\_s*��\|�E\_s*��\|��\_s*��\_s*�q\|��\_s*�y\|��\_s*�x\|��\_s*�H\|�x\_s*�\|��\_s*[�s��]\|��\_s*��\|�g\_s*�q\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\)\|L\_s*\%(�T\_s*�C\_s*�Y\|L\_s*\%(�T\_s*�C\_s*�Y\|��\_s*��\)\)\|��\_s*\%([仗��Q]\|�m\_s*��\)\|N\_s*��\|�m\_s*\%([�‹ɋ�]\|��\_s*��\|�p\_s*�`\|�g\_s*�j\_s*�z\_s*�[\_s*��\)\|��\_s*��\|�Z\_s*��\|��\_s*�X\_s*�r\_s*�[\_s*�H\_s*�i\|S\_s*\%([����]\|�T\_s*�C\_s*�Y\|N\_s*��\|F\_s*��\_s*��\)\|�r\_s*\%([�g���ȋ�]\|�T\_s*�C\_s*�Y\|�m\_s*��\|�e\_s*��\_s*��\)\|�q\_s*[���y]\|�w\_s*\%([���r��]\|��\_s*�F\_s*��\)\|X\_s*\%([���r]\|O\_s*��\|��\_s*�F\_s*��\)\|�A\_s*��\|�\_s*��\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|�C\_s*\%(�V\|�W\_s*��\)\|��\_s*�s\_s*��\_s*��\_s*�x\_s*��\_s*��\_s*�c\_s*�c\|��\_s*�[\_s*�N\_s*�X\_s*�e\_s*�[\_s*�V\_s*��\_s*��\|��\_s*\%(�B\|��\_s*�b\)\|�^\_s*\%(�B\|��\_s*�b\)\|��\_s*�[\_s*��\_s*\%(�s\_s*�A\_s*��\|�b\_s*�p\)\|��\_s*\%(�A\_s*��\|�E\_s*��\_s*�s\_s*�E\_s*��\|��\_s*�C\_s*�J\|�[\_s*\%(��\|�m\_s*�X\|�j\_s*�X\|�W\_s*\%(��\|�[\_s*��\)\|�h\_s*��\|��\_s*�J\|��\_s*\%(�X\|�V\_s*�A\)\|�t\_s*\%(��\_s*�e\_s*�X\|�H\_s*\%(��\_s*�A\|�j\_s*�A\_s*��\)\)\|�N\_s*��\_s*�b\_s*�h\|�J\_s*��\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|�d\_s*�q\_s*��\_s*\%(�[\_s*��\|�C\_s*��\)\|��\_s*�W\|�]\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|�S\_s*��\_s*��\_s*�T\|�J\_s*�v\_s*�Z\_s*��\_s*��\|�I\_s*\%(�[\|�C\_s*\%(��\_s*�[\|�Q\_s*��\)\)\|��\_s*�s\|�g\_s*��\|��\_s*�O\|��\_s*�Q\_s*��\|�A\_s*\%([���C]\|�j\_s*�h\|�[\_s*\%([�}�X��]\|�E\_s*�B\_s*��\|��\_s*��\|�j\_s*�[\|�l\_s*�X\_s*�g\|�~\_s*��\|�V\_s*�[\|��\_s*�[\)\)\|��\_s*��\|e\_s*\%(x\_s*a\|�R\_s*�}\_s*�[\_s*�X\|��\_s*�[\_s*�j\_s*��\_s*�O\)\|�C\_s*\%([�u���A���[]\|�W\_s*�F\_s*�N\_s*�g\|�t\_s*�F\_s*�N\_s*[�g�^]\|�R\_s*\%(�[\_s*��\|��\_s*�C\_s*[�Y�U]\)\|�v\_s*�V\_s*��\_s*��\|�~\_s*��\_s*��\_s*\%(�[\_s*[�g�^]\|�C\_s*�^\)\|�x\_s*��\_s*\%(�g\|�^\_s*�[\)\|�m\_s*�b\_s*�N\|�l\_s*�[\_s*�u\_s*��\|�M\_s*��\_s*�X\|��\_s*�O\_s*\%(��\_s*��\_s*�h\|��\_s*�b\_s*�V\_s*��\)\|�b\_s*�`\|��\_s*\%(�[\|��\_s*��\_s*�O\|�t\_s*�H\_s*��\|�z\_s*��\)\|�O\_s*�W\_s*\%(�b\_s*�g\|�X\_s*�g\)\|�N\_s*\%(�X\|�A\_s*��\_s*�e\_s*�B\)\|�X\_s*�t\_s*�@\_s*�n\_s*��\|��\_s*[�A��]\|��\_s*\%(�[\_s*\%(�X\|�U\_s*�[\|�T\_s*�[\)\|�C\_s*\%(��\|�U\_s*�[\|�T\_s*�[\)\|�u\_s*��\)\)\|�E\_s*\%(�[\|�W\_s*�F\_s*�[\_s*�k\)\)',
+      \ 'F' : '\%([�[���Ή������M�֓~�����y�`�[脟T����͈�j�͊ȎD�^����J㬐�䔕����b�ʟ��X�䙆�������앶�|�����������������t�y���M�D���������၂�⁃��������������᳍Ę��W�o�����K���敖�lᆕ�慊����p���̐k⿕�谌���P�c��霜i�������񕥕����h������u���C�����c�������ޔX���܊ܕ����t�e�������������o���o���n劚������]�w�w���S�ܙ󕄉畆���y�D�X���Y�|�������[��~�Y�������\�V�~���z�����B�U�v䘕�㧕����Е��t�s���D�z�@����缕u���•t�����b������ҕ}��G�H���������t�{䎙���ʖ|�ӓS���́��x�܋����ŋU��e�󕤕��t�����U��F]\|�\_s*�\|�b\_s*�t\|��\_s*��\|��\_s*��\|�A\_s*�X\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*�i\|�}\_s*��\_s*��\|�C\_s*�f\|��\_s*\%(�C\|��\_s*[����]\)\|��\_s*�C\|�_\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*��\|��\_s*�c\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[���R]\|��\_s*�t\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�Q\_s*[�l�“�]\|�h\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\|��\_s*��\|��\_s*��\_s*�o\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|�_\_s*��\_s*��\|�`\_s*��\|�z\_s*\%(��\_s*�C\_s*�G\|�C\_s*��\|��\_s*\%(�}\_s*\%(��\_s*�g\|��\_s*��\)\|��\_s*�A\_s*\%(�~\_s*�h\|��\_s*�f\_s*�q\_s*�h\)\)\)\|��\_s*�t\|�@\_s*�\\|��\_s*��\|��\_s*��\_s*��\|�C\_s*��\|�q\_s*\%(��\|��\_s*�[\_s*[�Y��]\)\|��\_s*1\_s*�v\_s*�f\|�P\_s*\%(�^\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*�s\|�n\_s*\%(�G\|��\_s*�u\_s*��\|��\_s*��\)\|�_\_s*��\_s*��\|��\_s*�g\_s*��\|�G\_s*�t\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
+      \ 'G' : '\%([���E�D��ĉ�愍��܍��Ό���՘��ᖈ�@�W龚����o�X�����ߍ��n�S�����΍���������c�r���Š�����穚�������ꇟ|�����ߍ��������܌�����������Ɍ݌��ߋɉz��5⺙Z��䲌�뛈�T���ގq�I�w���x�ౌ�免@�㓆��������驌�纞���Q��������|��k��轚��nj}�~�|�Y�P��ꖕF���q�Ù����䋌�ῌ��V�Ȍ��������������������������Z���ɉĉ����R�т��C��������򕳕ȍ��I�Ƒq���ʌ���䣋����X���ȋ{�������j㸌S�Q�R�����ԋ����g���O��H�ً�����F���[�h���ߌ��N��ۋ������қ��ً�⚞�����f��耋ʋ������z��C�Č��ɛ���邙F�‹ƋŋÍs�ኋs�t�_�C�F�c��E�ٌV㺌�����~�E�[���]供ҋb�U�a�X�a�^�؋W�`ซZ鰒��\�Y�V�E���_�㎆雔������Wᥟd�m�A�ԛݔ��v�����ʊ��ŕ��꓁��^�`���e��寊����q���I�}�d�P�j�k���h����G�_�~�������܌�����������ݙʊہ���꜋��܊���������ߌ����猎���|�罚ْ�ꛞٛ{�Ӝ��ԙ��k�z�x�{�y�w�����R������♓�G���N��᳚P�U���n᫊Y�P�K�w䈊H�V�Q�Z�S�X�M�T�W�[�O�a�䉾��G���ώ؉���@�݉��ɑ֑��`�މ���b�����ʉꏑ���͉뛴��䮔���|�P���M�A���₪�⁄�f�����K�S�����Ƀ������������̓��Ѓ˃��σ��ȃ̃ǃ��ƃʃ����Ã��ƒ��Ճ��΃��у����҃����ă��Ӄ��ԃ��ŃփM�O�s�����Q�CG]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�S�Q�O�M�K]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*�~\|��\_s*��\|��\_s*�y\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*�s\_s*��\|��\_s*�q\|�H\_s*��\|��\_s*��\|��\_s*��\_s*��\|�~\_s*��\|�i\_s*\%([�ԉ�]\|�V\_s*��\)\|�P\_s*��\_s*��\|�]\_s*\%([�ÌΏ��B]\|�k\_s*��\)\|��\_s*[���`]\|�\_s*�\|�w\_s*�\|�i\_s*�F\|��\_s*��\|��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[���ō�]\|��\_s*��\|��\_s*�E\|�\_s*�\|�~\_s*��\_s*��\_s*�F\|�H\_s*��\|��\_s*[��Ս��i]\|�g\_s*�@\|�\_s*�\|�{\_s*��\|��\_s*\%([�알]\|�Z\_s*��\)\|��\_s*\%([�@����]\|�s\_s*��\_s*��\|��\_s*��\_s*�@\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�c\|��\_s*��\_s*�J\|��\_s*�t\|�L\_s*�q\|�Y\_s*��\|�\_s*�\|��\_s*��\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*�^\|�b\_s*��\|��\_s*��\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|�k\_s*�[\|��\_s*��\_s*��\_s*��\|�j\_s*��\_s*�[\_s*�Y\|�m\_s*�[\_s*��\|��\_s*�i\_s*��\_s*��\|�A\_s*��\_s*��\_s*�R\_s*��\_s*�i\_s*��\_s*��\|�q\_s*��\|�N\_s*�b\_s*�p\|��\_s*�q\|�n\_s*�{\_s*��\_s*�[\_s*�l\|��\_s*��\|��\_s*�[\_s*�e\_s*�{\_s*��\|�G\_s*�[\_s*�e\_s*�{\_s*��\|�C\_s*�F\_s*\%(�[\_s*�e\_s*�{\_s*��\|�e\_s*�{\_s*��\)\|��\_s*��\|�w\_s*\%(��\_s*��\_s*�h\|��\_s*�}\_s*��\)\|�h\_s*�C\_s*�c\|��\_s*�g\_s*�v\_s*��\|�[\_s*\%(��\_s*\%(�`\_s*��\|�j\_s*�E\_s*��\)\|��\_s*�N\_s*��\_s*�b\_s*�v\|�m\_s*�A\|��\_s*�g\_s*��\_s*�}\_s*��\|�l\_s*\%(�R\_s*��\|��\_s*\%(��\|��\_s*�X\_s*�g\)\)\)\|��\_s*\%(��\|�w\_s*�@\_s*��\)\|�W\_s*\%([�����W�O�m�i�I���[]\|�v\_s*�V\_s*�[\|�A\_s*��\|�b\_s*�h\|�C\_s*�h\|�^\_s*��\|�[\_s*��\|��\_s*�A\_s*��\|��\_s*�b\_s*�g\|�S\_s*��\|��\_s*\%(�t\|��\_s*\%(�h\|�f\_s*�B\_s*�[\_s*�m\)\)\|��\_s*\%(�[\|��\_s*�h\)\|�o\_s*��\_s*�V\_s*�[\|�u\_s*\%(��\|��\_s*��\_s*�^\_s*��\)\|�x\_s*\%(��\_s*�i\_s*�E\|��\_s*��\_s*��\)\|�l\_s*�b\_s*�g\|��\_s*\%(�b\_s*�g\|��\_s*�@\_s*��\_s*[�j�i]\|�o\_s*��\_s*[�j�i]\|�R\_s*\%(�[\_s*�\\|��\_s*�_\)\|��\_s*\%(�W\|�_\_s*�[\_s*�m\)\|�[\_s*\%(�W\|�[\_s*�b\_s*�g\)\)\|��\_s*\%(��\|�C\_s*\%(��\|��\_s*�Y\|�A\_s*��\_s*[�c�g]\)\|�R\_s*\%(��\|��\_s*�b\_s*�e\_s*�B\)\|�[\_s*�}\_s*��\)\|�j\_s*�[\|��\_s*\%([���l]\|�[\_s*�b\_s*�y\|��\_s*\%(�A\|�[\_s*�j\|�G\_s*�b\_s*�^\)\|�k\_s*\%(�r\_s*�G\_s*�[\_s*�u\|��\_s*�B\_s*�G\_s*�[\_s*��\)\)\|�F\_s*\%([�����t���}�l]\|�X\_s*�`\_s*��\_s*�[\|��\_s*�j\_s*��\|��\_s*\%(�[\_s*[�g���h]\|��\_s*\%(�h\|�f\_s*�B\_s*��\|�_\_s*�C\_s*��\)\)\|�~\_s*�j\|�j\_s*�[\|�m\_s*\%([�A�o]\|��\_s*�@\|��\_s*�[\_s*�Y\|�T\_s*�C\_s*�h\)\|��\_s*\%(�}\|�g\_s*\%(��\|��\_s*[�B�[]\)\|�_\_s*�[\)\)\)\)',
+      \ 'H' : '\%([Η���䀉������L�N������{�����w�ʔM��S�ܖŖy�j��壌u�������ׁ����󜓏c�����������]�K�g���֚��\✖{�x�j�ښ��N���W�����œY��u���q�������I��c�_�����p��沖Q���}䚑�鵖N��闈������{�B�P��a����H��������K�A�O�f�D���G�̜d���M�O�E�v����L�C����󝻝��e�M�іk���@��棕��n�ܚ��O�􍛕䕒�e�K�̚����M��ꅕߒ��J�~���s���܉Y癗_��͌���������z�u���`�œL�K���������H����Q蓕��Q�����ɕ������E憕��w��ǝ́ݕՕ��x�ҝG���ٖݕ͒�⍛i���y�Q�a������Û��z�˕r�������Ǖ•���糌�������粐��w�˂�̘[���Ή������։A�~�����y�`�[脟T�Ǐ͈�͊ȎD��^����J���㬐�䔕����b�ʟ��X��䎟������앶�|�����������������t�y���M�D���������⁄������������᳘��W�oB���K���敖�lᆕ�慊����p���̐k⿕�谌�ꄜ�霘Ŝi��������F�������Ӌ��h������u�ⷁ��������ޔX���܊ܕ��t�e���������o���o���n劚������]�w�w���S�ܙ󕄉畀�y�X���Y�|�����[��x�~�Y�����\�~�������B�U�v䘕�㧕����Е��t�s���D�z�@����缕u���•t�����b����ҕ}��G�H���������t�{������V�Q�_�~�P�c���ݕA�S��鯏G��G�哝��ǁ|�ጄ�Չ��颕E�j�h�k�_�l㏟q�o���ĕn�m�p�g�i���ם��ʕf�g������R�ʒ��J���I�����������@������P�������v�����z�h�啸���Ǐ��d�֋Ϗ��ē����d�ΒP�ՓƑ��m���l1�P�u��ഁ����H�͏ݝf�ە��\�P�F�t��鷑M���J焕S���Z���O�z���n�I�Q�T䊌��Q�P��㟋������j�E���W�q�G���g��ϏE�S���h������ꤊ����[�O�G�m�T�_�A�L�����J�C�N�ȕL�D�l���J�C捍����r�M�K��g�H�I�j�u�q�~�U銕V��G�^�Y�~�Z�֙��d���ߕ[�]�W���\���{�_�i���u�y�w�����������D���ڔ�ޝ�����ّޔٔ۔���唊�����X�䙶�O�����g����������|����������]�`���ۘ�ҍ���澝���ΞK������瀊��]��ݔ��B�B���w��ߛE�ܔ��O���栂�ʎ������z�j�H���ԗ󌃙����㔈墏Ȝ[���O���X�J��y������ٓ�}�j�݋Е��o������ޝ՝؏��ދ@�@�T�m�����ה�������喗��I���j���Y�D���s���c�P�����Ĕ��J�`������e������ƈ���n�]�n�G���|�F�ɉ��������Iꡓ��z�y���t������妝p�������p�������S���Ɨ����|杙�����b���r�@�؉��X��瞞d�z���x�X�򒌑������\������➕��^��⦔���������R�x�펾�њ����������虘������NJ����A���M���������������唏�����隤�R�����d�ʌv�}�є������`���ڔ������񏉘o�@��W���Iᢔ����@�������������Ҕu��ښ�������輏��v�`��u�i�����t���\�E�C�p��Bᓔo�x�ޔy�w�W��p�r�q�s�D�z�Ȕ֟����N�W����⛔����a�J������Í➷�^䗖}ፖ|���Y�K�唺�Ϟϔ��ٔ��͔�㆔הєŔ����Ǎ�ʔƔɔ̔Ĕ����Д����_�l���y�P㵔��Ôf��ڙ����h�ޝ��������c�j�p���b���h��[�e����n�U��f���ƙ��ȉH�i�����������Ց��f���͚��ĉʒ���蘗t�d��۔��ǐH�m�c���J����঑|��ꏛƓ\�̈́��������������������������������������������g�]�t������g�q�z�w�nH]\|�\_s*[�����]\|�b\_s*[�z�w�t�q�n]\|��\_s*[�قւӂЂ�]\|��\_s*��\|�q\_s*�K\|�\_s*��\|�m\_s*[�C�F]\|��\_s*��\|��\_s*�}\|��\_s*[�ΐ�]\|��\_s*�{\|�S\_s*��\|�_\_s*��\|�p\_s*�K\|��\_s*��\_s*�F\|�g\_s*[��]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|�\_s*�@\|�a\_s*��\|��\_s*�q\|�|\_s*\%(�\\|��\_s*��\)\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�Z\|h\_s*e\_s*c\_s*t\_s*o\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*�i\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[���R]\|��\_s*�t\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�h\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|�]\_s*�c\_s*��\|��\_s*��\|��\_s*�I\|��\_s*�\|��\_s*��\_s*��\|��\_s*�@\|�_\_s*[����]\|�I\_s*��\|��\_s*��\|�i\_s*�a\|�\_s*�\|��\_s*\%([�l�o]\|��\_s*�o\_s*��\)\|��\_s*��\|��\_s*��\|�f\_s*��\|��\_s*�V\_s*�q\|�_\_s*[����]\|��\_s*�l\|��\_s*[�ƁX]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*�f\_s*�]\|��\_s*��\_s*��\|��\_s*[�c��]\|��\_s*��\|��\_s*[�������B]\|��\_s*��\|��\_s*��\_s*��\|�h\_s*��\|��\_s*[�j�s]\|�K\_s*�W\|�e\_s*��\|�W\_s*��\|��\_s*�q\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�`\_s*��\|��\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�o\_s*��\_s*�|\|��\_s*�E\|��\_s*��\|��\_s*[��]\|�y\_s*[�����t]\|�q\_s*[�f�C]\|��\_s*�t\|��\_s*��\_s*�l\|��\_s*��\|�x\_s*�q\|��\_s*�J\|��\_s*��\_s*��\|�Z\_s*��\|��\_s*��\|��\_s*�]\|�K\_s*[��q]\|�{\_s*\%(��\_s*��\|��\_s*��\)\|�E\_s*[���l]\|��\_s*�s\|�w\_s*��\|�Q\_s*\%([�l�“�]\|�O\_s*[�Γ�]\)\|2\_s*\%([�l�“�]\|��\_s*��\|0\_s*��\)\|�W\_s*�|\|8\_s*��\|�q\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|�C\_s*\%([��i�f����]\|��\_s*��\_s*��\|�f\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|�F\_s*��\|��\_s*�a\_s*�_\_s*��\|�E\_s*�[\_s*�S\|��\_s*\%(�[\|�y\_s*�[\_s*��\|�x\_s*�[\_s*��\|�C\_s*�X\_s*�}\_s*��\_s*�X\|�S\_s*�[\|�O\_s*�m\_s*�[\|�}\_s*�j\_s*\%(�e\|�X\_s*[�g��]\)\)\|��\_s*��\|�\\_s*�Z\_s*�i\_s*��\|��\_s*��\|��\_s*�`\|�C\_s*\%(�_\_s*��\_s*�S\|�X\_s*�p\_s*�j\_s*�A\|��\_s*�[\_s*��\|�G\_s*��\)\|�I\_s*\%([���[]\|�i\_s*�[\|�m\_s*��\|��\_s*�t\_s*��\_s*�[\_s*��\|�l\_s*\%(�X\_s*\%(�g\|�e\_s*�B\)\|�Q\_s*��\)\|�e\_s*��\|��\_s*�K\_s*�[\|�}\_s*�[\_s*�W\_s*��\)\|�A\_s*\%(��\_s*\%(��\|�x\_s*�[\_s*��\)\|�l\_s*�X\_s*�g\|��\_s*�[\|�_\_s*�}\_s*�[\_s*��\|�V\_s*�F\_s*�b\_s*�g\|�r\_s*�^\_s*�V\_s*�I\_s*��\|�[\_s*\%(�l\_s*�X\_s*�g\|�m\_s*��\_s*�N\_s*�[\_s*��\)\)\|�G\_s*\%(�f\_s*�B\|��\_s*��\_s*�P\|��\_s*\%(�i\|�[\_s*�k\)\|��\_s*�C\_s*�[\_s*�Y\|�N\_s*�g\_s*��\|��\_s*\%(�Q\_s*��\|��\_s*�F\|��\_s*�X\|�}\_s*��\|�~\_s*\%(�b\_s*�g\|�[\_s*�g\)\|�u\_s*��\_s*��\|�i\_s*��\_s*�f\_s*�X\|�L\_s*��\_s*�[\_s*��\)\|�m\_s*�N\|�C\_s*�`\|�b\_s*�`\)\|��\_s*[�╽�f]\)',
+      \ 'I' : '\%([��Ń��~��ꍘc�T�U���������n�������翔�䑌��폒��������恍ݍ��������r�x�������É��j囚|���d�Q�U�����|��Ɨ��������B�d���{��佈�S�\嫉�䆍��m�n�ؐF���A�t����F������̌Ì��䉳�L���d�������ƜјJ���i��ꌒ��Օa�k�v����ɔžo�������֍����y�󙬌M���E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�������N�~�}�z�c���c�t��硉Ɏ������䕟J����s�W���]�b�K�\���T��ซ]�r䟈��Z�Л��T������m�����Ĉ��M�ßΉ����C����������m��覉@������B�u�A�A�܊���j�H���ڈ�Ί�ֈ�Y�È�1�P���y���D���I��D�R������۔шዏ���ܐ��R�Δ���đP�_�ʈމ‘��E�h�����e�˗v�֍s�}�وߐ��ƈݟ��D�ᒒ�K�֋��҉]�����~�˓��шڏ�����Η��͛H������B�܈횀�}���ՋU䏜S�Ή�������u�������Ј׈ۈӘߗǔ@�b�ߏo�������؈�U�w����͉��]��ਖ��看�̈��g�؂��X�J�z���ˁ��������Ɉ�����D������灿�h�C�I���y����I]\|E\_s*��\_s*�[\_s*��\|�a\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|�c\_s*�J\|��\_s*��\_s*��\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�@\_s*��\|�h\_s*[�‘�]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�E\_s*[�c�R]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�a\_s*��\|�C\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�w\_s*�h\|��\_s*��\|�]\_s*[�햅�o�Z]\|��\_s*��\|�K\_s*�{\|��\_s*�q\|�_\_s*��\|��\_s*�r\_s*��\|��\_s*��\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*��\|�p\_s*\%(��\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[�ō�]\|<\_s*=\_s*=\_s*>\|�K\_s*�v\_s*�\\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�{\_s*�A\_s*�C\_s*�E\_s*�r\_s*�[\_s*�E\_s*�G\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*�w\|�W\_s*��\_s*��\_s*�@\_s*�\\)\|�t\_s*��\_s*�U\_s*�t\_s*�[\_s*��\_s*�G\_s*��\_s*��\|��\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*�^\|��\_s*�m\_s*�[\_s*�h\|i\_s*\%(�A\_s*�v\_s*��\|P\_s*o\_s*d\|��\_s*�[\_s*�h\|M\_s*a\_s*c\|�m\_s*�[\_s*�h\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�A\_s*�[\_s*�@\|��\_s*��\_s*��\|�s\_s*\%([�”@��]\|�[\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�S\|��\_s*\%(�A\_s*��\|�V\_s*�t\|�[\_s*�h\|�E\_s*�f\)\|�A\_s*\%(�C\|�[\_s*\%(��\_s*�B\_s*��\|�r\_s*��\)\|��\_s*\%(�v\_s*��\_s*��\_s*�v\_s*\%(�`\_s*��\|�e\_s*��\)\|�f\_s*�p\_s*��\_s*�_\_s*��\|�t\_s*�H\_s*��\_s*\%(��\_s*��\|�}\_s*�e\_s*�B\_s*�[\_s*�N\)\)\)\)',
+      \ 'J' : '\%([���󓈓����Ȟ펱���Ǝ��w�x�����H���Û�����K�������b�����H�ז��iᶘ���u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l���䥞`���œ���ҏ��t����J�珊�R�������P���������t�i���g��������Y�U���{�����ㅐ���媚ߘ����j�h�Ř�竐��ҝm���Y�o�@������Ï��ꏗ�����`���~��]���吷�꞊��󝵏������������������휵�h�G�ڜ����G��Q榏A�@���u�Q���h�x�m��n���p�q⢓ď��m�Ï|�m�����՟��~�[���x��{䤏��z���������y�}������汛}����������杆�n�G໒��^�E���☸�s�F��_�`���O�c�a�_�Y���[�]�b�\�Z�e�d�����ꎠ���������������m��䢛y���k�������d�����H���m���ˎ����掝���~�Ŏ����n�~���I���m熉a��玘����J�Ȏq����j���^�Z�������i�������V���ݒ���䝎�ڐ�����׋Y�Ҏ��l苂������������������D�u�E�����`���_���i�F�v�z�J�WJ]\|�\_s*�\_s*�\|�b\_s*�W\|��\_s*��\|G\_s*\%(��\_s*��\|�p\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�c\_s*��\_s*\%(��\_s*��\|�c\_s*��\)\|�Q\_s*��\|2\_s*��\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|�O\_s*��\_s*��\|��\_s*��\|�G\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\_s*��\_s*��\_s*��\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|�[\_s*��\_s*�[\|�G\_s*\%(�z\_s*�o\|��\_s*�R\|��\_s*�~\_s*��\|��\_s*�T\_s*��\_s*��\|�b\_s*�T\_s*�C\)\|�w\_s*\%(��\_s*�X\|�X\_s*�X\)\|�q\_s*��\_s*�l\_s*�X\|�`\_s*�Q\|�k\_s*��\_s*��\_s*�[\_s*\%(��\|��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\_s*�@\_s*��\_s*�w\)\|�n\_s*\%(�C\_s*��\|��\_s*�y\_s*�[\_s*�j\_s*��\)\|��\_s*��\|��\_s*\%([�����j�i�[]\|�C\_s*��\|�G\_s*��\|��\_s*�m\|��\_s*�h\|�k\_s*\%(�X\|�V\_s*��\)\|�X\_s*�p\_s*�[\_s*�X\|�R\_s*[�r�u]\|�b\_s*�P\)\|�t\_s*\%(�@\_s*[���i]\|��\_s*[�I�A]\)\|�Y\_s*�{\_s*��\|��\_s*\%([�n���_�m]\|��\_s*�Q\_s*��\|�[\_s*\%([���m]\|�Q\_s*��\_s*�g\|�f\_s*�B\_s*�b\_s*�g\)\|��\_s*\%(�O\|�P\_s*��\|�J\_s*�[\)\|�s\_s*�e\_s*��\|�b\_s*[�J�V]\)\|�C\_s*\%(�G\_s*\%([�i�X]\|��\_s*\%(�X\|�Z\_s*��\)\|�Y\_s*�X\)\|�F\_s*\%(�i\|��\_s*\%(�X\|�[\_s*��\|�Z\_s*��\)\|�[\_s*�K\_s*�[\|��\_s*\%(�N\|�T\_s*��\_s*��\)\)\)\|�z\_s*\%([�^�Z]\|��\_s*�w\|�z\_s*�o\|�A\_s*\%(��\|�L\_s*��\)\)\|��\_s*\%([�u�i]\|��\_s*\%(�O\|�_\_s*��\)\|�G\_s*��\|�A\_s*\%(�L\_s*��\|�q\_s*��\)\|�[\_s*�t\|�V\_s*\%(�t\|��\_s*�A\)\|�[\_s*\%([�h�g]\|�f\_s*��\|�[\_s*�t\)\|�Z\_s*�t\|�n\_s*[�i���l]\)\)',
+      \ 'K' : '\%([����a���|�V�шҜ��D����ޏn�s���ߐ��E�}���Ĉ����ۗ�ᶎ��s�Д������f�����ꎖ������I���z�Eꑍ��C��欉��䓚�䢐����u�S�}┍��əY�`�n�����X���M���Ȝk�ύ����������������������卭�Ӎ��������e�W�՝��B�L�ݖ����ϙi���Ҕ��Q�b��m��秘j���t����R���K�{�M�������`肍��ȎL琍f�ݚJ��k�i���Q���硟��L��������s���J��������𔸙��l���E�H���n�r������੘m��t����൙��{�X�������E���R�n㝍h�����}����H�y�ߝK�朑�����n�K�}��֞��\��囍y��ෙ��Μˍx����u�X�S�e倘����J�i�^���’@�V���A�W����썄�G�D�T����ᩍ`�p��᧍B�]�i�P���I���z�t�_���k�K�O�j�R�w�U�u�P�I�a�|�q�s�m���c�D�r�����J�L�ޛ��ܝ��w�΍������������я��W�g������V�����ڐ�������������မZ�čᑆ���ՙs�|�˙�Z�����e�q�؝s�Z���hⰍ����Čٕ֒��]�e�ۏ���㨏��h��ן�z�ÌП�绌�ꉍ�����烜��������ًÌnj΍��@�u�x�삱��s�|�q���W���O�׏b����]�{�Ȍ��t��_����^晘�P�Θn�[�B�����ӐK���r����K�{���������y���L���������C�[��N訙��i�٘����_���ݟ]�ܜ��p���������w���ٝ�惞��J���J�������ʌ�����㮛ӌ��@���ę�������F鄌������������������������������Ō������ښ�_����犙g���D������Ϟf����Z�w�c�l�|�����l���k�a�����l�㋜��d��P�n�������������������������������������������������������r�z������壌u�殌e�k�\�g��b�Y�p���]�v�[�ٖяR������Ɣz���z�M�K���ɞ���ⱟJ��㖍򍥛������I�����H���E���b�z�o������x�A�ܗ����D�B��ӏ��~���������B䱌s���Z�Yᯙ������Ӟ�ᮛ��M�ֈ��v���ڌL�����K�@����{���^���Z�򏾓�^�����č�㦖�鶔�ňʈ��U�Ñq���������C�~���ܒw�o�^������鿌~�G�F䇚����`�p�̃��L�Y���������ƌI��ގԚ��P�M�����E�u�����{���O���o�Ӟ������c���������m���ċ��ᙊ�H�M��῍C��​晠�J����v�͎ތɜ��g�ˍg�H��ܜ����|�E���؂���i���w�J�G�r���z��W���_���_�l���o�C∋̛����m���G������摋d�򐟏~����焌N��۟@�A���^�ϛ��l�ɝh�h�f�k�e�i�d�_���A���Z��߁D���O�񁣁��M�������Q�����G�������E���������^�����|�P���X�����Y�T���\���N��{�H�R�c����a���K���S�L�B�}�b��܁������C�⁃�������������I���J����ʁ����]�[�䁏�F�Ɂ��W�����V�W�������U���s�ה܍@���ߍX���������a�n�݋j�����~�g�����ˋ������R⮝v�����������v�[⯙ߋ��������a�z�ҝ��Ћی��׋؋ы͋ՋӋϋދًԋߋ֋����_����������⦉R䐘��c�`篋��ы��������������������Nj����������������蝋���⟙K�� ��s㳝O�v�w���S�����y��⸋��t�������|�^�v�O�t���I�[��h➍F���������p�����Z�i�g���݌����������x�������Z�Nj����]������䰚񋧋��������o����運��d�����������������������q�k��������p�t瓜��_溈��ڂX�}��緋���k�����Ë����u�������y�Z�������|�P�l�{�v�����u���������x�~�}���z���֘Ғ���ڙr㱋F���M�N���P�����؋B�Y���������y�����q�V�����H�P��鉩���Y�{�d��O恊��k�ɋL�ƚ_�Κ�G��h�����U���ȝ��M��針��i����D�������ʞX�����M�J��k�E���˝����I���b�_����������J�㙒�B�C�����b�쟃���������a�u�Q�W���Q����X���q�S���c����ߟ�����D�W�P�^���H���r�u看R�u�K�鞗�������y���NJ��r���݊��j���ƌy���Ĉꁽ�e�A���i������������M��ꝕr�P�T�M�����v������r��ᚁ����f�j�s�e�h�o�q�g�p�t�r���ƒb��鹜��NJ����D�R���U�ğd�z��ᥕ��p�ȌڋA���Ԏ��‹_雔B�ߗ��ދȋ�\�����Ί����ۖ͋w�d�T��e�z�J�x���Ō`�ӕ��^�������Ȕ��H�����X�R�C���P��������q�Š�������閔����@�ϞJ���{��������艁�嶔��㹊������|�ؙ��^������歒S�����e顊��j舊��������s���Fጐ��d�P�}���g�����y�a�`�f����S�W���m�����e��O��ݑ��]�ڛ��̊��Ŕ����@���쁨�F�����O���k�P���[�\铑���ಉG�h�@���󓂞Њ����~�y�ۍ\�������}�����ɐ��͘����V��،����~ऐ����c���͌��b���u�w��v�x�X�Õ��L����ꖊ��C�ƓK�G�S�R魓C���Ј����ߕK�v���֓S哑t�������ݓk�����䡞��S���湝���誜����vᙊd�n�]�Q��L�ڒ�������I跏ʜ������h���\�f�r�l�y�m�z�n�k�k�g�c�s�t�i�o�݉B�v�d�ߝ��j�l�g�q�u�p�m�G�d觛��Z��嵙��j珚����Ԙ��B�i�W�q�����r���[���~�����D䠊^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�_�F���׊@��E�m�����L�G���D�ŊA���������K���J����C���`���՚Q�ɟ��I�W錟a��檚��A洚��j��b�a�Y���ホe�⻞�䯙��q���T�㻛f�p�����N��㼝��c���㣟��V�뙁���M����ϊ�䅟��j�F�r�����������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�A�g������|���}�����ۊ��@�يΞ��؊��󊩐��ȊҊ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������š^�׊Ċ��ÊԊ��Պ��NJ����֊͊������ϊ��w����x�s�q�P�g�ӊe�����h���ӏ�Չɉ���Չ܃��`���͉��ތ��F㞉��S�˚Z���Q����草ؚm�׊]�����͉��ی�嗉��e�D��v�q������Ҏx�T�|�~���o戟ω̉ߍ��ю딃�̉ƞg��������`�ϙ�֑��d�U�������ݙJ�Ǝ��a������͉ۉ��я������ÚКk旓��z�Њ��|䑉�嘉�������㟉��q�ČC�����a�������{����斎؉�����҉ǟ���ϛ���◉Ή։���l�����߄��������V���R���`�����i�j�N�~���q�ȃL���J�K���{�ԃPK]\|�\_s*[�����]\|�b\_s*[�R�P�N�L�J]\|��\_s*[�q����������]\|�O\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*�J\|�H\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|�O\_s*�A\_s*��\|�\_s*�u\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|�S\_s*[�Z��]\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�z\_s*�n\|k\_s*i\_s*l\_s*o\|��\_s*[�q�V��]\|��\_s*��\|�m\_s*�F\|�\\_s*�\|��\_s*��\_s*��\|X\_s*e\|�@\_s*��\|��\_s*�s\|��\_s*��\|�f\_s*�n\|�\_s*�\|�\_s*�z\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|�e\_s*[����]\|�o\_s*[����]\|�j\_s*[����]\|�{\_s*��\|�n\_s*��\|�X\_s*\%([���]\|��\_s*��\)\|��\_s*��\|��\_s*�Z\|��\_s*�q\|��\_s*�T\|�\_s*�\|�z\_s*��\|�\_s*�x\|�R\_s*\%(��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|�t\_s*��\|�\_s*�r\|��\_s*�Z\|�|\_s*��\|�]\_s*��\|�\\_s*��\|��\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|��\_s*��\|�y\_s*��\|�A\_s*�g\|�g\_s*��\|��\_s*�t\_s*��\|C\_s*\%([ormdaf]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[�{���v]\|��\_s*\%(��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|(\_s*��\_s*)\|��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|��\_s*[�I�v�_]\|��\_s*�_\|�B\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|�m\_s*\%([�u�E]\|�[\_s*��\|�b\_s*\%([�g�N]\|�e\_s*�B\_s*��\_s*�O\|�J\_s*�[\|�L\_s*��\_s*�O\)\)\|�i\_s*\%(�b\_s*\%(�N\|�v\_s*\%(�T\_s*�b\_s*�N\|�U\_s*�b\_s*�N\)\)\|��\_s*�b\_s*�W\|�C\_s*[�t�g�c]\)\|�j\_s*\%(�[\|�b\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\)\|�z\_s*\%(�[\_s*\%(�~\_s*�[\|��\_s*�C\)\|��\_s*�C\_s*�j\)\|�t\_s*\%(�r\_s*��\_s*�C\|��\_s*�V\_s*�`\_s*��\_s*�t\)\|�n\_s*\%(��\|��\_s*�V\_s*��\_s*�[\|�[\_s*��\|�o\_s*��\_s*�t\_s*�X\_s*�N\|��\_s*�c\_s*�[\_s*��\|�`\_s*��\_s*�g\_s*�D\_s*��\_s*�A\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'L' : '\%([��H����F����D����B����@������Q�P���������΁Ɂʁ́����k�ȃ������L�Ʉ|��L]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�t\_s*��\|��\_s*��\_s*2\_s*��\_s*�@\|\.\_s*\.\_s*\.\|�f\_s*�F\|l\_s*-\_s*��\_s*��\_s*�g\_s*�[\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�z\|��\_s*��\|�E\_s*�G\|��\_s*��\|�w\_s*�K\|�{\_s*��\|��\_s*��\|�_\_s*��\|��\_s*\%([�L�C�A�����u�{�g���E�X�R�S�O�[]\|�y\_s*�X\|��\_s*�[\_s*��\|�G\_s*�x\|��\_s*��\|�t\_s*�g\|��\_s*�J\|�x\_s*��\_s*�A\|�r\_s*\%(�[\|��\_s*�O\|�C\_s*\%(�X\_s*�g\|��\_s*�O\)\)\|�e\_s*�B\|�T\_s*��\_s*\%(�W\_s*�F\_s*��\_s*�X\|�[\_s*��\_s*�X\)\|�j\_s*�[\|�N\_s*��\_s*�A\_s*��\|�b\_s*\%([�W�^�e�g�N]\|�L\_s*\%(��\_s*�O\|�[\_s*�h\)\|�J\_s*�[\)\|�P\_s*�[\_s*\%([�g�^��]\|�V\_s*��\_s*��\)\|�J\_s*�[\_s*��\|�K\_s*�[\|�M\_s*��\_s*�O\|�W\_s*\%(�[\|�e\_s*�b\_s*�N\|�X\_s*�e\_s*�B\_s*\%(�N\|�b\_s*�N\)\|�J\_s*��\|�N\_s*�[\_s*��\|�b\_s*[�g�N]\)\|��\_s*��\|��\_s*\%([�S�O�_]\|�{\_s*\%(�N\|�b\_s*�N\)\|�o\_s*��\_s*�f\_s*�B\|�Y\_s*�f\_s*�[\_s*��\|��\_s*[�[�B]\|�W\_s*��\|�h\_s*��\)\|��\_s*\%(�A\_s*��\|�b\_s*�^\|�[\_s*�k\|�C\_s*��\|��\_s*\%([�\�X]\|�c\_s*�H\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*\%([�B�Z�Y�U�T�X�_�|�������}�i�m���k�u�A�[]\|��\_s*�}\|��\_s*�h\_s*��\|��\_s*��\|�]\_s*�`\_s*�[\_s*��\|�R\_s*\%(��\_s*�X\|�s\_s*��\)\|�N\_s*�[\_s*�h\|�J\_s*\%(�[\|�I\_s*��\)\|�W\_s*[���[]\|�f\_s*[�B��]\|�h\_s*�J\_s*�C\_s*��\|�v\_s*�g\_s*��\|�p\_s*�[\_s*�[\|�O\_s*\%(�j\_s*��\|�i\_s*��\)\|�t\_s*\%([�G�g]\|�^\_s*�[\|�e\_s*�B\_s*��\_s*�O\)\|�e\_s*��\_s*[���V]\|�`\_s*�E\_s*��\|�\\_s*\%(�\\_s*�[\_s*��\|�O\_s*��\_s*�t\_s*�B\)\|�^\_s*�[\|�g\_s*\%([����]\|�}\_s*�X\|�A\_s*�j\_s*�A\|�O\_s*��\_s*�t\|�o\_s*��\_s*�X\_s*�L\_s*�[\)\|�I\_s*\%(�^\_s*�[\_s*��\|�l\_s*��\)\|�~\_s*\%(�e\_s*�b\_s*�h\|�b\_s*[�^�g]\)\|��\_s*\%(�[\_s*�W\_s*��\|�l\_s*��\|��\_s*�`\_s*�F\_s*�b\_s*��\)\|��\_s*�W\_s*��\|�L\_s*\%(�b\_s*�h\|��\_s*�[\_s*��\|�e\_s*��\_s*\%(�V\_s*��\_s*�^\_s*�C\_s*��\|�X\_s*�^\_s*�C\_s*��\)\)\|�G\_s*\%(�]\_s*��\|�[\_s*�W\_s*��\)\|�q\_s*�e\_s*��\_s*�V\_s*��\_s*�^\_s*�C\_s*��\|�l\_s*\%([�A��]\|�b\_s*�g\|�[\_s*�W\_s*��\)\|�j\_s*�A\|�x\_s*\%([����]\|��\_s*�A\|��\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�e\)\|�r\_s*\%([�A�[]\|�h\_s*�[\|��\_s*�O\)\|��\_s*\%([�X�[]\|�u\_s*��\_s*��\_s*�[\_s*�i\|��\_s*��\|�h\_s*�~\_s*��\|�N\_s*�T\_s*��\_s*�u\_s*�[\_s*��\|�b\_s*�N\|�V\_s*�A\_s*��\|�~\_s*�G\_s*�[\_s*��\)\|��\_s*\%(�C\|��\_s*�O\_s*�E\_s*�F\)\|��\_s*\%(�B\_s*��\_s*�O\_s*�X\_s*�g\_s*��\|�@\_s*\%(�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\)\|�o\_s*\%(�e\_s*�B\|�^\_s*��\_s*�A\_s*\%(��\|�j\_s*�Y\_s*��\)\|�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\|�b\_s*\%([�h�s�v�^�N�`�g]\|�X\_s*��\)\)\|�G\_s*��\)',
+      \ 'M' : '\%([ӊߊ㝪���ϙ~�E��ぞ���������J�I��䈐��Ўt�������u�q�v�U�p���ݑ���m�X�����ޖ��\�ҕ��~������⋖�̜����߉������b�f��{���e�����Җ۟������͟G㦖��̞N�����a�C�S�֖іЖҖԘR�֖]�r������R�ᑔ�Ȗ̞���k�G�ۖΖ���������ݒ����W�Ϗ����ږӛR��ㅖG�̜����b�p�cᾖɖ˖�ǖȖʟ���œ���Җ��ǖ��‰��ɏ��z�����܌�������ї�㸋X���ٟ}�ۖ��V�񛘊[������|��r���m��籑ΕS�}���Ɠ�絘A�W�p�����~�����׏@�����d����⚕ړk�����J⥐I���ßz峒������Ú��ۖ��ٖd�����x�������딍�Z�Q�������x���������N���a�D�Y�K�I����������C�T���ϗ��Η����������������������X�O�̎S�Z�����B�ꎨ�ݜD�X�����L�薦�ޑ��Ò��ف��v��p�󁨁z�x�E�G⊖����ɗΔF�����a�ϓ��r�ʘH�����飌Ύ��M倐�ᡞ��䪖��������s�{�S�A���Q���`�������捐����v���P�閨��{�F���������[�V�g���\�όȐf�Ŗ����m�O��[�����p���r�향��ϖ�▕n�������aῐݐ\�ן{�f�B坏�㇓�㕓I帑��]�^�ߋ[���]�H�o�q�h������Ɖ������M���ϔ�d�������h�q�ʌ��������ږ����p��鞔C����䍕������̓h�|�{���Ê�׈��w���e�l���C���������d��ꠖq�x�f���U����X���O��E���D�����K�B�j�i�~�ە��������בS�u�����Җ����K�������ĎQ��w�������Ęd�G����簖��a�ږ����_�����J�Z�Ֆ��攔��{����V�Ԕћ���I���ԙ��\�ݖ��ޖ���G�������M�����������挫�D�������󏫐����m��_����䝖��ڐ�����ɎU���]���v�^����������n�����v�G�ݕ���ᄎT�Ҕd�Ԗ��s�����Ȗ��܌������򃀁����������⁆��܁}���́�����Ɂ䃢�ʁˁہ΁ځȁ��́�߁��~���݁����ま�ށ����֖����Z�������l�����|�}�Ń~�M���ʃ�M]\|�\_s*[�����]\|�b\_s*[�������~�}]\|��\_s*[���߂ނ݂�]\|�g\_s*[�����t]\|�o\_s*\%([��n�e]\|��\_s*��\|��\_s*��\)\|�\_s*�o\|��\_s*�y\_s*\%(��\|��\_s*��\)\|��\_s*\%([�p�e�n]\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*�z\_s*��\|�k\_s*�~\_s*��\|��\_s*��\|��\_s*�p\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|��\_s*��\_s*��\|�j\_s*�E\|��\_s*��\|��\_s*[�N����]\|�n\_s*��\_s*�F\|�t\_s*��\|�J\_s*��\_s*��\|�v\_s*�w\|��\_s*��\|�z\_s*��\_s*�q\|�v\_s*\%([�����p�L]\|�`\_s*��\|�H\_s*�q\)\|��\_s*��\|�U\_s*��\|6\_s*��\|��\_s*�c\|��\_s*�w\|��\_s*��\|��\_s*�]\_s*�q\|�\_s*�n\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�Y\_s*��\|��\_s*�q\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|�t\_s*�m\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|�R\_s*��\|�\_s*��\|�e\_s*��\|�_\_s*[���q�`]\|�d\_s*��\|��\_s*��\|��\_s*��\|�c\_s*[�q����]\|�R\_s*[�“�]\|3\_s*[�“�]\|�p\_s*[��q��]\|��\_s*��\|��\_s*��\|�c\_s*��\|�C\_s*[�_�]���z���I�R]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|�y\_s*[�����Y]\|��\_s*�s\|�[\_s*�]\|��\_s*��\|��\_s*��\|�e\_s*�O\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|�s\_s*\%(��\|��\_s*[�]�_]\)\|��\_s*�l\_s*�}\_s*��\_s*�m\_s*�X\|��\_s*�X\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�X�Ќ���]\|��\_s*��\|�S\_s*��\|��\_s*��\|��\_s*�h\|��\_s*��\|��\_s*��\_s*��\|�{\_s*�B\|��\_s*�v\|��\_s*[�o����]\|��\_s*��\|�}\_s*�n\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*�b\|��\_s*�m\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�|\_s*\%(��\_s*�l\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[�V��]\|��\_s*�F\|�S\_s*�j\|��\_s*�q\|��\_s*[�����P]\|��\_s*��\_s*�N\|��\_s*�v\|��\_s*��\_s*��\_s*��\|��\_s*-\_s*�q\_s*�m\_s*�`\|�j\_s*�[\_s*��\_s*�j\_s*�b\_s*�N\|�P\_s*��\_s*��\|��\_s*�c\|�a\_s*�z\_s*[����]\|��\_s*��\_s*�q\|��\_s*��\_s*�]\|�s\_s*[�K��]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*�h\_s*�q\_s*��\_s*��\_s*��\_s*��\|�{\_s*��\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*�t\_s*�@\_s*�C\_s*��\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|�v\_s*�Z\_s*�@\|��\_s*��\|�U\_s*�b\_s*�w\_s*��\_s*��\_s*�}\_s*�]\_s*�b\_s*�z\|�n\_s*�s\_s*�I\_s*��\_s*��\|��\_s*�s\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|�C\_s*�m\|��\_s*��\|��\_s*��\|�G\_s*��\)',
+      \ 'N' : '\%([ɈҘj�C�򝼏��M��l����A�j�������f���w�a�X��H�p���L�H�]�`��k�c��䊉ѓ���o���ў����و풨�{�E����J�돸�W�@���Ћ錛�K���N�X�I�͓T������G���c�I�X�^�]�\�_��L���|���Z�����ޟZ���ڔV�۔U����q�W��Țˑ_�o��D�E���^�J�C�ꋑl�X�L���i���������s�M൘J�K�R�������_�Q�O�R�N���Q�����q�P�H�ח��l�B�S���I���������\���啼�K���L刐@���z���X���ޓ����F�܍f�z�D���ѝU�{�z�h�G�E��Ɲ^吒S�����������L�����E���R�P�{�e�����֏��A��E��U�Д@���P����E�ɔB轟��W�����t�s��w�x�����Z�X���K�וf�n�E�͔D�F�C�l�����׋ѐ����V���_�����a���m����玘����Ɠ�Q�����2�O�ǎ�獂���r�W㊓��c����k�j�›�����D�T�l��S�V�Q�e���o�w���Ԏ������P�����Y���g���粓�Q�^�垙�����ĎC���������鼉��Y����ّӓ��H�a����y���[�Ó�ܗm�G�X��Ɩ�Č`�Ɖr����ဗ��v�ᑶ�i�a�����������x�܏A���E�}�����V�Ύ����̔T�����R���f��펢����j������o�s�ϗ�o���ˁ��K�菦����b�a�e�n�ߖ‹������יT�r�ؓޟ����[�~�����֓△�L��ྒྷ��⍋��P��S��\���Ȅ��������������������������������������ޖ����������j�l�m�ʁ`���i�k�m�~�˃��NN]\|�\_s*[�����]\|�b\_s*[�m�l�k�j�i]\|��\_s*[�̂˂ʂɂ�]\|��\_s*��\|��\_s*�q\|��\_s*��\|�x\_s*�U\|��\_s*��\_s*��\|�\_s*��\_s*��\|�T\_s*[�|��]\|��\_s*�C\|�t\_s*��\|�g\_s*[���C]\|�j\_s*[����]\|��\_s*�]\|�L\_s*��\|��\_s*��\|��\_s*�q\|��\_s*[�@���q]\|�P\_s*�q\|�F\_s*�q\|��\_s*��\_s*��\|�h\_s*�V\|�q\_s*�|\|��\_s*�\_s*��\|��\_s*��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�]\_s*�q\|�_\_s*��\|��\_s*�P\|I\_s*I\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(�f\|��\_s*��\)\|�|\_s*�\|��\_s*�|\|��\_s*�T\|�s\_s*[����]\|L\_s*e\_s*a\_s*d\|P\_s*b\|�C\_s*[�ۑl]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�|\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|�n\_s*�k\|��\_s*��\|�s\_s*��\|��\_s*��\_s*�X\_s*�g\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|�R\_s*��\|�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|��\_s*�[\_s*�m\_s*�b\_s*�V\_s*��\_s*�E\_s*�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|�I\_s*��\_s*��\_s*�_\|�A\_s*��\_s*��\_s*�J\_s*�l\_s*�b\_s*�g\_s*��\_s*�[\_s*�N\|��\_s*��\|��\_s*�_\|��\_s*�z\_s*��\|n\_s*\%(��\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|��\_s*��\|��\_s*��\|�G\_s*�k\|��\_s*�f\)',
+      \ 'O' : '\%([����ݐb�S�M�o�N�O�Ì��Q�������j�w�d�Њd���Y���n�����n���x��������遒s���s��ና{��≬�L�ݜ����ڏP�񜁈؋������y���߁R�U�V�W�T�S�X�������y�􋳙{�E⫝������e���}�t���c�C筞��[�҉���x�^��拑����`�q�s�N��`�ƛ����ˊx���u���b�B���d�e�������Ȋe�퐊��K�ȉ��򚙊������a�C�����O�����݈җ�㱕������z�v�\�d�ʋ������U���K�������������{�|���������S���w��������D���}��Ҝ����i�g���^���]����[�a�����Q��_�����N�����R�����V�M�������ן^�q��r誉��S�B��������������������蜊׉��ʉ�������ꉂ�W�W�T�g�����E���c�T�ٖQ���P�������ѕ���}���ʼn���|���؏����N�~���֏��斃�������E�戳�[�O�D�Lj���������u�ѐ��ܘN�����Y�������Y�ǘV�j�v���Ĕ��ɚj���I�ɂ��偝���a��􁾁ɊJ�n���փ��O�I���̈́�O]\|��\_s*��\_s*��\_s*��\|��\_s*�p\|�\_s*�u\|�\\_s*��\_s*��\|�S\_s*��\|�C\_s*��\_s*�C\_s*��\|��\_s*��\|��\_s*�@\|��\_s*��\|��\_s*�\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�]\|��\_s*��\|��\_s*��\|�T\_s*[������]\|��\_s*[���q]\|�f\_s*[����]\|��\_s*[����]\|�H\_s*��\|��\_s*��\|��\_s*�C\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�p\|��\_s*[���q��]\|��\_s*�N\_s*��\|�{\_s*��\_s*��\|��\_s*��\|��\_s*�b\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�K\_s*��\|��\_s*�l\|�\_s*�c\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�o\_s*��\_s*�U\_s*\%(��\|��\_s*��\)\|��\_s*�m\|��\_s*��\|��\_s*�]\|��\_s*�g\|��\_s*��\|��\_s*��\_s*��\_s*�P\|�A\_s*[�z�n]\|��\_s*[�H��]\|�}\_s*��\|��\_s*�F\|�w\_s*�n\_s*�}\|��\_s*��\|�z\_s*[���i�q�m�x]\|��\_s*��\|�c\_s*[�_����]\|��\_s*�O\|�]\_s*�c\_s*[�ꕃ]\|��\_s*[�~�C��]\|��\_s*\%(�c\|��\_s*��\_s*��\|��\_s*�V\_s*�c\)\|��\_s*��\|��\_s*[�����G��]\|��\_s*��\_s*��\|��\_s*�m\_s*��\_s*��\_s*��\_s*��\_s*\.\|�G\_s*[����]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|��\_s*��\_s*�d\_s*�@\|�E\_s*��\|��\_s*�~\|�E\_s*\%(�B\|�[\_s*\%(�Y\|��\_s*��\)\|��\_s*�{\_s*��\_s*�X\)\|�o\_s*��\|�A\_s*\%(��\|�U\_s*�[\|�E\_s*\%([�`�g]\|�^\_s*�[\)\)\|��\_s*�{\_s*�\\_s*�t\_s*�g\_s*�E\_s*�F\_s*�A\|��\_s*\%(��\_s*[�N��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|�_\_s*��\_s*�a\|��\_s*�\_s*��\|��\_s*��\_s*�_\_s*�f\_s*�j\_s*��\_s*��\|�`\_s*��\_s*��\|��\_s*�K\_s*��\|��\_s*��\|��\_s*�Z\_s*�q\|��\_s*��\|�_\_s*�f\)',
+      \ 'P' : '\%([�B���C��@�{�����s���܂ە����y�~粕ҕ�糕ӕՕћ��ؕ��������z������C�ߕ[�U�i��������ᢑ����p�o�������Ǖ�ś���”ƕ������s�t�u�z�v���d�g�j�H���ω��Ճ��ҁ}�{�ՃӃ�������k����o�D�������_�E�v�|�Łj�i�݁��a�y�p�P�΃s������P]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�|�y�v�s�p]\|��\_s*[�ۂ؂Ղ҂�]\|�\_s*�\|��\_s*�l\_s*��\|�\_s*�\|�O\_s*[�I�D]\|�\_s*�\|��\_s*�R\|��\_s*�D\_s*��\|�\_s*�\|��\_s*�`\|��\_s*��\|�\_s*�\|��\_s*�q\|�b\_s*\%(��\|��\_s*�n\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|�r\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�Ž���]\|�V\_s*\%(��\_s*�[\_s*�h\|��\_s*�V\_s*�r\_s*��\)\|�T\_s*\%(�[\_s*��\|�C\_s*\%([�Y�N�P�R]\|��\_s*�V\_s*�r\_s*��\|��\_s*�E\_s*��\|�L\_s*�b\_s*�N\)\)\|+\_s*��\|�z\_s*\%(��\|�X\_s*�Q\_s*��\)\|�q\_s*��\_s*�|\_s*��\|��\_s*\%(�z\|��\_s*�o\)\|�t\_s*\%(��\_s*�W\_s*�A\_s*��\|��\_s*\%(�[\_s*\%(�Y\|�W\_s*��\_s*�O\)\|�C\_s*�W\_s*��\_s*�O\)\|�^\_s*��\_s*�C\_s*��\|�H\_s*\%([�[���m�g]\|�{\_s*�X\|�r\_s*�A\|�X\_s*�t\_s*�@\_s*�[\|�j\_s*�[\)\|�@\_s*\%(�C\|��\_s*�I\|�[\_s*\%([�W�}]\|�~\_s*��\_s*�O\)\|��\_s*\%(�g\_s*��\|�^\_s*�Y\_s*[���}]\)\|��\_s*[�c�X]\|��\_s*�m\_s*�v\_s*�V\_s*�X\)\|�B\_s*\%([����]\|�W\_s*\%(�b\_s*�N\_s*�X\|�J\_s*��\)\|�[\_s*�r\_s*�[\|�b\_s*�V\_s*��\_s*�O\|��\_s*��\_s*��\|��\_s*�f\_s*��\_s*�t\_s*�B\_s*�A\|��\_s*\%([�X�[�A�p]\|�b\_s*[�v�p]\|�s\_s*\%(��\|�[\_s*�k\)\)\)\|�F\_s*\%(�[\_s*\%([�x�Y]\|�W\_s*��\_s*�O\)\|�C\_s*�Y\|��\_s*��\_s*��\|�j\_s*\%(��\|�b\_s*�N\_s*�X\|�L\_s*�A\|�[\_s*��\)\|�m\_s*\%(�L\_s*�V\|�[\_s*��\)\)\)\|�q\_s*��\|��\_s*��\|�^\_s*��\_s*�p\_s*�N\_s*��\|��\_s*��\|��\_s*��\_s*��\|�i\_s*�s\|�Z\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*��\|��\_s*�`\|�^\_s*��\|�i\_s*��\|�J\_s*��\_s*�E\_s*��\|��\_s*��\_s*��\|�d\_s*��\_s*��\|��\_s*��\_s*�^\|�o\_s*�e\_s*��\_s*��\|�\\_s*��\_s*�t\_s*��\|�_\_s*��\|��\_s*��\_s*[���a]\|��\_s*��\|p\_s*\%(T\_s*e\_s*X\|H\_s*��\_s*�[\_s*�^\|e\_s*\%(t\_s*a\|r\_s*l\_s*�X\_s*�N\_s*��\_s*�v\_s*�g\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\|��\_s*��\)',
+      \ 'Q' : '\%([�z���z�M���K���ɞ��՟J��㖍򍥛������I������H���E�d�������b�z�o������x�A�ܗ����ϕ��D�C�B��ӊǏ��~�����������B䱌s���Z���Yᯙ������Ӟ�ᮉ��O�M�֌N���v���ڊ�L�������K�@����{���^���Z�򏾓��^�������č��A㦖�鶔�r�ňʈ��U�Ñq�𔯞��������C�~���V�W�R�U�S�X�T�܉_�w�o�^�������鿌~�G�F䇚����`�p�̃��L���Y�������۞����I���f�Ȋs��ގԚ��P�M�����E�u�����[�{���O�֞������o�Ӂ@�󞔐����ȓS�c��������������v������m�������Č���痈�S�q�ᙊ�H�M�῍C����​�晠�J���{��v�v�͘ҋ����X�ތɜ���g�ˍg�H��ܜ����|�E�{�윁�؋�����p�h�e�f�g��P�H�N��Q]\|�\_s*�\|�b\_s*�N\|��\_s*��\|��\_s*��\|�\_s*�\|�~\_s*��\|�\_s*��\|��\_s*�S\|�S\_s*[�Z��]\|��\_s*��\_s*�x\|��\_s*��\|��\_s*�h\|��\_s*��\|9\_s*��\|�^\_s*�{\|��\_s*��\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�V\_s*�l\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*[�{��]\|�C\_s*��\|��\_s*��\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([�ƕ����E������]\|�o\_s*��\)\|��\_s*��\|��\_s*�C\_s*�a\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�R\_s*��\_s*�q\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*�s\_s*�N\_s*��\|�`\_s*��\_s*��\_s*��\_s*��\_s*�}\|�w\_s*�x\|�R\_s*\%(�[\_s*��\_s*��\|��\_s*�e\_s*�B\_s*�t\_s*�@\_s*�C\_s*�A\)\|��\_s*��\_s*��\|�J\_s*\%(�U\_s*��\|�^\_s*�[\_s*��\|�X\_s*�o\|�[\_s*�k\_s*�[\_s*��\|�i\_s*�[\_s*�g\|�_\_s*�t\_s*�B\|��\_s*�e\|�h\_s*��\_s*�[\_s*[����]\|��\_s*\%(�`\_s*[�F�G]\|�e\_s*\%(�B\_s*�G\|�b\_s*�g\)\)\|��\_s*�^\_s*[���X��]\)\|��\_s*��\|�L\_s*\%(�g\|�u\_s*��\|�z\_s*�[\_s*�e\|�n\_s*�[\_s*�_\|��\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\|�[\_s*��\|�m\_s*��\|�b\_s*�V\_s*��\|��\_s*\%(�[\|�G\_s*��\)\)\)',
+      \ 'R' : '\%([ۘӛěŚ̉h�_�R���{��]�Ә[�\���U�^�M�P�R���䛉�������R�˙C�C�l�u��d����N譞L�c屑�����O�c�YᑘL�S�Q�XᔘW�O�U�ĘT�R�N��m�I�E����@醕����b�b�d�L�F�i��B�e࢘G鐂�ڟ��Y�x�U೙�������e�v�����Y�ׁZ�a����t����X�F�䫗����ᖗ����w�������̟K��魟M�l�I瀗��Q�����w�����Y�q������r���Q���ݗ����@���B���������A��٘H���〟����pᐗ�㾗ۗݗ��~���Z�����K蛂��ಝ��_����×����ɌI�����ʘZ�C���P䞛��g�X����Y������V�Ê}�֗����������������������X�a��ᅞ��������W��H��P�˗����Ԝ���d�h�g�ҙz�ؗϙ�חїӗ��W�򗵞��O���C�����͗���������������q�]�x�@�y饖����×�A�_�`�����p�����֝����H�×�㇗ߗ��Ɨȗ���ɗ��������������ʗ̗����Śi����胗����ߗ��؜������ۗ����\�鋗���������A�������i��仂�טJ���ə���V�����Y�O�㜛n���p�g���B�R�S�����E���T�A��ࣗ��a����茗�����������E�h���඗��p�����y�����q��㡟I�����Q�۝��S��ᚘ����痋�������f������f逓���t��E���D�w�@�C�A�U�t�x���X�z�v�H�{�N�G���^���S�T�R�r���_�F�`�[�L�B�q�V�M�}�W�����~�I���p�I�u���E�]�K�P�Z���������D�Y�s�|�����\���O�y�����J�ց㍪�����X�q���������Q�τ���R]\|�\_s*[�����]\|�b\_s*[����������]\|��\_s*[������]\|��\_s*��\|��\_s*[�L��]\|�h\_s*[�E�ߎ�]\|��\_s*��\_s*��\|6\_s*[����]\|�E\_s*�G\|��\_s*��\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|�|\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*�P\_s*�[\_s*�u\_s*��\)\|�C\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*�W\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�s\_s*��\_s*�w\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�k\_s*��\_s*\%(��\_s*��\|�w\_s*�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\|�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|��\_s*��\|�K\_s*��\|�g\_s*��\|r\_s*u\_s*b\_s*y\_s*�X\_s*�N\_s*��\_s*�v\_s*�g\|�v\_s*��\|��\_s*��\|��\_s*�A\|��\_s*[�M��]\|��\_s*��\|��\_s*��\_s*��\|�Q\_s*\%(�l\_s*��\_s*��\|��\_s*�^\)\|�@\_s*�\\_s*��\_s*��\_s*�P\_s*��\|��\_s*�A\_s*�I\|�F\_s*��\|��\_s*�K\_s*�\\_s*��\|�A\_s*�[\_s*��\)',
+      \ 'S' : '\%([��������}�[��T���y���}����Q��^�����������ēi�������h��掞��y�{�G�O�ʗ��c�������������������U���t�wⶊ���Q锑뙩�s�u����क़���x�ƔK�������}柛”a╛^���ԛ���y���ꑅ�������z������|�S�������\䇛q���~�H�x�����y�ܑ�䵑q���������B�J�t�v�������Ƒ��N����ⵑ������r���|��s�w���p�n�m���y���n�\�F絖��u�L�M�����������X������g�e�d��בb��f�e���􈷑Y�S�a���[�i���s�ƈ�ꋟ��^�h���j꒑`�c�l��z�N������N�Z��驉k���ŋ��Q�L�����G�i�L����ↁ��ސِېڐߞ����C���G����@������S�����ዙ����[�T���אɐ͊֐ȐǞ���N����������d�Ϟ��囡�p�ә�㙟�㚘j���A䦈��_���t�b�A���A���b�����x�������a�H�����ܟ������C���J����I⤑G�S���L⒑W�s�r葁�������D�J���A�L��񙒐�枙@�ې�M���H�����l�F�K���D�B�@�G��h�ǝ��N���������d�D����������R��Ŗ��|�˝�������������v��⫝�呝y�H���������Ր��������}�����U�ҙ����[����������ߝ�p�S爊��c���a���o�p���I�D�c���E�R�����䊔��T�����ωs��ꈝ��ؐ����C����S��h�ᓩ�����]�T�\�����~���y�u�̖����������齗V�������Œ��������s����v�ǐ����E�p�z����~�d�Ǜ���俑��Y�p�n���z�y��羝���裐�䍐������␕���ځ���ȁ����ˁ�΁݁��}�������ʁށ~�́��܁၆���Ɂ������袜����ၐ��v��ℐ��x���N�ː��X���a�V���䐆����H�������������z���`�������X���ʐ������]�䐟�֋󓧖����L�������i�������z�����Z�D�������B�A������P������D���Y�����`�������L���Z����连x�Z���x����w��圑����ȓ������G���F�a�Ǝb��乗��M�E�����s�C�F�������Z�n���D�㈵㦃Ƌs�����]�Ŗl⚑^������潔A���g���Ζ�儞������ɖΏd�ݜ�臐w�p��玬�d����쎹���g��[��諎��^���G�������N���H���˒��Ύ��m����������������\�ސːK�Ž��������K���������t�o���q�������ϔ����͚��͎��b���P��᪎������j�A�ϐ֙��̎ݐ���┐��^�ܐΎގڎ؎����Y�ώΎɎԎߎЈޝ��ȕi�S�C�G����ဎ�偊��f�z���t�W�V��������题���㌎瑲�����f��������E����i�g�l�k�{�������蜕婙��o���J�蕘�Ꟛ�k���V���h��娔��h�K�q�����F榚S�Q�F�T��酝����n���������S�X�K�U��ڏM�G�j���E�a�N�����O�P�D�C�A�L�R�T�I���B�@���M᭜�����貚я�忏w�{�v�x�s�⡏t�u�r�f�ݚp���u���V�y���J�U�����Z���]����j�P�曚A���՜�����f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�h�N�f�d��C�k���X�L�������T�Q�W�g�i�R�[�M�e�b�I�_�S���Ώ��n�Z��勋o����|�׊��_�䓏��w�����b��򏎏��������v�ߓɚ��[�m�����יА��О_�c�R���u����B��䐠�Ϟ�Ɛ����L�����Ҝћ�辛����頔����׏����[����M���B����䀙����n������␏�୚���K♏����яҁ������u���i�Ϗ]疏ցi�j�Ӑ��Ԛ������Ϗ����U���J���n�ސ��Ŝ܏��ߏ�������ُ������G��������ଏ������ޑ��ď��������������͏Ǐ����ɏ����������Џ����ۏ�暐����̏ďΏƏ������͏ڏ؏��ɏ��ȏ����p���l���T���e����g�ߐ@�R�C�ܑ��F�������D�I����冐B�������A�H�E�u�o���w�ʕE��e�y�򚬞��@�џ��|������X������ꏎ��ю}�ؗ�⿎l�_�o�Ŏ������������s�t�ћ�����L�y�p�i�k�䍟��������ߊ`�`�o�o���r�{�z�j����`�V���@���@���i�y���掂�I�ِy�n�����X���n�B�g�~���v��s�Ў����o���������N������᎒���Z���u���i�U���抎����f���]���K�j���q�{��������J�{��r���˙�׎�藂���ۚ~��礉J���L��f�V�W�l���ȕ̐���������䰐��T����ᰗ����l�I�J���M����h���E�U�嶎��\�z�G���ԑu���V���\���V���֔f���X�M�ˍ��Ǐ�x���š�����皔��m��匈��^�꛽��O��@�՛��N�����\�󎘊j�����ۗ��B睋ʼnb���q�@�d�N�m�P���b���q�嗝�W�����Ɣ��f��ⲝH���F�H�B�r���{�吷ᵞv�W�t�u�ĉh�|�招�E��䋫�🛋t����剎�����럈��E�`�f��������s�œ������|�̝��a�c���H�K�c�ߙӎ[�ǎW�Xㄐ��V���������Ҏ\�r�]�Z�P�R������3�Q�^O�U�S�R�Y�_�A�T�C�D�搔�@�F���D�\���q���G��ӍƎE�Ǜ������ː؟����N��Z�����r���Ԝ��������淍K�ȍ���͙Pꎍ��`�B�ڛv�ɍ��V�ҍۍЍю��΍؍Ӎ̐č֍ՍȍÍˍ��ҍٍ΍ō鑨焞o�r������⧍�e���y���|�s�����k����w�����N�����񍻓ዎ�ˋ��Îюh�����n����������������r��������䳍�~�⑁�����ʛˍ��l���O�R�ğ��A�L�����璍�o�m������򉺍�������⍽�}���������S�_�s�K��������^�d�w�����@�����Y�������Y�ご�򄋄Z�Y���������������Á������W�n�ŽO���y�ʁ��������`��e�f�����W�_�T�������Z�T�r�V�\�X�b�Ѓ��R��S]\|�\_s*[�����]\|�b\_s*[�\�Z�X�V�T]\|��\_s*[����������]\|�\_s*��\|�\\_s*\%(�H\|�I\_s*��\)\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�g\|��\_s*��\|�v\_s*[�X�v]\|��\_s*�n\|�\_s*��\|��\_s*�c\|��\_s*��\|�B\_s*[�B�X]\|��\_s*�C\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[�U��]\|�C\_s*��\|�\_s*��\|�}\_s*��\|�T\_s*��\|�G\_s*�Y\|�f\_s*��\|�V\_s*[�c��]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*�\|�\_s*��\|�b\_s*\%(�^\|��\_s*��\)\|�V\_s*��\|�]\_s*��\|��\_s*��\|�s\_s*[�m�E]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*�_\|��\_s*��\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|��\_s*[�J��]\|�]\_s*[�]�X]\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�֌��ڎu]\|��\_s*��\)\|�V\_s*��\|7\_s*��\|�S\_s*[����]\|4\_s*��\|�R\_s*�{\|�h\_s*�t\|��\_s*�u\|��\_s*��\|�A\_s*[�o��]\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|��\_s*��\|�c\_s*�e\|��\_s*��\|��\_s*\%(�_\|�C\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*[�Η�]\|�\_s*�\|�\_s*��\|��\_s*��\|�e\_s*��\_s*��\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*�X\|�^\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*�K\|�|\_s*[�“���]\|��\_s*�p\_s*��\|�G\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[�N��]\|�X\_s*[�N��]\)\|�h\_s*�l\|�S\_s*��\_s*�g\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�e\|��\_s*��\|��\_s*\%(�@\|��\_s*��\_s*��\)\|��\_s*��\|�G\_s*��\|�\_s*�q\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|��\_s*[�T��]\|B\_s*\%(r\|�V\_s*�F\_s*��\)\|�g\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|�u\_s*��\|�A\_s*��\_s*�`\_s*��\_s*��\|�\\_s*��\_s*��\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|��\_s*\%(�V\|�s\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|�P\_s*�C\_s*�f\|�]\_s*�f\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�w\_s*��\|�l\_s*�b\_s*�g\_s*�T\_s*�[\_s*�r\_s*�X\|�U\_s*\%(�b\_s*�N\|�N\_s*�Z\_s*��\|�r\_s*�[\_s*�l\|�E\_s*�o\_s*�[\|��\_s*�[\_s*�N\_s*��\_s*�E\_s*�g\|��\_s*�U\|��\_s*�c\|�C\_s*\%([����]\|��\_s*�[\|�f\_s*��\)\|�[\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\|�[\_s*�~\|�i\_s*�g\_s*��\_s*�E\_s*��\|�]\_s*\%(��\|��\_s*�f\|�[\_s*\%(��\|��\_s*��\_s*�Q\_s*��\)\|�t\_s*�B\_s*�[\)\|�W\_s*\%(��\|�[\_s*\%([�O�N]\|��\_s*��\_s*[�Y�X]\)\|�O\_s*��\_s*��\_s*�g\|��\_s*\%(��\_s*��\|�O\_s*�V\_s*��\_s*�s\_s*�[\_s*��\|�e\_s*�[\_s*�[\)\)\|��\_s*��\|�G\_s*�X\)',
+      \ 'T' : '\%([Ĝ������R��牉ș��h���Ќ���☝��ω����i���מR���h�����|�������������������c�툪�H���֓�騗���֋�㜐C䃕����۔y榏Q�����F�b����r�\����c�����͙��ʓד՘��J�����c������ٓؓڐ����J�x��ɍΖ����r���q�N�P�דь{�ԍǘ؝���沖L��௜{�ී��“��Γ������C�j�ߙ������㛟D椟X�b��ى��⅝T�w�F��~��㫛䞨�����[�����������џ����ẓ��}��衞Δ󓎌B���U�ÓĉD��������ڎ�獙W�M��������ꊐ��z�c�����b�u�����ٓ��幓������������������鉓�������~��鍓����������򓀓��������������˓e�{�O�x�~�茤�y�Z��䷞��n�Z�^��u�̔�m�q�ė��y�}�o�l�r�o�p�V�Ĕ�������Ï\�p�v���j�n���掷�n�ϙ\�E�i�t�������N�O�g�\�l���h�ꚤ����r�l�W�P�Ȏ��o�d�͙��W���難��ÓR��瘉��L����N�J�U��猓H�њ��V�z�A�U�V���ځC�����h����A���z�D�d�D�F�x�[���^�៓U�z���a�Z�L�W⽓Y�Q�I�N�G�P���O�c�S��������Y�ꚉ���ٞq�|�Ǟ��h�����t�L��礓B�������@���������稒�����ఒ���A���e����V�Ƃ�•��͕��皁�I���������T�P�햱�׏g�w�ΐى����W��h�іʉt�`�I�␎���a���S�ڎB�ڐR����ȕ�p�A�n䆉������I�~����焍ߑ����z�c�����摂���u���񗾎i�����d�͌��g����Q�ǒٚ�؍j�q��塔|�ȕ�ȓ`�B�\�����Չ���㔖�ꉌۑ����ԔԒ̒��v����׏I�Đ��ȒŒnj��雅�ə����ݙ����������֒ߘ��s�r�s�n���U�T�ӑn�쑢���L���U�����Ό���C���U�֋ސT���Ĝ����ɞ��Ս��y����㋒Ý��p�k�x�ːϔ��Ћl�s�ʜߐZ��ᶝ��A�A�ڕt����h�Պ�J��������Y�_���������Z�o�T���S���N���Ē�����������Z�N��༒������m�֖����’������ޒ}�z���k���e玐��ŗ͓�ߝQ��E��������k��浔��I��O���՞`����������蠙��Ò��e�P��������障K������������U�����U�ݓC������o�L�L���j�l�������y��鬒��k踒𒜒��{�⒳���\�_���񒝓����[�������������d�������������}�����ޒ�������������渒����������x���Q�h�I峜��J����a�C�ԁ��n�N���f���R�h�t���������p�m�o�n�~�n���@�������������ؒ������T�w����鳚��v�ꃒr�l���h���Ր��ƌ����s�U�n�t筒m���p�u�o�k�v�q�x����ᗒy����J�}���֓}�Ԑu���g�q�K���f�e�ޞ���˒M�o�R�Г��Lᷖ�靌�ٜ������y�g栌����˘����l�|�]��漒K�]�̎^���D���M骝D�l�퓬�e�Ȓ@�g�i�h����Y�k�X�S��ݛ̝E�Y�U�ԕۏ��X�I���H�����a��蒒F�C���}�{�����C��J���F�מ��l��S�s韞����퓃��������ࣕY�ۈɗ��吥�������ҋ��k�B���z�n�Ҋm����������ԚK�t���p���ЋB�����ŗY����k���˜[�]����썰�͗����K�’e���ʖd休��s�b��饕����|�c�G����B�ٍ��k���e�d��뛹��k残ċ��b�C�W�F�V�O�������h�x�^���В|⹑������t�M����F������������W�̝^�t�T���H�`�����ؒ]��K���ßp�[���ϟ~���֒h�����j�̜ݝ��d���W�������`�^W�UႚV�J�Rἔ�C�Q�V�a�_�\杒O�S�X�W�Y�b�d�Z�T�ÒP�A���f�����V�]�p�F�ѝF�U����鮒{�������I����痑��~�x�����擑���[讖w���ʑ��H�֟�铉O���\���l���ߑړ����ܒ��Б⛔�E�ܑՑ����ԑۑґؑ��ݑ���ّё̑ޑב�Α���А���茌o�����������]�S�B�HᢞS�O�l�N�����ϑ����֋N睒����������š����f�u���P���B��c���ّ��_��̌����������W�`�V���~�^�Γy���f�s������E������\��؃X�W�����ƃU���c�N�]�����������g�`�c�E���[�^�s�����������������������������ф��������S���eT]\|�\_s*[�����]\|�b\_s*[�g�e�c�`�^]\|��\_s*[�ƂÂ���]\|�\_s*��\|��\_s*�n\_s*��\|��\_s*[���]\|�\_s*�\|��\_s*�l\|��\_s*��\|��\_s*�V\|��\_s*��\|�i\_s*[���v]\|��\_s*�P\|�h\_s*��\|��\_s*��\|�D\_s*��\_s*��\|��\_s*[����]\|��\_s*[�q��]\|�W\_s*��\|��\_s*��\_s*�E\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�x\|�G\_s*[�ߓ��h]\|��\_s*[����]\|�F\_s*�N\_s*��\|�i\_s*[�v�q]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|��\_s*��\|��\_s*�j\|��\_s*�j\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*��\|��\_s*��\|�g\_s*��\|�Z\_s*��\|�Q\_s*�~\_s*�S\|��\_s*�j\|��\_s*\%(��\|��\_s*�q\)\|�S\_s*[���Z]\|��\_s*\%(��\|��\_s*�a\)\|�X\_s*��\|��\_s*�X\|�\_s*�J\|��\_s*�~\|�~\_s*�J\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|�P\_s*\%(��\|�O\_s*��\)\|��\_s*��\|1\_s*\%(��\|0\_s*��\)\|��\_s*�l\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(�v\|��\_s*�F\)\|�g\_s*��\|��\_s*��\|�`\_s*��\|��\_s*�w\|��\_s*\%(�V\_s*��\|��\_s*�F\)\|��\_s*\%([��]\|�[\_s*��\|��\_s*��\_s*�N\)\|��\_s*�v\|�r\_s*�q\|��\_s*�r\_s*�q\|��\_s*[�a��]\|��\_s*��\|��\_s*��\|�@\_s*��\_s*��\|�L\_s*�q\|�S\_s*��\|��\_s*��\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|�]\_s*�h\|�G\_s*��\|�u\_s*[�˔�]\|�k\_s*�J\|��\_s*�\|��\_s*�I\_s*�q\|��\_s*�a\|��\_s*�p\|��\_s*[����]\|�A\_s*��\|��\_s*[���]\|��\_s*��\_s*�\|��\_s*��\_s*�\\|��\_s*\%(�\\_s*��\|�A\_s*��\_s*[����]\)\|�t\_s*\%(��\|�{\_s*�V\)\|�h\_s*��\|�e\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*�s\|��\_s*\%(�[\|��\_s*�q\)\|��\_s*�v\|��\_s*��\|�P\_s*��\|��\_s*��\|��\_s*\%(��\|�\_s*��\)\|��\_s*��\|�E\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�s\_s*��\|��\_s*��\|�E\_s*�w\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|�\\_s*[���V]\|�w\_s*��\|�\_s*��\|�i\_s*�K\|��\_s*��\_s*�p\|��\_s*�B\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|�f\_s*�B\_s*�X\|�R\_s*��\_s*��\|�\_s*�l\|�\\_s*\%(�[\_s*[�g���v]\|��\_s*�[\)\|�w\_s*�[\_s*�O\|�[\_s*[�C�����A]\|�Z\_s*\%(�I\|��\_s*�}\|��\_s*\%(��\|�j\_s*�A\_s*�X\)\|��\_s*�s\_s*\%(�[\|�X\_s*�g\)\)\|�V\_s*\%(��\|�b\_s*�N\|�X\_s*��\|�A\_s*�^\_s*�[\|�\\_s*�[\_s*��\_s*�X\|�I\_s*�h\_s*�A\|�[\_s*[�t�^]\)\|�T\_s*\%([�C��]\|�~\_s*��\_s*�O\|�E\_s*�U\_s*��\_s*�h\|��\_s*�u\_s*��\_s*�b\_s*�h\|�[\_s*\%([�h��]\|�e\_s*�B\|�X\_s*�g\_s*��\|�Y\_s*�f\_s*[�C�B�[]\|�}\_s*��\)\|�b\_s*�`\_s*��\_s*�[\|��\_s*\%(�N\|�_\_s*�[\|�L\_s*��\_s*�[\)\|��\_s*�h\_s*�}\_s*�C\_s*�h\)\|�|\_s*��\_s*�y\_s*�v\_s*�`\_s*�h\|�O\_s*\%(�a\_s*�y\|�A\_s*��\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*��\_s*��\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|�p\_s*��\|�d\_s*\%([���b]\|�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\)',
+      \ 'U' : '\%([��y����h�����Ȍl�e�[�f���񓴑a�؈��ϑ����鎽�[�X���D�W�r䷙\��w���u���ќ����z�D鴑��ߚX�����i�^�ښ��R�従��L�M�f��~�ӑ�r戏���楓]���搗w�S�^�̗��É��򃑂��k�։\�u�����L�G�Q�m���P�O��⣐H���Q�m�����I��V�ߊ��a�������X�S�n�|�U����o�J���y�팻���f�ʈژ��ⓐx���ԋ����ʏ���ݓ��A�ω��]りC���]�D��^�@����T�A��������m����S���Y�v�_�������Z�r����N�������T�T���ݗ��Ɠ����a�H���Z���������J�L�Q�n�������L�I���̝j�󌂟����J䥎˔^���o�pᱝ�ꚉE�ӏ��K���юY�𓢙Ǔe�A�Z�F�����G���N�����t���E���҄TU]\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|��\_s*�y\_s*[����]\|�y\_s*��\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�`\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|�C\_s*�M\_s*��\_s*�X\|�I\_s*�}\_s*��\|��\_s*��\_s*�s\_s*�\\|��\_s*\%(�p\_s*��\|�L\_s*��\)\|�A\_s*\%([�X��]\|�O\_s*��\_s*�[\|�[\_s*\%(�V\_s*��\_s*��\|�W\_s*�F\_s*��\_s*�g\|�o\_s*��\)\|��\_s*�e\_s*�B\_s*��\_s*�b\_s*�g\|�|\_s*��\|�b\_s*\%(�v\|�p\_s*�[\|�V\_s*��\_s*�[\)\)\|�P\_s*\%(��\|��\_s*��\)\|��\_s*\%([�^�j�[]\|�g\_s*\%(��\_s*��\|��\_s*�q\_s*�g\)\|��\_s*\%(�A\|�V\_s*�[\_s*�Y\)\|�v\_s*�V\_s*��\_s*��\|�l\_s*�X\_s*�R\|�i\_s*\%(�J\_s*�C\_s*�g\|�C\_s*�e\_s*�b\_s*�h\)\|�r\_s*�L\_s*\%(�^\_s*�X\|�m\_s*��\)\)\)',
+      \ 'V' : '\%([�F���l�u�۔ńr���B�Ƀ�V]\|�\_s*�\_s*�\|�b\_s*��\|��\_s*��\|�\_s*�\|��\_s*��\_s*�D\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|�`\_s*�F\_s*��\|��\_s*�^\| \_s*�r\_s*�N\_s*�g\_s*�[\_s*��\|��\_s*�o\|��\_s*�z\|�j\_s*�X\|��\_s*��\|�P\_s*�^\|��\_s*\%(�f\_s*�B\_s*��\|�M\_s*�i\|�j\_s*�X\|�Z\_s*��\_s*��\|�N\_s*�`\_s*��\|��\_s*�L\_s*��\_s*�[\_s*��\|��\_s*��\_s*�[\|�[\_s*�j\_s*��\)\|��\_s*�b\|�{\_s*\%(�X\_s*�g\_s*�[\_s*�N\|��\_s*�S\_s*��\|��\_s*\%([�K�{�g�^]\|�e\_s*\%(�b\_s*�N\_s*�X\|�[\_s*[�W��]\)\)\|��\_s*��\_s*�[\_s*��\|��\_s*��\_s*\%(�`\|�e\_s*�B\_s*�A\|�^\_s*��\_s*�[\)\|��\_s*�[\|�R\_s*�[\_s*�_\|�[\_s*\%([���g�O]\|��\_s*�g\|�h\_s*�r\_s*\%(��\|��\_s*�A\_s*��\)\|�p\_s*��\|�_\_s*�t\_s*�H\_s*��\|�J\_s*\%(��\|��\_s*�X\_s*�g\)\)\|�L\_s*��\_s*�u\_s*��\_s*��\|�C\_s*\%([�h�X]\|�W\_s*��\_s*�[\|�V\_s*��\_s*�O\)\)\|�w\_s*�b\_s*�g\|��\_s*��\_s*��\|��\_s*��\|�t\_s*\%(�@\_s*\%(��\|�h\_s*�[\_s*�c\)\|�H\_s*\%(��\|��\_s*\%(�N\|�J\_s*�[\)\)\|�F\_s*��\_s*��\_s*�[\_s*��\)\|�E\_s*\%(��\_s*\%(�f\_s*�B\_s*�~\_s*�[\_s*��\|�W\_s*\%(�[\_s*�~\_s*��\|�~\_s*�[\_s*��\|�I\_s*�X\_s*�g\_s*\%(�N\|�b\_s*�N\)\)\)\|�B\_s*\%(��\_s*�i\|��\_s*�X\)\|�H\_s*�b\_s*�J\|�C\_s*\%(��\_s*�X\|��\_s*�i\_s*�[\)\|�F\_s*\%(��\_s*�M\_s*��\_s*�E\_s*�X\|�k\_s*�X\)\)\|�r\_s*\%([�A���u�o�X�U]\|�K\_s*�[\|�n\_s*�[\_s*��\|�^\_s*�~\_s*��\|��\_s*\%(�b\_s*�W\|��\_s*�C\)\|�r\_s*\%(�A\_s*��\|�b\_s*�h\)\|�b\_s*\%(�N\|�L\_s*�[\)\|�Z\_s*��\_s*�e\|�N\_s*\%(�^\_s*�[\|�g\_s*\%(��\|��\_s*[�[�A]\)\)\|�V\_s*\%(��\_s*�X\|�\\_s*��\_s*�[\_s*�Y\)\|��\_s*\%([�`�X]\|�\\_s*��\|�e\_s*�[\_s*�W\|�Z\_s*��\_s*�g\)\|�l\_s*\%(�K\_s*�[\|�O\_s*��\_s*�b\_s*�g\)\|�j\_s*\%([�[��]\|��\_s*�f\_s*��\)\|��\_s*�[\|�G\_s*��\_s*�`\_s*��\_s*��\|�W\_s*\%(��\|�b\_s*�g\|�^\_s*�[\|��\_s*\%(��\|�i\_s*��\_s*�[\)\|��\_s*�A\_s*\%(��\|��\_s*�C\_s*\%(�Y\|�[\_s*�[\_s*�V\_s*��\_s*��\)\)\)\|�_\_s*��\|�f\_s*�I\|��\_s*\%(�S\|�k\_s*�[\_s*�u\)\|�I\_s*��\|��\_s*�W\_s*�A\_s*��\|�B\_s*�[\_s*�i\_s*�X\|�[\_s*\%(�{\|��\_s*�X\|�N\_s*��\|�i\_s*�X\)\)\|�x\_s*\%([�K����]\|�g\_s*�i\_s*��\|�C\_s*�_\_s*�[\|�[\_s*\%(��\|�_\_s*�[\)\|�e\_s*��\_s*��\|�b\_s*�Z\_s*��\|�X\_s*\%([�g�^�p]\|�r\_s*�I\)\|�N\_s*\%(�^\|�g\_s*��\)\|�W\_s*�^\_s*\%(�u\_s*��\|��\_s*�A\_s*��\)\|��\_s*\%([�B�[]\|�t\_s*�@\_s*�C\|�T\_s*�C\_s*��\)\|��\_s*\%(�i\|�V\_s*�e\_s*�B\|�[\_s*�i\|�j\_s*[�J�N]\)\|��\_s*\%(�f\|�x\_s*�b\_s*�g\|�_\_s*��\|��\_s*�[\_s*�k\|�T\_s*\%(�[\_s*�`\|�C\_s*��\)\|��\_s*�b\_s*�g\)\|�m\_s*��\|�j\_s*[�X���A]\|�l\_s*\%(�V\_s*��\_s*��\|�`\_s*�A\|�c\_s*�B\_s*�A\|�Y\_s*�G\_s*��\)\)\|�u\_s*\%(�C\|��\_s*\%(�h\|�b\_s*�h\)\|�[\_s*�h\_s*�D\_s*�[\)\|�o\_s*\%([����]\|�C\_s*\%([�A�u���I]\|�p\_s*�[\|�^\_s*\%(��\|��\_s*�e\_s*�B\)\|�L\_s*��\_s*�O\|�U\_s*�[\|�V\_s*��\)\|�b\_s*�g\|�`\_s*�J\_s*��\|�M\_s*�i\|�K\_s*�{\_s*��\_s*�h\|��\_s*\%(�i\_s*�V\|�G\_s*�e\_s*�B\)\|�T\_s*��\|�X\_s*\%(�R\|�P\_s*�X\)\|�J\_s*��\_s*�X\|�P\_s*�[\_s*�V\_s*��\_s*��\|�L\_s*��\_s*�[\_s*��\|�E\_s*�`\_s*��\_s*�[\|��\_s*\%(��\|�G\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�[\|�A\_s*\%(�u\_s*��\|��\_s*�g\)\|�b\_s*�h\|�f\_s*�[\_s*�V\_s*��\_s*��\)\|�k\_s*�A\_s*�c\|�j\_s*\%(��\|�[\_s*��\)\|��\_s*\%([���[]\|��\_s*��\|��\_s*�[\|��\_s*\%(�V\_s*�A\|�`\_s*�m\|�^\_s*�C\_s*��\)\)\|�[\_s*\%([�S�O]\|�`\_s*��\_s*��\|��\_s*�g\_s*�D\_s*�[\_s*�h\|�o\_s*��\|�{\_s*�X\|�x\_s*�i\|�e\_s*�B\_s*�J\_s*��\|�T\_s*�X\|�W\_s*\%(��\|�j\_s*�A\|��\_s*��\)\|�m\_s*��\|�j\_s*�A\|��\_s*��\_s*�g\|�~\_s*\%(��\_s*�I\_s*��\|�L\_s*��\_s*��\_s*�C\_s*�g\)\)\|�i\_s*\%(�L\_s*��\_s*��\_s*�[\|�W\_s*�E\_s*��\)\)\)',
+      \ 'W' : '\%([��������������Y���ɔ��j��y����h�����ȃ��Ҍl�e�[�f���񓴑a�؈������鎽�[�X���D�W䷙\��w���u�ќ����z�D鴑��ߚX�����i�^�ښ��R�従��L�M�f��~�ӑ�r戏���楓]���搗w�S�^�̗��É��򃑂�k�։\�u�����L�G�Q�m���P�O��⣐H���Q�m�����I��V�ߊ��a�������X�S�n�|�U����o�J���y�팻���f�ʈژ��ⓐx���ԋ����ʏ���ݓ��A�ω]゜��]�D��^�@����T�A��������m����U�S���Y�v���������Z�r����N�������T�T���ݗ��Ɠ����a���Z���������J�L�Q�n�������L�I���̝j�󌂟����J䥎˔^���o�pᱝ�ꚉE�ӏ��K���юY�𓢙Ǔe�A�Z�F�����G��������܉����c���㩟|㘔��͊��ϊ�p��ԉЍЋƋZ�����ǜ������k�Y���e�o���n���m�܏Νt������s�f��氖����^�]�o�_�r�q�p���c�˜i���q��ǘj�n�Ȏ��G�F�d�̘e���Θc�Q�C崙N������Z�����ʒt�ሽ�g�f�h���l�֘a�O�N���c�b�̔f��j���Z���`�•��i�H�핝���Ȕg�v�E��W]\|�\_s*[�������]\|�b\_s*[�����E����]\|��\_s*[������]\|��\_s*��\_s*�~\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|��\_s*�y\_s*[����]\|�y\_s*��\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|��\_s*��\|�o\_s*�D\|��\_s*�Y\_s*��\|��\_s*��\|�i\_s*��\_s*�j\|(\_s*��\_s*)\|��\_s*[����]\|�R\_s*��\|�Y\_s*�z\|�x\_s*��\|�x\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|Y\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�R��]\|��\_s*��\|�a\_s*�t\|��\_s*��\_s*��\_s*�D\_s*�\|��\_s*\%(�`\|��\_s*�m\_s*��\_s*��\)\|�^\_s*�B\_s*��\_s*�D\|��\_s*\%(��\_s*��\_s*��\_s*�E\_s*��\_s*��\|��\_s*��\_s*��\_s*�E\_s*��\_s*��\)\|�u\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|��\_s*��\_s*�O\|��\_s*\%(��\|�C\_s*�X\|�b\_s*�J\_s*�[\|�X\_s*\%(��\_s*�[\|��\_s*��\_s*�O\)\)\|��\_s*\%(�[\_s*�X\|��\_s*�N\_s*��\|�X\_s*�g\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(�b\_s*\%([�v�p]\|�s\_s*��\_s*�O\)\|�C\_s*\%([�^�g]\|�e\_s*�B\_s*��\_s*�O\)\)\|�{\_s*��\_s*�t\|�t\_s*\%([���[]\|�@\_s*�C\_s*��\|�B\_s*\%(�[\_s*�g\|�b\_s*�`\)\)\|�z\_s*\%(�G\_s*[�[�C�A]\|�[\_s*��\|�C\_s*\%(�[\_s*\%(��\|��\_s*�[\)\|�b\_s*\%(�v\|�X\_s*��\|�p\_s*�[\|�g\_s*\%(�j\_s*�[\|�}\_s*��\)\)\)\|��\_s*\%(�C\|�b\_s*[�g�c]\)\)\|�x\_s*��\_s*�i\_s*�[\|w\_s*e\_s*b\_s*�T\_s*\%(�C\_s*�g\|�[\_s*\%(�o\|�r\_s*�X\)\)\|�x\_s*��\|�o\_s*��\_s*�^\_s*�[\|��\_s*\%(��\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|�H\_s*��\_s*�t\|�B\_s*\%([�[��]\|��\_s*\%(��\|�w\_s*��\_s*��\)\)\|�F\_s*\%(��\_s*�_\_s*�[\_s*�X\|��\_s*�i\_s*�[\|�[\_s*�o\_s*�[\|�C\_s*��\)\|�@\_s*\%(�C\_s*[���X]\|�[\_s*�O\_s*�i\_s*�[\|��\_s*�_\|��\_s*\%(�^\_s*�[\|�L\_s*��\_s*�[\_s*��\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|�_\_s*�u\_s*��\_s*��\_s*�[\|�^\_s*��\_s*�O\_s*�X\_s*�e\_s*��\)',
+      \ 'X' : '\%([��H����F����D����B����@���w�́~�V����X]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�V\_s*��\_s*\%(�t\_s*�H\_s*��\|�z\_s*��\)\|�W\_s*�I\_s*��\|�[\_s*\%(�r\_s*�E\_s*�X\|��\_s*\%(�b\_s*�N\_s*�X\|�O\_s*��\_s*�t\_s*�B\)\)\|�n\_s*�r\_s*�G\_s*��\|�U\_s*\%(��\|�r\_s*�G\_s*��\)\|�L\_s*\%(�V\_s*\%(��\|��\_s*��\|��\_s*�g\_s*�[\_s*��\)\|�Z\_s*�m\_s*��\|�T\_s*��\_s*\%(�`\_s*��\|�^\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|�N\_s*\%(�V\_s*�[\|��\_s*�X\_s*�|\_s*�X\_s*�g\|�Z\_s*\%(�i\_s*�L\_s*�X\|�m\_s*�t\_s*�H\_s*��\)\|�U\_s*��\_s*�B\_s*�G\|�T\_s*\%(�C\|��\_s*\%(�g\_s*�X\|�e\_s*�B\_s*�b\_s*�y\|�`\_s*�b\_s*�y\)\)\|��\_s*�X\_s*�}\_s*�X\)\|�G\_s*\%(�N\_s*�X\|�b\_s*�N\_s*�X\)\)',
+      \ 'Y' : '\%([։ߕ֍������H�V�ş�ꔗ���㊽�؊Z���ݝ����Z���g�|�~�}�����Ĕ���ϑ��b���b���щx�X�����\���c���c�i�U����F�g�`��m����ꡞ՛����@���T�f����x���J��u���ן��L��������y�s�~��@������籝X�yꢗq�s�i�^�w�g�s�j�f��g�t匍��r�o�����חl�d�n�p�їw�z�m�Ï��h�S�^�@焉��������^���r�`��椌P�a�o���\�˗_�]�ߔ\�S�l�P�l��a��P�Q�ĉr���I�K�b��������㒏����̎͒o�ɒ�����t沖L��u���V�K�ᛮ�|��w�䓎樏�଎�����������z�ڗW�F�Q������w��些��C�����ޗG�C���P�E�Z�X�O�N�S�З[�H�I�֗F�Y�J�L�����@ሑ��g�M祗h�|��懖����k�ߗV���O�J�R�`�g��埓����A䥐����䲃Ń�ꍘc�T�U���������n�������翔�䑌�����������恍ݍ��������r�x�������É��j囚|���d�Q�U�����|��Ɨ��������B�d���{���Nj�佈��䆍��m�n�ؐF���A�t����F������̌Ì��䉳�L���d�������ƜјJ���i��ꌒ��Փk�v����ɔžo�������֍����y�󙬌M���E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�����w�����N�~�}�z�c���c��硉Ɏ��h�����䕟J����s�W���]�b�K�\���T��ซ]�r䟈��Z�Л��T������m�����Ĉ��D�M�ß�I�����C��������m��覉@������B�u�A��A�܊���j�H���ڈ�Ί�ֈ�È�1�P���y���D���I��D�R�����۔шዏ���ܐ��R�Δ���đP�_�ʈމ‘��E�h�����e�˗v�֍s�}�وߓ����ƈݟ��D�ᒒ�K�֋��҉]�����~�˓��ڏ�����Η��͛H������B�܈횀�}���ɋU䏜S�Ή�������u�������Ј׈ۈӘߗǔ@�b�o�������؈�U�w����͉��]��ਖ��看�̈��g�؂�Ԅ`���t�c���b�ّ������q���ۈŔs���M���l����h�E�`�_�ʗ�S�Q���n����_�a–z�l���˗D���y������ي��V�o��������原K�Z꞉v�N��u������򎾛��k欎��ຏ��k�s�t�q�r�R�Г@�ݜD洗{�k��єJ���T���׈Ջx�N�ۈ����i��ዖ�熔W�����t�����❔����Ĕj���J��E�˕a�뉉�̖������\�����~�Ɲ���x�u�E�~�����������F�v�������������C�J���҄\�zY]\|�\_s*[�ղ�]\|�b\_s*[�����C��]\|��\_s*[��䂢��]\|�^\_s*��\_s*�b\|��\_s*��\_s*�b\|�I\_s*��\|��\_s*��\|�B\_s*��\|�I\_s*��\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|4\_s*\%([�“�����]\|��\_s*��\|��\_s*��\)\|��\_s*��\|�m\_s*�j\|��\_s*��\|��\_s*��\|�F\_s*��\|��\_s*��\|�j\_s*��\|��\_s*[�q��]\|�h\_s*�L\|�V\_s*��\|��\_s*[���j]\|�@\_s*��\|��\_s*[�q��]\|�i\_s*��\|�W\_s*��\|8\_s*��\|��\_s*��\|�t\_s*\%(��\|�^\_s*�[\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�S\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(�Y\|��\_s*��\)\|��\_s*�M\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*�[\_s*��\)\|�a\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�c\_s*�J\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�@\_s*��\|�h\_s*[�‘�]\|U\_s*\%(��\|�^\_s*�[\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�E\_s*[�c�R]\|�C\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�]\_s*[�햅�o�Z]\|��\_s*��\|��\_s*�q\|�_\_s*��\|��\_s*�r\_s*��\|��\_s*��\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*[����]\|�p\_s*\%([�꓍��]\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ȉ���]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|�s\_s*[�”@]\|��\_s*�{\|��\_s*��\_s*��\|��\_s*��\|��\_s*�L\_s*�n\|��\_s*��\|��\_s*[�c��]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|�V\_s*�\\|�`\_s*�G\|��\_s*�{\_s*��\_s*��\|��\_s*�a\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*�t\|��\_s*��\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�q\|��\_s*[���j]\|�G\_s*\%(�z\_s*�o\|�t\_s*�Q\_s*�j\_s*�[\|��\_s*��\_s*�@\_s*��\|�j\_s*�Z\_s*�C\|�[\_s*��\)\|��\_s*�C\)',
+      \ 'Z' : '\%([�󉀉��ꑹ����㔑����������������������ґm���h�X���f�ّ��������ۑ����\�����]���Y��萊��A�K��㿑R�U�W��N��征͑V陑T�P�Q�f�O�S�⚃������ҐƐōU���ӂ��ž����l�b齕������A�Z�B钎���@笐������~�t�������ߒÐ|���}�C���D�����󓈓����Ȟ펱���Ǝ��w�x����c��H��苍��׎��l����䝎�ڐ����㒼�Ó�����K�������b�����H�ז��iᶘ���u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l���䥞`���œ���ҏ��t����J�珊�R�������P���������t�i���g��������Y�U���{�����ㅐ���媚ߘ����j�h�Ř�竐��ҝm���Y�o�@�ݖ�����Ï��ꏗ�����`���~��]����꞊��󝵏������������������휵�h�G�ڜ����G��Q榏A�@���u�Q���h�x�m��n���p�q⢓ď��m�Ï|�m�����՟��~�[���x��{䤏��z���������y�}������汛}����������杆�n�G໒��^�E���☸�s�F��_�`���O�c�a�_�Y���[�]�b�\�Z�e�d�����ꎠ���������������m��䢛y���k�������d�������H���m���ˎ����掝���~�Ŏ����n�~���I���m熉a��玘����J�Ȏq����j���^�Z�������i�������V�����V��������␷��╛���N�M�������趞��ƎL�G�Q�Z�����S�R�͛؜�k�O��槎S�b�Μ͎a�c���Z���ˍϙ����܍ލ��ߍ݊o����Y�፿���������U�������������[�]���������w�G�Y�]��Z���U�y�W�ĄH�[�x��Z]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�]�[�Y�W�U]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|�o\_s*��\|��\_s*[���q��]\|�\_s*�\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|��\_s*��\_s*��\|��\_s*��\|�O\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|�\_s*�\|��\_s*�p\|��\_s*�o\|�C\_s*�@\|�m\_s*��\|��\_s*��\|�k\_s*[�ߌY]\|�\_s*��\|��\_s*�s\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|�\_s*�\|G\_s*\%(��\_s*��\|�p\_s*��\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�Q\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|J\_s*\%(I\_s*S\_s*�R\_s*�[\_s*�h\|�|\_s*�b\_s*�v\|R\_s*��\_s*��\_s*�{\)\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�i\_s*\%(��\_s*�[\_s*�O\|�|\_s*�b\_s*�v\|�t\_s*�m\_s*�j\_s*�n\)\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|�\_s*�u\|�e\_s*��\|��\_s*��\|��\_s*��\|��\_s*�{\|�U\_s*��\_s*��\|��\_s*�H\|��\_s*��\|�T\_s*\%(��\_s*��\|��\_s*�|\_s*�[\_s*�j\_s*��\|��\_s*�S\_s*�T\)\|�V\_s*\%(�^\_s*�[\_s*��\|�I\_s*\%(��\|�j\_s*\%(�X\_s*�g\|�Y\_s*��\)\)\)\|�c\_s*\%(�@\_s*\%(��\_s*�g\_s*�D\_s*�X\_s*�g\_s*��\|�C\_s*�g\)\|�F\_s*\%(�i\_s*�[\|�b\_s*�y\_s*��\_s*��\|��\_s*�}\_s*�b\_s*�g\)\|�B\_s*\%(�N\_s*��\_s*�X\|�^\_s*�[\|�[\_s*�O\_s*��\_s*�[\|��\_s*\%(�o\_s*��\_s*��\|�}\_s*�[\_s*�}\_s*��\)\|�S\_s*�C\_s*�l\_s*��\)\)\|�`\_s*\%(�N\_s*��\_s*�X\|�A\_s*�m\_s*�[\_s*�[\|��\_s*�[\_s*��\_s*\%(�q\|�b\_s*�q\)\|��\_s*��\_s*�_\_s*�b\_s*�V\_s*��\|�S\_s*�C\_s*�l\_s*��\_s*��\_s*�C\_s*�[\_s*��\)\)',
+      \ '[' : '[���k�m�w�y[]',
+      \ '\' : '[�Ɂ_��\\]',
+      \ ']' : '[�z�x�n�l]]',
+      \ '_' : '[�@�Q_]',
+      \ '`' : '[�g�e�M`]',
+      \ 'a' : '\%([��ݕ��N��Ҋ{�b���]毛^�������w�܏����o�@�C�����糕ӓ����J�l���V�Ȍl�ˆ��^���؜��{�����Q����z鸈��W�E�B���{���M榏Q�k�w�{ꁋ\�����N�}�H���o���{���t����V�p�������A�֔\���H�Փ��a�S�N���[��ړ��a�W���o㻓֏��~�ĔM���ؒg��禈������Ŋ��������N�[���Ύ��ѕ��Қ��a�e��}�R�y�������v�X���I���\����॑��Ő��V�a�z���\�e���X�E�V�~�d�����Y�эʊ늿�ߎӕT��瑀������剎��Օ��P����]��J�ÓV���������쉐�˖ԋY�͈����b�������������般�HꙌ�卋������ǖ����s�����N�𗺌��摏�����L���[�j��P�N�������z���ӟ�E�D���ɏ͏����W���쏺�H�V������q��������襞B���\���͈��ԑ�����~㪌Z����Q�ōs���}�ĈLj���ƈ�����풩�����@��r�b�����~�`���q���g���ݝю鈩�[���ޝ�脋ōC����K���\�ؐԐ���z�Đ��•Ɉ����Œ��������}�����ራ�S�ݑ��Y�K�򗁍r�g�Ҙa�𞓍��G�������c���L�J�}���숢�j���������ޜ����O�[�㝧�����������ȁ����_&�ڋ��͈�󁨁����ˁ��́܌�W���āN�L�M�O�f���`���p���@�A��a]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*�q\|��\_s*��\|�E\_s*�n\|��\_s*��\|�f\_s*��\|�M\_s*�V\_s*��\|��\_s*�T\|��\_s*��\|�Z\_s*�q\|��\_s*��\|�l\_s*��\|��\_s*��\|�^\_s*��\|��\_s*��\|��\_s*��\|��\_s*�w\|��\_s*[����]\|��\_s*�p\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*�{\|��\_s*\%(��\|��\_s*�q\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\|�H\_s*�a\_s*�b\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*�F\|��\_s*��\|��\_s*�`\|�^\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�D\_s*�`\|��\_s*[�������K]\|��\_s*�G\|��\_s*[�m�F]\|�\_s*�x\|��\_s*��\|��\_s*��\|��\_s*��\|�p\_s*\%([�ۓc]\|��\_s*�p\|��\_s*��\)\|��\_s*[�ɁX]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|�h\_s*\%(�o\_s*�d\_s*�b\|�b\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(�d\_s*�b\|�A\_s*�h\_s*��\_s*�X\)\|D\_s*�J\_s*�[\_s*�h\|C\_s*\%(�^\_s*�O\|�J\_s*�[\_s*�h\)\)\|��\_s*�~\|��\_s*��\|�c\_s*��\|�n\_s*��\_s*��\|�C\_s*[�^���m�l���]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*�a\_s*��\|��\_s*��\|��\_s*�n\|��\_s*[�nꆖ�]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|�g\_s*��\_s*�v\_s*��\_s*A\| \_s*�A\_s*�N\_s*�V\_s*�A\_s*��\|��\_s*��\|��\_s*�f\|�q\_s*�f\|��\_s*�s\_s*��\_s*�x\_s*�Z\_s*�p\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�Y\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�@\|�a\_s*��\_s*��\_s*�@\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�Z\_s*��\_s*�g\_s*�L\_s*�b\_s*�c\_s*�l\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�p\_s*��\_s*�\\|�g\_s*�p\_s*��\_s*�\\|�Z\_s*�@\|��\_s*��\_s*��\_s*��\|�I\_s*\%(��\|�M\_s*��\_s*�X\_s*�^\_s*��\|�h\_s*��\_s*�C\|��\_s*�O\_s*�X\_s*�g\_s*��\_s*�[\_s*��\|��\_s*\%(�g\_s*�L\_s*�[\|�^\_s*\%([�[�i]\|�l\_s*\%(�[\_s*�g\|�C\_s*�g\)\)\)\|�[\_s*\%([�N�K�T�g����]\|�j\_s*��\_s*�O\|�L\_s*�V\_s*��\|�u\_s*��\_s*�[\|�o\_s*�[\_s*�h\|�x\_s*��\_s*�W\_s*��\|�M\_s*��\_s*�X\_s*\%(�g\|�^\_s*��\)\|�]\_s*��\_s*�k\|�X\_s*\%(�`\_s*��\|�e\_s*�B\_s*��\|�^\_s*�[\|�g\_s*\%(��\_s*�A\|��\_s*��\_s*�A\)\)\|�h\_s*��\_s*�[\|�W\_s*\%([�F�[]\|�I\_s*��\_s*�W\)\|�f\_s*�B\_s*\%(�I\|�G\_s*��\_s*�X\|�V\_s*��\_s*��\|�g\_s*��\_s*�A\_s*��\)\|�^\_s*��\|�\\_s*\%(��\_s*�e\_s*�B\|��\_s*�C\_s*�Y\)\|�Z\_s*��\_s*�e\_s*�B\_s*�b\_s*�N\|��\_s*��\)\)\|�z\_s*��\|�o\_s*�C\_s*�g\|�n\_s*��\_s*�}\_s*�Q\_s*�h\_s*��\|��\_s*��\|�l\_s*�H\_s*\%(��\_s*��\_s*��\|�m\_s*�\\)\|�C\_s*\%(�[\_s*�W\_s*�X\|�I\_s*��\|�\\_s*�b\_s*�v\)\|�}\_s*��\_s*�h\_s*�D\_s*�[\_s*�N\|��\_s*\%(�z\_s*��\|��\_s*��\|��\_s*�p\)\|A\_s*\%([tlrImc]\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|�^\_s*�C\_s*�v\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*�V\_s*�X\_s*�e\_s*��\|L\_s*T\_s*�L\_s*�[\|��\_s*��\_s*�N\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*��\_s*�f\_s*��\|�h\_s*��\_s*�C\_s*�u\|d\_s*a\|M\_s*��\_s*�W\_s*�I\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|C\_s*�A\_s*�_\_s*�v\_s*�^\)\|�t\_s*�^\|�`\_s*\%([�S�^��]\|��\_s*��\_s*��\|�a\_s*\%(�^\|��\_s*��\_s*��\_s*��\)\|�^\_s*�C\_s*�v\|�s\_s*��\_s*�s\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*�N\|�h\_s*�G\_s*�L\_s*�X\_s*�p\_s*�[\_s*�g\|�^\_s*�c\_s*�R\_s*��\_s*�o\_s*�[\_s*�^\|�h\_s*��\_s*�C\_s*�u\|��\_s*��\_s*��\_s*��\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|��\_s*��\_s*��\_s*��\)\|��\_s*�p\|�G\_s*\%([�j���A�[�C]\|�b\_s*�`\|��\_s*\%(�h\_s*��\_s*��\|�W\_s*�F\_s*\%(��\|��\_s*�b\_s*�N\)\|�[\_s*��\)\|��\_s*�A\|�I\_s*��\_s*�A\|�X\_s*�e\|�v\_s*��\_s*��\)\)',
+      \ 'b' : '\%([���ݍ����x�f��t���ݖv�{�}�~�Ϟ��r�s�����`�����p�ؖn�l�m�q��������������K䛖e�㤝ԕ��O�R�E廖b�ӖQ������g��Ԝ�R���W�a�X��Z�U�`���Y��N��ϙ˛��S�c�]�f�h�T�^�d�����@�G�ە�덛�͕��d��敕������W�J���V��_����K�럑�k㰋Йp�g���ꈕ̕����ѝV燙��ę��ܛ~���A�ᾙj�וؕى•��粂בD�[�k�u�q�J�ڟ����������������ܐ[�W��᳓ؐߕ��ܖܘŕ��h�ᕷ���F���������ᕑ�o���F�x���~�w���򐁕��������ŐU�����@���s�ԕ�捐l�L�J�x�ʕT�C�Z�z�[�m��㢛����ߕp�C�ޜ��r�F��{���q�n��蓕S焛唒��I�a�l�L�[�߁��e��Ὗە��d�c�b�`�_�a���e����������r�o�������Z�����g���]�X�Δ��z���ۓ���є��䊑����ы������s�I�������������[�@���bV�������U�㭔����j�A�c���U���P�����������W�����є��m���\�����e���}���t�S���̔��i��䕜ޔ|��ꀊL�����������{�~�}�����Ŕ����f���\�Ҕ��Ԗ_�J���m�ה”d���H����ݔ֔ӔՔԔؖ��따������������\�n���m���t��H�����Ŕl�n�����y�k�΂��g�������ےꉺ�~�|�a�b�_�攞�{�o�n�m�p�o�u�r���A�q���xb]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�{�x�u�r�o]\|��\_s*[�ڂׂԂт�]\|�\_s*�\|��\_s*��\|�A\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*�Z\|��\_s*��\|�r\_s*�r\|��\_s*��\|�\_s*�\|��\_s*�_\|��\_s*�_\|��\_s*��\|�E\_s*��\|�\_s*�\|��\_s*�C\|��\_s*��\|�X\_s*[���j]\|�R\_s*��\_s*�O\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|�z\_s*�c\|�\_s*��\|�u\_s*\%(��\|�l\_s*�b\_s*�N\|�V\_s*�l\_s*�}\)\|��\_s*�q\|�t\_s*�q\|��\_s*��\|�L\_s*[�O��]\|�\_s*�\|�V\_s*�A\_s*�O\|��\_s*[�ĘU]\|�\\_s*�D\|��\_s*[���D]\|��\_s*��\|�o\_s*��\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|�h\_s*��\|��\_s*[�q�@]\|��\_s*[�Žq]\|�\\_s*��\|�\_s*�\|��\_s*��\|��\_s*�q\|�c\_s*��\_s*��\_s*��\|�b\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�K\_s*�N\|��\_s*�q\|��\_s*\%([�јJ�y]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[���]\|�\_s*��\|�f\_s*��\_s*��\|�v\_s*��\_s*�R\_s*�M\|��\_s*��\_s*��\|�I\_s*�[\_s*�g\_s*�o\_s*�C\|��\_s*[�b��]\|�t\_s*�@\_s*�S\_s*�b\_s*�g\|�w\_s*�i\|�k\_s*��\|�y\_s*\%(�L\_s*��\|�e\_s*��\_s*�M\_s*�E\_s*�X\)\|�L\_s*�f\|�C\_s*�M\_s*��\_s*�X\|�a\_s*\%([�ʔ����^��]\|��\_s*�E\|�^\_s*�C\_s*�v\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|�|\_s*�X\_s*�v\_s*��\_s*�C\_s*��\|��\_s*��\_s*��\_s*�m\_s*��\_s*��\_s*��\|��\_s*��\_s* \_s*�d\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*�N\)\|B\_s*\%([h�ʔ����^kiae]\|C\_s*��\_s*��\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|�^\_s*�C\_s*�v\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|�t\_s*��\_s*�b\_s*�c\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|M\_s*P\_s*�t\_s*�@\_s*�C\_s*��\|�X\_s*�v\_s*��\_s*�C\_s*��\|S\_s*\%(D\|�L\_s*�[\|�`\_s*��\_s*�[\_s*�i\|�A\_s*��\_s*�e\_s*�i\|�f\_s*�W\_s*�^\_s*��\)\|O\_s*X\_s*�Z\_s*�b\_s*�g\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|��\_s*��\_s*�N\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|��\_s*�f\|�z\_s*�E\_s*�f\)',
+      \ 'c' : '\%([��a�������|�Ҝ��D����ޏn�s���}���Ĝl���a��ʗ���ۗ���ᶐs�Д������f�����َ�����řb���I���z���iꑍ����C���麌Z欉��䓚৐��}���əY���`�n�����X�����M�ٍ��Ȝk�ύ������������ߌ������������匣���Ӎ����������e�W�����B�L�ݖ����ϙi���Ҕ��Q�b������m��秋��t����R���K�{���}�����`肍��L琍f�ݚJ��k�i���Q�硟��L��������s���J�������𔸙��l���E�H���n�r������੘m��t����൙��{�X�������E���R�n㝍h�����}����H�y�ߝK�朑�����n�K�}��֞��\��@囍y��ෙ��΍[��⠍x����u�X�S�e倘������J�i�^���’@�V���A�W����썄�G�D�T����ᩍ`�p��᧍B�����]�P���I���z���t�_���k�O�j�R�w�u�P�I�a�|�q�F�X�Z�s�m���c�D�r�����J�L�ޛ��ܝ��w�l�������������������W�g������V�����ڞ����������ׁ܋��Z�X�čᑆ���ՙs�|�˙�Z�����e�،؝s�Z���hⰍ��������ٕ֒��]�ی�㨏����h��ן�z�Ë��П�绌�ꉍ�����烜��������ٌnj��@�u�x�삱����N�Ë��Z��驉k�����ş��Q�L�����T�G�i�L������↝B�ގE���ِېߐ��C���G��А��������ዙ����[�T�����אɐ͐ȐǞ���N����������d�Ϟ��囡�p�ә�㙟�㚘j���A䦈��a�_���t�b�A���A���b�����x�����a�H�柞�����E�C���J�⤑G�S���L⒑W�s�r���������D�J�A�L��񙒐�枙@�ۑM���H�����l�F�K�����D�B�@�G��h�ǐ坡�N�������d�D�������I�����R��Ŗ��|���˝��������ō�����v��⫝�ꎍΐ����y���H�����������`�Ր������}�����U�ҙ������[���ǐ�������z���z�M�K����ⱟJ��㖍������I�����H���E���b�z�o�����x�A�ܗ��ϕ��D�B��ӏ��~���������B䱌s���Z�Yᯙ������Ӟ�ᮛ��M�֌N���v������K�@����{���^���Z��퐾�^�����č���鶔�ňʈ��U�Ñq�������C�~���V�W�R�U�S�X�T�܉_�w�o�^�������鿌~���G�F䇚��`�p�̃��Y�������۞����ƌI����Әޚ��P�M�����u���������o�Ӟ������c�������苟���m�����痈�q��H�M�῍C��​晠�J���{��v�v�͘Ҋ�X�ɜ��g�ˍg��ܜ����|�E���؋������捃����B�A������P������D���Y���`�������L���Z������连x���Z������l���W�������ȓ��������G�F�a�Ǝb����乗��M�E�����s�C�F���n���D�㈵㦃Ƌs�����]�Ŗl⚑^����潔A���g���ߞΖ�儞����b���ɖΕݜ�臐w�p��玬�d����쎹���g��[��諎����^���G�������N���H���˒��ΐÎ������ᕹ���R����������K�\�ސˌ�K�Ž��������K���򛍉����t�o���q������������ϔ����O���ӎ��͚��͟��̍��b�y�P��᪎������j�A�ϐ֙��̎ݐ���┐��^�܎ېΎގڎ����Y�ώՎˎΎɎԎߎЈޝ��i�S�C�G����ဎ���f�z���t�W�V������题�������f��������E��i�g�l�h�k�{��������蜕婙��o�J�蕘�Ꟛ�V���h��娔��h�K�q�����F榚S�Q�F�T��酝����n������������S�X�K�U��ڏM�G�j���E�a�N�����O�D�C�A�L�R�T�W�I���B�H�@���M᭜��\����貚я�忏w�{���v�x�s�⡏u�r�f�ݐ��p���u���V�y�J�U�����Z���]����j�P�曚A���՜�����f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�N�f�d��C�k���X�L�������T�Q�W�i�R�[�M�e�b�I�\�S�^�V���Ώ��n�Z��勋o����|�ב_�䓏��w����򏎏��������v���ߓɚ��[�m�������יЎK�О_�c�R���u����B���䐠�Ϟ�Ɛ����L���Ҝћ�辛����頔��I���׏����[縜��B����䀙����n������␏���K♏����яҁ������u���i�œϏ]疏֏Ӑ��Ԛ��А�躐���Ϗ����U���J���n�ސ��Ŝ܏��ߏ���������ُ����G�����Ꮷ��ଏ����������������������������͏Ǐ����ɏ������Џ��ˏ���暏��ďΏƏ����͏ڏ؏ɏ��������\�p���l���T���e����g�ߐ@�C�ܑ������D�I����冐B�����G���A�H�E�u�o���w�ʕE��e�y�򚬞��@�h�џ��|������X������ꏎ��ю}�ؗ�⿎l�o�Ŏ����~�����d���s�t�w�ћ���L�y�p�i�n���Îk�䍟��������߁Y�`�o�m�o���{�j����`�V���@�m�@���i�y�����I�ِy�n�����X�����n�B�g�~���v�s�Ў����o���������N������᎒���Z���u���i�U���抎����f���]���K�j�����{��������J�{��r���˙��藂������y���NJ��r���݊��j���ƌy�����Ĉ�呁��e�A���i������������M��ꝕr�P�T�M�v�����ᚃ��ȍ��f�j�s�e�h�o�q�g�p�t�r����鹜��NJ����D�R���U�ğd�z��ᥕ���p�ȌڋA���Ԏ��‹_雔B�ߗ��ދȋ�\�����Ί����ۖ͋w�d�T��e�z�J�x���Ō`�ӕ��^�������Ȕ��H�����X�R�C���P���t������qK�Š�������閔������@�ϞJ���{���������嶔��㹊������|�ؙ��^������歒S�������e顊��j舊��������s���Fጐ��d�P�}���g�����y�a�`�f����S�W���m�����e��O��ݑ��]�ڛ��̊��ňה����@���쁨�F�`�����O���P���[�\铐g����ಉG�h���󓂞Њ����~�y�ۉ������}�q�����ɐ��͘����V�،����~ऐ����c���͌��b���u�w��v�x�X�i�Õ��L����ꖊ��ƓK�G�̜S�R魓C���Ј����ߕK�v���֓S哑t�������ݓk�����䡞��S���湝���誜����vᙊd�n�]�Q��L�ڒ�������I跏ʜ������h���\�f�r�l�y�m�z�n�k�k�g�c�s�t�i�o�݉B�v�d�ߝ��j�l�g�q�u�p�m�G�d觛��Z��嵙��j珚����Ԙ��B�i�W�q�����r���[���~�����D䠊^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�F���׊@��E�m�����L�G���D�ŊA���������K���J����C���`���՚Q�ɟ��I�W錟a��檚��A洚��j��b�a�Y���ホe�⻞�䯙��q���T�㻛f�p�����N��㼝��c���㣎���V�늬���M������ϊ�䅟��j���F�r�����������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�g������|���}�����ۊ��@�يΞ��؊��󊩐��Ҋ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������š^�׊Ċ��ÊԊ��Պ��NJ����֊��͊������ϊ��w����x�s�q�P�g�ӊe�����h���ӏ�Չɉ���Չ܃��`���͉��ތ��F㞉��S�˚Z���Q����草ؚm�׊]�����͉Ȍ�嗉��e�D��v�q������Ҏx�T�|�~���o戟ω̉ߍ��ю딃�̉ƞg��������`�ϙ�֑��d�U�������ݙJ�Ǝ��a������͉ۉ��я������ÚКk旓��z�Њ��|䑉�嘉�������㟉��q�ČC�����a�����{����斎�����҉ǟ��뛺��◉Ή։���l�����E�c���‹���ā����ى����U�C�D�@�w�A���z�t�x���G�N�{�v�H���^���T�S�r�R�_���[�`�F�L�I�~�����q�B�}�M�V�]�E���p�u���P�K�Z���Y�������\�����O�Q�y�|�s���J���􄾄��~���������������ԃ��q�X�����W�ہA�C�F�N�Ջ��\�Ȑ��ߕϐڃJ�������������������R�V�Z����c]\|�\_s*[�����]\|�b\_s*[�R�Z�N�V�J]\|��\_s*[�q����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�m\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*�C\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|��\_s*�@\|�O\_s*[�ȍ�]\|��\_s*[�U��]\|�P\_s*�y\|��\_s*��\|��\_s*[���ρX]\|�~\_s*��\|�\_s*��\|�S\_s*[�Z��]\|��\_s*�h\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�V\_s*��\|�]\_s*��\|�f\_s*[���l��]\|��\_s*�A\|�s\_s*[�m�E]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*�_\|��\_s*��\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|�]\_s*[�]�X]\|�\_s*\%([�Ɨ���u�ʑ��Ɏ茓��]\|��\_s*��\|�[\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|�V\_s*��\|7\_s*��\|��\_s*��\|�S\_s*[����]\|4\_s*��\|�R\_s*�{\|�\_s*�\|�h\_s*�t\|��\_s*[�ʈ�]\|��\_s*��\|�O\_s*\%(��\|��\_s*��\)\|�|\_s*[�“�]\|�A\_s*[�o��]\|��\_s*��\|B\_s*r\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|�Q\_s*��\|��\_s*�Y\|�b\_s*��\|�c\_s*�e\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*�Z\|��\_s*�q\|�\_s*�\|�z\_s*��\|�R\_s*\%(�C\_s*�o\|��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�r\_s*�C\|�b\_s*[����]\|��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*�r\|�|\_s*��\|�]\_s*��\|�\\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|�y\_s*��\|�A\_s*�g\|�k\_s*�k\|�@\_s*��\|��\_s*�t\_s*��\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[���r]\|��\_s*\%([���_]\|�C\_s*��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|�C\_s*[���G]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|�_\_s*�o\|��\_s*�\|�B\_s*��\|�A\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*�u\|��\_s*��\_s*��\_s*�e\_s*�N\_s*�m\_s*�T\_s*�C\_s*�G\_s*��\_s*�X\|��\_s*��\|�X\_s*��\_s*�[\_s*�Y\|��\_s*�e\|�g\_s*��\_s*��\_s*�v\|��\_s*[�{���v��]\|��\_s*�G\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|�T\_s*\%(��\_s*�`\_s*�[\_s*��\|�G\_s*��\|�C\_s*\%(�g\_s*�J\_s*�C\_s*��\|��\_s*�X\|�N\_s*\%([����]\|��\_s*\%(��\|�b\_s*�N\)\)\|�{\_s*\%(�E\_s*�Y\|�[\_s*�O\)\|�o\_s*\%(�[\|�l\_s*�e\_s*�B\_s*\%(�b\_s*�N\|�N\_s*�X\)\)\|��\_s*��\_s*�[\_s*��\|�_\_s*�[\|�t\_s*�@\_s*�[\|�l\_s*��\_s*�A\)\|�[\_s*\%(�e\_s*�B\_s*�t\_s*�B\_s*�P\_s*�[\_s*�V\_s*��\_s*��\|�N\_s*��\|�J\_s*\%(�X\|��\_s*�X\_s*�N\_s*\%(��\_s*�C\_s*�u\|��\_s*�v\_s*�V\_s*��\_s*��\)\)\|�L\_s*\%(��\_s*\%(��\_s*�[\|��\_s*�[\_s*\%(�^\_s*�[\|�V\_s*��\_s*��\)\)\|�b\_s*�g\)\)\)\|�}\_s*�h\_s*��\_s*�X\|��\_s*�\|�P\_s*\%([���A�C]\|�t\_s*�F\_s*�E\_s*�X\|�v\_s*�X\_s*�g\_s*��\_s*[����]\|�`\_s*��\_s*�b\_s*�v\|��\_s*\%(�^\_s*�E\_s*\%(��\|��\_s*�X\)\|�u\_s*��\_s*�b\_s*�W\)\|�[\_s*\%([�L�W�u�v�X��]\|�N\_s*�E\_s*�H\_s*�[\_s*�N\|�\\_s*��\|�^\_s*��\_s*��\_s*�O\|�p\_s*\%(�[\|�r\_s*��\_s*�e\_s*�B\)\|�V\_s*��\_s*�O\|��\_s*�[\)\|��\_s*\%(�g\|�x\_s*��\_s*�X\|�e\_s*�B\_s*�b\_s*�N\|�r\_s*\%(��\|�[\_s*�j\)\)\|�~\_s*\%(�J\_s*��\|�X\_s*�g\)\)\|�L\_s*\%(��\_s*�m\_s*��\|�v\_s*��\_s*�X\|�P\_s*��\|��\_s*\%([�C�[�A]\|��\_s*�F\|�r\_s*\%(�Y\_s*��\|�X\_s*��\)\|��\_s*\%(�X\|�b\_s*�g\)\|��\_s*�[\_s*�^\_s*�[\|��\_s*�\\_s*�[\|��\_s*\%(�[\|�E\_s*��\|�A\_s*�X\|�I\_s*�V\_s*�e\_s*�B\)\)\|�A\_s*\%(��\|�[\_s*��\|��\_s*�e\_s*�B\)\|�`\_s*��\|�g\_s*�T\_s*��\|��\_s*��\|�}\_s*�C\_s*��\|�b\_s*�J\|��\_s*�[\_s*�g\|��\_s*\%([�h�p�X�u����]\|�f\_s*\%(�B\|��\_s*�b\_s*�N\)\|�r\_s*\%([�A���l]\|�e\_s*\%(�B\|�[\_s*�V\_s*��\_s*��\)\)\|�x\_s*�c\|�o\_s*\%(��\_s*[�G�A]\|��\_s*�[\)\|�g\_s*��\|�V\_s*�[\|�T\_s*��\_s*��\|�^\_s*�s\_s*��\|�s\_s*\%(�g\_s*��\|�^\_s*\%(��\|��\_s*�Y\_s*��\)\)\|�v\_s*\%(��\|�V\_s*��\_s*��\|�e\_s*��\|�`\_s*��\)\|�Z\_s*\%(�C\|��\_s*�[\_s*��\)\|�b\_s*\%([�c�g�`�v]\|�T\_s*�o\|�X\_s*��\|�V\_s*\%(��\|��\_s*�O\|��\_s*\%(�[\|�u\_s*��\)\)\)\|�j\_s*\%(�I\_s*��\|�X\_s*�^\_s*�[\)\|�i\_s*��\|�m\_s*\%(��\|�[\_s*��\|�s\_s*�[\)\|�~\_s*�\\_s*�[\_s*��\|��\_s*\%(��\|��\_s*\%(��\|�b\_s*�g\)\)\|��\_s*\%(��\|�E\_s*�F\_s*�C\|��\_s*��\|��\_s*�C\_s*[���i]\|�b\_s*�g\)\|��\_s*�b\_s*�g\|��\_s*\%([�R�[�A]\|�o\_s*�[\|�u\_s*��\_s*�[\_s*�V\_s*��\_s*��\|�b\_s*�W\|��\_s*�O\)\|�Y\_s*��\)\|��\_s*\%(�R\|�X\_s*�g\|�V\_s*�^\_s*��\)\)\|��\_s*�p\|�`\_s*\%([�^�����}�A]\|��\_s*��\|��\_s*�[\|��\_s*�h\|��\_s*�j\_s*�[\|�R\_s*��\|�b\_s*\%([�v�N]\|�e\_s*��\_s*�I\|�^\_s*�S\_s*��\)\|�L\_s*\%(��\|�[\_s*�^\)\|��\_s*\%(�A\_s*�u\_s*��\|�[\_s*�C\_s*��\_s*�K\_s*��\)\|�[\_s*\%([�t�g�v�N�Y]\|�p\_s*�[\|�^\_s*�[\)\|�F\_s*\%([���X�J�R�A��]\|�U\_s*\%(��\|�[\_s*��\)\|��\_s*\%(�j\_s*�[\|�V\_s*�[\|�m\_s*�u\_s*�C\_s*��\)\|��\_s*\%(�[\|�X\_s*�g\|�b\_s*�V\_s*��\|��\_s*��\)\|��\_s*\%(�X\_s*�^\|��\_s*�R\_s*�t\)\|�r\_s*�`\_s*�F\_s*�t\|�_\_s*�[\|�`\_s*�F\_s*��\|�b\_s*\%([�g�N�J]\|�L\_s*��\_s*�O\)\|�C\_s*\%([�X��]\|�j\_s*�[\|�T\_s*�[\|�V\_s*��\_s*�O\)\|�[\_s*\%(��\|�U\_s*��\|�z\_s*�t\)\)\|��\_s*\%([�I�t�h�C���R���E]\|�c\_s*�l\|�N\_s*��\|�v\_s*�^\_s*�[\|�p\_s*�e\_s*�B\|�y\_s*\%(��\|�b\_s*�N\)\|�`\_s*��\|�l\_s*\%(��\|��\_s*�[\|��\_s*��\_s*�O\)\|�b\_s*\%([�N�g]\|�s\_s*�[\|�v\_s*\%(�}\_s*��\|��\_s*��\)\)\|�^\_s*\%(��\_s*[�C�[]\|��\_s*��\_s*�O\)\|��\_s*�}\_s*�[\_s*�X\|��\_s*��\_s*�W\|��\_s*��\|�[\_s*\%([�`�^�g���W]\|�r\_s*��\|�~\_s*\%(�[\|��\_s*�O\)\|��\_s*�[\|��\_s*\%([�Y�X]\|�g\_s*��\)\)\|��\_s*��\_s*�S\)\|��\_s*\%([���R]\|�C\_s*�X\|��\_s*�X\_s*�L\_s*�[\|�[\_s*\%(�N\|�T\_s*�[\|�J\_s*�[\|�L\_s*��\_s*�O\)\|�S\_s*��\|�b\_s*\%(�v\|�s\_s*�[\|�p\_s*�[\)\|��\_s*�\\)\)\|��\_s*�W\|��\_s*��\|��\_s*��\|��\_s*\%(��\|�Y\_s*��\_s*�`\_s*��\)\|�p\_s*��\|C\_s*\%([srdfDeRoa]\|��\_s*��\|�^\_s*��\_s*��\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|�\\_s*��\_s*�O\)\|�^\_s*�C\_s*�v\|T\_s*\%(�X\_s*�L\_s*��\_s*��\|R\_s*L\_s*�L\_s*�[\)\|�V\_s*�F\_s*��\|S\_s*\%(V\_s*�t\_s*�@\_s*�C\_s*��\|�`\_s*��\_s*�[\_s*�i\|�A\_s*��\_s*�e\_s*�i\)\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|�R\_s*��\_s*�p\_s*�C\_s*��\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*�J\_s*��\_s*��\)\|�h\_s*��\_s*�C\_s*�u\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|��\_s*��\_s*�N\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*�L\_s*�[\)\)\|�b\_s*\%([�^��]\|�l\_s*�\\_s*��\_s*�O\|�^\_s*�C\_s*�v\|�J\_s*�b\_s*�v\|�N\_s*��\_s*�X\|��\_s*�r\|�c\_s*�|\_s*�q\_s*�n\_s*�l\|�h\_s*��\_s*�C\_s*�u\|�{\_s*�{\|��\_s*��\_s*�N\|�n\_s*2\|��\_s*�b\_s*\%(��\|�n\_s*�X\_s*�g\_s*�A\)\|��\_s*��\)\|�c\_s*\%(�@\_s*�[\|�B\_s*��\_s*��\|�F\_s*\%(�[\|��\_s*�j\_s*�[\|��\_s*��\)\)\|�Y\_s*�f\)',
+      \ 'd' : '\%([�다�h�b���r�a�����Ǐ������B�t�N���{�����c�j���ۓ��Ó��̊���椓�����ՓœǙI���^�ӛk���N�������U�˒��~���}�X������駁߁̓��ԓ����ӓ��W�V���������֓����g�˓z�ގ���{�y�m���w�^���~�x�W�Z�v�ǎ��F≓��B����H�D�s�M�����u����������b�\�B�a�d�ƂŃd�ߐh���ȍj�Γ`���������s�����ˌ��n��g�A�t�ːϒ݋l�ВÐ}�ނÃa���ߗ͎����n����I�L���֓|�ʔZ睏����J���N��M���ҋ��ʍ��x�J�_�يڒ|�Ԋx���������F�ڒD�E���N璑ДU�Ւ��i�����n�m���聄�������Г̓�ْU���[�g�h�k�i�f�c���d�e�j�ƑǑʎ��P��[�S�֚֝\�ǐ�������Ȑ����əT�����P��䶗��c�ĕ���k�ř[�яo���������C���A�D\.�d�E�c���h�g�������\���B�����ƃh�������_�W�D�t���ƒf��d]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�h�f�d�a�_]\|��\_s*[�ǂłÂ���]\|�\_s*�\|�s\_s*�X\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*�V\_s*��\|��\_s*��\|�@\_s*��\|�\_s*�\|�Y\_s*��\|�S\_s*�t\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�t��]\|�\_s*��\|�\_s*�\|��\_s*[�I��]\|�\_s*�\|�m\_s*�b\|�x\_s*��\|��\_s*�q\|��\_s*�q\|�\_s*�\|��\_s*�K\|��\_s*�\|��\_s*�B\|�R\_s*��\|��\_s*��\|��\_s*�k\_s*�B\_s*��\|��\_s*\%([���Ɍ�]\|��\_s*�L\|��\_s*�V\_s*�c\|��\_s*\%(��\|��\_s*�b\)\)\|�T\_s*[���B]\|��\_s*��\|��\_s*�|\|��\_s*\%(��\_s*��\|�\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\)\|�R\_s*��\_s*��\_s*�r\_s*�A\|�Y\_s*\%(��\_s*�[\_s*�X\|�b\_s*�N\)\|�C\_s*��\_s*�J\|��\_s*��\|��\_s*�m\|��\_s*��\|�s\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|�n\_s*�[\_s*�O\|��\_s*��\_s*��\_s*��\_s*��\|�j\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*�q\|�L\_s*�q\_s*�q\|�c\_s*\%(�_\|�^\_s*�C\_s*�v\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|�b\_s*�u\_s*��\_s*��\_s*�h\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*�N\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|�\\_s*�i\_s*��\|�[\_s*�b\_s*�P\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|D\_s*\%(b\|�^\_s*�C\_s*�v\|T\_s*\%(E\|P\_s*�\\_s*�t\_s*�g\|M\_s*�\\_s*�t\_s*�g\)\|M\_s*A\|�h\_s*��\_s*�C\_s*�u\|�J\_s*�b\_s*�v\|C\_s*\%(�J\_s*�[\_s*�h\|�u\_s*��\_s*��\_s*�h\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|�T\_s*�[\_s*�o\)\|H\_s*C\_s*P\_s*\%(�T\_s*�[\_s*�o\|�N\_s*��\_s*�C\_s*�A\_s*��\_s*�g\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|��\_s*��\_s*�N\|V\_s*D\_s*\%(�{\_s*�b\_s*�N\_s*�X\|�V\_s*��\_s*�b\_s*�v\|�P\_s*�[\_s*�X\|�f\_s*�b\_s*�L\|�h\_s*��\_s*�C\_s*�u\|�I\_s*�[\_s*�f\_s*�B\_s*�I\|�v\_s*��\_s*\%(�C\_s*��\_s*�[\|�[\_s*��\_s*�[\)\|��\_s*�b\_s*�N\|��\_s*�R\_s*�[\_s*�_\_s*�[\|�}\_s*��\_s*�`\|�r\_s*�f\_s*�I\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*�L\_s*�[\)\|I\_s*\%(P\_s*�X\_s*�C\_s*�b\_s*�`\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
+      \ 'e' : '\%([�ኙ����P�G���ҋ�`�ܐ�ݑ����傉��滌ӏ^�Λ����������x�V�x�{�y��㈔���t厚�z郉u�Չv���w�t鴝o�H�H�ў����́����d���v������ꁊ_脚��ঢ়��Q���������`腖��b膞Ł܉���⥟��}�������|��������叉��͉�����������������l�����U�������~�����������I�t�o����k�����������㗚Țz�o�i�͉j�o�ĉb�l��g�s�d�m繉e�r�f�h�n�c�i�}��I�߈ˉ|㉙d���G�q���`�Ή�b�l���d�ʉ`�d���a�]��Ε��������������������������U���߁́����Q���}�M���N���p�Ύ��I�Ń����R�L�|�Ä^���G��e]\|A\_s*\%([�ʔ��^��]\|V\_s*\%(�@\_s*��\|��\_s*�D\)\|B\_s*\%(�^\|C\_s*��\)\)\|�`\_s*\%([�ʔ��^��]\|�u\_s*\%(�@\_s*��\|��\_s*�D\)\|�a\_s*�^\)\|��\_s*\%(��\|��\_s*��\)\|�O\_s*��\_s*��\|M\_s*�T\_s*�C\_s*�Y\|�l\_s*�T\_s*�C\_s*�Y\|�G\_s*�X\_s*�q\|��\_s*��\|�g\_s*��\|�E\_s*��\|��\_s*��\_s*�q\|��\_s*�y\|��\_s*�x\|��\_s*�H\|�x\_s*�\|��\_s*[�s��]\|��\_s*��\|�g\_s*�q\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\)\|L\_s*\%(�T\_s*�C\_s*�Y\|L\_s*\%(�T\_s*�C\_s*�Y\|��\_s*��\)\)\|��\_s*\%([仗��Q]\|�m\_s*��\)\|N\_s*��\|�m\_s*\%([�‹ɋ�]\|��\_s*��\|�p\_s*�`\|�g\_s*�j\_s*�z\_s*�[\_s*��\)\|��\_s*��\|�Z\_s*��\|��\_s*�X\_s*�r\_s*�[\_s*�H\_s*�i\|S\_s*\%([����]\|�T\_s*�C\_s*�Y\|N\_s*��\|F\_s*��\_s*��\)\|�r\_s*\%([�g���ȋ�]\|�T\_s*�C\_s*�Y\|�m\_s*��\|�e\_s*��\_s*��\)\|�q\_s*[���y]\|�w\_s*\%([���r��]\|��\_s*�F\_s*��\)\|X\_s*\%([���r]\|O\_s*��\|��\_s*�F\_s*��\)\|�A\_s*��\|�\_s*��\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|�C\_s*\%(�V\|�W\_s*��\)\|��\_s*�s\_s*��\_s*��\_s*�x\_s*��\_s*��\_s*�c\_s*�c\|��\_s*�[\_s*�N\_s*�X\_s*�e\_s*�[\_s*�V\_s*��\_s*��\|��\_s*\%(�B\|��\_s*�b\)\|�^\_s*\%(�B\|��\_s*�b\)\|��\_s*�[\_s*��\_s*\%(�s\_s*�A\_s*��\|�b\_s*�p\)\|��\_s*\%(�A\_s*��\|�E\_s*��\_s*�s\_s*�E\_s*��\|��\_s*�C\_s*�J\|�[\_s*\%(��\|�m\_s*�X\|�j\_s*�X\|�W\_s*\%(��\|�[\_s*��\)\|�h\_s*��\|��\_s*�J\|��\_s*\%(�X\|�V\_s*�A\)\|�t\_s*\%(��\_s*�e\_s*�X\|�H\_s*\%(��\_s*�A\|�j\_s*�A\_s*��\)\)\|�N\_s*��\_s*�b\_s*�h\|�J\_s*��\)\)\|��\_s*�W\|��\_s*��\|�d\_s*�q\_s*��\_s*\%(�[\_s*��\|�C\_s*��\)\|��\_s*�W\|�]\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|�S\_s*��\_s*��\_s*�T\|�J\_s*�v\_s*�Z\_s*��\_s*��\|�I\_s*\%(�[\|�C\_s*\%(��\_s*�[\|�Q\_s*��\)\)\|��\_s*�s\|�g\_s*��\|��\_s*�O\|��\_s*�Q\_s*��\|�d\_s*\%(�o\_s*�n\|�h\_s*��\_s*�C\_s*�u\|�c\_s*�x\_s*�[\_s*�^\|��\_s*��\_s*��\_s*��\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�^\_s*�C\_s*�v\)\|�A\_s*\%([���C]\|�j\_s*�h\|�[\_s*\%([�}�X��]\|�E\_s*�B\_s*��\|��\_s*��\|�j\_s*�[\|�l\_s*�X\_s*�g\|�~\_s*��\|�V\_s*�[\|��\_s*�[\)\)\|��\_s*��\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*�R\_s*�[\_s*�h\|P\_s*��\_s*�R\_s*�[\_s*�h\|�h\_s*��\_s*�C\_s*�u\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|-\_s*m\_s*a\_s*i\_s*l\|��\_s*�[\_s*��\|�J\_s*�b\_s*�v\|�R\_s*�}\_s*�[\_s*�X\|N\_s*T\_s*E\_s*R\_s*�L\_s*�[\|�^\_s*�C\_s*�v\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*�L\_s*�[\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|�C\_s*\%([�u���A���[]\|�W\_s*�F\_s*�N\_s*�g\|�t\_s*�F\_s*�N\_s*[�g�^]\|�R\_s*\%(�[\_s*��\|��\_s*�C\_s*[�Y�U]\)\|�v\_s*�V\_s*��\_s*��\|�~\_s*��\_s*��\_s*\%(�[\_s*[�g�^]\|�C\_s*�^\)\|�x\_s*��\_s*\%(�g\|�^\_s*�[\)\|�m\_s*�b\_s*�N\|�l\_s*�[\_s*�u\_s*��\|�M\_s*��\_s*�X\|��\_s*�O\_s*\%(��\_s*��\_s*�h\|��\_s*�b\_s*�V\_s*��\)\|�b\_s*�`\|��\_s*\%(�[\|��\_s*��\_s*�O\|�t\_s*�H\_s*��\|�z\_s*��\)\|�O\_s*�W\_s*\%(�b\_s*�g\|�X\_s*�g\)\|�N\_s*\%(�X\|�A\_s*��\_s*�e\_s*�B\)\|�X\_s*�t\_s*�@\_s*�n\_s*��\|��\_s*[�A��]\|��\_s*\%(�[\_s*\%(�X\|�U\_s*�[\|�T\_s*�[\)\|�C\_s*\%(��\|�U\_s*�[\|�T\_s*�[\)\|�u\_s*��\)\)\|�E\_s*\%(�[\|�W\_s*�F\_s*�[\_s*�k\)\)',
+      \ 'f' : '\%([�[���Ή������M�֓~�����y�`�[脟T����͈�j�͊ȎD�^����J㬐�䔕����b�ʟ��X�䙆�������앶�|�����������������t�y���M�D���������၂�⁃��������������᳍Ę��W�o�����K���敖�lᆕ�慊����p���̐k⿕�谌���P�c��霜i�������񕥕����h������u���C�����c�������ޔX���܊ܕ����t�e�������������o���o���n劚������]�w�w���S�ܙ󕄉畆���y�D�X���Y�|�������[��~�Y�������\�V�~���z�����B�U�v䘕�㧕����Е��t�s���D�z�@����缕u���•t�����b������ҕ}��G�H���������t�{䎙���ʖ|�ӂ��S���́��x�܋����ŋU��󕤕��t����F�U��f]\|�\_s*�\|�b\_s*�t\|��\_s*��\|��\_s*��\|�A\_s*�X\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*�i\|�}\_s*��\_s*��\|�C\_s*�f\|��\_s*\%(�C\|��\_s*[����]\)\|��\_s*�C\|�_\_s*��\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*��\|��\_s*�c\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[���R]\|��\_s*�t\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�Q\_s*[�l�“�]\|�h\_s*��\|2\_s*\%([�l�“�]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*��\|��\_s*��\|��\_s*��\_s*�o\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|�_\_s*��\_s*��\|�`\_s*��\|�z\_s*\%(��\_s*�C\_s*�G\|�C\_s*��\|��\_s*\%(�}\_s*\%(��\_s*�g\|��\_s*��\)\|��\_s*�A\_s*\%(�~\_s*�h\|��\_s*�f\_s*�q\_s*�h\)\)\)\|��\_s*�t\|�@\_s*�\\|��\_s*��\|��\_s*��\_s*��\|�C\_s*��\|�q\_s*\%(��\|��\_s*�[\_s*[�Y��]\)\|��\_s*1\_s*�v\_s*�f\|�P\_s*\%(�^\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*�s\|�n\_s*\%(�G\|��\_s*�u\_s*��\|��\_s*��\)\|�_\_s*��\_s*��\|�e\_s*\%(�P\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*�g\_s*��\|�G\_s*�t\)',
+      \ 'g' : '\%([���E�D��ĉ�愍��܍��Ό���՘��ᖈ�@�W龚����o�X�����ߍ��n�S�����΍���������c�r���Š�����穚�������ꇟ|�����ߍ��������܌�����������Ɍ݌��ߋɉz��5⺙Z��䲌�뛈�T���ގq�I�w���x�ౌ�免@�㓆��������驌�纞���Q��������|��k��轚��nj}�~�|�Y�P��ꖕF���q�Ù����䋌�ῌ��V�Ȍ��������������������������Z���ɉĉ����R�т��C��������򕳕ȍ��I�Ƒq���ʌ���䣋����X���ȋ{�������j㸌S�Q�R�����ԋ����g���O��H�ً�����F���[�h���ߌ��N��ۋ������қ��ً�⚞�����f��耋ʋ������z��C�Č��ɛ���邙F�‹ƋŋÍs�ኋs�t�_�C�F�c��E�ٌV㺌�����~�E�[���]供ҋb�U�a�X�a�^�؋W�`ซZ鰒��\�Y�V�E���_�㎆雔������Wᥟd�m�A�ԛݔ��v�����ʊ��ŕ��꓁��^�`���e��寊����q���I�}�d�P�j�k���h����G�_�~�������܌�����������ݙʊہ���꜋��܊���������ߌ����猎���|�罚ْ�ꛞٛ{�Ӝ��ԙ��k�z�x�{�y�w�����R������♓�G���N��᳚P�U���n᫊Y�P�K�w䈊H�V�Q�Z�S�X�M�T�W�[�O�a�䉾��G���ώ؉���@�݉��ɑ֑��`�މ���b�����ʉꏑ���͉뛴��䮔���|�P���M�A���₪�⁄�������K�S�����Ƀ������������̓��Ѓ˃��σ��ȃ̃ǃ��ƃʃ����Ã��ƒ��Ճ��΃��у����҃����ă��Ӄ��ԃ��ŃփM�O�s�����Q�Cg]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�S�Q�O�M�K]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*�~\|��\_s*��\|��\_s*�y\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*�s\_s*��\|��\_s*�q\|�H\_s*��\|��\_s*��\|��\_s*��\_s*��\|�~\_s*��\|�i\_s*\%([�ԉ�]\|�V\_s*��\)\|�P\_s*��\_s*��\|�]\_s*\%([�ÌΏ��B]\|�k\_s*��\)\|��\_s*[���`]\|�\_s*�\|�w\_s*�\|�i\_s*�F\|��\_s*��\|��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[���ō�]\|��\_s*��\|��\_s*�E\|�\_s*�\|�~\_s*��\_s*��\_s*�F\|�H\_s*��\|��\_s*[��Ս��i]\|�g\_s*�@\|�\_s*�\|�{\_s*��\|��\_s*\%([�알]\|�Z\_s*��\)\|��\_s*\%([�@����]\|�s\_s*��\_s*��\|��\_s*��\_s*�@\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*�c\|��\_s*��\_s*�J\|��\_s*�t\|�L\_s*�q\|�Y\_s*��\|�\_s*�\|��\_s*��\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*�^\|�b\_s*��\|��\_s*��\|�k\_s*�[\|�f\_s*\%(�n\_s*�q\_s*�n\|�a\_s*��\_s*��\_s*��\|��\_s*��\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|�X\_s*�|\_s*�b\_s*�g\|�p\_s*��\|��\_s*��\_s*��\)\|�j\_s*��\_s*�[\_s*�Y\|�m\_s*�[\_s*��\|��\_s*�i\_s*��\_s*��\|�A\_s*��\_s*��\_s*�R\_s*��\_s*�i\_s*��\_s*��\|�q\_s*��\|�N\_s*�b\_s*�p\|��\_s*�q\|�n\_s*�{\_s*��\_s*�[\_s*�l\|��\_s*��\|��\_s*�[\_s*�e\_s*�{\_s*��\|�G\_s*�[\_s*�e\_s*�{\_s*��\|�C\_s*�F\_s*\%(�[\_s*�e\_s*�{\_s*��\|�e\_s*�{\_s*��\)\|��\_s*��\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|��\_s*��\|C\_s*L\|c\_s*c\|�J\_s*�b\_s*�v\|�^\_s*�C\_s*�v\|�X\_s*�|\_s*�b\_s*�g\|�p\_s*��\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(�t\_s*�@\_s*�C\_s*��\|�A\_s*�j\_s*��\)\)\|U\_s*I\|N\_s*U\|O\_s*�T\_s*�C\_s*��\|E\_s*T\_s*��\_s*�\\_s*�b\_s*�h\)\|�w\_s*\%(��\_s*��\_s*�h\|��\_s*�}\_s*��\)\|�h\_s*�C\_s*�c\|��\_s*�g\_s*�v\_s*��\|�[\_s*\%(��\_s*\%(�`\_s*��\|�j\_s*�E\_s*��\)\|��\_s*�N\_s*��\_s*�b\_s*�v\|�m\_s*�A\|��\_s*�g\_s*��\_s*�}\_s*��\|�l\_s*\%(�R\_s*��\|��\_s*\%(��\|��\_s*�X\_s*�g\)\)\)\|��\_s*\%(��\|�w\_s*�@\_s*��\)\|�W\_s*\%([�����W�O�m�i�I���[]\|�v\_s*�V\_s*�[\|�A\_s*��\|�b\_s*�h\|�C\_s*�h\|�^\_s*��\|�[\_s*��\|��\_s*�A\_s*��\|��\_s*�b\_s*�g\|�S\_s*��\|��\_s*\%(�t\|��\_s*\%(�h\|�f\_s*�B\_s*�[\_s*�m\)\)\|��\_s*\%(�[\|��\_s*�h\)\|�o\_s*��\_s*�V\_s*�[\|�u\_s*\%(��\|��\_s*��\_s*�^\_s*��\)\|�x\_s*\%(��\_s*�i\_s*�E\|��\_s*��\_s*��\)\|�l\_s*�b\_s*�g\|��\_s*\%(�b\_s*�g\|��\_s*�@\_s*��\_s*[�j�i]\|�o\_s*��\_s*[�j�i]\|�R\_s*\%(�[\_s*�\\|��\_s*�_\)\|��\_s*\%(�W\|�_\_s*�[\_s*�m\)\|�[\_s*\%(�W\|�[\_s*�b\_s*�g\)\)\|��\_s*\%(��\|�C\_s*\%(��\|��\_s*�Y\|�A\_s*��\_s*[�c�g]\)\|�R\_s*\%(��\|��\_s*�b\_s*�e\_s*�B\)\|�[\_s*�}\_s*��\)\|�j\_s*�[\|��\_s*\%([���l]\|�[\_s*�b\_s*�y\|��\_s*\%(�A\|�[\_s*�j\|�G\_s*�b\_s*�^\)\|�k\_s*\%(�r\_s*�G\_s*�[\_s*�u\|��\_s*�B\_s*�G\_s*�[\_s*��\)\)\|�F\_s*\%([�����t���}�l]\|�X\_s*�`\_s*��\_s*�[\|��\_s*�j\_s*��\|��\_s*\%(�[\_s*[�g���h]\|��\_s*\%(�h\|�f\_s*�B\_s*��\|�_\_s*�C\_s*��\)\)\|�~\_s*�j\|�j\_s*�[\|�m\_s*\%([�A�o]\|��\_s*�@\|��\_s*�[\_s*�Y\|�T\_s*�C\_s*�h\)\|��\_s*\%(�}\|�g\_s*\%(��\|��\_s*[�B�[]\)\|�_\_s*�[\)\)\)\)',
+      \ 'h' : '\%([Η���䀉������L�N������{�����w�ʔM��S�ܖŖy�j��壌u�������ׁ����󜓏c�����������]�K�g���֚��\✖{�x�j�ښ��N���W�����œY��u���q�������I��c�_�����p��沖Q���}䚑�鵖N��闈������{�B�P��a����H��������K�A�O�f�D���G�̜d���M�O�E�v����L�C����󝻝��e�M�іk���@��棕��n�ܚ��O�􍛕䕒�e�K�̚����M��ꅕߒ��J�~���s���܉Y癗_��͌���������z�u���`�œL�K���������H����Q蓕��Q�����ɕ������E憕��w��ǝ́ݕՕ��x�ҝG���ٖݕ͒�⍛i���y�Q�a������Û��z�˕r�������Ǖ•���糌�������粐��w�˂�̘[���Ή������։A�~�����y�`�[脟T�Ǐ͈�͊ȎD��^����J���㬐�䔕����b�ʟ��X��䎟������앶�|�����������������t�y���M�D���������⁄������������᳘��W�oB���K���敖�lᆕ�慊����p���̐k⿕�谌�ꄜ�霘Ŝi��������F�������Ӌ��h������u�ⷁ��������ޔX���܊ܕ��t�e���������o���o���n劚������]�w�w���S�ܙ󕄉畀�y�X���Y�|�����[��x�~�Y�����\�~�������B�U�v䘕�㧕����Е��t�s���D�z�@����缕u���•t�����b����ҕ}��G�H���������t�{������V�Q�_�~�P�c���ݕA�S��鯏G��G�哝��ǁ|�ጄ�Չ��颕E�j�h�k�_�l㏟q�o���ĕn�m�p�g�i���ם��ʕf�g������R�ʒ��J���I�����������@������P�������v�����z�h�啸���Ǐ��d�֋Ϗ��ē����d�ΒP�ՓƑ��m���l1�P�u��ഁ����H�͏ݝf�ە��\�P�F�t��鷑M���J焕S���Z���O�z���n�I�Q�T䊌��Q�P��㟋������j�E���W�q�G���g��ϏE�S���h������ꤊ����[�O�G�m�T�_�A�L�����J�C�N�ȕL�D�l���J�C捍����r�M�K��g�H�I�j�u�q�~�U銕V��G�^�Y�~�Z�֙��d���ߕ[�]�W���\���{�_�i���u�y�w�����������D���ڔ�ޝ�����ّޔٔ۔���唊�����X�䙶�O�����g����������|����������]�`���ۘ�ҍ���澝���ΞK������瀊��]��ݔ��B�B���w��ߛE�ܔ��O���栂�ʎ������z�j�H���ԗ󌃙����㔈墏Ȝ[���O���X�J��y������ٓ�}�j�݋Е��o������ޝ՝؏��ދ@�@�T�m�����ה�������喗��I���j���Y�D���s���c�P�����Ĕ��J�`������e������ƈ���n�]�n�G���|�F�ɉ��������Iꡓ��z�y���t������妝p�������p�������S���Ɨ����|杙�����b���r�@�؉��X��瞞d�z���x�X�򒌑������\������➕��^��⦔���������R�x�펾�њ����������虘������NJ����A���M���������������唏�����隤�R�����d�ʌv�}�є������`���ڔ������񏉘o�@��W���Iᢔ����@�������������Ҕu��ښ�������輏��v�`��u�i�����t���\�E�C�p��Bᓔo�x�ޔy�w�W��p�r�q�s�D�z�Ȕ֟����N�W����⛔����a�J������Í➷�^䗖}ፖ|���Y�K�唺�Ϟϔ��ٔ��͔�㆔הєŔ����Ǎ�ʔƔɔ̔Ĕ����Д����_�l���y�P㵔��Ôf��ڙ����h�ޝ��������c�j�p���b���h��[�e����n�U��f���ƙ��ȉH�i�����������Ց��f���͚��ĉʒ���蘗t�d��۔��ǐH�m�c���J����঑|��ꏛƓ\�͂����������������������������������������������g�]�t������q�z�w�nh]\|�\_s*[�����]\|�b\_s*[�z�w�t�q�n]\|��\_s*[�قւӂЂ�]\|��\_s*��\|�q\_s*�K\|�\_s*��\|�m\_s*[�C�F]\|��\_s*��\|��\_s*�}\|��\_s*[�ΐ�]\|��\_s*�{\|�S\_s*��\|�_\_s*��\|�p\_s*�K\|��\_s*��\_s*�F\|�g\_s*[��]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|�\_s*�@\|�a\_s*��\|��\_s*�q\|�|\_s*\%(�\\|��\_s*��\)\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*�i\|��\_s*�C\|��\_s*��\|��\_s*��\|��\_s*�~\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[���R]\|��\_s*�t\|�k\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�h\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|�~\_s*�~\_s*�~\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|�]\_s*�c\_s*��\|��\_s*��\|��\_s*�I\|��\_s*�\|��\_s*��\_s*��\|��\_s*�@\|�_\_s*[����]\|�I\_s*��\|��\_s*��\|�i\_s*�a\|�\_s*�\|��\_s*\%([�l�o]\|��\_s*�o\_s*��\)\|��\_s*��\|��\_s*��\|�f\_s*��\|��\_s*�V\_s*�q\|�_\_s*[����]\|��\_s*�l\|��\_s*[�ƁX]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*�f\_s*�]\|��\_s*��\_s*��\|��\_s*[�c��]\|��\_s*��\|��\_s*[�������B]\|��\_s*��\|��\_s*��\_s*��\|�h\_s*��\|��\_s*[�j�s]\|�K\_s*�W\|�e\_s*��\|�W\_s*��\|��\_s*�q\|��\_s*�q\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�`\_s*��\|��\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|�o\_s*��\_s*�|\|��\_s*�E\|��\_s*��\|��\_s*[��]\|�y\_s*[�����t]\|�q\_s*[�f�C]\|��\_s*�t\|��\_s*��\_s*�l\|��\_s*��\|�x\_s*�q\|��\_s*�J\|��\_s*��\_s*��\|�Z\_s*��\|��\_s*��\|��\_s*�]\|�K\_s*[��q]\|�{\_s*\%(��\_s*��\|��\_s*��\)\|�E\_s*[���l]\|��\_s*�s\|�w\_s*��\|�Q\_s*\%([�l�“�]\|�O\_s*[�Γ�]\)\|2\_s*\%([�l�“�]\|��\_s*��\|0\_s*��\)\|�W\_s*�|\|8\_s*��\|�q\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|�C\_s*\%([��i�f����]\|��\_s*��\_s*��\|�f\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|�F\_s*��\|��\_s*�a\_s*�_\_s*��\|�E\_s*�[\_s*�S\|��\_s*\%(�[\|�y\_s*�[\_s*��\|�x\_s*�[\_s*��\|�C\_s*�X\_s*�}\_s*��\_s*�X\|�S\_s*�[\|�O\_s*�m\_s*�[\|�}\_s*�j\_s*\%(�e\|�X\_s*[�g��]\)\)\|��\_s*��\|�\\_s*�Z\_s*�i\_s*��\|��\_s*��\|��\_s*�`\|�C\_s*\%(�_\_s*��\_s*�S\|�X\_s*�p\_s*�j\_s*�A\|��\_s*�[\_s*��\|�G\_s*��\)\|�g\_s*\%(��\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(�W\|�a\_s*��\_s*��\_s*��\)\)\|�I\_s*\%([���[]\|�i\_s*�[\|�m\_s*��\|��\_s*�t\_s*��\_s*�[\_s*��\|�l\_s*\%(�X\_s*\%(�g\|�e\_s*�B\)\|�Q\_s*��\)\|�e\_s*��\|��\_s*�K\_s*�[\|�}\_s*�[\_s*�W\_s*��\)\|�A\_s*\%(��\_s*\%(��\|�x\_s*�[\_s*��\)\|�l\_s*�X\_s*�g\|��\_s*�[\|�_\_s*�}\_s*�[\_s*��\|�V\_s*�F\_s*�b\_s*�g\|�r\_s*�^\_s*�V\_s*�I\_s*��\|�[\_s*\%(�l\_s*�X\_s*�g\|�m\_s*��\_s*�N\_s*�[\_s*��\)\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�J\_s*�b\_s*�v\|T\_s*\%(M\_s*L\_s*�t\_s*�@\_s*�C\_s*��\|T\_s*P\_s*�T\_s*�[\_s*�o\)\|D\_s*D\_s*��\_s*�R\_s*�[\_s*�_\_s*�[\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|�G\_s*\%(�f\_s*�B\|��\_s*��\_s*�P\|��\_s*\%(�i\|�[\_s*�k\)\|��\_s*�C\_s*�[\_s*�Y\|�N\_s*�g\_s*��\|��\_s*\%(�Q\_s*��\|��\_s*�F\|��\_s*�X\|�}\_s*��\|�~\_s*\%(�b\_s*�g\|�[\_s*�g\)\|�u\_s*��\_s*��\|�i\_s*��\_s*�f\_s*�X\|�L\_s*��\_s*�[\_s*��\)\|�m\_s*�N\|�C\_s*�`\|�b\_s*�`\)\|��\_s*[�╽�f]\)',
+      \ 'i' : '\%([��Ń��~��ꍘc�T�U���������n�������翔�䑌��폒��������恍ݍ��������r�x�������É��j囚|���d�Q�U�����|��Ɨ��������B�d���{��佈�S�\嫉�䆍��m�n�ؐF���A�t����F������̌Ì��䉳�L���d�������ƜјJ���i��ꌒ��Օa�k�v����ɔžo�������֍����y�󙬌M���E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�������N�~�}�z�c���c�t��硉Ɏ������䕟J����s�W���]�b�K�\���T��ซ]�r䟈��Z�Л��T������m�����Ĉ��M�ßΉ����C����������m��覉@������B�u�A�A�܊���j�H���ڈ�Ί�ֈ�Y�È�1�P���y���D���I��D�R������۔шዏ���ܐ��R�Δ���đP�_�ʈމ‘��E�h�����e�˗v�֍s�}�وߐ��ƈݟ��D�ᒒ�K�֋��҉]�����~�˓��шڏ�����Η��͛H������B�܈횀�}���ՋU䏜S�Ή�������u�������Ј׈ۈӘߗǔ@�b�ߏo�������؈�U�w����͉��]��ਖ��看�̈��g�؂��X�J�z���ˁ��������ɂ�������D������灿�h�C�I���y����i]\|E\_s*��\_s*�[\_s*��\|�a\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|�c\_s*�J\|��\_s*��\_s*��\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�@\_s*��\|�h\_s*[�‘�]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�E\_s*[�c�R]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�a\_s*��\|�C\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�w\_s*�h\|��\_s*��\|�]\_s*[�햅�o�Z]\|��\_s*��\|�K\_s*�{\|��\_s*�q\|�_\_s*��\|��\_s*�r\_s*��\|��\_s*��\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*��\|�p\_s*\%(��\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[�ō�]\|<\_s*=\_s*=\_s*>\|�K\_s*�v\_s*�\\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*�{\_s*�A\_s*�C\_s*�E\_s*�r\_s*�[\_s*�E\_s*�G\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*�w\|�W\_s*��\_s*��\_s*�@\_s*�\\)\|�t\_s*��\_s*�U\_s*�t\_s*�[\_s*��\_s*�G\_s*��\_s*��\|��\_s*��\_s*�q\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*�^\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�A\_s*�[\_s*�@\|��\_s*��\_s*��\|�s\_s*\%([�”@��]\|�[\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�S\|I\_s*\%([rPn]\|R\_s*Q\|�J\_s*�b\_s*�v\|C\_s*\%(�^\_s*�O\|�`\_s*�b\_s*�v\|�J\_s*�[\_s*�h\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(�R\_s*�[\_s*�h\|��\_s*��\)\|A\_s*�o\_s*�X\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(�J\_s*�[\_s*�h\|E\_s*\%(�h\_s*��\_s*�C\_s*�u\|�f\_s*�o\_s*�C\_s*�X\|�P\_s*�[\_s*�u\_s*��\|�R\_s*��\_s*�g\_s*��\_s*�[\_s*��\)\)\|�^\_s*�[\_s*��\|T\_s*\%(�V\_s*�X\_s*�e\_s*��\|�o\_s*�u\_s*��\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|��\_s*\%(�A\_s*��\|�V\_s*�t\|�[\_s*�h\|�E\_s*�f\)\|�A\_s*\%(�C\|�[\_s*\%(��\_s*�B\_s*��\|�r\_s*��\)\|��\_s*\%(�v\_s*��\_s*��\_s*�v\_s*\%(�`\_s*��\|�e\_s*��\)\|�f\_s*�p\_s*��\_s*�_\_s*��\|�t\_s*�H\_s*��\_s*\%(��\_s*��\|�}\_s*�e\_s*�B\_s*�[\_s*�N\)\)\)\)',
+      \ 'j' : '\%([���󓈓����Ȟ펱���Ǝ��w�x�����H���Û�����K�������b�����H�ז��iᶘ���u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l���䥞`���œ���ҏ��t����J�珊�R�������P���������t�i���g��������Y�U���{�����ㅐ���媚ߘ����j�h�Ř�竐��ҝm���Y�o�@������Ï��ꏗ�����`���~��]���吷�꞊��󝵏������������������휵�h�G�ڜ����G��Q榏A�@���u�Q���h�x�m��n���p�q⢓ď��m�Ï|�m�����՟��~�[���x��{䤏��z���������y�}������汛}����������杆�n�G໒��^�E���☸�s�F��_�`���O�c�a�_�Y���[�]�b�\�Z�e�d�����ꎠ���������������m��䢛y���k�������d�����H���m���ˎ����掝���~�Ŏ����n�~���I���m熉a��玘����J�Ȏq����j���^�Z�������i�������V���ݒ���䝎�ڐ�����׋Y�Ҏ��l苂��������������������D�u�E�����`���_���F�v�z�J�Wj]\|�\_s*�\_s*�\|�b\_s*�W\|��\_s*��\|G\_s*\%(��\_s*��\|�p\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�c\_s*��\_s*\%(��\_s*��\|�c\_s*��\)\|�Q\_s*��\|2\_s*��\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|�O\_s*��\_s*��\|��\_s*��\|�G\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\_s*��\_s*��\_s*��\|�[\_s*��\_s*�[\|�G\_s*\%(�z\_s*�o\|��\_s*�R\|��\_s*�~\_s*��\|��\_s*�T\_s*��\_s*��\|�b\_s*�T\_s*�C\)\|�w\_s*\%(��\_s*�X\|�X\_s*�X\)\|�q\_s*��\_s*�l\_s*�X\|�`\_s*�Q\|�k\_s*��\_s*��\_s*�[\_s*\%(��\|��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\_s*�@\_s*��\_s*�w\)\|�n\_s*\%(�C\_s*��\|��\_s*�y\_s*�[\_s*�j\_s*��\)\|��\_s*��\|��\_s*\%([�����j�i�[]\|�C\_s*��\|�G\_s*��\|��\_s*�m\|��\_s*�h\|�k\_s*\%(�X\|�V\_s*��\)\|�X\_s*�p\_s*�[\_s*�X\|�R\_s*[�r�u]\|�b\_s*�P\)\|�t\_s*\%(�@\_s*[���i]\|��\_s*[�I�A]\)\|J\_s*\%(R\_s*��\_s*��\_s*�{\|\.\_s*S\_s*\.\_s*\%(B\_s*a\_s*c\_s*h\|�o\_s*�b\_s*�n\)\|��\_s*�[\_s*�O\|�J\_s*�b\_s*�v\|C\_s*B\_s*�J\_s*�[\_s*�h\|-\_s*P\_s*O\_s*P\|�|\_s*�b\_s*�v\|P\_s*\%(G\_s*�t\_s*�@\_s*�C\_s*��\|E\_s*G\_s*�t\_s*�@\_s*�C\_s*��\)\|I\_s*S\_s*\%(�}\_s*�[\_s*�N\|�R\_s*�[\_s*�h\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*�R\_s*�[\_s*�h\|V\_s*A\_s*\%(�X\_s*�N\_s*��\_s*�v\_s*�g\|�A\_s*�v\_s*��\_s*�b\_s*�g\)\)\|U\_s*N\_s*E\_s*T\)\|�Y\_s*�{\_s*��\|�i\_s*\%(�Q\|�|\_s*�v\_s*�`\_s*�u\_s*�d\|��\_s*�[\_s*�O\|�J\_s*�b\_s*�v\|�|\_s*�b\_s*�v\|�h\_s*�b\_s*�b\_s*�o\_s*��\|��\_s*��\|�t\_s*\%(�r\|�m\_s*�j\_s*�n\)\)\|��\_s*\%([�n���_�m]\|��\_s*�Q\_s*��\|�[\_s*\%([���m]\|�Q\_s*��\_s*�g\|�f\_s*�B\_s*�b\_s*�g\)\|��\_s*\%(�O\|�P\_s*��\|�J\_s*�[\)\|�s\_s*�e\_s*��\|�b\_s*[�J�V]\)\|�C\_s*\%(�G\_s*\%([�i�X]\|��\_s*\%(�X\|�Z\_s*��\)\|�Y\_s*�X\)\|�F\_s*\%(�i\|��\_s*\%(�X\|�[\_s*��\|�Z\_s*��\)\|�[\_s*�K\_s*�[\|��\_s*\%(�N\|�T\_s*��\_s*��\)\)\)\|�z\_s*\%([�^�Z]\|��\_s*�w\|�z\_s*�o\|�A\_s*\%(��\|�L\_s*��\)\)\|��\_s*\%([�u�i]\|��\_s*\%(�O\|�_\_s*��\)\|�G\_s*��\|�A\_s*\%(�L\_s*��\|�q\_s*��\)\|�[\_s*�t\|�V\_s*\%(�t\|��\_s*�A\)\|�[\_s*\%([�h�g]\|�f\_s*��\|�[\_s*�t\)\|�Z\_s*�t\|�n\_s*[�i���l]\)\)',
+      \ 'k' : '\%([����a���|�V�шҜ��D����ޏn�s���ߐ��E�}���Ĉ����ۗ�ᶎ��s�Д������f�����ꎖ������I���z�Eꑍ��C��欉��䓚�䢐����u�S�}┍��əY�`�n�����X���M���Ȝk�ύ����������������������卭�Ӎ��������e�W�՝��B�L�ݖ����ϙi���Ҕ��Q�b��m��秘j���t����R���K�{�M�������`肍��ȎL琍f�ݚJ��k�i���Q���硟��L��������s���J��������𔸙��l���E�H���n�r������੘m��t����൙��{�X�������E���R�n㝍h�����}����H�y�ߝK�朑�����n�K�}��֞��\��囍y��ෙ��Μˍx����u�X�S�e倘����J�i�^���’@�V���A�W����썄�G�D�T����ᩍ`�p��᧍B�]�i�P���I���z�t�_���k�K�O�j�R�w�U�u�P�I�a�|�q�s�m���c�D�r�����J�L�ޛ��ܝ��w�΍������������я��W�g������V�����ڐ�������������မZ�čᑆ���ՙs�|�˙�Z�����e�q�؝s�Z���hⰍ����Čٕ֒��]�e�ۏ���㨏��h��ן�z�ÌП�绌�ꉍ�����烜��������ًÌnj΍��@�u�x�삱��s�|�q���W���O�׏b����]�{�Ȍ��t��_����^晘�P�Θn�[�B�����ӐK���r����K�{���������y���L���������C�[��N訙��i�٘����_���ݟ]�ܜ��p���������w���ٝ�惞��J���J�������ʌ�����㮛ӌ��@���ę�������F鄌������������������������������Ō������ښ�_����犙g���D������Ϟf����Z�w�c�l�|�����l���k�a�����l�㋜��d��P�n�������������������������������������������������������r�z������壌u�殌e�k�\�g��b�Y�p���]�v�[�ٖяR������Ɣz���z�M�K���ɞ���ⱟJ��㖍򍥛������I�����H���E���b�z�o������x�A�ܗ����D�B��ӏ��~���������B䱌s���Z�Yᯙ������Ӟ�ᮛ��M�ֈ��v���ڌL�����K�@����{���^���Z�򏾓�^�����č�㦖�鶔�ňʈ��U�Ñq���������C�~���ܒw�o�^������鿌~�G�F䇚����`�p�̃��L�Y���������ƌI��ގԚ��P�M�����E�u�����{���O���o�Ӟ������c���������m���ċ��ᙊ�H�M��῍C��​晠�J����v�͎ތɜ��g�ˍg�H��ܜ����|�E���؂���i���w�J�G�r���z��W���_���_�l���o�C∋̛����m���G������摋d�򐟏~����焌N��۟@�A���^�ϛ��l�ɝh�h�f�k�e�i�d�_���A���Z��߁D���O�񁣁��M�������Q�����G�������E���������^�����|�P���X�����Y�T���\���N��{�H�R�c����a���K���S�L�B�}�b��܁������C�⁃�������������I���J����ʁ����]�[�䁏�F�Ɂ��W�����V�W�������U���s�ה܍@���ߍX���������a�n�݋j�����~�g�����ˋ������R⮝v�����������v�[⯙ߋ��������a�z�ҝ��Ћی��׋؋ы͋ՋӋϋދًԋߋ֋����_����������⦉R䐘��c�`篋��ы��������������������Nj����������������蝋���⟙K�� ��s㳝O�v�w���S�����y��⸋��t�������|�^�v�O�t���I�[��h➍F���������p�����Z�i�g���݌����������x�������Z�Nj����]������䰚񋧋��������o����運��d�����������������������q�k��������p�t瓜��_溈��ڂX�}��緋���k�����Ë����u�������y�Z�������|�P�l�{�v�����u���������x�~�}���z���֘Ғ���ڙr㱋F���M�N���P�����؋B�Y���������y�����q�V�����H�P��鉩���Y�{�d��O恊��k�ɋL�ƚ_�Κ�G��h�����U���ȝ��M��針��i����D�������ʞX�����M�J��k�E���˝����I���b�_����������J�㙒�B�C�����b�쟃���������a�u�Q�W���Q����X���q�S���c����ߟ�����D�W�P�^���H���r�u看R�u�K�鞗�������y���NJ��r���݊��j���ƌy���Ĉꁽ�e�A���i������������M��ꝕr�P�T�M�����v������r��ᚁ����f�j�s�e�h�o�q�g�p�t�r���ƒb��鹜��NJ����D�R���U�ğd�z��ᥕ��p�ȌڋA���Ԏ��‹_雔B�ߗ��ދȋ�\�����Ί����ۖ͋w�d�T��e�z�J�x���Ō`�ӕ��^�������Ȕ��H�����X�R�C���P��������q�Š�������閔����@�ϞJ���{��������艁�嶔��㹊������|�ؙ��^������歒S�����e顊��j舊��������s���Fጐ��d�P�}���g�����y�a�`�f����S�W���m�����e��O��ݑ��]�ڛ��̊��Ŕ����@���쁨�F�����O���k�P���[�\铑���ಉG�h�@���󓂞Њ����~�y�ۍ\�������}�����ɐ��͘����V��،����~ऐ����c���͌��b���u�w��v�x�X�Õ��L����ꖊ��C�ƓK�G�S�R魓C���Ј����ߕK�v���֓S哑t�������ݓk�����䡞��S���湝���誜����vᙊd�n�]�Q��L�ڒ�������I跏ʜ������h���\�f�r�l�y�m�z�n�k�k�g�c�s�t�i�o�݉B�v�d�ߝ��j�l�g�q�u�p�m�G�d觛��Z��嵙��j珚����Ԙ��B�i�W�q�����r���[���~�����D䠊^�񔐘��\�X����{�Ž\箊I�ؘ�����r�H�_���������j�~�_�F���׊@��E�m�����L�G���D�ŊA���������K���J����C���`���՚Q�ɟ��I�W錟a��檚��A洚��j��b�a�Y���ホe�⻞�䯙��q���T�㻛f�p�����N��㼝��c���㣟��V�뙁���M����ϊ�䅟��j�F�r�����������ȟ�綝��m���l���b���˙����_�x�����pᒔ����c�A�g������|���}�����ۊ��@�يΞ��؊��󊩐��ȊҊ��@�����ʊ��Ş��̊��Ɋ��ƜA�L��萊ъ������š^�׊Ċ��ÊԊ��Պ��NJ����֊͊������ϊ��w����x�s�q�P�g�ӊe�����h���ӏ�Չɉ���Չ܃��`���͉��ތ��F㞉��S�˚Z���Q����草ؚm�׊]�����͉��ی�嗉��e�D��v�q������Ҏx�T�|�~���o戟ω̉ߍ��ю딃�̉ƞg��������`�ϙ�֑��d�U�������ݙJ�Ǝ��a������͉ۉ��я������ÚКk旓��z�Њ��|䑉�嘉�������㟉��q�ČC�����a�������{����斎؉�����҉ǟ���ϛ���◉Ή։���l�������߄��������V���R���`�����iK�N�~���q�ȃL���J�K���{�ԃPk]\|�\_s*[�����]\|�b\_s*[�R�P�N�L�J]\|��\_s*[�q����������]\|�O\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*�J\|�H\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*�y\|��\_s*�F\|��\_s*��\|��\_s*��\|�S\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|�O\_s*�A\_s*��\|�\_s*�u\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|�S\_s*[�Z��]\|9\_s*[����]\|�^\_s*�{\|�Q\_s*�O\|��\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*��\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�z\_s*�n\|��\_s*[�q�V��]\|��\_s*��\|�m\_s*�F\|�\\_s*�\|��\_s*��\_s*��\|X\_s*e\|�@\_s*��\|��\_s*�s\|��\_s*��\|�f\_s*�n\|�\_s*�\|�\_s*�z\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|�e\_s*[����]\|�o\_s*[����]\|�j\_s*[����]\|�{\_s*��\|�n\_s*��\|�X\_s*\%([���]\|��\_s*��\)\|��\_s*��\|��\_s*�Z\|��\_s*�q\|��\_s*�T\|�\_s*�\|�z\_s*��\|�\_s*�x\|�R\_s*\%(��\_s*�q\|�z\_s*��\)\|�j\_s*��\|��\_s*��\_s*��\_s*��\|�}\_s*��\|��\_s*\%(��\|�`\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*��\|�V\_s*\%(��\|�l\_s*��\)\|��\_s*�q\|�|\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|�t\_s*��\|�\_s*�r\|��\_s*�Z\|�|\_s*��\|�]\_s*��\|�\\_s*��\|��\_s*��\|��\_s*�q\_s*��\|��\_s*[�a�y]\|��\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*�R\_s*�q\|�\_s*�\|��\_s*��\|��\_s*��\|�y\_s*��\|�A\_s*�g\|�g\_s*��\|��\_s*�t\_s*��\|C\_s*\%([ormdaf]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|�q\_s*��\)\|�\_s*�\|�\_s*�\|�Z\_s*\%(�c\|�C\_s*��\)\|��\_s*��\|��\_s*[�{���v]\|��\_s*\%(��\|��\_s*�s\_s*��\_s*��\_s*�w\_s*�Z\_s*�p\_s*��\_s*�w\)\|(\_s*��\_s*)\|��\_s*�q\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|�m\_s*\%(��\|��\_s*��\)\|�~\_s*��\_s*��\|�o\_s*�c\|�Y\_s*�t\|��\_s*[�I�v�_]\|��\_s*�_\|�B\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|�m\_s*\%([�u�E]\|�[\_s*��\|�b\_s*\%([�g�N]\|�e\_s*�B\_s*��\_s*�O\|�J\_s*�[\|�L\_s*��\_s*�O\)\)\|�i\_s*\%(�b\_s*\%(�N\|�v\_s*\%(�T\_s*�b\_s*�N\|�U\_s*�b\_s*�N\)\)\|��\_s*�b\_s*�W\|�C\_s*[�t�g�c]\)\|�j\_s*\%(�[\|�b\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\)\|�z\_s*\%(�[\_s*\%(�~\_s*�[\|��\_s*�C\)\|��\_s*�C\_s*�j\)\|�t\_s*\%(�r\_s*��\_s*�C\|��\_s*�V\_s*�`\_s*��\_s*�t\)\|�n\_s*\%(��\|��\_s*�V\_s*��\_s*�[\|�[\_s*��\|�o\_s*��\_s*�t\_s*�X\_s*�N\|��\_s*�c\_s*�[\_s*��\|�`\_s*��\_s*�g\_s*�D\_s*��\_s*�A\_s*��\)\|�j\_s*\%([�_����]\|�J\_s*�b\_s*�v\|��\_s*��\_s*��\_s*��\_s*�n\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'l' : '\%([��H����F����D����B����@�����ႌ�Q�P���������΁Ɂʁ́����ȃ������L�Ʉ|��l]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�t\_s*��\|��\_s*��\_s*2\_s*��\_s*�@\|\.\_s*\.\_s*\.\|�f\_s*�F\|��\_s*�z\|��\_s*��\|�E\_s*�G\|��\_s*��\|�w\_s*�K\|�{\_s*��\|��\_s*��\|�_\_s*��\|��\_s*\%([�L�C�A�����u�{�g���E�X�R�S�O�[]\|�y\_s*�X\|��\_s*�[\_s*��\|�G\_s*�x\|��\_s*��\|�t\_s*�g\|��\_s*�J\|�x\_s*��\_s*�A\|�r\_s*\%(�[\|��\_s*�O\|�C\_s*\%(�X\_s*�g\|��\_s*�O\)\)\|�e\_s*�B\|�T\_s*��\_s*\%(�W\_s*�F\_s*��\_s*�X\|�[\_s*��\_s*�X\)\|�j\_s*�[\|�N\_s*��\_s*�A\_s*��\|�b\_s*\%([�W�^�e�g�N]\|�L\_s*\%(��\_s*�O\|�[\_s*�h\)\|�J\_s*�[\)\|�P\_s*�[\_s*\%([�g�^��]\|�V\_s*��\_s*��\)\|�J\_s*�[\_s*��\|�K\_s*�[\|�M\_s*��\_s*�O\|�W\_s*\%(�[\|�e\_s*�b\_s*�N\|�X\_s*�e\_s*�B\_s*\%(�N\|�b\_s*�N\)\|�J\_s*��\|�N\_s*�[\_s*��\|�b\_s*[�g�N]\)\|��\_s*��\|��\_s*\%([�S�O�_]\|�{\_s*\%(�N\|�b\_s*�N\)\|�o\_s*��\_s*�f\_s*�B\|�Y\_s*�f\_s*�[\_s*��\|��\_s*[�[�B]\|�W\_s*��\|�h\_s*��\)\|��\_s*\%(�A\_s*��\|�b\_s*�^\|�[\_s*�k\|�C\_s*��\|��\_s*\%([�\�X]\|�c\_s*�H\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|�k\_s*\%(�T\_s*�C\_s*�Y\|�k\_s*�T\_s*�C\_s*�Y\|�t\_s*�m\_s*�`\|��\_s*\%(��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|A\_s*�s\_s*E\_s*�w\|��\_s*\%(��\_s*��\_s*��\_s*��\|�s\_s*��\_s*�w\|��\_s*��\_s*��\_s*�v\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|L\_s*\%([DP]\|�T\_s*�C\_s*�Y\|L\_s*�T\_s*�C\_s*�Y\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*��\_s*�C\_s*�g\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|��\_s*��\_s*��\|��\_s*\%([�B�Z�Y�U�T�X�_�|�������}�i�m���k�u�A�[]\|��\_s*�}\|��\_s*�h\_s*��\|��\_s*��\|�]\_s*�`\_s*�[\_s*��\|�R\_s*\%(��\_s*�X\|�s\_s*��\)\|�N\_s*�[\_s*�h\|�J\_s*\%(�[\|�I\_s*��\)\|�W\_s*[���[]\|�f\_s*[�B��]\|�h\_s*�J\_s*�C\_s*��\|�v\_s*�g\_s*��\|�p\_s*�[\_s*�[\|�O\_s*\%(�j\_s*��\|�i\_s*��\)\|�t\_s*\%([�G�g]\|�^\_s*�[\|�e\_s*�B\_s*��\_s*�O\)\|�e\_s*��\_s*[���V]\|�`\_s*�E\_s*��\|�\\_s*\%(�\\_s*�[\_s*��\|�O\_s*��\_s*�t\_s*�B\)\|�^\_s*�[\|�g\_s*\%([����]\|�}\_s*�X\|�A\_s*�j\_s*�A\|�O\_s*��\_s*�t\|�o\_s*��\_s*�X\_s*�L\_s*�[\)\|�I\_s*\%(�^\_s*�[\_s*��\|�l\_s*��\)\|�~\_s*\%(�e\_s*�b\_s*�h\|�b\_s*[�^�g]\)\|��\_s*\%(�[\_s*�W\_s*��\|�l\_s*��\|��\_s*�`\_s*�F\_s*�b\_s*��\)\|��\_s*�W\_s*��\|�L\_s*\%(�b\_s*�h\|��\_s*�[\_s*��\|�e\_s*��\_s*\%(�V\_s*��\_s*�^\_s*�C\_s*��\|�X\_s*�^\_s*�C\_s*��\)\)\|�G\_s*\%(�]\_s*��\|�[\_s*�W\_s*��\)\|�q\_s*�e\_s*��\_s*�V\_s*��\_s*�^\_s*�C\_s*��\|�l\_s*\%([�A��]\|�b\_s*�g\|�[\_s*�W\_s*��\)\|�j\_s*�A\|�x\_s*\%([����]\|��\_s*�A\|��\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�e\)\|�r\_s*\%([�A�[]\|�h\_s*�[\|��\_s*�O\)\|��\_s*\%([�X�[]\|�u\_s*��\_s*��\_s*�[\_s*�i\|��\_s*��\|�h\_s*�~\_s*��\|�N\_s*�T\_s*��\_s*�u\_s*�[\_s*��\|�b\_s*�N\|�V\_s*�A\_s*��\|�~\_s*�G\_s*�[\_s*��\)\|��\_s*\%(�C\|��\_s*�O\_s*�E\_s*�F\)\|��\_s*\%(�B\_s*��\_s*�O\_s*�X\_s*�g\_s*��\|�@\_s*\%(�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\)\|�o\_s*\%(�e\_s*�B\|�^\_s*��\_s*�A\_s*\%(��\|�j\_s*�Y\_s*��\)\|�v\_s*�[\_s*��\|�C\_s*�A\_s*�T\_s*��\)\|�b\_s*\%([�h�s�v�^�N�`�g]\|�X\_s*��\)\)\|�G\_s*��\)',
+      \ 'm' : '\%([ӊߊ㝪���ϙ~�E��ぞ���������J�I��䈐��Ўt�������u�q�v�U�p���ݑ���m�X�����ޖ��\�ҕ��~������⋖�̜����߉������b�f��{���e�����Җ۟������͟G㦖��̞N�����a�C�S�֖іЖҖԘR�֖]�r������R�ᑔ�Ȗ̞���k�G�ۖΖ���������ݒ����W�Ϗ����ږӛR��ㅖG�̜����b�p�cᾖɖ˖�ǖȖʟ���œ���Җ��ǖ��‰��ɏ��z�����܌�������ї�㸋X���ٟ}�ۖ��V�񛘊[������|��r���m��籑ΕS�}���Ɠ�絘A�W�p�����~�����׏@�����d����⚕ړk�����J⥐I���ßz峒������Ú��ۖ��ٖd�����x�������딍�Z�Q�������x���������N���a�D�Y�K�I����������C�T���ϗ��Η����������������������X�O�̎S�Z�����B�ꎨ�ݜD�X�����L�薦�ޑ��Ò��ف��v��p�󁨁z�x�E�G⊖����ɗΔF�����a�ϓ��r�ʘH�����飌Ύ��M倐�ᡞ��䪖��������s�{�S�A���Q���`�������捐����v���P�閨��{�F���������[�V�g���\�όȐf�Ŗ����m�O��[�����p���r�향��ϖ�▕n�������aῐݐ\�ן{�f�B坏�㇓�㕓I帑��]�^�ߋ[���]�H�o�q�h������Ɖ������M���ϔ�d�������h�q�ʌ��������ږ����p��鞔C����䍕������̓h�|�{���Ê�׈��w���e�l���C���������d��ꠖq�x�f���U����X���O��E���D�����K�B�j�i�~�ە��������בS�u�����Җ����K�������ĎQ��w�������Ęd�G����簖��a�ږ����_�����J�Z�Ֆ��攔��{����V�Ԕћ���I���ԙ��\�ݖ��ޖ���G�������M�����������挫�D�������󏫐����m��_����䝖��ڐ�����ɎU���]���v�^����������n�����v�G�ݕ���ᄎT�Ҕd�Ԗ��s�����Ȗ��܂��������򃀁����������⁆��܁}���́�����Ɂ䃢�ʁˁہ΁ځȁ��́�߁��~���݁����ま�ށ����֖����Z�����������|�}�Ń~�M���ʃ�m]\|�\_s*[�����]\|�b\_s*[�������~�}]\|��\_s*[���߂ނ݂�]\|�g\_s*[�����t]\|�o\_s*\%([��n�e]\|��\_s*��\|��\_s*��\)\|�\_s*�o\|��\_s*�y\_s*\%(��\|��\_s*��\)\|��\_s*\%([�p�e�n]\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*�z\_s*��\|�k\_s*�~\_s*��\|��\_s*��\|��\_s*�p\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|��\_s*�R\|��\_s*��\_s*��\|�j\_s*�E\|��\_s*��\|��\_s*[�N����]\|�n\_s*��\_s*�F\|�t\_s*��\|�J\_s*��\_s*��\|�v\_s*�w\|��\_s*��\|�z\_s*��\_s*�q\|�v\_s*\%([�����p�L]\|�`\_s*��\|�H\_s*�q\)\|��\_s*��\|�U\_s*��\|6\_s*��\|��\_s*�c\|��\_s*�w\|��\_s*��\|��\_s*�]\_s*�q\|�\_s*�n\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�Y\_s*��\|��\_s*�q\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|�t\_s*�m\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|�R\_s*��\|�\_s*��\|�e\_s*��\|�_\_s*[���q�`]\|�d\_s*��\|��\_s*��\|��\_s*��\|�c\_s*[�q����]\|�R\_s*[�“�]\|3\_s*[�“�]\|�p\_s*[��q��]\|��\_s*��\|��\_s*��\|�c\_s*��\|�C\_s*[�_�]���z���I�R]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|�y\_s*[�����Y]\|��\_s*�s\|�[\_s*�]\|��\_s*��\|��\_s*��\|�e\_s*�O\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|�s\_s*\%(��\|��\_s*[�]�_]\)\|��\_s*�l\_s*�}\_s*��\_s*�m\_s*�X\|��\_s*�X\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�X�Ќ���]\|��\_s*��\|�S\_s*��\|��\_s*��\|��\_s*�h\|��\_s*��\|��\_s*��\_s*��\|�{\_s*�B\|��\_s*�v\|��\_s*[�o����]\|��\_s*��\|�}\_s*�n\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*�b\|��\_s*�m\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|�|\_s*\%(��\_s*�l\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[�V��]\|��\_s*�F\|�S\_s*�j\|��\_s*�q\|��\_s*[�����P]\|��\_s*��\_s*�N\|��\_s*�v\|��\_s*��\_s*��\_s*��\|�j\_s*�[\_s*��\_s*�j\_s*�b\_s*�N\|�P\_s*��\_s*��\|��\_s*�c\|�a\_s*�z\_s*[����]\|��\_s*��\_s*�q\|��\_s*��\_s*�]\|�s\_s*[�K��]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*�h\_s*�q\_s*��\_s*��\_s*��\_s*��\|�{\_s*��\)\|�l\_s*\%(�g\_s*��\|�T\_s*�C\_s*�Y\|�r\_s*�|\_s*�c\_s*�n\_s*�r\|�k\_s*�T\_s*�C\_s*�Y\|��\_s*�D\|��\_s*��\_s*��\|��\_s*�b\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|�v\_s*�Z\_s*�@\|��\_s*��\|�U\_s*�b\_s*�w\_s*��\_s*��\_s*�}\_s*�]\_s*�b\_s*�z\|�n\_s*�s\_s*�I\_s*��\_s*��\|��\_s*�s\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|�C\_s*�m\|��\_s*��\|��\_s*��\|M\_s*\%([dgtnOo��]\|X\_s*�e\_s*��\_s*�r\|�T\_s*�C\_s*�Y\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*�T\_s*�C\_s*�Y\|P\_s*3\_s*�v\_s*��\_s*\%(�[\_s*��\_s*�[\|�C\_s*��\_s*�[\)\|D\_s*\%(�v\_s*��\_s*�[\_s*��\_s*�[\|��\_s*�R\_s*�[\_s*�_\_s*�[\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*�A\_s*�h\_s*��\_s*�X\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(e\_s*d\|s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|�G\_s*��\)',
+      \ 'n' : '\%([݃���ɈҘj�C�򝼏��M��l����A�j�������f���w�a�X��H�p���L�H�]�`��k�c��䊉ѓ���o���ў����و풨�{�E����J�돸�W�@���Ћ錛�K���N�X�I�͓T������G���c�I�X�^�]�\�_��L���|���Z�����ޟZ���ڔV�۔U����q�W��Țˑ_�o��D�E���^�J�C�ꋑl�X�L���i���������s�M൘J�K�R�������_�Q�O�R�N���Q�����q�P�H�ח��l�B�S���I���������\���啼�K���L刐@���z���X���ޓ����F�܍f�z�D���ѝU�{�z�h�G�E��Ɲ^吒S�����������L�����E���R�P�{�e�����֏��A��E��U�Д@���P����E�ɔB轟��W�����t�s��w�x�����Z�X���K�וf�n�E�͔D�F�C�l�����׋ѐ����V���_�����a���m����玘����Ɠ�Q�����2�O�ǎ�獂���r�W㊓��c����k�j�›�����D�T�l��S�V�Q�e���o�w���Ԏ������P�����Y���g���粓�Q�^�垙�����ĎC���������鼉��Y����ّӓ��H�a����y���[�Ó�ܗm�G�X��Ɩ�Č`�Ɖr����ဗ��v�ᑶ�i�a�����������x�܏A���E�}�����V�Ύ����̔T�����R���f��펢����j������o�s�ϗ�o���ˁ��K�菦����b�a�e�n�ߖ‹������יT�r�ؓޟ����[�~�����֓△�L��ྒྷ��⍋��P��S��\���Ȅ��������������������������������������ޖ������������j�l�ʁ`���i�k�m�~�˃��Nn]\|��\_s*��\|��\_s*�q\|��\_s*��\|�x\_s*�U\|��\_s*��\_s*��\|�\_s*��\_s*��\|�T\_s*[�|��]\|��\_s*�C\|�t\_s*��\|�g\_s*[���C]\|�j\_s*[����]\|��\_s*�]\|�L\_s*��\|��\_s*��\|��\_s*�q\|��\_s*[�@���q]\|�P\_s*�q\|�F\_s*�q\|��\_s*��\_s*��\|�h\_s*�V\|�q\_s*�|\|��\_s*�\_s*��\|��\_s*��\_s*��\|�m\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�]\_s*�q\|�_\_s*��\|��\_s*�P\|I\_s*I\_s*��\|�^\_s*��\|��\_s*��\|��\_s*�\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(�f\|��\_s*��\)\|�|\_s*�\|��\_s*�|\|��\_s*�T\|�s\_s*[����]\|L\_s*e\_s*a\_s*d\|P\_s*b\|�C\_s*[�ۑl]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|�|\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|�n\_s*�k\|��\_s*��\|�s\_s*��\|��\_s*��\_s*�X\_s*�g\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|�R\_s*��\|�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|��\_s*�[\_s*�m\_s*�b\_s*�V\_s*��\_s*�E\_s*�t\_s*�H\_s*��\_s*�E\_s*�m\_s*�C\_s*�}\_s*��\|�I\_s*��\_s*��\_s*�_\|�A\_s*��\_s*��\_s*�J\_s*�l\_s*�b\_s*�g\_s*��\_s*�[\_s*�N\|��\_s*��\|��\_s*�_\|�m\_s*\%([�_�n]\|�N\_s*�B\_s*�[\_s*��\|\.\_s*�x\_s*\.\|�h\_s*�e\_s*�s\_s*�x\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(�w\_s*�s\|��\_s*��\_s*��\_s*��\|��\_s*�|\_s*�i\_s*��\_s*��\_s*��\_s*��\_s*��\|�v\_s*�r\|��\_s*��\_s*��\_s*��\)\|�d\_s*\%(��\_s*��\_s*��\_s*��\|�s\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(�D\|�v\_s*��\)\)\|��\_s*�z\_s*��\|��\_s*��\|��\_s*��\|�G\_s*�k\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*��\_s*�[\_s*�h\|H\_s*K\_s*\%(�z\_s*�[\_s*��\|��\_s*�W\_s*�I\)\|T\_s*T\|Y\_s*�_\_s*�E\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|��\_s*�f\)',
+      \ 'o' : '\%([����ݐb�S�M�o�N�O�Ì��Q�������j�w�d�Њd���Y���n�����n���x��������遒s���s��ና{��≬�L�ݜ����ڏP�񜁈؋������y���߁R�U�V�W�T�S�X�������y�􋳙{�E⫝������e���}�t���c�C筞��[�҉���x�^��拑����`�q�s�N��`�ƛ����ˊx���u���b�B���d�e�������Ȋe�퐊��K�ȉ��򚙊������a�C�����O�����݈җ�㱕������z�v�\�d�ʋ������U���K�������������{�|���������S���w��������D���}��Ҝ����i�g���^���]����[�a�����Q��_�����N�����R�����V�M�������ן^�q��r誉��S�B��������������������蜊׉��ʉ�������ꉂ�W�W�T�g�����E���c�T�ٖQ���P�������ѕ���}���ʼn���|���؏����N�~���֏��斃�������E�戳�[�O�D�Lj���������u�ѐ��ܘN�����Y�������Y�ǘV�j�v���Ĕ��ɚj���I�ɂ����偝���a��􁾁ɊJ���փ��O�I���̈́�o]\|��\_s*��\_s*��\_s*��\|��\_s*�p\|�\_s*�u\|�\\_s*��\_s*��\|�S\_s*��\|�C\_s*��\_s*�C\_s*��\|��\_s*��\|��\_s*�@\|��\_s*��\|��\_s*�\_s*��\|��\_s*��\|�n\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�]\|��\_s*��\|��\_s*��\|�T\_s*[������]\|��\_s*[���q]\|�f\_s*[����]\|��\_s*[����]\|�H\_s*��\|��\_s*��\|��\_s*�C\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�p\|��\_s*[���q��]\|��\_s*�N\_s*��\|�{\_s*��\_s*��\|��\_s*��\|��\_s*�b\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�K\_s*��\|��\_s*�l\|�\_s*�c\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�o\_s*��\_s*�U\_s*\%(��\|��\_s*��\)\|��\_s*�m\|��\_s*��\|��\_s*�]\|��\_s*�g\|��\_s*��\|��\_s*��\_s*��\_s*�P\|�A\_s*[�z�n]\|��\_s*[�H��]\|�}\_s*��\|��\_s*�F\|�w\_s*�n\_s*�}\|��\_s*��\|�z\_s*[���i�q�m�x]\|��\_s*��\|�c\_s*[�_����]\|��\_s*�O\|�]\_s*�c\_s*[�ꕃ]\|��\_s*[�~�C��]\|��\_s*\%(�c\|��\_s*��\_s*��\|��\_s*�V\_s*�c\)\|��\_s*��\|��\_s*[�����G��]\|��\_s*��\_s*��\|��\_s*�m\_s*��\_s*��\_s*��\_s*��\_s*\.\|�G\_s*[����]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|��\_s*��\_s*�d\_s*�@\|�E\_s*��\|��\_s*�~\|�E\_s*\%(�B\|�[\_s*\%(�Y\|��\_s*��\)\|��\_s*�{\_s*��\_s*�X\)\|�o\_s*��\|�A\_s*\%(��\|�U\_s*�[\|�E\_s*\%([�`�g]\|�^\_s*�[\)\)\|��\_s*�{\_s*�\\_s*�t\_s*�g\_s*�E\_s*�F\_s*�A\|��\_s*\%(��\_s*[�N��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|�_\_s*��\_s*�a\|��\_s*�\_s*��\|��\_s*��\_s*�_\_s*�f\_s*�j\_s*��\_s*��\|�`\_s*��\_s*��\|��\_s*�K\_s*��\|�n\_s*\%([�r�^]\|�q\_s*�d\|\.\_s*�j\_s*\.\|�r\_s*�X\|��\_s*��\_s*�O\|��\_s*��\_s*��\_s*\%(�k\_s*��\_s*��\_s*��\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*�Z\_s*�q\|��\_s*��\|�_\_s*�f\|O\_s*\%([�^�rsS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*�N\_s*��\_s*�[\_s*�i\_s*�[\|C\_s*R\_s*�\\_s*�t\_s*�g\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|��\_s*��\_s*�O\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
+      \ 'p' : '\%([�B���C��@�{�����s���܂ە����y�~粕ҕ�糕ӕՕћ��ؕ��������z������C�ߕ[�U�i��������ᢑ����p�o�������Ǖ�ś���”ƕ������s�t�u�z�v���d�g�j�H���ς����Ճ��ҁ}�{�ՃӃ�������k����D�������_�E�v�|�Łj�i�݁��a�y�p�P�΃s������p]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�|�y�v�s�p]\|��\_s*[�ۂ؂Ղ҂�]\|�\_s*�\|��\_s*�l\_s*��\|�\_s*�\|�O\_s*[�I�D]\|�\_s*�\|��\_s*�R\|��\_s*�D\_s*��\|�\_s*�\|��\_s*�`\|��\_s*��\|�\_s*�\|��\_s*�q\|�b\_s*\%(��\|��\_s*�n\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|�r\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�Ž���]\|�V\_s*\%(��\_s*�[\_s*�h\|��\_s*�V\_s*�r\_s*��\)\|�T\_s*\%(�[\_s*��\|�C\_s*\%([�Y�N�P�R]\|��\_s*�V\_s*�r\_s*��\|��\_s*�E\_s*��\|�L\_s*�b\_s*�N\)\)\|+\_s*��\|�z\_s*\%(��\|�X\_s*�Q\_s*��\)\|�q\_s*��\_s*�|\_s*��\|��\_s*\%(�z\|��\_s*�o\)\|�t\_s*\%(��\_s*�W\_s*�A\_s*��\|��\_s*\%(�[\_s*\%(�Y\|�W\_s*��\_s*�O\)\|�C\_s*�W\_s*��\_s*�O\)\|�^\_s*��\_s*�C\_s*��\|�H\_s*\%([�[���m�g]\|�{\_s*�X\|�r\_s*�A\|�X\_s*�t\_s*�@\_s*�[\|�j\_s*�[\)\|�@\_s*\%(�C\|��\_s*�I\|�[\_s*\%([�W�}]\|�~\_s*��\_s*�O\)\|��\_s*\%(�g\_s*��\|�^\_s*�Y\_s*[���}]\)\|��\_s*[�c�X]\|��\_s*�m\_s*�v\_s*�V\_s*�X\)\|�B\_s*\%([����]\|�W\_s*\%(�b\_s*�N\_s*�X\|�J\_s*��\)\|�[\_s*�r\_s*�[\|�b\_s*�V\_s*��\_s*�O\|��\_s*��\_s*��\|��\_s*�f\_s*��\_s*�t\_s*�B\_s*�A\|��\_s*\%([�X�[�A�p]\|�b\_s*[�v�p]\|�s\_s*\%(��\|�[\_s*�k\)\)\)\|�F\_s*\%(�[\_s*\%([�x�Y]\|�W\_s*��\_s*�O\)\|�C\_s*�Y\|��\_s*��\_s*��\|�j\_s*\%(��\|�b\_s*�N\_s*�X\|�L\_s*�A\|�[\_s*��\)\|�m\_s*\%(�L\_s*�V\|�[\_s*��\)\)\)\|�q\_s*��\|��\_s*��\|�^\_s*��\_s*�p\_s*�N\_s*��\|��\_s*��\|��\_s*��\_s*��\|�i\_s*�s\|�Z\_s*��\|��\_s*��\|��\_s*�Z\|��\_s*��\|��\_s*�`\|�^\_s*��\|�o\_s*\%(�g\|�k\_s*�@\|�b\_s*\%(�^\_s*�`\_s*�s\|�X\_s*�W\|��\_s*�f\_s*��\)\|��\_s*��\_s*��\_s*�r\_s*��\_s*��\_s*��\_s*��\_s*��\|�r\_s*�D\|�D\_s*�r\_s*�D\|��\_s*��\_s*�h\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\)\|�i\_s*��\|�J\_s*��\_s*�E\_s*��\|��\_s*��\_s*��\|�d\_s*��\_s*��\|��\_s*��\_s*�^\|�o\_s*�e\_s*��\_s*��\|�\\_s*��\_s*�t\_s*��\|�_\_s*��\|��\_s*��\_s*[���a]\|��\_s*��\|P\_s*\%([umdCaor]\|K\_s*��\|D\_s*F\_s*�t\_s*�@\_s*�C\_s*��\|�R\_s*�[\_s*�h\|�^\_s*�C\_s*��\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*�E\_s*S\)\|I\_s*C\_s*�}\_s*�C\_s*�R\_s*��\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*�{\_s*�g\_s*��\|O\_s*S\_s*\%(�V\_s*�X\_s*�e\_s*��\|I\_s*X\|T\_s*��\_s*�\\_s*�b\_s*�h\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\|��\_s*��\)',
+      \ 'q' : '\%([�z���z�M���K���ɞ��՟J��㖍򍥛������I������H���E�d�������b�z�o������x�A�ܗ����ϕ��D�C�B��ӊǏ��~�����������B䱌s���Z���Yᯙ������Ӟ�ᮉ��O�M�֌N���v���ڊ�L�������K�@����{���^���Z�򏾓��^�������č��A㦖�鶔�r�ňʈ��U�Ñq�𔯞��������C�~���V�W�R�U�S�X�T�܉_�w�o�^�������鿌~�G�F䇚����`�p�̃��L���Y�������۞����I���f�Ȋs��ގԚ��P�M�����E�u�����[�{���O�֞������o�Ӂ@�󞔐����ȓS�c��������������v������m�������Č���痈�S�q�ᙊ�H�M�῍C����​�晠�J���{��v�v�͘ҋ����X�ތɜ���g�ˍg�H��ܜ����|�E�{�윁�؋�������h�e�f�g��P�H�N��q]\|�\_s*�\|�b\_s*�N\|��\_s*��\|��\_s*��\|�\_s*�\|�~\_s*��\|�\_s*��\|��\_s*�S\|�S\_s*[�Z��]\|��\_s*��\_s*�x\|��\_s*��\|��\_s*�h\|��\_s*��\|9\_s*��\|�^\_s*�{\|��\_s*��\|�Q\_s*�O\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�V\_s*�l\_s*��\|��\_s*�|\|�T\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|�T\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*[�{��]\|�C\_s*��\|��\_s*��\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([�ƕ����E������]\|�o\_s*��\)\|��\_s*��\|��\_s*�C\_s*�a\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�Z\_s*��\|�n\_s*�_\|�s\_s*�q\|�B\_s*��\|�R\_s*��\_s*�q\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|�p\_s*��\_s*�`\|��\_s*�s\_s*�N\_s*��\|�`\_s*��\_s*��\_s*��\_s*��\_s*�}\|Q\_s*\%(I\_s*C\|R\_s*�R\_s*�[\_s*�h\|C\_s*�T\_s*�[\_s*�N\_s*��\|U\_s*O\_s*�J\_s*�[\_s*�h\)\|�w\_s*�x\|�R\_s*\%(�[\_s*��\_s*��\|��\_s*�e\_s*�B\_s*�t\_s*�@\_s*�C\_s*�A\)\|��\_s*��\_s*��\|�J\_s*\%(�U\_s*��\|�^\_s*�[\_s*��\|�X\_s*�o\|�[\_s*�k\_s*�[\_s*��\|�i\_s*�[\_s*�g\|�_\_s*�t\_s*�B\|��\_s*�e\|�h\_s*��\_s*�[\_s*[����]\|��\_s*\%(�`\_s*[�F�G]\|�e\_s*\%(�B\_s*�G\|�b\_s*�g\)\)\|��\_s*�^\_s*[���X��]\)\|��\_s*��\|�L\_s*\%(�g\|�u\_s*��\|�z\_s*�[\_s*�e\|�n\_s*�[\_s*�_\|��\_s*\%(�g\|�e\_s*�B\_s*��\_s*�O\)\|�[\_s*��\|�m\_s*��\|�b\_s*�V\_s*��\|��\_s*\%(�[\|�G\_s*��\)\)\)',
+      \ 'r' : '\%([ۘӛěŚ̉h�_�R���{��]�Ә[�\���U�^�M�P�R���䛉�������R�˙C�C�l�u��d����N譞L�c屑�����O�c�YᑘL�S�Q�XᔘW�O�U�ĘT�R�N��m�I�E����@醕����b�b�d�L�F�i��B�e࢘G鐂�ڟ��Y�x�U೙�������e�v�����Y�ׁZ�a����t����X�F�䫗����ᖗ����w�������̟K��魟M�l�I瀗��Q�����w�����Y�q������r���Q���ݗ����@���B���������A��٘H���〟����pᐗ�㾗ۗݗ��~���Z�����K蛂��ಝ��_����×����ɌI�����ʘZ�C���P䞛��g�X����Y������V�Ê}�֗����������������������X�a��ᅞ��������W��H��P�˗����Ԝ���d�h�g�ҙz�ؗϙ�חїӗ��W�򗵞��O���C�����͗���������������q�]�x�@�y饖����×�A�_�`�����p�����֝����H�×�㇗ߗ��Ɨȗ���ɗ��������������ʗ̗����Śi����胗����ߗ��؜������ۗ����\�鋗���������A�������i��仂�טJ���ə���V�����Y�O�㜛n���p�g���B�R�S�����E���T�A��ࣗ��a����茗�����������E�h���඗��p�����y�����q��㡟I�����Q�۝��S��ᚘ����痋�������f������f逓���t�炒�E���D�w�@�C�A�U�t�x���X�z�v�H�{�N�G���^���S�T�R�r���_�F�`�[�L�B�q�V�M�}�W�����~�I���p�I�u���E�]�K�P�Z���������D�Y�s�|�����\���O�y�����J�ց㍪�����X���������Q�τ���r]\|�\_s*[�����]\|�b\_s*[����������]\|��\_s*[������]\|��\_s*��\|��\_s*[�L��]\|�h\_s*[�E�ߎ�]\|��\_s*��\_s*��\|6\_s*[����]\|�E\_s*�G\|��\_s*��\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|�|\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*�P\_s*�[\_s*�u\_s*��\)\|�C\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*�W\_s*�f\_s*�[\_s*�^\_s*�x\_s*�[\_s*�X\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�s\_s*��\_s*�w\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*�k\_s*��\_s*\%(��\_s*��\|�w\_s*�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\|�d\_s*�C\_s*��\_s*�M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*�Z\_s*�b\_s*�g\_s*�v\_s*�Z\_s*�@\|��\_s*��\|�K\_s*��\|�g\_s*��\|�v\_s*��\|��\_s*��\|��\_s*�A\|��\_s*[�M��]\|��\_s*��\|��\_s*��\_s*��\|�Q\_s*\%(�l\_s*��\_s*��\|��\_s*�^\)\|�q\_s*\%(�h\_s*�m\_s*�`\|��\_s*�c\|�r\_s*�|\_s*�Q\_s*�R\_s*�Q\_s*�b\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|�@\_s*�\\_s*��\_s*��\_s*�P\_s*��\|��\_s*�A\_s*�I\|�F\_s*��\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*��\_s*�[\_s*�_\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*��\_s*��\|T\_s*U\_s*R\_s*N\_s*�L\_s*�[\|A\_s*D\_s*M\_s*E\)\)\|��\_s*�K\_s*�\\_s*��\|�A\_s*�[\_s*��\)',
+      \ 's' : '\%([��������}�[��T���y���}����Q��^�����������ēi�������h��掞��y�{�G�O�ʗ��c�������������������U���t�wⶊ���Q锑뙩�s�u����क़���x�ƔK�������}柛”a╛^���ԛ���y���ꑅ�������z������|�S�������\䇛q���~�H�x�����y�ܑ�䵑q���������B�J�t�v�������Ƒ��N����ⵑ������r���|��s�w���p�n�m���y���n�\�F絖��u�L�M�����������X������g�e�d��בb��f�e���􈷑Y�S�a���[�i���s�ƈ�ꋟ��^�h���j꒑`�c�l��z�N������N�Z��驉k���ŋ��Q�L�����G�i�L����ↁ��ސِېڐߞ����C���G����@������S�����ዙ����[�T���אɐ͊֐ȐǞ���N����������d�Ϟ��囡�p�ә�㙟�㚘j���A䦈��_���t�b�A���A���b�����x�������a�H�����ܟ������C���J����I⤑G�S���L⒑W�s�r葁�������D�J���A�L��񙒐�枙@�ې�M���H�����l�F�K���D�B�@�G��h�ǝ��N���������d�D����������R��Ŗ��|�˝�������������v��⫝�呝y�H���������Ր��������}�����U�ҙ����[����������ߝ�p�S爊��c���a���o�p���I�D�c���E�R�����䊔��T�����ωs��ꈝ��ؐ����C����S��h�ᓩ�����]�T�\�����~���y�u�̖����������齗V�������Œ��������s����v�ǐ����E�p�z����~�d�Ǜ���俑��Y�p�n���z�y��羝���裐�䍐������␕���ځ���ȁ����ˁ�΁݁��}�������ʁށ~�́��܁၆���Ɂ������袜����ၐ��v��ℐ��x���N�ː��X���a�V���䐆����H�������������z���`�������X���ʐ������]�䐟�֋󓧖����L�������i�������z�����Z�D�������B�A������P������D���Y�����`�������L���Z����连x�Z���x����w��圑����ȓ������G���F�a�Ǝb��乗��M�E�����s�C�F�������Z�n���D�㈵㦃Ƌs�����]�Ŗl⚑^������潔A���g���Ζ�儞������ɖΏd�ݜ�臐w�p��玬�d����쎹���g��[��諎��^���G�������N���H���˒��Ύ��m����������������\�ސːK�Ž��������K���������t�o���q�������ϔ����͚��͎��b���P��᪎������j�A�ϐ֙��̎ݐ���┐��^�ܐΎގڎ؎����Y�ώΎɎԎߎЈޝ��ȕi�S�C�G����ဎ�偊��f�z���t�W�V��������题���㌎瑲�����f��������E����i�g�l�k�{�������蜕婙��o���J�蕘�Ꟛ�k���V���h��娔��h�K�q�����F榚S�Q�F�T��酝����n���������S�X�K�U��ڏM�G�j���E�a�N�����O�P�D�C�A�L�R�T�I���B�@���M᭜�����貚я�忏w�{�v�x�s�⡏t�u�r�f�ݚp���u���V�y���J�U�����Z���]����j�P�曚A���՜�����f�Y�`�D����s橝ΐa�O��凓��c�j�c�ѐU�a�h�N�f�d��C�k���X�L�������T�Q�W�g�i�R�[�M�e�b�I�_�S���Ώ��n�Z��勋o����|�׊��_�䓏��w�����b��򏎏��������v�ߓɚ��[�m�����יА��О_�c�R���u����B��䐠�Ϟ�Ɛ����L�����Ҝћ�辛����頔����׏����[����M���B����䀙����n������␏�୚���K♏����яҁ������u���i�Ϗ]疏ցi�j�Ӑ��Ԛ������Ϗ����U���J���n�ސ��Ŝ܏��ߏ�������ُ������G��������ଏ������ޑ��ď��������������͏Ǐ����ɏ����������Џ����ۏ�暐����̏ďΏƏ������͏ڏ؏��ɏ��ȏ����p���l���T���e����g�ߐ@�R�C�ܑ��F�������D�I����冐B�������A�H�E�u�o���w�ʕE��e�y�򚬞��@�џ��|������X������ꏎ��ю}�ؗ�⿎l�_�o�Ŏ������������s�t�ћ�����L�y�p�i�k�䍟��������ߊ`�`�o�o���r�{�z�j����`�V���@���@���i�y���掂�I�ِy�n�����X���n�B�g�~���v��s�Ў����o���������N������᎒���Z���u���i�U���抎����f���]���K�j���q�{��������J�{��r���˙�׎�藂���ۚ~��礉J���L��f�V�W�l���ȕ̐���������䰐��T����ᰗ����l�I�J���M����h���E�U�嶎��\�z�G���ԑu���V���\���V���֔f���X�M�ˍ��Ǐ�x���š�����皔��m��匈��^�꛽��O��@�՛��N�����\�󎘊j�����ۗ��B睋ʼnb���q�@�d�N�m�P���b���q�嗝�W�����Ɣ��f��ⲝH���F�H�B�r���{�吷ᵞv�W�t�u�ĉh�|�招�E��䋫�🛋t����剎�����럈��E�`�f��������s�œ������|�̝��a�c���H�K�c�ߙӎ[�ǎW�Xㄐ��V���������Ҏ\�r�]�Z�P�R������3�Q�^O�U�S�R�Y�_�A�T�C�D�搔�@�F���D�\���q���G��ӍƎE�Ǜ������ː؟����N��Z�����r���Ԝ��������淍K�ȍ���͙Pꎍ��`�B�ڛv�ɍ��V�ҍۍЍю��΍؍Ӎ̐č֍ՍȍÍˍ��ҍٍ΍ō鑨焞o�r������⧍�e���y���|�s�����k����w�����N�����񍻓ዎ�ˋ��Îюh�����n����������������r��������䳍�~�⑁�����ʛˍ��l���O�R�ğ��A�L�����璍�o�m������򉺍�������⍽�}���������S�_�s�K��������^�d�w�����@�����Y�������Y�ご�򄋄Z�Y�����������������Á������W�n�ŽO���y�ʁ��������`��e�f�����W�_�T�������Z�T�V�\�X�b�Ѓ��R��s]\|�\_s*[�����]\|�b\_s*[�\�Z�X�V�T]\|��\_s*[����������]\|�\_s*��\|�\\_s*\%(�H\|�I\_s*��\)\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�g\|��\_s*��\|�v\_s*[�X�v]\|��\_s*�n\|�\_s*��\|��\_s*�c\|��\_s*��\|�B\_s*[�B�X]\|��\_s*�C\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|�}\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[�U��]\|�C\_s*��\|�\_s*��\|�}\_s*��\|�T\_s*��\|�G\_s*�Y\|�f\_s*��\|�V\_s*[�c��]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*�\|�\_s*��\|�b\_s*\%(�^\|��\_s*��\)\|�V\_s*��\|�]\_s*��\|��\_s*��\|�s\_s*[�m�E]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*�t\_s*��\|��\_s*��\|��\_s*�_\|��\_s*��\|��\_s*�Y\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|�`\_s*��\|��\_s*[�J��]\|�]\_s*[�]�X]\|��\_s*\%(�X\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�֌��ڎu]\|��\_s*��\)\|�V\_s*��\|7\_s*��\|�S\_s*[����]\|4\_s*��\|�R\_s*�{\|�h\_s*�t\|��\_s*�u\|��\_s*��\|�A\_s*[�o��]\|��\_s*[�N�Y]\|�\_s*[���]\|�r\_s*[ꏎ�]\|��\_s*��\|�c\_s*�e\|��\_s*��\|��\_s*\%(�_\|�C\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\_s*�{\_s*\%(�I\|��\_s*�I\)\|��\_s*��\_s*�a\_s*��\_s*�W\)\|��\_s*[�Η�]\|�\_s*�\|�\_s*��\|��\_s*��\|�e\_s*��\_s*��\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*�X\|�^\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*�K\|�|\_s*[�“���]\|��\_s*�p\_s*��\|�G\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[�N��]\|�X\_s*[�N��]\)\|�h\_s*�l\|�S\_s*��\_s*�g\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�e\|��\_s*��\|��\_s*\%(�@\|��\_s*��\_s*��\)\|��\_s*��\|�G\_s*��\|�\_s*�q\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|��\_s*[�T��]\|B\_s*\%(r\|�V\_s*�F\_s*��\)\|�g\_s*��\_s*�q\|��\_s*��\|�u\_s*��\|�A\_s*��\_s*�`\_s*��\_s*��\|�\\_s*��\_s*��\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|��\_s*\%(�V\|�s\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|�P\_s*�C\_s*�f\|�]\_s*�f\|�v\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�w\_s*��\|�l\_s*�b\_s*�g\_s*�T\_s*�[\_s*�r\_s*�X\|�U\_s*\%(�b\_s*�N\|�N\_s*�Z\_s*��\|�r\_s*�[\_s*�l\|�E\_s*�o\_s*�[\|��\_s*�[\_s*�N\_s*��\_s*�E\_s*�g\|��\_s*�U\|��\_s*�c\|�C\_s*\%([����]\|��\_s*�[\|�f\_s*��\)\|�[\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\|�[\_s*�~\|�i\_s*�g\_s*��\_s*�E\_s*��\|�]\_s*\%(��\|��\_s*�f\|�[\_s*\%(��\|��\_s*��\_s*�Q\_s*��\)\|�t\_s*�B\_s*�[\)\|�W\_s*\%(��\|�[\_s*\%([�O�N]\|��\_s*��\_s*[�Y�X]\)\|�O\_s*��\_s*��\_s*�g\|��\_s*\%(��\_s*��\|�O\_s*�V\_s*��\_s*�s\_s*�[\_s*��\|�e\_s*�[\_s*�[\)\)\|�r\_s*\%([�Ȏ�]\|�T\_s*�C\_s*�Y\|�r\_s*�T\_s*�C\_s*�Y\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|�t\_s*�m\|��\_s*\%(��\|��\_s*��\_s*��\_s*�`\_s*��\_s*��\_s*��\_s*��\)\|�h\_s*�b\_s*�o\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|�|\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|�n\_s*�m\_s*�x\_s* \_s*�m\_s*�d\_s*�v\_s*�r\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*�u\)\|��\_s*��\|�G\_s*�X\|S\_s*\%([nrgmce��]\|G\_s*M\_s*L\|�T\_s*�C\_s*�Y\|S\_s*�T\_s*�C\_s*�Y\|F\_s*�}\_s*�K\_s*�W\_s*��\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(�v\_s*��\_s*�C\|�N\_s*��\_s*�u\)\|P\_s*\%(��\_s*�R\_s*�[\_s*�h\|A\_s*C\_s*E\_s*�L\_s*�[\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*�L\_s*�[\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\)',
+      \ 't' : '\%([Ĝ������R��牉ș��h���Ќ���☝��ω����i���מR���h�����|�������������������c�툪�H���֓�騗���֋�㜐C䃕����۔y榏Q�����F�b����r�\����c�����͙��ʓד՘��J�����c������ٓؓڐ����J�x��ɍΖ����r���q�N�P�דь{�ԍǘ؝���沖L��௜{�ී��“��Γ������C�j�ߙ������㛟D椟X�b��ى��⅝T�w�F��~��㫛䞨�����[�����������џ����ẓ��}��衞Δ󓎌B���U�ÓĉD��������ڎ�獙W�M��������ꊐ��z�c�����b�u�����ٓ��幓������������������鉓�������~��鍓����������򓀓��������������˓e�{�O�x�~�茤�y�Z��䷞��n�Z�^��u�̔�m�q�ė��y�}�o�l�r�o�p�V�Ĕ�������Ï\�p�v���j�n���掷�n�ϙ\�E�i�t�������N�O�g�\�l���h�ꚤ����r�l�W�P�Ȏ��o�d�͙��W���難��ÓR��瘉��L����N�J�U��猓H�њ��V�z�A�U�V���ځC�����h����A���z�D�d�D�F�x�[���^�៓U�z���a�Z�L�W⽓Y�Q�I�N�G�P���O�c�S��������Y�ꚉ���ٞq�|�Ǟ��h�����t�L��礓B�������@���������稒�����ఒ���A���e����V�Ƃ�•��͕��皁�I���������T�P�햱�׏g�w�ΐى����W��h�іʉt�`�I�␎���a���S�ڎB�ڐR����ȕ�p�A�n䆉������I�~����焍ߑ����z�c�����摂���u���񗾎i�����d�͌��g����Q�ǒٚ�؍j�q��塔|�ȕ�ȓ`�B�\�����Չ���㔖�ꉌۑ����ԔԒ̒��v����׏I�Đ��ȒŒnj��雅�ə����ݙ����������֒ߘ��s�r�s�n���U�T�ӑn�쑢���L���U�����Ό���C���U�֋ސT���Ĝ����ɞ��Ս��y����㋒Ý��p�k�x�ːϔ��Ћl�s�ʜߐZ��ᶝ��A�A�ڕt����h�Պ�J��������Y�_���������Z�o�T���S���N���Ē�����������Z�N��༒������m�֖����’������ޒ}�z���k���e玐��ŗ͓�ߝQ��E��������k��浔��I��O���՞`����������蠙��Ò��e�P��������障K������������U�����U�ݓC������o�L�L���j�l�������y��鬒��k踒𒜒��{�⒳���\�_���񒝓����[�������������d�������������}�����ޒ�������������渒����������x���Q�h�I峜��J����a�C�ԁ��n�N���f���R�h�t���������p�m�o�n�~�n���@�������������ؒ������T�w����鳚��v�ꃒr�l���h���Ր��ƌ����s�U�n�t筒m���p�u�o�k�v�q�x����ᗒy����J�}���֓}�Ԑu���g�q�K���f�e�ޞ���˒M�o�R�Г��Lᷖ�靌�ٜ������y�g栌����˘����l�|�]��漒K�]�̎^���D���M骝D�l�퓬�e�Ȓ@�g�i�h����Y�k�X�S��ݛ̝E�Y�U�ԕۏ��X�I���H�����a��蒒F�C���}�{�����C��J���F�מ��l��S�s韞����퓃��������ࣕY�ۈɗ��吥�������ҋ��k�B���z�n�Ҋm����������ԚK�t���p���ЋB�����ŗY����k���˜[�]����썰�͗����K�’e���ʖd休��s�b��饕����|�c�G����B�ٍ��k���e�d��뛹��k残ċ��b�C�W�F�V�O�������h�x�^���В|⹑������t�M����F������������W�̝^�t�T���H�`�����ؒ]��K���ßp�[���ϟ~���֒h�����j�̜ݝ��d���W�������`�^W�UႚV�J�Rἔ�C�Q�V�a�_�\杒O�S�X�W�Y�b�d�Z�T�ÒP�A���f�����V�]�p�F�ѝF�U����鮒{�������I����痑��~�x�����擑���[讖w���ʑ��H�֟�铉O���\���l���ߑړ����ܒ��Б⛔�E�ܑՑ����ԑۑґؑ��ݑ���ّё̑ޑב�Α���А���茌o�����������]�S�B�HᢞS�O�l�N�����ϑ����֋N睒����������š����f�u���P���B��c���ّ��_��̌������������W�`�V���~�^�Γy���f�s������E������\��؃X�W�����ƃU���c�N�]�����������g�`�c�E���[�^�����������������������������ф��������S���et]\|�\_s*[�����]\|�b\_s*[�g�e�c�`�^]\|��\_s*[�ƂÂ���]\|�\_s*��\|��\_s*�n\_s*��\|��\_s*[���]\|�\_s*�\|��\_s*�l\|��\_s*��\|��\_s*�V\|��\_s*��\|�i\_s*[���v]\|��\_s*�P\|�h\_s*��\|��\_s*��\|�D\_s*��\_s*��\|��\_s*[����]\|��\_s*[�q��]\|�W\_s*��\|��\_s*��\_s*�E\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*�x\|�G\_s*[�ߓ��h]\|��\_s*[����]\|�F\_s*�N\_s*��\|�i\_s*[�v�q]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|��\_s*��\|��\_s*�j\|��\_s*�j\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*��\|��\_s*��\|�g\_s*��\|�Z\_s*��\|�Q\_s*�~\_s*�S\|��\_s*�j\|��\_s*\%(��\|��\_s*�q\)\|�S\_s*[���Z]\|��\_s*\%(��\|��\_s*�a\)\|�X\_s*��\|��\_s*�X\|�\_s*�J\|��\_s*�~\|�~\_s*�J\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|�P\_s*\%(��\|�O\_s*��\)\|��\_s*��\|1\_s*\%(��\|0\_s*��\)\|��\_s*�l\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(�v\|��\_s*�F\)\|�g\_s*��\|��\_s*��\|�`\_s*��\|��\_s*�w\|��\_s*\%(�V\_s*��\|��\_s*�F\)\|��\_s*\%([��]\|�[\_s*��\|��\_s*��\_s*�N\)\|��\_s*�v\|�r\_s*�q\|��\_s*�r\_s*�q\|��\_s*[�a��]\|��\_s*��\|��\_s*��\|�@\_s*��\_s*��\|�L\_s*�q\|�S\_s*��\|��\_s*��\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|�]\_s*�h\|�G\_s*��\|�u\_s*[�˔�]\|�k\_s*�J\|��\_s*�\|��\_s*�I\_s*�q\|��\_s*�a\|��\_s*�p\|��\_s*[����]\|�A\_s*��\|��\_s*[���]\|��\_s*��\_s*�\|��\_s*��\_s*�\\|��\_s*\%(�\\_s*��\|�A\_s*��\_s*[����]\)\|�t\_s*\%(��\|�{\_s*�V\)\|�h\_s*��\|�e\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*�s\|��\_s*\%(�[\|��\_s*�q\)\|��\_s*�v\|��\_s*��\|�P\_s*��\|��\_s*��\|��\_s*\%(��\|�\_s*��\)\|��\_s*��\|�E\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|�s\_s*��\|��\_s*��\|�E\_s*�w\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|�\\_s*[���V]\|�w\_s*��\|�\_s*��\|�i\_s*�K\|��\_s*��\_s*�p\|��\_s*�B\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*�q\|��\_s*��\|��\_s*��\|�f\_s*�B\_s*�X\|�R\_s*��\_s*��\|�\_s*�l\|�\\_s*\%(�[\_s*[�g���v]\|��\_s*�[\)\|�w\_s*�[\_s*�O\|�[\_s*[�C�����A]\|�Z\_s*\%(�I\|��\_s*�}\|��\_s*\%(��\|�j\_s*�A\_s*�X\)\|��\_s*�s\_s*\%(�[\|�X\_s*�g\)\)\|�V\_s*\%(��\|�b\_s*�N\|�X\_s*��\|�A\_s*�^\_s*�[\|�\\_s*�[\_s*��\_s*�X\|�I\_s*�h\_s*�A\|�[\_s*[�t�^]\)\|�T\_s*\%([�C��]\|�~\_s*��\_s*�O\|�E\_s*�U\_s*��\_s*�h\|��\_s*�u\_s*��\_s*�b\_s*�h\|�[\_s*\%([�h��]\|�e\_s*�B\|�X\_s*�g\_s*��\|�Y\_s*�f\_s*[�C�B�[]\|�}\_s*��\)\|�b\_s*�`\_s*��\_s*�[\|��\_s*\%(�N\|�_\_s*�[\|�L\_s*��\_s*�[\)\|��\_s*�h\_s*�}\_s*�C\_s*�h\)\|�|\_s*��\_s*�y\_s*�v\_s*�`\_s*�h\|�O\_s*\%(�a\_s*�y\|�A\_s*��\_s*��\)\|\\\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*��\_s*��\|�p\_s*��\|�d\_s*\%([���b]\|�C\_s*��\_s*�M\_s*��\_s*��\_s*��\)\|�s\_s*\%([����]\|��\_s*�E\|�j\_s*�W\_s*�O\|�]\_s*�[\_s*��\|�o\_s*�b\_s*�N\|�V\_s*��\_s*�c\|�u\_s*\%(�j\_s*��\_s*�[\_s*�X\|�Q\_s*�[\_s*��\|�h\_s*��\_s*�}\|�A\_s*�j\_s*��\)\|�b\_s*�o\_s*�^\_s*�h\_s*�o\|��\_s*��\|��\_s*��\_s*��\_s*�s\_s*��\_s*��\_s*��\|E\_s*�w\|��\_s*[�w��]\)\|T\_s*\%([bc��mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|�]\_s*�[\_s*��\|X\_s*T\_s*�t\_s*�@\_s*�C\_s*��\|�V\_s*��\_s*�c\|�o\_s*�b\_s*�N\|V\_s*\%(�j\_s*��\_s*�[\_s*�X\|�Q\_s*�[\_s*��\|�h\_s*��\_s*�}\|��\_s*�j\_s*�^\|�A\_s*�j\_s*��\|�V\_s*��\_s*�b\_s*�s\_s*��\_s*�O\)\|C\_s*P\|�R\_s*�[\_s*�h\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*�L\_s*�[\)\|E\_s*L\)\)',
+      \ 'u' : '\%([��y����h�����Ȍl�e�[�f���񓴑a�؈��ϑ����鎽�[�X���D�W�r䷙\��w���u���ќ����z�D鴑��ߚX�����i�^�ښ��R�従��L�M�f��~�ӑ�r戏���楓]���搗w�S�^�̗��É��򃑂��k�։\�u�����L�G�Q�m���P�O��⣐H���Q�m�����I��V�ߊ��a�������X�S�n�|�U����o�J���y�팻���f�ʈژ��ⓐx���ԋ����ʏ���ݓ��A�ω��]りC���]�D��^�@����T�A��������m����S���Y�v�_�������Z�r����N�������T�T���ݗ��Ɠ����a�H���Z���������J�L�Q�n�������L�I���̝j�󌂟����J䥎˔^���o�pᱝ�ꚉE�ӏ��K���юY�𓢙Ǔe�A�Z�F�����G�����N�������E���҄TUu]\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|��\_s*�y\_s*[����]\|�y\_s*��\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�`\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|�C\_s*�M\_s*��\_s*�X\|�I\_s*�}\_s*��\|��\_s*��\_s*�s\_s*�\\|��\_s*\%(�p\_s*��\|�L\_s*��\)\|�A\_s*\%([�X��]\|�O\_s*��\_s*�[\|�[\_s*\%(�V\_s*��\_s*��\|�W\_s*�F\_s*��\_s*�g\|�o\_s*��\)\|��\_s*�e\_s*�B\_s*��\_s*�b\_s*�g\|�|\_s*��\|�b\_s*\%(�v\|�p\_s*�[\|�V\_s*��\_s*�[\)\)\|�P\_s*\%(��\|��\_s*��\)\|�t\_s*\%(�{\_s*�[\_s*�g\|�^\_s*�[\_s*��\|�l\_s*�b\_s*�N\|�m\_s*�h\_s*�w\_s*\%(�t\_s*�F\_s*�A\_s*�[\|�}\_s*�K\_s*�W\_s*��\)\)\|��\_s*\%([�^�j�[]\|�g\_s*\%(��\_s*��\|��\_s*�q\_s*�g\)\|��\_s*\%(�A\|�V\_s*�[\_s*�Y\)\|�v\_s*�V\_s*��\_s*��\|�l\_s*�X\_s*�R\|�i\_s*\%(�J\_s*�C\_s*�g\|�C\_s*�e\_s*�b\_s*�h\)\|�r\_s*�L\_s*\%(�^\_s*�X\|�m\_s*��\)\)\)',
+      \ 'v' : '\%([���F���l�۔ńr���B�Ƀ�v]\|�\_s*�\_s*�\|�b\_s*��\|��\_s*��\|�\_s*�\|�`\_s*�F\_s*��\|��\_s*�^\| \_s*�r\_s*�N\_s*�g\_s*�[\_s*��\|��\_s*�o\|��\_s*�z\|�j\_s*�X\|��\_s*��\|�P\_s*�^\|��\_s*\%(�f\_s*�B\_s*��\|�M\_s*�i\|�j\_s*�X\|�Z\_s*��\_s*��\|�N\_s*�`\_s*��\|��\_s*�L\_s*��\_s*�[\_s*��\|��\_s*��\_s*�[\|�[\_s*�j\_s*��\)\|�u\_s*\%(��\|�]\_s*�[\_s*��\|�T\_s*�C\_s*��\|�l\_s*�b\_s*�N\|�S\_s*�[\_s*��\|�V\_s*�l\|��\_s*�[\_s*�O\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*�b\|�{\_s*\%(�X\_s*�g\_s*�[\_s*�N\|��\_s*�S\_s*��\|��\_s*\%([�K�{�g�^]\|�e\_s*\%(�b\_s*�N\_s*�X\|�[\_s*[�W��]\)\)\|��\_s*��\_s*�[\_s*��\|��\_s*��\_s*\%(�`\|�e\_s*�B\_s*�A\|�^\_s*��\_s*�[\)\|��\_s*�[\|�R\_s*�[\_s*�_\|�[\_s*\%([���g�O]\|��\_s*�g\|�h\_s*�r\_s*\%(��\|��\_s*�A\_s*��\)\|�p\_s*��\|�_\_s*�t\_s*�H\_s*��\|�J\_s*\%(��\|��\_s*�X\_s*�g\)\)\|�L\_s*��\_s*�u\_s*��\_s*��\|�C\_s*\%([�h�X]\|�W\_s*��\_s*�[\|�V\_s*��\_s*�O\)\)\|�w\_s*�b\_s*�g\|��\_s*��\_s*��\|��\_s*��\|�t\_s*\%(�@\_s*\%(��\|�h\_s*�[\_s*�c\)\|�H\_s*\%(��\|��\_s*\%(�N\|�J\_s*�[\)\)\|�F\_s*��\_s*��\_s*�[\_s*��\)\|�E\_s*\%(��\_s*\%(�f\_s*�B\_s*�~\_s*�[\_s*��\|�W\_s*\%(�[\_s*�~\_s*��\|�~\_s*�[\_s*��\|�I\_s*�X\_s*�g\_s*\%(�N\|�b\_s*�N\)\)\)\|�B\_s*\%(��\_s*�i\|��\_s*�X\)\|�H\_s*�b\_s*�J\|�C\_s*\%(��\_s*�X\|��\_s*�i\_s*�[\)\|�F\_s*\%(��\_s*�M\_s*��\_s*�E\_s*�X\|�k\_s*�X\)\)\|�r\_s*\%([�A���u�o�X�U]\|�K\_s*�[\|�n\_s*�[\_s*��\|�^\_s*�~\_s*��\|��\_s*\%(�b\_s*�W\|��\_s*�C\)\|�r\_s*\%(�A\_s*��\|�b\_s*�h\)\|�b\_s*\%(�N\|�L\_s*�[\)\|�Z\_s*��\_s*�e\|�N\_s*\%(�^\_s*�[\|�g\_s*\%(��\|��\_s*[�[�A]\)\)\|�V\_s*\%(��\_s*�X\|�\\_s*��\_s*�[\_s*�Y\)\|��\_s*\%([�`�X]\|�\\_s*��\|�e\_s*�[\_s*�W\|�Z\_s*��\_s*�g\)\|�l\_s*\%(�K\_s*�[\|�O\_s*��\_s*�b\_s*�g\)\|�j\_s*\%([�[��]\|��\_s*�f\_s*��\)\|��\_s*�[\|�G\_s*��\_s*�`\_s*��\_s*��\|�W\_s*\%(��\|�b\_s*�g\|�^\_s*�[\|��\_s*\%(��\|�i\_s*��\_s*�[\)\|��\_s*�A\_s*\%(��\|��\_s*�C\_s*\%(�Y\|�[\_s*�[\_s*�V\_s*��\_s*��\)\)\)\|�_\_s*��\|�f\_s*�I\|��\_s*\%(�S\|�k\_s*�[\_s*�u\)\|�I\_s*��\|��\_s*�W\_s*�A\_s*��\|�B\_s*�[\_s*�i\_s*�X\|�[\_s*\%(�{\|��\_s*�X\|�N\_s*��\|�i\_s*�X\)\)\|�x\_s*\%([�K����]\|�g\_s*�i\_s*��\|�C\_s*�_\_s*�[\|�[\_s*\%(��\|�_\_s*�[\)\|�e\_s*��\_s*��\|�b\_s*�Z\_s*��\|�X\_s*\%([�g�^�p]\|�r\_s*�I\)\|�N\_s*\%(�^\|�g\_s*��\)\|�W\_s*�^\_s*\%(�u\_s*��\|��\_s*�A\_s*��\)\|��\_s*\%([�B�[]\|�t\_s*�@\_s*�C\|�T\_s*�C\_s*��\)\|��\_s*\%(�i\|�V\_s*�e\_s*�B\|�[\_s*�i\|�j\_s*[�J�N]\)\|��\_s*\%(�f\|�x\_s*�b\_s*�g\|�_\_s*��\|��\_s*�[\_s*�k\|�T\_s*\%(�[\_s*�`\|�C\_s*��\)\|��\_s*�b\_s*�g\)\|�m\_s*��\|�j\_s*[�X���A]\|�l\_s*\%(�V\_s*��\_s*��\|�`\_s*�A\|�c\_s*�B\_s*�A\|�Y\_s*�G\_s*��\)\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|�]\_s*�[\_s*��\|�T\_s*�C\_s*��\|�l\_s*�b\_s*�N\|�S\_s*�[\_s*��\|J\_s*E\_s*-\_s*��\|�V\_s*�l\|��\_s*�[\_s*�O\|I\_s*S\_s*A\_s*�J\_s*�[\_s*�h\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\|�u\_s*\%(�C\|��\_s*\%(�h\|�b\_s*�h\)\|�[\_s*�h\_s*�D\_s*�[\)\|�o\_s*\%([����]\|�C\_s*\%([�A�u���I]\|�p\_s*�[\|�^\_s*\%(��\|��\_s*�e\_s*�B\)\|�L\_s*��\_s*�O\|�U\_s*�[\|�V\_s*��\)\|�b\_s*�g\|�`\_s*�J\_s*��\|�M\_s*�i\|�K\_s*�{\_s*��\_s*�h\|��\_s*\%(�i\_s*�V\|�G\_s*�e\_s*�B\)\|�T\_s*��\|�X\_s*\%(�R\|�P\_s*�X\)\|�J\_s*��\_s*�X\|�P\_s*�[\_s*�V\_s*��\_s*��\|�L\_s*��\_s*�[\_s*��\|�E\_s*�`\_s*��\_s*�[\|��\_s*\%(��\|�G\_s*�[\_s*�V\_s*��\_s*��\|��\_s*�[\|�A\_s*\%(�u\_s*��\|��\_s*�g\)\|�b\_s*�h\|�f\_s*�[\_s*�V\_s*��\_s*��\)\|�k\_s*�A\_s*�c\|�j\_s*\%(��\|�[\_s*��\)\|��\_s*\%([���[]\|��\_s*��\|��\_s*�[\|��\_s*\%(�V\_s*�A\|�`\_s*�m\|�^\_s*�C\_s*��\)\)\|�[\_s*\%([�S�O]\|�`\_s*��\_s*��\|��\_s*�g\_s*�D\_s*�[\_s*�h\|�o\_s*��\|�{\_s*�X\|�x\_s*�i\|�e\_s*�B\_s*�J\_s*��\|�T\_s*�X\|�W\_s*\%(��\|�j\_s*�A\|��\_s*��\)\|�m\_s*��\|�j\_s*�A\|��\_s*��\_s*�g\|�~\_s*\%(��\_s*�I\_s*��\|�L\_s*��\_s*��\_s*�C\_s*�g\)\)\|�i\_s*\%(�L\_s*��\_s*��\_s*�[\|�W\_s*�E\_s*��\)\)\)',
+      \ 'w' : '\%([��������������Y���ɔ��j��y����h�����ȃ��Ҍl�e�[�f���񓴑a�؈������鎽�[�X���D�W䷙\��w���u�ќ����z�D鴑��ߚX�����i�^�ښ��R�従��L�M�f��~�ӑ�r戏���楓]���搗w�S�^�̗��É��򃑂�k�։\�u�����L�G�Q�m���P�O��⣐H���Q�m�����I��V�ߊ��a�������X�S�n�|�U����o�J���y�팻���f�ʈژ��ⓐx���ԋ����ʏ���ݓ��A�ω]゜��]�D��^�@����T�A��������m����U�S���Y�v���������Z�r����N�������T�T���ݗ��Ɠ����a���Z���������J�L�Q�n�������L�I���̝j�󌂟����J䥎˔^���o�pᱝ�ꚉE�ӏ��K���юY�𓢙Ǔe�A�Z�F�����G��������܉����c���㩟|㘔��͊��ϊ�p��ԉЍЋƋZ�����ǜ������k�Y���e�o���n���m�܏Νt������s�f��氖����^�]�o�_�r�q�p���c�˜i���q��ǘj�n�Ȏ��G�F�d�̘e���Θc�Q�C崙N������Z�����ʒt�ሽ�g�f�h���l�֘a�O�N���c�b�̔f��j���Z���`�•��i�H�킗�����Ȕg�E��w]\|�\_s*[�������]\|�b\_s*[�����E����]\|��\_s*[������]\|��\_s*��\_s*�~\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|�T\_s*��\|��\_s*��\_s*��\|��\_s*��\|�H\_s*��\_s*�R\|��\_s*��\|�D\_s*\%(�k\_s*[�Lj�]\|��\_s*��\)\|��\_s*�i\|�e\_s*��\|��\_s*��\|�A\_s*��\|��\_s*�y\_s*[����]\|�y\_s*��\|��\_s*�\|��\_s*�[\|�\_s*��\|�\_s*��\|�\_s*��\|��\_s*�c\_s*��\_s*��\|�W\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�s\_s*��\_s*��\|��\_s*��\|�\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|�`\_s*��\|��\_s*�C\_s*��\|�\_s*��\|�O\_s*�Y\|��\_s*��\|��\_s*[�C�B��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�c\_s*��\|��\_s*��\|�o\_s*�D\|��\_s*�Y\_s*��\|��\_s*��\|�i\_s*��\_s*�j\|(\_s*��\_s*)\|��\_s*[����]\|�R\_s*��\|�Y\_s*�z\|�x\_s*��\|�x\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|Y\_s*\%(��\|�V\_s*��\_s*�c\|��\_s*�F\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�R��]\|��\_s*��\|�a\_s*�t\|��\_s*��\_s*��\_s*�D\_s*�\|��\_s*\%(�`\|��\_s*�m\_s*��\_s*��\)\|�^\_s*�B\_s*��\_s*�D\|��\_s*\%(��\_s*��\_s*��\_s*�E\_s*��\_s*��\|��\_s*��\_s*��\_s*�E\_s*��\_s*��\)\|�u\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|��\_s*��\_s*�O\|��\_s*\%(��\|�C\_s*�X\|�b\_s*�J\_s*�[\|�X\_s*\%(��\_s*�[\|��\_s*��\_s*�O\)\)\|��\_s*\%(�[\_s*�X\|��\_s*�N\_s*��\|�X\_s*�g\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(�b\_s*\%([�v�p]\|�s\_s*��\_s*�O\)\|�C\_s*\%([�^�g]\|�e\_s*�B\_s*��\_s*�O\)\)\|�{\_s*��\_s*�t\|�t\_s*\%([���[]\|�@\_s*�C\_s*��\|�B\_s*\%(�[\_s*�g\|�b\_s*�`\)\)\|�z\_s*\%(�G\_s*[�[�C�A]\|�[\_s*��\|�C\_s*\%(�[\_s*\%(��\|��\_s*�[\)\|�b\_s*\%(�v\|�X\_s*��\|�p\_s*�[\|�g\_s*\%(�j\_s*�[\|�}\_s*��\)\)\)\|��\_s*\%(�C\|�b\_s*[�g�c]\)\)\|�x\_s*��\_s*�i\_s*�[\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(�u\_s*��\_s*�E\_s*�U\|�}\_s*�K\_s*�W\_s*��\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(�y\_s*�[\_s*�W\|��\_s*�W\_s*�I\|�R\_s*�~\_s*�b\_s*�N\|�T\_s*\%(�C\_s*�g\|�[\_s*\%(�o\|�r\_s*�X\)\)\|�h\_s*��\_s*�}\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*�t\_s*�@\_s*�C\_s*��\)\|�x\_s*��\|�v\_s*\%(�t\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|�o\_s*��\_s*�^\_s*�[\|��\_s*\%(��\_s*��\_s*�c\_s*�u\_s*��\_s*�N\|�H\_s*��\_s*�t\|�B\_s*\%([�[��]\|��\_s*\%(��\|�w\_s*��\_s*��\)\)\|�F\_s*\%(��\_s*�_\_s*�[\_s*�X\|��\_s*�i\_s*�[\|�[\_s*�o\_s*�[\|�C\_s*��\)\|�@\_s*\%(�C\_s*[���X]\|�[\_s*�O\_s*�i\_s*�[\|��\_s*�_\|��\_s*\%(�^\_s*�[\|�L\_s*��\_s*�[\_s*��\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|�_\_s*�u\_s*��\_s*��\_s*�[\|�^\_s*��\_s*�O\_s*�X\_s*�e\_s*��\)',
+      \ 'x' : '\%([��H����F����D����B����@�����́~�V����x]\|�\_s*[�����]\|�b\_s*[�H�F�D�B�@]\|��\_s*[����������]\|�V\_s*��\_s*\%(�t\_s*�H\_s*��\|�z\_s*��\)\|�w\_s*\%([����]\|�f\_s*[�C�[]\|��\_s*��\_s*��\_s*��\|�r\_s*�T\_s*�C\_s*�Y\|�k\_s*\%(��\_s*��\_s*��\|�T\_s*�C\_s*�Y\)\|�E\_s*�B\_s*��\_s*�h\_s*�E\|�[\_s*��\)\|X\_s*\%([����]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|�f\_s*[�C�[]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*�T\_s*�C\_s*�Y\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|�T\_s*�C\_s*�Y\)\|e\_s*n\_s*o\_s*n\)\|�W\_s*�I\_s*��\|�[\_s*\%(�r\_s*�E\_s*�X\|��\_s*\%(�b\_s*�N\_s*�X\|�O\_s*��\_s*�t\_s*�B\)\)\|�n\_s*�r\_s*�G\_s*��\|�U\_s*\%(��\|�r\_s*�G\_s*��\)\|�L\_s*\%(�V\_s*\%(��\|��\_s*��\|��\_s*�g\_s*�[\_s*��\)\|�Z\_s*�m\_s*��\|�T\_s*��\_s*\%(�`\_s*��\|�^\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|�N\_s*\%(�V\_s*�[\|��\_s*�X\_s*�|\_s*�X\_s*�g\|�Z\_s*\%(�i\_s*�L\_s*�X\|�m\_s*�t\_s*�H\_s*��\)\|�U\_s*��\_s*�B\_s*�G\|�T\_s*\%(�C\|��\_s*\%(�g\_s*�X\|�e\_s*�B\_s*�b\_s*�y\|�`\_s*�b\_s*�y\)\)\|��\_s*�X\_s*�}\_s*�X\)\|�G\_s*\%(�N\_s*�X\|�b\_s*�N\_s*�X\)\)',
+      \ 'y' : '\%([։ߕ֍������H�V�ş�ꔗ���㊽�؊Z���ݝ����Z���g�|�~�}�����Ĕ���ϑ��b���b���щx�X�����\���c���c�i�U����F�g�`��m����ꡞ՛����@���T�f����x���J��u���ן��L��������y�s�~��@������籝X�yꢗq�s�i�^�w�g�s�j�f��g�t匍��r�o�����חl�d�n�p�їw�z�m�Ï��h�S�^�@焉��������^���r�`��椌P�a�o���\�˗_�]�ߔ\�S�l�P�l��a��P�Q�ĉr���I�K�b��������㒏����̎͒o�ɒ�����t沖L��u���V�K�ᛮ�|��w�䓎樏�଎�����������z�ڗW�F�Q������w��些��C�����ޗG�C���P�E�Z�X�O�N�S�З[�H�I�֗F�Y�J�L�����@ሑ��g�M祗h�|��懖����k�ߗV���O�J�R�`�g��埓����A䥐����䲃Ń�ꍘc�T�U���������n�������翔�䑌�����������恍ݍ��������r�x�������É��j囚|���d�Q�U�����|��Ɨ��������B�d���{���Nj�佈��䆍��m�n�ؐF���A�t����F������̌Ì��䉳�L���d�������ƜјJ���i��ꌒ��Փk�v����ɔžo�������֍����y�󙬌M���E���|�ځ��e�퐈�M����臐��Y���O�����ΖZ�}��x���א򌵉��M�Ձ��O䗚P�{���b�����w�����N�~�}�z�c���c��硉Ɏ��h�����䕟J����s�W���]�b�K�\���T��ซ]�r䟈��Z�Л��T������m�����Ĉ��D�M�ß�I�����C��������m��覉@������B�u�A��A�܊���j�H���ڈ�Ί�ֈ�È�1�P���y���D���I��D�R�����۔шዏ���ܐ��R�Δ���đP�_�ʈމ‘��E�h�����e�˗v�֍s�}�وߓ����ƈݟ��D�ᒒ�K�֋��҉]�����~�˓��ڏ�����Η��͛H������B�܈횀�}���ɋU䏜S�Ή�������u�������Ј׈ۈӘߗǔ@�b�o�������؈�U�w����͉��]��ਖ��看�̈��g�؂�Ԅ`���t�c���b�ّ������q���ۈŔs���M���l����h�E�`�_�ʗ�S�Q���n����_�a–z�l���˗D���y������ي��V�o��������原K�Z꞉v�N��u������򎾛��k欎��ຏ��k�s�t�q�r�R�Г@�ݜD洗{�k��єJ���T���׈Ջx�N�ۈ����i��ዖ�熔W�����t�����❔����Ĕj���J��E�˕a�뉉�̖������\�����~�Ɲ��ₙ�u�E�~�����������F�v�������������C�JY���҄\�zy]\|�\_s*[�ղ�]\|�b\_s*[�����C��]\|��\_s*[��䂢��]\|�^\_s*��\_s*�b\|��\_s*��\_s*�b\|�I\_s*��\|��\_s*��\|�B\_s*��\|�I\_s*��\|4\_s*\%([�“�����]\|��\_s*��\|��\_s*��\)\|��\_s*��\|�m\_s*�j\|��\_s*��\|��\_s*��\|�F\_s*��\|��\_s*��\|�j\_s*��\|��\_s*[�q��]\|�h\_s*�L\|�V\_s*��\|��\_s*[���j]\|�@\_s*��\|��\_s*[�q��]\|�i\_s*��\|�W\_s*��\|8\_s*��\|��\_s*��\|�t\_s*\%(��\|�^\_s*�[\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�~\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�S\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(�Y\|��\_s*��\)\|��\_s*�M\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*�[\_s*��\)\|�a\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�c\_s*�J\|�c\_s*��\|�G\_s*�s\|�\\_s*�Z\_s*��\|�Q\_s*�q\|�G\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*�G\|��\_s*��\|��\_s*�t\_s*��\|5\_s*[�“�]\|�T\_s*[�“�]\|��\_s*�E\|�r\_s*�U\|��\_s*��\|��\_s*�Y\|��\_s*�[\|��\_s*��\_s*��\|��\_s*��\|�~\_s*��\|�{\_s*��\|�o\_s*��\|��\_s*�g\|�Y\_s*[���q]\|�@\_s*��\|�h\_s*[�‘�]\|U\_s*\%(��\|�^\_s*�[\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�E\_s*[�c�R]\|�C\_s*��\|�d\_s*\%(�`\_s*�r\_s*�s\|�u\_s*�d\)\|�]\_s*[�햅�o�Z]\|��\_s*��\|��\_s*�q\|�_\_s*��\|��\_s*�r\_s*��\|��\_s*��\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\_s*��\|�r\_s*��\|�s\_s*��\_s*��\|�o\_s*[�E����]\|�\_s*[�W�k]\|�C\_s*[�؎Q]\|��\_s*�\\|��\_s*��\_s*[�ΒY]\|�_\_s*�F\|�e\_s*[����]\|�p\_s*\%([�꓍��]\|�g\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ȉ���]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|�s\_s*[�”@]\|��\_s*�{\|��\_s*��\_s*��\|��\_s*��\|��\_s*�L\_s*�n\|��\_s*��\|��\_s*[�c��]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|�V\_s*�\\|�`\_s*�G\|��\_s*�{\_s*��\_s*��\|��\_s*�a\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*�t\|��\_s*��\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*�q\|��\_s*[���j]\|�x\_s*\%([�k��]\|�V\_s*��\_s*�c\)\|�G\_s*\%(�z\_s*�o\|�t\_s*�Q\_s*�j\_s*�[\|��\_s*��\_s*�@\_s*��\|�j\_s*�Z\_s*�C\|�[\_s*��\)\|��\_s*�C\)',
+      \ 'z' : '\%([�󉀉��ꑹ����㔑����������������������ґm���h�X���f�ّ��������ۑ����\�����]���Y��萊��A�K��㿑R�U�W��N��征͑V陑T�P�Q�f�O�S�⚃������ҐƐōU���ӂ��ž����l�b齕������A�Z�B钎���@笐������~�t�������ߒÐ|���}�C���D�����󓈓����Ȟ펱���Ǝ��w�x����c��H��苍��׎��l����䝎�ڐ����㒼�Ó�����K�������b�����H�ז��iᶘ���u�@�v�ސn�Չ`�r�x�����o�s�q�w�p�t�l���䥞`���œ���ҏ��t����J�珊�R�������P���������t�i���g��������Y�U���{�����ㅐ���媚ߘ����j�h�Ř�竐��ҝm���Y�o�@�ݖ�����Ï��ꏗ�����`���~��]����꞊��󝵏������������������휵�h�G�ڜ����G��Q榏A�@���u�Q���h�x�m��n���p�q⢓ď��m�Ï|�m�����՟��~�[���x��{䤏��z���������y�}������汛}����������杆�n�G໒��^�E���☸�s�F��_�`���O�c�a�_�Y���[�]�b�\�Z�e�d�����ꎠ���������������m��䢛y���k�������d�������H���m���ˎ����掝���~�Ŏ����n�~���I���m熉a��玘����J�Ȏq����j���^�Z�������i�������V�����V��������␷��╛���N�M�������趞��ƎL�G�Q�Z�����S�R�͛؜�k�O��槎S�b�Μ͎a�c���Z���ˍϙ����܍ލ��ߍ݊o����Y�፿���������U���������������[�]���������w�G�Y�]��Z���U�W�ĄH�[�x��z]\|�\_s*\%(�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\|�\_s*�\)\|�b\_s*[�]�[�Y�W�U]\|��\_s*[����������]\|�\_s*�\|��\_s*��\|�o\_s*��\|��\_s*[���q��]\|�\_s*�\|��\_s*��\_s*��\|��\_s*��\|�O\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|�\_s*�\|��\_s*�p\|��\_s*�o\|�C\_s*�@\|�m\_s*��\|��\_s*��\|�k\_s*[�ߌY]\|�\_s*��\|��\_s*�s\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|�\_s*�\|G\_s*\%(��\_s*��\|�p\_s*��\)\|D\_s*y\|�f\_s*\%(��\_s*��\|�p\_s*��\)\|�x\_s*�x\|��\_s*��\|�Q\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�q\|J\_s*\%(I\_s*S\_s*�R\_s*�[\_s*�h\|�|\_s*�b\_s*�v\|R\_s*��\_s*��\_s*�{\)\|��\_s*�q\|�b\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�M\_s*�h\_s*�p\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|�[\_s*\%(��\|��\_s*��\)\|�`\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|�R\_s*�l\|�y\_s*�_\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�r\_s*��\|��\_s*�v\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���@�S����������]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|�i\_s*\%(��\_s*�[\_s*�O\|�|\_s*�b\_s*�v\|�t\_s*�m\_s*�j\_s*�n\)\|��\_s*�q\|��\_s*��\|�P\_s*\%(�Q\|�O\_s*[�i��]\|�P\_s*��\|�U\_s*�i\|�W\_s*��\)\|�t\_s*��\|��\_s*��\|�R\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|�\_s*�\|��\_s*��\|��\_s*��\|�\_s*�u\|�e\_s*��\|��\_s*��\|��\_s*��\|��\_s*�{\|�U\_s*��\_s*��\|��\_s*�H\|��\_s*��\|�T\_s*\%(��\_s*��\|��\_s*�|\_s*�[\_s*�j\_s*��\|��\_s*�S\_s*�T\)\|Z\_s*\%([r��]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|�K\_s*��\_s*�_\_s*��\|�o\_s*�b\_s*�t\_s*�@\|I\_s*P\_s*�t\_s*�@\_s*�C\_s*��\)\|�V\_s*\%(�^\_s*�[\_s*��\|�I\_s*\%(��\|�j\_s*\%(�X\_s*�g\|�Y\_s*��\)\)\)\|�y\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|�c\_s*\%(�@\_s*\%(��\_s*�g\_s*�D\_s*�X\_s*�g\_s*��\|�C\_s*�g\)\|�F\_s*\%(�i\_s*�[\|�b\_s*�y\_s*��\_s*��\|��\_s*�}\_s*�b\_s*�g\)\|�B\_s*\%(�N\_s*��\_s*�X\|�^\_s*�[\|�[\_s*�O\_s*��\_s*�[\|��\_s*\%(�o\_s*��\_s*��\|�}\_s*�[\_s*�}\_s*��\)\|�S\_s*�C\_s*�l\_s*��\)\)\|�`\_s*\%(�N\_s*��\_s*�X\|�A\_s*�m\_s*�[\_s*�[\|��\_s*�[\_s*��\_s*\%(�q\|�b\_s*�q\)\|��\_s*��\_s*�_\_s*�b\_s*�V\_s*��\|�S\_s*�C\_s*�l\_s*��\_s*��\_s*�C\_s*�[\_s*��\)\)',
+      \ '{' : '[�o{]',
+      \ '|' : '[�����b�a����|]',
+      \ '}' : '[�p}]',
+      \ '~' : '[�ʁ`�P~]',
+    \ }
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim
new file mode 100644
index 0000000..3d7e21b
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/eucjp.vim
@@ -0,0 +1,97 @@
+function! EasyMotion#migemo#eucjp#load_dict()
+    return {
+      \ '!' : '\%([�⡪!]\|��\_s*ò\_s*��\)',
+      \ '"' : '[�ɡ��ȡ�"]',
+      \ '#' : '[��#]',
+      \ '$' : '[����\$]',
+      \ '%' : '\%([���%]\|��\_s*��\_s*��\_s*��\_s*��\)',
+      \ '&' : '\%([��&]\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)',
+      \ "'" : '\%([���ɡ��ơ졭��'']\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)',
+      \ '(' : '[�ʡ̡ڡء�(]',
+      \ ')' : '[�ۡ١ˡ�)]',
+      \ '*' : '[���ߢ�\*]',
+      \ '+' : '[�ި����ܨ���+]',
+      \ ',' : '[����,]',
+      \ '-' : '\%([�������ࡽ�ݨ���������-]\|��\_s*��\_s*��\_s*��\| \_s*��\_s* \)',
+      \ '.' : '\%([�š�������\.]\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)',
+      \ '/' : '\%([��ࡿ\/]\|s\_s*l\_s*a\_s*s\_s*h\_s*d\_s*o\_s*t\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
+      \ '0' : '\%([������0]\|��\_s*��\|z\_s*e\_s*r\_s*o\)',
+      \ '1' : '\%([��ɴ��GMKhYZEPTn��mcyzdafp��С��죱1]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|s\_s*\%(e\_s*v\_s*e\_s*n\_s*t\_s*e\_s*e\_s*n\|i\_s*x\_s*t\_s*e\_s*e\_s*n\)\|��\_s*��\_s*��\_s*��\_s*[�֥�]\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|g\_s*i\_s*g\_s*a\|��\_s*��\|��\_s*��\|k\_s*i\_s*l\_s*o\|��\_s*��\|��\_s*��\_s*��\|e\_s*\%(i\_s*g\_s*h\_s*t\_s*e\_s*e\_s*n\|l\_s*e\_s*v\_s*e\_s*n\|x\_s*a\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|t\_s*\%(w\_s*e\_s*l\_s*v\_s*e\|h\_s*\%(i\_s*r\_s*t\_s*e\_s*e\_s*n\|o\_s*u\_s*s\_s*a\_s*n\_s*d\)\|e\_s*\%(n\|r\_s*a\)\)\|��\_s*[���]\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|o\_s*n\_s*e\)',
+      \ '2' : '\%([���2]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|t\_s*w\_s*\%(o\|e\_s*n\_s*t\_s*y\)\|��\_s*��\)',
+      \ '3' : '\%([����3]\|��\_s*��\_s*��\|��\_s* \_s*��\_s* \_s*��\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|t\_s*h\_s*\%(i\_s*r\_s*t\_s*y\|r\_s*e\_s*e\)\)',
+      \ '4' : '\%([�ͣ�4]\|f\_s*o\_s*u\_s*r\|��\_s*��\_s*��\)',
+      \ '5' : '\%([����5]\|f\_s*i\_s*\%(f\_s*t\_s*y\|v\_s*e\)\|��\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\)\)',
+      \ '6' : '\%([ϻ��6]\|s\_s*i\_s*x\|��\_s*��\_s*��\_s*��\)',
+      \ '7' : '\%([����7]\|��\_s*��\_s*��\|s\_s*e\_s*v\_s*e\_s*n\)',
+      \ '8' : '\%([��Ȭ8]\|��\_s*��\_s*\%([����]\|��\_s*��\)\|e\_s*i\_s*g\_s*h\_s*t\)',
+      \ '9' : '\%([�壹9]\|��\_s*��\_s*��\|n\_s*i\_s*n\_s*e\)',
+      \ ':' : '[���ġ�:]',
+      \ ';' : '[��;]',
+      \ '<' : '[��<]',
+      \ '=' : '[����⢮���=]',
+      \ '>' : '[��>]',
+      \ '?' : '[��?]',
+      \ '@' : '[��@]',
+      \ 'A' : '\%([���������Գ���ȯϾ�տ��ƭ�����޾�����ӡŤ�������Ƭ��ѫ����ͷ�ʷ��İ�Ϳ���������������������ø�������ܶ���쨽��̵����ᵽ�������驰��н�������ƪ��鷹ѻ�����ˢ��ǽ���������½���֦��������½�Φ����ؽ����Ǯ�����Ȳ���䰵�Ǵ�������ݯռ���м�������Թ�������޹����������׹���Ϫ��ɽ��������������¹�Юͽ����㹻�ɷ���Ű���庾Ӻ̴������ɵ�����ఽ���������������;������ŷ��������������ֵ��ϰ�̣�ð���Ԫƴ�����갮����������������������������ů��μ���������ۭ�������浱ϯ��������ޫ����ۦۥ���˾Ͼ����������ݷԼ�������న��ʸ�ۣ��齶��ϰ����갥���欷�����ǹ԰��ްưɰ���Ȱ�������ī����������ð�������­�����������Ӽ밫�Ƽ������ǹ��������˽�����������������˰����ķ�ʻ��г�������㰭մ�����������������������먰µ�����ͭ���ް��������������ب��˰����ک��������ʡ�����&�ܶ��ϰ���������͢��΢޸姸���ơ��������Ǣ������Ѧ�������A]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*ŵ\|��\_s*��\|��\_s*��\|��\_s*Ʀ\|��\_s*��\|��\_s*��\|�\_s*̾\|��\_s*̾\|��\_s*��\|��\_s*��\|��\_s*[��Ļ]\|��\_s*��\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|¹\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*ʪ\_s*��\)\|��\_s*��\_s*��\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|ޱ\_s*��\|��\_s*��\|Ʀ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*¿\|��\_s*��\|��\_s*��\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|��\_s*[�º���Ǭ]\|��\_s*��\|��\_s*[��ɧ]\|��\_s*��\|��\_s*��\|��\_s*��\|Ҹ\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*[�ˡ�]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|D\_s*��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[ɿ���ο�����]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\_s*��\_s*A\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*ư\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|°\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\_s*��\_s*ǽ\|��\_s*��\_s*��\_s*ǽ\|��\_s*ˡ\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([�������ȥ��]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*ǽ\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*Ͽ\|��\_s*��\|��\_s*\%([�˥ᥢ����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)',
+      \ 'B' : '\%([���߹�������������������������������������ھڽ���������������������������𰺱�������������ѳ˦�����˲̶������������˳ر˸��˹��˻˶����˺����������˴��˾����˵˿�Ŵ�����ը����������������������������˫Ħ˷��������������沶��ѹ���������ʽ���ٷ��ҡ����������������������۲�������˼������ū��޽��ʥ��޼�������޿������������������ʪ�ɲ�ʹʸ�����������������ק��̵���ز�������������ǿ����⿡ʬ�Ԥ������͹�������ɵɤ�������ޣ�ֱ���������ؾ��ݧ�������������ɴ�������졪����ǭɼ�����֢���ʿ����������������̤������������������ջ��������߾׹����������������Ȣ�����®�Ӷ���ȭ��˪��ƯȪȫ��ʵüɡΥ��V̥����ٶ��ȵȶ��Ǣ��ʢ��ʧ㱸�����Ȥ���������������˽�������������ձ��������������������೭����������������Ȩؤ��ȹ���������Ƚ���������������ȼ㩺������������������Ȳ������ȴȳ��Ž�����β�������ĥ�����Ϳ��������̤С�ʩ�������첼�ߡݡ¡á������ܥСϡΡѡУ¥֥Ӧ����Ҧ¥�B]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ܥ٥֥ӥ�]\|��\_s*[�ܤ٤֤Ӥ�]\|��\_s*��\|��\_s*��\|�\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*Ǥ\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*ݰ\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|˭\_s*[����]\|��\_s*��\|ŷ\_s*�\_s*�\|��\_s*[��϶]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|׽\_s*˥\|��\_s*[̡˥]\|��\_s*Ҵ\|��\_s*Ƭ\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ʼ\_s*[��ˡ]\|��\_s*[�Ļ�]\|ɽ\_s*��\|��\_s*��\|ȯ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�\_s*�\|��\_s*��\|��\_s*\%([��ϫ��]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)',
+      \ 'C' : '\%([���²����ݰ���ť������������ޢ��������°������������Я�⸿���Ƚ�����Ǽ����ۻ�������ô�㪸��ۺ��������礷���򼷻쮱���������޹���Ѻ�����Ϲ���ٹ������ۺ������Ѻ�������������������������縥���պ�����������︷���������������������ȹ�����������������������޳Ӭ��������ު���⺤�������ӫ����������ޫ�ص���������٫��������Ⱥ����Һۦ��־����ִ��������������������Ṳ��������ӳ������̫���ָ������٬����������޸���ܺս�幡����������й���䢹�̨����ɹ������ж���๫�ʹ�����á��������������乨ۥ�����⫹�����⩹�������������۶��չ����̹��˹��عֹ�骹¹ݹҹ������Թθ��Ĺ��ӹ���ëӭ���������ص����������Ĩ���������������������̼ܵ�������٢޵�ѻ۹�ƺ���������ݸ���ջʴ�����ڸ���ǻ����䲹������������ž�ݸ�檽�����������۸ŵ������麮���������Ķ���۸ɸ�������������ɯ�Ŷ�˻����ܦ�������í����ӵ��������޶��٣�໦��������������������������������Ҫ����ͼ��������������������·��������������֣�����������������訰��������������Ѣ����������޷����ѩ������ڱ�������߫��������������������������ߥ����������������ѡ����������������������٥����Ѩ��������ڣ��������������������������������������̻������ګ�������Ǻ������������������������خ����ع�����������������Ṷ�����������������������ܮ��ݮݬܱܯ�ݫ������ʵ��ߪ�������������÷��������ٷ�������ʤ������վ�߷�������ţ賷�Φۻ���Ү����������·��ط����״����򷬷���������ڶ�������˿��ֲ�ƺ�̽���ǰ̰�鶰��������פ��޺���������������ޱ�����Ϳ����������߸������������ѦΦ���庿����ܸ���ȷ������������ˮԢ������ʭ����Ц��������ġ������궡�����ȷ��������㹩家�����������Ң�������׵����Դ񣹸������͹ȶ�����ҿ�ݹ����ڵ⤯��Ա�������颼�������������ý�Ƴ��ħ��������󻼲�������١��������Ĵ������ɸ¢ֺλ����������ߨߧ�¼Ȼ������ο�Ǧ�������ǧк�Ϣ����尷樦ȵԦ��������������ܰ�Ǣ��������������ܾ������������ؼ��������鼮��Ĭ�������߼��𭼿������ɨ���������ũ���������ż�������ʻ��������������������͸忬�ļ��������������������������Һ�������ĵ��������հ���ռ�������ޯ�κ�����ٱ��⬼��������բ�������μ�����������忼޼��м�ܼ�����Ѽ׼ͼм˼ּ�Ұ����ʵ��������༩���ǿ�ެ��ոշܤܣƵ��������ý�������������ʽȽͽɽܼ̿�������������н���������������֭��������ܶ�����Ӵ����嵼��������ϸ��������������������ܽ�����µ���½���������������������������������Ѯ�آ߽ض����ӽ����ؽ�޴�׽ٽ���䣽ֽ����߿����������������֪��꿾�����˿�����Ӣ����������ǿ������������п¿��������Ŀ˿��ӿ��¿��ǿ���ä���⿹�����ü��������ʿ������ƿ�謹����������н��������н���������������ؽ�����������׼�������������������һ��������������������������޵�������������������������黪���پ�����طգ������ңֹ�Ͼ�����������������Ӿԡ������������ѽ����ؾ����������������Ѿ����ء髾����������޾��������������۾���騾����ľ㾩��ா���ܥ�������������꾤�����Ͼɾ����˾���ƴ�Ҿ��;��������ƾоȾ��þϾܾھ˾����������֤��ԧ������������ῡ����°�������������濣��������������ֻ�������ɦ��Ƶڴ�Ԯ��ӡ�������ݻ��������������ӻ������������ǻ���߻ද�����Իջ���֬����ڻ����Ͽ�Ż��溡��������᡺���л��л�����������Ƿ��ǡ���ʻ�����᪶ۿڻ������������ף�����������һ���л��������̦�������򼡿����ּ���׶�����꼨���ǻ�徼�㬻˻������������㫻�������������������������ڹ��ɳ�����߳��˹��ȷ�̢���ư��񢿱Ʊ����ʡ�ܢ��������������ᱵ����������������ʹ�ǡˡԡơɡСҡȡѡա������ج�ɳ�����϶�������������Ѿʸܵ�ȿ�ּ����ĵ���ǣ�����ʶ�ͽ�����г�����ϵع�˵�����ۿ��ٸ��Ƿ�����������������ͩΫ�����峻����������������K�Ĵ���������ȱ���١��۫�������������Ȧ��滳��������Ҥٿ���龹�ô���������������������������Ž��޳���������ڳ³��������������������ư귰����¦�������γ��ǰ�����㡴��姡������������������������റ����������ҳ��������ݲ��������ҳ����˿����������ڸ����ি�ԣ�����ϸ³ø��֡���סٷ�������ŭƬ��������ŬŨ��״׳�Ť���Ұ�����ɬ������Ŵ����ܷ�������̳��������������ڲ������������ų�Ӿ���筢�����Խ������ڨƿ����ӽ�dzӡ͡ڡΡۡϡ̳��ȳijԳճʳ��߱�������ڼ�˳ͳȵҳֳѳ�ר���������һ����������Т�����������������Ӽ���߶���ݥ袳�����Ъ�����������Ļ�����������ӳ���ܴ��������߳����ٳ����β����𳭳������dz����������󳬲����������������Ӳ����٪۸���������٢�Ԭ�������ٺ��������������Ұ����ߵ��������Х����������Ľ��楼������������������Ѵ���޾�˸�˧�ӳ�����������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ�����ȴ�����ݴ���԰���ݴ����۴���ڴ��������Դ�ա�����̴�����δ��˴���ע������Ӵ�������ӿ�ٴƴ��Ŵִ��״��ɴ����ش��ϴ������Ѵ��ش������Գҵ��ȴճƶ����ɳ��վ�ײ˲����ײޥ������ϲ����ӧ����鴲�ӻ�������������βٳ�������ϲʸ�������ӥ���׷ҽ����Իٷ����߲������Ѳβ��Ӽ����β��ȹ����������������ŷ���������ѫ�Ȼ��¥������ϲݲľ��Ӿ���������������۲Ҵ�������������粽桲����Ʒ������²�����Ф�����������Բ�����ּ�����вز���ͤ����ı��Ķ��Ƣ����۲ø򧶧������ا���ۧէ٧���ܧק��⧿�觵���ӧ����𧼧��������ߧ���ҧ��ާ���������ѧ֧᧱�����㧺���秽��䧰���ڧݧԧ姫��������ߨ���������Ƽ���֦��ҧ�������ݡ��������׶������������ܥ��������������������������á��C]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\_s*Ⱦ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ѥ\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*[�ʺ�]\|��\_s*[϶��]\|ѱ\_s*��\|��\_s*��\|��\_s*[̱�ѡ�]\|��\_s*��\|�\_s*��\|ɴ\_s*[߻��]\|��\_s*��\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|õ\_s*��\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*[������]\|��\_s*Ϣ\|��\_s*[��Ǧ]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[����]\|�\_s*\%([��α���ֲ����˼���]\|��\_s*��\|Ǽ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|7\_s*��\|ʸ\_s*��\|��\_s*[ʬ��]\|4\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�̰�]\|��\_s*��\|��\_s*\%(̣\|��\_s*��\)\|��\_s*[����]\|͢\_s*[����]\|´\_s*��\|B\_s*r\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*[����]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|ݣ\_s*��\|�\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*ƣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|ʬ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|��\_s*[������׾�]\|ʣ\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\|��\_s*�\|��\_s*\%([���]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*[���]\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����֥ץ���]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ɥѥ��֥��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%(��\_s*[����]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�ĥȥ���]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%([�����ޥ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ץ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�եȥץ���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([������������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([���եɥ��󥳥ꥦ]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[����]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�����ȥॸ]\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*ɸ\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*³\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\)\|ú\_s*��\)',
+      \ 'D' : '\%([�������ñ��ӹ������ɾ�������ǯ����Ļ������Ч���������γ����������������Ѫƺ�������ѯ��ƫƯ��������ƣ�ޡ���Ʒƴ���Ƽ��ƵƳ��Ƹ����Ʋƶưƹ��Ʊƻ�ȸ���������������α��Ͽ������׸ͻ�פɻ�����������ǩť��ŮܬҴ��ޡ�����������ѣ���žȤǥ���ɶ��ʹ˶���������¤��Դ����͸������Ϣ�������ߵ����ſ���ť�����ϼ����Ϥ¼�êí�����ݺ�ǻ����������ï��î���Ե�̺���ë���۴����ֳٹ�������է��åæ�������Ƕ������ʿ�����ϡ�����������������������ö��׼������������ԥ�����������̼�ձ��ټ۴����ٽ�ɿ���ί���ʿ�����ѵ����߱���Ω������������Ѽ���ĽФ�ľ����Ц����\.�š��ġ�ɡȢ���������ã����ȣĥɡ�����������զ��ĥǢ�D]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ɥǥť¥�]\|��\_s*[�ɤǤŤ¤�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*ŷ\_s*��\|Ʀ\_s*��\|ǡ\_s*��\|��\_s*��\|��\_s*��\|Ǵ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|Ƭ\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|Ĵ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*��\|��\_s*��\_s*ã\_s*¿\|��\_s*\%([��˸�]\|ʿ\_s*��\|��\_s*ŷ\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|ǵ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*ʪ\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|��\_s*��\_s*��\|ȯ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*ά\|��\_s*��\_s*��\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|��\_s*��\)',
+      \ 'E' : '\%([��������ٱ稰��Զ�����������������콸ս���֦����������ٻ��ٱܱ�������������������ְױ����ر�����ݩ�������Ρ�޼��������޽��������Ԩ�����ɲ�����᰸������ާ�����Ǣޱ���޻����ʥ������Ԥ�������ϱ������������ͱ��ն�����߱��������۪���������ܳ��������������۱����ϱ����Ʊñ����ȱԱű�ƱӱDZɱϱıʻ޲�����ͱ�������賨�������в�ó�ت���̱������¹�����������������������������槶���΢�������ާ������Ѣм����Ǧ��ŧ㧳���ݦŧ��泌��E]\|A\_s*\%([��Ƚ����]\|V\_s*\%(��\_s*��\|��\_s*ͥ\)\|B\_s*\%(��\|C\_s*��\)\)\|��\_s*\%([��Ƚ����]\|��\_s*\%(��\_s*��\|��\_s*ͥ\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|ɰ\_s*��\_s*��\|M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*˹\_s*��\|��\_s*ʪ\|��\_s*��\|˦\_s*��\|��\_s*��\_s*��\|Լ\_s*��\|��\_s*��\|��\_s*ϩ\|��\_s*��\|��\_s*[�Ի�]\|��\_s*ƺ\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|L\_s*\%(��\_s*��\_s*��\|L\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([���ɲ]\|��\_s*��\)\|N\_s*��\|��\_s*\%([�Ķ˶�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%([����]\|��\_s*��\_s*��\|N\_s*��\|F\_s*��\_s*��\)\|��\_s*\%([�Ȼ��ʶ�]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*[¿��]\|��\_s*\%([������]\|��\_s*��\_s*��\)\|X\_s*\%([����]\|O\_s*��\|��\_s*��\_s*��\)\|��\_s*ƻ\|�\_s*Ʀ\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|��\_s*\%(Ϸ\|�\_s*��\)\|��\_s*��\_s*��\_s*®\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|ݿ\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|ȯ\_s*Ÿ\|ɾ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|ɴ\_s*��\_s*��\_s*ŵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*ĥ\|��\_s*��\|��\_s*ò\_s*��\|��\_s*\%([��]\|��\_s*��\|��\_s*\%([�ޥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*Ω\|e\_s*\%(x\_s*a\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�֥����顼]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*[�ȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*[�ȥ�]\|��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)',
+      \ 'F' : '\%([ϼ���в�����ɮ���߸�������˼��ݵ����ϰ�˴ϴʻ�ÿ����ū���������������߹������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ��������������������޽ʥ޼����⵺�б����ƣ��߬����������������������ο���ʳ���������������زʰ��ʧʨ�������ؿ�����礢�����ı������ǹ���޴�ʤʢ������������ʣʡ������������Դ���������н��������������祹����������Ƨ�������������Ϸ�������붸��������ʮ���Ҷ�������������ۿ�������������տ���������������������������ʫ������������ݤ�Ŵ��Ϣ��٢޶�ʩ�ǵ����Ƣ�ʦ��զ��槶��F]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ǹ\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(Ǥ\|��\_s*[����]\)\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[�滳]\|��\_s*��\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*[�ͤ���]\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Χ\_s*��\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*ǽ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*[����]\)\|��\_s*1\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
+      \ 'G' : '\%([���������Ʊ��亲�޺��и������Я����ǡ����¹���ɹ��������Ͽ������й����������ӹ��ij����������������ݶ���������޸������Ķ����˸߸���˱۸�5�ѻ��贸���裵�����Ӫ�ش�����೸��幡���椴����֡�����������������������ɷ޷߷��ݱ����ɧ�������������븿����ѷ�ʸ����������¸�����������������˲Ʋ򲼽��Ӥ�����������ʵ�ʹ�������¢�̸���襶���鹶��ʵܶ�������溷����������ֶ����ȶ���뿩�۶��������ɤ���������ݵ�Է����֪�۶��������������̵���������ߤ�Ƹ����������ѧ�ĶȶǶŹ�����Եյ���ۧ�Ĵ�Ѧ�۷�漷������㦵��뵾���Եõ��µ��µ��ڵ���ີ���嵽����٦���������ȱ��ⷸ��Źε���������״�¦�̳���������񷿷�����Ը걳����ҳ����޽Ż��˳���������������Ƭ�����޸���������������̴ݢ��������޴��������ḵ�����������������������س�����̳۳ٳܳڳ�Щ����ֽ���������Զ�������ӱ������⭳��������賩���������������������²����Ө���Ѽڲ����߲��������������þ����̲����ϲ�ֶ������ݥ���ծ󢴢�䤬���Ǵ��楬�����¦˦������������Ϧ��Ҧͦ��Ѧ��ʦΦɦ��Ȧ̦����Ŧ��Ħ��צ��Ц��Ӧ����Ԧ����Ʀ��զ��֦��Ǧإ����Ԧæ�����G]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƭ\_s*��\|��\_s*��\|��\_s*��\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ֱ�]\|ŷ\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([�Ÿо���]\|��\_s*��\)\|Ʀ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��¯]\|��\_s*[���ǹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*[���׹��]\|��\_s*ϡ\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\|��\_s*\%([ˡƻ��]\|��\_s*��\_s*��\|ʹ\_s*��\_s*ˡ\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\|��\_s*��\_s*ë\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*̾\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ϣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([��른���Υʥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*[�˥�]\|��\_s*��\_s*[�˥�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*[�ĥ�]\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ե�ޥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*[����]\)\|��\_s*��\)\)\)\)',
+      \ 'H' : '\%([��ά������мۭϯƶ�����������ش�Ǯ��˴����������ꥷֹ����١��������ڣ��������þ���̷��Լ�����������Ե篳�ٸ������׺������������ê��ޤ����ұƾ�����˲���������˯������������ˣ˱�������˩��������ˬˢ߰��˥��˨��������ˮ˰˦������˭ˤ������ڽھ����������������Ͼ�Ծ�����������Ӭ������Ӯ������Ħ˫���������ޱ������ێ͸�½Ш�����۳ֱ�����׭׬̦������������������������������������������΢���������٨������������������ղ��ʽ������֢��������ʾʻ�������������������ظͤ؎�ϼ���в������ر��߸�������˼��ݵ�ɾϰ�ϴʻ���ÿ����ū������������������߹������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ����������������޽ʥ޼�����б����Bƣ߬����������������������ο���ʳ��������������زʰʩFʦʨ���յ������ؿ����乢���������ǹ���޴�ʤ��������ʣʡ������������Դ���������н�����������ڹ��������Ƨ�����ٹ������������붸��������ʮ���Ҷ�������������ۿ�������������տ�������������������������ʫ���ܤՎ���ϷDz����DZ������ɢ���򱽨��ɨ���ڻ�ɡ����ײ����ɦ����������������گ�����������ʶ����������������ɳ����߫��ߪ��̩���������ҷ�蹱��������Ψ�����ɢ�ʺ���ɽ��źضѽ�����������ñ����¾��Ʒ��1������ඡ���ɩ�Ͼ��Ǽ�����ݱɧ������������ɴ����������ɪ粹����ɲɱ��桶���ڲ�����Ÿ��ͨ�������ѽ�ʹ������������������������͵��ע��������ɤɯ��ɭɥ�ʹ�ɫݤ����̤��ɮɬ��������������ɶ��ɷ��ɿɺ��ɻ������ʼ��ɼɾɸʿɽ�������ʡ�֡ڡآ�����������淥У��������������������������������ɹ��Ҹɰ����ȸ�����̥��������������������������Ժ����������۬���������ഥ�����������������զ���������좤Ҏʻ���ȧ�۽ˡ�ȣ������ү������ꤾ�׼����Ȧ׹���������������������߶�����������¦�����ھ��ൡá˵��ȫƯ��Ȫ�������������������IJ�Ը����ʧ����ȷ��������ȩ���Ƹ�С��Ȱ�����ϳ����ܥ��˧�˲�����ʢͪ�������ڼ�����������Ѷ�����������������Υȹ��������ȸ��ަ��ɡ�ڲ��������������չ������Ȥ��ýҺ�⢢������ҹ�Ȣȡ������ٰ������®Ȼ�������и�����ɳ�֯ݢ�����ڦ���������������¬��ԦѳĽ�����̷׿޸��������������ȥȮ�������ϡ����ȭ˪�ȱ��ˡȰ����Ȭȯڴ��������ԯ������������������������أ��צ�����ɣ����������������������Գ�������ޢ��߯�Ȩ�����������������ź�ܹ������������ڵ������ȼ��������Ƚ�����������������ɺ�����������Ⱦ����ȿȺ����ķ��۱�����������ҵ����������û�����������������ü�������Ŷ���Ǻ������ʱ���ĥ����������������Գ�Ʋ�ı���������������ɿ������㻫Ժ�����������Ž�Ϩ��������������������������������������������ȡ��ա�����ȥҥۥإ�H]\|��\_s*[�Ύ͎̎ˎ�]\|��\_s*[�ۥإեҥ�]\|��\_s*[�ۤؤդҤ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[󤱧]\|��\_s*Ļ\|��\_s*��\|��\_s*[�п�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\_s*��\|��\_s*[����]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*ˡ\|��\_s*λ\|��\_s*��\|��\_s*\%(�\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|h\_s*e\_s*c\_s*t\_s*o\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[�滳]\|��\_s*��\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*\%([�ͽ�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�ȡ�]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|ľ\_s*[�����Ᵽ]\|��\_s*Φ\|��\_s*��\_s*��\|��\_s*��\|��\_s*[�˹�]\|��\_s*Ÿ\|��\_s*��\|��\_s*ƻ\|��\_s*��\|��\_s*��\|��\_s*��\|̢\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ι\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|Ʊ\_s*˦\|��\_s*��\|��\_s*[��ȧ]\|��\_s*[������]\|��\_s*[�ǵ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|Ĺ\_s*ë\|��\_s*��\_s*��\|Ż\_s*Ƭ\|��\_s*��\|��\_s*��\|��\_s*[���]\|��\_s*\%(��\_s*��\|��\_s*��\)\|ͦ\_s*[����]\|ή\_s*��\|��\_s*��\|��\_s*\%([�ͤ���]\|��\_s*[����]\)\|2\_s*\%([�ͤ���]\|��\_s*��\|0\_s*��\)\|ø\_s*��\|8\_s*��\|��\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|��\_s*\%([���������]\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*ή\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\|��\_s*ϻ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[��ʿ��]\)',
+      \ 'I' : '\%([���Ǧ��ߡ�����׵׶���������϶���������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�������������ȵ������ܵ�述�S׽ꭲ���������ڿ��Ĺ�Ǣ��������̿��θŸ��沵����ż���������ϫ��������ĺ�������׻��������к������غ�������Ү����ͦ�����ܡ�����Ǯʰ����������������˻�ް�������������Ϯ�ס����ӱ��������©ĩ��߱��۱İ����ս�˻�С������ݫ�����׸�������ԩ۵��ີ���衰�ݻ����յ������������ư�׮���в����������������ΰ�𨱡���������ֱ����޴����۩���ܰ��д��ذ�Y�Ű�1��������㥴�Ū��٥������������Ӱ�����������׳�������������̰����Ѧ������ư��׺ع��ް۰����Ȱ�ަ������ͬ�ص�Ա������߼���Ӱܾ������Ψ��թ������ͣ�ް�������׵���״�б�������ְ������Ұٰݰ�����ǡ�����޻�����ڰ汶��ԣ���ϱ����������ΰ��Ȱڤ�ɹ���ۢ��͢��������˰����籥���������ɥ������ڻ��I]\|E\_s*��\_s*��\_s*��\|��\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*ë\|��\_s*ʸ\_s*��\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|�\_s*��\|��\_s*[����]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�\_s*[�Ļ�]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*[����з�]\|��\_s*��\|ݬ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*¹\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[�Ǻ�]\|<\_s*=\_s*=\_s*>\|ɬ\_s*��\_s*��\_s*ʬ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|ɸ\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Υ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|¨\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|i\_s*\%(��\_s*��\_s*��\|P\_s*o\_s*d\|��\_s*��\_s*��\|M\_s*a\_s*c\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|̵\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*Ǽ\_s*ˡ\|��\_s*��\_s*��\|��\_s*\%([��ǡ­]\|��\_s*ʬ\)\|��\_s*��\_s*��\|��\_s*��\|Ƴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\)',
+      \ 'J' : '\%([��������ֺ���Ｓ���ȼ����ټ������ľ������¿������������ߩ��̭��������顿�����ױ��ӿ�������пԿҿؿѿտ�������ޮ�������Խ������쿫���ٳа����屽�����ġ�����������������������п�������������л��������Ы�������������ǡ̼����ž�������������߾�վ�������������ڷ����������������������ط��è������Ǩ��쨽������۲�����ٽμ�����ѽ���ƽ����Ž���Ȼ�����ޭ�߱��������覽�۽����ڽ޽�����޼�����������������ߨ��潿������к��ߧ�������尽Ľ½����������ý����ƽŻ����켢��������������μ��������������Ż༤ϩ���μ��ͻ�֮������߾ǻ������߻��Я���������б��㫰ʻ�ֵ��˼��ѻ�������ʼ�����緺����������ܿ�����ٵ��Լ����뤸�������������������֧������������ʧ��קۧ���J]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ʊ\_s*��\_s*��\_s*��\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Φ\_s*��\_s*ü\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���˥ʡ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*[�ӥ�]\|��\_s*��\)\|��\_s*\%(��\_s*[���]\|��\_s*[����]\)\|��\_s*��\_s*��\|��\_s*\%([�ϥ����]\|��\_s*��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*\%([�ʥ�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%([�֥�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*[�ʥ��]\)\)',
+      \ 'K' : '\%([�����²���Ƿ�Ӱ���ť����������������������ư���������Я�⸼�����Ƚ�����Ǽ����������㪸��ۻ��������쮱�����������ֿ���������Ѻ���Ϲ���ٹ��󮺱�����Ѻ����������������������纯�պ���������︾���������������������ȹ������������˶���������޳Ӭ�������ު���⺤�ʻ������ӫ������������ޫ�ص���������٫���������Ⱥ����Һۦ��־����ִ��������������������Ṳ��������ӳ������̫���ָ������٬����������޸���ܺս��������������͹�̨����ɹ������ж�๫�ʹ�����á��������������乨ۥ�����⫹�����⩹������������۹չ����̹����˹��ع��ֹ�骹¹ݹҹԹθ��Ĺ��ӹ���ëӭ�����������й�����Ĩ�����Ӿ������������������̼ܵ����������ѻ�ƺ���������ݸ���ջʴ���ƻҸ���ǻ����䲹����Ƹ�����ž�Ƹݾ���檽���������۸Ÿ�����麮���������Ķ���۶Ÿɸк��������������Ҹ�����ݰ�ٽ����ᾱ��ʷ�������Э��ۿ����ٱ����ݼ������տ������������ܷ��������ѭثҥ����������կ�������������ԡ��ݾ��������غش޲������������ի��᫷𸳰��̷�����ո����������������丮�������������������򸬸������Ǹ�����������ҧڸ�������������������廷���������Ҿ�������º���������ت�����Ϩ���������������������������������������������������������������ꥷ���찷Ʒ̷�����÷���Ҧ���׷����ӽ�����������ܮ��ݮݬܱ��ܯ���ݫ����������ʵ��ߪ�������������÷����������ٷ�����ʤ������վ�߷�������ţ賷�Φۻ���Ү����������·��ذ������ܷ����򷬷���������ڶ�������˿��ֲ�ƺ��̽���ǰ̰�鶰����������פ��޺������Ϳ���������߷�����������ѦΦ�����庿ܸ���ȷ����������ˮԢ��ɦ����ʭ��������Ц��������ĸ�¢����������ƶ�����깩家����������Ң��������ϼ�������͹ȿ�������ҿ�ݹ����ڤ������������ӽ����廸����������������������θ�˨��������ž����߷����䷯���ݡݢ��뿸�֨�����ɵɵǵ̵Ƶʡš��򡢡꡻��ᡥ�����󢥢��������졲���������������󢣡�᡿�⢫�ݡ�������顺�������𡯢��ܡ����Ģ����¡������������ޡâ�ޡ���ࡤ���������墤��������̡뢦�������ˡ䧸����顷������������Ժ��޹�ܶ�ṹ����������µϴߵ�ʷ���ߵ�̸���Ͷ����������������������������������۶�ڢ�Ҷݸ��ٶڶӶ϶׶նѶ�۶ֶ�ض�����ک����ڡڪ䨱����������ӵ����Ҩд��ީ�򰰶ɵ��������ַ����������Ѭ����ި���ٰ���ع�������ڶ�亶�����������ѿ��װ��зժ�������������¶����ⶴ�����ȶ��߸���ҳ����ٶ��������ɶ���Ѿ��������󶩶��������ж����ᶫ�Ŷ��������ö��������������̾����������������켰��ܣ���������֩���ŵ���ָ������������ݱ��͵ܵ׵��ֵ�ȷ���ٵߵ޵�۶�������������泵�������ʹױ�����ڵ�����������ڴ�¶�ҷ�����ȩ�嵩����벫��ݺ���ž뵰������̶˵���������������ة��㶾ø���ۮ޿�����ʴ��ѥҼ������۹���ôﵮ����̵�������Ȳ���������������������٣ݤ��ֿ��������������¿ֵ���̧�ԭ������ҵ�������������������ݸɱ�İө�����������ֵ����������������ڹ��ɳ�����߳��˹��ȷ�̢�ư좿�Ʊ����ʡ�ܢ��������������ᱵ��������ר������Ӹ�������ǡˡԡơɡСҡȡѡա������ô��ج�ɳ�����϶������������Ѿʸܵ�ȿ�ּ����ĵ���ǣ�����ʶ�ͽ�����г�����ϵع�˵�����ۿ��ٸ��Ƿ�����������������ͩΫ�����峻���������������Ĵ���������ȱ��١��۫��������������Ȧ��滳��������Ҥٿ���龹�ô�������������������������Ž��޳���������ڳ³��������������������ư귰����¦�������γ�������㡴������������̻�������������റ��ɵ��������ҳ��������ݹ��������޳����˿�����������ڸ����ি�ԣ�����ϸ³ø��֡���סٷ�����ŭƬ����������ŬŨ״׳�Ť���Ұ�����ɬ������Ŵ����ܷ�������̳��������������ڲ������������ų�Ӿ���筢�����Խ������ڨƿ����ӽ�dzӡ͡ڡΡۡϡ̳��ȳijԳճʳ��߱�������ڼ�˳ͳȵҳֳѳ�ר���������һ����������Т�����������������Ӽ���߶���ݥ袳�����Ъ�����������Ļ�����������ӳ���ܴ��������߷������ٳ����β����𳭳������dz����������󳬲����������������Ӳ����٪۸���������٢�Ԭ�������ٺ��������������Ұ����ߵ��������Х����������Ľ���������ᴮ�������Ѵ���޾��˧�ӳ�����������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ������ȴ�����ݴ���԰���ݴ����۴���ڴ��������ʴԴ�ա�����̴�����δ��˴���ע������Ӵ�������ӿ�ٴƴ��Ŵִ��״��ɴ����شϴ������Ѵ��ش������Գҵ��ȴճƶ����ɳ��վ�ײ˲����ײޥ������ϲ����ӧ����鴲�ӻ�������������βٳ�������ϲ��ݸ�������ӥ���׷ҽ����Իٷ����߲������Ѳβ��Ӽ����β��ȹ����������������ŷ���������ѫ�Ȼ��¥������ϲݲľ��Ӿ���������������۲Ҵ�������������粽桲����Ʒ������¸򲿶���Ф�����ڲ������Բ�������ּ�����вز���ͤ����ᨦ�����秷�������������ʣ˥��߶��Ҧʥ����������ܦ֥�K]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ⱦ\|�\_s*ë\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ϣ\_s*̣\|�\_s*��\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|ɴ\_s*[߻��]\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|k\_s*i\_s*l\_s*o\|��\_s*[��Ƿ��]\|��\_s*��\|��\_s*ɧ\|��\_s*�\|��\_s*��\_s*Ļ\|X\_s*e\|ǡ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*�\|�\_s*��\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[��©]\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|̳\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŵ\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%([ormdaf]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[�������]\|��\_s*\%(��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|(\_s*��\_s*)\|��\_s*��\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*[���׿�]\|��\_s*��\|ݣ\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*\%([�֥�]\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*[�եȥ�]\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'L' : '\%([��������������������������������㡲�����������Тˢ̢Ϣ���̢ʥ��򧭦˧ݦ�L]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\_s*2\_s*��\_s*ˡ\|\.\_s*\.\_s*\.\|��\_s*��\|l\_s*-\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ݦ\_s*ݨ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����������֥ܥȥᥦ����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([�����ƥȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*[�ȥ�]\)\|��\_s*��\|��\_s*\%([������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*��\_s*��\|��\_s*\%([���������������ݥ���ޥʥΥ�̥֥���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*[��]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*[�륷]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�ɥԥץ�������]\|��\_s*��\)\)\|��\_s*��\)',
+      \ 'M' : '\%([�Ӵ��ڬ��������������������߫ߪ�������һս�����������������������ο�������������ὼ�ʪ��ʹ�����������أ���᲼Ъ�����Ǵ��ܸ�����ʸ�������������ݨ�����ۯ�������ۤ˴����������ϳ��˾�������dz��������ܾ���ը�������������������ո�ľѾ�������ճ����˨��ت�����������������������������������������IJ��˾��������޸�������Ϊ溵�ʰ������̺�����������ü������ӹ��������ɴ���������Ϣ͸��¼���ߵ����ٽ��ﶻ�ŷ�̼�����������ǫ䧿��������������������̻����̸̷��̵̴̹����ϻ��̶̳�������������믵��Ĺ�ǥߺ���֪������Ь�յ�������������������̮�þ���̬��Ѱ�λ�û����ǣ�켪��ץŹ������̨��º��ļ�ۡ�����������ۡٱ����̰������ǧʾ������Ƴ����ϩƻ����м�����������̯̾̿̽�Ե�㴳���ﲸ���̫����������Ĵ��̩���̪��ܳ�̲��̱̥��뷿���׽�ѸʿǴ�̣���λ��潼̭���̦����̧�ߎ������ϸ����������߿����ܵ������������Ū�¹׾׿�ᵼ��ž���е����������ȱ�μ�㿮�°����Ž�������ɱ��̸�����Ʀ����ԫ�ѿ���Ǥ������ʶ������������Ŵ��ٰ������������������ü�������������������賹Į���硦Ԥ�����롬���ˡʱߴ�ʣ���󺵸�����������������������ƻ��������������Ϩ����������������������Ż�������Ȩ��ؤ������������̢�������̡�����罨������Ϯ�����򾾶��踭ͥ���������������β�����������������̤�˻���۾�ñ׿����鼬�����Ϸ����׻��������仵���Ŵ����Դ�������޸���������ࢿ��������ޡޢ��Ϣ�����ˢ榤�̢͢ݢТܢʢ��΢����ߢ��ߢ����������������������͢���ݥ޺ǥߧ����̥�M]\|��\_s*[�ӎҎюЎ�]\|��\_s*[����ߥ�]\|��\_s*[����ߤ�]\|��\_s*[������]\|��\_s*\%([���Ͽ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*\%(��\|ʸ\_s*��\)\|ξ\_s*\%([�ѿƿ�]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|ر\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*ĥ\|��\_s*[�����]\|��\_s*��\_s*ӧ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��������ͭ]\|��\_s*ƻ\|��\_s*��\)\|��\_s*��\|��\_s*��\|6\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|©\_s*��\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|��\_s*��\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|��\_s*��\|�\_s*ȷ\|��\_s*��\|��\_s*[�����]\|��\_s*��\|��\_s*��\|Φ\_s*��\|��\_s*[�ҽ�Ԣ]\|��\_s*[����]\|3\_s*[����]\|��\_s*[����ȱ]\|��\_s*��\|ȷ\_s*��\|��\_s*��\|��\_s*[������۾�˪��]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[ζε��]\|��\_s*��\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(̣\|��\_s*[ž��]\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*��\|��\_s*[���Ҹ���]\|��\_s*��\|ߴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*[��̯��]\|��\_s*��\|��\_s*��\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|Ю\_s*��\|��\_s*��\|��\_s*��\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[Ƿ��]\|��\_s*ɧ\|ʹ\_s*��\|��\_s*��\|��\_s*[��§��]\|��\_s*��\_s*ǯ\|��\_s*��\|¿\_s*��\_s*��\_s*��\|��\_s*-\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|ñ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*Ǿ\|��\_s*[����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*��\_s*��\_s*��\_s*��\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\_s*��\_s*̣\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*̣\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)',
+      \ 'N' : '\%([�ɰ��˽���ھ�翮������������������Ǽ����¡���۩����뭵�˾�����̻ĵ����ƭ���о��������۰�Ī�ܹ����ɫ����Ÿˡ���Ҷ����§ů������ŵ������ۨ�����ǹǿǾǽ�������Ľ�ǻ�����ݻ���Ƿ��ǶЫ���Ǹ�Ύ���������եݦ��߿ǫդ������ٹǭ���ʿ�ܡ̲������Ǯ�ϫǬ��̭ܬ����Dzǰdzǯ������޺��DZǩ������ϣǴ��Ǫ�������͎��Բ��ʾ����迡���۾�ݹ��������ŧ�޹dz�˥ȴ��ٶ������Ǩæ�̎�ٿ��ô�����������콭��ʨ���߳���Ʋ������ؽ�Ǣ��Ѧ�浶��ǡ���������ǣ����������աԢ�ءٰ�����ѹ��լ���ǿ�Ǧ��ǥǧǤ�������ٶ�����������������֮��ƨ����б����������������2ð�ɻ����ˎ���ٸ�������ij���������֧����ť鵵ͼ㳴÷ò��ڳ���ز��ּ�����ͱľؽǺޥ��������ϲ˿������ܧ�ƻ����������������������������±���ڽർ��������ͨ��������Ʒ��ȱ���į��ή����¸������ܩ��Ĺ�����޽�Ⱦ�������棷�м�����ǵ����ճ���Ǣ��Ｄ�����������������Զ����Т��͢����꾨��������ƽ����ĵ㴷����ѵ�Ӻ���޸��Ǽ���������̵ӭ�����������ձ��˴��ٽ���ʨ���������������������������������������̾��������˥ͣ΢̡���ʥ̥Χߦͦ���N]\|��\_s*[�ɎȎǎƎ�]\|��\_s*[�Υ̥ͥ˥�]\|��\_s*[�Τ̤ͤˤ�]\|Ģ\_s*��\|��\_s*��\|��\_s*��\|��\_s*ö\|��\_s*��\_s*ȿ\|�\_s*��\_s*��\|ϵ\_s*[�ݱ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƿ\|��\_s*��\|ο\_s*�\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|��\_s*�\|I\_s*I\_s*��\|�\_s*ȭ\|��\_s*��\|��\_s*�\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*ѵ\|��\_s*[����]\|L\_s*e\_s*a\_s*d\|P\_s*b\|��\_s*[����]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ʪ\)\|��\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|��\_s*��\|ʿ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|ɳ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|n\_s*\%(��\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)',
+      \ 'O' : '\%([�����߿��Ů��ۯ۰�Ÿ�۲������˻��Űҳ���������س����������������Ը������������䲮ɭ�������ܽ�����ڶ�����ڼ��ᡳ��������������������������Ǧ��������Ƽ�����Ĺ�Ľ����Ǽ�Բ����������£�����ҽԿ�������־���ͳ�Φ�ֲ���ݣ���ſ����༫�ʳ������ˬ�ʲ��������������񤲷��ǰ��߰�θ��������ۻ�ɽ���̶�������Ͷ��笲��������������ݶ�������ߴ������޳ص����������إ��������㿲�۾����ռ���鲪���������ݯ����ݳ�²�۷��겣����ݿ�������൴�������꾪Ʊ�����������ٱ�̱���������⳸͸���Ȳ����������ϵ��˲��˱����¿��ʤ�������Dz����ݺ��ڽ�ﵯ�����ؾ����������ͦ�谵��Ӱ���ɰ�����������������ϯ����Ϻڨ����ͺ��Ϸ�������������˸��Ľ��ˤ�������¢�����˳��ϡ��ئ��������ϧ�O]\|��\_s*��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*Ȭ\_s*��\|Ŵ\_s*��\|��\_s*ȱ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\|��\_s*�\_s*��\|��\_s*ʴ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ب\_s*��\|˵\_s*[������]\|��\_s*[̼��]\|��\_s*[����]\|��\_s*[����]\|թ\_s*��\|��\_s*��\|��\_s*��\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[̼�Ҳ�]\|��\_s*ǯ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*��\|��\_s*��\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ʪ\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*Υ\|ز\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����������]\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*[�߳���]\|��\_s*\%(��\|��\_s*��\_s*η\|��\_s*ŷ\_s*��\)\|��\_s*Ƭ\|��\_s*[��������]\|��\_s*��\_s*¾\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*\.\|��\_s*[��ζ]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|Ω\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*[ǯ��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*Ŭ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)',
+      \ 'P' : '\%([ˣ��ˤ��ˡ����ܮ�����ޤ�ʻ�����ġ�����������������������ʬ��������ɤ��ɼɶ����ʿ��ȯ���Ȣ��������������������������ʢʧ����������Ȭ�����˱�ĥ�ѱ��צ��ԡޡܤצզ��������̨���С���������ץ��ǡˡʢߢ��¥ڥѧ��Хԧᦰ��P]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ݥڥץԥ�]\|��\_s*[�ݤڤפԤ�]\|��\_s*��\|��\_s*��\_s*Į\|��\_s*��\|�\_s*[Ϫϥ]\|��\_s*��\|��\_s*��\|��\_s*ϥ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Τ\|��\_s*��\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�ļ��]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*\%([��������]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|+\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|Χ\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%([����Υ�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*[���]\)\|��\_s*[�ĥ�]\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([��������]\|��\_s*[�ץ�]\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*\%([�٥�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*³\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*³\|��\_s*��\_s*��\_s*��\|��\_s*ƺ\_s*��\|��\_s*��\_s*��\|¿\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ž\_s*��\_s*��\_s*��\|��\_s*ʸ\|��\_s*��\_s*[����]\|��\_s*��\|p\_s*\%(T\_s*e\_s*X\|H\_s*��\_s*��\_s*��\|e\_s*\%(t\_s*a\|r\_s*l\_s*��\_s*��\_s*��\_s*��\_s*��\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\|��\_s*��\)',
+      \ 'Q' : '\%([��ܮ��ݮ��ݬܱ��ܯ��ݫ����������ʵ��ߪ�����緩�����ų������÷����������ٷ���������ʤ��������մɾ�߷��������ţ賷�Φۻ�����Ү��������ⰲ������ط��������ܴ뷭�����򷬷���������ڶ��������˿����ֲ�ƺ����̽���Ӱǰ̰�鶰��Ҽ�ȱ�������פ��޺���������������ޱ�����Ϳ����������߷�����������ѦΦ�������庿����ܸ�𷪶��Ƕʳ����������ˮԢ��ɦ����ʭӼ�������������Цա�����������Ŵ�ġ�������¢�����׶��������ȷ����Ƹ�����蹴�����깩家��������������Ң�������׵����Զ���죹����������͹ȿ�������ҿ�ݹ��ܶ����ڵ⎸���ѡɡơǡȢ���������Q]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̼\|�\_s*�\|��\_s*��\|�\_s*��\|��\_s*Ѵ\|ɴ\_s*[߻��]\|��\_s*��\_s*��\|��\_s*ʪ\|��\_s*��\|Ĺ\_s*��\|9\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ŷ\_s*��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*[����]\|��\_s*��\|��\_s*¢\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([��������ʸ����]\|��\_s*��\)\|��\_s*��\|��\_s*Ѥ\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*ϯ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*[���]\|��\_s*\%(��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*[�ॹ��]\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)',
+      \ 'R' : '\%([���������α���㳹�����Ͼ��ϼϽ����ϿϮϱ�ҩ����������߳��ѤӤ�����������ӯ�ۭ���������۰��Ϻ��ϭϴϲϹ��ϸϰ϶��ϵϳϯ����תϦȧ���������������ݭϧ����ߣ���Ϩ����ްߺ��Ѷ�ү��������������Ӻ�١������������㹵���������������������������������ݬ�����ݮ�������߲��ҽ�������������������ݲ��������ϡ��ϣڻ������Ϣ���ϩ�����ޥ��������������������ﻼ���Ϭ������ڶ����Ϋά��ΪΨ�˷�Χҭ��ϻ٤Φ߱��������������������ų���ί��βΰαΩ��γέδή��������ܲ����������ש��P��������ا�����������������������������η���κϤθо������������������������ס���̺������ۢ��������������������ɩ��������������������οεζν����μ����λ������ξ����ι��������ئ΢����ΤΥ�����Ρ��������ߢ����Σ����轤��ϫ��������Ϸ��ԿպѰ������������Ьݣݳݴڰ����������������������������������������������������������ݪ�������ڧѴ����������������������������������դ鱦�����ا��������է٧짹�ۧק��ܧ�����觴�����ӧ�������������ҧ����ާ�����ߧ����Ϫ�֧᧦�������������ϥ���ԧݧ�ꧽ�称�ڧ�槫�آ庬������ҥ���꧲�ѧ⦱R]\|��\_s*[�ێڎَ؎�]\|��\_s*[�������]\|��\_s*[�������]\|��\_s*��\|��\_s*[ͭ��]\|��\_s*[˦���]\|��\_s*̵\_s*��\|6\_s*[����]\|ݦ\_s*ݨ\|԰\_s*��\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*§\|��\_s*��\|r\_s*u\_s*b\_s*y\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ȿ\_s*��\_s*��\|��\_s*\%(��\_s*ʸ\_s*��\|��\_s*��\)\|��\_s*ǽ\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\|ǧ\_s*��\|��\_s*��\_s*ɽ\_s*��\|��\_s*��\_s*��\)',
+      \ 'S' : '\%([������Ъ��ۼ��˵ֵ�ڰ��޶�������˿������������Խ�����������������Ǩ����Ψ��м��©­¥«¦¬��߶������丳���ײ����ҫ�����������������Ǭ���������������տ����������֥����£̫Ȣ��ػ�����ٴ��������ݽ�����������������������������Ҳ������������������������������������������������������������ϱ�ç�������î¹½¸º»��¶ȿ�����������������������������������������Ȱ�������ɱ���������������㯤�������ɯ˻����ܦ�Ƕ��í����������޶�������������ܸ���������������������������Ҫ����ͼ�������ϴ���������·��������������֣�����������������訰������������Ѣ����������޷������ѩ����������ڱ�����߫����ߪ�����������������������ߥ������������������ѡ����������������������٥����Ѩ������ڣ������������������������������������̻����ګ������������������������������ع���������������Ṷ�������������������������������¿��б�¼��ͥ������ӳҰ��������ӵ�����ѱ�������ڿ�����ͤμ��ʹ�������ƫ������ǵ��¨§�ߵ�������̡����������ͷ�������ķ������������״ɿ���צ��������ߵŲ�������®ú���϶��ۡڽ���������������������ܡ��ʢ���͢�Тߡ�ޢ��⦤�̢�ߢϢ��ޢ���ˢ�������ج���������������حï�Ϳ������巿������H��������۽�����ľ��ٹ����������������ض�Ʃ����߭���������������ڧ����������Ա���颼�������������ý�Ƴ����ħ��������󻼲�����١����ٶ�������Ĵ��¢ֺ��������ߨ��ߧ�¼Ȼ����ο�Ǧ�������ǧ���кӻ�Ϣ����尷樦ȵԦ��������������ܰ���Ǣ������������ܾ�������н���ؼ��������鼮��Ĭ�������߼��𭼿����ɨ���������ũ�������м�������ʻ�������������Ϳ��ļ���������������������������ĵ������������ϼ�����ٱ��⬼��������բ�������μ�����������忼��м�ܼڼ�����Ѽм˼ּ�Ұ������ʵ��������༩����ǿ�ެ��ոշܤܣƵ����������´�ô�����������������ʽȽͽܼ̿�������������г⽫����������ܷ������֭��������ܶ�����Ӵ����嵼��������ϸ�����������������ܽ�����µ���½�������������������������������Ѯ�آض����ӽ����ؽܽ׽ٽ���䣽սֽ����������������������֪��꿾�����˿�����Ӣ����������ǿ������������п¿��������Ŀ˿��ӿ��¿ɿ��ǿ���ä���⿹�����ü��������ȿʿ������ƿ�謹������н��������н������ٳ���������ر�����������������������������������������������������������޵���������⾨�������������������پ�������طգ������ңֹ�Ͼ��������������������Ӿԡ����������ѽ����ءʡ˾������������Ѿ����ء髾����������޾������������۾��¾�騾����ľ���ா���ܥ�����ƾ��������������Ͼɾ����˾���ƴ�����Ҿ����ݾ��������ξƾоȾ����þϾܾھ�˾��ʾ�����֤��ԧ������������ῡ񳿤��°�����������������濣������������ֻ�������ɦ��Ƶڴ�Ԯ��ӡ�����ݻ��������������ӻ��������͵����ǻ���ද�����Ի���֬������ڻ��ʻ��溡���������������л���ܻ���������Ƿ��ǡ���ʻ������᪶ۿڻ����������ף�������������һ���л��������̦�������򼡿����ּ���׶�����꼨���ǻ�徼�㬻˻������������㫻�����������ټ���������������軭���dz�˸�������ο����������������������ͻ�����ٮ����������ӦͶ��긼���ۿ�ܻ������߷��߽Ϋ��ڼ����޴�����ͺ��ɾ�������������������참����ֿ�����곡��ָӯ�����������˼�����λã���DZ�����͡��ů�η��������Ҹ���۸Τܪ�����Ǿ��٩��姻����Ӵ��ܼ������������Ʊ��ݺ������涭�����ո������ප������ߦ��������������������������ڹ���Ŀ������Ģ��ջ��ɻ���������ܢ�������Ի��ӻ�������������3����O����������������������������彿��Ҽ�����պȻ�������������ޯ���컯�߻����������خ�������칹��ʺ����ѱ�����٣���׺˺�㷺ԺݺҺӼ��кںպ��ƺغ׺ʺĺźͺ��ԺۺкǺ�ª�����Ӻ������䩺������ں����Ժ������������غ��ݯ���������Ͷ��żӻɺ�����̬�������������������úú�赺�����������ͺ��ͺ�հ��������٭����������������������������亿�޺�����������Ի�����⤹���Ż������������������ꧺ������맻ź������������ʸ�š�����ɸ���Ļ����ں̢����������ơǨ�������õ�����������ӥ������æҦ�����S]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|�\_s*��\|��\_s*\%(ϩ\|Ϫ\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*[�]\|��\_s*Ѥ\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[϶��]\|��\_s*��\|�\_s*̥\|��\_s*��\|ŵ\_s*��\|��\_s*ͺ\|��\_s*��\|ŷ\_s*[�IJ�]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*��\|�\_s*ƻ\|��\_s*\%(��\|��\_s*��\)\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*��\|��\_s*[��Ǧ]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[ë��]\|��\_s*[����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�ظ��ܻ�]\|��\_s*��\)\|��\_s*��\|7\_s*��\|��\_s*[ʬ��]\|4\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|͢\_s*[����]\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|ή\_s*[��Υ]\|��\_s*��\|�\_s*��\|Һ\_s*ȭ\|��\_s*��\_s*��\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*Ź\|��\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[������]\|��\_s*��\_s*Ʀ\|ۨ\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[ǯ��]\|��\_s*[ǯ��]\)\|��\_s*��\|ɴ\_s*��\_s*��\|��\_s*¹\_s*��\|��\_s*ƣ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(ˡ\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|��\_s*[ŵ��]\|B\_s*\%(r\|��\_s*��\_s*��\)\|��\_s*ĥ\_s*��\|��\_s*��\_s*��\|��\_s*ʬ\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*¤\_s*��\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|��\_s*\%(Ƿ\|��\_s*\%(��\_s*��\_s*��\|��\_s*̣\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*¬\_s*��\_s*ư\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([���]\|��\_s*��\)\)\|��\_s*̣\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%([����]\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|β\_s*��\|��\_s*��\)',
+      \ 'T' : '\%([�������˳��������ɼ��Ҹ�����ڽ�Ѳ���������۳���������ݽ�꾲��������������ﰬ�����ƾ�η���ض���������������쨽�ȼ��ͧ����������۽�����Ĺ���������������Ч�ԥ�������������������㫽����˺�̭��������ǯ���ӷֺܺ���ڢκ�˭��������ƿ���¢���������������������ݥ�ݹ�����۲����ٵ�����������ܪ����Ǽе��ܫ�������������ƻ������������۶���Ʊ�ڮƺ����ܻ���Ѹ߮ƪֺ�������������ƽ��������޹��ơ�������������Ʀ���������ƭ����Ƥ����ƣ������������ƫƥ�����������ƹܳ��ٻ��긦��뻼�����ͻϿ���ֺ���������α�ڿ��п�����������������Ž����������ϲ�輹����ѽæ��������������㽳�������Ԧ�Ȏ��ӱ͹����ʻ����������Թ��֥����ų������ŭ���ׯū�ڳ��ũ�������ۡ������ܡ����������������ץ�š�����ż��ſ���Ŷ������Ż�Ÿ�źŲŪůŨű��Ű��Ŵ������������������������ܼ��ܨ���ձ����ţ��������š��������������������������Ţ޸��������׷�ȤƎ�ʾ��ʼ������������ŵ����̳�ٽ��ض��۲���ϸ��ɴ��̱ս�Ϫ������·�ٴ�ܻ��ܿ���������ѳ����������㪱����γ�����ª������ڼ��������ָ������ʴ������ϸ��Ⱥ��鲶������ڹ˷Ҿ�����������ѣ������ױ����������³������������������ٽ��ƿ������ɸ���������������������̢�����������Խϴ���˵���Ϻ�¤������ݶԯ���з���ˤ�����ض࿵������������ܦ�׹�����Ƶ������ѻ̻��������ҵͿ����Ώ���ڻϢ�����դĎ����״����������ۺ��������������紺��N�������㾹Ŀ����ٻ����������������������������������������������������ٲ��Ŧ�������������Ȥ�����������������ܺ���Ҭ��Ľ������ļ��ذ��׬��������������������Ť��������׭߭ı������������������������ġ����ĵįŽ��������Ƭĸ��ķijĪĢ��ĭ��ƨĻĥĤĨȥ��ħ����İĦĬĮĺĴģ�IJĶĩīЦ����Ѳ��ɪ�د�������פ�֢��ϱ�������ɳ���ղ�������ѡΡСϿ��������������������������������������������������ɼ�������ȷ�֮�Ի�������γ����������������������ڤ������̯�����ֿ�ڸ�ȿ�ˬ��������ܽ���î�����Ƣí�̱����������������좷�����нԻ����վι�ì���λ�����Ƨ��٥����Ʈ����á�����ɾ��ẹ��ﴰ����٦��ɶ���ݾ�Źê��é��ڥ������çä���ޡܱ���ͤ��ɫ��맰�������������ܭ������ζε�����ɺ�ݰ�������ľ����Զ���ͣ�������Գ�������������Ӭ�����ѹ�ҵ�������ͺ���������׼������������Ŭ���Ƶ�����«�ԡý�������ݽ�è����ã�۹��̴��ƿ�����ֻ���찶Ƶ���Ǥ������ϰ���䶳�ɳٹ��������º����յ����빧δ��������Ӹ��ٿ��������й����þ��߬�����������������������������ں����߸�������ÿWö��ӷëó�ȿCò÷����ý��ðôùøú����ûõ��ñâ��������߷پ��ŧ��٧Ӷڤ��������������������������������������������ڭ���������������ʿ��ڬ�����������������������������������������������������������­���ҿ�����п���ʲ��ί���ӣ���۴����ï¾���������ص������봮Ĺ����Աȯ����¿߱֫٣����Ω���������η���򤿧觸��ŷ���߷����ڢ����������ᦨ�����ɽ���ڥ����覨�ȥ����ġ�žƩ���������ȥ��ġ���ü���ԧ䨼�������������������������Ө�������������T]\|��\_s*[�ĎΎ���]\|��\_s*[�ȥƥĥ���]\|��\_s*[�ȤƤĤ���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ϸ\|��\_s*��\|��\_s*[���]\|��\_s*�\|��\_s*ľ\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|͸\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��ƻ��]\|��\_s*[����]\|��\_s*ǯ\_s*��\|��\_s*[�׻�]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|ƶ\_s*��\|��\_s*��\|��\_s*��\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*¼\|��\_s*��\|��\_s*̼\|ɻ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|ε\_s*��\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|ɹ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|1\_s*\%(��\|0\_s*��\)\|��\_s*��\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Ϸ\_s*Ƭ\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|ܥ\_s*��\_s*�\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*��\|��\_s*ެ\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*ë\|��\_s*��\|��\_s*Ϫ\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*��\_s*[����]\)\|��\_s*\%(��\|��\_s*˷\)\|��\_s*Ƣ\|��\_s*��\|��\_s*��\|��\_s*[ڳ��]\|��\_s*��\|��\_s*\%(ͼ\|��\_s*��\)\|��\_s*��\|��\_s*��\|ͱ\_s*Ю\|̵\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ж\_s*��\|Ʋ\_s*��\|ǽ\_s*[ʸǷ]\|��\_s*��\|��\_s*̱\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����ॢ]\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�ե�]\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*[������]\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*ʸ\_s*��\)\|\\\_s*T\_s*e\_s*X\|ʸ\_s*��\_s*��\|��\_s*��\_s*��\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
+      \ 'U' : '\%([����Ⱥ��ɶ���ʷ����������ƶ���ڰ��������뼿������å�����ѽ�������ִ���ء���۽��¥��ӹ����������ⱳ����ư뭱���������������辧���ž�������ر�����Ϊ�Ų�����������ر���������󨱲���山����䥿���۲��������񱷸����¹��������ϻݱ������������ڴ︽���Ǽ̰�����������ֶ����̽���������Ѳ����ⳤز����������ﷵ�����庨��������΢���ױ���������Ӻ��屯Ĭ��Σݵ�������²������±��������ڽ����ͭ����в��񱭱������˼���ޢ��ͫ觼�ǿ��������������վ���ھ�ӻ���Ƥ���ƿ�񻱧���������������է奦���ԧ�U]\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*��\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*ǽ\|��\_s*\%(��\_s*��\|ͭ\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|ñ\_s*\%(��\|��\_s*��\)\|��\_s*\%([���ˡ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\)',
+      \ 'V' : '\%([�����֢ͣ��ǧӢ����˥�V]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|��\_s*��\_s*��\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([���ܥȥ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��ȥ�]\|��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*Ĺ\_s*��\|��\_s*ľ\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([����֥Х���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*[����]\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*[���䥢]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([���]\|��\_s*\%([���֥�]\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\)',
+      \ 'W' : '\%([���򲧽��ﲴ��ͺ�������ˤ���Ⱥ��ɶ���ʦ��Է����������ƶ���ڰ������뼿������å���ѽ����������ء���۽��¥��ӹ����������ⱳ����ư뭱���������������辧���ž�������ر�����Ϊ�Ų���������ر���������󨱲���山����䥿���۲��������񱷸����¹��������ϻݱ������������ڴ︽���Ǽ̰�����������ֶ����̽���������ѱ���ز����������ﷵ�����庨��������U��΢���׻᢬�������Ӻ��屯Ĭ��Σݵ�������²��������������ڽ����ͭ����в��񱭱������˼���ޢ��ͫ觼�ǿ��������������վ���ھ�ӻ���Ƥ���ƿ�񻱧�������������ܲ����ı����������ϴ��Ѵ�����ֲҺҶȵ�������ب�భ��˺�����о���Ƹ���޾�������������������׿׾�б�������IJ�ľ���ƻ�����������ʻ䷨�������������Ų���ѯ�������Ƚ�����ռ㰿������ʨ������Ͱͯ�����������������ӻ������ʬ�ʱ���������ȣץ���W]\|��\_s*[���񎳥���]\|��\_s*[��񥦥��]\|��\_s*[��񤦤��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*��\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ͥ\|��\_s*˺\_s*��\|��\_s*��\|��\_s*��\_s*��\|(\_s*��\_s*)\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|Y\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[ͳ��]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*٥\_s*�\|��\_s*\%(��\|ʿ\_s*��\_s*��\_s*��\)\|ݿ\_s*��\_s*��\_s*٥\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%([�ץ�]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([�ࡼ]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[������]\|��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\_s*��\_s*��\|w\_s*e\_s*b\_s*��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*[��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)',
+      \ 'X' : '\%([�������������������������������ئΡߧ��禮X]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)',
+      \ 'Y' : '\%([�ֲ��غ�������˩շ��޷����ڡ��崿�ڳ�������ֻۻ���������������������������þ��ӱٵ���㷽���İ��Ľ������˧�ȵ�����������������ۡƫ����������׫����������խ�����������������ߡ�������ٹ�������������������������������������������������������βž�����ա�䲣ڵЮ��Ϳ��������즷����д�ͽ����;��ǽ����鱻�������Dz�Ʊӽ������������������μ��д�İ�������˭������Ƿ����ְ����������쪾�஻���ᾲ�������͸��Ͳإ����������餲�����ͨͤ��ͱ��ͻ͹Ͱͯʹ��ͼͩͪ��ͧͺͫͭ����͡������ͮ��ɵ�������������ͷ����ͳ����·�����͢�����掲�Ǧ�����׵׶���������϶��������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�������������ȵ������ܦ��ɵ�述����������ڿ��Ĺ�Ǣ��������̿��θŸ��沵����ż���������ϫ��������ĺ�����׻��������к������غ�������Ү����ͦ�����ܡ�����Ǯʰ����������������˻�ް�������������Ϯ�ס����ӱ��������©��ĩ����߱��۱İ��Ľ�˻��С������ݫ�����׸�������ԩ۵��ີ���衰�ݻ����յ������������ư���׮����I���������������ΰ�𨱡���������ֱ������޴����۩���ܰ��д��ذ��Ű�1��������㥴�Ū��٥������������Ӱ�����������׳�������������̰����Ѧ������ư��׺ع��ް۰������Ȱ�ަ������ͬ�ص�Ա������߼���ܾ������Ψ��թ������ͣ�ް�������˵���״�б�������ְ������Ұٰݰ�����ǡ�ý�޻�����ڰ汶��ԣ���ϱ����������ΰ��Ȱڤ��ԧ������İ��ø��������Ҳ��ݰ���������ͻ���Ϧ��������S�����ϵ����������������ͥ����²����۴���Т����������ݬ�����ٯ���������������ֳ��쮼��༽��̡ԡաҡӻ���š��ץ����̰��ǫ��͵���ٰ׵ٹ��ݰ�������������Ǹ���������鲰����Ȭ�����������ë�黦���������������׽��ܿ�ߺ����٧֧��ߡ���������ר���������������ԧ���Y]\|��\_s*[�֎Վ���]\|��\_s*[��楤��]\|��\_s*[��椤��]\|ݿ\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*Ƹ\|��\_s*��\|��\_s*��\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|4\_s*\%([�������]\|��\_s*��\|��\_s*��\)\|¾\_s*��\|��\_s*��\|δ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�Ҹ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|Ī\_s*[�Ұ�]\|��\_s*��\|��\_s*��\|8\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ɴ\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(ͺ\|��\_s*��\)\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*��\_s*��\)\|��\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*ë\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|�\_s*��\|��\_s*[����]\|U\_s*\%(��\|��\_s*��\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�\_s*[�Ļ�]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*[����з�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*¹\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|̵\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*[����]\|��\_s*\%([������]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ʱ��]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[��ǡ]\|��\_s*��\|��\_s*ζ\_s*��\|ξ\_s*��\|ή\_s*ŭ\_s*��\|��\_s*��\|��\_s*[����]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|ŷ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*º\|��\_s*��\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*¹\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\)',
+      \ 'Z' : '\%([�������»¸·��«­֤����±³��²¯°��������������������¡£����¤�������ȿź��������������������������������������������������������ǹ����դ����������������ظ��������������ԦƬ�����ſݿ��פƦ������������ֺ���Ｓ���ȼ����ټ����Ķ���������ټ����������ܿ�����ľ�������㿬�����������ߩ��̭��������顿�����ױ��ӿ�������пԿҿؿѿտ�������ޮ�������Խ������쿫���ٳа����屽�����ġ�����������������������п�������������л��������Ы�������������ǡ��̼����ž�������������߾�վ����������ڷ����������������������ط��è������Ǩ��쨽������۲�����ٽμ�����ѽ���ƽ����Ž���Ȼ�����ޭ�߱��������覽�۽����ڽ޽�����޼�����������������ߨ��潿������к��ߧ�������尽Ľ½����������ý����ƽŻ����켢��������������μ��������������ż��༤ϩ���μ��ͻ�֮������߾ǻ������߻��Я���������б��㫰ʻ�ֵ��˼��ѻ�������ʼ�����緤���߷���º����������ֿ�껯����������ܪ�Ȼ�������������ﴻ��������̻���쩻������ϻ»���߻���ͺ����ú޺���߳кº鵺���¢������鶺��úä�����������좭���ا��������������ڥ��Ƨ����٦�Z]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���һ�]\|��\_s*��\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ȯ\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*��\|Ĵ\_s*��\|��\_s*[�᷺]\|�\_s*��\|��\_s*��\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|J\_s*\%(I\_s*S\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
+      \ '[' : '[���̡Ρء�[]',
+      \ '\' : '[�ˡ���\\]',
+      \ ']' : '[�ۡ١ϡ�]]',
+      \ '_' : '[����_]',
+      \ '`' : '[�ȡơ�`]',
+      \ 'a' : '\%([���������Գ���ȯϾ�տ��ƭ�����޾�����ӡŤ�������Ƭ��ѫ����ͷ�ʷ��İ�Ϳ���������������������ø�������ܶ���쨽��̵����ᵽ�������驰��н�������ƪ��鷹ѻ�����ˢ��ǽ���������½���֦��������½�Φ����ؽ����Ǯ�����Ȳ���䰵�Ǵ�������ݯռ���м�������Թ�������޹����������׹���Ϫ��ɽ��������������¹�Юͽ����㹻�ɷ���Ű���庾Ӻ̴������ɵ�����ఽ���������������;������ŷ��������������ֵ��ϰ�̣�ð���Ԫƴ�����갮����������������������������ů��μ���������ۭ�������浱ϯ��������ޫ����ۦۥ���˾Ͼ����������ݷԼ�������న��ʸ�ۣ��齶��ϰ����갥���欷�����ǹ԰��ްưɰ���Ȱ�������ī����������ð�������­�����������Ӽ밫�Ƽ������ǹ��������˽�����������������˰����ķ�ʻ��г�������㰭մ�����������������������먰µ�����ͭ���ް��������������ب��˰����ک����������ʡ�����&�ܶ��ϰ���������͢��΢޸姸���ơ��������Ǣ����Ѧ�������a]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Z\_s*\%(n\|i\_s*n\_s*c\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*ŵ\|��\_s*��\|��\_s*��\|��\_s*Ʀ\|��\_s*��\|��\_s*��\|�\_s*̾\|��\_s*̾\|��\_s*��\|��\_s*��\|��\_s*[��Ļ]\|��\_s*��\|��\_s*��\|��\_s*��\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|¹\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*ʪ\_s*��\)\|��\_s*��\_s*��\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|ޱ\_s*��\|��\_s*��\|Ʀ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*¿\|��\_s*��\|��\_s*��\|��\_s*[�º���Ǭ]\|��\_s*��\|��\_s*[��ɧ]\|��\_s*��\|��\_s*��\|��\_s*��\|Ҹ\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*[�ˡ�]\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|D\_s*��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[ɿ���ο�����]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\_s*��\_s*A\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|G\_s*o\_s*l\_s*d\|��\_s*ư\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|°\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\_s*��\_s*ǽ\|��\_s*��\_s*��\_s*ǽ\|��\_s*ˡ\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([�������ȥ��]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*ǽ\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|A\_s*\%([tlrImc]\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|��\_s*��\_s*��\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*��\_s*��\_s*��\_s*��\|L\_s*T\_s*��\_s*��\|��\_s*��\_s*��\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|d\_s*a\|M\_s*��\_s*��\_s*��\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Ͽ\|��\_s*\%([������]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([�˥ᥢ����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)',
+      \ 'b' : '\%([���߹�������������������������������������ھڽ���������������������������𰺱�������������ѳ˦�����˲̶������������˳ر˸��˹��˻˶����˺����������˴��˾����˵˿�Ŵ�����ը����������������������������˫Ħ˷��������������沶��ѹ���������ʽ���ٷ��ҡ����������������������۲�������˼������ū��޽��ʥ��޼�������޿������������������ʪ�ɲ�ʹʸ�����������������ק��̵���ز�������������ǿ����⿡ʬ�Ԥ������͹�������ɵɤ�������ޣ�ֱ���������ؾ��ݧ�������������ɴ�������졪����ǭɼ�����֢���ʿ����������������̤������������������ջ��������߾׹����������������Ȣ�����®�Ӷ���ȭ��˪��ƯȪȫ��ʵüɡΥ��V̥����ٶ��ȵȶ��Ǣ��ʢ��ʧ㱸�����Ȥ���������������˽�������������ձ��������������������೭����������������Ȩؤ��ȹ���������Ƚ���������������ȼ㩺������������������Ȳ������ȴȳ��Ž�����β�������ĥ�����Ϳ��������̤У��ʩ�������첼�ߡݡ¡á������ܥСϡΡѡХ֥Ӧ����Ҧ¥�b]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ܥ٥֥ӥ�]\|��\_s*[�ܤ٤֤Ӥ�]\|��\_s*��\|��\_s*��\|�\_s*��\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*Ǥ\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*ݰ\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|�\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|˭\_s*[����]\|��\_s*��\|ŷ\_s*�\_s*�\|��\_s*[��϶]\|׽\_s*˥\|��\_s*[̡˥]\|��\_s*Ҵ\|��\_s*Ƭ\_s*�\|��\_s*��\|��\_s*��\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ʼ\_s*[��ˡ]\|��\_s*[�Ļ�]\|ɽ\_s*��\|��\_s*��\|ȯ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|�\_s*�\|��\_s*��\|��\_s*\%([��ϫ��]\|��\_s*��\_s*��\)\|�\_s*��\|�\_s*��\|��\_s*��\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([��Ƚ�鷿��]\|��\_s*˦\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s* \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|B\_s*\%([h��Ƚ�鷿kiae]\|C\_s*ʼ\_s*��\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|��\_s*��\_s*��\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|M\_s*P\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%(D\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|O\_s*X\_s*��\_s*��\_s*��\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|��\_s*��\_s*��\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|��\_s*��\|��\_s*��\_s*��\)',
+      \ 'c' : '\%([���²����ݰ���ť������������ޢ��������°������������Я�⸿���Ƚ�����Ǽ����ۻ�������ô�㪸��ۺ��������礷���򼷻쮱���������޹���Ѻ�����Ϲ���ٹ������ۺ������Ѻ�������������������������縥���պ�����������︷���������������������ȹ�����������������������޳Ӭ��������ު���⺤�������ӫ����������ޫ�ص���������٫��������Ⱥ����Һۦ��־����ִ��������������������Ṳ��������ӳ������̫���ָ������٬����������޸���ܺս�幡����������й���䢹�̨����ɹ������ж���๫�ʹ�����á��������������乨ۥ�����⫹�����⩹�������������۶��չ����̹��˹��عֹ�骹¹ݹҹ������Թθ��Ĺ��ӹ���ëӭ���������ص����������Ĩ���������������������̼ܵ�������٢޵�ѻ۹�ƺ���������ݸ���ջʴ�����ڸ���ǻ����䲹������������ž�ݸ�檽�����������۸ŵ������麮���������Ķ���۸ɸ�������������ɯ�Ŷ�˻����ܦ�������í����ӵ��������޶��٣�໦��������������������������������Ҫ����ͼ��������������������·��������������֣�����������������訰��������������Ѣ����������޷����ѩ������ڱ�������߫��������������������������ߥ����������������ѡ����������������������٥����Ѩ��������ڣ��������������������������������������̻������ګ�������Ǻ������������������������خ����ع�����������������Ṷ�����������������������ܮ��ݮݬܱܯ�ݫ������ʵ��ߪ�������������÷��������ٷ�������ʤ������վ�߷�������ţ賷�Φۻ���Ү����������·��ط����״����򷬷���������ڶ�������˿��ֲ�ƺ�̽���ǰ̰�鶰��������פ��޺���������������ޱ�����Ϳ����������߸������������ѦΦ���庿����ܸ���ȷ������������ˮԢ������ʭ����Ц��������ġ������궡�����ȷ��������㹩家�����������Ң�������׵����Դ񣹸������͹ȶ�����ҿ�ݹ����ڵ⤯��Ա�������颼�������������ý�Ƴ��ħ��������󻼲�������١��������Ĵ������ɸ¢ֺλ����������ߨߧ�¼Ȼ������ο�Ǧ�������ǧк�Ϣ����尷樦ȵԦ��������������ܰ�Ǣ��������������ܾ������������ؼ��������鼮��Ĭ�������߼��𭼿������ɨ���������ũ���������ż�������ʻ��������������������͸忬�ļ��������������������������Һ�������ĵ��������հ���ռ�������ޯ�κ�����ٱ��⬼��������բ�������μ�����������忼޼��м�ܼ�����Ѽ׼ͼм˼ּ�Ұ����ʵ��������༩���ǿ�ެ��ոշܤܣƵ��������ý�������������ʽȽͽɽܼ̿�������������н���������������֭��������ܶ�����Ӵ����嵼��������ϸ��������������������ܽ�����µ���½���������������������������������Ѯ�آ߽ض����ӽ����ؽ�޴�׽ٽ���䣽ֽ����߿����������������֪��꿾�����˿�����Ӣ����������ǿ������������п¿��������Ŀ˿��ӿ��¿��ǿ���ä���⿹�����ü��������ʿ������ƿ�謹����������н��������н���������������ؽ�����������׼�������������������һ��������������������������޵�������������������������黪���پ�����طգ������ңֹ�Ͼ�����������������Ӿԡ������������ѽ����ؾ����������������Ѿ����ء髾����������޾��������������۾���騾����ľ㾩��ா���ܥ�������������꾤�����Ͼɾ����˾���ƴ�Ҿ��;��������ƾоȾ��þϾܾھ˾����������֤��ԧ������������ῡ����°�������������濣��������������ֻ�������ɦ��Ƶڴ�Ԯ��ӡ�������ݻ��������������ӻ������������ǻ���߻ද�����Իջ���֬����ڻ����Ͽ�Ż��溡��������᡺���л��л�����������Ƿ��ǡ���ʻ�����᪶ۿڻ������������ף�����������һ���л��������̦�������򼡿����ּ���׶�����꼨���ǻ�徼�㬻˻������������㫻�������������������������ڹ��ɳ�����߳��˹��ȷ�̢���ư��񢿱Ʊ����ʡ�ܢ��������������ᱵ����������������ʹ�ǡˡԡơɡСҡȡѡա������ج�ɳ�����϶�������������Ѿʸܵ�ȿ�ּ����ĵ���ǣ�����ʶ�ͽ�����г�����ϵع�˵�����ۿ��ٸ��Ƿ�����������������ͩΫ�����峻����������������K�Ĵ���������ȱ���١��۫�������������Ȧ��滳��������Ҥٿ���龹�ô���������������������������Ž��޳���������ڳ³��������������������ư귰����¦�������γ��ǰ�����㡴��姡������������������������റ����������ҳ��������ݲ��������ҳ����˿����������ڸ����ি�ԣ�����ϸ³ø��֡���סٷ�������ŭƬ��������ŬŨ��״׳�Ť���Ұ�����ɬ������Ŵ����ܷ�������̳��������������ڲ������������ų�Ӿ���筢�����Խ������ڨƿ����ӽ�dzӡ͡ڡΡۡϡ̳��ȳijԳճʳ��߱�������ڼ�˳ͳȵҳֳѳ�ר���������һ����������Т�����������������Ӽ���߶���ݥ袳�����Ъ�����������Ļ�����������ӳ���ܴ��������߳����ٳ����β����𳭳������dz����������󳬲����������������Ӳ����٪۸���������٢�Ԭ�������ٺ��������������Ұ����ߵ��������Х����������Ľ��楼������������������Ѵ���޾�˸�˧�ӳ�����������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ�����ȴ�����ݴ���԰���ݴ����۴���ڴ��������Դ�ա�����̴�����δ��˴���ע������Ӵ�������ӿ�ٴƴ��Ŵִ��״��ɴ����ش��ϴ������Ѵ��ش������Գҵ��ȴճƶ����ɳ��վ�ײ˲����ײޥ������ϲ����ӧ����鴲�ӻ�������������βٳ�������ϲʸ�������ӥ���׷ҽ����Իٷ����߲������Ѳβ��Ӽ����β��ȹ����������������ŷ���������ѫ�Ȼ��¥������ϲݲľ��Ӿ���������������۲Ҵ�������������粽桲����Ʒ������²�����Ф�����������Բ�����ּ�����вز���ͤ��㡦�ı��Ķ��Ƣ����۲ø򧶧������ا���ۧէ٧���ܧק��⧿�觵���ӧ����𧼧��������ߧ���ҧ��ާ���������ѧ֧᧱�����㧺���秽��䧰���ڧݧԧ姫��������ߨ���������Ƽ���֦��ҧ�������ݡ��������׶������������ܥ����������������������������c]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\_s*Ⱦ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ѥ\|��\_s*��\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*[�ʺ�]\|��\_s*[϶��]\|ѱ\_s*��\|��\_s*��\|��\_s*[̱�ѡ�]\|��\_s*��\|�\_s*��\|ɴ\_s*[߻��]\|��\_s*��\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|õ\_s*��\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*[������]\|��\_s*Ϣ\|��\_s*[��Ǧ]\|��\_s*��\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[����]\|�\_s*\%([��α���ֲ����˼���]\|��\_s*��\|Ǽ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|7\_s*��\|ʸ\_s*��\|��\_s*[ʬ��]\|4\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�̰�]\|��\_s*��\|��\_s*\%(̣\|��\_s*��\)\|��\_s*[����]\|͢\_s*[����]\|´\_s*��\|B\_s*r\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[����]\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*[����]\|(\_s*��\_s*)\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|ݣ\_s*��\|�\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*ƣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|ʬ\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[������׾�]\|ʣ\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\)\)\)\|��\_s*��\_s*��\_s*��\|��\_s*�\|��\_s*\%([���]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*[���]\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����֥ץ���]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ɥѥ��֥��]\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%(��\_s*[����]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([�ĥȥ���]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([������]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*\%([�����ޥ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ץ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�եȥץ���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([������������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([���եɥ��󥳥ꥦ]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[����]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�����ȥॸ]\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*ɸ\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*³\|C\_s*\%([srdfDeRoa]\|��\_s*��\|��\_s*��\_s*��\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|T\_s*\%(��\_s*��\_s*��\_s*��\|R\_s*L\_s*��\_s*��\)\|��\_s*��\_s*��\|S\_s*\%(V\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|��\_s*��\_s*��\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*��\_s*��\)\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*2\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\)\|ú\_s*��\)',
+      \ 'd' : '\%([�������ñ��ӹ������ɾ�������ǯ����Ļ������Ч���������γ����������������Ѫƺ�������ѯ��ƫƯ��������ƣ�ޡ���Ʒƴ���Ƽ��ƵƳ��Ƹ����Ʋƶưƹ��Ʊƻ�ȸ���������������α��Ͽ������׸ͻ�פɻ�����������ǩť��ŮܬҴ��ޡ�����������ѣ���žȤǥ���ɶ��ʹ˶���������¤��Դ����͸������Ϣ�������ߵ����ſ���ť�����ϼ����Ϥ¼�êí�����ݺ�ǻ����������ï��î���Ե�̺���ë���۴����ֳٹ�������է��åæ�������Ƕ������ʿ�����ϡ�����������������������ö��׼������������ԥ�����������̼�ձ��ټ۴����ٽ�ɿ���ί���ʿ�����ѵ����߱���Ω������������Ѽ���ĽФ���ľ����Ц����\.�š��ġ�ɡȢ���������ã����ȥɡ�����������զ��ĥǢ�d]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ɥǥť¥�]\|��\_s*[�ɤǤŤ¤�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|��\_s*ŷ\_s*��\|Ʀ\_s*��\|ǡ\_s*��\|��\_s*��\|��\_s*��\|Ǵ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|Ƭ\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|Ĵ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*��\|��\_s*��\_s*ã\_s*¿\|��\_s*\%([��˸�]\|ʿ\_s*��\|��\_s*ŷ\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|ǵ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*ʪ\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|��\_s*��\_s*��\|ȯ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*ά\|��\_s*��\_s*��\|��\_s*��\|D\_s*\%(b\|��\_s*��\_s*��\|T\_s*\%(E\|P\_s*��\_s*��\_s*��\|M\_s*��\_s*��\_s*��\)\|M\_s*A\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|��\_s*��\_s*��\)\|H\_s*C\_s*P\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|��\_s*��\_s*��\|V\_s*D\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*��\_s*��\)\|I\_s*\%(P\_s*��\_s*��\_s*��\_s*��\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
+      \ 'e' : '\%([��������ٱ稰��Զ�����������������콸ս���֦����������ٻ��ٱܱ�������������������ְױ����ر�����ݩ�������Ρ�޼��������޽��������Ԩ�����ɲ�����᰸������ާ�����Ǣޱ���޻����ʥ������Ԥ�������ϱ������������ͱ��ն�����߱��������۪���������ܳ��������������۱����ϱ����Ʊñ����ȱԱű�ƱӱDZɱϱıʻ޲�����ͱ�������賨�������в�ó�ت���̱������¹�����������������������������槶���΢�������ާ��姯���Ѣм����Ǧ��㧳���ݦŧ��泌��e]\|A\_s*\%([��Ƚ����]\|V\_s*\%(��\_s*��\|��\_s*ͥ\)\|B\_s*\%(��\|C\_s*��\)\)\|��\_s*\%([��Ƚ����]\|��\_s*\%(��\_s*��\|��\_s*ͥ\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|ɰ\_s*��\_s*��\|M\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*˹\_s*��\|��\_s*ʪ\|��\_s*��\|˦\_s*��\|��\_s*��\_s*��\|Լ\_s*��\|��\_s*��\|��\_s*ϩ\|��\_s*��\|��\_s*[�Ի�]\|��\_s*ƺ\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|L\_s*\%(��\_s*��\_s*��\|L\_s*\%(��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([���ɲ]\|��\_s*��\)\|N\_s*��\|��\_s*\%([�Ķ˶�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|S\_s*\%([����]\|��\_s*��\_s*��\|N\_s*��\|F\_s*��\_s*��\)\|��\_s*\%([�Ȼ��ʶ�]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*[¿��]\|��\_s*\%([������]\|��\_s*��\_s*��\)\|X\_s*\%([����]\|O\_s*��\|��\_s*��\_s*��\)\|��\_s*ƻ\|�\_s*Ʀ\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|��\_s*\%(Ϸ\|�\_s*��\)\|��\_s*��\_s*��\_s*®\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|ݿ\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*Ĵ\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|ȯ\_s*Ÿ\|ɾ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|ɴ\_s*��\_s*��\_s*ŵ\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*ĥ\|��\_s*��\|��\_s*ò\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([��]\|��\_s*��\|��\_s*\%([�ޥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*Ω\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*��\_s*��\_s*��\|P\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|-\_s*m\_s*a\_s*i\_s*l\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|N\_s*T\_s*E\_s*R\_s*��\_s*��\|��\_s*��\_s*��\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*��\_s*��\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|��\_s*\%([�֥����顼]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*[�ȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*[�ȥ�]\|��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)',
+      \ 'f' : '\%([ϼ���в�����ɮ���߸�������˼��ݵ����ϰ�˴ϴʻ�ÿ����ū���������������߹������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ��������������������޽ʥ޼����⵺�б����ƣ��߬����������������������ο���ʳ���������������زʰ��ʧʨ�������ؿ�����礢�����ı������ǹ���޴�ʤʢ������������ʣʡ������������Դ���������н��������������祹����������Ƨ�������������Ϸ�������붸��������ʮ���Ҷ�������������ۿ�������������տ���������������������������ʫ������������ݤգ�Ŵ��Ϣ��٢޶�ʩ�ǵ�����ʦ��զ���F����f]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ǹ\|��\_s*��\|��\_s*��\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(Ǥ\|��\_s*[����]\)\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*[�滳]\|��\_s*��\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*[�ͤ���]\|��\_s*��\|2\_s*\%([�ͤ���]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Χ\_s*��\|I\_s*r\_s*o\_s*n\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*ǽ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*[����]\)\|��\_s*1\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\)',
+      \ 'g' : '\%([���������Ʊ��亲�޺��и������Я����ǡ����¹���ɹ��������Ͽ������й����������ӹ��ij����������������ݶ���������޸������Ķ����˸߸���˱۸�5�ѻ��贸���裵�����Ӫ�ش�����೸��幡���椴����֡�����������������������ɷ޷߷��ݱ����ɧ�������������븿����ѷ�ʸ����������¸�����������������˲Ʋ򲼽��Ӥ�����������ʵ�ʹ�������¢�̸���襶���鹶��ʵܶ�������溷����������ֶ����ȶ���뿩�۶��������ɤ���������ݵ�Է����֪�۶��������������̵���������ߤ�Ƹ����������ѧ�ĶȶǶŹ�����Եյ���ۧ�Ĵ�Ѧ�۷�漷������㦵��뵾���Եõ��µ��µ��ڵ���ີ���嵽����٦���������ȱ��ⷸ��Źε���������״�¦�̳���������񷿷�����Ը걳����ҳ����޽Ż��˳���������������Ƭ�����޸���������������̴ݢ��������޴��������ḵ�����������������������س�����̳۳ٳܳڳ�Щ����ֽ���������Զ�������ӱ������⭳��������賩���������������������²����Ө���Ѽڲ����߲��������������þ����̲����ϲ�ֶ������ݥ���ծ󢴢�䤬���紤�楬�����¦˦������������Ϧ��Ҧͦ��Ѧ��ʦΦɦ��Ȧ̦����Ŧ��Ħ��צ��Ц��Ӧ����Ԧ����Ʀ��զ��֦��Ǧإ����Ԧæ�����g]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƭ\_s*��\|��\_s*��\|��\_s*��\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([�ֱ�]\|ŷ\_s*��\)\|��\_s*��\_s*��\|��\_s*\%([�Ÿо���]\|��\_s*��\)\|Ʀ\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��¯]\|��\_s*[���ǹ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*[���׹��]\|��\_s*ϡ\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\|��\_s*\%([ˡƻ��]\|��\_s*��\_s*��\|ʹ\_s*��\_s*ˡ\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|��\_s*��\|��\_s*��\_s*ë\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*̾\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|��\_s*[��]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ϣ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|��\_s*��\|C\_s*L\|c\_s*c\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|U\_s*I\|N\_s*U\|O\_s*��\_s*��\_s*��\|E\_s*T\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%([��른���Υʥ���]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*[�˥�]\|��\_s*��\_s*[�˥�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*[�ĥ�]\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ե�ޥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*[����]\)\|��\_s*��\)\)\)\)',
+      \ 'h' : '\%([��ά������мۭϯƶ�����������ش�Ǯ��˴����������ꥷֹ����١��������ڣ��������þ���̷��Լ�����������Ե篳�ٸ������׺������������ê��ޤ����ұƾ�����˲���������˯������������ˣ˱�������˩��������ˬˢ߰��˥��˨��������ˮ˰˦������˭ˤ������ڽھ����������������Ͼ�Ծ�����������Ӭ������Ӯ������Ħ˫���������ޱ������ێ͸�½Ш�����۳ֱ�����׭׬̦������������������������������������������΢���������٨������������������ղ��ʽ������֢��������ʾʻ�������������������ظͤ؎�ϼ���в������ر��߸�������˼��ݵ�ɾϰ�ϴʻ���ÿ����ū������������������߹������ʷʵ��ʸ��ʯʭʶʲʱʬʴ�����ڸ����������������޽ʥ޼�����б����Bƣ߬����������������������ο���ʳ��������������زʰʩFʦʨ���յ������ؿ����乢���������ǹ���޴�ʤ��������ʣʡ������������Դ���������н�����������ڹ��������Ƨ�����ٹ������������붸��������ʮ���Ҷ�������������ۿ�������������տ�������������������������ʫ���ܤՎ���ϷDz����DZ������ɢ���򱽨��ɨ���ڻ�ɡ����ײ����ɦ����������������گ�����������ʶ����������������ɳ����߫��ߪ��̩���������ҷ�蹱��������Ψ�����ɢ�ʺ���ɽ��źضѽ�����������ñ����¾��Ʒ��1������ඡ���ɩ�Ͼ��Ǽ�����ݱɧ������������ɴ����������ɪ粹����ɲɱ��桶���ڲ�����Ÿ��ͨ�������ѽ�ʹ������������������������͵��ע��������ɤɯ��ɭɥ�ʹ�ɫݤ����̤��ɮɬ��������������ɶ��ɷ��ɿɺ��ɻ������ʼ��ɼɾɸʿɽ�������ʡ�֡ڡآ�����������淥У��������������������������������ɹ��Ҹɰ����ȸ�����̥��������������������������Ժ����������۬���������ഥ�����������������զ���������좤Ҏʻ���ȧ�۽ˡ�ȣ������ү������ꤾ�׼����Ȧ׹���������������������߶�����������¦�����ھ��ൡá˵��ȫƯ��Ȫ�������������������IJ�Ը����ʧ����ȷ��������ȩ���Ƹ�С��Ȱ�����ϳ����ܥ��˧�˲�����ʢͪ�������ڼ�����������Ѷ�����������������Υȹ��������ȸ��ަ��ɡ�ڲ��������������չ������Ȥ��ýҺ�⢢������ҹ�Ȣȡ������ٰ������®Ȼ�������и�����ɳ�֯ݢ�����ڦ���������������¬��ԦѳĽ�����̷׿޸��������������ȥȮ�������ϡ����ȭ˪�ȱ��ˡȰ����Ȭȯڴ��������ԯ������������������������أ��צ�����ɣ����������������������Գ�������ޢ��߯�Ȩ�����������������ź�ܹ������������ڵ������ȼ��������Ƚ�����������������ɺ�����������Ⱦ����ȿȺ����ķ��۱�����������ҵ����������û�����������������ü�������Ŷ���Ǻ������ʱ���ĥ����������������Գ�Ʋ�ı���������������ɿ������㻫Ժ�����������Ž�ϣ訬�������������������������������������������ȡ��ա�����ҥۥإ�h]\|��\_s*[�Ύ͎̎ˎ�]\|��\_s*[�ۥإեҥ�]\|��\_s*[�ۤؤդҤ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[󤱧]\|��\_s*Ļ\|��\_s*��\|��\_s*[�п�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*�\|��\_s*��\_s*��\|��\_s*[����]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*ˡ\|��\_s*λ\|��\_s*��\|��\_s*\%(�\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|Ƭ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|��\_s*[�滳]\|��\_s*��\|��\_s*��\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*\%([�ͽ�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŷ\_s*��\|��\_s*[���]\|��\_s*��\|��\_s*[�ȡ�]\|��\_s*��\_s*\%(��\|��\_s*��\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|ľ\_s*[�����Ᵽ]\|��\_s*Φ\|��\_s*��\_s*��\|��\_s*��\|��\_s*[�˹�]\|��\_s*Ÿ\|��\_s*��\|��\_s*ƻ\|��\_s*��\|��\_s*��\|��\_s*��\|̢\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ι\_s*��\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|Ʊ\_s*˦\|��\_s*��\|��\_s*[��ȧ]\|��\_s*[������]\|��\_s*[�ǵ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|Ĺ\_s*ë\|��\_s*��\_s*��\|Ż\_s*Ƭ\|��\_s*��\|��\_s*��\|��\_s*[���]\|��\_s*\%(��\_s*��\|��\_s*��\)\|ͦ\_s*[����]\|ή\_s*��\|��\_s*��\|��\_s*\%([�ͤ���]\|��\_s*[����]\)\|2\_s*\%([�ͤ���]\|��\_s*��\|0\_s*��\)\|ø\_s*��\|8\_s*��\|��\_s*��\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|��\_s*\%([���������]\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*ή\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*S\_s*I\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|��\_s*Ĵ\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\|��\_s*ϻ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\_s*��\|T\_s*\%(M\_s*L\_s*��\_s*��\_s*��\_s*��\|T\_s*P\_s*��\_s*��\_s*��\)\|D\_s*D\_s*��\_s*��\_s*��\_s*��\_s*��\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[��ʿ��]\)',
+      \ 'i' : '\%([���Ǧ��ߡ�����׵׶���������϶���������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�������������ȵ������ܵ�述�S׽ꭲ���������ڿ��Ĺ�Ǣ��������̿��θŸ��沵����ż���������ϫ��������ĺ�������׻��������к������غ�������Ү����ͦ�����ܡ�����Ǯʰ����������������˻�ް�������������Ϯ�ס����ӱ��������©ĩ��߱��۱İ����ս�˻�С������ݫ�����׸�������ԩ۵��ີ���衰�ݻ����յ������������ư�׮���в����������������ΰ�𨱡���������ֱ����޴����۩���ܰ��д��ذ�Y�Ű�1��������㥴�Ū��٥������������Ӱ�����������׳�������������̰����Ѧ������ư��׺ع��ް۰����Ȱ�ަ������ͬ�ص�Ա������߼���Ӱܾ������Ψ��թ������ͣ�ް�������׵���״�б�������ְ������Ұٰݰ�����ǡ�����޻�����ڰ汶��ԣ���ϱ����������ΰ��Ȱڤ�ɹ���ۢ��͢��������ˣ�����籥���������ɥ������ڻ��i]\|E\_s*��\_s*��\_s*��\|��\_s*��\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*ë\|��\_s*ʸ\_s*��\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|��\_s*��\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|�\_s*��\|��\_s*[����]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|�\_s*[�Ļ�]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*[����з�]\|��\_s*��\|ݬ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*¹\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[�Ǻ�]\|<\_s*=\_s*=\_s*>\|ɬ\_s*��\_s*��\_s*ʬ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|ɸ\_s*��\_s*��\_s*��\_s*��\)\|��\_s*Υ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|¨\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|̵\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*Ǽ\_s*ˡ\|��\_s*��\_s*��\|��\_s*\%([��ǡ­]\|��\_s*ʬ\)\|��\_s*��\_s*��\|��\_s*��\|Ƴ\_s*��\|��\_s*��\|��\_s*��\|I\_s*\%([rPn]\|R\_s*Q\|��\_s*��\_s*��\|C\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|A\_s*��\_s*��\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(��\_s*��\_s*��\|E\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|T\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\)',
+      \ 'j' : '\%([��������ֺ���Ｓ���ȼ����ټ������ľ������¿������������ߩ��̭��������顿�����ױ��ӿ�������пԿҿؿѿտ�������ޮ�������Խ������쿫���ٳа����屽�����ġ�����������������������п�������������л��������Ы�������������ǡ̼����ž�������������߾�վ�������������ڷ����������������������ط��è������Ǩ��쨽������۲�����ٽμ�����ѽ���ƽ����Ž���Ȼ�����ޭ�߱��������覽�۽����ڽ޽�����޼�����������������ߨ��潿������к��ߧ�������尽Ľ½����������ý����ƽŻ����켢��������������μ��������������Ż༤ϩ���μ��ͻ�֮������߾ǻ������߻��Я���������б��㫰ʻ�ֵ��˼��ѻ�������ʼ�����緺����������ܿ�����ٵ��Լ����뤸�ꨭ�����������������֧�����������𧧧קۧ���j]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ʊ\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Φ\_s*��\_s*ü\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���˥ʡ�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*[�ӥ�]\|��\_s*��\)\|��\_s*\%(��\_s*[���]\|��\_s*[����]\)\|J\_s*\%(R\_s*��\_s*��\_s*��\|\.\_s*S\_s*\.\_s*\%(B\_s*a\_s*c\_s*h\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|C\_s*B\_s*��\_s*��\_s*��\|-\_s*P\_s*O\_s*P\|��\_s*��\_s*��\|P\_s*\%(G\_s*��\_s*��\_s*��\_s*��\|E\_s*G\_s*��\_s*��\_s*��\_s*��\)\|I\_s*S\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*��\_s*��\_s*��\|V\_s*A\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|U\_s*N\_s*E\_s*T\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%([�ϥ����]\|��\_s*��\_s*��\|��\_s*\%([���]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*\%([�ʥ�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%([�֥�]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*[�ʥ��]\)\)',
+      \ 'k' : '\%([�����²���Ƿ�Ӱ���ť����������������������ư���������Я�⸼�����Ƚ�����Ǽ����������㪸��ۻ��������쮱�����������ֿ���������Ѻ���Ϲ���ٹ��󮺱�����Ѻ����������������������纯�պ���������︾���������������������ȹ������������˶���������޳Ӭ�������ު���⺤�ʻ������ӫ������������ޫ�ص���������٫���������Ⱥ����Һۦ��־����ִ��������������������Ṳ��������ӳ������̫���ָ������٬����������޸���ܺս��������������͹�̨����ɹ������ж�๫�ʹ�����á��������������乨ۥ�����⫹�����⩹������������۹չ����̹����˹��ع��ֹ�骹¹ݹҹԹθ��Ĺ��ӹ���ëӭ�����������й�����Ĩ�����Ӿ������������������̼ܵ����������ѻ�ƺ���������ݸ���ջʴ���ƻҸ���ǻ����䲹����Ƹ�����ž�Ƹݾ���檽���������۸Ÿ�����麮���������Ķ���۶Ÿɸк��������������Ҹ�����ݰ�ٽ����ᾱ��ʷ�������Э��ۿ����ٱ����ݼ������տ������������ܷ��������ѭثҥ����������կ�������������ԡ��ݾ��������غش޲������������ի��᫷𸳰��̷�����ո����������������丮�������������������򸬸������Ǹ�����������ҧڸ�������������������廷���������Ҿ�������º���������ت�����Ϩ���������������������������������������������������������������ꥷ���찷Ʒ̷�����÷���Ҧ���׷����ӽ�����������ܮ��ݮݬܱ��ܯ���ݫ����������ʵ��ߪ�������������÷����������ٷ�����ʤ������վ�߷�������ţ賷�Φۻ���Ү����������·��ذ������ܷ����򷬷���������ڶ�������˿��ֲ�ƺ��̽���ǰ̰�鶰����������פ��޺������Ϳ���������߷�����������ѦΦ�����庿ܸ���ȷ����������ˮԢ��ɦ����ʭ��������Ц��������ĸ�¢����������ƶ�����깩家����������Ң��������ϼ�������͹ȿ�������ҿ�ݹ����ڤ������������ӽ����廸����������������������θ�˨��������ž����߷����䷯���ݡݢ��뿸�֨�����ɵɵǵ̵Ƶʡš��򡢡꡻��ᡥ�����󢥢��������졲���������������󢣡�᡿�⢫�ݡ�������顺�������𡯢��ܡ����Ģ����¡������������ޡâ�ޡ���ࡤ���������墤��������̡뢦�������ˡ䧸����顷������������Ժ��޹�ܶ�ṹ����������µϴߵ�ʷ���ߵ�̸���Ͷ����������������������������������۶�ڢ�Ҷݸ��ٶڶӶ϶׶նѶ�۶ֶ�ض�����ک����ڡڪ䨱����������ӵ����Ҩд��ީ�򰰶ɵ��������ַ����������Ѭ����ި���ٰ���ع�������ڶ�亶�����������ѿ��װ��зժ�������������¶����ⶴ�����ȶ��߸���ҳ����ٶ��������ɶ���Ѿ��������󶩶��������ж����ᶫ�Ŷ��������ö��������������̾����������������켰��ܣ���������֩���ŵ���ָ������������ݱ��͵ܵ׵��ֵ�ȷ���ٵߵ޵�۶�������������泵�������ʹױ�����ڵ�����������ڴ�¶�ҷ�����ȩ�嵩����벫��ݺ���ž뵰������̶˵���������������ة��㶾ø���ۮ޿�����ʴ��ѥҼ������۹���ôﵮ����̵�������Ȳ���������������������٣ݤ��ֿ��������������¿ֵ���̧�ԭ������ҵ�������������������ݸɱ�İө�����������ֵ����������������ڹ��ɳ�����߳��˹��ȷ�̢�ư좿�Ʊ����ʡ�ܢ��������������ᱵ��������ר������Ӹ�������ǡˡԡơɡСҡȡѡա������ô��ج�ɳ�����϶������������Ѿʸܵ�ȿ�ּ����ĵ���ǣ�����ʶ�ͽ�����г�����ϵع�˵�����ۿ��ٸ��Ƿ�����������������ͩΫ�����峻���������������Ĵ���������ȱ��١��۫��������������Ȧ��滳��������Ҥٿ���龹�ô�������������������������Ž��޳���������ڳ³��������������������ư귰����¦�������γ�������㡴������������̻�������������റ��ɵ��������ҳ��������ݹ��������޳����˿�����������ڸ����ি�ԣ�����ϸ³ø��֡���סٷ�����ŭƬ����������ŬŨ״׳�Ť���Ұ�����ɬ������Ŵ����ܷ�������̳��������������ڲ������������ų�Ӿ���筢�����Խ������ڨƿ����ӽ�dzӡ͡ڡΡۡϡ̳��ȳijԳճʳ��߱�������ڼ�˳ͳȵҳֳѳ�ר���������һ����������Т�����������������Ӽ���߶���ݥ袳�����Ъ�����������Ļ�����������ӳ���ܴ��������߷������ٳ����β����𳭳������dz����������󳬲����������������Ӳ����٪۸���������٢�Ԭ�������ٺ��������������Ұ����ߵ��������Х����������Ľ���������ᴮ�������Ѵ���޾��˧�ӳ�����������ޱ�ڿ����ͻ�ô������ÿ�����������ȡ������ȴ�����ݴ���԰���ݴ����۴���ڴ��������ʴԴ�ա�����̴�����δ��˴���ע������Ӵ�������ӿ�ٴƴ��Ŵִ��״��ɴ����شϴ������Ѵ��ش������Գҵ��ȴճƶ����ɳ��վ�ײ˲����ײޥ������ϲ����ӧ����鴲�ӻ�������������βٳ�������ϲ��ݸ�������ӥ���׷ҽ����Իٷ����߲������Ѳβ��Ӽ����β��ȹ����������������ŷ���������ѫ�Ȼ��¥������ϲݲľ��Ӿ���������������۲Ҵ�������������粽桲����Ʒ������¸򲿶���Ф�����ڲ������Բ�������ּ�����вز���ͤ�����ᨦ�����秷��������������K���߶��Ҧʥ����������ܦ֥�k]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[�Ҥ���������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ⱦ\|�\_s*ë\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ϧ\|��\_s*��\|��\_s*��\|�\_s*��\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|��\_s*Ϣ\_s*̣\|�\_s*��\|�\_s*��\|��\_s*��\|S\_s*i\|�\_s*��\|ɴ\_s*[߻��]\|9\_s*[����]\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*¢\_s*��\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[��Ƿ��]\|��\_s*��\|��\_s*ɧ\|��\_s*�\|��\_s*��\_s*Ļ\|X\_s*e\|ǡ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*�\|�\_s*��\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*��\_s*��\|��\_s*��\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[��©]\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|̳\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ŵ\|��\_s*�\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ƻ\)\|��\_s*��\|Υ\_s*��\_s*Υ\_s*��\|��\_s*Ƭ\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|Ĺ\_s*[�]\|��\_s*��\|ŷ\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|̱\_s*��\|��\_s*��\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|Ϣ\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%([ormdaf]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|�\_s*�\|�\_s*�\|��\_s*\%(��\|Ϥ\_s*��\)\|��\_s*��\|��\_s*[�������]\|��\_s*\%(��\|��\_s*��\_s*Ω\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|(\_s*��\_s*)\|��\_s*��\|��\_s*��\_s*��\|��\_s*ʼ\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*[���׿�]\|��\_s*��\|ݣ\_s*��\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|��\_s*\%([�֥�]\|��\_s*��\|��\_s*\%([�ȥ�]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*[�եȥ�]\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'l' : '\%([���������������������������������졲�����������Тˢ̢Ϣ���ʥ��򧭦˧ݦ�l]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\_s*2\_s*��\_s*ˡ\|\.\_s*\.\_s*\.\|��\_s*��\|��\_s*��\|��\_s*��\|ݦ\_s*ݨ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����������֥ܥȥᥦ����������]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%([�����ƥȥ�]\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\)\|��\_s*��\_s*\%([�ȥ���]\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*[�ȥ�]\)\|��\_s*��\|��\_s*\%([������]\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|A\_s*��\_s*E\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|L\_s*\%([DP]\|��\_s*��\_s*��\|L\_s*��\_s*��\_s*��\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*��\_s*��\_s*��\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|��\_s*��\_s*��\|��\_s*\%([���������������ݥ���ޥʥΥ�̥֥���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*[��]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*[�륷]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([�ɥԥץ�������]\|��\_s*��\)\)\|��\_s*��\)',
+      \ 'm' : '\%([�Ӵ��ڬ��������������������߫ߪ�������һս�����������������������ο�������������ὼ�ʪ��ʹ�����������أ���᲼Ъ�����Ǵ��ܸ�����ʸ�������������ݨ�����ۯ�������ۤ˴����������ϳ��˾�������dz��������ܾ���ը�������������������ո�ľѾ�������ճ����˨��ت�����������������������������������������IJ��˾��������޸�������Ϊ溵�ʰ������̺�����������ü������ӹ��������ɴ���������Ϣ͸��¼���ߵ����ٽ��ﶻ�ŷ�̼�����������ǫ䧿��������������������̻����̸̷��̵̴̹����ϻ��̶̳�������������믵��Ĺ�ǥߺ���֪������Ь�յ�������������������̮�þ���̬��Ѱ�λ�û����ǣ�켪��ץŹ������̨��º��ļ�ۡ�����������ۡٱ����̰������ǧʾ������Ƴ����ϩƻ����м�����������̯̾̿̽�Ե�㴳���ﲸ���̫����������Ĵ��̩���̪��ܳ�̲��̱̥��뷿���׽�ѸʿǴ�̣���λ��潼̭���̦����̧�ߎ������ϸ����������߿����ܵ������������Ū�¹׾׿�ᵼ��ž���е����������ȱ�μ�㿮�°����Ž�������ɱ��̸�����Ʀ����ԫ�ѿ���Ǥ������ʶ������������Ŵ��ٰ������������������ü�������������������賹Į���硦Ԥ�����롬���ˡʱߴ�ʣ���󺵸�����������������������ƻ��������������Ϩ����������������������Ż�������Ȩ��ؤ������������̢�������̡�����罨������Ϯ�����򾾶��踭ͥ���������������β�����������������̤�˻���۾�ñ׿����鼬�����Ϸ����׻��������仵���Ŵ����Դ�������ޣ�����������ࢿ��������ޡޢ��Ϣ�����ˢ榤�̢͢ݢТܢʢ��΢����ߢ��ߢ���������������������⢩��ݥ޺ǥߧ����̥�m]\|��\_s*[�ӎҎюЎ�]\|��\_s*[����ߥ�]\|��\_s*[����ߤ�]\|��\_s*[������]\|��\_s*\%([���Ͽ�]\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*\%(��\|ʸ\_s*��\)\|ξ\_s*\%([�ѿƿ�]\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|ر\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*ĥ\|��\_s*[�����]\|��\_s*��\_s*ӧ\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��������ͭ]\|��\_s*ƻ\|��\_s*��\)\|��\_s*��\|��\_s*��\|6\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|©\_s*��\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|��\_s*��\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|��\_s*��\|�\_s*ȷ\|��\_s*��\|��\_s*[�����]\|��\_s*��\|��\_s*��\|Φ\_s*��\|��\_s*[�ҽ�Ԣ]\|��\_s*[����]\|3\_s*[����]\|��\_s*[����ȱ]\|��\_s*��\|ȷ\_s*��\|��\_s*��\|��\_s*[������۾�˪��]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*[ζε��]\|��\_s*��\|�\_s*�\|��\_s*��\|��\_s*��\|��\_s*��\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(̣\|��\_s*[ž��]\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*Ļ\|��\_s*��\|��\_s*��\|��\_s*[���Ҹ���]\|��\_s*��\|ߴ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*ã\|��\_s*��\|��\_s*[��̯��]\|��\_s*��\|��\_s*��\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|Ю\_s*��\|��\_s*��\|��\_s*��\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*[Ƿ��]\|��\_s*ɧ\|ʹ\_s*��\|��\_s*��\|��\_s*[��§��]\|��\_s*��\_s*ǯ\|��\_s*��\|¿\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|ñ\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*Ǿ\|��\_s*[����]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\_s*��\_s*̣\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*̣\)\|��\_s*��\|��\_s*��\|��\_s*��\|M\_s*\%([dgtnOo��]\|X\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*��\_s*��\_s*��\|P\_s*3\_s*��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|D\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*��\_s*��\_s*��\_s*��\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(e\_s*d\|s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|��\_s*��\)',
+      \ 'n' : '\%([�ݥ��ɰ��˽���ھ�翮������������������Ǽ����¡���۩����뭵�˾�����̻ĵ����ƭ���о��������۰�Ī�ܹ����ɫ����Ÿˡ���Ҷ����§ů������ŵ������ۨ�����ǹǿǾǽ�������Ľ�ǻ�����ݻ���Ƿ��ǶЫ���Ǹ�Ύ���������եݦ��߿ǫդ������ٹǭ���ʿ�ܡ̲������Ǯ�ϫǬ��̭ܬ����Dzǰdzǯ������޺��DZǩ������ϣǴ��Ǫ�������͎��Բ��ʾ����迡���۾�ݹ��������ŧ�޹dz�˥ȴ��ٶ������Ǩæ�̎�ٿ��ô�����������콭��ʨ���߳���Ʋ������ؽ�Ǣ��Ѧ�浶��ǡ���������ǣ����������աԢ�ءٰ�����ѹ��լ���ǿ�Ǧ��ǥǧǤ�������ٶ�����������������֮��ƨ����б����������������2ð�ɻ����ˎ���ٸ�������ij���������֧����ť鵵ͼ㳴÷ò��ڳ���ز��ּ�����ͱľؽǺޥ��������ϲ˿������ܧ�ƻ����������������������������±���ڽർ��������ͨ��������Ʒ��ȱ���į��ή����¸������ܩ��Ĺ�����޽�Ⱦ�������棷�м�����ǵ����ճ���Ǣ��Ｄ�����������������Զ����Т��͢����꾨��������ƽ����ĵ㴷����ѵ�Ӻ���޸��Ǽ���������̵ӭ�����������ձ��˴��ٽ���ʨ���������������������������������������̾����������˥̡͢���ʥ̥Χߦͦ���n]\|Ģ\_s*��\|��\_s*��\|��\_s*��\|��\_s*ö\|��\_s*��\_s*ȿ\|�\_s*��\_s*��\|ϵ\_s*[�ݱ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*Ƿ\|��\_s*��\|ο\_s*�\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*;\_s*��\|��\_s*��\|��\_s*�\|I\_s*I\_s*��\|�\_s*ȭ\|��\_s*��\|��\_s*�\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*�\|��\_s*��\|��\_s*ѵ\|��\_s*[����]\|L\_s*e\_s*a\_s*d\|P\_s*b\|��\_s*[����]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*ʪ\)\|��\_s*��\_s*��\|7\_s*[����]\|��\_s*��\|��\_s*��\|ʿ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|ɳ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\|\.\_s*��\_s*\.\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*��\_s*��\_s*��\|H\_s*K\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|T\_s*T\|Y\_s*��\_s*��\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|��\_s*��\)',
+      \ 'o' : '\%([�����߿��Ů��ۯ۰�Ÿ�۲������˻��Űҳ���������س����������������Ը������������䲮ɭ�������ܽ�����ڶ�����ڼ��ᡳ��������������������������Ǧ��������Ƽ�����Ĺ�Ľ����Ǽ�Բ����������£�����ҽԿ�������־���ͳ�Φ�ֲ���ݣ���ſ����༫�ʳ������ˬ�ʲ��������������񤲷��ǰ��߰�θ��������ۻ�ɽ���̶�������Ͷ��笲��������������ݶ�������ߴ������޳ص����������إ��������㿲�۾����ռ���鲪���������ݯ����ݳ�²�۷��겣����ݿ�������൴�������꾪Ʊ�����������ٱ�̱���������⳸͸���Ȳ����������ϵ��˲��˱����¿��ʤ�������Dz����ݺ��ڽ�ﵯ�����ؾ����������ͦ�谵��Ӱ���ɰ�����������������ϯ����Ϻڨ����ͺ��Ϸ�������������˸��Ľ��ˤ���������¢�����˳����ئ��������ϧ�o]\|��\_s*��\_s*��\_s*��\|��\_s*��\|�\_s*��\|��\_s*Ȭ\_s*��\|Ŵ\_s*��\|��\_s*ȱ\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̣\|��\_s*�\_s*��\|��\_s*ʴ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ب\_s*��\|˵\_s*[������]\|��\_s*[̼��]\|��\_s*[����]\|��\_s*[����]\|թ\_s*��\|��\_s*��\|��\_s*��\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[̼�Ҳ�]\|��\_s*ǯ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|�\_s*��\|��\_s*��\|��\_s*��\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ʪ\|��\_s*��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|��\_s*Υ\|ز\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����������]\|��\_s*��\|��\_s*[������]\|��\_s*��\|��\_s*��\_s*[����]\|��\_s*[�߳���]\|��\_s*\%(��\|��\_s*��\_s*η\|��\_s*ŷ\_s*��\)\|��\_s*Ƭ\|��\_s*[��������]\|��\_s*��\_s*¾\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*\.\|��\_s*[��ζ]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|Ω\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*[ǯ��]\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*Ŭ\_s*��\|��\_s*\%([�ӷ�]\|��\_s*��\|\.\_s*��\_s*\.\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|O\_s*\%([����sS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*��\_s*��\_s*��\_s*��\_s*��\|C\_s*R\_s*��\_s*��\_s*��\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|��\_s*��\_s*��\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
+      \ 'p' : '\%([ˣ��ˤ��ˡ����ܮ�����ޤ�ʻ�����ġ�����������������������ʬ��������ɤ��ɼɶ����ʿ��ȯ���Ȣ��������������������������ʢʧ����������Ȭ�����˱�ĥ�ѣ���צ��ԡޡܤצզ��������̨��󡥡�������ץ��ǡˡʢߢ��¥ڥѧ��Хԧᦰ��p]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[�ݥڥץԥ�]\|��\_s*[�ݤڤפԤ�]\|��\_s*��\|��\_s*��\_s*Į\|��\_s*��\|�\_s*[Ϫϥ]\|��\_s*��\|��\_s*��\|��\_s*ϥ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Τ\|��\_s*��\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|��\_s*[�ļ��]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*\%([��������]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|+\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|Χ\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%([����Υ�]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*[���]\)\|��\_s*[�ĥ�]\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([��������]\|��\_s*[�ץ�]\|��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*\%([�٥�]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*³\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*ˡ\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*³\|��\_s*��\_s*��\_s*��\|��\_s*ƺ\_s*��\|��\_s*��\_s*��\|¿\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|Ž\_s*��\_s*��\_s*��\|��\_s*ʸ\|��\_s*��\_s*[����]\|��\_s*��\|P\_s*\%([umdCaor]\|K\_s*��\|D\_s*F\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*��\_s*S\)\|I\_s*C\_s*��\_s*��\_s*��\_s*��\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*��\_s*��\_s*��\|O\_s*S\_s*\%(��\_s*��\_s*��\_s*��\|I\_s*X\|T\_s*��\_s*��\_s*��\_s*��\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\|��\_s*��\)',
+      \ 'q' : '\%([��ܮ��ݮ��ݬܱ��ܯ��ݫ����������ʵ��ߪ�����緩�����ų������÷����������ٷ���������ʤ��������մɾ�߷��������ţ賷�Φۻ�����Ү��������ⰲ������ط��������ܴ뷭�����򷬷���������ڶ��������˿����ֲ�ƺ����̽���Ӱǰ̰�鶰��Ҽ�ȱ�������פ��޺���������������ޱ�����Ϳ����������߷�����������ѦΦ�������庿����ܸ�𷪶��Ƕʳ����������ˮԢ��ɦ����ʭӼ�������������Цա�����������Ŵ�ġ�������¢�����׶��������ȷ����Ƹ�����蹴�����깩家��������������Ң�������׵����Զ���죹����������͹ȿ�������ҿ�ݹ��ܶ����ڵ⎸����ɡơǡȢ���������q]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*̼\|�\_s*�\|��\_s*��\|�\_s*��\|��\_s*Ѵ\|ɴ\_s*[߻��]\|��\_s*��\_s*��\|��\_s*ʪ\|��\_s*��\|Ĺ\_s*��\|9\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|ŷ\_s*��\_s*��\|��\_s*��\|ŵ\_s*��\_s*��\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|õ\_s*��\|��\_s*��\|c\_s*r\_s*e\_s*s\_s*c\|��\_s*[����]\|��\_s*��\|��\_s*¢\_s*��\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%([��������ʸ����]\|��\_s*��\)\|��\_s*��\|��\_s*Ѥ\_s*��\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|ϻ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*��\_s*ϯ\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|Q\_s*\%(I\_s*C\|R\_s*��\_s*��\_s*��\|C\_s*��\_s*��\_s*��\_s*��\|U\_s*O\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*[���]\|��\_s*\%(��\_s*[����]\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*��\_s*[�ॹ��]\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\)',
+      \ 'r' : '\%([���������α���㳹�����Ͼ��ϼϽ����ϿϮϱ�ҩ����������߳��ѤӤ�����������ӯ�ۭ���������۰��Ϻ��ϭϴϲϹ��ϸϰ϶��ϵϳϯ����תϦȧ���������������ݭϧ����ߣ���Ϩ����ްߺ��Ѷ�ү��������������Ӻ�١������������㹵���������������������������������ݬ�����ݮ�������߲��ҽ�������������������ݲ��������ϡ��ϣڻ������Ϣ���ϩ�����ޥ��������������������ﻼ���Ϭ������ڶ����Ϋά��ΪΨ�˷�Χҭ��ϻ٤Φ߱��������������������ų���ί��βΰαΩ��γέδή��������ܲ����������ש��P��������ا�����������������������������η���κϤθо������������������������ס���̺������ۢ��������������������ɩ��������������������οεζν����μ����λ������ξ����ι��������ئ΢����ΤΥ�����Ρ��������ߢ����Σ����轤��ϫ��������Ϸ��ԿպѰ������������Ьݣݳݴڰ����������������������������������������������������������ݪ�������ڧѴ����������������������������������դ�򱦢����ا��������է٧짹�ۧק��ܧ�����觴�����ӧ�������������ҧ����ާ�����ߧ����Ϫ�֧᧦�������������ϥ���ԧݧ�ꧽ�称�ڧ�槫�آ庬���������꧲�ѧ⦱r]\|��\_s*[�ێڎَ؎�]\|��\_s*[�������]\|��\_s*[�������]\|��\_s*��\|��\_s*[ͭ��]\|��\_s*[˦���]\|��\_s*̵\_s*��\|6\_s*[����]\|ݦ\_s*ݨ\|԰\_s*��\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*̿\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*§\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|ȿ\_s*��\_s*��\|��\_s*\%(��\_s*ʸ\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*ǽ\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*Ū\|ǧ\_s*��\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*��\_s*��\_s*��\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*��\_s*̲\|T\_s*U\_s*R\_s*N\_s*��\_s*��\|A\_s*D\_s*M\_s*E\)\)\|��\_s*��\_s*ɽ\_s*��\|��\_s*��\_s*��\)',
+      \ 's' : '\%([������Ъ��ۼ��˵ֵ�ڰ��޶�������˿������������Խ�����������������Ǩ����Ψ��м��©­¥«¦¬��߶������丳���ײ����ҫ�����������������Ǭ���������������տ����������֥����£̫Ȣ��ػ�����ٴ��������ݽ�����������������������������Ҳ������������������������������������������������������������ϱ�ç�������î¹½¸º»��¶ȿ�����������������������������������������Ȱ�������ɱ���������������㯤�������ɯ˻����ܦ�Ƕ��í����������޶�������������ܸ���������������������������Ҫ����ͼ�������ϴ���������·��������������֣�����������������訰������������Ѣ����������޷������ѩ����������ڱ�����߫����ߪ�����������������������ߥ������������������ѡ����������������������٥����Ѩ������ڣ������������������������������������̻����ګ������������������������������ع���������������Ṷ�������������������������������¿��б�¼��ͥ������ӳҰ��������ӵ�����ѱ�������ڿ�����ͤμ��ʹ�������ƫ������ǵ��¨§�ߵ�������̡����������ͷ�������ķ������������״ɿ���צ��������ߵŲ�������®ú���϶��ۡڽ���������������������ܡ��ʢ���͢�Тߡ�ޢ��⦤�̢�ߢϢ��ޢ���ˢ�������ج���������������حï�Ϳ������巿������H��������۽�����ľ��ٹ����������������ض�Ʃ����߭���������������ڧ����������Ա���颼�������������ý�Ƴ����ħ��������󻼲�����١����ٶ�������Ĵ��¢ֺ��������ߨ��ߧ�¼Ȼ����ο�Ǧ�������ǧ���кӻ�Ϣ����尷樦ȵԦ��������������ܰ���Ǣ������������ܾ�������н���ؼ��������鼮��Ĭ�������߼��𭼿����ɨ���������ũ�������м�������ʻ�������������Ϳ��ļ���������������������������ĵ������������ϼ�����ٱ��⬼��������բ�������μ�����������忼��м�ܼڼ�����Ѽм˼ּ�Ұ������ʵ��������༩����ǿ�ެ��ոշܤܣƵ����������´�ô�����������������ʽȽͽܼ̿�������������г⽫����������ܷ������֭��������ܶ�����Ӵ����嵼��������ϸ�����������������ܽ�����µ���½�������������������������������Ѯ�آض����ӽ����ؽܽ׽ٽ���䣽սֽ����������������������֪��꿾�����˿�����Ӣ����������ǿ������������п¿��������Ŀ˿��ӿ��¿ɿ��ǿ���ä���⿹�����ü��������ȿʿ������ƿ�謹������н��������н������ٳ���������ر�����������������������������������������������������������޵���������⾨�������������������پ�������طգ������ңֹ�Ͼ��������������������Ӿԡ����������ѽ����ءʡ˾������������Ѿ����ء髾����������޾������������۾��¾�騾����ľ���ா���ܥ�����ƾ��������������Ͼɾ����˾���ƴ�����Ҿ����ݾ��������ξƾоȾ����þϾܾھ�˾��ʾ�����֤��ԧ������������ῡ񳿤��°�����������������濣������������ֻ�������ɦ��Ƶڴ�Ԯ��ӡ�����ݻ��������������ӻ��������͵����ǻ���ද�����Ի���֬������ڻ��ʻ��溡���������������л���ܻ���������Ƿ��ǡ���ʻ������᪶ۿڻ����������ף�������������һ���л��������̦�������򼡿����ּ���׶�����꼨���ǻ�徼�㬻˻������������㫻�����������ټ���������������軭���dz�˸�������ο����������������������ͻ�����ٮ����������ӦͶ��긼���ۿ�ܻ������߷��߽Ϋ��ڼ����޴�����ͺ��ɾ�������������������참����ֿ�����곡��ָӯ�����������˼�����λã���DZ�����͡��ů�η��������Ҹ���۸Τܪ�����Ǿ��٩��姻����Ӵ��ܼ������������Ʊ��ݺ������涭�����ո������ප������ߦ��������������������������ڹ���Ŀ������Ģ��ջ��ɻ���������ܢ�������Ի��ӻ�������������3����O����������������������������彿��Ҽ�����պȻ�������������ޯ���컯�߻����������خ�������칹��ʺ����ѱ�����٣���׺˺�㷺ԺݺҺӼ��кںպ��ƺغ׺ʺĺźͺ��ԺۺкǺ�ª�����Ӻ������䩺������ں����Ժ������������غ��ݯ���������Ͷ��żӻɺ�����̬�������������������úú�赺�����������ͺ��ͺ�հ��������٭����������������������������亿�޺�����������Ի�����⤹���Ż������������������ꧺ������맻ź�����󢾢�����ʸ�š�����ɸ���Ļ����ں̢����������ơǨ�������õ�����������������æҦ�����s]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|�\_s*��\|��\_s*\%(ϩ\|Ϫ\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|�\_s*[�]\|��\_s*Ѥ\|��\_s*��\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|��\_s*��\|��\_s*��\|c\_s*e\_s*n\_s*t\_s*i\|��\_s*[϶��]\|��\_s*��\|�\_s*̥\|��\_s*��\|ŵ\_s*��\|��\_s*ͺ\|��\_s*��\|ŷ\_s*[�IJ�]\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|��\_s*��\|�\_s*ƻ\|��\_s*\%(��\|��\_s*��\)\|Ϸ\_s*��\|˾\_s*Ĭ\|��\_s*��\|��\_s*[��Ǧ]\|L\_s*a\_s*\%(b\_s*i\_s*a\_s*t\_s*a\_s*e\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\_s*��\|ʾ\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ت\_s*ͺ\|��\_s*��\|��\_s*��\|I\_s*\%(s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\)\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*ʸ\|��\_s*[ë��]\|��\_s*[����]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([�ظ��ܻ�]\|��\_s*��\)\|��\_s*��\|7\_s*��\|��\_s*[ʬ��]\|4\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|͢\_s*[����]\|Ȼ\_s*[ϯϺ]\|�\_s*[���]\|��\_s*[���]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|³\_s*\%(��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|ή\_s*[��Υ]\|��\_s*��\|�\_s*��\|Һ\_s*ȭ\|��\_s*��\_s*��\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|��\_s*��\|D\_s*Ź\|��\_s*��\_s*��\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|��\_s*��\|��\_s*[������]\|��\_s*��\_s*Ʀ\|ۨ\_s*��\|��\_s*��\|��\_s*��\_s*\%(��\_s*[ǯ��]\|��\_s*[ǯ��]\)\|��\_s*��\|ɴ\_s*��\_s*��\|��\_s*¹\_s*��\|��\_s*ƣ\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(ˡ\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|��\_s*[ŵ��]\|B\_s*\%(r\|��\_s*��\_s*��\)\|��\_s*ĥ\_s*��\|��\_s*ʬ\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*¤\_s*��\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|��\_s*\%(Ƿ\|��\_s*\%(��\_s*��\_s*��\|��\_s*̣\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*¬\_s*��\_s*ư\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%([���]\|��\_s*��\|��\_s*��\)\|��\_s*\%([���]\|��\_s*��\)\)\|��\_s*̣\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%([����]\|��\_s*��\_s*[����]\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([�ʼ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s* \_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|β\_s*��\|��\_s*��\|S\_s*\%([nrgmce��]\|G\_s*M\_s*L\|��\_s*��\_s*��\|S\_s*��\_s*��\_s*��\|F\_s*��\_s*��\_s*��\_s*��\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|P\_s*\%(��\_s*��\_s*��\_s*��\|A\_s*C\_s*E\_s*��\_s*��\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*��\_s*��\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\)',
+      \ 't' : '\%([�������˳��������ɼ��Ҹ�����ڽ�Ѳ���������۳���������ݽ�꾲��������������ﰬ�����ƾ�η���ض���������������쨽�ȼ��ͧ����������۽�����Ĺ���������������Ч�ԥ�������������������㫽����˺�̭��������ǯ���ӷֺܺ���ڢκ�˭��������ƿ���¢���������������������ݥ�ݹ�����۲����ٵ�����������ܪ����Ǽе��ܫ�������������ƻ������������۶���Ʊ�ڮƺ����ܻ���Ѹ߮ƪֺ�������������ƽ��������޹��ơ�������������Ʀ���������ƭ����Ƥ����ƣ������������ƫƥ�����������ƹܳ��ٻ��긦��뻼�����ͻϿ���ֺ���������α�ڿ��п�����������������Ž����������ϲ�輹����ѽæ��������������㽳�������Ԧ�Ȏ��ӱ͹����ʻ����������Թ��֥����ų������ŭ���ׯū�ڳ��ũ�������ۡ������ܡ����������������ץ�š�����ż��ſ���Ŷ������Ż�Ÿ�źŲŪůŨű��Ű��Ŵ������������������������ܼ��ܨ���ձ����ţ��������š��������������������������Ţ޸��������׷�ȤƎ�ʾ��ʼ������������ŵ����̳�ٽ��ض��۲���ϸ��ɴ��̱ս�Ϫ������·�ٴ�ܻ��ܿ���������ѳ����������㪱����γ�����ª������ڼ��������ָ������ʴ������ϸ��Ⱥ��鲶������ڹ˷Ҿ�����������ѣ������ױ����������³������������������ٽ��ƿ������ɸ���������������������̢�����������Խϴ���˵���Ϻ�¤������ݶԯ���з���ˤ�����ض࿵������������ܦ�׹�����Ƶ������ѻ̻��������ҵͿ����Ώ���ڻϢ�����դĎ����״����������ۺ��������������紺��N�������㾹Ŀ����ٻ����������������������������������������������������ٲ��Ŧ�������������Ȥ�����������������ܺ���Ҭ��Ľ������ļ��ذ��׬��������������������Ť��������׭߭ı������������������������ġ����ĵįŽ��������Ƭĸ��ķijĪĢ��ĭ��ƨĻĥĤĨȥ��ħ����İĦĬĮĺĴģ�IJĶĩīЦ����Ѳ��ɪ�د�������פ�֢��ϱ�������ɳ���ղ�������ѡΡСϿ��������������������������������������������������ɼ�������ȷ�֮�Ի�������γ����������������������ڤ������̯�����ֿ�ڸ�ȿ�ˬ��������ܽ���î�����Ƣí�̱����������������좷�����нԻ����վι�ì���λ�����Ƨ��٥����Ʈ����á�����ɾ��ẹ��ﴰ����٦��ɶ���ݾ�Źê��é��ڥ������çä���ޡܱ���ͤ��ɫ��맰�������������ܭ������ζε�����ɺ�ݰ�������ľ����Զ���ͣ�������Գ�������������Ӭ�����ѹ�ҵ�������ͺ���������׼������������Ŭ���Ƶ�����«�ԡý�������ݽ�è����ã�۹��̴��ƿ�����ֻ���찶Ƶ���Ǥ������ϰ���䶳�ɳٹ��������º����յ����빧δ��������Ӹ��ٿ��������й����þ��߬�����������������������������ں����߸�������ÿWö��ӷëó�ȿCò÷����ý��ðôùøú����ûõ��ñâ��������߷پ��ŧ��٧Ӷڤ��������������������������������������������ڭ���������������ʿ��ڬ�����������������������������������������������������������­���ҿ�����п���ʲ��ί���ӣ���۴����ï¾���������ص������봮Ĺ����Աȯ����¿߱֫٣����Ω���������η���򤿣��觸��ŷ���߷����ڢ����������ᦨ�����ɽ���ڥ����覨�ȥ����ġ�žƩ���������ȥ��ġ���ü���䨼�������������������������Ө�������������t]\|��\_s*[�ĎΎ���]\|��\_s*[�ȥƥĥ���]\|��\_s*[�ȤƤĤ���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Ϸ\|��\_s*��\|��\_s*[���]\|��\_s*�\|��\_s*ľ\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*[����]\|͸\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*[��ƻ��]\|��\_s*[����]\|��\_s*ǯ\_s*��\|��\_s*[�׻�]\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|ƶ\_s*��\|��\_s*��\|��\_s*��\|F\_s*e\|I\_s*r\_s*o\_s*n\|��\_s*¼\|��\_s*��\|��\_s*̼\|ɻ\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|ε\_s*��\)\|��\_s*[����]\|��\_s*\%(��\|��\_s*��\)\|ɹ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|1\_s*\%(��\|0\_s*��\)\|��\_s*��\_s*��\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(Ϸ\_s*Ƭ\|��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|ܥ\_s*��\_s*�\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*��\|��\_s*ެ\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*ë\|��\_s*��\|��\_s*Ϫ\_s*��\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|��\_s*[����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*��\_s*[����]\)\|��\_s*\%(��\|��\_s*˷\)\|��\_s*Ƣ\|��\_s*��\|��\_s*��\|��\_s*[ڳ��]\|��\_s*��\|��\_s*\%(ͼ\|��\_s*��\)\|��\_s*��\|��\_s*��\|ͱ\_s*Ю\|̵\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|�\_s*��\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ж\_s*��\|Ʋ\_s*��\|ǽ\_s*[ʸǷ]\|��\_s*��\|��\_s*̱\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*[�ȥ��]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[����ॢ]\|��\_s*\%(��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\)\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[�ե�]\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*[������]\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|Ϣ\_s*ʸ\_s*��\)\|\\\_s*T\_s*e\_s*X\|ʸ\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*˦\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\|E\_s*��\|��\_s*[�أ�]\)\|T\_s*\%([bc��mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|��\_s*��\_s*��\|X\_s*T\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|V\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|C\_s*P\|��\_s*��\_s*��\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*��\_s*��\)\|E\_s*L\)\)',
+      \ 'u' : '\%([����Ⱥ��ɶ���ʷ����������ƶ���ڰ��������뼿������å�����ѽ�������ִ���ء���۽��¥��ӹ����������ⱳ����ư뭱���������������辧���ž�������ر�����Ϊ�Ų�����������ر���������󨱲���山����䥿���۲��������񱷸����¹��������ϻݱ������������ڴ︽���Ǽ̰�����������ֶ����̽���������Ѳ����ⳤز����������ﷵ�����庨��������΢���ױ���������Ӻ��屯Ĭ��Σݵ�������²������±��������ڽ����ͭ����в��񱭱������˼���ޢ��ͫ觼�ǿ��������������վ���ھ�ӻ���Ƥ���ƿ�񻱧�����������������奦���ԧ�Uu]\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*��\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*ǽ\|��\_s*\%(��\_s*��\|ͭ\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\)\)\|ñ\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%([���ˡ�]\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\)',
+      \ 'v' : '\%([�������͢��ǧӢ����˥�v]\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\| \_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([���ܥȥ�]\|��\_s*\%(��\_s*��\_s*��\|��\_s*[����]\)\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%([��ȥ�]\|��\_s*��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%([�ɥ�]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*Ĺ\_s*��\|��\_s*ľ\|��\_s*\%(��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\)\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\)\|��\_s*\%([����֥Х���]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*[����]\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*\%(��\|��\_s*��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\)\)\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*��\)\)\|��\_s*\%([�����]\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([�ȥ���]\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*[����]\)\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*[���䥢]\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|J\_s*E\_s*-\_s*��\|��\_s*��\|��\_s*��\_s*��\|I\_s*S\_s*A\_s*��\_s*��\_s*��\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\|��\_s*\%(��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%([���]\|��\_s*\%([���֥�]\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*\%([�顼]\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%([����]\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\)',
+      \ 'w' : '\%([���򲧽��ﲴ��ͺ�������ˤ���Ⱥ��ɶ���ʦ��Է����������ƶ���ڰ������뼿������å���ѽ����������ء���۽��¥��ӹ����������ⱳ����ư뭱���������������辧���ž�������ر�����Ϊ�Ų���������ر���������󨱲���山����䥿���۲��������񱷸����¹��������ϻݱ������������ڴ︽���Ǽ̰�����������ֶ����̽���������ѱ���ز����������ﷵ�����庨��������U��΢���׻᢬�������Ӻ��屯Ĭ��Σݵ�������²��������������ڽ����ͭ����в��񱭱������˼���ޢ��ͫ觼�ǿ��������������վ���ھ�ӻ���Ƥ���ƿ�񻱧�������������ܲ����ı����������ϴ��Ѵ�����ֲҺҶȵ�������ب�భ��˺�����о���Ƹ���޾�������������������׿׾�б�������IJ�ľ���ƻ�����������ʻ䷨�������������Ų���ѯ�������Ƚ�����ռ㰿������ʨ������Ͱͯ�����������������ӻ������ʬ�ʱ����������ȥ���w]\|��\_s*[���񎳥���]\|��\_s*[��񥦥��]\|��\_s*[��񤦤��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ϵ\_s*��\|��\_s*��\_s*��\|��\_s*��\|թ\_s*��\_s*��\|��\_s*��\|ͥ\_s*\%(��\_s*[�ɰ�]\|��\_s*��\)\|��\_s*��\|��\_s*²\|��\_s*��\|ˢ\_s*��\|��\_s*��\_s*[Ƭ��]\|��\_s*��\|��\_s*�\|��\_s*Ǽ\|�\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\_s*Ļ\_s*��\|ø\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|̣\_s*��\|��\_s*��\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\_s*��\|�\_s*��\|��\_s*Ϻ\|��\_s*��\|��\_s*[������]\|��\_s*\%(��\|��\_s*��\_s*��\)\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ͥ\|��\_s*˺\_s*��\|��\_s*��\|��\_s*��\_s*��\|(\_s*��\_s*)\|��\_s*[����]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|Y\_s*\%(��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*[ͳ��]\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*٥\_s*�\|��\_s*\%(��\|ʿ\_s*��\_s*��\_s*��\)\|ݿ\_s*��\_s*��\_s*٥\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*\%([�ץ�]\|��\_s*��\_s*��\)\|��\_s*\%([����]\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\|��\_s*\%([�ࡼ]\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\|��\_s*\%(��\_s*[������]\|��\_s*��\|��\_s*\%(��\_s*\%(��\|��\_s*��\)\|��\_s*\%(��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%(��\|��\_s*[�ȥ�]\)\)\|��\_s*��\_s*��\_s*��\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\|��\_s*\%(��\|��\_s*��\)\)\|��\_s*��\_s*��\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*\%([����]\|��\_s*\%(��\|��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*[��]\|��\_s*��\_s*��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\)',
+      \ 'x' : '\%([���������������������������������Ρߧ��禮x]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%([����]\|��\_s*[����]\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\|ü\_s*��\)\|X\_s*\%([����]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|��\_s*[����]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*��\_s*��\_s*��\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|��\_s*��\_s*��\)\|e\_s*n\_s*o\_s*n\)\|��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\|��\_s*��\_s*\%(��\_s*��\|��\_s*��\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\)\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\)\)',
+      \ 'y' : '\%([�ֲ��غ�������˩շ��޷����ڡ��崿�ڳ�������ֻۻ���������������������������þ��ӱٵ���㷽���İ��Ľ������˧�ȵ�����������������ۡƫ����������׫����������խ�����������������ߡ�������ٹ�������������������������������������������������������βž�����ա�䲣ڵЮ��Ϳ��������즷����д�ͽ����;��ǽ����鱻�������Dz�Ʊӽ������������������μ��д�İ�������˭������Ƿ����ְ����������쪾�஻���ᾲ�������͸��Ͳإ����������餲�����ͨͤ��ͱ��ͻ͹Ͱͯʹ��ͼͩͪ��ͧͺͫͭ����͡������ͮ��ɵ�������������ͷ����ͳ����·�����͢�����掲�Ǧ�����׵׶���������϶��������������������̴��ߺ�̤����ӷ��������Ų������ݳ�����Ͷư�������������ȵ������ܦ��ɵ�述����������ڿ��Ĺ�Ǣ��������̿��θŸ��沵����ż���������ϫ��������ĺ�����׻��������к������غ�������Ү����ͦ�����ܡ�����Ǯʰ����������������˻�ް�������������Ϯ�ס����ӱ��������©��ĩ����߱��۱İ��Ľ�˻��С������ݫ�����׸�������ԩ۵��ີ���衰�ݻ����յ������������ư���׮����I���������������ΰ�𨱡���������ֱ������޴����۩���ܰ��д��ذ��Ű�1��������㥴�Ū��٥������������Ӱ�����������׳�������������̰����Ѧ������ư��׺ع��ް۰������Ȱ�ަ������ͬ�ص�Ա������߼���ܾ������Ψ��թ������ͣ�ް�������˵���״�б�������ְ������Ұٰݰ�����ǡ�ý�޻�����ڰ汶��ԣ���ϱ����������ΰ��Ȱڤ��ԧ������İ��ø��������Ҳ��ݰ���������ͻ���Ϧ��������S�����ϵ����������������ͥ����²����۴���Т����������ݬ�����ٯ���������������ֳ��쮼��༽��̡ԡաҡӻ���š��ץ����̰��ǫ��͵���ٰ׵ٹ��ݰ�������������Ǹ���������鲰����Ȭ�����������ë�黦���������������׽��ܿ�ߺ������֧��ߡ���������ר������������Y���ԧ���y]\|��\_s*[�֎Վ���]\|��\_s*[��楤��]\|��\_s*[��椤��]\|ݿ\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*Ƹ\|��\_s*��\|��\_s*��\|4\_s*\%([�������]\|��\_s*��\|��\_s*��\)\|¾\_s*��\|��\_s*��\|δ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[�Ҹ�]\|��\_s*��\|��\_s*��\|��\_s*[����]\|��\_s*��\|Ī\_s*[�Ұ�]\|��\_s*��\|��\_s*��\|8\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ɴ\_s*��\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|��\_s*\%(ͺ\|��\_s*��\)\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|E\_s*\%(u\|��\_s*��\_s*��\)\|��\_s*��\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|��\_s*ë\|��\_s*��\|ɨ\_s*��\|��\_s*ϻ\_s*��\|��\_s*��\|��\_s*±\|��\_s*��\_s*��\|��\_s*ȷ\|β\_s*��\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|��\_s*ɨ\|��\_s*��\|��\_s*��\_s*ƣ\|5\_s*[����]\|��\_s*[����]\|ب\_s*٦\|��\_s*��\|Ĭ\_s*��\|��\_s*��\|��\_s*Ӽ\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ʸ\_s*��\|Ϻ\_s*[����]\|�\_s*��\|��\_s*[����]\|U\_s*\%(��\|��\_s*��\_s*��\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|�\_s*[�Ļ�]\|��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\)\|��\_s*[����з�]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*¹\_s*��\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|��\_s*��\|̵\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*ή\|��\_s*[�����]\|��\_s*[����]\|��\_s*[�ڻ�]\|��\_s*ɽ\|��\_s*��\_s*[��ú]\|��\_s*ӧ\|��\_s*[����]\|��\_s*\%([������]\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*[�ʱ��]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|��\_s*[��ǡ]\|��\_s*��\|��\_s*ζ\_s*��\|ξ\_s*��\|ή\_s*ŭ\_s*��\|��\_s*��\|��\_s*[����]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|��\_s*��\|��\_s*��\|��\_s*��\|ŷ\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*º\|��\_s*��\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\_s*��\|��\_s*¹\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|��\_s*��\|��\_s*[����]\|��\_s*\%([�̼�]\|��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\)\|��\_s*��\)',
+      \ 'z' : '\%([�������»¸·��«­֤����±³��²¯°��������������������¡£����¤�������ȿź��������������������������������������������������������ǹ����դ����������������ظ��������������ԦƬ�����ſݿ��פƦ������������ֺ���Ｓ���ȼ����ټ����Ķ���������ټ����������ܿ�����ľ�������㿬�����������ߩ��̭��������顿�����ױ��ӿ�������пԿҿؿѿտ�������ޮ�������Խ������쿫���ٳа����屽�����ġ�����������������������п�������������л��������Ы�������������ǡ��̼����ž�������������߾�վ����������ڷ����������������������ط��è������Ǩ��쨽������۲�����ٽμ�����ѽ���ƽ����Ž���Ȼ�����ޭ�߱��������覽�۽����ڽ޽�����޼�����������������ߨ��潿������к��ߧ�������尽Ľ½����������ý����ƽŻ����켢��������������μ��������������ż��༤ϩ���μ��ͻ�֮������߾ǻ������߻��Я���������б��㫰ʻ�ֵ��˼��ѻ�������ʼ�����緤���߷���º����������ֿ�껯����������ܪ�Ȼ�������������ﴻ��������̻���쩻������ϻ»���߻���ͺ����ú޺���߳кº鵺���¢������鶺��úä�������������좭���ا����������������Ƨ����٦�z]\|��\_s*\%(��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*[����������]\|��\_s*[����������]\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*[���һ�]\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|ȯ\_s*��\|�\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*ˡ\|��\_s*��\|Ĵ\_s*��\|��\_s*[�᷺]\|�\_s*��\|��\_s*��\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|��\_s*��\|G\_s*\%(��\_s*��\|��\_s*��\)\|D\_s*y\|��\_s*\%(��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|2\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|J\_s*\%(I\_s*S\_s*��\_s*��\_s*��\|��\_s*��\_s*��\|R\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\_s*ʺ\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*�\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\|��\_s*\%(��\|��\_s*��\)\|��\_s*ī\|��\_s*��\|Ƚ\_s*��\|ϳ\_s*��\|��\_s*��\|Ĺ\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*Τ\|��\_s*[����ϴ������崽]\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*\%(��\|��\_s*[�ʷ�]\|��\_s*��\|��\_s*��\|��\_s*��\)\|��\_s*��\|��\_s*��\|ɳ\_s*��\|1\_s*\%(0\|1\_s*��\|8\_s*��\|2\_s*��\)\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\|��\_s*��\_s*��\|��\_s*��\|��\_s*��\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\)\|Z\_s*\%([r��]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|I\_s*P\_s*��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*\%(��\|��\_s*\%(��\_s*��\|��\_s*��\)\)\)\|��\_s*\%([����]\|��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*\%(��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\)\|��\_s*\%(��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\)\|��\_s*��\_s*��\_s*��\)\)\|��\_s*\%(��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*\%(��\|��\_s*��\)\|��\_s*��\_s*��\_s*��\_s*��\_s*��\|��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\_s*��\)\)',
+      \ '{' : '[��{]',
+      \ '|' : '[��������|]',
+      \ '}' : '[��}]',
+      \ '~' : '[�̡���~]',
+    \ }
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim
new file mode 100644
index 0000000..71b1f16
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/migemo/utf8.vim
@@ -0,0 +1,97 @@
+function! EasyMotion#migemo#utf8#load_dict()
+    return {
+      \ '!' : '\%([≠！!]\|感\_s*嘆\_s*符\)',
+      \ '"' : '[”″“〃"]',
+      \ '#' : '[＃#]',
+      \ '$' : '[＄¢£\$]',
+      \ '%' : '\%([％‰%]\|パ\_s*ー\_s*セ\_s*ン\_s*ト\)',
+      \ '&' : '\%([＆&]\|ア\_s*ン\_s*\%(ド\|パ\_s*サ\_s*ン\_s*ド\)\)',
+      \ "'" : '\%([ズ”″‘′´’'']\|ア\_s*ポ\_s*ス\_s*ト\_s*ロ\_s*フ\_s*ィ\)',
+      \ '(' : '[（〔【『［(]',
+      \ ')' : '[】』）］)]',
+      \ '*' : '[＊×※\*]',
+      \ '+' : '[±┿╋＋┼╂+]',
+      \ ',' : '[，、,]',
+      \ '-' : '\%([ｰ┫┤÷―−━ー‐〜─-]\|マ\_s*イ\_s*ナ\_s*ス\| \_s*…\_s* \)',
+      \ '.' : '\%([‥。．・…\.]\|ド\_s*ッ\_s*ト\_s*\%(ネ\_s*ッ\_s*ト\|コ\_s*ム\)\)',
+      \ '/' : '\%([≠÷／\/]\|s\_s*l\_s*a\_s*s\_s*h\_s*d\_s*o\_s*t\|ス\_s*ラ\_s*\%(ド\|ッ\_s*シ\_s*ュ\_s*ド\_s*ッ\_s*ト\)\)',
+      \ '0' : '\%([〇０零0]\|ゼ\_s*ロ\|z\_s*e\_s*r\_s*o\)',
+      \ '1' : '\%([十百千GMKhYZEPTnμmcyzdafp壱弌壹一１1]\|シ\_s*ッ\_s*ク\_s*ス\_s*テ\_s*ィ\_s*ー\_s*ン\|s\_s*\%(e\_s*v\_s*e\_s*n\_s*t\_s*e\_s*e\_s*n\|i\_s*x\_s*t\_s*e\_s*e\_s*n\)\|ト\_s*ウ\_s*ェ\_s*ル\_s*[ブヴ]\|イ\_s*レ\_s*\%(ブ\_s*ン\|ヴ\_s*ン\)\|ハ\_s*ン\_s*ド\_s*レ\_s*ッ\_s*ド\|サ\_s*\%(ー\_s*テ\_s*ィ\_s*ー\_s*ン\|ウ\_s*ザ\_s*ン\_s*ド\)\|g\_s*i\_s*g\_s*a\|ギ\_s*ガ\|メ\_s*ガ\|k\_s*i\_s*l\_s*o\|キ\_s*ロ\|ヘ\_s*ク\_s*ト\|e\_s*\%(i\_s*g\_s*h\_s*t\_s*e\_s*e\_s*n\|l\_s*e\_s*v\_s*e\_s*n\|x\_s*a\)\|エ\_s*\%(イ\_s*テ\_s*ィ\_s*ー\_s*ン\|ク\_s*サ\)\|ペ\_s*タ\|t\_s*\%(w\_s*e\_s*l\_s*v\_s*e\|h\_s*\%(i\_s*r\_s*t\_s*e\_s*e\_s*n\|o\_s*u\_s*s\_s*a\_s*n\_s*d\)\|e\_s*\%(n\|r\_s*a\)\)\|テ\_s*[ンラ]\|ナ\_s*\%(ノ\|イ\_s*ン\_s*テ\_s*ィ\_s*ー\_s*ン\)\|マ\_s*イ\_s*ク\_s*ロ\|ミ\_s*\%(リ\|ク\_s*ロ\)\|セ\_s*\%(ヴ\_s*ン\_s*テ\_s*ィ\_s*ー\_s*ン\|ブ\_s*ン\_s*テ\_s*ィ\_s*ー\_s*ン\|ン\_s*チ\)\|ヨ\_s*\%(タ\|ク\_s*ト\)\|ゼ\_s*\%(タ\|プ\_s*ト\)\|デ\_s*[カシ]\|ア\_s*ト\|ピ\_s*コ\|フ\_s*\%(ィ\_s*フ\_s*テ\_s*ィ\_s*ー\_s*ン\|ォ\_s*ー\_s*テ\_s*ィ\_s*ー\_s*ン\|ェ\_s*ム\_s*ト\|ァ\_s*ー\_s*ス\_s*ト\)\|ワ\_s*ン\|o\_s*n\_s*e\)',
+      \ '2' : '\%([弍２二2]\|ト\_s*ウ\_s*ェ\_s*ン\_s*テ\_s*ィ\|セ\_s*カ\_s*ン\_s*ド\|t\_s*w\_s*\%(o\|e\_s*n\_s*t\_s*y\)\|ツ\_s*ー\)',
+      \ '3' : '\%([三３3]\|・\_s*・\_s*・\|★\_s* \_s*★\_s* \_s*★\|サ\_s*ー\_s*\%(ド\|テ\_s*ィ\)\|ス\_s*リ\_s*ー\|t\_s*h\_s*\%(i\_s*r\_s*t\_s*y\|r\_s*e\_s*e\)\)',
+      \ '4' : '\%([四４4]\|f\_s*o\_s*u\_s*r\|フ\_s*ォ\_s*ー\)',
+      \ '5' : '\%([５五5]\|f\_s*i\_s*\%(f\_s*t\_s*y\|v\_s*e\)\|フ\_s*\%(ィ\_s*フ\_s*\%(ス\|テ\_s*ィ\)\|ァ\_s*イ\_s*ブ\)\)',
+      \ '6' : '\%([六６6]\|s\_s*i\_s*x\|シ\_s*ッ\_s*ク\_s*ス\)',
+      \ '7' : '\%([７七7]\|セ\_s*ブ\_s*ン\|s\_s*e\_s*v\_s*e\_s*n\)',
+      \ '8' : '\%([８八8]\|エ\_s*イ\_s*\%([スト]\|テ\_s*ィ\)\|e\_s*i\_s*g\_s*h\_s*t\)',
+      \ '9' : '\%([九９9]\|ナ\_s*イ\_s*ン\|n\_s*i\_s*n\_s*e\)',
+      \ ':' : '[≒÷…：:]',
+      \ ';' : '[；;]',
+      \ '<' : '[＜<]',
+      \ '=' : '[〒≒≠〓≡＝=]',
+      \ '>' : '[＞>]',
+      \ '?' : '[？?]',
+      \ '@' : '[＠@]',
+      \ 'A' : '\%([ｱ餅母渉閔恤憐慌遽鰒蚫鮑袷淡∃主衽歩袵垤蟻麁凡塔蘭露著表霰非抗諍検革更改現競爭争洗殿鉱豫予粗嵐禮殺彪恠妖絢怪綺肖彩漢過謝謬誤礼操綾飴菴黯罨鱇鮟餡闇行按諳晏鞍暗鶩鬚鰓顎喘発肋豈嫂兄崇騰県購贖网罔與咫鼎中新邊邉辺恰頭価價値游遊畔畦堋杏梓与衵袙憬孔坑案侮窖強貴讎讐徒仇痣黶欺鮮糾字嘲薊姐姉曙炮焙炙蜚薹膏脂油危鐙虻泡蹟能痕踪跡東預輯蒐乢纂遏聚軋誂羹壓惇集陸敦暑淳篤熱扱暖温遖斡私圧焦汗央奥桜櫻媼奧塰蜑餘周遍普剰蔗余尼雨甘天押凹楝樗溢艶鰺庵網戯簣鯵味軛渥堊圷憧欠踵幄握芥齷厚蜊漁鯏蕣淺麻浅龝煥晢晰呆亮晄聡亨朖璋啓昜輝顯旭光陽洸鑑滉昿曠諦朗哲顕晶彬賈章商穐晃彰晧昭秋欸埃瞹阨穢噫姶文隘粟曖鮎藹饗靉挨間相哀葭趾晨朝愛跛蹇跫脚蘆葦芦桎鐐足赫淦燈赧紅旃朱茜藜銅赭曉閼暁垢皸皹證絳灯暴証赤扇呷黝榮碧葵蒼煽仰青穴併宛亞痾明逢吾悪婀在遭該飫褪浴荒揚編和會椏合襾安挙或當哇有開厭唖韲阿嗚当娃敢倦彼惡遇飽充上擧あ藍金＠∧＆∩論&∠銀会∀域空→←↓⇒↑⇔⌒後Ц亜米¨´｀＾’≒〜ＡÅаαАアΑA]\|厦\_s*門\|廈\_s*門\|沫\_s*雪\|食\_s*蟻\_s*獣\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|浣\_s*熊\|菖\_s*蒲\|豆\_s*汁\|蛙\_s*鳴\_s*蝉\_s*噪\|塩\_s*梅\|家\_s*鴨\|趺\_s*坐\|Z\_s*\%(n\|i\_s*n\_s*c\)\|浮\_s*子\|痘\_s*痕\|窪\_s*地\|醤\_s*蝦\|糠\_s*蝦\|信\_s*天\_s*翁\|左\_s*沢\|雅\_s*典\|校\_s*倉\|小\_s*豆\|四\_s*阿\|鴉\_s*\%(片\|鷺\_s*合\_s*戦\_s*物\_s*語\)\|綽\_s*名\|渾\_s*名\|化\_s*野\|翌\_s*檜\|飛\_s*[魚鳥]\|総\_s*角\|通\_s*草\|木\_s*通\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|花\_s*鶏\|我\_s*\%(妻\|孫\_s*子\)\|数\_s*多\|奄\_s*美\|灰\_s*汁\|a\_s*\%(t\_s*t\_s*o\|c\_s*c\_s*e\_s*n\_s*t\)\|胡\_s*[座坐床葱]\|日\_s*明\|碩\_s*宏\|祥\_s*[仁彦]\|蜻\_s*蛉\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|生\_s*憎\|匕\_s*首\|英\_s*\%([保田]\|虞\_s*湾\|賀\_s*保\)\|靄\_s*[靄々]\|Ｉ\_s*\%(Ｐ\_s*電\_s*話\|Ｃ\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(電\_s*話\|ア\_s*ド\_s*レ\_s*ス\)\|D\_s*カ\_s*ー\_s*ド\|C\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|走\_s*目\|鹹\_s*草\|馬\_s*酔\_s*木\|海\_s*[豹女士人部驢]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|褐\_s*毛\_s*和\_s*種\|石\_s*蓴\|白\_s*馬\|水\_s*[馬黽綿]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|ト\_s*リ\_s*プ\_s*ル\_s*A\| \_s*ア\_s*ク\_s*シ\_s*ア\_s*ム\|公\_s*理\|砒\_s*素\|ヒ\_s*素\|京\_s*都\_s*高\_s*度\_s*技\_s*術\_s*研\_s*究\_s*所\|代\_s*入\|遺\_s*産\|抽\_s*象\|G\_s*o\_s*l\_s*d\|自\_s*動\_s*\%(現\_s*金\_s*取\_s*り\_s*扱\_s*い\_s*機\|預\_s*貯\_s*金\_s*機\)\|属\_s*性\|何\_s*か\|か\_s*つ\|お\_s*よ\_s*び\|セ\_s*ン\_s*ト\_s*キ\_s*ッ\_s*ツ\_s*ネ\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|利\_s*用\_s*可\_s*能\|使\_s*用\_s*可\_s*能\|算\_s*法\|割\_s*り\_s*当\_s*て\|オ\_s*\%(レ\|ギ\_s*ュ\_s*ス\_s*タ\_s*ン\|ド\_s*レ\_s*イ\|ン\_s*グ\_s*ス\_s*ト\_s*ロ\_s*ー\_s*ム\|ル\_s*\%(ト\_s*キ\_s*ー\|タ\_s*\%([ーナ]\|ネ\_s*\%(ー\_s*ト\|イ\_s*ト\)\)\)\|ー\_s*\%([クガサトラル]\|ニ\_s*ン\_s*グ\|キ\_s*シ\_s*ン\|ブ\_s*リ\_s*ー\|バ\_s*ー\_s*ド\|ベ\_s*ル\_s*ジ\_s*ュ\|ギ\_s*ュ\_s*ス\_s*\%(ト\|タ\_s*ン\)\|ゾ\_s*ン\_s*ヌ\|ス\_s*\%(チ\_s*ン\|テ\_s*ィ\_s*ン\|タ\_s*ー\|ト\_s*\%(リ\_s*ア\|ラ\_s*リ\_s*ア\)\)\|ド\_s*リ\_s*ー\|ジ\_s*\%([ェー]\|オ\_s*ロ\_s*ジ\)\|デ\_s*ィ\_s*\%(オ\|エ\_s*ン\_s*ス\|シ\_s*ョ\_s*ン\|ト\_s*リ\_s*ア\_s*ム\)\|タ\_s*ム\|ソ\_s*\%(リ\_s*テ\_s*ィ\|ラ\_s*イ\_s*ズ\)\|セ\_s*ン\_s*テ\_s*ィ\_s*ッ\_s*ク\|ロ\_s*ラ\)\)\|配\_s*列\|バ\_s*イ\_s*ト\|ハ\_s*ル\_s*マ\_s*ゲ\_s*ド\_s*ン\|引\_s*数\|人\_s*工\_s*\%(現\_s*実\_s*感\|知\_s*能\)\|イ\_s*\%(ー\_s*ジ\_s*ス\|オ\_s*ン\|ソ\_s*ッ\_s*プ\)\|マ\_s*ル\_s*ド\_s*ゥ\_s*ー\_s*ク\|紫\_s*\%(陽\_s*花\|水\_s*晶\|石\_s*英\)\|付\_s*録\|応\_s*用\|エ\_s*\%([ニメアーイ]\|ッ\_s*チ\|ン\_s*\%(ド\_s*ラ\_s*ン\|ジ\_s*ェ\_s*\%(ル\|リ\_s*ッ\_s*ク\)\|ゼ\_s*ル\)\|リ\_s*ア\|オ\_s*リ\_s*ア\|ス\_s*テ\|プ\_s*ロ\_s*ン\)\)',
+      \ 'B' : '\%([鯔鰡堀本凡盆煩梵骨凹歿鈕釦沒渤没睦穆樸目濮攵攴朴木僕墨卜牧星黽蠎髦罔袤鋩氓瑁虻卯茆貌謗网旄抱甍儚胞蟒肪旁鵬牟眸冐鉾蒡榜懋乏惘妨帽昴忙剖冒忘茅膀妄厖尨膨貿防紡滂茫望亡傍某謀乾牡掘姆保慕簿惚模戊墓拇菩謨暮呆干暈姥褒彫坊募誉母ぼ覓幎汨冖羃巾冪紅韈瞥鼈蔑塀汳采抃辯辧卞辨湎宀遍瓣辮眄冕勉娩弁可辺邉邊べ船房笛鞭渊斑淵縁渕樗椈太袋深蓋葢盖豚節勿佛物震勃蚋風鰤馼蚊聞文錻葡侮葺蒲憮舞撲撫廡毋無嘸誣悔奉吹蕪撃部伏打振武歩拭分不ぶ米謐人匹浸額鐚跛！広開繆別謬緡泯罎岷梹旻紊檳頻壜愍瓶鬢閔憫敏貧便闢百辟帛白杪緲猫票憑″鋲屏眇渺平錨苗秒描廟病琵弾未比眉毘尾靡瀰寐微糜媚備引麋美濔弭火枇縻嵋贔日糒び早速林針尿拂腹散払祓原幡悗蠻塙旛鑁旙鷭挽判棒絆版輓蕃板播礬阪坂磐番盤晩萬蛮万箱蠅芒挟伴桴鉢枹蜂撥働畑畠屎糞端花鼻離話V魅許秤拔魃罸筏閥走橋箸柱藐貘寞獏暴漠瀑麥縛博駁莫驀爆杯唄霾賣狽吠楳苺憊培煤黴貝焙賠買売陪倍梅媒跋伐末幕曝抜罰場貼馬刄芭化葉庭羽張這塲罵刃晴歯馳婆ば“仏■□⊥底下×−‖｜＼∵麦ボバ］［｝｛ＢブビΒБбβベB]\|ｯ\_s*\%(ﾎ\_s*ﾞ\|ﾍ\_s*ﾞ\|ﾌ\_s*ﾞ\|ﾋ\_s*ﾞ\|ﾊ\_s*ﾞ\)\|ッ\_s*[ボベブビバ]\|っ\_s*[ぼべぶびば]\|ﾎ\_s*ﾞ\|小\_s*火\|襤\_s*褸\|孟\_s*買\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|南\_s*瓜\|耄\_s*耋\|孑\_s*孑\|包\_s*丁\|ﾍ\_s*ﾞ\|袂\_s*別\|箆\_s*棒\|篦\_s*棒\|胼\_s*胝\|ﾌ\_s*ﾞ\|補\_s*任\|毒\_s*島\|醜\_s*[女男]\|山\_s*毛\_s*欅\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|布\_s*団\|茯\_s*苓\|Ｖ\_s*\%(字\|ネ\_s*ッ\_s*ク\|シ\_s*ネ\_s*マ\)\|附\_s*子\|付\_s*子\|鞦\_s*韆\|豊\_s*[前後]\|ﾋ\_s*ﾞ\|魚\_s*[籠篭]\|b\_s*i\_s*o\_s*t\_s*o\_s*p\_s*e\|彌\_s*縫\|弥\_s*[漫縫]\|吃\_s*驚\|天\_s*鵞\_s*絨\|緬\_s*甸\|賓\_s*頭\_s*盧\|編\_s*木\|柏\_s*槙\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|兵\_s*[衛法]\|拍\_s*[板子]\|表\_s*紙\|ﾊ\_s*ﾞ\|囃\_s*子\|巴\_s*爾\_s*幹\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|薔\_s*薇\|蟠\_s*踞\|鈑\_s*金\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|発\_s*条\|祖\_s*母\_s*さ\_s*ん\|梯\_s*子\|伯\_s*\%([林労楽]\|剌\_s*西\_s*爾\)\|莪\_s*原\|飛\_s*[車蝗]\|蝗\_s*虫\|掲\_s*示\_s*板\|プ\_s*ル\_s*コ\_s*ギ\|作\_s*業\_s*域\|オ\_s*ー\_s*ト\_s*バ\_s*イ\|基\_s*[礎底]\|フ\_s*ァ\_s*ゴ\_s*ッ\_s*ト\|背\_s*景\|北\_s*京\|ペ\_s*\%(キ\_s*ン\|テ\_s*ル\_s*ギ\_s*ウ\_s*ス\)\|臭\_s*素\|イ\_s*ギ\_s*リ\_s*ス\|硼\_s*素\|ホ\_s*ウ\_s*素\)',
+      \ 'C' : '\%([ｺ恐怖惟怺※米暦轉頃悃鶤獻艮鯤很袞坤壼琿狠建棍魂蒟菎滾梱溷献痕渾墾恨懇根杪王挙泥裔樸鞐熟枹醴蛩徑蹊径溢毀零錯苔拒亊箏斷判諺理断盡尽辞琴言異事今壽寿鯒冀希礫鯉拱齣狛細腓昆拳瘤鮗兄近谺応應答爰是凩惚榾兀忽輿甑腰拵拗鐺鏝桁杲磽絖昊耗闔狎靠冓汞湟塙慌嫦效頁礦冦淆遘仰昴誥鬨鴿鏗浤哮砿伉烋熕洽訌閧困鮫逅糠槹哽盍稾亙壙覯隍遑洸餃惶寇鵁皋黌椌扣晄矼肓頏蛤呷詬匣昿皐崗肱徨峇袷敲爻藁倥釦棡凰犒吭窖畊岡猴胱絋傚啌蚣缸紘湊搆閤峺羔鍠幌鱇扛肴恆紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘后蝗酵嚆犢稿亢哄睾梗慷笄郊効岬肛項巷鑛洪佼狡叩昂勾喉晃滉糀晧剛曠宏控恍侯皓港膏耿皎坑煌向江膠虹巧鴻鉱興衡浩厚耕弘綱抗購講恒薨溝鋼航孝更校行肯光皇好荒高梏谷哭槲尅釛斛轂詰棘告刻酷穀踰懲蝴鴣袴觚虍粐乎沽餬胯菰瞽楜娘壺錮込葫⌒虚兒杞估冴漕痩虎冱倒戸呱媚粉夸詁木鈷捏濃故濾箍漉黄恋拠誇壷放転鼓股罟女己乕琥跨滬越古去糊滸扈瑚皷混怙弧辜戀蠱超児雇孤湖瓠蛄凅肥こｾ芹鬩槧羶甎揃倩翦箋燹濺苫栫槫孱孅簽吮纖湶纎亘筌蟾磚荐茜斬綫箭舩喘錢專僊贍鐫仟旃痊涎銛饌僣韆沾刋擶薦舛牋阡濳癬筅殱殲闡賎餞羨顫甅竰糎陝銓踐閃∨潺遷銑栴剪煽譫僉瞻践栓跣疝詮銭穿尠戰腺繊僭泉嬋淺仙擅鮮専扇浅蘚船線撰宣洗選煎戦尖先忙伜倅逼狹狭蝉旋洩椄§卩渫絏鱈泄攝啜紲緤薛刹褻浙竊截窃殺説拙摂節切蹐績蹠蓆籍跡跖晰威螫迹瘠勣裼晢夕鶺雪寂∫∬碩惜析席隻情甥躋貰淒婿嘶醒睛擠撕牲萋菁犀韲瀞穽齏筬晟齊歳栖棲掣腥逝惺斉臍旌悽整凄靖製晴急世堰攻脊丗迫勢畆糶塞瀬畝せｸ配椪栩櫪檪椡椚箜櫟含纐婚糞癖潛潜鵠凹窪縊跟軛頚珞頸諄窟鞋履狐轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬楠誓梳串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖ξΞ茸菌楔草圀邦國国嗽漱吻劫刧腔φ粂皹勳熏裙醺桾皸崑燻訓勲葷君委钁企咥銜桑某暝峅眛昏冥鮓比闇位鞍藏暗倉廚厨涅〃仝ヽゞヾ々ゝ公曇雲蜘佝栗狂包胡俥梍枢畔鐵★玄黒玖供苦九枸鳩煦狗来徠吼工絎駒朽眩垢口窶区劬繰呉宮暮貢久嶇來奇９庫惧組衢紅句吁懼區桍孔怐瞿汲くｼ埀謐Σσ蕋蘂蕊痺褥茵鵐蔀鷸鴫入責霑蔵嶌了縞嶋島凋搾澀澁渋縛暫屡柴荵凌鎬忍慕簧舖↓襪認从從．舌扱罔θ虐Θ粃秕椎椣貎尿肉臠猪衣榻黙蜆恵楙誠茂成繁鋪惻陣頻閾櫁樒汐鹽潮隰瑟嫉櫛蛭蟋疾隲悉漆躾膝失室沒鎭沈滴雫賤鎮靜静顰尓爾聢乍然併■□◇◆倖幸貭叱征質柵卯滋撓品鬼錣鍜錏凝痼而拉設垂萎栞襞吝咳什導汁徴験著記印☆〇銀城報調蝨虱白濕湿標七僕笞楚霜臀退斥後尻寫卸者炙冩柘舍砂＃♯暹諜喋煮這西娑沙謝紗鯱奢赦洒捨鮭瀉炸抉決皙勺釋蜥爍鑠妁斫蹟刳昔芍酌爵折癪笏赤綽灼杓石尺赭写鷓積遮舎車射斜釈社蛛麈諏洙殳娶娵鬚侏銖繻菽叔俶戚蓿倏蹙肅淑夙粛宿縮珠殊趣恤蟀卆出繍楢葺溲泅酬逎遒緝岫螽萩鷲甃駲楸穐蹤讎售讐洲綉收驟囚舅姑蓚皺鞦銹脩輯醜習羞酋聚舟秀祝袖拾啾蒐収執衆愁就臭蹴週終褶州宗集秋椶棕朱撞種修周手酒首須儁皴悛濬惷蕣雋墫順蠢舜旬浚竣峻駿逡筍瞬俊嗔蓁縉蔘鷏忱甄鷆寢岑畛矧疹槙齔臻娠譛譖哂脣袗怎晉瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵薪晨辰震宸森伸愼眞慎寝晋進審深親臣鍼申心宍信真新藷墅薯杵岨胥蜍黍渚砠處嶼狙苜苴曙背緒雎蔗庶処署所暑誚篠聲橡奬觴舂囁蛸懾燮厰錆獎枩稍甞韶炒淞陞顳咲腫井摺嶂橸浹愴星升鍬樅簫慯廂霎庠剿筱鬆秤鯖政訟廠樵鷦邵愀妝璋湫艢劭峭殤梢將敞醤青慫従逍倡竦爿薔笙樟装肖菖＜≦湘誦聳檣稱声裳蒋蕉嘯慴盛精霄清鈔粧彰悚鏘悄蕭哨瀟焦憔匠鍾償鞘瘴漿頌詔妾沼請薑唱庄渉障奨牀娼床椒荘抄聖宵傷性生相召銷賞猩症昭燒猖昌少憧紹晶祥尚承證将焼笑照招消章詳証硝掌商昇小觸穡屬稷嗇禝寔稙昃謖軾矚拭属燭贖囑嘱織蝕式喰蜀殖初諸触埴植食職砥姉摯誣侈髭肆仔及岐址梔咫刺贄沚旨誌資豕鷙凍厮粢齒雌耜枝齎領篩四嗤貲諮巵止死強仕熾市師指厶妛諡祗閇姿駟嗜衰偲嗣趾此染締詞茲釶〆覗弛士徙至嘴駛屎占啻之揣如知錙糸絞孜尸獅瓷緊笥始泗咨觜只匙輜廝使敷恃思痴漬脂氏蚩時紫沁俟絲巳祉矢恣若賜次浸詩志識司弑笶翅謚示梓伺視緇自祠史試私痣滲茨肢歯幟祀施竢舐卮耆呰芝阯しｶ癢糜粥痒麹輕骨業軽鰈鰔餉通龜瓶甕亀鳫獵鴈殯K猟雁釀鳬鳧髢氈鴨巛側躱廁厠磧瓦獺翡為皮裘→紮〜搦苧碓柄躯躰軆體身体鴉犂烏絡空唐榧茅澗鸛厂蒄啣卷淦扞杆骭歛瞰讙奐戡豢坎瀚皖稈鐶拑酣陷繝嫺驩篏樌莟勸捍撼澣盥羹嫻鑵寰丱康懽憾羮揀歡潤罕觀橄涵渙堪覡巫鉋随萱簪舘艱咸翰柬駻悍燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹緘款桓箝諫諌轗坩旱侃鰥　館莞橇韓患灌勧菅奸刊柑肝看桿寒緩干嵌廣広竿貫巻敢漢環喊陥監喚甘間歓閑寛管慣完汗艦乾幹官観壁椛屍姓庇鞄芳蔓千鯑一勘蜻⊃影陰蔭景＊棧梯筧庚辛柧門廉乞癩Κ川κ合’）《‘”｛〈“｝》〉囓柁鮖悴舵鰍梶錺餝飾篭籠歸孵卻皈還省顧楓槭却帰反返守帋督祇髮韮主裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀象模仇固硬傍難容忝辱頑形旁方型肩風滓翳微幽掠緕纃綛絣擦糟鎹粕春戞猾曷剋黠瞎鞨恰∧濶蠍筈蝎羯喝轄餓蛞聒劼擔刮蘰鬘桂闊括嘗捷豁渇担滑松堅鰹功割戛活疽暈鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿掲關罹抱踵嬶嚊拘関係顏貌郁薫顔母感釡罐窰鴎框叺喧竃竈窯釜缶蒲鎌數数槝栢膳傅畏賢橿姦樫爨炊圍喞託囲鈎「『鉤」』限鍵傾（禿蕪鏑頭齧被兜哉適敵必要称彜彝鬲鼎叶片哀愛悲鋺蛇鉄蜩神奏金楫裹磆餅徒褐粮糧茖椁覺幗槨貉擴壑隱愨寉殼癨嚇穫咯膕骼膈∠掴狢埆蠖覈霍礁恪擱匿撹攪喀廓較郭〕【［】］〔殻挌劃閣格隠覚矍革馘鶴攫核獲拡客隔角確廨囘隗嵬觧榿蠏匯徊迴壞褂獪丐械枴畍誨揩醢誡夬懈喙椢恠峡价櫂茴蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧皆界疥魁偕改繪貝胛絵快甲灰槐晦懐介塊解廻回階戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡柯噛箇上苛暇蚊廈易嘩ヵ描苅枯佳彼兼哥缺霞藉架啝下渦踝堝闕華嗄荷馨刈假夥河科個蝸迦軻咼黴舸繋書賀夏萪支卦掛掻蝦痂謌渮歌過香禾狩買變家枷克駈花賈畫珂呵替代訶袈咬画顆貸價淅飼和ヶ果糅厦課可醸葭勝仮搗嘉墟嗅譌日斯禍換窩苟貨蝌価懸欠化罅伽賭翔靴且嚼訛何駆驅个嫁譁借跏戈稼寡涸耶崋鹿笳火茄菓遐舁か・…塩閉倶錫呼∩取籐加交ФГДАжБъйдзьЖНкёЗрЭцУТвСЮюЪЯЁЛИноыбВмМХЬЕэаепПКЩсШщяхЫштОРилгуЙф♪╂┼×╋┿◎○●銅∪χΧ子Чч株Ц珈、，色ク衝競構簡制≡変接カ┏┓└┌┛┘┗┐正コシセＣ℃¢C]\|ｯ\_s*[ｺｾｸｼｶ]\|ッ\_s*[コセクシカ]\|っ\_s*[子こせくしか]\|焜\_s*炉\|嫡\_s*妻\|二\_s*合\_s*半\|牛\_s*尾\_s*魚\|巨\_s*勢\|独\_s*楽\|居\_s*士\|特\_s*牛\|粫\_s*門\|甦\_s*生\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|傴\_s*僂\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|懺\_s*法\|前\_s*[妻栽]\|妹\_s*尾\|嘲\_s*笑\|儕\_s*輩\|斎\_s*次\|済\_s*[民済々]\|蒸\_s*[篭籠]\|救\_s*世\|莎\_s*草\|百\_s*[濟済]\|恭\_s*敬\|9\_s*[日月]\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|探\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|老\_s*舗\|望\_s*潮\|健\_s*か\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|卓\_s*袱\|桎\_s*梏\|柳\_s*葉\_s*魚\|汚\_s*点\|蠹\_s*魚\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|云\_s*[云々]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|７\_s*月\|7\_s*月\|文\_s*月\|４\_s*[分月]\|4\_s*月\|竹\_s*[篦刀]\|羊\_s*[齒歯]\|爲\_s*\%([留難置果送極手兼合業]\|ん\_s*方\|來\_s*り\|納\_s*め\)\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|素\_s*[魚人面]\|不\_s*[忍知]\|注\_s*連\|軍\_s*鶏\|髑\_s*髏\|三\_s*\%(味\|鞭\_s*酒\)\|吃\_s*逆\|差\_s*[別異]\|叉\_s*手\|輸\_s*[出贏]\|卒\_s*去\|B\_s*r\|隼\_s*[朗郎]\|笋\_s*[干羹]\|参\_s*差\|財\_s*産\|枌\_s*所\|縦\_s*容\|睫\_s*毛\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|連\_s*枷\|枳\_s*殻\|機\_s*関\|落\_s*葉\_s*松\|凵\_s*繞\|檻\_s*車\|顴\_s*骨\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|山\_s*\%(海\_s*経\|梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|破\_s*片\|脚\_s*気\|旗\_s*魚\|鍛\_s*[治冶]\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|長\_s*[月官]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*[沫白]\|曽\_s*て\|曾\_s*て\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|螳\_s*螂\|蟷\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|瑕\_s*[瑾疵]\|東\_s*\%([風雲]\|海\_s*林\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|気\_s*[質触]\|(\_s*株\_s*)\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|契\_s*経\|中\_s*央\_s*処\_s*理\_s*装\_s*置\|伊\_s*藤\_s*忠\_s*テ\_s*ク\_s*ノ\_s*サ\_s*イ\_s*エ\_s*ン\_s*ス\|分\_s*類\|ス\_s*リ\_s*ー\_s*ズ\|範\_s*疇\|ト\_s*ラ\_s*ン\_s*プ\|c\_s*\%(e\_s*n\_s*t\_s*i\|r\_s*e\_s*s\_s*c\)\|水\_s*[鶏母手夫晶]\|複\_s*雑\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|サ\_s*\%(ン\_s*チ\_s*ー\_s*ム\|エ\_s*ラ\|イ\_s*\%(ト\_s*カ\_s*イ\_s*ン\|ラ\_s*ス\|ク\_s*\%([ルロ]\|リ\_s*\%(ン\|ッ\_s*ク\)\)\|ボ\_s*\%(ウ\_s*ズ\|ー\_s*グ\)\|バ\_s*\%(ー\|ネ\_s*テ\_s*ィ\_s*\%(ッ\_s*ク\|ク\_s*ス\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ダ\_s*ー\|フ\_s*ァ\_s*ー\|ネ\_s*リ\_s*ア\)\|ー\_s*\%(テ\_s*ィ\_s*フ\_s*ィ\_s*ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|ク\_s*ル\|カ\_s*\%(ス\|ム\_s*ス\_s*ク\_s*\%(ラ\_s*イ\_s*ブ\|リ\_s*プ\_s*シ\_s*ョ\_s*ン\)\)\|キ\_s*\%(ュ\_s*\%(ラ\_s*ー\|レ\_s*ー\_s*\%(タ\_s*ー\|シ\_s*ョ\_s*ン\)\)\|ッ\_s*ト\)\)\)\|マ\_s*ド\_s*ラ\_s*ス\|茶\_s*筅\|ケ\_s*\%([月アイ]\|フ\_s*ェ\_s*ウ\_s*ス\|プ\_s*ス\_s*ト\_s*ラ\_s*[ムル]\|チ\_s*ャ\_s*ッ\_s*プ\|ン\_s*\%(タ\_s*ウ\_s*\%(リ\|ロ\_s*ス\)\|ブ\_s*リ\_s*ッ\_s*ジ\)\|ー\_s*\%([キジブプスン]\|ク\_s*ウ\_s*ォ\_s*ー\_s*ク\|ソ\_s*ン\|タ\_s*リ\_s*ン\_s*グ\|パ\_s*\%(ー\|ビ\_s*リ\_s*テ\_s*ィ\)\|シ\_s*ン\_s*グ\|リ\_s*ー\)\|ル\_s*\%(ト\|ベ\_s*ロ\_s*ス\|テ\_s*ィ\_s*ッ\_s*ク\|ビ\_s*\%(ム\|ー\_s*ニ\)\)\|ミ\_s*\%(カ\_s*ル\|ス\_s*ト\)\)\|キ\_s*\%(ヤ\_s*ノ\_s*ン\|プ\_s*ロ\_s*ス\|ケ\_s*ロ\|ュ\_s*\%([イーア]\|ヴ\_s*ェ\|ビ\_s*\%(ズ\_s*ム\|ス\_s*ム\)\|ロ\_s*\%(ス\|ッ\_s*ト\)\|レ\_s*ー\_s*タ\_s*ー\|ラ\_s*ソ\_s*ー\|リ\_s*\%(ー\|ウ\_s*ム\|ア\_s*ス\|オ\_s*シ\_s*テ\_s*ィ\)\)\|ア\_s*\%(ラ\|ー\_s*ラ\|ン\_s*テ\_s*ィ\)\|チ\_s*ン\|ト\_s*サ\_s*ン\|メ\_s*ラ\|マ\_s*イ\_s*ラ\|ッ\_s*カ\|レ\_s*ー\_s*ト\|ャ\_s*\%([ドパスブンラ]\|デ\_s*\%(ィ\|ラ\_s*ッ\_s*ク\)\|ビ\_s*\%([アンネ]\|テ\_s*\%(ィ\|ー\_s*シ\_s*ョ\_s*ン\)\)\|ベ\_s*ツ\|バ\_s*\%(リ\_s*[エア]\|レ\_s*ー\)\|ト\_s*ル\|シ\_s*ー\|サ\_s*リ\_s*ン\|タ\_s*ピ\_s*ラ\|ピ\_s*\%(ト\_s*ル\|タ\_s*\%(ル\|リ\_s*ズ\_s*ム\)\)\|プ\_s*\%(ラ\|シ\_s*ョ\_s*ン\|テ\_s*ン\|チ\_s*ャ\)\|セ\_s*\%(イ\|ロ\_s*ー\_s*ル\)\|ッ\_s*\%([ツトチプ]\|サ\_s*バ\|ス\_s*ル\|シ\_s*\%(ュ\|ン\_s*グ\|ャ\_s*\%(ー\|ブ\_s*ル\)\)\)\|ニ\_s*\%(オ\_s*ン\|ス\_s*タ\_s*ー\)\|ナ\_s*ル\|ノ\_s*\%(ン\|ー\_s*ラ\|ピ\_s*ー\)\|ミ\_s*ソ\_s*ー\_s*ル\|メ\_s*\%(ル\|ロ\_s*\%(ン\|ッ\_s*ト\)\)\|ロ\_s*\%(ル\|ウ\_s*ェ\_s*イ\|リ\_s*ン\|ラ\_s*イ\_s*[ンナ]\|ッ\_s*ト\)\|レ\_s*ッ\_s*ト\|リ\_s*\%([コーア]\|バ\_s*ー\|ブ\_s*レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ッ\_s*ジ\|ン\_s*グ\)\|ズ\_s*ム\)\|リ\_s*\%(コ\|ス\_s*ト\|シ\_s*タ\_s*ン\)\)\|総\_s*角\|チ\_s*\%([タリンマア]\|ワ\_s*ワ\|ラ\_s*ー\|ル\_s*ド\|ム\_s*ニ\_s*ー\|コ\_s*リ\|ッ\_s*\%([プク]\|テ\_s*リ\_s*オ\|タ\_s*ゴ\_s*ン\)\|キ\_s*\%(ン\|ー\_s*タ\)\|ュ\_s*\%(ア\_s*ブ\_s*ル\|ー\_s*イ\_s*ン\_s*ガ\_s*ム\)\|ー\_s*\%([フトプクズ]\|パ\_s*ー\|タ\_s*ー\)\|ェ\_s*\%([ロスカコアン]\|ザ\_s*\%(レ\|ー\_s*レ\)\|ル\_s*\%(ニ\_s*ー\|シ\_s*ー\|ノ\_s*ブ\_s*イ\_s*リ\)\|リ\_s*\%(ー\|ス\_s*ト\|ッ\_s*シ\_s*ュ\|モ\_s*ヤ\)\|レ\_s*\%(ス\_s*タ\|ン\_s*コ\_s*フ\)\|ビ\_s*チ\_s*ェ\_s*フ\|ダ\_s*ー\|チ\_s*ェ\_s*ン\|ッ\_s*\%([トクカ]\|キ\_s*ン\_s*グ\)\|イ\_s*\%([スン]\|ニ\_s*ー\|サ\_s*ー\|シ\_s*ン\_s*グ\)\|ー\_s*\%(ン\|ザ\_s*レ\|ホ\_s*フ\)\)\|ャ\_s*\%([オフドインコリウ]\|ツ\_s*ネ\|ク\_s*ラ\|プ\_s*タ\_s*ー\|パ\_s*テ\_s*ィ\|ペ\_s*\%(ル\|ッ\_s*ク\)\|チ\_s*ャ\|ネ\_s*\%(ル\|ラ\_s*ー\|リ\_s*ン\_s*グ\)\|ッ\_s*\%([クト]\|ピ\_s*ー\|プ\_s*\%(マ\_s*ン\|リ\_s*ン\)\)\|タ\_s*\%(レ\_s*[イー]\|リ\_s*ン\_s*グ\)\|ル\_s*マ\_s*ー\_s*ス\|レ\_s*ン\_s*ジ\|モ\_s*ロ\|ー\_s*\%([チタトムジ]\|ビ\_s*ル\|ミ\_s*\%(ー\|ン\_s*グ\)\|リ\_s*ー\|ル\_s*\%([ズス]\|ト\_s*ン\)\)\|ラ\_s*ン\_s*ゴ\)\|ョ\_s*\%([ンコ]\|イ\_s*ス\|ム\_s*ス\_s*キ\_s*ー\|ー\_s*\%(ク\|サ\_s*ー\|カ\_s*ー\|キ\_s*ン\_s*グ\)\|ゴ\_s*リ\|ッ\_s*\%(プ\|ピ\_s*ー\|パ\_s*ー\)\|リ\_s*ソ\)\)\|座\_s*標\|喜\_s*劇\|互\_s*換\|共\_s*\%(通\|産\_s*主\_s*義\_s*者\)\|継\_s*続\|ツ\_s*\%(ァ\_s*ー\|ィ\_s*リ\_s*ル\|ェ\_s*\%(ー\|ル\_s*ニ\_s*ー\|ラ\_s*ン\)\)\|炭\_s*素\)',
+      \ 'D' : '\%([共吃巴錚鑼鶏鳥響嫩緞丼呑曇貪鈍肭遠蚌溝隣鄰塢床処所年時鯲鰍鰌讀得徳獨髑毒読僮萄鐃耨嫐橈儂撓陶働ゞ桐通閙藤々恫瞳憧鬧≡⇔慟撞導仝〃洞堂瞠獰艟胴銅童動同道堵戸奴退取呶解怒土駑留努録何止度弩融孥ど瓰竕凸竍籵瓧禰泥捏溺寺棯甸黏沺佃鈿畋淀澱臀傳殿電照でヅ鶴辛強妻綱勤伝筒包做造作尽机月塚遣冢疲使連付突積吊詰漬津図釣づヂ中近力痔持地ぢ種棚倒彩濃逹畳諾゛濁默球玉魂騙谷点館舘竹嶽岳高凧蛸怛妲獺奪脱梯餒迺岱廼戴弟臺平内醍橙］［題＞≧第台代大鱈頼便誰懶樽怠斷椴灘黙旦煖彈暖談段断檀団團壇弾男柁舵駄雫娜橢拏朶蛇墮拿佗垂沱溜懦楕炊鴕陀儺唾騨澑建荼立田惰抱陏駝打兌妥堕出だ直◎，丶、．\.‥・…＄”“↓†‡―┤達℃°独Ｄド÷◇◆ダジДдΔδデ∂D]\|ｯ\_s*\%(ﾄ\_s*ﾞ\|ﾃ\_s*ﾞ\|ﾂ\_s*ﾞ\|ﾁ\_s*ﾞ\|ﾀ\_s*ﾞ\)\|ッ\_s*[ドデヅヂダ]\|っ\_s*[どでづぢだ]\|ﾄ\_s*ﾞ\|都\_s*々\_s*逸\|褞\_s*袍\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|満\_s*天\_s*星\|豆\_s*腐\|如\_s*何\|ﾃ\_s*ﾞ\|刑\_s*事\|粘\_s*葉\_s*装\|手\_s*間\|木\_s*偶\|丁\_s*[稚抹]\|蝸\_s*牛\|ﾂ\_s*ﾞ\|頭\_s*[腦痛]\|ﾁ\_s*ﾞ\|調\_s*子\|茶\_s*碗\|知\_s*恵\|忸\_s*怩\|ﾀ\_s*ﾞ\|忠\_s*幸\|壁\_s*蝨\|伊\_s*達\|山\_s*車\|韃\_s*靼\|提\_s*婆\_s*達\_s*多\|太\_s*\%([刀宰鼓]\|平\_s*広\|上\_s*天\_s*皇\|政\_s*\%(官\|大\_s*臣\)\)\|乃\_s*[公毅]\|体\_s*操\|葮\_s*竹\|演\_s*\%(し\_s*物\|繹\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\)\|コ\_s*ロ\_s*ン\_s*ビ\_s*ア\|ズ\_s*\%(ロ\_s*ー\_s*ス\|ッ\_s*ク\)\|イ\_s*ル\_s*カ\|医\_s*者\|博\_s*士\|文\_s*書\|行\_s*列\_s*式\|発\_s*見\_s*す\_s*る\|ハ\_s*ー\_s*グ\|拒\_s*否\_s*さ\_s*れ\_s*た\|破\_s*壊\_s*\%(者\|す\_s*る\)\|消\_s*滅\_s*子\|記\_s*述\_s*子\|十\_s*進\_s*数\|ゼ\_s*ッ\_s*ケ\_s*ン\|復\_s*号\_s*化\|省\_s*略\|金\_s*剛\_s*石\|d\_s*\%(b\_s*m\_s*s\|e\_s*c\_s*\%([ia]\|r\_s*e\_s*s\)\|o\_s*u\_s*b\_s*l\_s*e\_s* \_s*i\_s*n\_s*c\_s*o\_s*m\_s*e\_s*,\_s* \_s*n\_s*o\_s* \_s*k\_s*i\_s*d\_s*s\|i\_s*m\)\|辞\_s*書\)',
+      \ 'E' : '\%([ｴ瘧腮偉鰓衿撰襟魘捐覃櫞湲檐薗篶￥渕鹽簷轅悁渊讌艷黶垣閼圜蜒爰掾媛鳶鴛焉宛嫣閻衍臙閹槐⌒援筵淹厭寃淵掩烟嚥圓沿宴蜿奄袁煙艶焔炎怨鉛園苑偃冤延婉遠堰燕演塩円縁刔刳抉猿狗描択鰕箙蛯蝦狄貊胡戎夷乢靨鉞戉粤咽噎桟悦閲謁亦繹伯懌掖蜴奕越役驛疫易益腋駅液咏瓔珱曵衡殪贏裔洩楹娃潁蠑瑩翳纓塋營頴瀛睿泳縊榮瑛暎曳盈郢影詠穎嬰鋭叡映営栄永枝会選衣依榎繪囘懷画絵衛會畫猥回恵獲惠慧衞荏重得餌江杖笑柄え━─┳┬┰┯┸┻┴┷фФ＝≡⇔∋∈РрмМН→英∃式！ηΗＥсСЛлεЭэエΕE]\|A\_s*\%([面判型級]\|V\_s*\%(機\_s*器\|女\_s*優\)\|B\_s*\%(型\|C\_s*順\)\)\|Ａ\_s*\%([面判型級]\|Ｖ\_s*\%(機\_s*器\|女\_s*優\)\|Ｂ\_s*型\)\|M\_s*サ\_s*イ\_s*ズ\|Ｍ\_s*サ\_s*イ\_s*ズ\|豪\_s*物\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\)\|L\_s*\%(サ\_s*イ\_s*ズ\|L\_s*\%(サ\_s*イ\_s*ズ\|教\_s*室\)\)\|羨\_s*道\|豌\_s*豆\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|似\_s*\%(非\|而\_s*非\)\|桧\_s*原\_s*湖\|烏\_s*帽\_s*子\|吉\_s*方\|胞\_s*衣\|淮\_s*南\_s*子\|埃\_s*及\|干\_s*支\|岐\_s*路\|支\_s*繞\|壊\_s*[疽死]\|葡\_s*萄\|蛭\_s*子\|愛\_s*\%([莉理媛]\|知\_s*川\)\|N\_s*極\|Ｎ\_s*\%([個極響]\|次\_s*元\|角\_s*形\|Ｈ\_s*Ｋ\_s*ホ\_s*ー\_s*ル\)\|斉\_s*魚\|兄\_s*鼓\|ヱ\_s*ス\_s*ビ\_s*ー\_s*食\_s*品\|S\_s*\%([式極]\|サ\_s*イ\_s*ズ\|N\_s*比\|F\_s*小\_s*説\)\|Ｓ\_s*\%([波字席極]\|サ\_s*イ\_s*ズ\|Ｎ\_s*比\|Ｆ\_s*小\_s*説\)\|穢\_s*[多土]\|Ｘ\_s*\%([軸脚線]\|染\_s*色\_s*体\)\|X\_s*\%([軸脚]\|O\_s*醤\|染\_s*色\_s*体\)\|海\_s*\%(老\|鷂\_s*魚\)\|帝\_s*都\_s*高\_s*速\_s*度\_s*交\_s*通\_s*営\_s*団\|ワ\_s*ー\_s*ク\_s*ス\_s*テ\_s*ー\_s*シ\_s*ョ\_s*ン\|欧\_s*\%(州\|羅\_s*巴\)\|歐\_s*\%(州\|羅\_s*巴\)\|ヨ\_s*ー\_s*ロ\_s*\%(ピ\_s*ア\_s*ン\|ッ\_s*パ\)\|ユ\_s*\%(ア\_s*ン\|ウ\_s*ロ\_s*ピ\_s*ウ\_s*ム\|リ\_s*イ\_s*カ\|ー\_s*\%(ロ\|ノ\_s*ス\|ニ\_s*ス\|ジ\_s*\%(ン\|ー\_s*ン\)\|ド\_s*ラ\|レ\_s*カ\|ラ\_s*\%(ス\|シ\_s*ア\)\|フ\_s*\%(ラ\_s*テ\_s*ス\|ォ\_s*\%(リ\_s*ア\|ニ\_s*ア\_s*ム\)\)\|ク\_s*リ\_s*ッ\_s*ド\|カ\_s*リ\)\)\|編\_s*集\|強\_s*調\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\|電\_s*子\_s*メ\_s*\%(ー\_s*ル\|イ\_s*ル\)\|発\_s*展\|評\_s*価\_s*す\_s*る\|符\_s*号\_s*化\|百\_s*科\_s*事\_s*典\|カ\_s*プ\_s*セ\_s*ル\_s*化\|オ\_s*\%(ー\|イ\_s*\%(ラ\_s*ー\|ゲ\_s*ン\)\)\|実\_s*行\|拡\_s*張\|例\_s*外\|感\_s*嘆\_s*符\|ア\_s*\%([ンイ]\|ニ\_s*ド\|ー\_s*\%([マスル]\|ウ\_s*ィ\_s*ン\|ラ\_s*ン\|ニ\_s*ー\|ネ\_s*ス\_s*ト\|ミ\_s*ン\|シ\_s*ー\|リ\_s*ー\)\)\|設\_s*立\|e\_s*\%(x\_s*a\|コ\_s*マ\_s*ー\_s*ス\|ラ\_s*ー\_s*ニ\_s*ン\_s*グ\)\|イ\_s*\%([ブヴアラー]\|ジ\_s*ェ\_s*ク\_s*ト\|フ\_s*ェ\_s*ク\_s*[トタ]\|コ\_s*\%(ー\_s*ル\|ラ\_s*イ\_s*[ズザ]\)\|プ\_s*シ\_s*ロ\_s*ン\|ミ\_s*ュ\_s*レ\_s*\%(ー\_s*[トタ]\|イ\_s*タ\)\|ベ\_s*ン\_s*\%(ト\|タ\_s*ー\)\|ノ\_s*ッ\_s*ク\|ネ\_s*ー\_s*ブ\_s*ル\|ギ\_s*リ\_s*ス\|ン\_s*グ\_s*\%(ラ\_s*ン\_s*ド\|リ\_s*ッ\_s*シ\_s*ュ\)\|ッ\_s*チ\|ヤ\_s*\%(ー\|リ\_s*ン\_s*グ\|フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|グ\_s*ジ\_s*\%(ッ\_s*ト\|ス\_s*ト\)\|ク\_s*\%(ス\|ア\_s*リ\_s*テ\_s*ィ\)\|ス\_s*フ\_s*ァ\_s*ハ\_s*ン\|リ\_s*[アヤ]\|レ\_s*\%(ー\_s*\%(ス\|ザ\_s*ー\|サ\_s*ー\)\|イ\_s*\%(ン\|ザ\_s*ー\|サ\_s*ー\)\|ブ\_s*ン\)\)\|ウ\_s*\%(ー\|ジ\_s*ェ\_s*ー\_s*ヌ\)\)',
+      \ 'F' : '\%([麓梺冬′枌賁汾濆吩刎氛雰糞褌忿墳吻紛焚扮分粉揮旧舊顫故震篩奮隹古衾襖贅燻筆鰒絃総惣總房閼鬱塞鞴章郁史艦簡札耽吭鰾笛文罧節苳蕗淦舩艙舷舟船肥太懷懐≧≪≠≫＜＞≦渊淵渕縁葢盖再弍蓋双藤鯊潭蒸鱶楓殕瘋封諷黻祓拂怫髴彿恚慍憤二払沸拒防茯蔔愎輹蝠箙腓⊇⊃膨脹嚢梟袋含⊆⊂袱覆輻腹幅復馥服副複福経俘麸賦麩蜉坿父附訃婦誣仆經舗咐符臥膚斧冨腑更俛觝怖腐斑踏深趺降畉譜履葺觸老敷歩布赴狂殖振夫苻噴罘伏匐賻風柎不巫蹈孵拭普芙郛埠鋪鯆付吹阜拊生桴溥榑扶俯触践負増傅鮒孚府芬呎ﾌ飜翻ふ鉄♀∀¶富⌒金仏佛偽誤Ｆ♭弗浮フΦфФφF]\|ｯ\_s*ﾌ\|ッ\_s*フ\|っ\_s*ふ\|鞦\_s*韆\|睾\_s*丸\|陰\_s*嚢\|乱\_s*吹\|相\_s*応\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|回\_s*回\_s*教\|書\_s*司\|図\_s*書\_s*寮\|海\_s*蘿\|補\_s*\%(任\|陀\_s*[洛落]\)\|頭\_s*垢\|雲\_s*脂\|鳧\_s*鐘\|款\_s*冬\|菜\_s*蕗\|蒲\_s*団\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|釜\_s*[中山]\|雙\_s*葉\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|２\_s*[人つ日]\|宿\_s*酔\|2\_s*\%([人つ日]\|通\_s*り\)\|○\_s*○\_s*○\|□\_s*□\_s*□\|△\_s*△\_s*△\|×\_s*×\_s*×\|帛\_s*紗\|河\_s*豚\|比\_s*律\_s*賓\|I\_s*r\_s*o\_s*n\|極\_s*東\_s*放\_s*送\|論\_s*理\_s*式\|形\_s*式\|ホ\_s*\%(ワ\_s*イ\_s*エ\|イ\_s*ル\|ル\_s*\%(マ\_s*\%(ン\_s*ト\|リ\_s*ン\)\|ム\_s*ア\_s*\%(ミ\_s*ド\|ル\_s*デ\_s*ヒ\_s*ド\)\)\)\|一\_s*杯\|機\_s*能\|関\_s*数\|汎\_s*関\_s*数\|修\_s*正\|ヒ\_s*\%(レ\|ュ\_s*ー\_s*[ズム]\)\|第\_s*1\_s*要\_s*素\|１\_s*\%(／\_s*ｆ\_s*ゆ\_s*ら\_s*ぎ\|ｓ\_s*ｔ\)\|失\_s*敗\|ハ\_s*\%(エ\|ン\_s*ブ\_s*ル\|ロ\_s*ン\)\|柔\_s*軟\_s*な\|周\_s*波\_s*数\|エ\_s*フ\|f\_s*\%(e\_s*m\_s*t\_s*o\|o\_s*\%(n\_s*t\_s*-\_s*f\_s*a\_s*m\_s*i\_s*l\_s*y\|r\_s*t\_s*e\)\)\)',
+      \ 'G' : '\%([頃殺米諢魂權艮勤権鮴好蓙応駒事琴亊若毎如鏝埖込塵氷声肥聲腰拵心戀恋石国獄刧盒熬軣嗷壕敖噛濠哈遨拷囂轟毫傲鼇郷劫≡号豪剛沍五瑚晤珸呉超児檎庫互娯吾午極越護5篌兒冴茣梧誤寤５碁醐伍子唔忤期炬齬牾悟蜈后後宕ご〓戟屐鬩隙郤檄闃鷁撃激劇貎黥皃麑倪霓囈猊迎鯨芸藝蘖囓齧彦軒痃愿呟广監芫舷眩源儼衒弦絃験言諺現限幻玄減原拐実觧偈睨夏解下蹴毛げ靴草腐種口薬糞癖胡萸茱串藕遇嵎宮寓隅偶黒栗鞍倉蔵位昏麕羣郡群軍苦周包車狂惧組虞具弘暮食壷愚狗倶颶壺禺麌ぐ衣君嫌裂際牛垠崟斤岑憖吟銀圉圄禦馭魚嶷閠玉漁曉痙繞澆尭御翹嶢堯蟯驍僥仰業暁凝行謔瘧虐逆祇気曦議伎僞巍祁羲決城切艤礒擬沂犠萓嶬誼偽蟻宜斬疑木妓義犧技魏着欺戯儀戲ぎ巛皮川革乾側通殻絡辛柄鴉烏嵒頷巖厳嚴貫阮鳫偐岸厂⊃贋龕強翫岩鴈丸雁玩癌元願眼巌含頑神上紙髮髪金鐘係皈歸肯帰返潟固方語刀難型形鰹歹垳顏顔蟇釜鎌窯蒲蟹笠重傘號垣樫頭月合斈諤鄂壑鍔齶樂學萼愕嶽咢鰐額岳顎楽学乂既崖崕磑亥葢剴礙垓劾漑愾盖啀涯睚艾駭皚該咳階孩芥碍害鎧街凱慨概蓋骸外訛我伽臥哦換変借駕駆鵝貸画衙替代畫呀牙蛾訝勝ヶ果賀書餓芽河雅峩狩莪買峨掛ケヵ娥鵞刈俄が≫＞Ｇ瓦≧ガゴΨβλΣΕΖΗΚΘοΤσνΠρΑκξιΝθμΜΩεΧδΞψΔπατΒΙυΦΥζΡφΟχΛηωギグгγΓゲГG]\|ｯ\_s*\%(ｺ\_s*ﾞ\|ｹ\_s*ﾞ\|ｸ\_s*ﾞ\|ｷ\_s*ﾞ\|ｶ\_s*ﾞ\)\|ッ\_s*[ゴゲグギガ]\|っ\_s*[ごげぐぎが]\|ｺ\_s*ﾞ\|小\_s*屋\|蒙\_s*御\_s*免\|巨\_s*頭\_s*鯨\|欣\_s*求\|独\_s*楽\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|瞽\_s*女\|歩\_s*行\_s*虫\|向\_s*拝\|皐\_s*月\|穀\_s*潰\|寄\_s*居\_s*虫\|降\_s*魔\|格\_s*\%([間縁]\|天\_s*井\)\|恒\_s*河\_s*沙\|江\_s*\%([津湖商州]\|談\_s*抄\)\|豆\_s*[油汁]\|ｹ\_s*ﾞ\|蚰\_s*蜒\|景\_s*色\|化\_s*粧\|鴃\_s*舌\|稽\_s*古\|懸\_s*魚\|還\_s*[向俗]\|拳\_s*[万固骨]\|喧\_s*嘩\|顕\_s*界\|ｸ\_s*ﾞ\|救\_s*世\_s*菩\_s*薩\|工\_s*合\|供\_s*[奉祭香進]\|紅\_s*蓮\|ｷ\_s*ﾞ\|毬\_s*杖\|岐\_s*\%([南阜]\|セ\_s*ン\)\|棋\_s*将\_s*谷\|求\_s*\%([法道肥]\|不\_s*得\_s*苦\|聞\_s*持\_s*法\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|希\_s*臘\|杏\_s*葉\|餃\_s*子\|刑\_s*部\|ｶ\_s*ﾞ\|搦\_s*み\|鑑\_s*真\|仮\_s*名\|蝦\_s*[蟆蟇]\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|鉤\_s*状\_s*部\|菓\_s*子\|甲\_s*斐\|会\_s*社\|g\_s*\%(i\_s*g\_s*a\|h\_s*o\_s*s\_s*t\_s*s\_s*c\_s*r\_s*i\_s*p\_s*t\)\|ヌ\_s*ー\|ｇ\_s*ｎ\_s*ｕ\_s*ｓ\|ニ\_s*ュ\_s*ー\_s*ズ\|ノ\_s*ー\_s*ム\|総\_s*司\_s*令\_s*部\|連\_s*合\_s*国\_s*軍\_s*総\_s*司\_s*令\_s*部\|ヒ\_s*ル\|ク\_s*ッ\_s*パ\|硝\_s*子\|ハ\_s*ボ\_s*ロ\_s*ー\_s*ネ\|瞿\_s*曇\|ヨ\_s*ー\_s*テ\_s*ボ\_s*リ\|エ\_s*ー\_s*テ\_s*ボ\_s*リ\|イ\_s*ェ\_s*\%(ー\_s*テ\_s*ボ\_s*リ\|テ\_s*ボ\_s*リ\)\|得\_s*る\|ヘ\_s*\%(ラ\_s*ル\_s*ド\|ル\_s*マ\_s*ン\)\|ド\_s*イ\_s*ツ\|成\_s*吉\_s*思\_s*汗\|ゼ\_s*\%(ラ\_s*\%(チ\_s*ン\|ニ\_s*ウ\_s*ム\)\|ム\_s*ク\_s*リ\_s*ッ\_s*プ\|ノ\_s*ア\|ン\_s*ト\_s*ル\_s*マ\_s*ン\|ネ\_s*\%(コ\_s*ン\|ラ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\)\|大\_s*\%(蚊\|学\_s*院\_s*生\)\|ジ\_s*\%([ムルジグノナオンー]\|プ\_s*シ\_s*ー\|ア\_s*ン\|ッ\_s*ド\|イ\_s*ド\|タ\_s*ン\|ゼ\_s*ル\|リ\_s*ア\_s*ン\|レ\_s*ッ\_s*ト\|ゴ\_s*ロ\|ラ\_s*\%(フ\|ル\_s*\%(ド\|デ\_s*ィ\_s*ー\_s*ノ\)\)\|ロ\_s*\%(ー\|ン\_s*ド\)\|バ\_s*ン\_s*シ\_s*ー\|ブ\_s*\%(リ\|ラ\_s*ル\_s*タ\_s*ル\)\|ベ\_s*\%(ル\_s*ナ\_s*ウ\|レ\_s*リ\_s*ン\)\|ネ\_s*ッ\_s*ト\|ョ\_s*\%(ッ\_s*ト\|ヴ\_s*ァ\_s*ン\_s*[ニナ]\|バ\_s*ン\_s*[ニナ]\|コ\_s*\%(ー\_s*ソ\|ン\_s*ダ\)\|ル\_s*\%(ジ\|ダ\_s*ー\_s*ノ\)\|ー\_s*\%(ジ\|ゼ\_s*ッ\_s*ト\)\)\|ャ\_s*\%(ン\|イ\_s*\%(ロ\|ル\_s*ズ\|ア\_s*ン\_s*[ツト]\)\|コ\_s*\%(モ\|メ\_s*ッ\_s*テ\_s*ィ\)\|ー\_s*マ\_s*ン\)\|ニ\_s*ー\|ュ\_s*\%([レネ]\|ゼ\_s*ッ\_s*ペ\|リ\_s*\%(ア\|ー\_s*ニ\|エ\_s*ッ\_s*タ\)\|ヌ\_s*\%(ビ\_s*エ\_s*ー\_s*ブ\|ヴ\_s*ィ\_s*エ\_s*ー\_s*ヴ\)\)\|ェ\_s*\%([リルフムマネ]\|ス\_s*チ\_s*ャ\_s*ー\|ロ\_s*ニ\_s*モ\|ラ\_s*\%(ー\_s*[トルド]\|ル\_s*\%(ド\|デ\_s*ィ\_s*ン\|ダ\_s*イ\_s*ン\)\)\|ミ\_s*ニ\|ニ\_s*ー\|ノ\_s*\%([アバ]\|ヴ\_s*ァ\|ワ\_s*ー\_s*ズ\|サ\_s*イ\_s*ド\)\|ン\_s*\%(マ\|ト\_s*\%(ル\|リ\_s*[ィー]\)\|ダ\_s*ー\)\)\)\)',
+      \ 'H' : '\%([ﾎ洞亡袰滅幌濠壕畚笨略檣艢焔炎仄朖朗塊程施滸幾殆缶熱解屠榾螢蛍骨細本＊※糒恣縦擅星戟戈桙綻祠誇埃鉾矛堀頬袍垉膀鞄抔磅峯堋弸皰舫篷麭怦呆蔀棚褓泙枋棒勹鴇朴峰豐苞葬琺寳炮鵬寶繃魴鋒髣逢朋烹鳳彗箒俸焙蓬烽幇抱崩訪泡澎彷縫捧萌萠彭包胞倣邦飽疱庖奉豊砲報硼宝攴攵瀑蹼樮北恍掘畝譽保穗賞埔餔咆惚穂葡抛哮耄堡脯哺襃黼捕彫褒欲吼舖輔葆浦逋誉ほﾍ謙遜篦廰廳貶褊胼諞篇駢蝙翩變∂遍返騙編扁変丿暼諛諂隔凹臍巳蛇蔕蒂瓸竡粨躄闢癖甓璧劈碧壁聘餅箆坪竝嬖幤閇娉病塀蔽并陛屏炳斃瓶弊幣併敝閉並辺邉減屁圧歴邊折舳戸へﾌ麓梺冬♭′枌賁汾濆吩氛雰糞褌忿墳吻紛焚扮分粉揮旧舊顫故震篩奮隹古衾襖贅燻鰒陰絃総惣總房閼鬱塞章郁艦簡補札耽吭鰾笛芬呎文罧節苳蕗淦舩艙舷舟船蒲懷懐≧≪≫＞≦渊淵渕縁葢盖弍蓋双B藤潭蒸鱶楓殕瘋封諷黻怫髴佛彿恚慍憤仏F弗沸Φφ拒防茯蔔愎輹蝠箙⊇⊃嚢梟袋含⊆⊂袱覆輻復馥副複福経俘麸賦麩蜉坿父附訃婦誣仆經舗咐符臥斧冨更俛觝怖腐踏深趺富降畉譜葺觸敷歩赴狂殖振夫苻噴罘伏匐賻風柎不巫蹈孵拭普芙郛埠鋪鯆付吹阜拊桴溥榑扶俯触践負増傅鮒孚府ふﾋ鶸彬禀斌蘋嬪繽殯賓擯牝貧頻瀕稟品怯葫晝飜蒜蛭昼綬胙紐鰭∝衡片鮃閃鵯辟百媛姫仭擴絋仞展尋宥太拡拓拾祐恕紘煕泰熙寛啓弘宏洋裕浩廣広髟馮飃飆殍冰冫凭俵驫彪雹飄豹漂驃慓剽嫖兵憑票評標平表燧老撚拈捫捻歪籤籖柊旱魃秀跪膝蜩羆攣佗−低隙閑暇雛髯鬚髭¬蹄濳潜潛顰密窃鬻提瓠蠡瓢匏壽央恒廂尚寿久率蟆痙蟇丙丁孤女史獨独稘斎均倫準斉等≠單偏単他仁瞳人1１柆蔆拉杓柄犇◇◆菱醢醤曾蘖彦酷浸漬鶲額聖肱肘熈芒光膕控皸皹響罅僻鰉蹕匹逼篳畢疋柩棺弼櫃謐坤未羊筆必襞養饑（＜「【←『左緋罷引披惹轡丕卑碑彼昜痺砒鞁退匪否毘皮蜚干疲蓖氷比匕桧日梭曳牽費扉魅肥痞灯豼鞴斐狒碾秕杼冷贔俾挽索被貔暃避火朏菲裨秘髀轢乾臂泌庇批紕脾霏檜飛悲妣妃樋祕陳鄙譬ひﾊ布鱧釖鉤蝟梁鍼磔針肚禳腑腸孕原拂祓払遼温玄請腹陽悠遙東遥治春捷頓鮠鶻駿疾囃林隼畔磐泛鈑潘膰樊笵釆胖拌絆蟠氾坂范凡燔楾洪瘢翻板攀゜大伴煩槃斑袢判範藩繙蕃版搬叛班阪般販犯汎帆頒反侍鯊櫨祝？硲間烈激勵劇励速蝿蠅省飯彈勢外筈弭辱逸育毓齦浮難掵阻憚幅巾柞母翅幟側圃旌旙旛将傍働鰰機叩疥畠籏幡畑旗斜鴿再鳩開秦跣膚肌裸弾薑椒元弌壹哉壱甫一創馨始鋼芳剪夾鋏螯挾挟脛萩贐餞離塙英蕚萼衂衄縹譚咄放噺話洟甚鼻華花觜赱迸枦奔艀婢梯燥箸柱走橋箪匣凾□筐繁方運匚筥箱函佰珀魄陌亳狛柏愽栢岶蘗粕膊璞擘箔舶泊搏迫帛拍諮測企圖秤謀量計図儚捗袴伯博墓秡癶髮釟溌肇廿二初椀蓮♪８鉢蜂發髪服法半醗白薄八発擺旆盃珮湃坏碚琲睥霈埴牌拜裴孛吠入沛榛杯悖―廢腓徘誹稗癈俳肺憊輩背鷂胚廃排拝敗灰配蛤濱浜跳馳霸羞爆禿杷碆叭匍怕栄玻撥穿愧歯膨破恥晴巴生派暎端覇着帚刃填腫吐刷菷刎菠羽琶張這頗簸佩耻早映履慙坡榮果脹跛陂葉播笆葩矧霽食芭把刄捌垪剥爬掃帶齒嵌貼は━─┛┘┷┸┻┴┓┐┬┳┯┰┫┥┤┨╋┿┼╂波‐フ☆★非ＨヒホヘハH]\|ｯ\_s*[ﾎﾍﾌﾋﾊ]\|ッ\_s*[ホヘフヒハ]\|っ\_s*[ほへふひは]\|寄\_s*生\|珠\_s*鶏\|混\_s*一\_s*色\|紅\_s*[幇中]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|微\_s*[酔笑]\|子\_s*規\|蜀\_s*魂\|杜\_s*[鵑宇]\|時\_s*鳥\|上\_s*枝\|鬼\_s*灯\|酸\_s*漿\|叢\_s*祠\|和\_s*了\|鮑\_s*魚\|謗\_s*法\|黒\_s*子\|部\_s*屋\|竹\_s*\%(畚\|麦\_s*魚\)\|巻\_s*子\|綜\_s*麻\|下\_s*手\|糸\_s*瓜\|h\_s*e\_s*c\_s*t\_s*o\|霹\_s*靂\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|鞦\_s*韆\|睾\_s*丸\|乱\_s*吹\|相\_s*応\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|回\_s*\%(鍋\_s*肉\|回\_s*教\)\|書\_s*司\|頭\_s*垢\|鳧\_s*鐘\|款\_s*冬\|菜\_s*蕗\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|釜\_s*[中山]\|雙\_s*葉\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|宿\_s*酔\|○\_s*○\_s*○\|△\_s*△\_s*△\|×\_s*×\_s*×\|河\_s*\%(豚\|底\_s*撈\_s*魚\)\|神\_s*[庫籬]\|領\_s*巾\|肩\_s*巾\|素\_s*見\|曹\_s*白\_s*魚\|枚\_s*[田方]\|敬\_s*昌\|幸\_s*展\|容\_s*靖\|晃\_s*道\|宙\_s*子\|欧\_s*子\|祥\_s*加\|終\_s*日\|翡\_s*翠\|曽\_s*祖\_s*父\|豪\_s*将\|偉\_s*紀\|周\_s*[行男]\|茅\_s*蜩\|向\_s*日\_s*葵\|七\_s*宗\|桶\_s*坂\|永\_s*和\|蟾\_s*蜍\|抽\_s*\%([斗出]\|き\_s*出\_s*し\)\|告\_s*天\_s*子\|雲\_s*[脂雀]\|為\_s*人\|緊\_s*[と々]\|鎮\_s*火\_s*\%(祭\|の\_s*祭\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|粃\_s*糠\_s*疹\|只\_s*管\|直\_s*[向走垂隠]\|常\_s*陸\|鹿\_s*尾\_s*菜\|撲\_s*り\_s*倒\|同\_s*胞\|赦\_s*い\|青\_s*春\|哈\_s*爾\_s*浜\|美\_s*佳\|流\_s*行\|勇\_s*[樹人]\|韓\_s*流\|漢\_s*堡\|汗\_s*国\|盤\_s*陀\|R\_s*S\_s*I\|蔓\_s*延\|沙\_s*魚\|蝦\_s*虎\_s*魚\|馬\_s*銜\|狭\_s*間\|南\_s*風\|延\_s*\%(縄\|い\_s*て\)\|義\_s*母\|旅\_s*籠\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|黄\_s*[酒櫨]\|土\_s*[方生師]\|嘔\_s*[吐気]\|支\_s*倉\|長\_s*谷\|接\_s*ぎ\_s*合\|纏\_s*頭\|煙\_s*火\|麻\_s*疹\|階\_s*[上子]\|嘴\_s*\%(細\_s*鴉\|太\_s*鴉\)\|学\_s*胤\|２\_s*\%([人つ日]\|０\_s*[歳日]\)\|2\_s*\%([人つ日]\|通\_s*り\|0\_s*日\)\|淡\_s*竹\|8\_s*月\|客\_s*家\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|海\_s*\%([鞘永蘿星牙]\|拉\_s*爾\|底\_s*撈\_s*月\)\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|色\_s*調\|呼\_s*和\_s*浩\_s*特\|ウ\_s*ー\_s*ゴ\|ユ\_s*\%(ー\|ペ\_s*ー\_s*ル\|ベ\_s*ー\_s*ル\|イ\_s*ス\_s*マ\_s*ン\_s*ス\|ゴ\_s*ー\|グ\_s*ノ\_s*ー\|マ\_s*ニ\_s*\%(テ\|ス\_s*[トム]\)\)\|現\_s*代\|十\_s*六\_s*進\_s*数\|高\_s*さ\|香\_s*港\|イ\_s*\%(ダ\_s*ル\_s*ゴ\|ス\_s*パ\_s*ニ\_s*ア\|レ\_s*ー\_s*ル\|エ\_s*ロ\)\|オ\_s*\%([ラー]\|ナ\_s*ー\|ノ\_s*レ\|ン\_s*フ\_s*ル\_s*ー\_s*ル\|ネ\_s*\%(ス\_s*\%(ト\|テ\_s*ィ\)\|ゲ\_s*ル\)\|テ\_s*ル\|ル\_s*ガ\_s*ー\|マ\_s*ー\_s*ジ\_s*ュ\)\|ア\_s*\%(ン\_s*\%(リ\|ベ\_s*ー\_s*ル\)\|ネ\_s*ス\_s*ト\|ワ\_s*ー\|ダ\_s*マ\_s*ー\_s*ル\|シ\_s*ェ\_s*ッ\_s*ト\|ビ\_s*タ\_s*シ\_s*オ\_s*ン\|ー\_s*\%(ネ\_s*ス\_s*ト\|ノ\_s*ン\_s*ク\_s*ー\_s*ル\)\)\|エ\_s*\%(デ\_s*ィ\|ン\_s*リ\_s*ケ\|レ\_s*\%(ナ\|ー\_s*ヌ\)\|ロ\_s*イ\_s*ー\_s*ズ\|ク\_s*ト\_s*ル\|ル\_s*\%(ゲ\_s*ラ\|ヴ\_s*ェ\|メ\_s*ス\|マ\_s*ン\|ミ\_s*\%(ッ\_s*ト\|ー\_s*ト\)\|ブ\_s*ラ\_s*ン\|ナ\_s*ン\_s*デ\_s*ス\|キ\_s*ュ\_s*ー\_s*ル\)\|ノ\_s*ク\|イ\_s*チ\|ッ\_s*チ\)\|水\_s*[銀平素]\)',
+      \ 'I' : '\%([ｲηΗ賤鄙卑苟嫌弥薯妹芋藷夢艷鑪鈩彩鱗色鯆忽綺貸甍答応愈圦杁茵胤飮寅尹婬贇韵隱蚓氤酳霪蔭堙湮廴音飲慇韻咽淫殞姻隕院允隠殷陰窟巖巌頌祝鰮鰛鰯岩磐円￥鼾歪弋弑抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗嘶鰍電引躄誘動≦忿鵤錨碇怒霆霹雷凧桴筏魚S菴庵彌雖家尿荊棘茨祈祷命豕猯古伍聿乙鎰鴪軼樹慈悼愴慯労格到至傷鼬頂戴病徒致鈑痛板柞沙砂聊些潔諍烈功諫勳勇勲漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息挑絲縷厭營営愛幼稚緒遑暇糸弌壹肆莓苺櫟著市碑鐓礎甃臀弩石牲犧犠池溢Y佚壱1１鬻毓燠礇粥的戦戰軍郁幾育一稲否飯違居矮ゐ猪五煎彝醫斐逶貽善胆位萎可詑僞鑄熬活容依要斎行怡異衣逝猗胃洟好矣鋳揖椅去惟云懿熨痿射凍尉移将囗肄夷率囲姨慰頤忌唯緯逸噫挿鮪易偽苡彜莞往以韋遺炒謂李生威為維意倚良如彙已出淹言亥鰄井蔚痍圍幃渭堰饐医爲癒帷恚偉委詒畏い氷Йй→⇒⊂⊃▼▽伊印入∞吋∈∋∬∫∩ＩイИΙи私ιI]\|E\_s*メ\_s*ー\_s*ル\|灼\_s*然\|祖\_s*谷\|湯\_s*文\_s*字\|文\_s*身\|郎\_s*[女子]\|蕁\_s*麻\|刺\_s*[青草]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*青\|況\_s*ん\_s*や\|所\_s*謂\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%(蘭\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|夜\_s*来\_s*香\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|細\_s*小\_s*魚\|小\_s*魚\|鯨\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|和\_s*泉\|気\_s*吹\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|指\_s*宿\|拠\_s*所\|従\_s*[弟妹姉兄]\|鴨\_s*脚\_s*樹\|公\_s*孫\_s*樹\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|檪\_s*本\|巫\_s*子\|神\_s*巫\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|許\_s*[嫁婚]\|<\_s*=\_s*=\_s*>\|必\_s*要\_s*十\_s*分\_s*条\_s*件\|ヤ\_s*ン\|日\_s*本\_s*ア\_s*イ\_s*・\_s*ビ\_s*ー\_s*・\_s*エ\_s*ム\_s*株\_s*式\_s*会\_s*社\|国\_s*際\_s*\%(基\_s*督\_s*教\_s*大\_s*学\|標\_s*準\_s*化\_s*機\_s*構\)\|逆\_s*離\_s*散\_s*フ\_s*ー\_s*リ\_s*エ\_s*変\_s*換\|識\_s*別\_s*子\|即\_s*興\_s*曲\|な\_s*ら\_s*ば\|項\_s*目\|逐\_s*次\_s*型\|ｉ\_s*ノ\_s*ー\_s*ド\|i\_s*\%(ア\_s*プ\_s*リ\|P\_s*o\_s*d\|モ\_s*ー\_s*ド\|M\_s*a\_s*c\|ノ\_s*ー\_s*ド\)\|誤\_s*っ\_s*た\|無\_s*\%(花\_s*果\|効\_s*な\)\|帰\_s*納\_s*法\|字\_s*下\_s*げ\|不\_s*\%([可如足]\|充\_s*分\)\|具\_s*体\_s*化\|情\_s*報\|導\_s*入\|整\_s*数\|完\_s*全\|ヨ\_s*\%(ア\_s*ン\|シ\_s*フ\|ー\_s*ド\|ウ\_s*素\)\|ア\_s*\%(イ\|ー\_s*\%(ヴ\_s*ィ\_s*ン\|ビ\_s*ン\)\|ン\_s*\%(プ\_s*ロ\_s*ン\_s*プ\_s*\%(チ\_s*ュ\|テ\_s*ュ\)\|デ\_s*パ\_s*ン\_s*ダ\_s*ン\|フ\_s*ォ\_s*ル\_s*\%(メ\_s*ル\|マ\_s*テ\_s*ィ\_s*ー\_s*ク\)\)\)\)',
+      \ 'J' : '\%([塩嶋島嶌縞橲竺衂衄宍舳忸軸舌喰食直凝實昵実印尻侭仞刄臣恁儘潯贐稔進盡仭糂訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敍莇茹杼洳敘汝蜍耡恕舒縟褥蓐辱溽所抒鋤徐絮序叙助帖穰疂聶疊驤襄淨讓繩禳絛蕘諚仗壌滌繞生靜蟐壤仍茸嬲疉塲乘遶星瀞拯釀躡孃如剩娘嬢錠静醸縄女尉饒丈成烝擾嫋穣丞盛場杖條条蒸貞状攘畳剰冗定浄乗情城上常譲懦愀鷲竪嬬戍得濡咒讐讎就聚笋篤盾徇凖楯詢隼筍蓴惇洵淳閏恂諄馴旬荀潤循醇巡遵順准殉純準襦誦需朮戌宿孰塾珠熟恤術述豎孺呪儒綬樹受授壽揉從澀狃中戎拾廿鞣从縱澁糅蹂神汁獸絨縦渋柔什充十従獣住銃重事迩爺滋除怩尓痔璽至児士寿茲孳染嗣柱寺磁仕死爾路而仁辞塒時岻粫持恃敷焦字只地轜侍瓷亊知辭餌冶邇弍似祀以子峙二史自畤兒示耳慈司蒔次珥膩醤鮭着鉐惹搦尺雀寂若弱邪戯者蛇麝闍じ┃│┝┣├┠┌┏．еЕ治яЯ日ЮюＪЁёйЙジJ]\|ｯ\_s*ｼ\_s*ﾞ\|ッ\_s*ジ\|っ\_s*じ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|祖\_s*父\_s*\%(さ\_s*ん\|祖\_s*母\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|↑\_s*↓\_s*←\_s*→\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｼ\_s*ﾞ\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|三\_s*味\_s*線\|雑\_s*魚\|著\_s*語\|杓\_s*子\|共\_s*同\_s*企\_s*業\_s*体\|j\_s*\%(T\_s*e\_s*X\|L\_s*a\_s*T\_s*e\_s*X\|B\_s*i\_s*b\_s*T\_s*e\_s*X\)\|ゼ\_s*リ\_s*ー\|エ\_s*\%(ホ\_s*バ\|リ\_s*コ\|レ\_s*ミ\_s*ヤ\|ル\_s*サ\_s*レ\_s*ム\|ッ\_s*サ\_s*イ\)\|ヘ\_s*\%(レ\_s*ス\|ス\_s*ス\)\|ヒ\_s*メ\_s*ネ\_s*ス\|チ\_s*ゲ\|北\_s*陸\_s*先\_s*端\_s*\%(大\|科\_s*学\_s*技\_s*術\_s*大\_s*学\_s*院\_s*大\_s*学\)\|ハ\_s*\%(イ\_s*メ\|ラ\_s*ペ\_s*ー\_s*ニ\_s*ョ\)\|碧\_s*玉\|ヤ\_s*\%([リンニナー]\|イ\_s*ル\|エ\_s*ル\|ル\_s*ノ\|レ\_s*ド\|ヌ\_s*\%(ス\|シ\_s*ュ\)\|ス\_s*パ\_s*ー\_s*ス\|コ\_s*[ビブ]\|ッ\_s*ケ\)\|フ\_s*\%(ァ\_s*[ンナ]\|リ\_s*[オア]\)\|ズ\_s*ボ\_s*ン\|ユ\_s*\%([ハリダノ]\|ル\_s*ゲ\_s*ン\|ー\_s*\%([リノ]\|ゲ\_s*ン\_s*ト\|デ\_s*ィ\_s*ッ\_s*ト\)\|ン\_s*\%(グ\|ケ\_s*ル\|カ\_s*ー\)\|ピ\_s*テ\_s*ル\|ッ\_s*[カシ]\)\|イ\_s*\%(エ\_s*\%([ナス]\|ン\_s*\%(ス\|セ\_s*ン\)\|ズ\_s*ス\)\|ェ\_s*\%(ナ\|ン\_s*\%(ス\|ゼ\_s*ン\|セ\_s*ン\)\|ー\_s*ガ\_s*ー\|ル\_s*\%(ク\|サ\_s*レ\_s*ム\)\)\)\|ホ\_s*\%([タセ]\|ル\_s*ヘ\|ホ\_s*バ\|ア\_s*\%(ン\|キ\_s*ン\)\)\|ヨ\_s*\%([ブナ]\|ル\_s*\%(グ\|ダ\_s*ン\)\|エ\_s*ル\|ア\_s*\%(キ\_s*ム\|ヒ\_s*ム\)\|ゼ\_s*フ\|シ\_s*\%(フ\|ュ\_s*ア\)\|ー\_s*\%([ドト]\|デ\_s*ル\|ゼ\_s*フ\)\|セ\_s*フ\|ハ\_s*[ナンネ]\)\)',
+      \ 'K' : '\%([ｺ怖之旃惟怺薦米暦轉殺悃鶤艮鯤很袞坤壼琿狠漿棍魂菎滾梱溷痕渾墾恨懇根梢杪王泥裔樸鞐熟枹醴聲声蛩凍溢零錯苔亊箏斷判諺理断盡悉尽辞詞殊事壽寿鯒礫鯉齣狛腓昆瘤鮗谺応應答爰茲是試志心凩笏惚榾兀輿甑腰拵拗鐺鏝衝杲磽絖昊耗闔狎靠冓汞湟塙慌嫦礦冦淆遘亘仰昴誥鬨鴿鏗浤哮砿鎬伉熕洽訌閧困縞鮫逅糠槹哽盍稾亙壙覯隍簧遑洸餃惶寇鵁皋黌椌扣晄倖矼肓頏蛤呷詬匣昿皐崗肱徨峇袷敲爻藁倥釦棡凰犒吭窖畊岡猴胱絋傚啌蚣缸紘湊搆閤峺羔鍠幌鱇扛肴恆紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘蝗酵嚆犢稿亢哄睾慷郊岬肛項巷鑛洪佼狡叩昂勾喉晃滉糀晧剛曠宏控恍侯皓港膏耿皎坑江絞膠虹巧鴻鉱衡浩厚耕幸弘綱抗購攻講恒薨溝鋼航行肯光皇好荒高梏谷哭槲尅釛斛轂石告酷穀踰懲蝴鴣袴焦觚虍粐乎沽餬胯菰瞽請楜娘壺錮込葫痼兒估冴漕痩虎冱倒戸呱媚粉夸詁子鈷捏濃故濾箍漉恋呼誇壷放転仔鼓小股罟女乕琥跨滬越古糊滸扈瑚皷混怙弧辜戀蠱超児雇凝孤湖此瓠蛄凅肥こｹ峻欅獸騫剱儉惓劵蜷謇鉉鵑綣幵娟險劒虔瞼俔顯臉圈釼歉權慊縣暄愃愆涓黔劔獻搴諠椦妍檢甄験慳捲倦遣羂嶮蹇鹸狷譴腱驗軒憲繭謙圏険硯倹献犬絢顕券劍剣見権拳研眷牽県建烟鑷言獣蓋涜吝削畩閲検貶健桁嗾竭訐亅碣杰譎偈抉厥蕨歇襭刔頡獗尻訣孑頁纈蹶桀穴傑結血憇夐彑勍攜迥冏檠絅蹊煢笄醯枅憬盻綮詣冂挈黥剄匸徑奚挂兮鮭瓊畦逕繼惠慧謦鷄系┻┣┠┨┝┴│┿┰╋━┛┬┥╂┤┸┯┼─┷├┏┳┫┃┓罫痙奎脛谿溪螢蛍渓閨憩圭携硅恵刑継勁珪計啓異毛蹴褻けｸ姑配椪栩櫪檪椡橡椚湫箜櫟含纐柵婚屎糞癖潛潜鵠凹窪縊跟軛頚珞頸首諄窟鞋履轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬樟楠梳櫛串釧與与挫籖鯀鯨籤隈熊艸嚔藾叢鏈腐鎖種ξΞ臭楔草圀邦國国髭嗽漱吻嘴脣唇梔腔φ粂皹勳熏裙醺桾皸崑燻訓勲葷委钁精詳鍬咥銜桑某暝峅眛昏罔冥鮓比闇位鞍藏暗倉廚厨涅曇蜘佝栗包俥車梍枢畔鐵玄蔵黒喰苦枸煦焼倶狗吼刳工絎駒眩垢口窶区劬繰呉暮貢嶇酌庫惧組衢紅食句吁懼區桍孔怐瞿くｷ段痍疵絆紲傷築鱚稷嚴黍帛後碪砧絹萌兆刻椈鞫掬辟君牙檗蘗迄訖狐屹詰佶拮吃鞠橘菊喫‥＼£、♀〇∵≡．＆＾‰▲‡｀§¶′＿〓☆；□↑↓・％■¢＝／≒←−￣★々≠♂〆ゝ◎―＄¨♭＋？ヽ…†♪‖＠゜◆ヾ´。±｜≪⌒≧○÷，≫＜∞●◇∴≦△！℃゛▼♯¬°▽‐ー∽￥：∨＞Ц＃∝∫〃仝Å″〒ゞ煙蚶衣更細妃后楸蕈茸乙雉轢杵軋岸桔汚穢北樵際裂燦煌雲嫌胆竏粁瓩浄澄淳潔清雰錐蛬吉霧檮桐襟磬釁覲箘掀噤衿鈞檎瑾忻饉箟听芹衾釿懃斤蒟径窘擒巾菌公禽筋錦欣僅琴均禁謹緊欽近勤鉅秬擧渠踞據舉筥嘘苣慶倨距歔遽鋸醵拠拒去勗亟蕀洫跼旭局挙許居巨虚頃峽筴鍄陜卿竟筺僵狹竅洶誑羌抂炯烱劫經刧襁繦蕎篋況徼恊恟棘轎竸况廾荊亰姜梗孝亨跫敬筐梟饗矯挾矜挟校拱嬌響鞏杏向興匈嚮享警競喬怯兄彊僑兢狂供橋莢凶郷兇驕叫夾匡侠狭恐経疆協境胸強驚脅共恭今教玖赳鬮舊蚯逑恷歙貅扱樛９烋摎邱笈皀疚岌厳胡翕朽泣穹糺糾及躬汲窮灸弓臼宮久柩究給丘求鳩級球休救急旧吸九瞶來著喜旡决羈祈揮窺起聞弃伎燬憙毅綺麾基机棄希噐棋其尋祁熹奇肌跂稀覬暉企黄愾欹几稘城軌諱岐決詭極記猗喟槻竒季碕鰭悸切禧消己效朞淇驥揆麒嬉崎僖匱屓既毀杞危卉器貴徽癸虧畿忌耆曁伐紀晞畸饑酒碁樹生木覊聽剪截櫃熈嵜冀跪气愧煕期効斬訊飢妓箕祺圻熙餽来徠鬼譏羇馗着寄倚氣利幾汽欷姫饋聴唏剞鑽騏逵騎掎規幃棊きｶ癢糜粥痒麹輕骨業軽鰈鰔餉通龜瓶甕亀鳫獵鴈殯猟雁釀鳬鳧髢鴨巛側躱廁厠磧瓦獺翡皮裘→紮搦苧碓柄枳躯躰軆體体鴉犂烏機絡空唐榧茅澗鸛厂蒄啣卷淦扞杆骭歛瞰讙奐戡豢坎瀚皖稈鐶拑酣陷繝嫺驩篏樌莟勸捍撼澣盥羹嫻鑵寰丱康懽憾羮揀歡潤罕觀橄涵渙凵堪覡巫鉋萱簪舘艱咸翰柬駻悍燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹顴緘款桓箝諫諌轗坩旱侃鰥　館莞橇韓患灌勧菅簡奸刊柑肝看桿寒緩干嵌廣広竿貫巻敢漢環喊陥監喚甘間歓閑寛管慣完艦乾幹官観壁椛屍姓庇鞄芳蔓鯑一勘⊃影陰蔭景＊棧梯筧庚辛┘┐柧┌門廉脚乞癩∪川合’）《‘”｛〈“｝》〉囓柁旗鮖悴舵鰍鍛梶錺餝飾篭籠歸孵卻皈還省顧楓却帰反返守帋督祇髮韮裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀象模仇固硬傍難容忝辱頑形旁方型肩風滓翳微幽掠緕纃綛絣擦糟鎹粕戞猾曷剋黠瞎鞨恰∧濶∩蠍筈蝎羯喝轄餓蛞聒劼擔刮蘰鬘桂闊括嘗捷豁渇担滑堅鰹割戛活疽暈鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿掲關罹抱踵嬶嚊拘関係顏貌郁薫顔母感釡罐窰鴎框叺構喧竃竈釜缶蒲鎌數数槝栢膳傅瑕畏賢橿姦樫爨炊圍喞託囲鈎「『鉤」』限鍵傾禿蕪鏑頭齧気被兜哉適敵必要彜彝鬲鼎叶片哀愛悲鋺蛇鉄蜩神奏楫裹磆餅徒褐粮糧茖椁覺幗槨貉擴壑隱愨寉殼癨嚇穫咯膕骼膈∠掴狢埆蠖覈霍礁恪擱匿撹攪喀廓較郭〕【［】］〔殻挌劃閣格隠覚矍革馘鶴攫核獲拡客隔角確廨囘隗嵬觧榿蠏匯徊迴壞褂獪丐械枴畍誨揩醢誡夬懈喙椢恠峡价櫂茴蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧契皆界疥魁偕改繪貝胛絵快甲灰槐晦懐介塊解廻回階戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡柯噛箇上苛暇蚊廈易嘩ヵ描苅枯佳彼兼哥缺霞藉架啝下渦踝堝闕華嗄荷馨刈假夥河科珈個蝸迦軻咼黴舸繋書賀夏萪支卦掛掻蝦痂謌渮歌過香禾狩買變家枷克駈花賈畫珂呵替代訶袈咬画顆貸價淅飼和ヶ果糅厦課可醸葭勝仮搗嘉墟嗅譌日斯禍換窩苟貨蝌価懸欠化罅伽賭翔靴且嚼訛交何駆驅个嫁譁借加跏戈稼寡涸耶変崋鹿笳火茄菓遐舁か京節└┗※хХ忽コ汗〜功株（Ｋク×金窯κキΧカКΚкχケK]\|ｯ\_s*[ｺｹｸｷｶ]\|ッ\_s*[コケクキカ]\|っ\_s*[子こけくきか]\|蟀\_s*谷\|焜\_s*炉\|前\_s*妻\|嫡\_s*妻\|二\_s*合\_s*半\|秋\_s*桜\|牛\_s*尾\_s*魚\|庶\_s*幾\|独\_s*楽\|特\_s*牛\|粫\_s*門\|甦\_s*生\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|外\_s*連\_s*味\|螻\_s*蛄\|罌\_s*粟\|滅\_s*紫\|S\_s*i\|莎\_s*草\|百\_s*[濟済]\|9\_s*[日月]\|秧\_s*鶏\|釉\_s*掛\|典\_s*薬\_s*寮\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|群\_s*衆\|慈\_s*姑\|c\_s*r\_s*e\_s*s\_s*c\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|仁\_s*彦\|啄\_s*木\_s*鳥\|X\_s*e\|如\_s*月\|私\_s*市\|昨\_s*日\|素\_s*地\|布\_s*地\|欺\_s*罔\|k\_s*i\_s*l\_s*o\|聖\_s*[之子美]\|沈\_s*菜\|蟋\_s*蟀\|螽\_s*斯\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|菫\_s*青\_s*石\|槿\_s*花\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*l\_s*e\_s*s\)\)\|裾\_s*礁\|脇\_s*[侍息]\|姉\_s*[妹弟]\|頬\_s*[骨筋]\|毬\_s*果\|舅\_s*姑\|厩\_s*\%([肥舎]\|務\_s*員\)\|廐\_s*舎\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|氈\_s*瓜\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|為\_s*替\|連\_s*枷\|身\_s*体\|落\_s*葉\_s*松\|随\_s*神\|檻\_s*車\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|千\_s*典\|山\_s*\%(梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|蜻\_s*蛉\|破\_s*片\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|槭\_s*樹\|長\_s*[月官]\|主\_s*[紀計神]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*白\|春\_s*日\|C\_s*\%([ormfda]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|曽\_s*て\|曾\_s*て\|松\_s*魚\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|螳\_s*螂\|蟷\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|水\_s*[鶏母手夫]\|東\_s*\%(風\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|(\_s*株\_s*)\|称\_s*子\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|ノ\_s*\%([ブウ]\|ー\_s*ン\|ッ\_s*\%([トク]\|テ\_s*ィ\_s*ン\_s*グ\|カ\_s*ー\|キ\_s*ン\_s*グ\)\)\|ナ\_s*\%(ッ\_s*\%(ク\|プ\_s*\%(サ\_s*ッ\_s*ク\|ザ\_s*ッ\_s*ク\)\)\|レ\_s*ッ\_s*ジ\|イ\_s*[フトツ]\)\|ニ\_s*\%(ー\|ッ\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ホ\_s*\%(ー\_s*\%(ミ\_s*ー\|メ\_s*イ\)\|メ\_s*イ\_s*ニ\)\|フ\_s*\%(ビ\_s*ラ\_s*イ\|ル\_s*シ\_s*チ\_s*ョ\_s*フ\)\|ハ\_s*\%(ン\|ラ\_s*シ\_s*ョ\_s*ー\|ー\_s*ン\|バ\_s*ロ\_s*フ\_s*ス\_s*ク\|ル\_s*ツ\_s*ー\_s*ム\|チ\_s*ャ\_s*ト\_s*ゥ\_s*リ\_s*ア\_s*ン\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'L' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁ＜≪＿￣≦李左←∃∨¬∀⊃ルＬ∧レラ£ЛλлΛL]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|液\_s*晶\|最\_s*小\_s*2\_s*乗\_s*法\|\.\_s*\.\_s*\.\|拉\_s*薩\|l\_s*-\_s*メ\_s*ン\_s*ト\_s*ー\_s*ル\|ｌ\_s*ｉ\_s*ｓ\_s*ｐ\_s*ｅ\_s*ｒ\|聯\_s*想\|補\_s*題\|檸\_s*檬\|手\_s*紙\|学\_s*習\|施\_s*錠\|局\_s*所\|論\_s*理\|ロ\_s*\%([キイアロリブボトメウスコゴグー]\|ペ\_s*ス\|ワ\_s*ー\_s*ル\|エ\_s*ベ\|ヨ\_s*ラ\|フ\_s*ト\|ル\_s*カ\|ベ\_s*リ\_s*ア\|ビ\_s*\%(ー\|ン\_s*グ\|イ\_s*\%(ス\_s*ト\|ン\_s*グ\)\)\|テ\_s*ィ\|サ\_s*ン\_s*\%(ジ\_s*ェ\_s*ル\_s*ス\|ゼ\_s*ル\_s*ス\)\|ニ\_s*ー\|ク\_s*リ\_s*ア\_s*ン\|ッ\_s*\%([ジタテトク]\|キ\_s*\%(ン\_s*グ\|ー\_s*ド\)\|カ\_s*ー\)\|ケ\_s*ー\_s*\%([トタル]\|シ\_s*ョ\_s*ン\)\|カ\_s*ー\_s*ル\|ガ\_s*ー\|ギ\_s*ン\_s*グ\|ジ\_s*\%(ー\|テ\_s*ッ\_s*ク\|ス\_s*テ\_s*ィ\_s*\%(ク\|ッ\_s*ク\)\|カ\_s*ル\|ク\_s*ー\_s*ル\|ッ\_s*[トク]\)\|ラ\_s*ン\|ン\_s*\%([ゴグダ]\|ボ\_s*\%(ク\|ッ\_s*ク\)\|バ\_s*ル\_s*デ\_s*ィ\|ズ\_s*デ\_s*ー\_s*ル\|リ\_s*[ーィ]\|ジ\_s*ン\|ド\_s*ン\)\|レ\_s*\%(ア\_s*ル\|ッ\_s*タ\|ー\_s*ヌ\|イ\_s*ン\|ン\_s*\%([ソス]\|ツ\_s*ォ\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|研\_s*究\_s*室\|リ\_s*\%([ィセズザサスダポルラリマナノンヌブアー]\|ャ\_s*マ\|ヤ\_s*ド\_s*ロ\|ヨ\_s*ン\|ゾ\_s*チ\_s*ー\_s*ム\|コ\_s*\%(リ\_s*ス\|ピ\_s*ン\)\|ク\_s*ー\_s*ド\|カ\_s*\%(ー\|オ\_s*ン\)\|ジ\_s*[ンー]\|デ\_s*[ィル]\|ド\_s*カ\_s*イ\_s*ン\|プ\_s*ト\_s*ン\|パ\_s*ー\_s*ゼ\|グ\_s*\%(ニ\_s*ン\|ナ\_s*ン\)\|フ\_s*\%([エト]\|タ\_s*ー\|テ\_s*ィ\_s*ン\_s*グ\)\|テ\_s*ラ\_s*[ルシ]\|チ\_s*ウ\_s*ム\|ソ\_s*\%(ソ\_s*ー\_s*ム\|グ\_s*ラ\_s*フ\_s*ィ\)\|タ\_s*ー\|ト\_s*\%([レル]\|マ\_s*ス\|ア\_s*ニ\_s*ア\|グ\_s*ラ\_s*フ\|バ\_s*ル\_s*ス\_s*キ\_s*ー\)\|オ\_s*\%(タ\_s*ー\_s*ル\|ネ\_s*ル\)\|ミ\_s*\%(テ\_s*ッ\_s*ド\|ッ\_s*[タト]\)\|モ\_s*\%(ー\_s*ジ\_s*ュ\|ネ\_s*ン\|ン\_s*チ\_s*ェ\_s*ッ\_s*ロ\)\|ム\_s*ジ\_s*ン\|キ\_s*\%(ッ\_s*ド\|ュ\_s*ー\_s*ル\|テ\_s*ン\_s*\%(シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ス\_s*タ\_s*イ\_s*ン\)\)\|エ\_s*\%(ゾ\_s*ン\|ー\_s*ジ\_s*ュ\)\|ヒ\_s*テ\_s*ン\_s*シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ネ\_s*\%([アン]\|ッ\_s*ト\|ー\_s*ジ\_s*ュ\)\|ニ\_s*ア\|ベ\_s*\%([ロラ]\|リ\_s*ア\|レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ル\_s*テ\)\|ビ\_s*\%([アー]\|ド\_s*ー\|ン\_s*グ\)\|ュ\_s*\%([スー]\|ブ\_s*リ\_s*ャ\_s*ー\_s*ナ\|リ\_s*ュ\|ド\_s*ミ\_s*ラ\|ク\_s*サ\_s*ン\_s*ブ\_s*ー\_s*ル\|ッ\_s*ク\|シ\_s*ア\_s*ン\|ミ\_s*エ\_s*ー\_s*ル\)\|ロ\_s*\%(イ\|ン\_s*グ\_s*ウ\_s*ェ\)\|ヴ\_s*\%(ィ\_s*ン\_s*グ\_s*ス\_s*ト\_s*ン\|ァ\_s*\%(プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\)\|バ\_s*\%(テ\_s*ィ\|タ\_s*リ\_s*ア\_s*\%(ン\|ニ\_s*ズ\_s*ム\)\|プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\|ッ\_s*\%([ドピプタクチト]\|ス\_s*ン\)\)\|エ\_s*ル\)',
+      \ 'M' : '\%([ﾓ脆醪師諸催靄舫腿銛杜森捫聞匁紋問玩翫擡齎靠凭鵙鴃縺悶樅籾椛楓蛻濳潛艾潜殯黐餠用糯餅桃者懶專専物尤勿畚許故悖旧戻下乖求礎素基本元綟捩文默沐杢黙芒网莽檬罔耗耄朦魍艨矇濛曚亡蒙毛孟猛網漏裳望喪揉持母燃若藻以摸楙貰洩姆保茂模糢もﾒ麪緜眄緬麺門棉綿面蓍珎珍♀娶貭粧妾牝瞽盲娚暈繞萌惠慈恵萠溟暝滅謎姪瞑盟酩銘鳴芽睨召奴瑪碼賞減雌女めﾑ羣榁室簇屯邨連邑叢村紫梅葎宜憤葮毳槿椋酬報尨骸躯旨難睦酷麥麦邀対百迎昔虚空鞅宗棟胸掬娘結笞鞭徒蝕蠧蠹蟲席莚蓆寧筵虫毟貉狢豸貪壻聟婿无謀霧矛毋無鵡夢梦剥六群牟務蒸噎武向咽むﾐ渠霙溝妊澪薨岑嶺峰峯亂紊婬淫妄濫猥乱◇※■＊簔穣簑蓑醜儖慘短惨幹研耳壥廛店操陵鶚崎岬巫尊敕勅詔＞」砌頻汀→】』右翠碧緑認幣蹊径倫導途通路道瞠髻鬟湖自蹼蛟瑞癸禊晦漲源鏖港湊南櫁瞶謐水調貢密甕帝蜜覩幸脉脈韮韭竓粍瓱榠螟茗名妙命冥都宮罠閔皆眠明民魅深觀身實彌観己診看味美盈三御充稔視壬巳靡弥箕みﾏ毬鞠紕蝮麿転稀賓客檀繭黛眉囘巡周防衛衞護守荳菽豆槫・圓．◯°゜。）（丸鬘謾幡縵懣鰻幔蹣蔓瞞卍饅漫滿慢迄笆貧幻瞼蔟疎眩回廻設申儲招繚統纒的蟶孫彎弯籬擬免猿亮純信実委罷壗侭圸飯儘継随髷任蒭芻耙紛鮪見猯塗斈學眥眦眼俎愛学斑枡斗鱒舛升桝萬蠱呪薪槙槇牧窗惑悗円窓甼襠区街町前複亦俣叉跨全瞬木胯股又鍖枕膜幕參眛参瑁詣妹哩迷枚米賄賂埋昧邁毎秣靺抹沫枩奉祀纏祭睫末大秀太勝柾弄優成盛將松匡鉞賢征誠昌希将政正仁雅媽万俟茉満目先麼未卷散磨枉眞益真増負蒔坐交馬捲舞嘛雑在放墹痲撒待播間摩敗巻混曲魔ま光月♪♭♯ム⊃∴≦∞÷≫≧≪⌒±∈∀⊂∬∫∝∨∽Δ¬⇒⊥∃∠∧⊆⇔∵≡∩×⊇∂∋≠√∪∇≒♂曼麻◎〇○●モＭ〒′−マ最ミМΜμメM]\|ｯ\_s*[ﾓﾒﾑﾐﾏ]\|ッ\_s*[モメムミマ]\|っ\_s*[もめむみま]\|双\_s*\%([手墨親]\|向\_s*き\|差\_s*し\)\|蜀\_s*黍\|唐\_s*土\_s*\%(書\|文\_s*字\)\|両\_s*\%([角親刃]\|差\_s*し\)\|楊\_s*梅\_s*皮\|主\_s*水\|旺\_s*角\|紅\_s*[絹染葉]\|強\_s*請\|虎\_s*落\|痘\_s*瘡\|莫\_s*斯\_s*科\|固\_s*よ\_s*り\|一\_s*徳\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|惘\_s*然\|乙\_s*張\|赤\_s*目\_s*魚\|針\_s*孔\|妻\_s*[君合沼]\|墨\_s*西\_s*哥\|鍍\_s*金\|繍\_s*眼\_s*児\|夫\_s*婦\|乳\_s*母\|布\_s*の\_s*子\|没\_s*\%([薬後入却有]\|義\_s*道\|食\_s*子\)\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|浮\_s*腫\|６\_s*日\|6\_s*日\|崇\_s*田\|刀\_s*背\|襁\_s*褓\|零\_s*余\_s*子\|蜈\_s*蚣\|産\_s*霊\|息\_s*子\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|蚯\_s*蚓\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|山\_s*陵\|雎\_s*鳩\|親\_s*王\|嬰\_s*児\|亨\_s*治\|陸\_s*奥\|皇\_s*[子女國]\|３\_s*[つ日]\|3\_s*[つ日]\|角\_s*[鴟子髪]\|七\_s*寸\|鳩\_s*尾\|鷦\_s*鷯\|孤\_s*児\|凝\_s*視\|兎\_s*唇\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|神\_s*[子輿酒]\|苗\_s*字\|海\_s*[雲蘊藻布蜂松山]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|土\_s*[龍竜産]\|京\_s*都\|横\_s*浜\_s*マ\_s*リ\_s*ノ\_s*ス\|忠\_s*実\|肉\_s*刺\|翻\_s*\%(筋\_s*斗\|車\_s*魚\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|不\_s*\%(味\|見\_s*[転点]\)\|兇\_s*々\|凶\_s*鳥\|澗\_s*潟\|勾\_s*玉\|禍\_s*[々禍言事]\|況\_s*し\|澳\_s*門\|苧\_s*麻\|茅\_s*台\_s*酒\|丈\_s*夫\|倍\_s*達\|微\_s*[塵妙睡]\|燐\_s*寸\|驀\_s*地\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|豫\_s*て\|陪\_s*臣\|売\_s*僧\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|理\_s*[之元]\|允\_s*彦\|祐\_s*史\|晶\_s*子\|公\_s*[美則輝]\|斉\_s*加\_s*年\|方\_s*夫\|多\_s*言\_s*語\_s*化\|ｍ\_s*-\_s*Ｒ\_s*Ｎ\_s*Ａ\|ニ\_s*ー\_s*モ\_s*ニ\_s*ッ\_s*ク\|単\_s*量\_s*体\|会\_s*議\|和\_s*布\_s*[刈蕪]\|中\_s*間\_s*子\|薄\_s*荷\_s*脳\|行\_s*[幸列]\|写\_s*像\|日\_s*\%(米\_s*相\_s*互\_s*防\_s*衛\_s*援\_s*助\_s*協\_s*定\|本\_s*製\)\|m\_s*\%(u\_s*l\_s*t\_s*i\_s*l\_s*i\_s*n\_s*g\_s*u\_s*a\_s*l\_s*i\_s*z\_s*a\_s*t\_s*i\_s*o\_s*n\|i\_s*\%(c\_s*r\_s*o\|l\_s*l\_s*i\)\|e\_s*\%(g\_s*a\|z\_s*z\_s*o\_s* \_s*\%(f\_s*o\_s*r\_s*t\_s*e\|p\_s*i\_s*a\_s*n\_s*o\)\)\|a\_s*\%(k\_s*e\_s*フ\_s*ァ\_s*イ\_s*ル\|d\_s*e\_s* \_s*i\_s*n\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\)\)\|計\_s*算\_s*機\|手\_s*紙\|ザ\_s*ッ\_s*ヘ\_s*ル\_s*＝\_s*マ\_s*ゾ\_s*ッ\_s*ホ\|嗜\_s*虐\_s*的\_s*趣\_s*味\|被\_s*虐\_s*\%(淫\_s*乱\_s*症\|趣\_s*味\)\|修\_s*士\|仮\_s*面\|移\_s*送\|エ\_s*ム\)',
+      \ 'N' : '\%([ﾉ麕咒燧烽詛呪悳孔伯朔弼雅教糊矩憲規哲宜紀範典惟亘修允攵展順暢信則法後罵吭咽喉鑿蚤々湾宣曰臨覘稀望覗遺殘残鋸芒禾騰幟昇登上簷檐軒遁逸衲瑙碯曩王皇腦嚢膿能脳農野伸嚥−陳除濃熨飲退飮延載之呑廼乘乗述埜のﾈ塒姉聹侫檸嚀濘寧佞鼡鼠拗猫嫉妬希願捏熱犒労葱狙閨睡棔眠然稔棯懇拈撚燃念年根寝音涅子捻禰袮練値錬粘捩祢寢嶺煉ねﾇ絖饅垈帛幣鵺主蛻拭温布沼盜偸窃盗抽擢緯糠額縫抜貫拔怒奴塗濡脱ぬﾆ楡蒻潦鷄鶏瀑庭繞獰女尿韭眈薤睨韮儿刄姙葫蒜刃忍∀妊認任人乳擔蜷担濁賑握俄鳰臭匂沸錵贄偐僞贋偽柔靤如苦膠霓滲虹躙廿》《◎∬『』悪憎兄螺鯡鰊錦西入新肉‖岻仁逃似邇弍荷貳弐２二尼迩煮2丹貮児迯にﾅ靡抔嫐嬲鯆屶釶鉈泥薺詰若慨歎嘆抛擲撲毆殴慰治癒等猶直泪波辺邉邊鍋浪某棘棗懷懐夏擦梨情懶譌艶訛鉛鯰癜鮠膾鱠韲憖怠鈍腥捺准準擬凖謎涙洋宥傾灘詠霖眺痼乍存流轅永和梛椥渚長莫毋勿半・媒仲中７斜七蔑乃尚内繩畷縄苗滑鞣惱悩就哉也斉形業徳娚垂喃∵楠爾尓汝男軟難何倣肄双枹均列柞→⇒⊃楢習嘗投爲綯啾啼熟那鳴泣慣生為儺舐菜奈涕並納痿嚶撫茄凪無哭做狎南萎竝魚娜薙亡馴拿失な┘┛│┃┨┫┤┥┣┝├┠╋┿╂┼成＃∋∇名┗└日≒ニネＮ¬〜≠ナヌノнνΝНN]\|ｯ\_s*[ﾉﾈﾇﾆﾅ]\|ッ\_s*[ノネヌニナ]\|っ\_s*[のねぬにな]\|帳\_s*面\|狼\_s*[烟煙]\|惚\_s*気\|暖\_s*[簾気]\|礼\_s*江\|功\_s*晶\|賀\_s*子\|訓\_s*子\|祈\_s*子\|式\_s*部\_s*省\|記\_s*代\|倫\_s*[明子宗]\|敬\_s*之\|賭\_s*弓\|誠\_s*也\|敦\_s*子\|悦\_s*旦\|祝\_s*[女詞]\|仰\_s*け\_s*反\|盧\_s*泰\_s*愚\|逆\_s*上\|凌\_s*霄\_s*花\|姐\_s*さ\_s*ん\|杜\_s*松\|強\_s*請\|合\_s*歓\|微\_s*温\|零\_s*余\_s*子\|酸\_s*漿\|鐃\_s*鉢\|鰾\_s*膠\|I\_s*I\_s*部\|耳\_s*根\|面\_s*皰\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|莞\_s*爾\|L\_s*e\_s*a\_s*d\|P\_s*b\|海\_s*[苔鼠]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|雪\_s*崩\|竹\_s*節\_s*虫\|7\_s*[日個]\|地\_s*震\|行\_s*[木方]\|大\_s*\%(蒜\|理\_s*石\)\|蛞\_s*蝓\|弱\_s*竹\|追\_s*儺\|済\_s*\%(し\_s*崩\|り\_s*物\)\|可\_s*成\|平\_s*城\|不\_s*成\|空\_s*リ\_s*ス\_s*ト\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|ｎ\_s*\%(個\|次\_s*元\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\)\|紐\_s*育\|フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|ヤ\_s*ー\_s*ノ\_s*ッ\_s*シ\_s*ュ\_s*・\_s*フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|オ\_s*ラ\_s*ン\_s*ダ\|ア\_s*メ\_s*リ\_s*カ\_s*ネ\_s*ッ\_s*ト\_s*ワ\_s*ー\_s*ク\|番\_s*号\|節\_s*点\|夜\_s*想\_s*曲\|n\_s*\%(次\|a\_s*n\_s*o\|o\_s*t\_s* \_s*o\_s*r\)\|諾\_s*威\|正\_s*常\|エ\_s*ヌ\|窒\_s*素\)',
+      \ 'O' : '\%([ｵ俺游泳指妖畢在澱檻氈拇親愚疎颪卸念錘惟慮赴徐趣俤羈主想表重面瘟隱園Å怨♀妾温恩悍鈍臣覺溺朦朧思覚榲現朮桶威嚇踴戯縅棘駭愕驚躍踊傲奢驕嚴厳痴遣瘧怒行怠蒹補荻懼惧獺虞怐畏恐襲甥笈及綬葹ヽゞ〃仝ゝヾ々同唖繦襁鴛鴦教几忍筬收兎抑稚長幼理収治修遲檍納後遅饋賻諡贈送憶袵臆拜拝峻侵奇冒犯崗阜陵岳女陸丘岡欄斧自己各戦鬼衰劣囮頤訪貶乙漢♂音弟阿脅怯首夥誘屋膃億穩穏煽熈煕熾燠諚掟興隠沖翁鴬澳嚶毆泓浤惶罌瓮泱閘蓊墺悒凰殃徃奧秧襖枉姶鸚懊媼嫗鴎怏鏖謳旺凹櫻鴨樗欒楝殴朷甌汪横往鞅歐嘔陷陥遠果応掩蔽應夛奄蓋概欧公邑麋薤被仰扇皇狼弁鵬鴻鳳黄奥多衽覆粱凡鰲頁王穂怖桜壓緒居起降落墮将帶麻央小牡勇捺圧措唹織追悪苧汚下御置帯生折朗於負郎擱押推雄塢老男夫逐墜尾惜嗚乎堕終淤お大◎∞和∝♪∪∨開Ｏ○ωΟОオΩοоO]\|濠\_s*太\_s*剌\_s*利\|父\_s*[娘子]\|母\_s*[娘子屋]\|万\_s*年\_s*青\|本\_s*懸\_s*魚\|玩\_s*具\|沢\_s*瀉\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|厭\_s*離\|乳\_s*母\_s*日\_s*傘\|陰\_s*[陽地]\|飲\_s*[食酒]\|慍\_s*色\|婦\_s*系\_s*図\|手\_s*術\|螻\_s*蛄\|十\_s*八\_s*番\|鉄\_s*漿\|海\_s*髪\_s*海\_s*苔\|虎\_s*魚\|花\_s*魁\|美\_s*味\|含\_s*羞\_s*草\|白\_s*粉\|渡\_s*島\|訳\_s*語\|通\_s*事\|晩\_s*[稲生]\|可\_s*笑\|惡\_s*寒\|傍\_s*[目惚見]\|叔\_s*[父母]\|伯\_s*[父母]\|姨\_s*捨\|少\_s*女\|侠\_s*気\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|霊\_s*屋\|蝌\_s*蚪\|飫\_s*肥\|佩\_s*物\|良\_s*人\|纓\_s*田\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|鷹\_s*揚\|椀\_s*飯\_s*振\_s*\%(舞\|る\_s*舞\)\|相\_s*知\|鶯\_s*語\|近\_s*江\|零\_s*落\|越\_s*[生訴智知度]\|彼\_s*方\|祖\_s*[神父母]\|車\_s*前\|従\_s*祖\_s*[母父]\|青\_s*[梅海木]\|太\_s*\%(田\|安\_s*万\_s*侶\|上\_s*天\_s*皇\)\|巨\_s*頭\|逢\_s*[魔瀬隈坂]\|そ\_s*の\_s*他\|承\_s*知\_s*し\_s*ま\_s*し\_s*た\_s*\.\|烏\_s*[滸龍]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|立\_s*石\_s*電\_s*機\|職\_s*業\|楕\_s*円\|ウ\_s*\%(ィ\|ー\_s*\%(ズ\|ロ\_s*ン\)\|ロ\_s*ボ\_s*ロ\_s*ス\)\|出\_s*力\|ア\_s*\%(ワ\|ザ\_s*ー\|ウ\_s*\%([チト]\|タ\_s*ー\)\)\|基\_s*本\_s*ソ\_s*フ\_s*ト\_s*ウ\_s*ェ\_s*ア\|一\_s*\%(昨\_s*[年日]\|対\_s*一\)\|ワ\_s*ン\|ま\_s*た\_s*は\|論\_s*理\_s*和\|聖\_s*譚\_s*曲\|水\_s*中\_s*酸\_s*素\_s*破\_s*壊\_s*剤\|蛋\_s*白\_s*石\|最\_s*適\_s*化\|歌\_s*劇\|演\_s*算\_s*子\|操\_s*作\|酸\_s*素\)',
+      \ 'P' : '\%([本磅椪烹方砲報法舖歩舗ぽ併蔽閇閉×邊編片邉辺遍篇屁ぺ幅服風分布符腐泌匹憑票俵品筒平日版幇搬板犯腹払発發走箱朴駮博拍泊愽包放敗杯盃配牌八播波破羽張ぱ鉛ψΨぴ±＋ぷφΦ┣├∝北┴‰Ｐ．％£〒点・プポ頁）（∂¶‖ペパПπピпΠ燐P]\|ｯ\_s*\%(ﾎ\_s*ﾟ\|ﾍ\_s*ﾟ\|ﾌ\_s*ﾟ\|ﾋ\_s*ﾟ\|ﾊ\_s*ﾟ\)\|ッ\_s*[ポペプピパ]\|っ\_s*[ぽぺぷぴぱ]\|ﾎ\_s*ﾟ\|先\_s*斗\_s*町\|ﾍ\_s*ﾟ\|祕\_s*[露魯]\|ﾌ\_s*ﾟ\|釜\_s*山\|普\_s*魯\_s*西\|ﾋ\_s*ﾟ\|皮\_s*蛋\|光\_s*一\|ﾊ\_s*ﾟ\|麺\_s*麭\|巴\_s*\%(里\|奈\_s*馬\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|排\_s*骨\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|白\_s*[板酒金]\|シ\_s*\%(ュ\_s*ー\_s*ド\|ロ\_s*シ\_s*ビ\_s*ン\)\|サ\_s*\%(ー\_s*ム\|イ\_s*\%([ズクケコ]\|ロ\_s*シ\_s*ビ\_s*ン\|リ\_s*ウ\_s*ム\|キ\_s*ッ\_s*ク\)\)\|+\_s*α\|ホ\_s*\%(ン\|ス\_s*ゲ\_s*ン\)\|ヒ\_s*ロ\_s*ポ\_s*ン\|比\_s*\%(布\|律\_s*賓\)\|フ\_s*\%(リ\_s*ジ\_s*ア\_s*ン\|レ\_s*\%(ー\_s*\%(ズ\|ジ\_s*ン\_s*グ\)\|イ\_s*ジ\_s*ン\_s*グ\)\|タ\_s*レ\_s*イ\_s*ン\|ォ\_s*\%([ーンノト]\|ボ\_s*ス\|ビ\_s*ア\|ス\_s*フ\_s*ァ\_s*ー\|ニ\_s*ー\)\|ァ\_s*\%(イ\|ラ\_s*オ\|ー\_s*\%([ジマ]\|ミ\_s*ン\_s*グ\)\|ン\_s*\%(ト\_s*ム\|タ\_s*ズ\_s*[ムマ]\)\|ル\_s*[ツス]\|レ\_s*ノ\_s*プ\_s*シ\_s*ス\)\|ィ\_s*\%([ロル]\|ジ\_s*\%(ッ\_s*ク\_s*ス\|カ\_s*ル\)\|ー\_s*ビ\_s*ー\|ッ\_s*シ\_s*ン\_s*グ\|レ\_s*モ\_s*ン\|ラ\_s*デ\_s*ル\_s*フ\_s*ィ\_s*ア\|リ\_s*\%([スーアパ]\|ッ\_s*[プパ]\|ピ\_s*\%(ン\|ー\_s*ヌ\)\)\)\|ェ\_s*\%(ー\_s*\%([ベズ]\|ジ\_s*ン\_s*グ\)\|イ\_s*ズ\|ロ\_s*モ\_s*ン\|ニ\_s*\%(ル\|ッ\_s*ク\_s*ス\|キ\_s*ア\|ー\_s*ル\)\|ノ\_s*\%(キ\_s*シ\|ー\_s*ル\)\)\)\|述\_s*語\|証\_s*明\|タ\_s*ン\_s*パ\_s*ク\_s*質\|処\_s*理\|手\_s*続\_s*き\|進\_s*行\|算\_s*譜\|利\_s*潤\|南\_s*瓜\|公\_s*告\|宣\_s*伝\|真\_s*珠\|永\_s*続\|カ\_s*リ\_s*ウ\_s*ム\|葡\_s*萄\_s*牙\|重\_s*合\_s*体\|多\_s*相\_s*型\|バ\_s*テ\_s*レ\_s*ン\|貼\_s*り\_s*付\_s*け\|論\_s*文\|偏\_s*執\_s*[狂病]\|引\_s*数\|p\_s*\%(T\_s*e\_s*X\|H\_s*メ\_s*ー\_s*タ\|e\_s*\%(t\_s*a\|r\_s*l\_s*ス\_s*ク\_s*リ\_s*プ\_s*ト\)\|i\_s*\%(c\_s*o\|a\_s*n\_s*\%(o\|i\_s*s\_s*s\_s*i\_s*\%(m\_s*o\|s\_s*s\_s*i\_s*m\_s*o\)\)\)\)\|リ\_s*ン\)',
+      \ 'Q' : '\%([配椪栩櫪椢檪椡橡椚湫櫟含纐柵婚屎糞癖潛潜鵠裹凹窪馘括縊踵跟軛頚珞頸首諄窟鞋履寛狐轡覆靴沓碎砕管条降件頽崩屑葛釘莖茎陸杙株杭掘崛倔鶏鐃藥擽薬樟楠酒髪梳櫛串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖種ξΞ臭日茸菌楔草圀邦國国髭嗽漱吻喙嘴脣唇蛇梔劫刧腔φ　空粂皹勳熏裙醺桾皸下薫燻訓勲葷君委钁精詳企鍬加咥銜桑塊某暝競峅眛昏晦罔冥鮓比較闇位鞍藏暗倉廚厨涅〃仝ヽゞヾ々ゝ曇雲蜘栗狂包俥車廓曲郭梍枢踝畔鉄鐵★●■玄蔵黒玖柧供喰苦九枸鳩煦悔焼功倶狗来拘徠吼刳工絎駒朽眩垢口屈窶駈区劬繰呉宮暮貢久嶇來矩奇鉤９酌庫惧躯組衢紅食句吁懼區桍孔驅駆怐瞿汲ｸくＱ”‘’“♪ケ？ク¶Q]\|ｯ\_s*ｸ\|ッ\_s*ク\|っ\_s*く\|姑\_s*娘\|箜\_s*篌\|救\_s*世\|莎\_s*草\|傀\_s*儡\|被\_s*下\_s*度\|百\_s*[濟済]\|果\_s*物\|恭\_s*敬\|長\_s*月\|9\_s*月\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|天\_s*鼠\_s*矢\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|山\_s*梔\_s*子\|崑\_s*央\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|c\_s*r\_s*e\_s*s\_s*c\|水\_s*[鶏母]\|海\_s*月\|内\_s*蔵\_s*助\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|公\_s*\%([家方卿界美事文]\|出\_s*挙\)\|佝\_s*僂\_s*病\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|胡\_s*桃\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|珠\_s*穆\_s*朗\_s*瑪\|チ\_s*ョ\_s*モ\_s*ラ\_s*ン\_s*マ\|『\_s*』\|コ\_s*\%(ー\_s*ラ\_s*ン\|ン\_s*テ\_s*ィ\_s*フ\_s*ァ\_s*イ\_s*ア\)\|問\_s*合\_s*せ\|カ\_s*\%(ザ\_s*ン\|タ\_s*ー\_s*ル\|ス\_s*バ\|ー\_s*ヌ\_s*ー\_s*ン\|ナ\_s*ー\_s*ト\|ダ\_s*フ\_s*ィ\|リ\_s*テ\|ド\_s*リ\_s*ー\_s*[ユル]\|ル\_s*\%(チ\_s*[ェエ]\|テ\_s*\%(ィ\_s*エ\|ッ\_s*ト\)\)\|ン\_s*タ\_s*[ムスン]\)\|質\_s*問\|キ\_s*\%(ト\|ブ\_s*ラ\|ホ\_s*ー\_s*テ\|ハ\_s*ー\_s*ダ\|ル\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\|ー\_s*ン\|ノ\_s*ン\|ッ\_s*シ\_s*ュ\|ュ\_s*\%(ー\|エ\_s*リ\)\)\)',
+      \ 'R' : '\%([ﾛ侖崙崘堽栄論祿漉轆碌肋勒麓禄鹿６録弄榔薐勞琅實樓焜瓏潦簍僂咾鑞柆螂臈槞瑯哢隴朖蘢螻滝朧壟撈臘郎瘻廊牢浪蝋癆聾楼篭籠狼漏朗轤瀘廬櫓櫨艪顱驢蕗鷺鹵蘆枦櫚炉輅艫滷臚爐賂髏ろﾚ洌澪蛉儷犁勵鴒齢苓綟砺囹糲唳聆〇蛎齡蠡黎羚戻禮祈隸茘麗玲隷伶癘励零冷例冽劣烈裂列靂檪癧轣鬲櫪瀝礫轢歴濂戀匳嗹奩斂鏈瀲漣鎌縺輦簾櫺∧聨憐恋蓮煉錬攣練聯廉連れﾙ♪路盧縲泪壘瘰誄涙羸塁累類縷璢鏤屡褸婁陋るﾘ犂篥葎率慄栗勠淕六戮陸律擽畧暦掠略澑苙嶐瀏鏐瑠窿餾鉚旒瘤畄霤嚠笠榴溜硫琉留立柳粒劉隆流躪藺醂痳棆懍鄰菻躙鈴廩麟P淪厘凜霖琳悋綸淋禀稟凛鱗倫吝隣林燐臨絽踉侶梠膂虜呂慮仂力緑魎粮獵靈粱裲倆怜輌鷯繆廖凉鬣椋楞崚嶺暸兩鐐蓼輛燎瞭聊陵令梁糧諒霊遼凌龍漁亮寮⇔涼撩繚綾療竜量菱僚領了寥稜喨両料閭旅璃籬履釐悧裏梨俚里離浬莅驪痢李哩罹俐漓吏利裡詈理莉りﾗΛλ婪儖繿纜嬾覧瀾臠亂檻欒欖攬籃襴巒覽襤懶爛藍鸞卵濫闌嵐欄乱蘭労剌溂老埓埒猟辣薤喇珞樂犖絡駱酪烙楽落洛徠醴罍櫑耒賚蕾籟擂儡莱磊癩來礼雷頼来螺拉裸們良蘿騾等邏鑼ら右→ДжАГБФдзъЧйёЗкНЖьЭцТУСвюЮЁЯЪЛВбХМмЦоынИэа露епЕЬКПЩсчщя魯ШглушЫхОитфЙ輪√根羅ロ々ＲラルレリРρрΡR]\|ｯ\_s*[ﾛﾚﾙﾘﾗ]\|ッ\_s*[ロレルリラ]\|っ\_s*[ろれるりら]\|鱸\_s*魚\|芦\_s*[有花]\|濾\_s*[胞過紙]\|水\_s*無\_s*月\|6\_s*[時月]\|檸\_s*檬\|坩\_s*堝\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|鯉\_s*[魚城]\|二\_s*\%(索\|翻\_s*縛\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*ケ\_s*ー\_s*ブ\_s*ル\)\|海\_s*獺\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|関\_s*係\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\|数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|京\_s*都\_s*大\_s*学\_s*数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|東\_s*北\_s*大\_s*\%(通\_s*研\|学\_s*電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\)\|電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|限\_s*定\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|範\_s*囲\|規\_s*則\|紅\_s*玉\|r\_s*u\_s*b\_s*y\_s*ス\_s*ク\_s*リ\_s*プ\_s*ト\|要\_s*求\|検\_s*索\|復\_s*帰\|返\_s*[信事]\|拒\_s*否\|反\_s*射\_s*鏡\|参\_s*\%(考\_s*文\_s*献\|照\_s*型\)\|機\_s*能\_s*回\_s*復\_s*訓\_s*練\|再\_s*帰\_s*的\|認\_s*識\|正\_s*規\_s*表\_s*現\|ア\_s*ー\_s*ル\)',
+      \ 'S' : '\%([ｿ似杣灌傍峙毓育具供備害底苑薗園儲貮酘妬埆埣譏讒詆誹謗濡外猝率喞熄仄息足促束測側赱澡鯵嗾掫筝竃裝弉髞瀧勦輳嗽搶蔟爭偬瘡窗菷葱剏梍壯竈譟崢蚤笊嫂薮雙帚叟諍屮滝槽贈湊箱艘愡甑箒艚抓燥樔奘懆歃孀窓踪匝噪遭艙爪糟莊倉怱曹匆淙繰宋漕簇槍躁鎗箏綜痩喪藻艸葬壮操掻掃奏蹌滄争草層創蒼叢僧走惣送叛乖抑諳某橇轌艝拵噂巽邨鱒忖蹲樽孫遜存尊損噌其反踈組粗租胙俎礎爼詛麁囎蔬姐塑甦疎副措訴愬疽酥逸鼡沮蘓徂沿阻齟疏祖鼠咀想祚そｾ芹鬩槧羶甎揃倩翦箋燹濺苫栫槫孱孅簽吮纖湶纎亘筌蟾磚荐茜綫箭舩喘錢專僊贍鐫仟旃痊涎巛銛饌僣氈韆籤沾刋擶舛牋阡濳籖癬潛筅殱殲闡釧賎餞羨顫甅竰糎¢陝銓踐閃潺遷銑栴川剪煽譫僉瞻践栓跣疝詮銭穿戰腺繊僭泉嬋淺擅鮮専潜扇浅蘚船線撰宣洗煎戦千忙伜倅逼蝉旋洩椄卩屑絏鱈泄攝紲緤薛褻浙竊℃窃拙摂接節楔淅蹐績蹠蓆籍磧跡跖關藉晰威迹瘠勣裼晢夕鶺潟碩惜析関席隻情甥躋貰淒婿嘶睛擠撕牲萋菁韲瀞穽齏筬晟掣腥逝惺旌蜻整靖誓制晴競急世堰攻脊丗勢畆糶瀬畝せｽ鯣鋭坐座李既已昴術辷全滑皇脛臑裾双英村選優営寸漱薦啌勸雪濯啜勧芒薄煤賺鼈捩筋頗丞輔佑亮甫祐介助蘇裔陶曽乃曾即則淳漁凉鑾篶漫硯雀涼鱸鮓鮨遊椙犂犁耒篦隙尽末眇縋管菅頽廢廃窘救掬寡尠糘粭菫速純鈴炭角墨隅】【鄒數菘陬雛芻嵩崇趨樞∝∫∠∞≫∧∋÷⇒∬∃∂∴±∩≒Δ¬∇×∀∈⌒≪≧≠∨∵⇔枢翆榱陲悴隹粹瘁帥騅萃邃錘捶忰誰醉遂膵燧彗綏錐穂炊翠⊥H吹粋推水酔睡掏鋤總巣直簾拗耡醋棲総過饐剃澄籔空透磨壽澂寿統梳喫栖棄据吸擂剥住好漉ｼ埀謐蕋蘂蕊痺褥茵鵐蔀鷸鴫入霑蔵嶌縞嶋島凋澀沫澁渋縛暫屡荵凌鎬忍慕簧舖↓襪健認随从啝從．舌扱罔θ虐Θ粃秕椎椣卓貎尿肉臠猪榻黙蜆楙誠茂成繁重鋪惻陣頻閾櫁樒汐鹽潮隰瑟嫉櫛蛭蟋疾隲漆躾膝失室沒鎭沈滴雫賤鎮靜顰尓爾確聢併◇◆鹿貭叱征質卯滋撓科品鬼錣鍜錏凝痼而拉設萎栞襞吝咳爲什導怪汁徴験著記印〇○』銀城代『報調蝨濕湿七僕笞楚霜臀退斥尻寫卸者炙冩柘舍暹諜喋煮這謝鯱奢赦捨瀉嚼抉決皙勺釋蜥爍鑠妁斫蹟刳昔芍酌爵折癪笏赤綽灼石尺借赭写鷓積舎車斜釈社蛛株麈諏洙殳娶娵鬚侏銖繻卒菽粥叔俶戚蓿倏蹙槭肅淑夙粛縮取珠殊趣恤蟀卆出鰍繍楢葺溲泅嗅楫酬逎遒緝岫螽萩鷲甃駲楸穐蹤讎售讐洲綉收驟囚舅姑蓚鞦脩輯醜習羞酋聚舟秀祝袖拾啾蒐収執衆襲愁就臭蹴週終褶州宗椶棕守朱撞種修周手首狩須儁皴悛惷蕣雋墫順蠢舜旬竣峻駿逡筍春瞬俊嗔蓁縉蔘鷏忱簪甄鷆寢岑畛矧疹槙齔臻娠譛譖哂脣袗怎晉瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵辛薪晨辰震宸森伸愼眞慎寝晋身進審深親臣鍼心宍信神藷墅薯杵岨胥蜍黍渚砠處嶼且狙苜苴曙背塩緒枌雎蔗庶処所書暑誚聲橡奬觴舂蛸懾燮厰姓獎枩稍甞韶炒淞陞顳腫井摺嶂橸浹愴星升鍬樅嘗簫慯廂霎庠剿筱鬆秤政訟廠樵鷦礁邵餉愀妝璋湫艢劭峭殤梢將敞醤慫従逍倡竦爿牆墻薔笙樟装肖菖＜≦湘誦聳檣稱声裳（）蒋蕉嘯慴精霄鈔粧彰悚鏘悄蕭哨瀟焦憔匠鍾償瘴漿頌詔妾沼請衝薑唱庄渉奨牀娼床椒鉦荘翔抄宵傷踵召銷賞猩症昭燒猖昌少憧松捷紹晶尚象承證正将称焼笑照勝招消章詳証鐘硝掌省商昇穡屬稷嗇禝寔稙昃謖軾矚拭餝属燭贖色飾囑嘱織蝕式喰蜀殖初諸埴植食職砥姉摯誣侈髭肆仔及岐址梔咫贄沚旨誌資豕鷙凍厮粢齒雌耜枝齎領篩四祇嗤貲諮巵死強紙熾市師厶妛飼諡祗閇姿駟嗣趾此染締詞茲釶柿覗弛徙至屍嘴斯駛屎占啻之揣如閉錙糸絞孜尸滓獅瓷緊笥始泗咨觜只輜廝使敷恃思帋痴漬脂氏蚩時紫沁俟絲巳祉矢恣若賜次浸詩志識司弑笶翅謚示梓伺視緇自祠史試子痣滲茨肢歯幟祀施竢舐卮耆呰為芝阯しｻ杓雨寤鮫清鞘莢觸騷触椹鰆爽騒澤沢濬掠新攫渫杷浚更士桾申白素汕纉潸餐蒜衫讚粲芟爨鑚蠶戔嶄跚驂慘攅斬彡杉秋桑…≡簒纂鯢燦珊繖棧刪卅參蚕鑽算傘３▼▽贊3参賛O散惨産酸嘸摩遉樣彷碍妨様山漣貶蔑垂鮭叫仙鏥寞寥皺淋生鯆虱鯖捌偖扨偵宿禎貞定哘誘蝎蠍授皿祥桟匙簓障囁私篠支捧笹逧迫讃鐸蛹宛真碕嵜尖前崎魁遮峺哢囀候侍核実説俚了達逹暁叡聰敏諭慧哲知訓郷恵聡智悟理杆里小棹竿箚扎刹紮皐撮搜寒捜相主盛盞柧觚杯盃榮栄倒肴魚界阪堺境酒泝逆賢坂榊猿麾挟鷺拶撒擦颯先数察薩刷札綵衰縡偲腮樶責哉殺霽崔淬顋寨切洒纔碎晒犲濟凄砦灑釵靫悽摧倖豺呵苛幸猜塞蔡栽儕采齊財臍截載孥宰済齋犀際災柴賽菜砕採斉斎祭妻債催才細鰓裁歳最埼捉辟柞縒咋簀筰齪筴窄册槊酢嘖朔柵遡溯鑿索搾昨炸冊策錯櫻桜裟提砂乍去射狭狹紗刺唆曝柤蓑裂捺做梭磋褪銹荒插醒挫差莎削止冷早避些槎嵳嵯嗟沙娑然再渣蹉扠詐割咲注覚嗄茶螫簑瑣下左搓瑳冴寂鎖挿叉査佐作覺点冱錆さ√錫す／仕指製西　┓┐〆□■шШ上＃♯щЩ添∪日⊂⊆⊃⊇文静★☆＊標嗜青三聖土彩△▲悉署〜∽‘’┌┏集＼探§″性セサＳシソス秒σΣСсS]\|ｯ\_s*[ｿｾｽｼｻ]\|ッ\_s*[ソセスシサ]\|っ\_s*[そせすしさ]\|遽\_s*走\|蕎\_s*麦\|内\_s*障\|彼\_s*杵\|諷\_s*歌\|幾\_s*許\|錚\_s*[錚々]\|十\_s*\%(路\|露\_s*盤\)\|冬\_s*青\|微\_s*風\|虚\_s*言\|宙\_s*組\|夫\_s*[々夫]\|返\_s*田\|傴\_s*僂\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|c\_s*e\_s*n\_s*t\_s*i\|妹\_s*尾\|嘲\_s*笑\|海\_s*象\|蒸\_s*[篭籠]\|魑\_s*魅\|凡\_s*て\|典\_s*侍\|季\_s*雄\|天\_s*[皇蛾]\|蘿\_s*蔔\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|夊\_s*繞\|隧\_s*道\|Ｃ\_s*\%(型\|言\_s*語\)\|老\_s*舗\|望\_s*潮\|飛\_s*沫\|L\_s*a\_s*\%(m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|桎\_s*梏\|柳\_s*葉\_s*魚\|衣\_s*魚\|汚\_s*点\|蠹\_s*魚\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|閑\_s*[谷か]\|云\_s*[云々]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|７\_s*月\|7\_s*月\|４\_s*[分月]\|4\_s*月\|羊\_s*[齒歯]\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|不\_s*[忍知]\|後\_s*\%([輪口志目]\|込\_s*み\)\|軍\_s*鶏\|香\_s*菜\|吃\_s*逆\|蝦\_s*蛄\|輸\_s*[出贏]\|隼\_s*[朗郎]\|笋\_s*[干羹]\|縦\_s*容\|睫\_s*毛\|翡\_s*翠\|東\_s*\%(雲\|海\_s*林\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|髑\_s*髏\|匣\_s*鉢\|復\_s*習\|百\_s*日\_s*紅\|胡\_s*孫\_s*眼\|←\_s*→\|霰\_s*弾\|弥\_s*生\|懺\_s*\%(法\|悔\_s*懺\_s*悔\)\|流\_s*[離石]\|蠑\_s*螺\|覇\_s*王\_s*樹\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|言\_s*語\|D\_s*店\|型\_s*肝\_s*炎\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|竹\_s*[篦刀筒]\|大\_s*角\_s*豆\|防\_s*人\|曩\_s*に\|向\_s*坂\|一\_s*昨\_s*\%(昨\_s*[年日]\|々\_s*[年日]\)\|實\_s*藤\|甘\_s*藷\|五\_s*月\|月\_s*代\|匂\_s*坂\|税\_s*所\|雑\_s*賀\|骰\_s*子\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|s\_s*f\_s*o\_s*r\_s*z\_s*a\_s*n\_s*d\_s*o\|瑞\_s*[典西]\|B\_s*\%(r\|シ\_s*ェ\_s*ル\)\|拡\_s*張\_s*子\|ｓ\_s*ｕ\_s*ｎ\|部\_s*分\|置\_s*換\|ア\_s*ン\_s*チ\_s*モ\_s*ン\|構\_s*造\_s*体\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|加\_s*\%(之\|虐\_s*\%(淫\_s*乱\_s*症\|趣\_s*味\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|ケ\_s*イ\_s*素\|珪\_s*素\|計\_s*測\_s*自\_s*動\_s*制\_s*御\_s*学\_s*会\|ネ\_s*ッ\_s*ト\_s*サ\_s*ー\_s*ビ\_s*ス\|ザ\_s*\%(ッ\_s*ク\|ク\_s*セ\_s*ン\|ビ\_s*ー\_s*ネ\|ウ\_s*バ\_s*ー\|ワ\_s*ー\_s*ク\_s*ラ\_s*ウ\_s*ト\|ム\_s*ザ\|ル\_s*ツ\|イ\_s*\%([ルン]\|ラ\_s*ー\|デ\_s*ル\)\|ー\_s*\%([ルラ]\|メ\_s*ン\)\)\|意\_s*味\|ゼ\_s*ミ\|ナ\_s*ト\_s*リ\_s*ウ\_s*ム\|ゾ\_s*\%(ル\|ン\_s*デ\|ー\_s*\%(ム\|リ\_s*ン\_s*ゲ\_s*ン\)\|フ\_s*ィ\_s*ー\)\|ジ\_s*\%(ム\|ー\_s*\%([グク]\|メ\_s*ン\_s*[ズス]\)\|グ\_s*ム\_s*ン\_s*ト\|ン\_s*\%(メ\_s*ル\|グ\_s*シ\_s*ュ\_s*ピ\_s*ー\_s*ル\|テ\_s*ー\_s*ゼ\)\)\|硫\_s*黄\|エ\_s*ス\)',
+      \ 'T' : '\%([ﾄ乕囚寅虎瀞侶舮靹供纜燭艫朋倶鞆輩讎讐伴共友巴沌惇丼飩團暾団遯燉遁豚鷄禽酉砦塞俘擒虜豐恍惚枢乏塒迚科咎篷笘攴苫鶏伽唱稱鄰隣朿棘刺整鎖處処所床享鴟鵄扉鳶嫁訥晨穐秋刻鴇鬨斎頓幄幃帷柮杤栃閼軣轟屆届咄吶凸世暁祀駿壽繁稔寿豊歳俊利敏年慝牘悳黷犢匿督徳涜∃得特磴稻鞜剳宕滕鬥纛櫂讀盜綯橦叨桶盪竇抖縢礑荅閙塘罩帑棹兜檮納亠嶋棠搨档嶝溏鞳夲蘯道黨酘陦榻樋梼沓涛朸淌篤吋擣萄釖鬧籘諮迯儻潼鐙嶌逗螳蟷稲■幢滔鼕掏當峠読饕疼淘濤籐董悼棟搭痘套＝豆燈桃韜遠統騰橈冬討骰祷藤灯島橙凍刀陶糖謄唐答投等桐兎砿外富止礪研閇觧疾莵梳穫融録問砥採飛杜賭翔留冨図熔人途登菟畄蠧泊戸跿荼蠹十蚪砺盗屠渡解取執溶睹兔脱妬鍍磨説摂覩鎔堵秉獲汢塗肚圖とﾃ瑛晃輝衒寺靦囀躔忝、鷆鷏碾巓，槙沾殄霑腆壥諂廛轉‥．：輾填甜奠顛纒癲恬殿纏覘展篆添梃輦輟鐡耋咥餮垤跌屮銕姪迭俶逖荻鏑狄糴廸笛覿擲迪滴轍的哲敵撤剔徹鐵鉄酲眤碵羝觝幀嚔嚏渟柢酊掟睇楴詆棣汀騁鵜叮遉釘弟碇剃蹄邸締梯悌訂程底偵廷遞逓抵牴呈艇鄭涕啼庭定低弖照てﾂ模幹劈聾列辛貫面液汁露冷錘舶紡系艷艶絃鉉寉橡剱劒釼劍劔剣弦蔓敦鶴幣兵鉗噤鶫償桓恆典恒常夙務勉努勤拙拐倹抓嬬撮詳審爪褄妻募角晦螺瞑円呟礫具粒辻辟罪捉捕閊把曹阜丘元首寮司官柄仕掴遣攫搏疲使窄莟蕾局壷壺坪綱繋壌蝪培霾戊己伝傳鐔翅翼鍔燕唾續約皷鼓続葛綴番栂槌縋弊費序潰終墜遂鎚椎追做殱殲捏繕傍旁創造作熟机佃蹲拒欟坏鴾槻月裹砲障躑榴謹慎筒愼恙包堤痛椄衝告點附撞繼津搗継嗣支突積尾漬詰尽通憑浸次盡攣連就接付つﾁ吃釁岐巷衢粽粡因杠契鵆児交腟帙膣些蟄N窒斉秩父捷矗筑築逐盟税力親邇誓迩近苣尖縮鏤塵朕珎趁抻鎭碪狆亭跛闖鴆砧椿枕鎮陳珍沈賃杖找摘茶嫡着潴儲豬箸紵竚躇瀦墸杼苧緒樗楮⊥陟飭敕捗稙躅猪勅著悵髫廳樢微聽鵈楪齠甼漲佻膓吊鼎趙迢萇誂廰澂脹疔輙昶糶蔦窕晁鬯塚輒雕挺凋帖掉停諜跳眺貼鐇澄提喋頭銚ー蝶暢帳丁牒重逃鳥張弔懲肇嘲徴兆釣聴彫潮町頂調庁貂腸超挑朝丶黜寵儔冑肘蟲惆鍮晝紬綢廚籌※冢丑胄稠酎紐鑄冲沖偸宙虫｝［｛］厨誅鋳紂仲註駐柱衷注籀昼抽中躓蜘踟褫魑夊黐笞黹池値夂輊治耻千薙家血岻痴散地稚遲知茅恥置穉緻致智遅乳禿癡馳ちﾀ便党屯椽榱架樽弛膤鰔蕩鱈盥戯俵袂保躊為樣様爲啗猯擔疸餤湍覃彖亶鄲靼綻站潭憺酖殫膽襌賺毯摶袒檀褝槫緞椴憚攤壇慱湯澹‡†蛋耽W旦痰啖坦眈反C嘆歎誕胆箪譚担淡鍛單短探貪単覊栲妙戲訊攜携尋訪比畴疇類民髱娯樂恃頼愉楽喩例譬激滾斃仆嵶垰殕倒嫋旅貍狸讃称賛敲蹈踏祟湛鬪戰斗戦闘彳佇叩疊疂疉畳箍鏨違互畉耕畊掌店棚到炭辿燵撻斬韃闥巽辰佐扶＋援相佑輔弼助襷髻椨誑胤種塔龍竜糜糺爛漂維伊理貞是直禎忠惟匡徒唯只窘嗜慥確鮹鱆胝凧蛸嶽哮誥茸英豪威毅猛笋筍酣雄健丈斌武靈彈珪承賚珠霊魂卵偶適環弾球玉丹謀莨束縱｜盾鬣奉楯蓼縦竪質城達館忽橘舘瀑薪滝瀧峪溪渓谿谷尭亨臣任集宇昂楼小剛恭岳洪喬嵩孚尚尊敬孝崇隆貴鷹竹篁簟寶財高寳宝但濯綰鐸倬澤拆柝擢柘戳啅擇鈬魄畜企啄磔匠巧択沢逞琢蓄度宅託卓謫托拓躰隶殆抬靆黛紿替滯體碓帶軆平駘擡逮腿当怠玳諦岱鯛對颱袋戴堆頽態苔滞待代帝貸隊褪胎帯体退泰大対足手斷垂佗闌経炊撓焚矯溜躱經咤食發朶薫詫誰他詑耐太強蛇起逹貯給堪長揉閉埀発断勃多澑岔截絶田立裁汰点夛侘建它賜たцЦ〜天時×型火土→吐都東上噸瓲┃│台表第木スジ∴Θθザ正ツ¨転透▲△▼▽トチ…・試端タＴт┝Τ┯┰┣┷┸┤┬┥┴┻┠τ┫┳├〒Т┨テT]\|ｯ\_s*[ﾄﾃﾂﾁﾀ]\|ッ\_s*[トテツチタ]\|っ\_s*[とてつちた]\|門\_s*渡\_s*り\|薯\_s*蕷\|船\_s*尾\_s*座\|公\_s*[明暁]\|倫\_s*[子明]\|邑\_s*中\|蜻\_s*蛉\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|蜷\_s*局\|跡\_s*[絶切]\|蜥\_s*蜴\|舎\_s*人\|馴\_s*鹿\|野\_s*老\|瓊\_s*脂\|永\_s*[遠久]\|宿\_s*直\|朱\_s*鷺\|左\_s*見\_s*右\_s*見\|朽\_s*木\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|独\_s*鈷\|季\_s*[衣道栄]\|聡\_s*[明徳]\|祈\_s*年\_s*祭\|淑\_s*[夫子]\|洞\_s*爺\|光\_s*男\|晧\_s*史\|紅\_s*娘\|瓢\_s*虫\|F\_s*e\|I\_s*r\_s*o\_s*n\|劇\_s*村\|滌\_s*除\|２\_s*×\_s*４\|悪\_s*阻\|石\_s*\%(蕗\|竜\_s*子\)\|心\_s*[太算]\|自\_s*\%(摸\|模\_s*和\)\|氷\_s*柱\|倩\_s*々\|黴\_s*雨\|入\_s*梅\|梅\_s*雨\|再\_s*見\|悉\_s*に\|備\_s*に\|旋\_s*[風毛]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|１\_s*\%(日\|０\_s*日\)\|朔\_s*日\|1\_s*\%(日\|0\_s*日\)\|美\_s*人\_s*局\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|字\_s*\%(牌\|一\_s*色\)\|少\_s*と\|義\_s*父\|主\_s*[殿税]\|周\_s*夫\|睦\_s*子\|渠\_s*睦\_s*子\|萵\_s*苣\|身\_s*柱\|似\_s*指\|清\_s*\%(老\_s*頭\|一\_s*色\)\|青\_s*\%([幇島]\|梗\_s*菜\|椒\_s*肉\_s*絲\)\|全\_s*帯\|昌\_s*洙\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|江\_s*蘇\|焼\_s*豚\|叉\_s*焼\|察\_s*哈\_s*爾\|餃\_s*子\|雑\_s*砕\|炒\_s*[麺飯]\|北\_s*谷\|甘\_s*露\_s*子\|錯\_s*和\|総\_s*角\|一\_s*[日寸]\|植\_s*字\|魚\_s*[屋蝨]\|金\_s*魚\_s*蝨\|草\_s*石\_s*蚕\|春\_s*\%(麗\|宮\_s*坊\)\|九\_s*\%(十\_s*九\|連\_s*宝\_s*[灯燈]\)\|揺\_s*蕩\|容\_s*易\|白\_s*痴\|猶\_s*豫\|蜑\_s*民\|段\_s*銭\|蒲\_s*公\_s*英\|騨\_s*州\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|仮\_s*令\|打\_s*[擲坐]\|七\_s*\%(夕\|対\_s*子\)\|活\_s*計\|方\_s*便\|無\_s*料\|黄\_s*\%(昏\|蜀\_s*葵\)\|章\_s*魚\|胼\_s*胝\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|壮\_s*聡\|煙\_s*草\|殺\_s*陣\|賢\_s*明\|性\_s*質\|怱\_s*ち\|亢\_s*ぶ\|堂\_s*子\|学\_s*聡\|能\_s*[文之]\|内\_s*匠\|松\_s*明\|奈\_s*子\|幇\_s*間\|切\_s*符\|デ\_s*ィ\_s*ス\|３\_s*ｒ\_s*ｄ\|閾\_s*値\|ソ\_s*\%(ー\_s*[トンプ]\|ロ\_s*ー\)\|ヘ\_s*ー\_s*グ\|ゼ\_s*[インムア]\|セ\_s*\%(オ\|ル\_s*マ\|ロ\_s*\%(ン\|ニ\_s*ア\_s*ス\)\|ラ\_s*ピ\_s*\%(ー\|ス\_s*ト\)\)\|シ\_s*\%(ン\|ッ\_s*ク\|ス\_s*ル\|ア\_s*タ\_s*ー\|ソ\_s*ー\_s*ラ\_s*ス\|オ\_s*ド\_s*ア\|ー\_s*[フタ]\)\|サ\_s*\%([イム]\|ミ\_s*ン\_s*グ\|ウ\_s*ザ\_s*ン\_s*ド\|ラ\_s*ブ\_s*レ\_s*ッ\_s*ド\|ー\_s*\%([ドモ]\|テ\_s*ィ\|ス\_s*ト\_s*ン\|ズ\_s*デ\_s*[イィー]\|マ\_s*ル\)\|ッ\_s*チ\_s*ャ\_s*ー\|ン\_s*\%(ク\|ダ\_s*ー\|キ\_s*ュ\_s*ー\)\|リ\_s*ド\_s*マ\_s*イ\_s*ド\)\|ポ\_s*リ\_s*ペ\_s*プ\_s*チ\_s*ド\|三\_s*\%(和\_s*土\|連\_s*文\_s*字\)\|\\\_s*T\_s*e\_s*X\|文\_s*字\_s*列\|教\_s*科\_s*書\|t\_s*e\_s*\%(r\_s*a\|m\_s*p\_s*o\_s*r\_s*a\_s*r\_s*y\)\|用\_s*語\|電\_s*\%([視話]\|気\_s*通\_s*信\_s*研\_s*究\_s*所\)\)',
+      \ 'U' : '\%([ｳ孳蛤礼敬恭洞鱗愛潤煩騒粳漆閏患慯悄恙騷愁呻楳梅嫐釉噂褞吽曇紜耘黄云繧慍蘊薀暈運錙怏麗羨卦憾怨恨占卜末嬉心裏浦糶瓜汝己畦疇畆畴畝疎踈宜諾奪姥腕莵兔驢鑿穿嗽魘唸促令項頷訴鷽獺嘯嘘蠢蠕動覘窺伺海萼台詠謌唱唄宴讌転詩謠謳謡疑歌葎鯏鴬鶯ヱゑゐヰ鶉疼堆踞蹲渦舂臼碓羅薄筌食槽朮肯凵魚巧茨廏廐厩鰻午甘秣孫餞馬旨蔚寫暎冩遷噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆雲氏上後喪艮丑潮牛裡鬱欝中袿梁家内紆嫗羽打禹請浮攴得雨有飢熟于埋倦鵜迂生賣挧受撃泛傴憂茹射膿売撲菟盂搏齲右胡承卯攵績産芋討夘兎植饂宇享失烏う¨↑∪ＵуウΥυУU]\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蟒\_s*蛇\|蠎\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|雅\_s*楽\_s*[頭寮]\|楽\_s*官\|干\_s*莉\|維\_s*納\|太\_s*秦\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|イ\_s*ギ\_s*リ\_s*ス\|オ\_s*マ\_s*ル\|識\_s*別\_s*不\_s*能\|共\_s*\%(用\_s*体\|有\_s*体\)\|ア\_s*\%([スン]\|グ\_s*リ\_s*ー\|ー\_s*\%(シ\_s*ュ\_s*ラ\|ジ\_s*ェ\_s*ン\_s*ト\|バ\_s*ン\)\|ル\_s*テ\_s*ィ\_s*メ\_s*ッ\_s*ト\|ポ\_s*ン\|ッ\_s*\%(プ\|パ\_s*ー\|シ\_s*ャ\_s*ー\)\)\|単\_s*\%(位\|一\_s*化\)\|ユ\_s*\%([タニー]\|ト\_s*\%(リ\_s*ロ\|レ\_s*ヒ\_s*ト\)\|リ\_s*\%(ア\|シ\_s*ー\_s*ズ\)\|プ\_s*シ\_s*ロ\_s*ン\|ネ\_s*ス\_s*コ\|ナ\_s*\%(カ\_s*イ\_s*ト\|イ\_s*テ\_s*ッ\_s*ド\)\|ビ\_s*キ\_s*\%(タ\_s*ス\|ノ\_s*ン\)\)\)',
+      \ 'V' : '\%([：├値Ｖ⊥版в↓В∨ヴV]\|ｯ\_s*ｳ\_s*ﾞ\|ッ\_s*ヴ\|っ\_s*ヴ\|ｳ\_s*ﾞ\|ｖ\_s*ｓ\_s*．\|v\_s*e\_s*r\_s*s\_s*u\_s*s\|チ\_s*ェ\_s*ロ\|ヰ\_s*タ\| \_s*ビ\_s*ク\_s*ト\_s*ー\_s*ル\|視\_s*覚\|仮\_s*想\|ニ\_s*ス\|変\_s*数\|恒\_s*真\|ワ\_s*\%(デ\_s*ィ\_s*ム\|ギ\_s*ナ\|ニ\_s*ス\|セ\_s*リ\_s*ン\|ク\_s*チ\_s*ン\|ル\_s*キ\_s*ュ\_s*ー\_s*レ\|レ\_s*リ\_s*ー\|ー\_s*ニ\_s*ャ\)\|語\_s*彙\|ボ\_s*\%(ス\_s*ト\_s*ー\_s*ク\|ン\_s*ゴ\_s*レ\|ル\_s*\%([ガボトタ]\|テ\_s*\%(ッ\_s*ク\_s*ス\|ー\_s*[ジル]\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ラ\_s*ン\_s*\%(チ\|テ\_s*ィ\_s*ア\|タ\_s*リ\_s*ー\)\|レ\_s*ー\|コ\_s*ー\_s*ダ\|ー\_s*\%([ントグ]\|ル\_s*ト\|ド\_s*ビ\_s*\%(ル\|リ\_s*ア\_s*ン\)\|パ\_s*ル\|ダ\_s*フ\_s*ォ\_s*ン\|カ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\|キ\_s*ャ\_s*ブ\_s*ラ\_s*リ\|イ\_s*\%([ドス]\|ジ\_s*ャ\_s*ー\|シ\_s*ン\_s*グ\)\)\|ヘ\_s*ッ\_s*ト\|冗\_s*長\_s*な\|垂\_s*直\|フ\_s*\%(ァ\_s*\%(ン\|ド\_s*ー\_s*ツ\)\|ォ\_s*\%(ン\|ル\_s*\%(ク\|カ\_s*ー\)\)\|ェ\_s*ル\_s*メ\_s*ー\_s*ル\)\|ウ\_s*\%(ラ\_s*\%(デ\_s*ィ\_s*ミ\_s*ー\_s*ル\|ジ\_s*\%(ー\_s*ミ\_s*ル\|ミ\_s*ー\_s*ル\|オ\_s*ス\_s*ト\_s*\%(ク\|ッ\_s*ク\)\)\)\|ィ\_s*\%(ン\_s*ナ\|ル\_s*ス\)\|ォ\_s*ッ\_s*カ\|イ\_s*\%(ル\_s*ス\|ン\_s*ナ\_s*ー\)\|ェ\_s*\%(ル\_s*ギ\_s*リ\_s*ウ\_s*ス\|ヌ\_s*ス\)\)\|ビ\_s*\%([アラブバスザ]\|ガ\_s*ー\|ハ\_s*ー\_s*ラ\|タ\_s*ミ\_s*ン\|レ\_s*\%(ッ\_s*ジ\|ロ\_s*イ\)\|ビ\_s*\%(ア\_s*ン\|ッ\_s*ド\)\|ッ\_s*\%(ク\|キ\_s*ー\)\|セ\_s*ン\_s*テ\|ク\_s*\%(タ\_s*ー\|ト\_s*\%(ル\|リ\_s*[ーア]\)\)\|シ\_s*\%(ャ\_s*ス\|ソ\_s*ワ\_s*ー\_s*ズ\)\|ン\_s*\%([チス]\|ソ\_s*ン\|テ\_s*ー\_s*ジ\|セ\_s*ン\_s*ト\)\|ネ\_s*\%(ガ\_s*ー\|グ\_s*レ\_s*ッ\_s*ト\)\|ニ\_s*\%([ール]\|リ\_s*デ\_s*ン\)\|ュ\_s*ー\|エ\_s*ン\_s*チ\_s*ャ\_s*ン\|ジ\_s*\%(ャ\|ッ\_s*ト\|タ\_s*ー\|ョ\_s*\%(ン\|ナ\_s*リ\_s*ー\)\|ュ\_s*ア\_s*\%(ル\|ラ\_s*イ\_s*\%(ズ\|ゼ\_s*ー\_s*シ\_s*ョ\_s*ン\)\)\)\|ダ\_s*ル\|デ\_s*オ\|ル\_s*\%(ゴ\|ヌ\_s*ー\_s*ブ\)\|オ\_s*ラ\|リ\_s*ジ\_s*ア\_s*ン\|ィ\_s*ー\_s*ナ\_s*ス\|ー\_s*\%(ボ\|ル\_s*ス\|ク\_s*ル\|ナ\_s*ス\)\)\|ベ\_s*\%([ガラン]\|ト\_s*ナ\_s*ム\|イ\_s*ダ\_s*ー\|ー\_s*\%(ル\|ダ\_s*ー\)\|テ\_s*ラ\_s*ン\|ッ\_s*セ\_s*ル\|ス\_s*\%([トタパ]\|ビ\_s*オ\)\|ク\_s*\%(タ\|ト\_s*ル\)\|ジ\_s*タ\_s*\%(ブ\_s*ル\|リ\_s*ア\_s*ン\)\|リ\_s*\%([ィー]\|フ\_s*ァ\_s*イ\|サ\_s*イ\_s*ン\)\|ロ\_s*\%(ナ\|シ\_s*テ\_s*ィ\|ー\_s*ナ\|ニ\_s*[カク]\)\|ル\_s*\%(デ\|ベ\_s*ッ\_s*ト\|ダ\_s*ン\|レ\_s*ー\_s*ヌ\|サ\_s*\%(ー\_s*チ\|イ\_s*ユ\)\|モ\_s*ッ\_s*ト\)\|ノ\_s*ム\|ニ\_s*[スヤア]\|ネ\_s*\%(シ\_s*ャ\_s*ン\|チ\_s*ア\|ツ\_s*ィ\_s*ア\|ズ\_s*エ\_s*ラ\)\)\|ブ\_s*\%(イ\|ラ\_s*\%(ド\|ッ\_s*ド\)\|ー\_s*ド\_s*ゥ\_s*ー\)\|バ\_s*\%([ルン]\|イ\_s*\%([アブンオ]\|パ\_s*ー\|タ\_s*\%(ル\|リ\_s*テ\_s*ィ\)\|キ\_s*ン\_s*グ\|ザ\_s*ー\|シ\_s*ャ\)\|ッ\_s*ト\|チ\_s*カ\_s*ン\|ギ\_s*ナ\|ガ\_s*ボ\_s*ン\_s*ド\|ラ\_s*\%(ナ\_s*シ\|エ\_s*テ\_s*ィ\)\|サ\_s*ロ\|ス\_s*\%(コ\|ケ\_s*ス\)\|カ\_s*ン\_s*ス\|ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|キ\_s*ュ\_s*ー\_s*ム\|ウ\_s*チ\_s*ャ\_s*ー\|リ\_s*\%(ン\|エ\_s*ー\_s*シ\_s*ョ\_s*ン\|ュ\_s*ー\|ア\_s*\%(ブ\_s*ル\|ン\_s*ト\)\|ッ\_s*ド\|デ\_s*ー\_s*シ\_s*ョ\_s*ン\)\|ヌ\_s*ア\_s*ツ\|ニ\_s*\%(ラ\|ー\_s*ユ\)\|レ\_s*\%([ラー]\|ロ\_s*ン\|リ\_s*ー\|ン\_s*\%(シ\_s*ア\|チ\_s*ノ\|タ\_s*イ\_s*ン\)\)\|ー\_s*\%([ゴグ]\|チ\_s*ャ\_s*ル\|リ\_s*ト\_s*ゥ\_s*ー\_s*ド\|バ\_s*ル\|ボ\_s*ス\|ベ\_s*ナ\|テ\_s*ィ\_s*カ\_s*ル\|サ\_s*ス\|ジ\_s*\%(ン\|ニ\_s*ア\|ョ\_s*ン\)\|ノ\_s*ン\|ニ\_s*ア\|モ\_s*ン\_s*ト\|ミ\_s*\%(リ\_s*オ\_s*ン\|キ\_s*ュ\_s*ラ\_s*イ\_s*ト\)\)\|ナ\_s*\%(キ\_s*ュ\_s*ラ\_s*ー\|ジ\_s*ウ\_s*ム\)\)\)',
+      \ 'W' : '\%([ｦヲ女翁緒牡小雄汚惜尾男をｳ孳蛤礼敬恭洞鱗愛潤騒粳漆閏慯悄恙騷愁呻楳梅嫐釉噂褞吽曇紜耘云繧慍蘊薀暈運錙怏麗羨U卦憾怨恨占卜末嬉心裏浦糶瓜汝己Υυ畦疇畆畴畝疎踈宜諾奪姥莵兔驢鑿穿嗽魘唸促令項頷訴鷽獺嘯嘘蠢蠕動覘窺伺萼台詠謌唱唄宴讌転詩謠謳謡疑歌葎鯏鴬鶯ヱゑ鶉疼堆踞蹲渦舂臼碓羅薄筌食槽朮肯凵魚巧茨廏廐厩鰻午甘秣孫餞馬旨蔚寫暎冩遷噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆氏↑上後喪艮丑潮牛裡鬱欝中袿梁家内紆嫗打禹請浮攴得雨有飢熟于埋倦鵜迂生賣挧受撃泛傴憂茹射膿売撲菟盂搏齲右胡承卯攵績産芋討夘兎植饂宇享失烏うヰ居ゐﾜ叫喚惡÷悪原稿嗤妾蕨童藁鞋笑灣綰萬豌万弯彎椀雲腕碗湾横黄皇往羂罠毫纔微僅患煩伎術厄禍災態業技佗王鰐忘掖弁腋譯腸緜渉亙道航弥亘棉渡綿私隈薈賄淮脇矮猥歪轍海蟠儂∪解頒觧判訣別稚若或枠惑鷲沸詫輪和涌湧我吾把話侘杷訳破萵啝割倭環分琶羽わ幅水∧波ＷウワW]\|ｯ\_s*[ｦヱｳヰﾜ]\|ッ\_s*[ヲヱウヰワ]\|っ\_s*[をゑうゐわ]\|乎\_s*古\_s*止\_s*点\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蟒\_s*蛇\|蠎\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|雅\_s*楽\_s*[頭寮]\|楽\_s*官\|干\_s*莉\|維\_s*納\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|草\_s*鞋\|（\_s*笑\_s*）\|(\_s*笑\_s*)\|戦\_s*慄\|俳\_s*優\|勿\_s*忘\_s*草\|早\_s*[生稲]\|山\_s*葵\|戯\_s*奴\|度\_s*会\|Ｙ\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|Y\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|華\_s*盛\_s*頓\|裙\_s*蔕\_s*菜\|理\_s*[由解]\|公\_s*魚\|病\_s*葉\|大\_s*東\_s*亜\_s*戰\_s*爭\|太\_s*\%(秦\|平\_s*洋\_s*戦\_s*争\)\|歐\_s*州\_s*大\_s*戰\|第\_s*\%(二\_s*次\_s*世\_s*界\_s*大\_s*戦\|一\_s*次\_s*世\_s*界\_s*大\_s*戦\)\|ブ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ロ\_s*ン\_s*グ\|レ\_s*\%(ン\|イ\_s*ス\|ッ\_s*カ\_s*ー\|ス\_s*\%(ラ\_s*ー\|リ\_s*ン\_s*グ\)\)\|リ\_s*\%(ー\_s*ス\|ン\_s*ク\_s*ル\|ス\_s*ト\)\|書\_s*き\_s*込\_s*み\|ラ\_s*\%(ッ\_s*\%([プパ]\|ピ\_s*ン\_s*グ\)\|イ\_s*\%([タト]\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ボ\_s*ル\_s*フ\|フ\_s*\%([ムー]\|ァ\_s*イ\_s*ル\|ィ\_s*\%(ー\_s*ト\|ッ\_s*チ\)\)\|ホ\_s*\%(エ\_s*[ーイア]\|ー\_s*ル\|イ\_s*\%(ー\_s*\%(ル\|ラ\_s*ー\)\|ッ\_s*\%(プ\|ス\_s*ル\|パ\_s*ー\|ト\_s*\%(ニ\_s*ー\|マ\_s*ン\)\)\)\|ワ\_s*\%(イ\|ッ\_s*[トツ]\)\)\|ベ\_s*ル\_s*ナ\_s*ー\|w\_s*e\_s*b\_s*サ\_s*\%(イ\_s*ト\|ー\_s*\%(バ\|ビ\_s*ス\)\)\|警\_s*告\|バ\_s*ル\_s*タ\_s*ー\|ヴ\_s*\%(ュ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ォ\_s*ル\_s*フ\|ィ\_s*\%([ーム]\|ル\_s*\%(ム\|ヘ\_s*ル\_s*ム\)\)\|ェ\_s*\%(ン\_s*ダ\_s*ー\_s*ス\|ル\_s*ナ\_s*ー\|ー\_s*バ\_s*ー\|イ\_s*ユ\)\|ァ\_s*\%(イ\_s*[ンス]\|ー\_s*グ\_s*ナ\_s*ー\|ン\_s*ダ\|ル\_s*\%(タ\_s*ー\|キ\_s*ュ\_s*ー\_s*レ\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|ダ\_s*ブ\_s*リ\_s*ュ\_s*ー\|タ\_s*ン\_s*グ\_s*ス\_s*テ\_s*ン\)',
+      \ 'X' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁＸξ×ХхΞX]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|シ\_s*ロ\_s*\%(フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|ジ\_s*オ\_s*ン\|ゼ\_s*\%(ビ\_s*ウ\_s*ス\|ロ\_s*\%(ッ\_s*ク\_s*ス\|グ\_s*ラ\_s*フ\_s*ィ\)\)\|ハ\_s*ビ\_s*エ\_s*ル\|ザ\_s*\%(ン\|ビ\_s*エ\_s*ル\)\|キ\_s*\%(シ\_s*\%(ロ\|レ\_s*ン\|リ\_s*ト\_s*ー\_s*ル\)\|セ\_s*ノ\_s*ン\|サ\_s*ン\_s*\%(チ\_s*ン\|タ\_s*ン\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|ク\_s*\%(シ\_s*ー\|ロ\_s*ス\_s*ポ\_s*ス\_s*ト\|セ\_s*\%(ナ\_s*キ\_s*ス\|ノ\_s*フ\_s*ォ\_s*ン\)\|ザ\_s*ヴ\_s*ィ\_s*エ\|サ\_s*\%(イ\|ン\_s*\%(ト\_s*ス\|テ\_s*ィ\_s*ッ\_s*ペ\|チ\_s*ッ\_s*ペ\)\)\|リ\_s*ス\_s*マ\_s*ス\)\|エ\_s*\%(ク\_s*ス\|ッ\_s*ク\_s*ス\)\)',
+      \ 'Y' : '\%([ﾖ艾蒿蓬娵嫁齡齢據頼弱歓憙鎧万萬過便婚汚涎捩峪杙翊緘慾欲翌翼抑米比裝粧装澱淀縦誼祥葭悦宜克純圭禎葦慶淑禧美喜芳吉義癰穃慂踴遙榕幺怏曄陶甬瀁燿珱踊暘廱樣蓉恙慵泱姚雍癢瑶昜瘍痒孕窰謠漾鷹瓔煬邀遥拗擁瑤窯徭膺窈殀耀曜庸夭揚葉蛹腰羊熔杳沃壅様妖溶用佯謡陽洋嘉宵蘇甦蘓奸辟横攀豫世与酔縒輿読讀訓預與喚予醉誉余憑能４舁蕷四譱畭譽餘撚呼詠除選飫歟丗代避よﾕ潤赦緩弛聴岼閖梦努纈∴故濯檠穰豐豊倖志裄之幸雪趾梼讓譲牀紫縁浴床攸犹黝俑邑熊猷悒酉蝣蚰囿莠尢蕕佳尤佑〒右郵涌祐侑游猶湧融宥夕幽悠釉友雄憂有楡油諭瘉汰徃柚逾揺弓踰諛愉瑜臾渝遊結覦腴由兪喩揃蝓淘揄輸茹征搖ゆｲηΗ賤鄙卑苟嫌妹湯芋藷夢艷鑪鈩彩鱗色鯆忽綺貸甍答応愈圦杁茵胤飮寅尹婬贇韵隱蚓氤酳霪蔭堙湮吋廴I音慇韻咽淫殞姻隕院允隠殷陰窟巖巌頌祝鰮鰛鰯岩磐鼾歪弋弑抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗印嘶鰍電引躄誘動≦忿鵤錨碇怒霆霹雷凧桴筏Ιι魚菴庵雖尿荊棘茨祈祷命豕猯古伍聿乙鎰鴪軼樹慈悼愴慯労格到至傷鼬頂戴徒致鈑痛板柞沙砂聊些潔諍烈功諫勳勇勲漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息指挑拠絲縷厭營営愛幼緒遑暇糸Ｉ弌壹肆莓苺櫟著市碑鐓礎甃臀弩石牲犧犠池溢佚壱1１鬻毓燠礇粥的戦戰軍郁幾一稲許否飯違居矮ゐ猪五煎彝醫斐逶貽善胆位萎可詑僞鑄熬活容依要斎行怡異衣入逝猗胃洟好矣鋳揖椅去惟云懿熨痿射凍移将囗肄夷率囲姨慰頤忌唯緯逸噫挿鮪伊偽苡彜莞往以韋遺炒謂李生威為維意倚良如彙出淹言亥鰄井蔚痍圍幃渭堰饐医爲癒帷恚偉委詒畏いﾔ稚稍飲鎗鑓槍孀寡鰥Я碼傭雇闇敗吝藪薮殕脂寄宿櫓軈軅簗梁S漸鋏刃灸軟柔和窶鱧奴僕萢優柳喧宅館舘輩族鏃鑰≒籥繹譯葯蜴檪藥龠扼益厄疫躍約役訳薬疾岾疚楊谺邪薯豺犲《》〈〉山邸壥廛豢養社鑢育尉寧廉裕恭泰易休康保安靖妬已瘠弥辭埜辞家輻矢痩屋灼笶八罷冶焼破夜爺谷也殺⇒病耶演⇔野燒遣彌熄椰止哉揶やＹеЕ円￥→↑↓←Ёё─━ユヤヨыイЙΥυЫйY]\|ｯ\_s*[ﾖﾕｲﾔ]\|ッ\_s*[ヨユイヤ]\|っ\_s*[よゆいや]\|歐\_s*羅\_s*巴\|欧\_s*羅\_s*巴\|尸\_s*童\|蹌\_s*踉\|蹣\_s*跚\|終\_s*夜\|4\_s*\%([項者つ日]\|番\_s*目\|種\_s*類\)\|y\_s*o\_s*\%(t\_s*t\_s*a\|c\_s*t\_s*o\)\|他\_s*所\|仁\_s*史\|隆\_s*克\|尚\_s*武\|孝\_s*高\|悌\_s*也\|彬\_s*伯\|賀\_s*[子悟]\|栄\_s*伸\|新\_s*生\|昌\_s*[美男]\|宗\_s*生\|暢\_s*[子一]\|永\_s*沈\|８\_s*日\|8\_s*日\|黄\_s*泉\|左\_s*手\|百\_s*合\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|Ｕ\_s*\%(字\|タ\_s*ー\_s*ン\)\|鞦\_s*韆\|強\_s*請\|梅\_s*桃\|桜\_s*桃\|靫\_s*負\|宙\_s*美\|礼\_s*暁\|温\_s*\%(雄\|泉\_s*津\)\|長\_s*庚\|昨\_s*夜\|又\_s*木\|木\_s*綿\|E\_s*\%(u\|メ\_s*ー\_s*ル\)\|祖\_s*谷\|文\_s*身\|郎\_s*[女子]\|蕁\_s*麻\|刺\_s*[青草]\|U\_s*\%(字\|タ\_s*ー\_s*ン\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*[向青]\|況\_s*ん\_s*や\|所\_s*[以縁謂]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%([一桃蘭]\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|細\_s*小\_s*魚\|小\_s*魚\|鯨\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|気\_s*吹\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|従\_s*[弟妹姉兄]\|鴨\_s*脚\_s*樹\|公\_s*孫\_s*樹\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|巫\_s*子\|神\_s*巫\|無\_s*花\_s*果\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|不\_s*[可如]\|守\_s*宮\|燕\_s*龍\_s*茶\|両\_s*班\|流\_s*鏑\_s*馬\|柵\_s*原\|箭\_s*[田内]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|自\_s*棄\|火\_s*傷\|徐\_s*ら\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|天\_s*蚕\|倭\_s*絵\|日\_s*本\_s*武\_s*尊\|大\_s*和\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|香\_s*具\_s*師\|玄\_s*孫\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|妥\_s*子\|寿\_s*[詞男]\|エ\_s*\%(ホ\_s*バ\|フ\_s*ゲ\_s*ニ\_s*ー\|レ\_s*ヴ\_s*ァ\_s*ン\|ニ\_s*セ\_s*イ\|ー\_s*ル\)\|ワ\_s*イ\)',
+      \ 'Z' : '\%([空損存揃園薗底續束足屬∈∋賊続粟族俗属慥僧梍臧噌賍臟贓憎像臓贈象増造曾初沿曽反添ぞ譱然繕禪苒薇千蠕∀髯禅善漸冉前全關関蝉膳錢銭絶噬説勢筮贅脆税攻是責ぜ狡詰桷寸喘鮨附◆惴蘂膸蕋髓蕊隧隋隨瑞髄随厨付圖頭刷鶴津酢逗図廚豆好ず塩嶋島嶌縞橲竺衂衄宍舳忸軸舌祖喰食直凝日實昵印者闍鮭邪蛇麝着鉐惹搦尺雀寂若弱尻侭仞刄臣恁儘潯贐稔進盡仭糂訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敍莇茹杼洳敘汝蜍耡恕舒縟褥蓐辱溽所抒鋤徐絮序叙助帖穰疂聶疊驤襄淨讓繩禳絛蕘諚仗壌滌繞生靜蟐壤仍茸嬲疉塲乘遶星瀞拯釀躡孃如醤剩娘嬢錠静醸縄女尉饒丈成烝擾嫋穣丞場杖條条蒸貞状攘畳剰冗定浄乗情城上常譲懦愀鷲竪嬬戍得濡咒讐讎就聚笋篤盾徇凖楯詢隼筍蓴惇洵淳閏恂諄馴旬荀潤循醇巡遵順准殉純準襦誦需朮戌宿孰塾珠熟恤術述豎孺呪儒綬樹受授壽揉從澀狃中戎拾廿鞣从縱澁糅蹂神汁獸絨縦渋柔什充十従獣住銃重事迩爺滋除怩尓痔璽至児士寿茲孳染嗣柱寺磁仕治死爾路而仁辞塒時岻粫持恃敷焦字只地轜侍瓷亊知辭餌冶邇弍似祀以子峙二史自畤兒示耳慈司蒔次珥膩じ騒澤沢猿笊晒皿曝鮫参算懴慘竄鏨山殘塹巉懺嶄讒惨暫慚慙斬残実笹酒坂盛三嵜崎桜榴襍雜棹竿雑斉濟西才済劑戝剤材財罪在覚座咲戯冴坐蔵左裂冷藏差醒挫ざ→↑ЪЬьъ↓←жЖズゾ零〇〒ザＺジζЗゼзΖZ]\|ｯ\_s*\%(ｿ\_s*ﾞ\|ｾ\_s*ﾞ\|ｽ\_s*ﾞ\|ｼ\_s*ﾞ\|ｻ\_s*ﾞ\)\|ッ\_s*[ゾゼズジザ]\|っ\_s*[ぞぜずじざ]\|ｿ\_s*ﾞ\|簇\_s*生\|双\_s*紙\|草\_s*[履子紙]\|ｾ\_s*ﾞ\|台\_s*詞\|０\_s*次\|撥\_s*条\|発\_s*条\|發\_s*条\|z\_s*e\_s*\%(t\_s*t\_s*a\|p\_s*t\_s*o\)\|世\_s*阿\_s*弥\|ｽ\_s*ﾞ\|相\_s*撲\|木\_s*菟\|修\_s*法\|杜\_s*撰\|調\_s*所\|徒\_s*[罪刑]\|螟\_s*虫\|芋\_s*茎\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|ｼ\_s*ﾞ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|J\_s*\%(I\_s*S\_s*コ\_s*ー\_s*ド\|ポ\_s*ッ\_s*プ\|R\_s*東\_s*日\_s*本\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|著\_s*語\|杓\_s*子\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|Ｊ\_s*\%(リ\_s*ー\_s*グ\|ポ\_s*ッ\_s*プ\|Ｕ\_s*Ｎ\_s*Ｋ\_s*Ｏ\)\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｻ\_s*ﾞ\|搾\_s*菜\|蜊\_s*蛄\|粗\_s*目\|槧\_s*本\|散\_s*切\_s*り\|沙\_s*汰\|柘\_s*榴\|石\_s*榴\|細\_s*工\|亜\_s*鉛\|サ\_s*\%(モ\_s*ラ\|ン\_s*ポ\_s*ー\_s*ニ\_s*ャ\|ラ\_s*ゴ\_s*サ\)\|シ\_s*\%(タ\_s*ー\_s*ル\|オ\_s*\%(ン\|ニ\_s*\%(ス\_s*ト\|ズ\_s*ム\)\)\)\|ツ\_s*\%(ァ\_s*\%(ラ\_s*ト\_s*ゥ\_s*ス\_s*ト\_s*ラ\|イ\_s*ト\)\|ェ\_s*\%(ナ\_s*ー\|ッ\_s*ペ\_s*リ\_s*ン\|ル\_s*マ\_s*ッ\_s*ト\)\|ィ\_s*\%(ク\_s*ル\_s*ス\|タ\_s*ー\|ー\_s*グ\_s*ラ\_s*ー\|ン\_s*\%(バ\_s*ロ\_s*ン\|マ\_s*ー\_s*マ\_s*ン\)\|ゴ\_s*イ\_s*ネ\_s*ル\)\)\|チ\_s*\%(ク\_s*ル\_s*ス\|ア\_s*ノ\_s*ー\_s*ゼ\|ュ\_s*ー\_s*リ\_s*\%(ヒ\|ッ\_s*ヒ\)\|ャ\_s*ル\_s*ダ\_s*ッ\_s*シ\_s*ュ\|ゴ\_s*イ\_s*ネ\_s*ル\_s*ワ\_s*イ\_s*ゼ\_s*ン\)\)',
+      \ '[' : '[□〔［『【[]',
+      \ '\' : '[∨＼￥\\]',
+      \ ']' : '[】』］〕]]',
+      \ '_' : '[　＿_]',
+      \ '`' : '[“‘｀`]',
+      \ 'a' : '\%([ｱ餅母渉閔恤憐慌遽鰒蚫鮑袷淡∃主衽歩袵垤蟻麁凡塔蘭露著表霰非抗諍検革更改現競爭争洗殿鉱豫予粗嵐禮殺彪恠妖絢怪綺肖彩漢過謝謬誤礼操綾飴菴黯罨鱇鮟餡闇行按諳晏鞍暗鶩鬚鰓顎喘発肋豈嫂兄崇騰県購贖网罔與咫鼎中新邊邉辺恰頭価價値游遊畔畦堋杏梓与衵袙憬孔坑案侮窖強貴讎讐徒仇痣黶欺鮮糾字嘲薊姐姉曙炮焙炙蜚薹膏脂油危鐙虻泡蹟能痕踪跡東預輯蒐乢纂遏聚軋誂羹壓惇集陸敦暑淳篤熱扱暖温遖斡私圧焦汗央奥桜櫻媼奧塰蜑餘周遍普剰蔗余尼雨甘天押凹楝樗溢艶鰺庵網戯簣鯵味軛渥堊圷憧欠踵幄握芥齷厚蜊漁鯏蕣淺麻浅龝煥晢晰呆亮晄聡亨朖璋啓昜輝顯旭光陽洸鑑滉昿曠諦朗哲顕晶彬賈章商穐晃彰晧昭秋欸埃瞹阨穢噫姶文隘粟曖鮎藹饗靉挨間相哀葭趾晨朝愛跛蹇跫脚蘆葦芦桎鐐足赫淦燈赧紅旃朱茜藜銅赭曉閼暁垢皸皹證絳灯暴証赤扇呷黝榮碧葵蒼煽仰青穴併宛亞痾明逢吾悪婀在遭該飫褪浴荒揚編和會椏合襾安挙或當哇有開厭唖韲阿嗚当娃敢倦彼惡遇飽充上擧あａ藍金＠∧＆∩論&∠銀会∀域空→←↓⇒↑⇔⌒後Ц亜米¨´｀＾’≒〜ÅаαАアΑa]\|厦\_s*門\|廈\_s*門\|沫\_s*雪\|食\_s*蟻\_s*獣\|H\_s*a\_s*l\_s*o\_s*r\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|浣\_s*熊\|菖\_s*蒲\|豆\_s*汁\|蛙\_s*鳴\_s*蝉\_s*噪\|塩\_s*梅\|家\_s*鴨\|趺\_s*坐\|Z\_s*\%(n\|i\_s*n\_s*c\)\|浮\_s*子\|痘\_s*痕\|窪\_s*地\|醤\_s*蝦\|糠\_s*蝦\|信\_s*天\_s*翁\|左\_s*沢\|雅\_s*典\|校\_s*倉\|小\_s*豆\|四\_s*阿\|鴉\_s*\%(片\|鷺\_s*合\_s*戦\_s*物\_s*語\)\|綽\_s*名\|渾\_s*名\|化\_s*野\|翌\_s*檜\|飛\_s*[魚鳥]\|総\_s*角\|通\_s*草\|木\_s*通\|L\_s*a\_s*r\_s*d\_s*i\_s*z\_s*a\_s*b\_s*a\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|花\_s*鶏\|我\_s*\%(妻\|孫\_s*子\)\|数\_s*多\|奄\_s*美\|灰\_s*汁\|胡\_s*[座坐床葱]\|日\_s*明\|碩\_s*宏\|祥\_s*[仁彦]\|蜻\_s*蛉\|E\_s*\%(s\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\)\|生\_s*憎\|匕\_s*首\|英\_s*\%([保田]\|虞\_s*湾\|賀\_s*保\)\|靄\_s*[靄々]\|Ｉ\_s*\%(Ｐ\_s*電\_s*話\|Ｃ\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|I\_s*\%(r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(電\_s*話\|ア\_s*ド\_s*レ\_s*ス\)\|D\_s*カ\_s*ー\_s*ド\|C\_s*\%(タ\_s*グ\|カ\_s*ー\_s*ド\)\)\|走\_s*目\|鹹\_s*草\|馬\_s*酔\_s*木\|海\_s*[豹女士人部驢]\|R\_s*u\_s*b\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|褐\_s*毛\_s*和\_s*種\|石\_s*蓴\|白\_s*馬\|水\_s*[馬黽綿]\|M\_s*a\_s*l\_s*v\_s*a\_s*l\_s*e\_s*s\|ト\_s*リ\_s*プ\_s*ル\_s*A\| \_s*ア\_s*ク\_s*シ\_s*ア\_s*ム\|公\_s*理\|砒\_s*素\|ヒ\_s*素\|京\_s*都\_s*高\_s*度\_s*技\_s*術\_s*研\_s*究\_s*所\|代\_s*入\|遺\_s*産\|抽\_s*象\|G\_s*o\_s*l\_s*d\|自\_s*動\_s*\%(現\_s*金\_s*取\_s*り\_s*扱\_s*い\_s*機\|預\_s*貯\_s*金\_s*機\)\|属\_s*性\|何\_s*か\|か\_s*つ\|お\_s*よ\_s*び\|セ\_s*ン\_s*ト\_s*キ\_s*ッ\_s*ツ\_s*ネ\|S\_s*\%(b\|i\_s*l\_s*v\_s*e\_s*r\)\|利\_s*用\_s*可\_s*能\|使\_s*用\_s*可\_s*能\|算\_s*法\|割\_s*り\_s*当\_s*て\|オ\_s*\%(レ\|ギ\_s*ュ\_s*ス\_s*タ\_s*ン\|ド\_s*レ\_s*イ\|ン\_s*グ\_s*ス\_s*ト\_s*ロ\_s*ー\_s*ム\|ル\_s*\%(ト\_s*キ\_s*ー\|タ\_s*\%([ーナ]\|ネ\_s*\%(ー\_s*ト\|イ\_s*ト\)\)\)\|ー\_s*\%([クガサトラル]\|ニ\_s*ン\_s*グ\|キ\_s*シ\_s*ン\|ブ\_s*リ\_s*ー\|バ\_s*ー\_s*ド\|ベ\_s*ル\_s*ジ\_s*ュ\|ギ\_s*ュ\_s*ス\_s*\%(ト\|タ\_s*ン\)\|ゾ\_s*ン\_s*ヌ\|ス\_s*\%(チ\_s*ン\|テ\_s*ィ\_s*ン\|タ\_s*ー\|ト\_s*\%(リ\_s*ア\|ラ\_s*リ\_s*ア\)\)\|ド\_s*リ\_s*ー\|ジ\_s*\%([ェー]\|オ\_s*ロ\_s*ジ\)\|デ\_s*ィ\_s*\%(オ\|エ\_s*ン\_s*ス\|シ\_s*ョ\_s*ン\|ト\_s*リ\_s*ア\_s*ム\)\|タ\_s*ム\|ソ\_s*\%(リ\_s*テ\_s*ィ\|ラ\_s*イ\_s*ズ\)\|セ\_s*ン\_s*テ\_s*ィ\_s*ッ\_s*ク\|ロ\_s*ラ\)\)\|配\_s*列\|バ\_s*イ\_s*ト\|ハ\_s*ル\_s*マ\_s*ゲ\_s*ド\_s*ン\|引\_s*数\|人\_s*工\_s*\%(現\_s*実\_s*感\|知\_s*能\)\|イ\_s*\%(ー\_s*ジ\_s*ス\|オ\_s*ン\|ソ\_s*ッ\_s*プ\)\|マ\_s*ル\_s*ド\_s*ゥ\_s*ー\_s*ク\|紫\_s*\%(陽\_s*花\|水\_s*晶\|石\_s*英\)\|A\_s*\%([tlrImc]\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\|u\_s*s\_s*t\_s*r\_s*o\_s*b\_s*a\_s*i\_s*l\_s*e\_s*y\_s*a\_s*c\_s*e\_s*a\_s*e\|K\_s*C\_s*L\|S\_s*C\_s*I\_s*I\|s\_s*t\_s*a\_s*t\_s*i\_s*n\_s*e\|タ\_s*イ\_s*プ\|T\_s*O\_s*K\|N\_s*S\_s*I\|V\_s*シ\_s*ス\_s*テ\_s*ム\|L\_s*T\_s*キ\_s*ー\|ラ\_s*ン\_s*ク\|E\_s*R\_s*A\|D\_s*S\_s*L\_s*モ\_s*デ\_s*ム\|ド\_s*ラ\_s*イ\_s*ブ\|d\_s*a\|M\_s*ラ\_s*ジ\_s*オ\|b\_s*s\_s*t\_s*r\_s*a\_s*c\_s*t\_s* \_s*C\_s*o\_s*n\_s*t\_s*r\_s*o\_s*l\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|C\_s*ア\_s*ダ\_s*プ\_s*タ\)\|付\_s*録\|Ａ\_s*\%([４型面]\|ｘ\_s*ｏ\_s*ｎ\|Ｂ\_s*\%(型\|ｒ\_s*ｏ\_s*ａ\_s*ｄ\)\|タ\_s*イ\_s*プ\|Ｔ\_s*＆\_s*Ｔ\|ｔ\_s*\%(ｏ\_s*ｋ\|ｈ\_s*ｅ\_s*ｎ\_s*ａ\)\|ラ\_s*ン\_s*ク\|Ｉ\_s*エ\_s*キ\_s*ス\_s*パ\_s*ー\_s*ト\|／\_s*Ｄ\_s*コ\_s*ン\_s*バ\_s*ー\_s*タ\|ド\_s*ラ\_s*イ\_s*ブ\|ｄ\_s*ｏ\_s*ｂ\_s*ｅ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|ｐ\_s*ｐ\_s*ｌ\_s*ｅ\)\|応\_s*用\|エ\_s*\%([ニメアーイ]\|ッ\_s*チ\|ン\_s*\%(ド\_s*ラ\_s*ン\|ジ\_s*ェ\_s*\%(ル\|リ\_s*ッ\_s*ク\)\|ゼ\_s*ル\)\|リ\_s*ア\|オ\_s*リ\_s*ア\|ス\_s*テ\|プ\_s*ロ\_s*ン\)\)',
+      \ 'b' : '\%([鯔鰡堀本凡盆煩梵骨凹歿鈕釦沒渤没睦穆樸目濮攵攴朴木僕墨卜牧星黽蠎髦罔袤鋩氓瑁虻卯茆貌謗网旄抱甍儚胞蟒肪旁鵬牟眸冐鉾蒡榜懋乏惘妨帽昴忙剖冒忘茅膀妄厖尨膨貿防紡滂茫望亡傍某謀乾牡掘姆保慕簿惚模戊墓拇菩謨暮呆干暈姥褒彫坊募誉母ぼ覓幎汨冖羃巾冪紅韈瞥鼈蔑塀汳采抃辯辧卞辨湎宀遍瓣辮眄冕勉娩弁可辺邉邊べ船房笛鞭渊斑淵縁渕樗椈太袋深蓋葢盖豚節勿佛物震勃蚋風鰤馼蚊聞文錻葡侮葺蒲憮舞撲撫廡毋無嘸誣悔奉吹蕪撃部伏打振武歩拭分不ぶ米謐人匹浸額鐚跛！広開繆別謬緡泯罎岷梹旻紊檳頻壜愍瓶鬢閔憫敏貧便闢百辟帛白杪緲猫票憑″鋲屏眇渺平錨苗秒描廟病琵弾未比眉毘尾靡瀰寐微糜媚備引麋美濔弭火枇縻嵋贔日糒び早速林針尿拂腹散払祓原幡悗蠻塙旛鑁旙鷭挽判棒絆版輓蕃板播礬阪坂磐番盤晩萬蛮万箱蠅芒挟伴桴鉢枹蜂撥働畑畠屎糞端花鼻離話V魅許秤拔魃罸筏閥走橋箸柱藐貘寞獏暴漠瀑麥縛博駁莫驀爆杯唄霾賣狽吠楳苺憊培煤黴貝焙賠買売陪倍梅媒跋伐末幕曝抜罰場貼馬刄芭化葉庭羽張這塲罵刃晴歯馳婆ばｂ“仏■□⊥底下×−‖｜＼∵麦ボバ］［｝｛ブビΒБбβベb]\|ｯ\_s*\%(ﾎ\_s*ﾞ\|ﾍ\_s*ﾞ\|ﾌ\_s*ﾞ\|ﾋ\_s*ﾞ\|ﾊ\_s*ﾞ\)\|ッ\_s*[ボベブビバ]\|っ\_s*[ぼべぶびば]\|ﾎ\_s*ﾞ\|小\_s*火\|襤\_s*褸\|孟\_s*買\|P\_s*a\_s*e\_s*o\_s*n\_s*i\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|南\_s*瓜\|耄\_s*耋\|孑\_s*孑\|包\_s*丁\|ﾍ\_s*ﾞ\|袂\_s*別\|箆\_s*棒\|篦\_s*棒\|胼\_s*胝\|ﾌ\_s*ﾞ\|補\_s*任\|毒\_s*島\|醜\_s*[女男]\|山\_s*毛\_s*欅\|F\_s*a\_s*g\_s*a\_s*l\_s*e\_s*s\|布\_s*団\|茯\_s*苓\|Ｖ\_s*\%(字\|ネ\_s*ッ\_s*ク\|シ\_s*ネ\_s*マ\)\|附\_s*子\|付\_s*子\|鞦\_s*韆\|豊\_s*[前後]\|ﾋ\_s*ﾞ\|魚\_s*[籠篭]\|彌\_s*縫\|弥\_s*[漫縫]\|吃\_s*驚\|天\_s*鵞\_s*絨\|緬\_s*甸\|賓\_s*頭\_s*盧\|編\_s*木\|柏\_s*槙\|S\_s*a\_s*n\_s*t\_s*a\_s*l\_s*a\_s*l\_s*e\_s*s\|兵\_s*[衛法]\|拍\_s*[板子]\|表\_s*紙\|ﾊ\_s*ﾞ\|囃\_s*子\|巴\_s*爾\_s*幹\|R\_s*o\_s*s\_s*a\_s*l\_s*e\_s*s\|薔\_s*薇\|蟠\_s*踞\|鈑\_s*金\|A\_s*n\_s*n\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|発\_s*条\|祖\_s*母\_s*さ\_s*ん\|梯\_s*子\|伯\_s*\%([林労楽]\|剌\_s*西\_s*爾\)\|莪\_s*原\|飛\_s*[車蝗]\|蝗\_s*虫\|掲\_s*示\_s*板\|プ\_s*ル\_s*コ\_s*ギ\|作\_s*業\_s*域\|オ\_s*ー\_s*ト\_s*バ\_s*イ\|基\_s*[礎底]\|フ\_s*ァ\_s*ゴ\_s*ッ\_s*ト\|背\_s*景\|北\_s*京\|ペ\_s*\%(キ\_s*ン\|テ\_s*ル\_s*ギ\_s*ウ\_s*ス\)\|臭\_s*素\|イ\_s*ギ\_s*リ\_s*ス\|Ｂ\_s*\%([面判級型ｙ]\|細\_s*胞\|タ\_s*イ\_s*プ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|−\_s*ス\_s*プ\_s*ラ\_s*イ\_s*ン\|ｌ\_s*ｕ\_s*ｅ\_s*Ｎ\_s*ｏ\_s*ｔ\_s*ｅ\|ｕ\_s*ｓ\_s* \_s*Ｅ\_s*ｒ\_s*ｒ\_s*ｏ\_s*ｒ\|ａ\_s*ｃ\_s*ｈ\|ｅ\_s*ｌ\_s*ｌ\_s*研\|ラ\_s*ン\_s*ク\)\|B\_s*\%([h面判級型kiae]\|C\_s*兵\_s*器\|N\_s*F\_s*(\_s*B\_s*a\_s*c\_s*k\_s*u\_s*s\_s*-\_s*N\_s*a\_s*u\_s*r\_s* \_s*F\_s*o\_s*r\_s*m\_s*)\|B\_s*C\|タ\_s*イ\_s*プ\|u\_s*r\_s*k\_s*i\_s*n\_s*a\_s* \_s*F\_s*a\_s*s\_s*o\|フ\_s*レ\_s*ッ\_s*ツ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|M\_s*P\_s*フ\_s*ァ\_s*イ\_s*ル\|ス\_s*プ\_s*ラ\_s*イ\_s*ン\|S\_s*\%(D\|キ\_s*ー\|チ\_s*ュ\_s*ー\_s*ナ\|ア\_s*ン\_s*テ\_s*ナ\|デ\_s*ジ\_s*タ\_s*ル\)\|O\_s*X\_s*セ\_s*ッ\_s*ト\|I\_s*T\_s*N\_s*E\_s*T\|r\_s*o\_s*m\_s*i\_s*n\_s*e\|ラ\_s*ン\_s*ク\|o\_s*\%(h\_s*r\_s*i\_s*u\_s*m\|v\_s*i\_s*n\_s*e\_s* \_s*S\_s*p\_s*o\_s*n\_s*g\_s*i\_s*f\_s*o\_s*r\_s*m\_s* \_s*E\_s*n\_s*c\_s*e\_s*p\_s*h\_s*a\_s*l\_s*o\_s*p\_s*a\_s*t\_s*h\_s*y\|o\_s*k\|r\_s*o\_s*n\)\)\|硼\_s*素\|ホ\_s*ウ\_s*素\)',
+      \ 'c' : '\%([ｺ恐怖惟怺※米暦轉頃悃鶤獻艮鯤很袞坤壼琿狠建棍魂蒟菎滾梱溷献痕渾墾恨懇根杪王挙泥裔樸鞐熟枹醴蛩徑蹊径溢毀零錯苔拒亊箏斷判諺理断盡尽辞琴言異事今壽寿鯒冀希礫鯉拱齣狛細腓昆拳瘤鮗兄近谺応應答爰是凩惚榾兀忽輿甑腰拵拗鐺鏝桁杲磽絖昊耗闔狎靠冓汞湟塙慌嫦效頁礦冦淆遘仰昴誥鬨鴿鏗浤哮砿伉烋熕洽訌閧困鮫逅糠槹哽盍稾亙壙覯隍遑洸餃惶寇鵁皋黌椌扣晄矼肓頏蛤呷詬匣昿皐崗肱徨峇袷敲爻藁倥釦棡凰犒吭窖畊岡猴胱絋傚啌蚣缸紘湊搆閤峺羔鍠幌鱇扛肴恆紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘后蝗酵嚆犢稿亢哄睾梗慷笄郊効岬肛項巷鑛洪佼狡叩昂勾喉晃滉糀晧剛曠宏控恍侯皓港膏耿皎坑煌向江膠虹巧鴻鉱興衡浩厚耕弘綱抗購講恒薨溝鋼航孝更校行肯光皇好荒高梏谷哭槲尅釛斛轂詰棘告刻酷穀踰懲蝴鴣袴觚虍粐乎沽餬胯菰瞽楜娘壺錮込葫⌒虚兒杞估冴漕痩虎冱倒戸呱媚粉夸詁木鈷捏濃故濾箍漉黄恋拠誇壷放転鼓股罟女己乕琥跨滬越古去糊滸扈瑚皷混怙弧辜戀蠱超児雇孤湖瓠蛄凅肥こｾ芹鬩槧羶甎揃倩翦箋燹濺苫栫槫孱孅簽吮纖湶纎亘筌蟾磚荐茜斬綫箭舩喘錢專僊贍鐫仟旃痊涎銛饌僣韆沾刋擶薦舛牋阡濳癬筅殱殲闡賎餞羨顫甅竰糎陝銓踐閃∨潺遷銑栴剪煽譫僉瞻践栓跣疝詮銭穿尠戰腺繊僭泉嬋淺仙擅鮮専扇浅蘚船線撰宣洗選煎戦尖先忙伜倅逼狹狭蝉旋洩椄§卩渫絏鱈泄攝啜紲緤薛刹褻浙竊截窃殺説拙摂節切蹐績蹠蓆籍跡跖晰威螫迹瘠勣裼晢夕鶺雪寂∫∬碩惜析席隻情甥躋貰淒婿嘶醒睛擠撕牲萋菁犀韲瀞穽齏筬晟齊歳栖棲掣腥逝惺斉臍旌悽整凄靖製晴急世堰攻脊丗迫勢畆糶塞瀬畝せｸ配椪栩櫪檪椡椚箜櫟含纐婚糞癖潛潜鵠凹窪縊跟軛頚珞頸諄窟鞋履狐轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬楠誓梳串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖ξΞ茸菌楔草圀邦國国嗽漱吻劫刧腔φ粂皹勳熏裙醺桾皸崑燻訓勲葷君委钁企咥銜桑某暝峅眛昏冥鮓比闇位鞍藏暗倉廚厨涅〃仝ヽゞヾ々ゝ公曇雲蜘佝栗狂包胡俥梍枢畔鐵★玄黒玖供苦九枸鳩煦狗来徠吼工絎駒朽眩垢口窶区劬繰呉宮暮貢久嶇來奇９庫惧組衢紅句吁懼區桍孔怐瞿汲くｼ埀謐Σσ蕋蘂蕊痺褥茵鵐蔀鷸鴫入責霑蔵嶌了縞嶋島凋搾澀澁渋縛暫屡柴荵凌鎬忍慕簧舖↓襪認从從．舌扱罔θ虐Θ粃秕椎椣貎尿肉臠猪衣榻黙蜆恵楙誠茂成繁鋪惻陣頻閾櫁樒汐鹽潮隰瑟嫉櫛蛭蟋疾隲悉漆躾膝失室沒鎭沈滴雫賤鎮靜静顰尓爾聢乍然併■□◇◆倖幸貭叱征質柵卯滋撓品鬼錣鍜錏凝痼而拉設垂萎栞襞吝咳什導汁徴験著記印☆〇銀城報調蝨虱白濕湿標七僕笞楚霜臀退斥後尻寫卸者炙冩柘舍砂＃♯暹諜喋煮這西娑沙謝紗鯱奢赦洒捨鮭瀉炸抉決皙勺釋蜥爍鑠妁斫蹟刳昔芍酌爵折癪笏赤綽灼杓石尺赭写鷓積遮舎車射斜釈社蛛麈諏洙殳娶娵鬚侏銖繻菽叔俶戚蓿倏蹙肅淑夙粛宿縮珠殊趣恤蟀卆出繍楢葺溲泅酬逎遒緝岫螽萩鷲甃駲楸穐蹤讎售讐洲綉收驟囚舅姑蓚皺鞦銹脩輯醜習羞酋聚舟秀祝袖拾啾蒐収執衆愁就臭蹴週終褶州宗集秋椶棕朱撞種修周手酒首須儁皴悛濬惷蕣雋墫順蠢舜旬浚竣峻駿逡筍瞬俊嗔蓁縉蔘鷏忱甄鷆寢岑畛矧疹槙齔臻娠譛譖哂脣袗怎晉瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵薪晨辰震宸森伸愼眞慎寝晋進審深親臣鍼申心宍信真新藷墅薯杵岨胥蜍黍渚砠處嶼狙苜苴曙背緒雎蔗庶処署所暑誚篠聲橡奬觴舂囁蛸懾燮厰錆獎枩稍甞韶炒淞陞顳咲腫井摺嶂橸浹愴星升鍬樅簫慯廂霎庠剿筱鬆秤鯖政訟廠樵鷦邵愀妝璋湫艢劭峭殤梢將敞醤青慫従逍倡竦爿薔笙樟装肖菖＜≦湘誦聳檣稱声裳蒋蕉嘯慴盛精霄清鈔粧彰悚鏘悄蕭哨瀟焦憔匠鍾償鞘瘴漿頌詔妾沼請薑唱庄渉障奨牀娼床椒荘抄聖宵傷性生相召銷賞猩症昭燒猖昌少憧紹晶祥尚承證将焼笑照招消章詳証硝掌商昇小觸穡屬稷嗇禝寔稙昃謖軾矚拭属燭贖囑嘱織蝕式喰蜀殖初諸触埴植食職砥姉摯誣侈髭肆仔及岐址梔咫刺贄沚旨誌資豕鷙凍厮粢齒雌耜枝齎領篩四嗤貲諮巵止死強仕熾市師指厶妛諡祗閇姿駟嗜衰偲嗣趾此染締詞茲釶〆覗弛士徙至嘴駛屎占啻之揣如知錙糸絞孜尸獅瓷緊笥始泗咨觜只匙輜廝使敷恃思痴漬脂氏蚩時紫沁俟絲巳祉矢恣若賜次浸詩志識司弑笶翅謚示梓伺視緇自祠史試私痣滲茨肢歯幟祀施竢舐卮耆呰芝阯しｶ癢糜粥痒麹輕骨業軽鰈鰔餉通龜瓶甕亀鳫獵鴈殯K猟雁釀鳬鳧髢氈鴨巛側躱廁厠磧瓦獺翡為皮裘→紮〜搦苧碓柄躯躰軆體身体鴉犂烏絡空唐榧茅澗鸛厂蒄啣卷淦扞杆骭歛瞰讙奐戡豢坎瀚皖稈鐶拑酣陷繝嫺驩篏樌莟勸捍撼澣盥羹嫻鑵寰丱康懽憾羮揀歡潤罕觀橄涵渙堪覡巫鉋随萱簪舘艱咸翰柬駻悍燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹緘款桓箝諫諌轗坩旱侃鰥　館莞橇韓患灌勧菅奸刊柑肝看桿寒緩干嵌廣広竿貫巻敢漢環喊陥監喚甘間歓閑寛管慣完汗艦乾幹官観壁椛屍姓庇鞄芳蔓千鯑一勘蜻⊃影陰蔭景＊棧梯筧庚辛柧門廉乞癩Κ川κ合’）《‘”｛〈“｝》〉囓柁鮖悴舵鰍梶錺餝飾篭籠歸孵卻皈還省顧楓槭却帰反返守帋督祇髮韮主裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀象模仇固硬傍難容忝辱頑形旁方型肩風滓翳微幽掠緕纃綛絣擦糟鎹粕春戞猾曷剋黠瞎鞨恰∧濶蠍筈蝎羯喝轄餓蛞聒劼擔刮蘰鬘桂闊括嘗捷豁渇担滑松堅鰹功割戛活疽暈鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿掲關罹抱踵嬶嚊拘関係顏貌郁薫顔母感釡罐窰鴎框叺喧竃竈窯釜缶蒲鎌數数槝栢膳傅畏賢橿姦樫爨炊圍喞託囲鈎「『鉤」』限鍵傾（禿蕪鏑頭齧被兜哉適敵必要称彜彝鬲鼎叶片哀愛悲鋺蛇鉄蜩神奏金楫裹磆餅徒褐粮糧茖椁覺幗槨貉擴壑隱愨寉殼癨嚇穫咯膕骼膈∠掴狢埆蠖覈霍礁恪擱匿撹攪喀廓較郭〕【［】］〔殻挌劃閣格隠覚矍革馘鶴攫核獲拡客隔角確廨囘隗嵬觧榿蠏匯徊迴壞褂獪丐械枴畍誨揩醢誡夬懈喙椢恠峡价櫂茴蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧皆界疥魁偕改繪貝胛絵快甲灰槐晦懐介塊解廻回階戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡柯噛箇上苛暇蚊廈易嘩ヵ描苅枯佳彼兼哥缺霞藉架啝下渦踝堝闕華嗄荷馨刈假夥河科個蝸迦軻咼黴舸繋書賀夏萪支卦掛掻蝦痂謌渮歌過香禾狩買變家枷克駈花賈畫珂呵替代訶袈咬画顆貸價淅飼和ヶ果糅厦課可醸葭勝仮搗嘉墟嗅譌日斯禍換窩苟貨蝌価懸欠化罅伽賭翔靴且嚼訛何駆驅个嫁譁借跏戈稼寡涸耶崋鹿笳火茄菓遐舁かｃ・…塩閉倶錫呼∩取籐加交ФГДАжБъйдзьЖНкёЗрЭцУТвСЮюЪЯЁЛИноыбВмМХЬЕэаепПКЩсШщяхЫштОРилгуЙф♪╂┼×╋┿◎○●銅∪χΧ子Чч株Ц珈、，色ク衝競構簡制≡変接カ┏┓└┌┛┘┗┐正コシセ℃¢c]\|ｯ\_s*[ｺｾｸｼｶ]\|ッ\_s*[コセクシカ]\|っ\_s*[子こせくしか]\|焜\_s*炉\|嫡\_s*妻\|二\_s*合\_s*半\|牛\_s*尾\_s*魚\|巨\_s*勢\|独\_s*楽\|居\_s*士\|特\_s*牛\|粫\_s*門\|甦\_s*生\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|傴\_s*僂\|A\_s*\%(r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|p\_s*i\_s*a\_s*l\_s*e\_s*s\)\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|懺\_s*法\|前\_s*[妻栽]\|妹\_s*尾\|嘲\_s*笑\|儕\_s*輩\|斎\_s*次\|済\_s*[民済々]\|蒸\_s*[篭籠]\|救\_s*世\|莎\_s*草\|百\_s*[濟済]\|恭\_s*敬\|9\_s*[日月]\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|探\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|老\_s*舗\|望\_s*潮\|健\_s*か\|L\_s*a\_s*\%(u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|卓\_s*袱\|桎\_s*梏\|柳\_s*葉\_s*魚\|汚\_s*点\|蠹\_s*魚\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|云\_s*[云々]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|７\_s*月\|7\_s*月\|文\_s*月\|４\_s*[分月]\|4\_s*月\|竹\_s*[篦刀]\|羊\_s*[齒歯]\|爲\_s*\%([留難置果送極手兼合業]\|ん\_s*方\|來\_s*り\|納\_s*め\)\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|素\_s*[魚人面]\|不\_s*[忍知]\|注\_s*連\|軍\_s*鶏\|髑\_s*髏\|三\_s*\%(味\|鞭\_s*酒\)\|吃\_s*逆\|差\_s*[別異]\|叉\_s*手\|輸\_s*[出贏]\|卒\_s*去\|B\_s*r\|隼\_s*[朗郎]\|笋\_s*[干羹]\|参\_s*差\|財\_s*産\|枌\_s*所\|縦\_s*容\|睫\_s*毛\|M\_s*\%(e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|u\_s*s\_s*a\_s*l\_s*e\_s*s\)\|S\_s*\%([ge]\|p\_s*e\_s*r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*i\_s*t\_s*a\_s*m\_s*i\_s*n\_s*e\_s*a\_s*e\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|o\_s*\%(t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\|d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\)\)\|連\_s*枷\|枳\_s*殻\|機\_s*関\|落\_s*葉\_s*松\|凵\_s*繞\|檻\_s*車\|顴\_s*骨\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|山\_s*\%(海\_s*経\|梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|破\_s*片\|脚\_s*気\|旗\_s*魚\|鍛\_s*[治冶]\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|長\_s*[月官]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*[沫白]\|曽\_s*て\|曾\_s*て\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|螳\_s*螂\|蟷\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|瑕\_s*[瑾疵]\|東\_s*\%([風雲]\|海\_s*林\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|気\_s*[質触]\|(\_s*株\_s*)\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|契\_s*経\|中\_s*央\_s*処\_s*理\_s*装\_s*置\|伊\_s*藤\_s*忠\_s*テ\_s*ク\_s*ノ\_s*サ\_s*イ\_s*エ\_s*ン\_s*ス\|分\_s*類\|ス\_s*リ\_s*ー\_s*ズ\|範\_s*疇\|ト\_s*ラ\_s*ン\_s*プ\|水\_s*[鶏母手夫晶]\|複\_s*雑\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|サ\_s*\%(ン\_s*チ\_s*ー\_s*ム\|エ\_s*ラ\|イ\_s*\%(ト\_s*カ\_s*イ\_s*ン\|ラ\_s*ス\|ク\_s*\%([ルロ]\|リ\_s*\%(ン\|ッ\_s*ク\)\)\|ボ\_s*\%(ウ\_s*ズ\|ー\_s*グ\)\|バ\_s*\%(ー\|ネ\_s*テ\_s*ィ\_s*\%(ッ\_s*ク\|ク\_s*ス\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ダ\_s*ー\|フ\_s*ァ\_s*ー\|ネ\_s*リ\_s*ア\)\|ー\_s*\%(テ\_s*ィ\_s*フ\_s*ィ\_s*ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|ク\_s*ル\|カ\_s*\%(ス\|ム\_s*ス\_s*ク\_s*\%(ラ\_s*イ\_s*ブ\|リ\_s*プ\_s*シ\_s*ョ\_s*ン\)\)\|キ\_s*\%(ュ\_s*\%(ラ\_s*ー\|レ\_s*ー\_s*\%(タ\_s*ー\|シ\_s*ョ\_s*ン\)\)\|ッ\_s*ト\)\)\)\|マ\_s*ド\_s*ラ\_s*ス\|茶\_s*筅\|ケ\_s*\%([月アイ]\|フ\_s*ェ\_s*ウ\_s*ス\|プ\_s*ス\_s*ト\_s*ラ\_s*[ムル]\|チ\_s*ャ\_s*ッ\_s*プ\|ン\_s*\%(タ\_s*ウ\_s*\%(リ\|ロ\_s*ス\)\|ブ\_s*リ\_s*ッ\_s*ジ\)\|ー\_s*\%([キジブプスン]\|ク\_s*ウ\_s*ォ\_s*ー\_s*ク\|ソ\_s*ン\|タ\_s*リ\_s*ン\_s*グ\|パ\_s*\%(ー\|ビ\_s*リ\_s*テ\_s*ィ\)\|シ\_s*ン\_s*グ\|リ\_s*ー\)\|ル\_s*\%(ト\|ベ\_s*ロ\_s*ス\|テ\_s*ィ\_s*ッ\_s*ク\|ビ\_s*\%(ム\|ー\_s*ニ\)\)\|ミ\_s*\%(カ\_s*ル\|ス\_s*ト\)\)\|キ\_s*\%(ヤ\_s*ノ\_s*ン\|プ\_s*ロ\_s*ス\|ケ\_s*ロ\|ュ\_s*\%([イーア]\|ヴ\_s*ェ\|ビ\_s*\%(ズ\_s*ム\|ス\_s*ム\)\|ロ\_s*\%(ス\|ッ\_s*ト\)\|レ\_s*ー\_s*タ\_s*ー\|ラ\_s*ソ\_s*ー\|リ\_s*\%(ー\|ウ\_s*ム\|ア\_s*ス\|オ\_s*シ\_s*テ\_s*ィ\)\)\|ア\_s*\%(ラ\|ー\_s*ラ\|ン\_s*テ\_s*ィ\)\|チ\_s*ン\|ト\_s*サ\_s*ン\|メ\_s*ラ\|マ\_s*イ\_s*ラ\|ッ\_s*カ\|レ\_s*ー\_s*ト\|ャ\_s*\%([ドパスブンラ]\|デ\_s*\%(ィ\|ラ\_s*ッ\_s*ク\)\|ビ\_s*\%([アンネ]\|テ\_s*\%(ィ\|ー\_s*シ\_s*ョ\_s*ン\)\)\|ベ\_s*ツ\|バ\_s*\%(リ\_s*[エア]\|レ\_s*ー\)\|ト\_s*ル\|シ\_s*ー\|サ\_s*リ\_s*ン\|タ\_s*ピ\_s*ラ\|ピ\_s*\%(ト\_s*ル\|タ\_s*\%(ル\|リ\_s*ズ\_s*ム\)\)\|プ\_s*\%(ラ\|シ\_s*ョ\_s*ン\|テ\_s*ン\|チ\_s*ャ\)\|セ\_s*\%(イ\|ロ\_s*ー\_s*ル\)\|ッ\_s*\%([ツトチプ]\|サ\_s*バ\|ス\_s*ル\|シ\_s*\%(ュ\|ン\_s*グ\|ャ\_s*\%(ー\|ブ\_s*ル\)\)\)\|ニ\_s*\%(オ\_s*ン\|ス\_s*タ\_s*ー\)\|ナ\_s*ル\|ノ\_s*\%(ン\|ー\_s*ラ\|ピ\_s*ー\)\|ミ\_s*ソ\_s*ー\_s*ル\|メ\_s*\%(ル\|ロ\_s*\%(ン\|ッ\_s*ト\)\)\|ロ\_s*\%(ル\|ウ\_s*ェ\_s*イ\|リ\_s*ン\|ラ\_s*イ\_s*[ンナ]\|ッ\_s*ト\)\|レ\_s*ッ\_s*ト\|リ\_s*\%([コーア]\|バ\_s*ー\|ブ\_s*レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ッ\_s*ジ\|ン\_s*グ\)\|ズ\_s*ム\)\|リ\_s*\%(コ\|ス\_s*ト\|シ\_s*タ\_s*ン\)\)\|総\_s*角\|チ\_s*\%([タリンマア]\|ワ\_s*ワ\|ラ\_s*ー\|ル\_s*ド\|ム\_s*ニ\_s*ー\|コ\_s*リ\|ッ\_s*\%([プク]\|テ\_s*リ\_s*オ\|タ\_s*ゴ\_s*ン\)\|キ\_s*\%(ン\|ー\_s*タ\)\|ュ\_s*\%(ア\_s*ブ\_s*ル\|ー\_s*イ\_s*ン\_s*ガ\_s*ム\)\|ー\_s*\%([フトプクズ]\|パ\_s*ー\|タ\_s*ー\)\|ェ\_s*\%([ロスカコアン]\|ザ\_s*\%(レ\|ー\_s*レ\)\|ル\_s*\%(ニ\_s*ー\|シ\_s*ー\|ノ\_s*ブ\_s*イ\_s*リ\)\|リ\_s*\%(ー\|ス\_s*ト\|ッ\_s*シ\_s*ュ\|モ\_s*ヤ\)\|レ\_s*\%(ス\_s*タ\|ン\_s*コ\_s*フ\)\|ビ\_s*チ\_s*ェ\_s*フ\|ダ\_s*ー\|チ\_s*ェ\_s*ン\|ッ\_s*\%([トクカ]\|キ\_s*ン\_s*グ\)\|イ\_s*\%([スン]\|ニ\_s*ー\|サ\_s*ー\|シ\_s*ン\_s*グ\)\|ー\_s*\%(ン\|ザ\_s*レ\|ホ\_s*フ\)\)\|ャ\_s*\%([オフドインコリウ]\|ツ\_s*ネ\|ク\_s*ラ\|プ\_s*タ\_s*ー\|パ\_s*テ\_s*ィ\|ペ\_s*\%(ル\|ッ\_s*ク\)\|チ\_s*ャ\|ネ\_s*\%(ル\|ラ\_s*ー\|リ\_s*ン\_s*グ\)\|ッ\_s*\%([クト]\|ピ\_s*ー\|プ\_s*\%(マ\_s*ン\|リ\_s*ン\)\)\|タ\_s*\%(レ\_s*[イー]\|リ\_s*ン\_s*グ\)\|ル\_s*マ\_s*ー\_s*ス\|レ\_s*ン\_s*ジ\|モ\_s*ロ\|ー\_s*\%([チタトムジ]\|ビ\_s*ル\|ミ\_s*\%(ー\|ン\_s*グ\)\|リ\_s*ー\|ル\_s*\%([ズス]\|ト\_s*ン\)\)\|ラ\_s*ン\_s*ゴ\)\|ョ\_s*\%([ンコ]\|イ\_s*ス\|ム\_s*ス\_s*キ\_s*ー\|ー\_s*\%(ク\|サ\_s*ー\|カ\_s*ー\|キ\_s*ン\_s*グ\)\|ゴ\_s*リ\|ッ\_s*\%(プ\|ピ\_s*ー\|パ\_s*ー\)\|リ\_s*ソ\)\)\|座\_s*標\|喜\_s*劇\|互\_s*換\|共\_s*\%(通\|産\_s*主\_s*義\_s*者\)\|継\_s*続\|C\_s*\%([srfdDeRoa]\|言\_s*語\|型\_s*肝\_s*炎\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|P\_s*\%(U\|S\_s*(\_s*C\_s*o\_s*n\_s*t\_s*i\_s*n\_s*u\_s*a\_s*t\_s*i\_s*o\_s*n\_s*-\_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\)\|u\_s*r\_s*i\_s*u\_s*m\|M\_s*\%(U\|ソ\_s*ン\_s*グ\)\|タ\_s*イ\_s*プ\|T\_s*\%(ス\_s*キ\_s*ャ\_s*ン\|R\_s*L\_s*キ\_s*ー\)\|シ\_s*ェ\_s*ル\|S\_s*\%(V\_s*フ\_s*ァ\_s*イ\_s*ル\|チ\_s*ュ\_s*ー\_s*ナ\|ア\_s*ン\_s*テ\_s*ナ\)\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|コ\_s*ン\_s*パ\_s*イ\_s*ラ\|C\_s*\%(R\_s*(\_s*C\_s*r\_s*e\_s*e\_s*d\_s*e\_s*n\_s*c\_s*e\_s* \_s*C\_s*l\_s*e\_s*a\_s*r\_s*w\_s*a\_s*t\_s*e\_s*r\_s* \_s*R\_s*e\_s*v\_s*i\_s*v\_s*a\_s*l\_s*)\|D\_s*カ\_s*メ\_s*ラ\)\|ド\_s*ラ\_s*イ\_s*ブ\|+\_s*+\|L\_s*\%(X\|O\_s*S\|I\_s*S\_s*P\)\|E\_s*S\_s*P\|A\_s*\%(D\|S\_s*[LE]\)\|ラ\_s*ン\_s*ク\|I\_s*S\_s*C\|h\_s*\%(l\_s*o\_s*r\_s*\%(a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\_s*e\)\|r\_s*o\_s*m\_s*i\_s*u\_s*m\|a\_s*S\_s*e\_s*n\)\|O\_s*\%(B\_s*O\_s*L\|N\_s*T\_s*R\_s*O\_s*L\_s*キ\_s*ー\)\)\|Ｃ\_s*\%([型ｍ]\|Ｍ\_s*ソ\_s*ン\_s*グ\|タ\_s*イ\_s*プ\|カ\_s*ッ\_s*プ\|ク\_s*ラ\_s*ス\|ｄ\_s*Ｓ\|Ｄ\_s*−\_s*Ｒ\_s*Ｏ\_s*Ｍ\|ド\_s*ラ\_s*イ\_s*ブ\|＋\_s*＋\|ラ\_s*ン\_s*ク\|Ｏ\_s*2\|ｏ\_s*Ｃ\_s*\%(ｏ\|Ｏ\_s*ス\_s*ト\_s*ア\)\|言\_s*語\)\|ツ\_s*\%(ァ\_s*ー\|ィ\_s*リ\_s*ル\|ェ\_s*\%(ー\|ル\_s*ニ\_s*ー\|ラ\_s*ン\)\)\|炭\_s*素\)',
+      \ 'd' : '\%([共吃巴錚鑼鶏鳥響嫩緞丼呑曇貪鈍肭遠蚌溝隣鄰塢床処所年時鯲鰍鰌讀得徳獨髑毒読僮萄鐃耨嫐橈儂撓陶働ゞ桐通閙藤々恫瞳憧鬧≡⇔慟撞導仝〃洞堂瞠獰艟胴銅童動同道堵戸奴退取呶解怒土駑留努録何止度弩融孥ど瓰竕凸竍籵瓧禰泥捏溺寺棯甸黏沺佃鈿畋淀澱臀傳殿電照でヅ鶴辛強妻綱勤伝筒包做造作尽机月塚遣冢疲使連付突積吊詰漬津図釣づヂ中近力痔持地ぢ種棚倒彩濃逹畳諾゛濁默球玉魂騙谷点館舘竹嶽岳高凧蛸怛妲獺奪脱梯餒迺岱廼戴弟臺平内醍橙］［題＞≧第台代大鱈頼便誰懶樽怠斷椴灘黙旦煖彈暖談段断檀団團壇弾男柁舵駄雫娜橢拏朶蛇墮拿佗垂沱溜懦楕炊鴕陀儺唾騨澑建荼立田惰抱陏駝打兌妥堕出だｄ直◎，丶、．\.‥・…＄”“↓†‡―┤達℃°独ド÷◇◆ダジДдΔδデ∂d]\|ｯ\_s*\%(ﾄ\_s*ﾞ\|ﾃ\_s*ﾞ\|ﾂ\_s*ﾞ\|ﾁ\_s*ﾞ\|ﾀ\_s*ﾞ\)\|ッ\_s*[ドデヅヂダ]\|っ\_s*[どでづぢだ]\|ﾄ\_s*ﾞ\|都\_s*々\_s*逸\|褞\_s*袍\|S\_s*a\_s*u\_s*r\_s*u\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|C\_s*\%(u\|o\_s*p\_s*p\_s*e\_s*r\)\|満\_s*天\_s*星\|豆\_s*腐\|如\_s*何\|ﾃ\_s*ﾞ\|刑\_s*事\|粘\_s*葉\_s*装\|手\_s*間\|木\_s*偶\|丁\_s*[稚抹]\|蝸\_s*牛\|ﾂ\_s*ﾞ\|頭\_s*[腦痛]\|ﾁ\_s*ﾞ\|調\_s*子\|茶\_s*碗\|知\_s*恵\|忸\_s*怩\|ﾀ\_s*ﾞ\|忠\_s*幸\|壁\_s*蝨\|伊\_s*達\|山\_s*車\|韃\_s*靼\|提\_s*婆\_s*達\_s*多\|太\_s*\%([刀宰鼓]\|平\_s*広\|上\_s*天\_s*皇\|政\_s*\%(官\|大\_s*臣\)\)\|乃\_s*[公毅]\|体\_s*操\|葮\_s*竹\|演\_s*\%(し\_s*物\|繹\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\)\|コ\_s*ロ\_s*ン\_s*ビ\_s*ア\|ズ\_s*\%(ロ\_s*ー\_s*ス\|ッ\_s*ク\)\|イ\_s*ル\_s*カ\|医\_s*者\|博\_s*士\|文\_s*書\|行\_s*列\_s*式\|発\_s*見\_s*す\_s*る\|ハ\_s*ー\_s*グ\|拒\_s*否\_s*さ\_s*れ\_s*た\|破\_s*壊\_s*\%(者\|す\_s*る\)\|消\_s*滅\_s*子\|記\_s*述\_s*子\|Ｄ\_s*\%(論\|タ\_s*イ\_s*プ\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|Ｃ\_s*ブ\_s*ラ\_s*ン\_s*ド\|ｙ\_s*ｌ\_s*ａ\_s*ｎ\|ラ\_s*ン\_s*ク\|ａ\_s*ｉ\_s*ｓ\_s*ｙ\|ｅ\_s*ｍ\_s*ａ\_s*ｃ\_s*ｓ\)\|十\_s*進\_s*数\|ゼ\_s*ッ\_s*ケ\_s*ン\|復\_s*号\_s*化\|省\_s*略\|金\_s*剛\_s*石\|辞\_s*書\|D\_s*\%(b\|タ\_s*イ\_s*プ\|T\_s*\%(E\|P\_s*ソ\_s*フ\_s*ト\|M\_s*ソ\_s*フ\_s*ト\)\|M\_s*A\|ド\_s*ラ\_s*イ\_s*ブ\|カ\_s*ッ\_s*プ\|C\_s*\%(カ\_s*ー\_s*ド\|ブ\_s*ラ\_s*ン\_s*ド\)\|u\_s*b\_s*n\_s*i\_s*u\_s*m\|B\_s*\%(M\_s*S\|サ\_s*ー\_s*バ\)\|H\_s*C\_s*P\_s*\%(サ\_s*ー\_s*バ\|ク\_s*ラ\_s*イ\_s*ア\_s*ン\_s*ト\)\|y\_s*\%(s\_s*p\_s*r\_s*o\_s*s\_s*i\_s*u\_s*m\|l\_s*a\_s*n\)\|r\_s* \_s*P\_s*e\_s*p\_s*p\_s*e\_s*r\|ラ\_s*ン\_s*ク\|V\_s*D\_s*\%(ボ\_s*ッ\_s*ク\_s*ス\|シ\_s*ョ\_s*ッ\_s*プ\|ケ\_s*ー\_s*ス\|デ\_s*ッ\_s*キ\|ド\_s*ラ\_s*イ\_s*ブ\|オ\_s*ー\_s*デ\_s*ィ\_s*オ\|プ\_s*レ\_s*\%(イ\_s*ヤ\_s*ー\|ー\_s*ヤ\_s*ー\)\|ラ\_s*ッ\_s*ク\|レ\_s*コ\_s*ー\_s*ダ\_s*ー\|マ\_s*ル\_s*チ\|ビ\_s*デ\_s*オ\)\|O\_s*S\|o\_s*\%(c\_s*u\_s*m\_s*e\_s*n\_s*t\_s* \_s*\%(T\_s*y\_s*p\_s*e\_s* \_s*D\_s*e\_s*f\_s*i\_s*n\_s*i\_s*t\_s*i\_s*o\_s*n\|O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*o\_s*d\_s*e\_s*l\)\|C\_s*o\_s*M\_s*o\)\|e\_s*\%(g\_s*e\_s*n\_s*e\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|l\_s*a\_s*w\_s*a\_s*r\_s*e\)\|E\_s*\%(C\|L\_s*キ\_s*ー\)\|I\_s*\%(P\_s*ス\_s*イ\_s*ッ\_s*チ\|S\_s*K\)\|i\_s*\%(r\_s*e\_s*c\_s*t\_s* \_s*M\_s*e\_s*m\_s*o\_s*r\_s*y\_s* \_s*A\_s*c\_s*c\_s*e\_s*s\_s*s\|s\_s*t\_s*r\_s*i\_s*c\_s*t\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*l\_s*u\_s*m\_s*b\_s*i\_s*a\|g\_s*i\_s*t\_s*a\_s*l\)\)\)',
+      \ 'e' : '\%([ｴ瘧腮偉鰓衿撰襟魘捐覃櫞湲檐薗篶￥渕鹽簷轅悁渊讌艷黶垣閼圜蜒爰掾媛鳶鴛焉宛嫣閻衍臙閹槐⌒援筵淹厭寃淵掩烟嚥圓沿宴蜿奄袁煙艶焔炎怨鉛園苑偃冤延婉遠堰燕演塩円縁刔刳抉猿狗描択鰕箙蛯蝦狄貊胡戎夷乢靨鉞戉粤咽噎桟悦閲謁亦繹伯懌掖蜴奕越役驛疫易益腋駅液咏瓔珱曵衡殪贏裔洩楹娃潁蠑瑩翳纓塋營頴瀛睿泳縊榮瑛暎曳盈郢影詠穎嬰鋭叡映営栄永枝会選衣依榎繪囘懷画絵衛會畫猥回恵獲惠慧衞荏重得餌江杖笑柄え━─┳┬┰┯┸┻┴┷фФ＝≡⇔∋∈РрмМｅН→英∃式！ηΗсСЛлεЭэエΕe]\|A\_s*\%([面判型級]\|V\_s*\%(機\_s*器\|女\_s*優\)\|B\_s*\%(型\|C\_s*順\)\)\|Ａ\_s*\%([面判型級]\|Ｖ\_s*\%(機\_s*器\|女\_s*優\)\|Ｂ\_s*型\)\|M\_s*サ\_s*イ\_s*ズ\|Ｍ\_s*サ\_s*イ\_s*ズ\|豪\_s*物\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\)\|L\_s*\%(サ\_s*イ\_s*ズ\|L\_s*\%(サ\_s*イ\_s*ズ\|教\_s*室\)\)\|羨\_s*道\|豌\_s*豆\|C\_s*\%(l\|h\_s*l\_s*o\_s*r\_s*i\_s*n\_s*e\)\|似\_s*\%(非\|而\_s*非\)\|桧\_s*原\_s*湖\|烏\_s*帽\_s*子\|吉\_s*方\|胞\_s*衣\|淮\_s*南\_s*子\|埃\_s*及\|干\_s*支\|岐\_s*路\|支\_s*繞\|壊\_s*[疽死]\|葡\_s*萄\|蛭\_s*子\|愛\_s*\%([莉理媛]\|知\_s*川\)\|N\_s*極\|Ｎ\_s*\%([個極響]\|次\_s*元\|角\_s*形\|Ｈ\_s*Ｋ\_s*ホ\_s*ー\_s*ル\)\|斉\_s*魚\|兄\_s*鼓\|ヱ\_s*ス\_s*ビ\_s*ー\_s*食\_s*品\|S\_s*\%([式極]\|サ\_s*イ\_s*ズ\|N\_s*比\|F\_s*小\_s*説\)\|Ｓ\_s*\%([波字席極]\|サ\_s*イ\_s*ズ\|Ｎ\_s*比\|Ｆ\_s*小\_s*説\)\|穢\_s*[多土]\|Ｘ\_s*\%([軸脚線]\|染\_s*色\_s*体\)\|X\_s*\%([軸脚]\|O\_s*醤\|染\_s*色\_s*体\)\|海\_s*\%(老\|鷂\_s*魚\)\|帝\_s*都\_s*高\_s*速\_s*度\_s*交\_s*通\_s*営\_s*団\|ワ\_s*ー\_s*ク\_s*ス\_s*テ\_s*ー\_s*シ\_s*ョ\_s*ン\|欧\_s*\%(州\|羅\_s*巴\)\|歐\_s*\%(州\|羅\_s*巴\)\|ヨ\_s*ー\_s*ロ\_s*\%(ピ\_s*ア\_s*ン\|ッ\_s*パ\)\|ユ\_s*\%(ア\_s*ン\|ウ\_s*ロ\_s*ピ\_s*ウ\_s*ム\|リ\_s*イ\_s*カ\|ー\_s*\%(ロ\|ノ\_s*ス\|ニ\_s*ス\|ジ\_s*\%(ン\|ー\_s*ン\)\|ド\_s*ラ\|レ\_s*カ\|ラ\_s*\%(ス\|シ\_s*ア\)\|フ\_s*\%(ラ\_s*テ\_s*ス\|ォ\_s*\%(リ\_s*ア\|ニ\_s*ア\_s*ム\)\)\|ク\_s*リ\_s*ッ\_s*ド\|カ\_s*リ\)\)\|編\_s*集\|強\_s*調\|電\_s*子\_s*メ\_s*\%(ー\_s*ル\|イ\_s*ル\)\|発\_s*展\|評\_s*価\_s*す\_s*る\|符\_s*号\_s*化\|百\_s*科\_s*事\_s*典\|カ\_s*プ\_s*セ\_s*ル\_s*化\|オ\_s*\%(ー\|イ\_s*\%(ラ\_s*ー\|ゲ\_s*ン\)\)\|実\_s*行\|拡\_s*張\|例\_s*外\|感\_s*嘆\_s*符\|Ｅ\_s*\%(Ｐ\_s*Ｏ\|ド\_s*ラ\_s*イ\_s*ブ\|Ｄ\_s*ベ\_s*ー\_s*タ\|ｍ\_s*ａ\_s*ｃ\_s*ｓ\|カ\_s*ッ\_s*プ\|ａ\_s*ｓ\_s*ｔ\|ｘ\_s*ｅ\_s*ｒ\_s*ｃ\_s*ｉ\_s*ｓ\_s*ｅ\|タ\_s*イ\_s*プ\)\|ア\_s*\%([ンイ]\|ニ\_s*ド\|ー\_s*\%([マスル]\|ウ\_s*ィ\_s*ン\|ラ\_s*ン\|ニ\_s*ー\|ネ\_s*ス\_s*ト\|ミ\_s*ン\|シ\_s*ー\|リ\_s*ー\)\)\|設\_s*立\|E\_s*\%(r\|O\_s*F\|u\_s*\%(p\_s*o\_s*m\_s*a\_s*t\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*o\_s*p\_s*i\_s*u\_s*m\)\|U\_s*C\_s*コ\_s*ー\_s*ド\|P\_s*レ\_s*コ\_s*ー\_s*ド\|ド\_s*ラ\_s*イ\_s*ブ\|d\_s*i\_s*t\_s*i\_s*n\_s*g\_s* \_s*M\_s*A\_s*C\_s*r\_s*o\_s*S\|-\_s*m\_s*a\_s*i\_s*l\|メ\_s*ー\_s*ル\|カ\_s*ッ\_s*プ\|コ\_s*マ\_s*ー\_s*ス\|N\_s*T\_s*E\_s*R\_s*キ\_s*ー\|タ\_s*イ\_s*プ\|i\_s*n\_s*s\_s*t\_s*e\_s*i\_s*n\_s*i\_s*u\_s*m\|S\_s*\%(P\|C\_s*キ\_s*ー\)\|l\_s*k\|m\_s*a\_s*c\_s*s\)\|イ\_s*\%([ブヴアラー]\|ジ\_s*ェ\_s*ク\_s*ト\|フ\_s*ェ\_s*ク\_s*[トタ]\|コ\_s*\%(ー\_s*ル\|ラ\_s*イ\_s*[ズザ]\)\|プ\_s*シ\_s*ロ\_s*ン\|ミ\_s*ュ\_s*レ\_s*\%(ー\_s*[トタ]\|イ\_s*タ\)\|ベ\_s*ン\_s*\%(ト\|タ\_s*ー\)\|ノ\_s*ッ\_s*ク\|ネ\_s*ー\_s*ブ\_s*ル\|ギ\_s*リ\_s*ス\|ン\_s*グ\_s*\%(ラ\_s*ン\_s*ド\|リ\_s*ッ\_s*シ\_s*ュ\)\|ッ\_s*チ\|ヤ\_s*\%(ー\|リ\_s*ン\_s*グ\|フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|グ\_s*ジ\_s*\%(ッ\_s*ト\|ス\_s*ト\)\|ク\_s*\%(ス\|ア\_s*リ\_s*テ\_s*ィ\)\|ス\_s*フ\_s*ァ\_s*ハ\_s*ン\|リ\_s*[アヤ]\|レ\_s*\%(ー\_s*\%(ス\|ザ\_s*ー\|サ\_s*ー\)\|イ\_s*\%(ン\|ザ\_s*ー\|サ\_s*ー\)\|ブ\_s*ン\)\)\|ウ\_s*\%(ー\|ジ\_s*ェ\_s*ー\_s*ヌ\)\)',
+      \ 'f' : '\%([麓梺冬′枌賁汾濆吩刎氛雰糞褌忿墳吻紛焚扮分粉揮旧舊顫故震篩奮隹古衾襖贅燻筆鰒絃総惣總房閼鬱塞鞴章郁史艦簡札耽吭鰾笛文罧節苳蕗淦舩艙舷舟船肥太懷懐≧≪≠≫＜＞≦渊淵渕縁葢盖再弍蓋双藤鯊潭蒸鱶楓殕瘋封諷黻祓拂怫髴彿恚慍憤二払沸拒防茯蔔愎輹蝠箙腓⊇⊃膨脹嚢梟袋含⊆⊂袱覆輻腹幅復馥服副複福経俘麸賦麩蜉坿父附訃婦誣仆經舗咐符臥膚斧冨腑更俛觝怖腐斑踏深趺降畉譜履葺觸老敷歩布赴狂殖振夫苻噴罘伏匐賻風柎不巫蹈孵拭普芙郛埠鋪鯆付吹阜拊生桴溥榑扶俯触践負増傅鮒孚府芬呎ﾌ飜翻ふｆ鉄♀∀¶富⌒金仏佛偽誤♭弗浮フΦфFФφf]\|ｯ\_s*ﾌ\|ッ\_s*フ\|っ\_s*ふ\|鞦\_s*韆\|睾\_s*丸\|陰\_s*嚢\|乱\_s*吹\|相\_s*応\|E\_s*u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\|回\_s*回\_s*教\|書\_s*司\|図\_s*書\_s*寮\|海\_s*蘿\|補\_s*\%(任\|陀\_s*[洛落]\)\|頭\_s*垢\|雲\_s*脂\|鳧\_s*鐘\|款\_s*冬\|菜\_s*蕗\|蒲\_s*団\|M\_s*y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|釜\_s*[中山]\|雙\_s*葉\|B\_s*u\_s*d\_s*d\_s*l\_s*e\_s*j\_s*a\_s*c\_s*e\_s*a\_s*e\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|２\_s*[人つ日]\|宿\_s*酔\|2\_s*\%([人つ日]\|通\_s*り\)\|○\_s*○\_s*○\|□\_s*□\_s*□\|△\_s*△\_s*△\|×\_s*×\_s*×\|帛\_s*紗\|河\_s*豚\|比\_s*律\_s*賓\|I\_s*r\_s*o\_s*n\|極\_s*東\_s*放\_s*送\|論\_s*理\_s*式\|形\_s*式\|ホ\_s*\%(ワ\_s*イ\_s*エ\|イ\_s*ル\|ル\_s*\%(マ\_s*\%(ン\_s*ト\|リ\_s*ン\)\|ム\_s*ア\_s*\%(ミ\_s*ド\|ル\_s*デ\_s*ヒ\_s*ド\)\)\)\|一\_s*杯\|機\_s*能\|関\_s*数\|汎\_s*関\_s*数\|修\_s*正\|ヒ\_s*\%(レ\|ュ\_s*ー\_s*[ズム]\)\|第\_s*1\_s*要\_s*素\|１\_s*\%(／\_s*ｆ\_s*ゆ\_s*ら\_s*ぎ\|ｓ\_s*ｔ\)\|失\_s*敗\|ハ\_s*\%(エ\|ン\_s*ブ\_s*ル\|ロ\_s*ン\)\|柔\_s*軟\_s*な\|Ｆ\_s*\%(１\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ａ\_s*\%(ｘ\|ｍ\_s*ｅ\)\|ｌ\_s*ａ\_s*ｖ\_s*ｏ\_s*ｒ\)\|周\_s*波\_s*数\|エ\_s*フ\)',
+      \ 'g' : '\%([頃殺米諢魂權艮勤権鮴好蓙応駒事琴亊若毎如鏝埖込塵氷声肥聲腰拵心戀恋石国獄刧盒熬軣嗷壕敖噛濠哈遨拷囂轟毫傲鼇郷劫≡号豪剛沍五瑚晤珸呉超児檎庫互娯吾午極越護5篌兒冴茣梧誤寤５碁醐伍子唔忤期炬齬牾悟蜈后後宕ご〓戟屐鬩隙郤檄闃鷁撃激劇貎黥皃麑倪霓囈猊迎鯨芸藝蘖囓齧彦軒痃愿呟广監芫舷眩源儼衒弦絃験言諺現限幻玄減原拐実觧偈睨夏解下蹴毛げ靴草腐種口薬糞癖胡萸茱串藕遇嵎宮寓隅偶黒栗鞍倉蔵位昏麕羣郡群軍苦周包車狂惧組虞具弘暮食壷愚狗倶颶壺禺麌ぐ衣君嫌裂際牛垠崟斤岑憖吟銀圉圄禦馭魚嶷閠玉漁曉痙繞澆尭御翹嶢堯蟯驍僥仰業暁凝行謔瘧虐逆祇気曦議伎僞巍祁羲決城切艤礒擬沂犠萓嶬誼偽蟻宜斬疑木妓義犧技魏着欺戯儀戲ぎ巛皮川革乾側通殻絡辛柄鴉烏嵒頷巖厳嚴貫阮鳫偐岸厂⊃贋龕強翫岩鴈丸雁玩癌元願眼巌含頑神上紙髮髪金鐘係皈歸肯帰返潟固方語刀難型形鰹歹垳顏顔蟇釜鎌窯蒲蟹笠重傘號垣樫頭月合斈諤鄂壑鍔齶樂學萼愕嶽咢鰐額岳顎楽学乂既崖崕磑亥葢剴礙垓劾漑愾盖啀涯睚艾駭皚該咳階孩芥碍害鎧街凱慨概蓋骸外訛我伽臥哦換変借駕駆鵝貸画衙替代畫呀牙蛾訝勝ヶ果賀書餓芽河雅峩狩莪買峨掛ケヵ娥鵞刈俄が≫＞ｇ瓦≧ガゴΨβλΣΕΖΗΚΘοΤσνΠρΑκξιΝθμΜΩεΧδΞψΔπατΒΙυΦΥζΡφΟχΛηωギグгγΓゲГg]\|ｯ\_s*\%(ｺ\_s*ﾞ\|ｹ\_s*ﾞ\|ｸ\_s*ﾞ\|ｷ\_s*ﾞ\|ｶ\_s*ﾞ\)\|ッ\_s*[ゴゲグギガ]\|っ\_s*[ごげぐぎが]\|ｺ\_s*ﾞ\|小\_s*屋\|蒙\_s*御\_s*免\|巨\_s*頭\_s*鯨\|欣\_s*求\|独\_s*楽\|P\_s*e\_s*r\_s*s\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|瞽\_s*女\|歩\_s*行\_s*虫\|向\_s*拝\|皐\_s*月\|穀\_s*潰\|寄\_s*居\_s*虫\|降\_s*魔\|格\_s*\%([間縁]\|天\_s*井\)\|恒\_s*河\_s*沙\|江\_s*\%([津湖商州]\|談\_s*抄\)\|豆\_s*[油汁]\|ｹ\_s*ﾞ\|蚰\_s*蜒\|景\_s*色\|化\_s*粧\|鴃\_s*舌\|稽\_s*古\|懸\_s*魚\|還\_s*[向俗]\|拳\_s*[万固骨]\|喧\_s*嘩\|顕\_s*界\|ｸ\_s*ﾞ\|救\_s*世\_s*菩\_s*薩\|工\_s*合\|供\_s*[奉祭香進]\|紅\_s*蓮\|ｷ\_s*ﾞ\|毬\_s*杖\|岐\_s*\%([南阜]\|セ\_s*ン\)\|棋\_s*将\_s*谷\|求\_s*\%([法道肥]\|不\_s*得\_s*苦\|聞\_s*持\_s*法\)\|A\_s*g\|S\_s*\%(c\_s*r\_s*o\_s*p\_s*h\_s*u\_s*l\_s*a\_s*r\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|y\_s*m\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|i\_s*l\_s*v\_s*e\_s*r\)\|希\_s*臘\|杏\_s*葉\|餃\_s*子\|刑\_s*部\|ｶ\_s*ﾞ\|搦\_s*み\|鑑\_s*真\|仮\_s*名\|蝦\_s*[蟆蟇]\|T\_s*y\_s*p\_s*a\_s*l\_s*e\_s*s\|鉤\_s*状\_s*部\|菓\_s*子\|甲\_s*斐\|会\_s*社\|ヌ\_s*ー\|Ｇ\_s*\%(Ｏ\_s*Ｒ\_s*Ｏ\|Ｂ\_s*ｙ\_s*ｔ\_s*ｅ\|メ\_s*ン\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ス\_s*ポ\_s*ッ\_s*ト\|パ\_s*ン\|ｎ\_s*ｕ\_s*ｓ\)\|ニ\_s*ュ\_s*ー\_s*ズ\|ノ\_s*ー\_s*ム\|総\_s*司\_s*令\_s*部\|連\_s*合\_s*国\_s*軍\_s*総\_s*司\_s*令\_s*部\|ヒ\_s*ル\|ク\_s*ッ\_s*パ\|硝\_s*子\|ハ\_s*ボ\_s*ロ\_s*ー\_s*ネ\|瞿\_s*曇\|ヨ\_s*ー\_s*テ\_s*ボ\_s*リ\|エ\_s*ー\_s*テ\_s*ボ\_s*リ\|イ\_s*ェ\_s*\%(ー\_s*テ\_s*ボ\_s*リ\|テ\_s*ボ\_s*リ\)\|得\_s*る\|G\_s*\%([dae]\|o\_s*m\_s*o\_s*r\_s*t\_s*e\_s*g\_s*a\_s*c\_s*e\_s*a\_s*e\|M\_s*\%(T\|D\_s*(\_s*G\_s*e\_s*r\_s*m\_s*a\_s*n\_s* \_s*N\_s*a\_s*t\_s*i\_s*o\_s*n\_s*a\_s*l\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\_s* \_s*f\_s*o\_s*r\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s*)\)\|メ\_s*ン\|C\_s*L\|c\_s*c\|カ\_s*ッ\_s*プ\|タ\_s*イ\_s*プ\|ス\_s*ポ\_s*ッ\_s*ト\|パ\_s*ン\|P\_s*L\|n\_s*u\_s*s\|I\_s*\%(N\_s*A\_s*(\_s*t\_s*h\_s*e\_s* \_s*G\_s*e\_s*n\_s*e\_s*r\_s*i\_s*c\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*t\_s*i\_s*v\_s*e\_s* \_s*A\_s*p\_s*p\_s*l\_s*i\_s*c\_s*a\_s*t\_s*i\_s*o\_s*n\_s*)\|F\_s*\%(フ\_s*ァ\_s*イ\_s*ル\|ア\_s*ニ\_s*メ\)\)\|U\_s*I\|N\_s*U\|O\_s*サ\_s*イ\_s*ン\|E\_s*T\_s*メ\_s*ソ\_s*ッ\_s*ド\)\|ヘ\_s*\%(ラ\_s*ル\_s*ド\|ル\_s*マ\_s*ン\)\|ド\_s*イ\_s*ツ\|成\_s*吉\_s*思\_s*汗\|ゼ\_s*\%(ラ\_s*\%(チ\_s*ン\|ニ\_s*ウ\_s*ム\)\|ム\_s*ク\_s*リ\_s*ッ\_s*プ\|ノ\_s*ア\|ン\_s*ト\_s*ル\_s*マ\_s*ン\|ネ\_s*\%(コ\_s*ン\|ラ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\)\|大\_s*\%(蚊\|学\_s*院\_s*生\)\|ジ\_s*\%([ムルジグノナオンー]\|プ\_s*シ\_s*ー\|ア\_s*ン\|ッ\_s*ド\|イ\_s*ド\|タ\_s*ン\|ゼ\_s*ル\|リ\_s*ア\_s*ン\|レ\_s*ッ\_s*ト\|ゴ\_s*ロ\|ラ\_s*\%(フ\|ル\_s*\%(ド\|デ\_s*ィ\_s*ー\_s*ノ\)\)\|ロ\_s*\%(ー\|ン\_s*ド\)\|バ\_s*ン\_s*シ\_s*ー\|ブ\_s*\%(リ\|ラ\_s*ル\_s*タ\_s*ル\)\|ベ\_s*\%(ル\_s*ナ\_s*ウ\|レ\_s*リ\_s*ン\)\|ネ\_s*ッ\_s*ト\|ョ\_s*\%(ッ\_s*ト\|ヴ\_s*ァ\_s*ン\_s*[ニナ]\|バ\_s*ン\_s*[ニナ]\|コ\_s*\%(ー\_s*ソ\|ン\_s*ダ\)\|ル\_s*\%(ジ\|ダ\_s*ー\_s*ノ\)\|ー\_s*\%(ジ\|ゼ\_s*ッ\_s*ト\)\)\|ャ\_s*\%(ン\|イ\_s*\%(ロ\|ル\_s*ズ\|ア\_s*ン\_s*[ツト]\)\|コ\_s*\%(モ\|メ\_s*ッ\_s*テ\_s*ィ\)\|ー\_s*マ\_s*ン\)\|ニ\_s*ー\|ュ\_s*\%([レネ]\|ゼ\_s*ッ\_s*ペ\|リ\_s*\%(ア\|ー\_s*ニ\|エ\_s*ッ\_s*タ\)\|ヌ\_s*\%(ビ\_s*エ\_s*ー\_s*ブ\|ヴ\_s*ィ\_s*エ\_s*ー\_s*ヴ\)\)\|ェ\_s*\%([リルフムマネ]\|ス\_s*チ\_s*ャ\_s*ー\|ロ\_s*ニ\_s*モ\|ラ\_s*\%(ー\_s*[トルド]\|ル\_s*\%(ド\|デ\_s*ィ\_s*ン\|ダ\_s*イ\_s*ン\)\)\|ミ\_s*ニ\|ニ\_s*ー\|ノ\_s*\%([アバ]\|ヴ\_s*ァ\|ワ\_s*ー\_s*ズ\|サ\_s*イ\_s*ド\)\|ン\_s*\%(マ\|ト\_s*\%(ル\|リ\_s*[ィー]\)\|ダ\_s*ー\)\)\)\)',
+      \ 'h' : '\%([ﾎ洞亡袰滅幌濠壕畚笨略檣艢焔炎仄朖朗塊程施滸幾殆缶熱解屠榾螢蛍骨細本＊※糒恣縦擅星戟戈桙綻祠誇埃鉾矛堀頬袍垉膀鞄抔磅峯堋弸皰舫篷麭怦呆蔀棚褓泙枋棒勹鴇朴峰豐苞葬琺寳炮鵬寶繃魴鋒髣逢朋烹鳳彗箒俸焙蓬烽幇抱崩訪泡澎彷縫捧萌萠彭包胞倣邦飽疱庖奉豊砲報硼宝攴攵瀑蹼樮北恍掘畝譽保穗賞埔餔咆惚穂葡抛哮耄堡脯哺襃黼捕彫褒欲吼舖輔葆浦逋誉ほﾍ謙遜篦廰廳貶褊胼諞篇駢蝙翩變∂遍返騙編扁変丿暼諛諂隔凹臍巳蛇蔕蒂瓸竡粨躄闢癖甓璧劈碧壁聘餅箆坪竝嬖幤閇娉病塀蔽并陛屏炳斃瓶弊幣併敝閉並辺邉減屁圧歴邊折舳戸へﾌ麓梺冬♭′枌賁汾濆吩氛雰糞褌忿墳吻紛焚扮分粉揮旧舊顫故震篩奮隹古衾襖贅燻鰒陰絃総惣總房閼鬱塞章郁艦簡補札耽吭鰾笛芬呎文罧節苳蕗淦舩艙舷舟船蒲懷懐≧≪≫＞≦渊淵渕縁葢盖弍蓋双B藤潭蒸鱶楓殕瘋封諷黻怫髴佛彿恚慍憤仏F弗沸Φφ拒防茯蔔愎輹蝠箙⊇⊃嚢梟袋含⊆⊂袱覆輻復馥副複福経俘麸賦麩蜉坿父附訃婦誣仆經舗咐符臥斧冨更俛觝怖腐踏深趺富降畉譜葺觸敷歩赴狂殖振夫苻噴罘伏匐賻風柎不巫蹈孵拭普芙郛埠鋪鯆付吹阜拊桴溥榑扶俯触践負増傅鮒孚府ふﾋ鶸彬禀斌蘋嬪繽殯賓擯牝貧頻瀕稟品怯葫晝飜蒜蛭昼綬胙紐鰭∝衡片鮃閃鵯辟百媛姫仭擴絋仞展尋宥太拡拓拾祐恕紘煕泰熙寛啓弘宏洋裕浩廣広髟馮飃飆殍冰冫凭俵驫彪雹飄豹漂驃慓剽嫖兵憑票評標平表燧老撚拈捫捻歪籤籖柊旱魃秀跪膝蜩羆攣佗−低隙閑暇雛髯鬚髭¬蹄濳潜潛顰密窃鬻提瓠蠡瓢匏壽央恒廂尚寿久率蟆痙蟇丙丁孤女史獨独稘斎均倫準斉等≠單偏単他仁瞳人1１柆蔆拉杓柄犇◇◆菱醢醤曾蘖彦酷浸漬鶲額聖肱肘熈芒光膕控皸皹響罅僻鰉蹕匹逼篳畢疋柩棺弼櫃謐坤未羊筆必襞養饑（＜「【←『左緋罷引披惹轡丕卑碑彼昜痺砒鞁退匪否毘皮蜚干疲蓖氷比匕桧日梭曳牽費扉魅肥痞灯豼鞴斐狒碾秕杼冷贔俾挽索被貔暃避火朏菲裨秘髀轢乾臂泌庇批紕脾霏檜飛悲妣妃樋祕陳鄙譬ひﾊ布鱧釖鉤蝟梁鍼磔針肚禳腑腸孕原拂祓払遼温玄請腹陽悠遙東遥治春捷頓鮠鶻駿疾囃林隼畔磐泛鈑潘膰樊笵釆胖拌絆蟠氾坂范凡燔楾洪瘢翻板攀゜大伴煩槃斑袢判範藩繙蕃版搬叛班阪般販犯汎帆頒反侍鯊櫨祝？硲間烈激勵劇励速蝿蠅省飯彈勢外筈弭辱逸育毓齦浮難掵阻憚幅巾柞母翅幟側圃旌旙旛将傍働鰰機叩疥畠籏幡畑旗斜鴿再鳩開秦跣膚肌裸弾薑椒元弌壹哉壱甫一創馨始鋼芳剪夾鋏螯挾挟脛萩贐餞離塙英蕚萼衂衄縹譚咄放噺話洟甚鼻華花觜赱迸枦奔艀婢梯燥箸柱走橋箪匣凾□筐繁方運匚筥箱函佰珀魄陌亳狛柏愽栢岶蘗粕膊璞擘箔舶泊搏迫帛拍諮測企圖秤謀量計図儚捗袴伯博墓秡癶髮釟溌肇廿二初椀蓮♪８鉢蜂發髪服法半醗白薄八発擺旆盃珮湃坏碚琲睥霈埴牌拜裴孛吠入沛榛杯悖―廢腓徘誹稗癈俳肺憊輩背鷂胚廃排拝敗灰配蛤濱浜跳馳霸羞爆禿杷碆叭匍怕栄玻撥穿愧歯膨破恥晴巴生派暎端覇着帚刃填腫吐刷菷刎菠羽琶張這頗簸佩耻早映履慙坡榮果脹跛陂葉播笆葩矧霽食芭把刄捌垪剥爬掃帶齒嵌貼はｈ━─┛┘┷┸┻┴┓┐┬┳┯┰┫┥┤┨╋┿┼╂波‐フ☆★非ヒホヘハh]\|ｯ\_s*[ﾎﾍﾌﾋﾊ]\|ッ\_s*[ホヘフヒハ]\|っ\_s*[ほへふひは]\|寄\_s*生\|珠\_s*鶏\|混\_s*一\_s*色\|紅\_s*[幇中]\|T\_s*r\_s*i\_s*u\_s*r\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|微\_s*[酔笑]\|子\_s*規\|蜀\_s*魂\|杜\_s*[鵑宇]\|時\_s*鳥\|上\_s*枝\|鬼\_s*灯\|酸\_s*漿\|叢\_s*祠\|和\_s*了\|鮑\_s*魚\|謗\_s*法\|黒\_s*子\|部\_s*屋\|竹\_s*\%(畚\|麦\_s*魚\)\|巻\_s*子\|綜\_s*麻\|下\_s*手\|糸\_s*瓜\|霹\_s*靂\|c\_s*l\_s*a\_s*u\_s*s\_s*t\_s*r\_s*o\_s*p\_s*h\_s*o\_s*b\_s*i\_s*a\|鞦\_s*韆\|睾\_s*丸\|乱\_s*吹\|相\_s*応\|E\_s*\%(r\_s*i\_s*o\_s*c\_s*a\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\|u\_s*p\_s*t\_s*e\_s*l\_s*e\_s*a\_s*c\_s*e\_s*a\_s*e\)\|回\_s*\%(鍋\_s*肉\|回\_s*教\)\|書\_s*司\|頭\_s*垢\|鳧\_s*鐘\|款\_s*冬\|菜\_s*蕗\|f\_s*\%(o\_s*r\_s*t\_s*e\|e\_s*m\_s*t\_s*o\)\|釜\_s*[中山]\|雙\_s*葉\|渓\_s*井\|G\_s*e\_s*r\_s*a\_s*n\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|宿\_s*酔\|○\_s*○\_s*○\|△\_s*△\_s*△\|×\_s*×\_s*×\|河\_s*\%(豚\|底\_s*撈\_s*魚\)\|神\_s*[庫籬]\|領\_s*巾\|肩\_s*巾\|素\_s*見\|曹\_s*白\_s*魚\|枚\_s*[田方]\|敬\_s*昌\|幸\_s*展\|容\_s*靖\|晃\_s*道\|宙\_s*子\|欧\_s*子\|祥\_s*加\|終\_s*日\|翡\_s*翠\|曽\_s*祖\_s*父\|豪\_s*将\|偉\_s*紀\|周\_s*[行男]\|茅\_s*蜩\|向\_s*日\_s*葵\|七\_s*宗\|桶\_s*坂\|永\_s*和\|蟾\_s*蜍\|抽\_s*\%([斗出]\|き\_s*出\_s*し\)\|告\_s*天\_s*子\|雲\_s*[脂雀]\|為\_s*人\|緊\_s*[と々]\|鎮\_s*火\_s*\%(祭\|の\_s*祭\)\|A\_s*\%(s\|r\_s*s\_s*e\_s*n\_s*i\_s*c\|n\_s*g\_s*i\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\|粃\_s*糠\_s*疹\|只\_s*管\|直\_s*[向走垂隠]\|常\_s*陸\|鹿\_s*尾\_s*菜\|撲\_s*り\_s*倒\|同\_s*胞\|赦\_s*い\|青\_s*春\|哈\_s*爾\_s*浜\|美\_s*佳\|流\_s*行\|勇\_s*[樹人]\|韓\_s*流\|漢\_s*堡\|汗\_s*国\|盤\_s*陀\|R\_s*S\_s*I\|蔓\_s*延\|沙\_s*魚\|蝦\_s*虎\_s*魚\|馬\_s*銜\|狭\_s*間\|南\_s*風\|延\_s*\%(縄\|い\_s*て\)\|義\_s*母\|旅\_s*籠\|N\_s*e\_s*l\_s*u\_s*m\_s*b\_s*o\_s*n\_s*a\_s*c\_s*e\_s*a\_s*e\|黄\_s*[酒櫨]\|土\_s*[方生師]\|嘔\_s*[吐気]\|支\_s*倉\|長\_s*谷\|接\_s*ぎ\_s*合\|纏\_s*頭\|煙\_s*火\|麻\_s*疹\|階\_s*[上子]\|嘴\_s*\%(細\_s*鴉\|太\_s*鴉\)\|学\_s*胤\|２\_s*\%([人つ日]\|０\_s*[歳日]\)\|2\_s*\%([人つ日]\|通\_s*り\|0\_s*日\)\|淡\_s*竹\|8\_s*月\|客\_s*家\|P\_s*\%(t\|o\_s*t\_s*a\_s*m\_s*o\_s*g\_s*e\_s*t\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*t\_s*i\_s*n\_s*u\_s*m\)\|海\_s*\%([鞘永蘿星牙]\|拉\_s*爾\|底\_s*撈\_s*月\)\|M\_s*\%(y\_s*r\_s*t\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*u\_s*r\_s*y\)\|色\_s*調\|呼\_s*和\_s*浩\_s*特\|ウ\_s*ー\_s*ゴ\|ユ\_s*\%(ー\|ペ\_s*ー\_s*ル\|ベ\_s*ー\_s*ル\|イ\_s*ス\_s*マ\_s*ン\_s*ス\|ゴ\_s*ー\|グ\_s*ノ\_s*ー\|マ\_s*ニ\_s*\%(テ\|ス\_s*[トム]\)\)\|現\_s*代\|十\_s*六\_s*進\_s*数\|高\_s*さ\|香\_s*港\|イ\_s*\%(ダ\_s*ル\_s*ゴ\|ス\_s*パ\_s*ニ\_s*ア\|レ\_s*ー\_s*ル\|エ\_s*ロ\)\|Ｈ\_s*\%(ｚ\|カ\_s*ッ\_s*プ\|ｏ\_s*ｂ\_s*ｂ\_s*ｉ\_s*ｔ\|ｉ\_s*\%(８\|Ｂ\_s*ａ\_s*ｎ\_s*ｄ\)\)\|オ\_s*\%([ラー]\|ナ\_s*ー\|ノ\_s*レ\|ン\_s*フ\_s*ル\_s*ー\_s*ル\|ネ\_s*\%(ス\_s*\%(ト\|テ\_s*ィ\)\|ゲ\_s*ル\)\|テ\_s*ル\|ル\_s*ガ\_s*ー\|マ\_s*ー\_s*ジ\_s*ュ\)\|ア\_s*\%(ン\_s*\%(リ\|ベ\_s*ー\_s*ル\)\|ネ\_s*ス\_s*ト\|ワ\_s*ー\|ダ\_s*マ\_s*ー\_s*ル\|シ\_s*ェ\_s*ッ\_s*ト\|ビ\_s*タ\_s*シ\_s*オ\_s*ン\|ー\_s*\%(ネ\_s*ス\_s*ト\|ノ\_s*ン\_s*ク\_s*ー\_s*ル\)\)\|H\_s*\%([fsPeo]\|i\_s*m\_s*a\_s*n\_s*t\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|カ\_s*ッ\_s*プ\|T\_s*\%(M\_s*L\_s*フ\_s*ァ\_s*イ\_s*ル\|T\_s*P\_s*サ\_s*ー\_s*バ\)\|D\_s*D\_s*レ\_s*コ\_s*ー\_s*ダ\_s*ー\|u\_s*r\_s*d\|a\_s*\%(s\_s*s\_s*i\_s*u\_s*m\|f\_s*n\_s*i\_s*u\_s*m\|w\_s*a\_s*i\_s*i\)\|y\_s*\%(p\_s*e\_s*r\_s* \_s*T\_s*e\_s*x\_s*t\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|d\_s*\%(n\_s*o\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|r\_s*\%(a\_s*s\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|o\_s*\%(s\_s*t\_s*a\_s*c\_s*h\_s*y\_s*d\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\)\)\)\)\)\|エ\_s*\%(デ\_s*ィ\|ン\_s*リ\_s*ケ\|レ\_s*\%(ナ\|ー\_s*ヌ\)\|ロ\_s*イ\_s*ー\_s*ズ\|ク\_s*ト\_s*ル\|ル\_s*\%(ゲ\_s*ラ\|ヴ\_s*ェ\|メ\_s*ス\|マ\_s*ン\|ミ\_s*\%(ッ\_s*ト\|ー\_s*ト\)\|ブ\_s*ラ\_s*ン\|ナ\_s*ン\_s*デ\_s*ス\|キ\_s*ュ\_s*ー\_s*ル\)\|ノ\_s*ク\|イ\_s*チ\|ッ\_s*チ\)\|水\_s*[銀平素]\)',
+      \ 'i' : '\%([ｲηΗ賤鄙卑苟嫌弥薯妹芋藷夢艷鑪鈩彩鱗色鯆忽綺貸甍答応愈圦杁茵胤飮寅尹婬贇韵隱蚓氤酳霪蔭堙湮廴音飲慇韻咽淫殞姻隕院允隠殷陰窟巖巌頌祝鰮鰛鰯岩磐円￥鼾歪弋弑抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗嘶鰍電引躄誘動≦忿鵤錨碇怒霆霹雷凧桴筏魚S菴庵彌雖家尿荊棘茨祈祷命豕猯古伍聿乙鎰鴪軼樹慈悼愴慯労格到至傷鼬頂戴病徒致鈑痛板柞沙砂聊些潔諍烈功諫勳勇勲漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息挑絲縷厭營営愛幼稚緒遑暇糸弌壹肆莓苺櫟著市碑鐓礎甃臀弩石牲犧犠池溢Y佚壱1１鬻毓燠礇粥的戦戰軍郁幾育一稲否飯違居矮ゐ猪五煎彝醫斐逶貽善胆位萎可詑僞鑄熬活容依要斎行怡異衣逝猗胃洟好矣鋳揖椅去惟云懿熨痿射凍尉移将囗肄夷率囲姨慰頤忌唯緯逸噫挿鮪易偽苡彜莞往以韋遺炒謂李生威為維意倚良如彙已出淹言亥鰄井蔚痍圍幃渭堰饐医爲癒帷恚偉委詒畏い氷Йй→⇒⊂⊃▼▽伊ｉ印入∞吋∈∋∬∫∩ＩイИΙи私ιi]\|E\_s*メ\_s*ー\_s*ル\|灼\_s*然\|祖\_s*谷\|湯\_s*文\_s*字\|文\_s*身\|郎\_s*[女子]\|蕁\_s*麻\|刺\_s*[青草]\|U\_s*r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*青\|況\_s*ん\_s*や\|所\_s*謂\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*n\_s*c\_s*a\_s*l\_s*e\_s*s\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%(蘭\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|夜\_s*来\_s*香\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|細\_s*小\_s*魚\|小\_s*魚\|鯨\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|和\_s*泉\|気\_s*吹\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|指\_s*宿\|拠\_s*所\|従\_s*[弟妹姉兄]\|鴨\_s*脚\_s*樹\|公\_s*孫\_s*樹\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|檪\_s*本\|巫\_s*子\|神\_s*巫\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|許\_s*[嫁婚]\|<\_s*=\_s*=\_s*>\|必\_s*要\_s*十\_s*分\_s*条\_s*件\|ヤ\_s*ン\|日\_s*本\_s*ア\_s*イ\_s*・\_s*ビ\_s*ー\_s*・\_s*エ\_s*ム\_s*株\_s*式\_s*会\_s*社\|国\_s*際\_s*\%(基\_s*督\_s*教\_s*大\_s*学\|標\_s*準\_s*化\_s*機\_s*構\)\|逆\_s*離\_s*散\_s*フ\_s*ー\_s*リ\_s*エ\_s*変\_s*換\|識\_s*別\_s*子\|即\_s*興\_s*曲\|な\_s*ら\_s*ば\|項\_s*目\|逐\_s*次\_s*型\|誤\_s*っ\_s*た\|無\_s*\%(花\_s*果\|効\_s*な\)\|帰\_s*納\_s*法\|字\_s*下\_s*げ\|不\_s*\%([可如足]\|充\_s*分\)\|具\_s*体\_s*化\|情\_s*報\|導\_s*入\|整\_s*数\|完\_s*全\|I\_s*\%([rPn]\|R\_s*Q\|カ\_s*ッ\_s*プ\|C\_s*\%(タ\_s*グ\|チ\_s*ッ\_s*プ\|カ\_s*ー\_s*ド\)\|l\_s*l\_s*i\_s*n\_s*o\_s*i\_s*s\|S\_s*\%(O\|B\_s*N\_s*\%(コ\_s*ー\_s*ド\|番\_s*号\)\|A\_s*バ\_s*ス\)\|d\_s*a\_s*h\_s*o\|D\_s*\%(カ\_s*ー\_s*ド\|E\_s*\%(ド\_s*ラ\_s*イ\_s*ブ\|デ\_s*バ\_s*イ\_s*ス\|ケ\_s*ー\_s*ブ\_s*ル\|コ\_s*ン\_s*ト\_s*ロ\_s*ー\_s*ラ\)\)\|タ\_s*ー\_s*ン\|T\_s*\%(シ\_s*ス\_s*テ\_s*ム\|バ\_s*ブ\_s*ル\)\|o\_s*\%(w\_s*a\|d\_s*i\_s*n\_s*e\)\)\|ヨ\_s*\%(ア\_s*ン\|シ\_s*フ\|ー\_s*ド\|ウ\_s*素\)\|ア\_s*\%(イ\|ー\_s*\%(ヴ\_s*ィ\_s*ン\|ビ\_s*ン\)\|ン\_s*\%(プ\_s*ロ\_s*ン\_s*プ\_s*\%(チ\_s*ュ\|テ\_s*ュ\)\|デ\_s*パ\_s*ン\_s*ダ\_s*ン\|フ\_s*ォ\_s*ル\_s*\%(メ\_s*ル\|マ\_s*テ\_s*ィ\_s*ー\_s*ク\)\)\)\)',
+      \ 'j' : '\%([塩嶋島嶌縞橲竺衂衄宍舳忸軸舌喰食直凝實昵実印尻侭仞刄臣恁儘潯贐稔進盡仭糂訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敍莇茹杼洳敘汝蜍耡恕舒縟褥蓐辱溽所抒鋤徐絮序叙助帖穰疂聶疊驤襄淨讓繩禳絛蕘諚仗壌滌繞生靜蟐壤仍茸嬲疉塲乘遶星瀞拯釀躡孃如剩娘嬢錠静醸縄女尉饒丈成烝擾嫋穣丞盛場杖條条蒸貞状攘畳剰冗定浄乗情城上常譲懦愀鷲竪嬬戍得濡咒讐讎就聚笋篤盾徇凖楯詢隼筍蓴惇洵淳閏恂諄馴旬荀潤循醇巡遵順准殉純準襦誦需朮戌宿孰塾珠熟恤術述豎孺呪儒綬樹受授壽揉從澀狃中戎拾廿鞣从縱澁糅蹂神汁獸絨縦渋柔什充十従獣住銃重事迩爺滋除怩尓痔璽至児士寿茲孳染嗣柱寺磁仕死爾路而仁辞塒時岻粫持恃敷焦字只地轜侍瓷亊知辭餌冶邇弍似祀以子峙二史自畤兒示耳慈司蒔次珥膩醤鮭着鉐惹搦尺雀寂若弱邪戯者蛇麝闍じｊ┃│┝┣├┠┌┏．еЕ治яЯ日ЮюЁёйЙジj]\|ｯ\_s*ｼ\_s*ﾞ\|ッ\_s*ジ\|っ\_s*じ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|祖\_s*父\_s*\%(さ\_s*ん\|祖\_s*母\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|Z\_s*\%(r\|i\_s*r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\)\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|↑\_s*↓\_s*←\_s*→\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｼ\_s*ﾞ\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|三\_s*味\_s*線\|雑\_s*魚\|著\_s*語\|杓\_s*子\|共\_s*同\_s*企\_s*業\_s*体\|ゼ\_s*リ\_s*ー\|エ\_s*\%(ホ\_s*バ\|リ\_s*コ\|レ\_s*ミ\_s*ヤ\|ル\_s*サ\_s*レ\_s*ム\|ッ\_s*サ\_s*イ\)\|ヘ\_s*\%(レ\_s*ス\|ス\_s*ス\)\|ヒ\_s*メ\_s*ネ\_s*ス\|チ\_s*ゲ\|北\_s*陸\_s*先\_s*端\_s*\%(大\|科\_s*学\_s*技\_s*術\_s*大\_s*学\_s*院\_s*大\_s*学\)\|ハ\_s*\%(イ\_s*メ\|ラ\_s*ペ\_s*ー\_s*ニ\_s*ョ\)\|碧\_s*玉\|ヤ\_s*\%([リンニナー]\|イ\_s*ル\|エ\_s*ル\|ル\_s*ノ\|レ\_s*ド\|ヌ\_s*\%(ス\|シ\_s*ュ\)\|ス\_s*パ\_s*ー\_s*ス\|コ\_s*[ビブ]\|ッ\_s*ケ\)\|フ\_s*\%(ァ\_s*[ンナ]\|リ\_s*[オア]\)\|J\_s*\%(R\_s*東\_s*日\_s*本\|\.\_s*S\_s*\.\_s*\%(B\_s*a\_s*c\_s*h\|バ\_s*ッ\_s*ハ\)\|リ\_s*ー\_s*グ\|カ\_s*ッ\_s*プ\|C\_s*B\_s*カ\_s*ー\_s*ド\|-\_s*P\_s*O\_s*P\|ポ\_s*ッ\_s*プ\|P\_s*\%(G\_s*フ\_s*ァ\_s*イ\_s*ル\|E\_s*G\_s*フ\_s*ァ\_s*イ\_s*ル\)\|I\_s*S\_s*\%(マ\_s*ー\_s*ク\|コ\_s*ー\_s*ド\)\|a\_s*p\_s*a\_s*n\_s* \_s*A\_s*d\_s*v\_s*a\_s*n\_s*c\_s*e\_s*d\_s* \_s*I\_s*n\_s*s\_s*t\_s*i\_s*t\_s*u\_s*t\_s*e\_s* \_s*o\_s*f\_s* \_s*S\_s*c\_s*i\_s*e\_s*n\_s*c\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*T\_s*e\_s*c\_s*h\_s*n\_s*o\_s*l\_s*o\_s*g\_s*y\|A\_s*\%(I\_s*S\_s*T\|N\_s*コ\_s*ー\_s*ド\|V\_s*A\_s*\%(ス\_s*ク\_s*リ\_s*プ\_s*ト\|ア\_s*プ\_s*レ\_s*ッ\_s*ト\)\)\|U\_s*N\_s*E\_s*T\)\|ズ\_s*ボ\_s*ン\|Ｊ\_s*\%(２\|−\_s*Ｗ\_s*Ａ\_s*Ｖ\_s*Ｅ\|リ\_s*ー\_s*グ\|カ\_s*ッ\_s*プ\|ポ\_s*ッ\_s*プ\|Ｉ\_s*Ｃ\_s*Ｃ\_s*出\_s*版\|ｕ\_s*ｓ\|Ｕ\_s*\%(Ｓ\|Ｎ\_s*Ｋ\_s*Ｏ\)\)\|ユ\_s*\%([ハリダノ]\|ル\_s*ゲ\_s*ン\|ー\_s*\%([リノ]\|ゲ\_s*ン\_s*ト\|デ\_s*ィ\_s*ッ\_s*ト\)\|ン\_s*\%(グ\|ケ\_s*ル\|カ\_s*ー\)\|ピ\_s*テ\_s*ル\|ッ\_s*[カシ]\)\|イ\_s*\%(エ\_s*\%([ナス]\|ン\_s*\%(ス\|セ\_s*ン\)\|ズ\_s*ス\)\|ェ\_s*\%(ナ\|ン\_s*\%(ス\|ゼ\_s*ン\|セ\_s*ン\)\|ー\_s*ガ\_s*ー\|ル\_s*\%(ク\|サ\_s*レ\_s*ム\)\)\)\|ホ\_s*\%([タセ]\|ル\_s*ヘ\|ホ\_s*バ\|ア\_s*\%(ン\|キ\_s*ン\)\)\|ヨ\_s*\%([ブナ]\|ル\_s*\%(グ\|ダ\_s*ン\)\|エ\_s*ル\|ア\_s*\%(キ\_s*ム\|ヒ\_s*ム\)\|ゼ\_s*フ\|シ\_s*\%(フ\|ュ\_s*ア\)\|ー\_s*\%([ドト]\|デ\_s*ル\|ゼ\_s*フ\)\|セ\_s*フ\|ハ\_s*[ナンネ]\)\)',
+      \ 'k' : '\%([ｺ怖之旃惟怺薦米暦轉殺悃鶤艮鯤很袞坤壼琿狠漿棍魂菎滾梱溷痕渾墾恨懇根梢杪王泥裔樸鞐熟枹醴聲声蛩凍溢零錯苔亊箏斷判諺理断盡悉尽辞詞殊事壽寿鯒礫鯉齣狛腓昆瘤鮗谺応應答爰茲是試志心凩笏惚榾兀輿甑腰拵拗鐺鏝衝杲磽絖昊耗闔狎靠冓汞湟塙慌嫦礦冦淆遘亘仰昴誥鬨鴿鏗浤哮砿鎬伉熕洽訌閧困縞鮫逅糠槹哽盍稾亙壙覯隍簧遑洸餃惶寇鵁皋黌椌扣晄倖矼肓頏蛤呷詬匣昿皐崗肱徨峇袷敲爻藁倥釦棡凰犒吭窖畊岡猴胱絋傚啌蚣缸紘湊搆閤峺羔鍠幌鱇扛肴恆紺鈩絳閘蒙冰氷郡蛟槁候楮媾溘蝗酵嚆犢稿亢哄睾慷郊岬肛項巷鑛洪佼狡叩昂勾喉晃滉糀晧剛曠宏控恍侯皓港膏耿皎坑江絞膠虹巧鴻鉱衡浩厚耕幸弘綱抗購攻講恒薨溝鋼航行肯光皇好荒高梏谷哭槲尅釛斛轂石告酷穀踰懲蝴鴣袴焦觚虍粐乎沽餬胯菰瞽請楜娘壺錮込葫痼兒估冴漕痩虎冱倒戸呱媚粉夸詁子鈷捏濃故濾箍漉恋呼誇壷放転仔鼓小股罟女乕琥跨滬越古糊滸扈瑚皷混怙弧辜戀蠱超児雇凝孤湖此瓠蛄凅肥こｹ峻欅獸騫剱儉惓劵蜷謇鉉鵑綣幵娟險劒虔瞼俔顯臉圈釼歉權慊縣暄愃愆涓黔劔獻搴諠椦妍檢甄験慳捲倦遣羂嶮蹇鹸狷譴腱驗軒憲繭謙圏険硯倹献犬絢顕券劍剣見権拳研眷牽県建烟鑷言獣蓋涜吝削畩閲検貶健桁嗾竭訐亅碣杰譎偈抉厥蕨歇襭刔頡獗尻訣孑頁纈蹶桀穴傑結血憇夐彑勍攜迥冏檠絅蹊煢笄醯枅憬盻綮詣冂挈黥剄匸徑奚挂兮鮭瓊畦逕繼惠慧謦鷄系┻┣┠┨┝┴│┿┰╋━┛┬┥╂┤┸┯┼─┷├┏┳┫┃┓罫痙奎脛谿溪螢蛍渓閨憩圭携硅恵刑継勁珪計啓異毛蹴褻けｸ姑配椪栩櫪檪椡橡椚湫箜櫟含纐柵婚屎糞癖潛潜鵠凹窪縊跟軛頚珞頸首諄窟鞋履轡覆沓碎砕条降件頽崩屑釘莖茎陸杙杭掘崛倔鶏鐃藥擽薬樟楠梳櫛串釧與与挫籖鯀鯨籤隈熊艸嚔藾叢鏈腐鎖種ξΞ臭楔草圀邦國国髭嗽漱吻嘴脣唇梔腔φ粂皹勳熏裙醺桾皸崑燻訓勲葷委钁精詳鍬咥銜桑某暝峅眛昏罔冥鮓比闇位鞍藏暗倉廚厨涅曇蜘佝栗包俥車梍枢畔鐵玄蔵黒喰苦枸煦焼倶狗吼刳工絎駒眩垢口窶区劬繰呉暮貢嶇酌庫惧組衢紅食句吁懼區桍孔怐瞿くｷ段痍疵絆紲傷築鱚稷嚴黍帛後碪砧絹萌兆刻椈鞫掬辟君牙檗蘗迄訖狐屹詰佶拮吃鞠橘菊喫‥＼£、♀〇∵≡．＆＾‰▲‡｀§¶′＿〓☆；□↑↓・％■¢＝／≒←−￣★々≠♂〆ゝ◎―＄¨♭＋？ヽ…†♪‖＠゜◆ヾ´。±｜≪⌒≧○÷，≫＜∞●◇∴≦△！℃゛▼♯¬°▽‐ー∽￥：∨＞Ц＃∝∫〃仝Å″〒ゞ煙蚶衣更細妃后楸蕈茸乙雉轢杵軋岸桔汚穢北樵際裂燦煌雲嫌胆竏粁瓩浄澄淳潔清雰錐蛬吉霧檮桐襟磬釁覲箘掀噤衿鈞檎瑾忻饉箟听芹衾釿懃斤蒟径窘擒巾菌公禽筋錦欣僅琴均禁謹緊欽近勤鉅秬擧渠踞據舉筥嘘苣慶倨距歔遽鋸醵拠拒去勗亟蕀洫跼旭局挙許居巨虚頃峽筴鍄陜卿竟筺僵狹竅洶誑羌抂炯烱劫經刧襁繦蕎篋況徼恊恟棘轎竸况廾荊亰姜梗孝亨跫敬筐梟饗矯挾矜挟校拱嬌響鞏杏向興匈嚮享警競喬怯兄彊僑兢狂供橋莢凶郷兇驕叫夾匡侠狭恐経疆協境胸強驚脅共恭今教玖赳鬮舊蚯逑恷歙貅扱樛９烋摎邱笈皀疚岌厳胡翕朽泣穹糺糾及躬汲窮灸弓臼宮久柩究給丘求鳩級球休救急旧吸九瞶來著喜旡决羈祈揮窺起聞弃伎燬憙毅綺麾基机棄希噐棋其尋祁熹奇肌跂稀覬暉企黄愾欹几稘城軌諱岐決詭極記猗喟槻竒季碕鰭悸切禧消己效朞淇驥揆麒嬉崎僖匱屓既毀杞危卉器貴徽癸虧畿忌耆曁伐紀晞畸饑酒碁樹生木覊聽剪截櫃熈嵜冀跪气愧煕期効斬訊飢妓箕祺圻熙餽来徠鬼譏羇馗着寄倚氣利幾汽欷姫饋聴唏剞鑽騏逵騎掎規幃棊きｶ癢糜粥痒麹輕骨業軽鰈鰔餉通龜瓶甕亀鳫獵鴈殯猟雁釀鳬鳧髢鴨巛側躱廁厠磧瓦獺翡皮裘→紮搦苧碓柄枳躯躰軆體体鴉犂烏機絡空唐榧茅澗鸛厂蒄啣卷淦扞杆骭歛瞰讙奐戡豢坎瀚皖稈鐶拑酣陷繝嫺驩篏樌莟勸捍撼澣盥羹嫻鑵寰丱康懽憾羮揀歡潤罕觀橄涵渙凵堪覡巫鉋萱簪舘艱咸翰柬駻悍燗槓浣邯攷稽宦考棺潅閂煥鉗疳癇函凾鹹顴緘款桓箝諫諌轗坩旱侃鰥　館莞橇韓患灌勧菅簡奸刊柑肝看桿寒緩干嵌廣広竿貫巻敢漢環喊陥監喚甘間歓閑寛管慣完艦乾幹官観壁椛屍姓庇鞄芳蔓鯑一勘⊃影陰蔭景＊棧梯筧庚辛┘┐柧┌門廉脚乞癩∪川合’）《‘”｛〈“｝》〉囓柁旗鮖悴舵鰍鍛梶錺餝飾篭籠歸孵卻皈還省顧楓却帰反返守帋督祇髮韮裃雷髪紙鉦曲矩予鐘樺沫偏騙語潟刀象模仇固硬傍難容忝辱頑形旁方型肩風滓翳微幽掠緕纃綛絣擦糟鎹粕戞猾曷剋黠瞎鞨恰∧濶∩蠍筈蝎羯喝轄餓蛞聒劼擔刮蘰鬘桂闊括嘗捷豁渇担滑堅鰹割戛活疽暈鵲瘡傘嵩重襲葛笠堵硴墻牆蠣蛎柿掲關罹抱踵嬶嚊拘関係顏貌郁薫顔母感釡罐窰鴎框叺構喧竃竈釜缶蒲鎌數数槝栢膳傅瑕畏賢橿姦樫爨炊圍喞託囲鈎「『鉤」』限鍵傾禿蕪鏑頭齧気被兜哉適敵必要彜彝鬲鼎叶片哀愛悲鋺蛇鉄蜩神奏楫裹磆餅徒褐粮糧茖椁覺幗槨貉擴壑隱愨寉殼癨嚇穫咯膕骼膈∠掴狢埆蠖覈霍礁恪擱匿撹攪喀廓較郭〕【［】］〔殻挌劃閣格隠覚矍革馘鶴攫核獲拡客隔角確廨囘隗嵬觧榿蠏匯徊迴壞褂獪丐械枴畍誨揩醢誡夬懈喙椢恠峡价櫂茴蛙瑰乖浬鰄傀糴柏街鳰懷蛔蠶蚕邂蟹潰壊恢腕芥垣楷會拐悔詼諧契皆界疥魁偕改繪貝胛絵快甲灰槐晦懐介塊解廻回階戒開会怪海縢篝炬耀赫輝冠鑒鑑各屈鏡柯噛箇上苛暇蚊廈易嘩ヵ描苅枯佳彼兼哥缺霞藉架啝下渦踝堝闕華嗄荷馨刈假夥河科珈個蝸迦軻咼黴舸繋書賀夏萪支卦掛掻蝦痂謌渮歌過香禾狩買變家枷克駈花賈畫珂呵替代訶袈咬画顆貸價淅飼和ヶ果糅厦課可醸葭勝仮搗嘉墟嗅譌日斯禍換窩苟貨蝌価懸欠化罅伽賭翔靴且嚼訛交何駆驅个嫁譁借加跏戈稼寡涸耶変崋鹿笳火茄菓遐舁かｋ京節└┗※хХ忽コ汗〜功株（Kク×金窯κキΧカКΚкχケk]\|ｯ\_s*[ｺｹｸｷｶ]\|ッ\_s*[コケクキカ]\|っ\_s*[子こけくきか]\|蟀\_s*谷\|焜\_s*炉\|前\_s*妻\|嫡\_s*妻\|二\_s*合\_s*半\|秋\_s*桜\|牛\_s*尾\_s*魚\|庶\_s*幾\|独\_s*楽\|特\_s*牛\|粫\_s*門\|甦\_s*生\|M\_s*e\_s*t\_s*a\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|f\_s*o\_s*o\_s*t\_s* \_s*a\_s*n\_s*d\_s* \_s*m\_s*o\_s*u\_s*s\_s*e\_s* \_s*d\_s*i\_s*s\_s*e\_s*a\_s*s\_s*e\|外\_s*連\_s*味\|螻\_s*蛄\|罌\_s*粟\|滅\_s*紫\|S\_s*i\|莎\_s*草\|百\_s*[濟済]\|9\_s*[日月]\|秧\_s*鶏\|釉\_s*掛\|典\_s*薬\_s*寮\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|群\_s*衆\|慈\_s*姑\|c\_s*r\_s*e\_s*s\_s*c\|内\_s*蔵\_s*助\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|仁\_s*彦\|啄\_s*木\_s*鳥\|X\_s*e\|如\_s*月\|私\_s*市\|昨\_s*日\|素\_s*地\|布\_s*地\|欺\_s*罔\|聖\_s*[之子美]\|沈\_s*菜\|蟋\_s*蟀\|螽\_s*斯\|G\_s*o\_s*l\_s*d\|A\_s*\%(u\|r\_s*c\_s*h\_s*i\_s*c\_s*h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|s\_s*t\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\)\|菫\_s*青\_s*石\|槿\_s*花\|R\_s*\%(h\_s*\%(o\_s*e\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\)\|u\_s*n\_s*u\_s*n\_s*c\_s*u\_s*l\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|a\_s*n\_s*\%(u\_s*n\_s*c\_s*u\_s*l\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*l\_s*e\_s*s\)\)\|裾\_s*礁\|脇\_s*[侍息]\|姉\_s*[妹弟]\|頬\_s*[骨筋]\|毬\_s*果\|舅\_s*姑\|厩\_s*\%([肥舎]\|務\_s*員\)\|廐\_s*舎\|離\_s*れ\_s*離\_s*れ\|掃\_s*部\|羚\_s*羊\|氈\_s*瓜\|土\_s*器\|蝙\_s*蝠\|魚\_s*狗\|為\_s*替\|連\_s*枷\|身\_s*体\|落\_s*葉\_s*松\|随\_s*神\|檻\_s*車\|T\_s*\%(h\_s*a\_s*l\_s*i\_s*c\_s*t\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|u\_s*b\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\)\|南\_s*瓜\|量\_s*子\|千\_s*典\|山\_s*\%(梔\_s*子\|陽\_s*道\)\|蜉\_s*蝣\|陽\_s*炎\|蜻\_s*蛉\|破\_s*片\|挿\_s*頭\|駕\_s*\%(籠\|輿\_s*丁\)\|槭\_s*樹\|長\_s*[月官]\|主\_s*[紀計神]\|剃\_s*刀\|天\_s*\%(牛\|鼠\_s*矢\)\|帷\_s*子\|酢\_s*漿\_s*草\|O\_s*x\_s*a\_s*l\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|飛\_s*白\|春\_s*日\|C\_s*\%([ormfda]\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\|i\_s*r\_s*c\_s*a\_s*e\_s*a\_s*s\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*r\_s*i\_s*u\_s*m\|y\_s*p\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*c\_s*i\_s*d\_s*i\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|曽\_s*て\|曾\_s*て\|松\_s*魚\|燕\_s*子\_s*花\|牡\_s*[蛎蠣]\|民\_s*部\|部\_s*曲\|E\_s*\%(b\_s*e\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|案\_s*山\_s*子\|梭\_s*\%(魚\|子\_s*魚\)\|螳\_s*螂\|蟷\_s*螂\|瓜\_s*\%(田\|呂\_s*根\)\|拍\_s*手\|水\_s*[鶏母手夫]\|東\_s*\%(風\|京\_s*都\_s*立\_s*科\_s*学\_s*技\_s*術\_s*大\_s*学\)\|(\_s*株\_s*)\|称\_s*子\|贏\_s*ち\_s*得\|歩\_s*兵\|恁\_s*く\|杜\_s*\%(若\|父\_s*魚\)\|梅\_s*花\_s*皮\|頴\_s*田\|膾\_s*炙\|ノ\_s*\%([ブウ]\|ー\_s*ン\|ッ\_s*\%([トク]\|テ\_s*ィ\_s*ン\_s*グ\|カ\_s*ー\|キ\_s*ン\_s*グ\)\)\|ナ\_s*\%(ッ\_s*\%(ク\|プ\_s*\%(サ\_s*ッ\_s*ク\|ザ\_s*ッ\_s*ク\)\)\|レ\_s*ッ\_s*ジ\|イ\_s*[フトツ]\)\|ニ\_s*\%(ー\|ッ\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ホ\_s*\%(ー\_s*\%(ミ\_s*ー\|メ\_s*イ\)\|メ\_s*イ\_s*ニ\)\|フ\_s*\%(ビ\_s*ラ\_s*イ\|ル\_s*シ\_s*チ\_s*ョ\_s*フ\)\|ハ\_s*\%(ン\|ラ\_s*シ\_s*ョ\_s*ー\|ー\_s*ン\|バ\_s*ロ\_s*フ\_s*ス\_s*ク\|ル\_s*ツ\_s*ー\_s*ム\|チ\_s*ャ\_s*ト\_s*ゥ\_s*リ\_s*ア\_s*ン\)\|Ｋ\_s*\%([点ｇｍ]\|カ\_s*ッ\_s*プ\|ｎ\_s*ｏ\_s*ｃ\_s*ｋ\_s*Ｏ\_s*ｕ\_s*ｔ\|ｅ\_s*ｎ\_s*ｗ\_s*ｏ\_s*ｏ\_s*ｄ\)\|P\_s*\%(i\_s*p\_s*e\_s*r\_s*a\_s*\%(l\_s*e\_s*s\|c\_s*e\_s*a\_s*e\)\|a\_s*p\_s*a\_s*v\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|o\_s*\%(d\_s*o\_s*s\_s*t\_s*e\_s*m\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|t\_s*a\_s*s\_s*s\_s*i\_s*u\_s*m\)\)\)',
+      \ 'l' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁ＜≪ｌ＿￣≦李左←∃∨¬∀⊃ル∧レラ£ЛλлΛl]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|液\_s*晶\|最\_s*小\_s*2\_s*乗\_s*法\|\.\_s*\.\_s*\.\|拉\_s*薩\|聯\_s*想\|補\_s*題\|檸\_s*檬\|手\_s*紙\|学\_s*習\|施\_s*錠\|局\_s*所\|論\_s*理\|ロ\_s*\%([キイアロリブボトメウスコゴグー]\|ペ\_s*ス\|ワ\_s*ー\_s*ル\|エ\_s*ベ\|ヨ\_s*ラ\|フ\_s*ト\|ル\_s*カ\|ベ\_s*リ\_s*ア\|ビ\_s*\%(ー\|ン\_s*グ\|イ\_s*\%(ス\_s*ト\|ン\_s*グ\)\)\|テ\_s*ィ\|サ\_s*ン\_s*\%(ジ\_s*ェ\_s*ル\_s*ス\|ゼ\_s*ル\_s*ス\)\|ニ\_s*ー\|ク\_s*リ\_s*ア\_s*ン\|ッ\_s*\%([ジタテトク]\|キ\_s*\%(ン\_s*グ\|ー\_s*ド\)\|カ\_s*ー\)\|ケ\_s*ー\_s*\%([トタル]\|シ\_s*ョ\_s*ン\)\|カ\_s*ー\_s*ル\|ガ\_s*ー\|ギ\_s*ン\_s*グ\|ジ\_s*\%(ー\|テ\_s*ッ\_s*ク\|ス\_s*テ\_s*ィ\_s*\%(ク\|ッ\_s*ク\)\|カ\_s*ル\|ク\_s*ー\_s*ル\|ッ\_s*[トク]\)\|ラ\_s*ン\|ン\_s*\%([ゴグダ]\|ボ\_s*\%(ク\|ッ\_s*ク\)\|バ\_s*ル\_s*デ\_s*ィ\|ズ\_s*デ\_s*ー\_s*ル\|リ\_s*[ーィ]\|ジ\_s*ン\|ド\_s*ン\)\|レ\_s*\%(ア\_s*ル\|ッ\_s*タ\|ー\_s*ヌ\|イ\_s*ン\|ン\_s*\%([ソス]\|ツ\_s*ォ\)\)\)\|\\\_s*L\_s*a\_s*T\_s*e\_s*X\|Ｌ\_s*\%(サ\_s*イ\_s*ズ\|Ｌ\_s*サ\_s*イ\_s*ズ\|Ｕ\_s*Ｎ\_s*Ａ\|ｕ\_s*\%(ｎ\_s*ａ\|ｃ\_s*\%(ｉ\_s*ｄ\|ｋ\_s*ｙ\)\)\|ｉ\_s*\%(ａ\_s*ｒ\|ｓ\_s*ｐ\|ｔ\_s*ｅ\)\|ｏ\_s*ｆ\_s*ｔ\|A\_s*Ｔ\_s*E\_s*Ｘ\|ａ\_s*\%(ｗ\_s*ｓ\_s*ｏ\_s*ｎ\|Ｔ\_s*ｅ\_s*Ｘ\|ｓ\_s*ｅ\_s*ｒ\_s*Ｗ\_s*ｒ\_s*ｉ\_s*ｔ\_s*ｅ\_s*ｒ\)\)\|L\_s*\%([DP]\|サ\_s*イ\_s*ズ\|L\_s*サ\_s*イ\_s*ズ\|u\_s*\%(t\_s*e\_s*t\_s*i\_s*u\_s*m\|c\_s*i\_s*d\)\|i\_s*\%(t\_s*h\_s*i\_s*u\_s*m\|s\_s*p\|n\_s*u\_s*x\)\|E\_s*D\_s*ラ\_s*イ\_s*ト\|e\_s*m\_s*m\_s*a\|o\_s*\%(g\_s*i\_s*c\_s*a\_s*l\_s* \_s*U\_s*n\_s*i\_s*t\_s* \_s*N\_s*u\_s*m\_s*b\_s*e\_s*r\|u\_s*i\_s*s\_s*i\_s*a\_s*n\_s*a\)\|a\_s*\%(w\_s*r\_s*e\_s*n\_s*c\_s*i\_s*u\_s*m\|n\_s*t\_s*h\_s*a\_s*n\_s*u\_s*m\|T\_s*e\_s*X\)\|A\_s*N\)\|研\_s*究\_s*室\|リ\_s*\%([ィセズザサスダポルラリマナノンヌブアー]\|ャ\_s*マ\|ヤ\_s*ド\_s*ロ\|ヨ\_s*ン\|ゾ\_s*チ\_s*ー\_s*ム\|コ\_s*\%(リ\_s*ス\|ピ\_s*ン\)\|ク\_s*ー\_s*ド\|カ\_s*\%(ー\|オ\_s*ン\)\|ジ\_s*[ンー]\|デ\_s*[ィル]\|ド\_s*カ\_s*イ\_s*ン\|プ\_s*ト\_s*ン\|パ\_s*ー\_s*ゼ\|グ\_s*\%(ニ\_s*ン\|ナ\_s*ン\)\|フ\_s*\%([エト]\|タ\_s*ー\|テ\_s*ィ\_s*ン\_s*グ\)\|テ\_s*ラ\_s*[ルシ]\|チ\_s*ウ\_s*ム\|ソ\_s*\%(ソ\_s*ー\_s*ム\|グ\_s*ラ\_s*フ\_s*ィ\)\|タ\_s*ー\|ト\_s*\%([レル]\|マ\_s*ス\|ア\_s*ニ\_s*ア\|グ\_s*ラ\_s*フ\|バ\_s*ル\_s*ス\_s*キ\_s*ー\)\|オ\_s*\%(タ\_s*ー\_s*ル\|ネ\_s*ル\)\|ミ\_s*\%(テ\_s*ッ\_s*ド\|ッ\_s*[タト]\)\|モ\_s*\%(ー\_s*ジ\_s*ュ\|ネ\_s*ン\|ン\_s*チ\_s*ェ\_s*ッ\_s*ロ\)\|ム\_s*ジ\_s*ン\|キ\_s*\%(ッ\_s*ド\|ュ\_s*ー\_s*ル\|テ\_s*ン\_s*\%(シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ス\_s*タ\_s*イ\_s*ン\)\)\|エ\_s*\%(ゾ\_s*ン\|ー\_s*ジ\_s*ュ\)\|ヒ\_s*テ\_s*ン\_s*シ\_s*ュ\_s*タ\_s*イ\_s*ン\|ネ\_s*\%([アン]\|ッ\_s*ト\|ー\_s*ジ\_s*ュ\)\|ニ\_s*ア\|ベ\_s*\%([ロラ]\|リ\_s*ア\|レ\_s*ー\_s*シ\_s*ョ\_s*ン\|ル\_s*テ\)\|ビ\_s*\%([アー]\|ド\_s*ー\|ン\_s*グ\)\|ュ\_s*\%([スー]\|ブ\_s*リ\_s*ャ\_s*ー\_s*ナ\|リ\_s*ュ\|ド\_s*ミ\_s*ラ\|ク\_s*サ\_s*ン\_s*ブ\_s*ー\_s*ル\|ッ\_s*ク\|シ\_s*ア\_s*ン\|ミ\_s*エ\_s*ー\_s*ル\)\|ロ\_s*\%(イ\|ン\_s*グ\_s*ウ\_s*ェ\)\|ヴ\_s*\%(ィ\_s*ン\_s*グ\_s*ス\_s*ト\_s*ン\|ァ\_s*\%(プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\)\|バ\_s*\%(テ\_s*ィ\|タ\_s*リ\_s*ア\_s*\%(ン\|ニ\_s*ズ\_s*ム\)\|プ\_s*ー\_s*ル\|イ\_s*ア\_s*サ\_s*ン\)\|ッ\_s*\%([ドピプタクチト]\|ス\_s*ン\)\)\|エ\_s*ル\)',
+      \ 'm' : '\%([ﾓ脆醪師諸催靄舫腿銛杜森捫聞匁紋問玩翫擡齎靠凭鵙鴃縺悶樅籾椛楓蛻濳潛艾潜殯黐餠用糯餅桃者懶專専物尤勿畚許故悖旧戻下乖求礎素基本元綟捩文默沐杢黙芒网莽檬罔耗耄朦魍艨矇濛曚亡蒙毛孟猛網漏裳望喪揉持母燃若藻以摸楙貰洩姆保茂模糢もﾒ麪緜眄緬麺門棉綿面蓍珎珍♀娶貭粧妾牝瞽盲娚暈繞萌惠慈恵萠溟暝滅謎姪瞑盟酩銘鳴芽睨召奴瑪碼賞減雌女めﾑ羣榁室簇屯邨連邑叢村紫梅葎宜憤葮毳槿椋酬報尨骸躯旨難睦酷麥麦邀対百迎昔虚空鞅宗棟胸掬娘結笞鞭徒蝕蠧蠹蟲席莚蓆寧筵虫毟貉狢豸貪壻聟婿无謀霧矛毋無鵡夢梦剥六群牟務蒸噎武向咽むﾐ渠霙溝妊澪薨岑嶺峰峯亂紊婬淫妄濫猥乱◇※■＊簔穣簑蓑醜儖慘短惨幹研耳壥廛店操陵鶚崎岬巫尊敕勅詔＞」砌頻汀→】』右翠碧緑認幣蹊径倫導途通路道瞠髻鬟湖自蹼蛟瑞癸禊晦漲源鏖港湊南櫁瞶謐水調貢密甕帝蜜覩幸脉脈韮韭竓粍瓱榠螟茗名妙命冥都宮罠閔皆眠明民魅深觀身實彌観己診看味美盈三御充稔視壬巳靡弥箕みﾏ毬鞠紕蝮麿転稀賓客檀繭黛眉囘巡周防衛衞護守荳菽豆槫・圓．◯°゜。）（丸鬘謾幡縵懣鰻幔蹣蔓瞞卍饅漫滿慢迄笆貧幻瞼蔟疎眩回廻設申儲招繚統纒的蟶孫彎弯籬擬免猿亮純信実委罷壗侭圸飯儘継随髷任蒭芻耙紛鮪見猯塗斈學眥眦眼俎愛学斑枡斗鱒舛升桝萬蠱呪薪槙槇牧窗惑悗円窓甼襠区街町前複亦俣叉跨全瞬木胯股又鍖枕膜幕參眛参瑁詣妹哩迷枚米賄賂埋昧邁毎秣靺抹沫枩奉祀纏祭睫末大秀太勝柾弄優成盛將松匡鉞賢征誠昌希将政正仁雅媽万俟茉満目先麼未卷散磨枉眞益真増負蒔坐交馬捲舞嘛雑在放墹痲撒待播間摩敗巻混曲魔まｍ光月♪♭♯ム⊃∴≦∞÷≫≧≪⌒±∈∀⊂∬∫∝∨∽Δ¬⇒⊥∃∠∧⊆⇔∵≡∩×⊇∂∋≠√∪∇≒♂曼麻◎〇○●モ〒′−マ最ミМΜμメm]\|ｯ\_s*[ﾓﾒﾑﾐﾏ]\|ッ\_s*[モメムミマ]\|っ\_s*[もめむみま]\|双\_s*\%([手墨親]\|向\_s*き\|差\_s*し\)\|蜀\_s*黍\|唐\_s*土\_s*\%(書\|文\_s*字\)\|両\_s*\%([角親刃]\|差\_s*し\)\|楊\_s*梅\_s*皮\|主\_s*水\|旺\_s*角\|紅\_s*[絹染葉]\|強\_s*請\|虎\_s*落\|痘\_s*瘡\|莫\_s*斯\_s*科\|固\_s*よ\_s*り\|一\_s*徳\|O\_s*l\_s*e\_s*a\_s*l\_s*e\_s*s\|惘\_s*然\|乙\_s*張\|赤\_s*目\_s*魚\|針\_s*孔\|妻\_s*[君合沼]\|墨\_s*西\_s*哥\|鍍\_s*金\|繍\_s*眼\_s*児\|夫\_s*婦\|乳\_s*母\|布\_s*の\_s*子\|没\_s*\%([薬後入却有]\|義\_s*道\|食\_s*子\)\|B\_s*\%(e\_s*r\_s*b\_s*e\_s*r\_s*i\_s*d\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*o\_s*r\_s*r\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\)\|浮\_s*腫\|６\_s*日\|6\_s*日\|崇\_s*田\|刀\_s*背\|襁\_s*褓\|零\_s*余\_s*子\|蜈\_s*蚣\|産\_s*霊\|息\_s*子\|k\_s*\$\_s*_\_s*{\_s*i\_s*n\_s*f\_s*}\_s*\$\|蚯\_s*蚓\|A\_s*\%(b\_s*i\_s*e\_s*s\|p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*r\_s*o\_s*s\_s*t\_s*i\_s*c\_s*h\_s*u\_s*m\)\|山\_s*陵\|雎\_s*鳩\|親\_s*王\|嬰\_s*児\|亨\_s*治\|陸\_s*奥\|皇\_s*[子女國]\|３\_s*[つ日]\|3\_s*[つ日]\|角\_s*[鴟子髪]\|七\_s*寸\|鳩\_s*尾\|鷦\_s*鷯\|孤\_s*児\|凝\_s*視\|兎\_s*唇\|R\_s*u\_s*t\_s*a\_s*l\_s*e\_s*s\|神\_s*[子輿酒]\|苗\_s*字\|海\_s*[雲蘊藻布蜂松山]\|P\_s*o\_s*d\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\|土\_s*[龍竜産]\|京\_s*都\|横\_s*浜\_s*マ\_s*リ\_s*ノ\_s*ス\|忠\_s*実\|肉\_s*刺\|翻\_s*\%(筋\_s*斗\|車\_s*魚\)\|H\_s*a\_s*m\_s*a\_s*m\_s*e\_s*l\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|不\_s*\%(味\|見\_s*[転点]\)\|兇\_s*々\|凶\_s*鳥\|澗\_s*潟\|勾\_s*玉\|禍\_s*[々禍言事]\|況\_s*し\|澳\_s*門\|苧\_s*麻\|茅\_s*台\_s*酒\|丈\_s*夫\|倍\_s*達\|微\_s*[塵妙睡]\|燐\_s*寸\|驀\_s*地\|L\_s*o\_s*g\_s*a\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|豫\_s*て\|陪\_s*臣\|売\_s*僧\|C\_s*\%(a\_s*s\_s*u\_s*a\_s*r\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|e\_s*r\_s*a\_s*t\_s*o\_s*p\_s*y\_s*l\_s*l\_s*a\_s*c\_s*e\_s*a\_s*e\)\|S\_s*\%(a\_s*p\_s*i\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|c\_s*h\_s*i\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|理\_s*[之元]\|允\_s*彦\|祐\_s*史\|晶\_s*子\|公\_s*[美則輝]\|斉\_s*加\_s*年\|方\_s*夫\|多\_s*言\_s*語\_s*化\|ニ\_s*ー\_s*モ\_s*ニ\_s*ッ\_s*ク\|単\_s*量\_s*体\|会\_s*議\|和\_s*布\_s*[刈蕪]\|中\_s*間\_s*子\|薄\_s*荷\_s*脳\|行\_s*[幸列]\|写\_s*像\|日\_s*\%(米\_s*相\_s*互\_s*防\_s*衛\_s*援\_s*助\_s*協\_s*定\|本\_s*製\)\|Ｍ\_s*\%(Ｈ\_s*ｚ\|サ\_s*イ\_s*ズ\|Ｓ\_s*−\_s*Ｄ\_s*Ｏ\_s*Ｓ\|Ｌ\_s*サ\_s*イ\_s*ズ\|ｒ\_s*．\|ｂ\_s*ｐ\_s*ｓ\|ｃ\_s*Ｃ\_s*ａ\_s*ｒ\_s*ｔ\_s*ｈ\_s*ｙ\|ｏ\_s*ｔ\_s*ｉ\_s*ｆ\|ａ\_s*ｃ\)\|計\_s*算\_s*機\|手\_s*紙\|ザ\_s*ッ\_s*ヘ\_s*ル\_s*＝\_s*マ\_s*ゾ\_s*ッ\_s*ホ\|嗜\_s*虐\_s*的\_s*趣\_s*味\|被\_s*虐\_s*\%(淫\_s*乱\_s*症\|趣\_s*味\)\|修\_s*士\|仮\_s*面\|移\_s*送\|M\_s*\%([dngtOo式]\|X\_s*テ\_s*レ\_s*ビ\|サ\_s*イ\_s*ズ\|S\_s*-\_s*D\_s*O\_s*S\|L\_s*サ\_s*イ\_s*ズ\|P\_s*3\_s*プ\_s*レ\_s*\%(ー\_s*ヤ\_s*ー\|イ\_s*ヤ\_s*ー\)\|D\_s*\%(プ\_s*レ\_s*ー\_s*ヤ\_s*ー\|レ\_s*コ\_s*ー\_s*ダ\_s*ー\)\|c\_s*C\_s*a\_s*r\_s*t\_s*h\_s*y\|e\_s*\%(d\_s*u\_s*s\_s*a\_s*n\_s*d\_s*r\_s*a\_s*l\_s*e\_s*s\|i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*u\_s*m\|t\_s*a\_s*F\_s*o\_s*n\_s*t\|n\_s*\%(y\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|d\_s*e\_s*l\_s*e\_s*v\_s*i\_s*u\_s*m\)\|C\_s*a\_s*b\)\|u\_s*l\_s*e\|A\_s*C\_s*ア\_s*ド\_s*レ\_s*ス\|a\_s*\%(g\_s*n\_s*\%(o\_s*l\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|e\_s*s\_s*i\_s*u\_s*m\)\|n\_s*\%(u\_s*\%(e\_s*d\|s\_s*c\_s*r\_s*i\_s*p\_s*t\_s* \_s*E\_s*d\_s*i\_s*t\_s*i\_s*n\_s*g\)\|g\_s*a\_s*n\_s*e\_s*s\_s*e\)\|r\_s*y\_s*l\_s*a\_s*n\_s*d\|i\_s*n\_s*e\|k\_s*e\_s*f\_s*i\_s*l\_s*e\|c\_s*\%(h\|i\_s*n\_s*t\_s*o\_s*s\_s*h\)\|s\_s*\%(s\_s*a\_s*c\_s*h\_s*u\_s*s\_s*e\_s*t\_s*t\_s*s\|t\_s*e\_s*r\_s*C\_s*a\_s*r\_s*d\)\)\|i\_s*\%(n\_s*n\_s*e\_s*s\_s*o\_s*t\_s*a\|s\_s*s\_s*\%(i\_s*s\_s*s\_s*i\_s*p\_s*p\_s*i\|o\_s*u\_s*r\_s*i\)\|c\_s*\%(r\_s*o\_s* \_s*S\_s*o\_s*f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\|h\_s*i\_s*g\_s*a\_s*n\)\)\|I\_s*\%(T\|P\_s*S\|M\_s*D\)\)\|エ\_s*ム\)',
+      \ 'n' : '\%([ﾝンんﾉ麕咒燧烽詛呪悳孔伯朔弼雅教糊矩憲規哲宜紀範典惟亘修允攵展順暢信則法後罵吭咽喉鑿蚤々湾宣曰臨覘稀望覗遺殘残鋸芒禾騰幟昇登上簷檐軒遁逸衲瑙碯曩王皇腦嚢膿能脳農野伸嚥−陳除濃熨飲退飮延載之呑廼乘乗述埜のﾈ塒姉聹侫檸嚀濘寧佞鼡鼠拗猫嫉妬希願捏熱犒労葱狙閨睡棔眠然稔棯懇拈撚燃念年根寝音涅子捻禰袮練値錬粘捩祢寢嶺煉ねﾇ絖饅垈帛幣鵺主蛻拭温布沼盜偸窃盗抽擢緯糠額縫抜貫拔怒奴塗濡脱ぬﾆ楡蒻潦鷄鶏瀑庭繞獰女尿韭眈薤睨韮儿刄姙葫蒜刃忍∀妊認任人乳擔蜷担濁賑握俄鳰臭匂沸錵贄偐僞贋偽柔靤如苦膠霓滲虹躙廿》《◎∬『』悪憎兄螺鯡鰊錦西入新肉‖岻仁逃似邇弍荷貳弐２二尼迩煮2丹貮児迯にﾅ靡抔嫐嬲鯆屶釶鉈泥薺詰若慨歎嘆抛擲撲毆殴慰治癒等猶直泪波辺邉邊鍋浪某棘棗懷懐夏擦梨情懶譌艶訛鉛鯰癜鮠膾鱠韲憖怠鈍腥捺准準擬凖謎涙洋宥傾灘詠霖眺痼乍存流轅永和梛椥渚長莫毋勿半・媒仲中７斜七蔑乃尚内繩畷縄苗滑鞣惱悩就哉也斉形業徳娚垂喃∵楠爾尓汝男軟難何倣肄双枹均列柞→⇒⊃楢習嘗投爲綯啾啼熟那鳴泣慣生為儺舐菜奈涕並納痿嚶撫茄凪無哭做狎南萎竝魚娜薙亡馴拿失な┘┛│┃┨┫┤┥┣┝├┠╋┿╂┼成＃∋∇名┗└ｎ日≒ニネ¬〜≠ナヌノнνΝНn]\|帳\_s*面\|狼\_s*[烟煙]\|惚\_s*気\|暖\_s*[簾気]\|礼\_s*江\|功\_s*晶\|賀\_s*子\|訓\_s*子\|祈\_s*子\|式\_s*部\_s*省\|記\_s*代\|倫\_s*[明子宗]\|敬\_s*之\|賭\_s*弓\|誠\_s*也\|敦\_s*子\|悦\_s*旦\|祝\_s*[女詞]\|仰\_s*け\_s*反\|盧\_s*泰\_s*愚\|逆\_s*上\|凌\_s*霄\_s*花\|姐\_s*さ\_s*ん\|杜\_s*松\|強\_s*請\|合\_s*歓\|微\_s*温\|零\_s*余\_s*子\|酸\_s*漿\|鐃\_s*鉢\|鰾\_s*膠\|I\_s*I\_s*部\|耳\_s*根\|面\_s*皰\|M\_s*y\_s*r\_s*i\_s*s\_s*t\_s*i\_s*c\_s*a\_s*c\_s*e\_s*a\_s*e\|莞\_s*爾\|L\_s*e\_s*a\_s*d\|P\_s*b\|海\_s*[苔鼠]\|C\_s*\%(e\_s*l\_s*a\_s*s\_s*t\_s*r\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|a\_s*r\_s*y\_s*o\_s*p\_s*h\_s*y\_s*l\_s*l\_s*a\_s*l\_s*e\_s*s\)\|雪\_s*崩\|竹\_s*節\_s*虫\|7\_s*[日個]\|地\_s*震\|行\_s*[木方]\|大\_s*\%(蒜\|理\_s*石\)\|蛞\_s*蝓\|弱\_s*竹\|追\_s*儺\|済\_s*\%(し\_s*崩\|り\_s*物\)\|可\_s*成\|平\_s*城\|不\_s*成\|空\_s*リ\_s*ス\_s*ト\|T\_s*h\_s*e\_s* \_s*N\_s*e\_s*t\_s*w\_s*o\_s*r\_s*k\_s* \_s*I\_s*n\_s*f\_s*o\_s*r\_s*m\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*C\_s*e\_s*n\_s*t\_s*e\_s*r\|S\_s*o\_s*\%(l\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|d\_s*i\_s*u\_s*m\)\|紐\_s*育\|フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|ヤ\_s*ー\_s*ノ\_s*ッ\_s*シ\_s*ュ\_s*・\_s*フ\_s*ォ\_s*ン\_s*・\_s*ノ\_s*イ\_s*マ\_s*ン\|オ\_s*ラ\_s*ン\_s*ダ\|ア\_s*メ\_s*リ\_s*カ\_s*ネ\_s*ッ\_s*ト\_s*ワ\_s*ー\_s*ク\|番\_s*号\|節\_s*点\|Ｎ\_s*\%([点Ｏ]\|ク\_s*ィ\_s*ー\_s*ン\|\.\_s*Ｙ\_s*\.\|Ｉ\_s*Ｆ\_s*Ｔ\_s*Ｙ\|ｉ\_s*ｆ\_s*ｔ\_s*ｙ\|ａ\_s*\%(ｖ\_s*ｉ\|ｔ\_s*ｕ\_s*ｒ\_s*ｅ\)\|ｅ\_s*\%(Ｘ\_s*Ｔ\|ｍ\_s*ａ\_s*ｃ\_s*ｓ\|ｗ\_s*−\_s*Ｊ\_s*ｅ\_s*ｒ\_s*ｓ\_s*ｅ\_s*ｙ\|Ｗ\_s*Ｓ\|ｕ\_s*ｒ\_s*ａ\_s*ｌ\)\|Ｅ\_s*\%(ｍ\_s*ａ\_s*ｃ\_s*ｓ\|Ｔ\_s*ｔ\_s*ａ\_s*ｌ\_s*ｋ\)\|ｏ\_s*\%(．\|ё\_s*ｌ\)\)\|夜\_s*想\_s*曲\|諾\_s*威\|正\_s*常\|エ\_s*ヌ\|N\_s*\%([dpbaeoi]\|R\_s*Z\_s*I\|-\_s*g\_s*r\_s*a\_s*m\|G\_s*ワ\_s*ー\_s*ド\|H\_s*K\_s*\%(ホ\_s*ー\_s*ル\|ラ\_s*ジ\_s*オ\)\|T\_s*T\|Y\_s*ダ\_s*ウ\|U\_s*L\_s*L\|A\_s*S\_s*A\|E\_s*\%(C\|p\_s*o\_s*c\_s*h\|m\_s*a\_s*c\_s*s\)\)\|窒\_s*素\)',
+      \ 'o' : '\%([ｵ俺游泳指妖畢在澱檻氈拇親愚疎颪卸念錘惟慮赴徐趣俤羈主想表重面瘟隱園Å怨♀妾温恩悍鈍臣覺溺朦朧思覚榲現朮桶威嚇踴戯縅棘駭愕驚躍踊傲奢驕嚴厳痴遣瘧怒行怠蒹補荻懼惧獺虞怐畏恐襲甥笈及綬葹ヽゞ〃仝ゝヾ々同唖繦襁鴛鴦教几忍筬收兎抑稚長幼理収治修遲檍納後遅饋賻諡贈送憶袵臆拜拝峻侵奇冒犯崗阜陵岳女陸丘岡欄斧自己各戦鬼衰劣囮頤訪貶乙漢♂音弟阿脅怯首夥誘屋膃億穩穏煽熈煕熾燠諚掟興隠沖翁鴬澳嚶毆泓浤惶罌瓮泱閘蓊墺悒凰殃徃奧秧襖枉姶鸚懊媼嫗鴎怏鏖謳旺凹櫻鴨樗欒楝殴朷甌汪横往鞅歐嘔陷陥遠果応掩蔽應夛奄蓋概欧公邑麋薤被仰扇皇狼弁鵬鴻鳳黄奥多衽覆粱凡鰲頁王穂怖桜壓緒居起降落墮将帶麻央小牡勇捺圧措唹織追悪苧汚下御置帯生折朗於負郎擱押推雄塢老男夫逐墜尾惜嗚乎堕終淤おｏ大◎∞和∝♪∪∨開○ωΟОオΩοоo]\|濠\_s*太\_s*剌\_s*利\|父\_s*[娘子]\|母\_s*[娘子屋]\|万\_s*年\_s*青\|本\_s*懸\_s*魚\|玩\_s*具\|沢\_s*瀉\|A\_s*l\_s*i\_s*s\_s*m\_s*a\_s*t\_s*a\_s*l\_s*e\_s*s\|厭\_s*離\|乳\_s*母\_s*日\_s*傘\|陰\_s*[陽地]\|飲\_s*[食酒]\|慍\_s*色\|婦\_s*系\_s*図\|手\_s*術\|螻\_s*蛄\|十\_s*八\_s*番\|鉄\_s*漿\|海\_s*髪\_s*海\_s*苔\|虎\_s*魚\|花\_s*魁\|美\_s*味\|含\_s*羞\_s*草\|白\_s*粉\|渡\_s*島\|訳\_s*語\|通\_s*事\|晩\_s*[稲生]\|可\_s*笑\|惡\_s*寒\|傍\_s*[目惚見]\|叔\_s*[父母]\|伯\_s*[父母]\|姨\_s*捨\|少\_s*女\|侠\_s*気\|D\_s*i\_s*l\_s*l\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|G\_s*u\_s*t\_s*t\_s*i\_s*f\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|H\_s*y\_s*p\_s*e\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|霊\_s*屋\|蝌\_s*蚪\|飫\_s*肥\|佩\_s*物\|良\_s*人\|纓\_s*田\|C\_s*o\_s*p\_s*t\_s*i\_s*d\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|鷹\_s*揚\|椀\_s*飯\_s*振\_s*\%(舞\|る\_s*舞\)\|相\_s*知\|鶯\_s*語\|近\_s*江\|零\_s*落\|越\_s*[生訴智知度]\|彼\_s*方\|祖\_s*[神父母]\|車\_s*前\|従\_s*祖\_s*[母父]\|青\_s*[梅海木]\|太\_s*\%(田\|安\_s*万\_s*侶\|上\_s*天\_s*皇\)\|巨\_s*頭\|逢\_s*[魔瀬隈坂]\|そ\_s*の\_s*他\|承\_s*知\_s*し\_s*ま\_s*し\_s*た\_s*\.\|烏\_s*[滸龍]\|t\_s*h\_s*e\_s* \_s*O\_s*b\_s*j\_s*e\_s*c\_s*t\_s* \_s*M\_s*a\_s*n\_s*a\_s*g\_s*e\_s*m\_s*e\_s*n\_s*t\_s* \_s*G\_s*r\_s*o\_s*u\_s*p\|立\_s*石\_s*電\_s*機\|職\_s*業\|楕\_s*円\|ウ\_s*\%(ィ\|ー\_s*\%(ズ\|ロ\_s*ン\)\|ロ\_s*ボ\_s*ロ\_s*ス\)\|出\_s*力\|ア\_s*\%(ワ\|ザ\_s*ー\|ウ\_s*\%([チト]\|タ\_s*ー\)\)\|基\_s*本\_s*ソ\_s*フ\_s*ト\_s*ウ\_s*ェ\_s*ア\|一\_s*\%(昨\_s*[年日]\|対\_s*一\)\|ワ\_s*ン\|ま\_s*た\_s*は\|論\_s*理\_s*和\|聖\_s*譚\_s*曲\|水\_s*中\_s*酸\_s*素\_s*破\_s*壊\_s*剤\|蛋\_s*白\_s*石\|最\_s*適\_s*化\|Ｏ\_s*\%([脚型]\|Ｒ\_s*Ｅ\|\.\_s*Ｋ\_s*\.\|Ｓ\_s*９\|リ\_s*ン\_s*グ\|ｐ\_s*ｅ\_s*ｎ\_s*\%(Ｌ\_s*ｏ\_s*ｏ\_s*ｋ\|Ｗ\_s*ｉ\_s*ｎ\_s*ｄ\_s*ｏ\_s*ｗ\_s*ｓ\)\)\|歌\_s*劇\|演\_s*算\_s*子\|操\_s*作\|酸\_s*素\|O\_s*\%([型脚sS]\|h\_s*i\_s*o\|k\_s*l\_s*a\_s*h\_s*o\_s*m\_s*a\|b\_s*j\_s*e\_s*c\_s*t\_s*-\_s*O\_s*r\_s*i\_s*e\_s*n\_s*t\_s*e\_s*d\|O\_s*\%(D\_s*L\|P\_s*L\)\|M\_s*R\_s*O\_s*N\|A\_s*ク\_s*リ\_s*ー\_s*ナ\_s*ー\|C\_s*R\_s*ソ\_s*フ\_s*ト\|r\_s*e\_s*g\_s*o\_s*n\|''\_s*R\_s*e\_s*i\_s*l\_s*l\_s*y\_s* \_s*J\_s*a\_s*p\_s*a\_s*n\|リ\_s*ン\_s*グ\|p\_s*e\_s*n\_s*W\_s*i\_s*n\_s*d\_s*o\_s*w\|x\_s*y\_s*g\_s*e\_s*n\)\)',
+      \ 'p' : '\%([本磅椪烹方砲報法舖歩舗ぽ併蔽閇閉×邊編片邉辺遍篇屁ぺ幅服風分布符腐泌匹憑票俵品筒平日版幇搬板犯腹払発發走箱朴駮博拍泊愽包放敗杯盃配牌八播波破羽張ぱｐ鉛ψΨぴ±＋ぷφΦ┣├∝北┴‰．％£〒点・プポ頁）（∂¶‖ペパПπピпΠ燐p]\|ｯ\_s*\%(ﾎ\_s*ﾟ\|ﾍ\_s*ﾟ\|ﾌ\_s*ﾟ\|ﾋ\_s*ﾟ\|ﾊ\_s*ﾟ\)\|ッ\_s*[ポペプピパ]\|っ\_s*[ぽぺぷぴぱ]\|ﾎ\_s*ﾟ\|先\_s*斗\_s*町\|ﾍ\_s*ﾟ\|祕\_s*[露魯]\|ﾌ\_s*ﾟ\|釜\_s*山\|普\_s*魯\_s*西\|ﾋ\_s*ﾟ\|皮\_s*蛋\|光\_s*一\|ﾊ\_s*ﾟ\|麺\_s*麭\|巴\_s*\%(里\|奈\_s*馬\)\|S\_s*y\_s*n\_s*a\_s*n\_s*t\_s*h\_s*a\_s*e\|C\_s*y\_s*c\_s*l\_s*a\_s*n\_s*t\_s*h\_s*a\_s*l\_s*e\_s*s\|排\_s*骨\|B\_s*r\_s*o\_s*m\_s*e\_s*l\_s*i\_s*a\_s*l\_s*e\_s*s\|L\_s*e\_s*a\_s*d\|白\_s*[板酒金]\|シ\_s*\%(ュ\_s*ー\_s*ド\|ロ\_s*シ\_s*ビ\_s*ン\)\|サ\_s*\%(ー\_s*ム\|イ\_s*\%([ズクケコ]\|ロ\_s*シ\_s*ビ\_s*ン\|リ\_s*ウ\_s*ム\|キ\_s*ッ\_s*ク\)\)\|+\_s*α\|ホ\_s*\%(ン\|ス\_s*ゲ\_s*ン\)\|ヒ\_s*ロ\_s*ポ\_s*ン\|比\_s*\%(布\|律\_s*賓\)\|フ\_s*\%(リ\_s*ジ\_s*ア\_s*ン\|レ\_s*\%(ー\_s*\%(ズ\|ジ\_s*ン\_s*グ\)\|イ\_s*ジ\_s*ン\_s*グ\)\|タ\_s*レ\_s*イ\_s*ン\|ォ\_s*\%([ーンノト]\|ボ\_s*ス\|ビ\_s*ア\|ス\_s*フ\_s*ァ\_s*ー\|ニ\_s*ー\)\|ァ\_s*\%(イ\|ラ\_s*オ\|ー\_s*\%([ジマ]\|ミ\_s*ン\_s*グ\)\|ン\_s*\%(ト\_s*ム\|タ\_s*ズ\_s*[ムマ]\)\|ル\_s*[ツス]\|レ\_s*ノ\_s*プ\_s*シ\_s*ス\)\|ィ\_s*\%([ロル]\|ジ\_s*\%(ッ\_s*ク\_s*ス\|カ\_s*ル\)\|ー\_s*ビ\_s*ー\|ッ\_s*シ\_s*ン\_s*グ\|レ\_s*モ\_s*ン\|ラ\_s*デ\_s*ル\_s*フ\_s*ィ\_s*ア\|リ\_s*\%([スーアパ]\|ッ\_s*[プパ]\|ピ\_s*\%(ン\|ー\_s*ヌ\)\)\)\|ェ\_s*\%(ー\_s*\%([ベズ]\|ジ\_s*ン\_s*グ\)\|イ\_s*ズ\|ロ\_s*モ\_s*ン\|ニ\_s*\%(ル\|ッ\_s*ク\_s*ス\|キ\_s*ア\|ー\_s*ル\)\|ノ\_s*\%(キ\_s*シ\|ー\_s*ル\)\)\)\|述\_s*語\|証\_s*明\|タ\_s*ン\_s*パ\_s*ク\_s*質\|処\_s*理\|手\_s*続\_s*き\|進\_s*行\|算\_s*譜\|利\_s*潤\|南\_s*瓜\|公\_s*告\|宣\_s*伝\|真\_s*珠\|Ｐ\_s*\%(波\|Ｌ\_s*法\|Ｃ\_s*\%(／\_s*Ａ\_s*Ｔ\|９\_s*８\|モ\_s*デ\_s*ル\)\|ｏ\_s*ｓ\_s*ｔ\_s*Ｓ\_s*ｃ\_s*ｒ\_s*ｉ\_s*ｐ\_s*ｔ\|Ｓ\_s*．\|．\_s*Ｓ\_s*．\|ｉ\_s*ｔ\_s*Ｉ\_s*ｎ\_s*ｎ\|ｒ\_s*ｏ\_s*\%(ｌ\_s*ｏ\_s*ｇ\|ｔ\_s*ｅ\_s*ｏ\_s*ｎ\)\|ｅ\_s*ｒ\_s*\%(ｌ\|ｉ\_s*ｏ\_s*ｄ\)\)\|永\_s*続\|カ\_s*リ\_s*ウ\_s*ム\|葡\_s*萄\_s*牙\|重\_s*合\_s*体\|多\_s*相\_s*型\|バ\_s*テ\_s*レ\_s*ン\|貼\_s*り\_s*付\_s*け\|論\_s*文\|偏\_s*執\_s*[狂病]\|引\_s*数\|P\_s*\%([umdCaor]\|K\_s*戦\|D\_s*F\_s*フ\_s*ァ\_s*イ\_s*ル\|コ\_s*ー\_s*ド\|タ\_s*イ\_s*ル\|\.\_s*S\_s*\.\|S\_s*\%(\.\|Y\_s*・\_s*S\)\|I\_s*C\_s*マ\_s*イ\_s*コ\_s*ン\|l\_s*\%(a\_s*t\_s*i\_s*n\_s*u\_s*m\|u\_s*t\_s*o\_s*n\_s*i\_s*u\_s*m\)\|E\_s*T\_s*ボ\_s*ト\_s*ル\|O\_s*S\_s*\%(シ\_s*ス\_s*テ\_s*ム\|I\_s*X\|T\_s*メ\_s*ソ\_s*ッ\_s*ド\)\|e\_s*\%(r\_s*l\|n\_s*\%(t\_s*\%(o\_s*x\_s*y\_s*l\_s*i\_s*d\_s*a\_s*e\|i\_s*u\_s*m\)\|n\_s*s\_s*y\_s*l\_s*v\_s*a\_s*n\_s*i\_s*a\)\)\|h\_s*o\_s*s\_s*p\_s*h\_s*o\_s*r\_s*u\_s*s\)\|リ\_s*ン\)',
+      \ 'q' : '\%([配椪栩櫪椢檪椡橡椚湫櫟含纐柵婚屎糞癖潛潜鵠裹凹窪馘括縊踵跟軛頚珞頸首諄窟鞋履寛狐轡覆靴沓碎砕管条降件頽崩屑葛釘莖茎陸杙株杭掘崛倔鶏鐃藥擽薬樟楠酒髪梳櫛串釧與与挫籖鯀鯨鬮籤隈熊艸嚔藾叢鏈腐鎖種ξΞ臭日茸菌楔草圀邦國国髭嗽漱吻喙嘴脣唇蛇梔劫刧腔φ　空粂皹勳熏裙醺桾皸下薫燻訓勲葷君委钁精詳企鍬加咥銜桑塊某暝競峅眛昏晦罔冥鮓比較闇位鞍藏暗倉廚厨涅〃仝ヽゞヾ々ゝ曇雲蜘栗狂包俥車廓曲郭梍枢踝畔鉄鐵★●■玄蔵黒玖柧供喰苦九枸鳩煦悔焼功倶狗来拘徠吼刳工絎駒朽眩垢口屈窶駈区劬繰呉宮暮貢久嶇來矩奇鉤９酌庫惧躯組衢紅食句吁懼區桍孔驅駆怐瞿汲ｸくｑ”‘’“♪ケ？ク¶q]\|ｯ\_s*ｸ\|ッ\_s*ク\|っ\_s*く\|姑\_s*娘\|箜\_s*篌\|救\_s*世\|莎\_s*草\|傀\_s*儡\|被\_s*下\_s*度\|百\_s*[濟済]\|果\_s*物\|恭\_s*敬\|長\_s*月\|9\_s*月\|秧\_s*鶏\|究\_s*竟\|釉\_s*掛\|典\_s*薬\_s*寮\|天\_s*鼠\_s*矢\|L\_s*a\_s*u\_s*r\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|探\_s*湯\|誓\_s*湯\|球\_s*磨\|六\_s*合\|地\_s*祇\|都\_s*子\|州\_s*光\|山\_s*梔\_s*子\|崑\_s*央\|群\_s*衆\|慈\_s*姑\|旧\_s*\%(訳\|唐\_s*書\)\|c\_s*r\_s*e\_s*s\_s*c\|水\_s*[鶏母]\|海\_s*月\|内\_s*蔵\_s*助\|K\_s*r\|H\_s*e\_s*l\_s*l\_s*e\_s*b\_s*o\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|公\_s*\%([家方卿界美事文]\|出\_s*挙\)\|佝\_s*僂\_s*病\|J\_s*u\_s*g\_s*l\_s*a\_s*n\_s*d\_s*a\_s*l\_s*e\_s*s\|胡\_s*桃\|C\_s*\%(r\|h\_s*r\_s*o\_s*m\_s*i\_s*u\_s*m\)\|R\_s*h\_s*a\_s*m\_s*n\_s*a\_s*l\_s*e\_s*s\|Ｑ\_s*＆\_s*Ａ\|珠\_s*穆\_s*朗\_s*瑪\|チ\_s*ョ\_s*モ\_s*ラ\_s*ン\_s*マ\|Q\_s*\%(I\_s*C\|R\_s*コ\_s*ー\_s*ド\|C\_s*サ\_s*ー\_s*ク\_s*ル\|U\_s*O\_s*カ\_s*ー\_s*ド\)\|『\_s*』\|コ\_s*\%(ー\_s*ラ\_s*ン\|ン\_s*テ\_s*ィ\_s*フ\_s*ァ\_s*イ\_s*ア\)\|問\_s*合\_s*せ\|カ\_s*\%(ザ\_s*ン\|タ\_s*ー\_s*ル\|ス\_s*バ\|ー\_s*ヌ\_s*ー\_s*ン\|ナ\_s*ー\_s*ト\|ダ\_s*フ\_s*ィ\|リ\_s*テ\|ド\_s*リ\_s*ー\_s*[ユル]\|ル\_s*\%(チ\_s*[ェエ]\|テ\_s*\%(ィ\_s*エ\|ッ\_s*ト\)\)\|ン\_s*タ\_s*[ムスン]\)\|質\_s*問\|キ\_s*\%(ト\|ブ\_s*ラ\|ホ\_s*ー\_s*テ\|ハ\_s*ー\_s*ダ\|ル\_s*\%(ト\|テ\_s*ィ\_s*ン\_s*グ\)\|ー\_s*ン\|ノ\_s*ン\|ッ\_s*シ\_s*ュ\|ュ\_s*\%(ー\|エ\_s*リ\)\)\)',
+      \ 'r' : '\%([ﾛ侖崙崘堽栄論祿漉轆碌肋勒麓禄鹿６録弄榔薐勞琅實樓焜瓏潦簍僂咾鑞柆螂臈槞瑯哢隴朖蘢螻滝朧壟撈臘郎瘻廊牢浪蝋癆聾楼篭籠狼漏朗轤瀘廬櫓櫨艪顱驢蕗鷺鹵蘆枦櫚炉輅艫滷臚爐賂髏ろﾚ洌澪蛉儷犁勵鴒齢苓綟砺囹糲唳聆〇蛎齡蠡黎羚戻禮祈隸茘麗玲隷伶癘励零冷例冽劣烈裂列靂檪癧轣鬲櫪瀝礫轢歴濂戀匳嗹奩斂鏈瀲漣鎌縺輦簾櫺∧聨憐恋蓮煉錬攣練聯廉連れﾙ♪路盧縲泪壘瘰誄涙羸塁累類縷璢鏤屡褸婁陋るﾘ犂篥葎率慄栗勠淕六戮陸律擽畧暦掠略澑苙嶐瀏鏐瑠窿餾鉚旒瘤畄霤嚠笠榴溜硫琉留立柳粒劉隆流躪藺醂痳棆懍鄰菻躙鈴廩麟P淪厘凜霖琳悋綸淋禀稟凛鱗倫吝隣林燐臨絽踉侶梠膂虜呂慮仂力緑魎粮獵靈粱裲倆怜輌鷯繆廖凉鬣椋楞崚嶺暸兩鐐蓼輛燎瞭聊陵令梁糧諒霊遼凌龍漁亮寮⇔涼撩繚綾療竜量菱僚領了寥稜喨両料閭旅璃籬履釐悧裏梨俚里離浬莅驪痢李哩罹俐漓吏利裡詈理莉りﾗΛλ婪儖繿纜嬾覧瀾臠亂檻欒欖攬籃襴巒覽襤懶爛藍鸞卵濫闌嵐欄乱蘭労剌溂老埓埒猟辣薤喇珞樂犖絡駱酪烙楽落洛徠醴罍櫑耒賚蕾籟擂儡莱磊癩來礼雷頼来螺拉裸們良蘿騾等邏鑼らｒ右→ДжАГБФдзъЧйёЗкНЖьЭцТУСвюЮЁЯЪЛВбХМмЦоынИэа露епЕЬКПЩсчщя魯ШглушЫхОитфЙ輪√根羅ロ々ラルレリРρрΡr]\|ｯ\_s*[ﾛﾚﾙﾘﾗ]\|ッ\_s*[ロレルリラ]\|っ\_s*[ろれるりら]\|鱸\_s*魚\|芦\_s*[有花]\|濾\_s*[胞過紙]\|水\_s*無\_s*月\|6\_s*[時月]\|檸\_s*檬\|坩\_s*堝\|C\_s*\%(a\_s*l\_s*y\_s*c\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|h\_s*o\_s*r\_s*i\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|A\_s*\%(c\_s*t\_s*a\_s*e\_s*a\|p\_s*o\_s*p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\)\|鯉\_s*[魚城]\|二\_s*\%(索\|翻\_s*縛\)\|V\_s*e\_s*r\_s*t\_s*i\_s*c\_s*i\_s*l\_s*l\_s*a\_s*t\_s*a\_s*e\|O\_s*r\_s*c\_s*h\_s*i\_s*d\_s*a\_s*l\_s*e\_s*s\|M\_s*i\_s*c\_s*r\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\|L\_s*\%([ruia]\|e\_s*i\_s*t\_s*n\_s*e\_s*r\_s*i\_s*a\_s*l\_s*e\_s*s\|A\_s*N\_s*ケ\_s*ー\_s*ブ\_s*ル\)\|海\_s*獺\|G\_s*\%(e\_s*n\_s*t\_s*i\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\|y\_s*\%(n\_s*a\_s*n\_s*d\_s*r\_s*a\_s*e\|m\_s*n\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*e\)\)\|関\_s*係\_s*デ\_s*ー\_s*タ\_s*ベ\_s*ー\_s*ス\|数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|京\_s*都\_s*大\_s*学\_s*数\_s*理\_s*解\_s*析\_s*研\_s*究\_s*所\|東\_s*北\_s*大\_s*\%(通\_s*研\|学\_s*電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\)\|電\_s*気\_s*通\_s*信\_s*研\_s*究\_s*所\|限\_s*定\_s*命\_s*令\_s*セ\_s*ッ\_s*ト\_s*計\_s*算\_s*機\|範\_s*囲\|規\_s*則\|紅\_s*玉\|要\_s*求\|検\_s*索\|復\_s*帰\|返\_s*[信事]\|拒\_s*否\|反\_s*射\_s*鏡\|参\_s*\%(考\_s*文\_s*献\|照\_s*型\)\|Ｒ\_s*\%(Ｉ\_s*Ｎ\_s*Ａ\|＆\_s*Ｄ\|Ｓ\_s*−\_s*２\_s*３\_s*２\_s*Ｃ\|ｕ\_s*ｍ\_s*ｂ\_s*ｌ\_s*ｅ\|ｅ\_s*ｎ\_s*ｏ\)\|機\_s*能\_s*回\_s*復\_s*訓\_s*練\|再\_s*帰\_s*的\|認\_s*識\|R\_s*\%([bnfeauh]\|i\_s*c\_s*h\_s*a\_s*r\_s*d\_s* \_s*M\_s*\.\_s* \_s*S\_s*t\_s*a\_s*l\_s*l\_s*m\_s*a\_s*n\|C\_s*S\|S\_s*S\_s*リ\_s*ー\_s*ダ\|I\_s*S\_s*C\|A\_s*M\|O\_s*M\|E\_s*\%(M\_s*睡\_s*眠\|T\_s*U\_s*R\_s*N\_s*キ\_s*ー\|A\_s*D\_s*M\_s*E\)\)\|正\_s*規\_s*表\_s*現\|ア\_s*ー\_s*ル\)',
+      \ 's' : '\%([ｿ似杣灌傍峙毓育具供備害底苑薗園儲貮酘妬埆埣譏讒詆誹謗濡外猝率喞熄仄息足促束測側赱澡鯵嗾掫筝竃裝弉髞瀧勦輳嗽搶蔟爭偬瘡窗菷葱剏梍壯竈譟崢蚤笊嫂薮雙帚叟諍屮滝槽贈湊箱艘愡甑箒艚抓燥樔奘懆歃孀窓踪匝噪遭艙爪糟莊倉怱曹匆淙繰宋漕簇槍躁鎗箏綜痩喪藻艸葬壮操掻掃奏蹌滄争草層創蒼叢僧走惣送叛乖抑諳某橇轌艝拵噂巽邨鱒忖蹲樽孫遜存尊損噌其反踈組粗租胙俎礎爼詛麁囎蔬姐塑甦疎副措訴愬疽酥逸鼡沮蘓徂沿阻齟疏祖鼠咀想祚そｾ芹鬩槧羶甎揃倩翦箋燹濺苫栫槫孱孅簽吮纖湶纎亘筌蟾磚荐茜綫箭舩喘錢專僊贍鐫仟旃痊涎巛銛饌僣氈韆籤沾刋擶舛牋阡濳籖癬潛筅殱殲闡釧賎餞羨顫甅竰糎¢陝銓踐閃潺遷銑栴川剪煽譫僉瞻践栓跣疝詮銭穿戰腺繊僭泉嬋淺擅鮮専潜扇浅蘚船線撰宣洗煎戦千忙伜倅逼蝉旋洩椄卩屑絏鱈泄攝紲緤薛褻浙竊℃窃拙摂接節楔淅蹐績蹠蓆籍磧跡跖關藉晰威迹瘠勣裼晢夕鶺潟碩惜析関席隻情甥躋貰淒婿嘶睛擠撕牲萋菁韲瀞穽齏筬晟掣腥逝惺旌蜻整靖誓制晴競急世堰攻脊丗勢畆糶瀬畝せｽ鯣鋭坐座李既已昴術辷全滑皇脛臑裾双英村選優営寸漱薦啌勸雪濯啜勧芒薄煤賺鼈捩筋頗丞輔佑亮甫祐介助蘇裔陶曽乃曾即則淳漁凉鑾篶漫硯雀涼鱸鮓鮨遊椙犂犁耒篦隙尽末眇縋管菅頽廢廃窘救掬寡尠糘粭菫速純鈴炭角墨隅】【鄒數菘陬雛芻嵩崇趨樞∝∫∠∞≫∧∋÷⇒∬∃∂∴±∩≒Δ¬∇×∀∈⌒≪≧≠∨∵⇔枢翆榱陲悴隹粹瘁帥騅萃邃錘捶忰誰醉遂膵燧彗綏錐穂炊翠⊥H吹粋推水酔睡掏鋤總巣直簾拗耡醋棲総過饐剃澄籔空透磨壽澂寿統梳喫栖棄据吸擂剥住好漉ｼ埀謐蕋蘂蕊痺褥茵鵐蔀鷸鴫入霑蔵嶌縞嶋島凋澀沫澁渋縛暫屡荵凌鎬忍慕簧舖↓襪健認随从啝從．舌扱罔θ虐Θ粃秕椎椣卓貎尿肉臠猪榻黙蜆楙誠茂成繁重鋪惻陣頻閾櫁樒汐鹽潮隰瑟嫉櫛蛭蟋疾隲漆躾膝失室沒鎭沈滴雫賤鎮靜顰尓爾確聢併◇◆鹿貭叱征質卯滋撓科品鬼錣鍜錏凝痼而拉設萎栞襞吝咳爲什導怪汁徴験著記印〇○』銀城代『報調蝨濕湿七僕笞楚霜臀退斥尻寫卸者炙冩柘舍暹諜喋煮這謝鯱奢赦捨瀉嚼抉決皙勺釋蜥爍鑠妁斫蹟刳昔芍酌爵折癪笏赤綽灼石尺借赭写鷓積舎車斜釈社蛛株麈諏洙殳娶娵鬚侏銖繻卒菽粥叔俶戚蓿倏蹙槭肅淑夙粛縮取珠殊趣恤蟀卆出鰍繍楢葺溲泅嗅楫酬逎遒緝岫螽萩鷲甃駲楸穐蹤讎售讐洲綉收驟囚舅姑蓚鞦脩輯醜習羞酋聚舟秀祝袖拾啾蒐収執衆襲愁就臭蹴週終褶州宗椶棕守朱撞種修周手首狩須儁皴悛惷蕣雋墫順蠢舜旬竣峻駿逡筍春瞬俊嗔蓁縉蔘鷏忱簪甄鷆寢岑畛矧疹槙齔臻娠譛譖哂脣袗怎晉瀋箴軫榛秦襯診鉐津駸讖紳斟唇針呻蜃賑芯瞋振殿侵辛薪晨辰震宸森伸愼眞慎寝晋身進審深親臣鍼心宍信神藷墅薯杵岨胥蜍黍渚砠處嶼且狙苜苴曙背塩緒枌雎蔗庶処所書暑誚聲橡奬觴舂蛸懾燮厰姓獎枩稍甞韶炒淞陞顳腫井摺嶂橸浹愴星升鍬樅嘗簫慯廂霎庠剿筱鬆秤政訟廠樵鷦礁邵餉愀妝璋湫艢劭峭殤梢將敞醤慫従逍倡竦爿牆墻薔笙樟装肖菖＜≦湘誦聳檣稱声裳（）蒋蕉嘯慴精霄鈔粧彰悚鏘悄蕭哨瀟焦憔匠鍾償瘴漿頌詔妾沼請衝薑唱庄渉奨牀娼床椒鉦荘翔抄宵傷踵召銷賞猩症昭燒猖昌少憧松捷紹晶尚象承證正将称焼笑照勝招消章詳証鐘硝掌省商昇穡屬稷嗇禝寔稙昃謖軾矚拭餝属燭贖色飾囑嘱織蝕式喰蜀殖初諸埴植食職砥姉摯誣侈髭肆仔及岐址梔咫贄沚旨誌資豕鷙凍厮粢齒雌耜枝齎領篩四祇嗤貲諮巵死強紙熾市師厶妛飼諡祗閇姿駟嗣趾此染締詞茲釶柿覗弛徙至屍嘴斯駛屎占啻之揣如閉錙糸絞孜尸滓獅瓷緊笥始泗咨觜只輜廝使敷恃思帋痴漬脂氏蚩時紫沁俟絲巳祉矢恣若賜次浸詩志識司弑笶翅謚示梓伺視緇自祠史試子痣滲茨肢歯幟祀施竢舐卮耆呰為芝阯しｻ杓雨寤鮫清鞘莢觸騷触椹鰆爽騒澤沢濬掠新攫渫杷浚更士桾申白素汕纉潸餐蒜衫讚粲芟爨鑚蠶戔嶄跚驂慘攅斬彡杉秋桑…≡簒纂鯢燦珊繖棧刪卅參蚕鑽算傘３▼▽贊3参賛O散惨産酸嘸摩遉樣彷碍妨様山漣貶蔑垂鮭叫仙鏥寞寥皺淋生鯆虱鯖捌偖扨偵宿禎貞定哘誘蝎蠍授皿祥桟匙簓障囁私篠支捧笹逧迫讃鐸蛹宛真碕嵜尖前崎魁遮峺哢囀候侍核実説俚了達逹暁叡聰敏諭慧哲知訓郷恵聡智悟理杆里小棹竿箚扎刹紮皐撮搜寒捜相主盛盞柧觚杯盃榮栄倒肴魚界阪堺境酒泝逆賢坂榊猿麾挟鷺拶撒擦颯先数察薩刷札綵衰縡偲腮樶責哉殺霽崔淬顋寨切洒纔碎晒犲濟凄砦灑釵靫悽摧倖豺呵苛幸猜塞蔡栽儕采齊財臍截載孥宰済齋犀際災柴賽菜砕採斉斎祭妻債催才細鰓裁歳最埼捉辟柞縒咋簀筰齪筴窄册槊酢嘖朔柵遡溯鑿索搾昨炸冊策錯櫻桜裟提砂乍去射狭狹紗刺唆曝柤蓑裂捺做梭磋褪銹荒插醒挫差莎削止冷早避些槎嵳嵯嗟沙娑然再渣蹉扠詐割咲注覚嗄茶螫簑瑣下左搓瑳冴寂鎖挿叉査佐作覺点冱錆さ√錫す／仕指製西　┓┐〆□■шШ上＃♯щЩ添∪日ｓ⊂⊆⊃⊇文静★☆＊標嗜青三聖土彩△▲悉署〜∽‘’┌┏集＼探§″性セサシソス秒σΣСсs]\|ｯ\_s*[ｿｾｽｼｻ]\|ッ\_s*[ソセスシサ]\|っ\_s*[そせすしさ]\|遽\_s*走\|蕎\_s*麦\|内\_s*障\|彼\_s*杵\|諷\_s*歌\|幾\_s*許\|錚\_s*[錚々]\|十\_s*\%(路\|露\_s*盤\)\|冬\_s*青\|微\_s*風\|虚\_s*言\|宙\_s*組\|夫\_s*[々夫]\|返\_s*田\|傴\_s*僂\|U\_s*m\_s*b\_s*e\_s*l\_s*l\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|台\_s*詞\|c\_s*e\_s*n\_s*t\_s*i\|妹\_s*尾\|嘲\_s*笑\|海\_s*象\|蒸\_s*[篭籠]\|魑\_s*魅\|凡\_s*て\|典\_s*侍\|季\_s*雄\|天\_s*[皇蛾]\|蘿\_s*蔔\|V\_s*i\_s*o\_s*l\_s*a\_s*l\_s*e\_s*s\|N\_s*y\_s*m\_s*p\_s*h\_s*a\_s*e\_s*\%(a\_s*c\_s*e\_s*a\_s*e\|o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|夊\_s*繞\|隧\_s*道\|Ｃ\_s*\%(型\|言\_s*語\)\|老\_s*舗\|望\_s*潮\|飛\_s*沫\|L\_s*a\_s*\%(m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|b\_s*i\_s*a\_s*t\_s*a\_s*e\)\|埋\_s*葬\_s*虫\|幣\_s*原\|桎\_s*梏\|柳\_s*葉\_s*魚\|衣\_s*魚\|汚\_s*点\|蠹\_s*魚\|惠\_s*雄\|舗\_s*石\|磯\_s*城\|W\_s*i\_s*n\_s*t\_s*e\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|倭\_s*文\|閑\_s*[谷か]\|云\_s*[云々]\|明\_s*\%(々\_s*後\_s*日\|明\_s*後\_s*日\)\|７\_s*月\|7\_s*月\|４\_s*[分月]\|4\_s*月\|羊\_s*[齒歯]\|I\_s*\%(l\_s*l\_s*i\_s*c\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|s\_s*o\_s*p\_s*y\_s*r\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\)\|不\_s*[忍知]\|後\_s*\%([輪口志目]\|込\_s*み\)\|軍\_s*鶏\|香\_s*菜\|吃\_s*逆\|蝦\_s*蛄\|輸\_s*[出贏]\|隼\_s*[朗郎]\|笋\_s*[干羹]\|縦\_s*容\|睫\_s*毛\|翡\_s*翠\|東\_s*\%(雲\|海\_s*林\)\|Z\_s*i\_s*n\_s*g\_s*i\_s*b\_s*e\_s*r\_s*a\_s*l\_s*e\_s*s\|続\_s*\%(日\_s*本\_s*\%(紀\|後\_s*紀\)\|後\_s*撰\_s*和\_s*歌\_s*集\)\|髑\_s*髏\|匣\_s*鉢\|復\_s*習\|百\_s*日\_s*紅\|胡\_s*孫\_s*眼\|←\_s*→\|霰\_s*弾\|弥\_s*生\|懺\_s*\%(法\|悔\_s*懺\_s*悔\)\|流\_s*[離石]\|蠑\_s*螺\|覇\_s*王\_s*樹\|C\_s*\%([es]\|y\_s*c\_s*a\_s*d\_s*\%(i\_s*d\_s*a\_s*e\|o\_s*\%(p\_s*s\_s*i\_s*d\_s*a\|f\_s*i\_s*l\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\)\|h\_s*l\_s*o\_s*r\_s*a\_s*n\_s*t\_s*h\_s*a\_s*c\_s*e\_s*a\_s*e\|言\_s*語\|D\_s*店\|型\_s*肝\_s*炎\|a\_s*\%(s\_s*s\_s*y\_s*t\_s*h\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|c\_s*t\_s*a\_s*l\_s*e\_s*s\)\)\|竹\_s*[篦刀筒]\|大\_s*角\_s*豆\|防\_s*人\|曩\_s*に\|向\_s*坂\|一\_s*昨\_s*\%(昨\_s*[年日]\|々\_s*[年日]\)\|實\_s*藤\|甘\_s*藷\|五\_s*月\|月\_s*代\|匂\_s*坂\|税\_s*所\|雑\_s*賀\|骰\_s*子\|P\_s*\%(a\_s*r\_s*i\_s*e\_s*t\_s*a\_s*l\_s*e\_s*s\|t\_s*e\_s*r\_s*i\_s*d\_s*o\_s*s\_s*p\_s*e\_s*r\_s*m\_s*\%(a\_s*l\_s*e\_s*s\|i\_s*d\_s*a\_s*e\)\|r\_s*i\_s*m\_s*u\_s*l\_s*a\_s*l\_s*e\_s*s\)\|A\_s*\%(p\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*a\_s*l\_s*e\_s*s\|n\_s*t\_s*i\_s*m\_s*o\_s*n\_s*y\)\|瑞\_s*[典西]\|B\_s*\%(r\|シ\_s*ェ\_s*ル\)\|拡\_s*張\_s*子\|部\_s*分\|置\_s*換\|ア\_s*ン\_s*チ\_s*モ\_s*ン\|構\_s*造\_s*体\|D\_s*o\_s*n\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*A\_s*l\_s*p\_s*h\_s*o\_s*n\_s*s\_s*e\_s* \_s*F\_s*r\_s*a\_s*n\_s*c\_s*o\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\|M\_s*\%(e\_s*r\_s*c\_s*u\_s*r\_s*y\|u\_s*s\_s*a\_s*l\_s*e\_s*s\|a\_s*r\_s*q\_s*u\_s*i\_s*s\_s* \_s*d\_s*e\_s* \_s*S\_s*a\_s*d\_s*e\)\|加\_s*\%(之\|虐\_s*\%(淫\_s*乱\_s*症\|趣\_s*味\)\)\|T\_s*\%(e\_s*t\_s*r\_s*a\_s*c\_s*e\_s*n\_s*t\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\|i\_s*n\|h\_s*e\_s* \_s*S\_s*i\_s*m\_s*p\_s*l\_s*e\_s* \_s*A\_s*P\_s*I\_s* \_s*f\_s*o\_s*r\_s* \_s*e\_s*v\_s*e\_s*n\_s*t\_s*-\_s*b\_s*a\_s*s\_s*e\_s*d\_s* \_s*X\_s*M\_s*L\_s* \_s*p\_s*a\_s*r\_s*s\_s*i\_s*n\_s*g\)\|ケ\_s*イ\_s*素\|珪\_s*素\|計\_s*測\_s*自\_s*動\_s*制\_s*御\_s*学\_s*会\|ネ\_s*ッ\_s*ト\_s*サ\_s*ー\_s*ビ\_s*ス\|ザ\_s*\%(ッ\_s*ク\|ク\_s*セ\_s*ン\|ビ\_s*ー\_s*ネ\|ウ\_s*バ\_s*ー\|ワ\_s*ー\_s*ク\_s*ラ\_s*ウ\_s*ト\|ム\_s*ザ\|ル\_s*ツ\|イ\_s*\%([ルン]\|ラ\_s*ー\|デ\_s*ル\)\|ー\_s*\%([ルラ]\|メ\_s*ン\)\)\|意\_s*味\|ゼ\_s*ミ\|ナ\_s*ト\_s*リ\_s*ウ\_s*ム\|ゾ\_s*\%(ル\|ン\_s*デ\|ー\_s*\%(ム\|リ\_s*ン\_s*ゲ\_s*ン\)\|フ\_s*ィ\_s*ー\)\|ジ\_s*\%(ム\|ー\_s*\%([グク]\|メ\_s*ン\_s*[ズス]\)\|グ\_s*ム\_s*ン\_s*ト\|ン\_s*\%(メ\_s*ル\|グ\_s*シ\_s*ュ\_s*ピ\_s*ー\_s*ル\|テ\_s*ー\_s*ゼ\)\)\|Ｓ\_s*\%([席式]\|サ\_s*イ\_s*ズ\|Ｓ\_s*サ\_s*イ\_s*ズ\|ｍ\_s*ａ\_s*ｌ\_s*ｌ\_s*ｔ\_s*ａ\_s*ｌ\_s*ｋ\|ｐ\_s*ａ\_s*ｉ\_s*ｎ\|ｃ\_s*ｏ\_s*ｔ\_s*ｃ\_s*ｈ\|Ｕ\_s*Ｎ\|ｕ\_s*\%(ｎ\|ｐ\_s*ｅ\_s*ｒ\_s*Ａ\_s*ｓ\_s*ｃ\_s*ｉ\_s*ｉ\)\|Ｉ\_s*Ｃ\_s*Ｐ\_s*(\_s*S\_s*t\_s*r\_s*u\_s*c\_s*t\_s*u\_s*r\_s*e\_s* \_s*a\_s*n\_s*d\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*a\_s*t\_s*i\_s*o\_s*n\_s* \_s*o\_s*f\_s* \_s*C\_s*o\_s*m\_s*p\_s*u\_s*t\_s*e\_s*r\_s* \_s*P\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\_s*s\_s*)\|−\_s*ｅ\_s*ｘ\_s*ｐ\_s*ｒ\_s*ｅ\_s*ｓ\_s*ｓ\_s*ｉ\_s*ｏ\_s*ｎ\|Ｏ\_s*Ｎ\_s*Ｙ\_s* \_s*Ｎ\_s*Ｅ\_s*Ｗ\_s*Ｓ\|ｏ\_s*ｌ\_s*ａ\_s*ｒ\_s*ｉ\_s*ｓ\|ｙ\_s*ｓ\_s*Ｖ\)\|硫\_s*黄\|エ\_s*ス\|S\_s*\%([nrgmce式]\|G\_s*M\_s*L\|サ\_s*イ\_s*ズ\|S\_s*サ\_s*イ\_s*ズ\|F\_s*マ\_s*ガ\_s*ジ\_s*ン\|Q\_s*U\_s*A\_s*R\_s*E\_s* \_s*E\_s*N\_s*I\_s*X\|K\_s*\%(K\|Y\_s* \_s*P\_s*e\_s*r\_s*f\_s*e\_s*c\_s*T\_s*V\_s*!\)\|a\_s*\%(r\_s*\%(r\_s*a\_s*c\_s*e\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|g\_s*e\_s*n\_s*t\_s*o\_s*d\_s*o\_s*x\_s*a\_s*c\_s*e\_s*a\_s*e\)\|m\_s*a\_s*r\_s*i\_s*u\_s*m\)\|M\_s*\%(プ\_s*レ\_s*イ\|ク\_s*ラ\_s*ブ\)\|P\_s*\%(レ\_s*コ\_s*ー\_s*ド\|A\_s*C\_s*E\_s*キ\_s*ー\)\|p\_s*\%(l\_s*u\_s*s\|e\_s*\%(r\_s*m\_s*a\_s*t\_s*o\_s*p\_s*h\_s*y\_s*t\_s*a\|c\_s*a\_s*l\_s*i\_s*t\_s*y\_s* \_s*S\_s*t\_s*o\_s*r\_s*e\_s* \_s*R\_s*e\_s*t\_s*a\_s*i\_s*l\_s*e\_s*r\_s* \_s*o\_s*f\_s* \_s*P\_s*r\_s*i\_s*v\_s*a\_s*t\_s*e\_s* \_s*L\_s*a\_s*b\_s*e\_s*l\_s* \_s*A\_s*p\_s*p\_s*a\_s*r\_s*e\_s*l\)\|a\_s*\%(t\_s*h\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|r\_s*c\)\)\|H\_s*I\_s*F\_s*T\_s*キ\_s*ー\|C\_s*S\_s*I\|T\_s*\%(k\|A\_s*R\)\|h\_s*u\_s*g\_s*a\_s*r\_s*t\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*s\_s* \_s*S\_s*y\_s*s\_s*t\_s*e\_s*m\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*f\_s*a\_s*c\_s*e\|A\_s*\%(P\|S\_s*I\)\|i\_s*\%(m\_s*p\_s*l\_s*e\_s* \_s*K\_s*a\_s*n\_s*a\_s* \_s*t\_s*o\_s* \_s*K\_s*a\_s*n\_s*j\_s*i\_s* \_s*c\_s*o\_s*n\_s*v\_s*e\_s*r\_s*s\_s*i\_s*o\_s*n\_s* \_s*p\_s*r\_s*o\_s*g\_s*r\_s*a\_s*m\|l\_s*i\_s*c\_s*o\_s*n\)\|t\_s*r\_s*o\_s*n\_s*t\_s*i\_s*u\_s*m\|o\_s*\%(u\_s*t\_s*h\_s* \_s*\%(D\_s*a\_s*k\_s*o\_s*t\_s*a\|C\_s*a\_s*r\_s*o\_s*l\_s*i\_s*n\_s*a\)\|l\_s*a\_s*r\_s*i\_s*s\|f\_s*t\_s*w\_s*a\_s*r\_s*e\_s* \_s*R\_s*e\_s*s\_s*e\_s*a\_s*r\_s*c\_s*h\_s* \_s*A\_s*s\_s*s\_s*o\_s*c\_s*i\_s*a\_s*t\_s*e\_s*,\_s*I\_s*n\_s*c\_s*\.\)\|u\_s*\%(n\|l\_s*f\_s*u\_s*r\)\)\)',
+      \ 't' : '\%([ﾄ乕囚寅虎瀞侶舮靹供纜燭艫朋倶鞆輩讎讐伴共友巴沌惇丼飩團暾団遯燉遁豚鷄禽酉砦塞俘擒虜豐恍惚枢乏塒迚科咎篷笘攴苫鶏伽唱稱鄰隣朿棘刺整鎖處処所床享鴟鵄扉鳶嫁訥晨穐秋刻鴇鬨斎頓幄幃帷柮杤栃閼軣轟屆届咄吶凸世暁祀駿壽繁稔寿豊歳俊利敏年慝牘悳黷犢匿督徳涜∃得特磴稻鞜剳宕滕鬥纛櫂讀盜綯橦叨桶盪竇抖縢礑荅閙塘罩帑棹兜檮納亠嶋棠搨档嶝溏鞳夲蘯道黨酘陦榻樋梼沓涛朸淌篤吋擣萄釖鬧籘諮迯儻潼鐙嶌逗螳蟷稲■幢滔鼕掏當峠読饕疼淘濤籐董悼棟搭痘套＝豆燈桃韜遠統騰橈冬討骰祷藤灯島橙凍刀陶糖謄唐答投等桐兎砿外富止礪研閇觧疾莵梳穫融録問砥採飛杜賭翔留冨図熔人途登菟畄蠧泊戸跿荼蠹十蚪砺盗屠渡解取執溶睹兔脱妬鍍磨説摂覩鎔堵秉獲汢塗肚圖とﾃ瑛晃輝衒寺靦囀躔忝、鷆鷏碾巓，槙沾殄霑腆壥諂廛轉‥．：輾填甜奠顛纒癲恬殿纏覘展篆添梃輦輟鐡耋咥餮垤跌屮銕姪迭俶逖荻鏑狄糴廸笛覿擲迪滴轍的哲敵撤剔徹鐵鉄酲眤碵羝觝幀嚔嚏渟柢酊掟睇楴詆棣汀騁鵜叮遉釘弟碇剃蹄邸締梯悌訂程底偵廷遞逓抵牴呈艇鄭涕啼庭定低弖照てﾂ模幹劈聾列辛貫面液汁露冷錘舶紡系艷艶絃鉉寉橡剱劒釼劍劔剣弦蔓敦鶴幣兵鉗噤鶫償桓恆典恒常夙務勉努勤拙拐倹抓嬬撮詳審爪褄妻募角晦螺瞑円呟礫具粒辻辟罪捉捕閊把曹阜丘元首寮司官柄仕掴遣攫搏疲使窄莟蕾局壷壺坪綱繋壌蝪培霾戊己伝傳鐔翅翼鍔燕唾續約皷鼓続葛綴番栂槌縋弊費序潰終墜遂鎚椎追做殱殲捏繕傍旁創造作熟机佃蹲拒欟坏鴾槻月裹砲障躑榴謹慎筒愼恙包堤痛椄衝告點附撞繼津搗継嗣支突積尾漬詰尽通憑浸次盡攣連就接付つﾁ吃釁岐巷衢粽粡因杠契鵆児交腟帙膣些蟄N窒斉秩父捷矗筑築逐盟税力親邇誓迩近苣尖縮鏤塵朕珎趁抻鎭碪狆亭跛闖鴆砧椿枕鎮陳珍沈賃杖找摘茶嫡着潴儲豬箸紵竚躇瀦墸杼苧緒樗楮⊥陟飭敕捗稙躅猪勅著悵髫廳樢微聽鵈楪齠甼漲佻膓吊鼎趙迢萇誂廰澂脹疔輙昶糶蔦窕晁鬯塚輒雕挺凋帖掉停諜跳眺貼鐇澄提喋頭銚ー蝶暢帳丁牒重逃鳥張弔懲肇嘲徴兆釣聴彫潮町頂調庁貂腸超挑朝丶黜寵儔冑肘蟲惆鍮晝紬綢廚籌※冢丑胄稠酎紐鑄冲沖偸宙虫｝［｛］厨誅鋳紂仲註駐柱衷注籀昼抽中躓蜘踟褫魑夊黐笞黹池値夂輊治耻千薙家血岻痴散地稚遲知茅恥置穉緻致智遅乳禿癡馳ちﾀ便党屯椽榱架樽弛膤鰔蕩鱈盥戯俵袂保躊為樣様爲啗猯擔疸餤湍覃彖亶鄲靼綻站潭憺酖殫膽襌賺毯摶袒檀褝槫緞椴憚攤壇慱湯澹‡†蛋耽W旦痰啖坦眈反C嘆歎誕胆箪譚担淡鍛單短探貪単覊栲妙戲訊攜携尋訪比畴疇類民髱娯樂恃頼愉楽喩例譬激滾斃仆嵶垰殕倒嫋旅貍狸讃称賛敲蹈踏祟湛鬪戰斗戦闘彳佇叩疊疂疉畳箍鏨違互畉耕畊掌店棚到炭辿燵撻斬韃闥巽辰佐扶＋援相佑輔弼助襷髻椨誑胤種塔龍竜糜糺爛漂維伊理貞是直禎忠惟匡徒唯只窘嗜慥確鮹鱆胝凧蛸嶽哮誥茸英豪威毅猛笋筍酣雄健丈斌武靈彈珪承賚珠霊魂卵偶適環弾球玉丹謀莨束縱｜盾鬣奉楯蓼縦竪質城達館忽橘舘瀑薪滝瀧峪溪渓谿谷尭亨臣任集宇昂楼小剛恭岳洪喬嵩孚尚尊敬孝崇隆貴鷹竹篁簟寶財高寳宝但濯綰鐸倬澤拆柝擢柘戳啅擇鈬魄畜企啄磔匠巧択沢逞琢蓄度宅託卓謫托拓躰隶殆抬靆黛紿替滯體碓帶軆平駘擡逮腿当怠玳諦岱鯛對颱袋戴堆頽態苔滞待代帝貸隊褪胎帯体退泰大対足手斷垂佗闌経炊撓焚矯溜躱經咤食發朶薫詫誰他詑耐太強蛇起逹貯給堪長揉閉埀発断勃多澑岔截絶田立裁汰点夛侘建它賜たｔцЦ〜天時×型火土→吐都東上噸瓲┃│台表第木スジ∴Θθザ正ツ¨転透▲△▼▽トチ…・試端タт┝Τ┯┰┣┷┸┤┬┥┴┻┠τ┫┳├〒Т┨テt]\|ｯ\_s*[ﾄﾃﾂﾁﾀ]\|ッ\_s*[トテツチタ]\|っ\_s*[とてつちた]\|門\_s*渡\_s*り\|薯\_s*蕷\|船\_s*尾\_s*座\|公\_s*[明暁]\|倫\_s*[子明]\|邑\_s*中\|蜻\_s*蛉\|A\_s*c\_s*o\_s*n\_s*i\_s*t\_s*u\_s*m\|蜷\_s*局\|跡\_s*[絶切]\|蜥\_s*蜴\|舎\_s*人\|馴\_s*鹿\|野\_s*老\|瓊\_s*脂\|永\_s*[遠久]\|宿\_s*直\|朱\_s*鷺\|左\_s*見\_s*右\_s*見\|朽\_s*木\|H\_s*y\_s*d\_s*r\_s*o\_s*c\_s*h\_s*a\_s*r\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|独\_s*鈷\|季\_s*[衣道栄]\|聡\_s*[明徳]\|祈\_s*年\_s*祭\|淑\_s*[夫子]\|洞\_s*爺\|光\_s*男\|晧\_s*史\|紅\_s*娘\|瓢\_s*虫\|F\_s*e\|I\_s*r\_s*o\_s*n\|劇\_s*村\|滌\_s*除\|２\_s*×\_s*４\|悪\_s*阻\|石\_s*\%(蕗\|竜\_s*子\)\|心\_s*[太算]\|自\_s*\%(摸\|模\_s*和\)\|氷\_s*柱\|倩\_s*々\|黴\_s*雨\|入\_s*梅\|梅\_s*雨\|再\_s*見\|悉\_s*に\|備\_s*に\|旋\_s*[風毛]\|B\_s*a\_s*l\_s*a\_s*n\_s*o\_s*p\_s*h\_s*o\_s*r\_s*a\_s*l\_s*e\_s*s\|１\_s*\%(日\|０\_s*日\)\|朔\_s*日\|1\_s*\%(日\|0\_s*日\)\|美\_s*人\_s*局\|E\_s*\%(u\_s*p\_s*h\_s*o\_s*r\_s*b\_s*i\_s*a\_s*l\_s*e\_s*s\|r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|字\_s*\%(牌\|一\_s*色\)\|少\_s*と\|義\_s*父\|主\_s*[殿税]\|周\_s*夫\|睦\_s*子\|渠\_s*睦\_s*子\|萵\_s*苣\|身\_s*柱\|似\_s*指\|清\_s*\%(老\_s*頭\|一\_s*色\)\|青\_s*\%([幇島]\|梗\_s*菜\|椒\_s*肉\_s*絲\)\|全\_s*帯\|昌\_s*洙\|J\_s*i\_s*a\_s*n\_s*g\_s*s\_s*u\|江\_s*蘇\|焼\_s*豚\|叉\_s*焼\|察\_s*哈\_s*爾\|餃\_s*子\|雑\_s*砕\|炒\_s*[麺飯]\|北\_s*谷\|甘\_s*露\_s*子\|錯\_s*和\|総\_s*角\|一\_s*[日寸]\|植\_s*字\|魚\_s*[屋蝨]\|金\_s*魚\_s*蝨\|草\_s*石\_s*蚕\|春\_s*\%(麗\|宮\_s*坊\)\|九\_s*\%(十\_s*九\|連\_s*宝\_s*[灯燈]\)\|揺\_s*蕩\|容\_s*易\|白\_s*痴\|猶\_s*豫\|蜑\_s*民\|段\_s*銭\|蒲\_s*公\_s*英\|騨\_s*州\|M\_s*\%(e\_s*n\_s*i\_s*s\_s*p\_s*e\_s*r\_s*m\_s*a\_s*c\_s*e\_s*a\_s*e\|o\_s*n\_s*o\_s*\%(p\_s*e\_s*t\_s*a\_s*l\_s*a\_s*e\|c\_s*\%(h\_s*l\_s*a\_s*m\_s*y\_s*d\_s*e\_s*a\_s*e\|o\_s*t\_s*y\_s*l\_s*e\_s*d\_s*o\_s*n\_s*e\_s*a\_s*e\)\)\)\|仮\_s*令\|打\_s*[擲坐]\|七\_s*\%(夕\|対\_s*子\)\|活\_s*計\|方\_s*便\|無\_s*料\|黄\_s*\%(昏\|蜀\_s*葵\)\|章\_s*魚\|胼\_s*胝\|P\_s*\%(\.\_s*S\_s*\.\|o\_s*l\_s*y\_s*\%(g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|c\_s*a\_s*r\_s*p\_s*i\_s*c\_s*a\_s*e\)\|a\_s*n\_s*d\_s*a\_s*n\_s*a\_s*l\_s*e\_s*s\)\|壮\_s*聡\|煙\_s*草\|殺\_s*陣\|賢\_s*明\|性\_s*質\|怱\_s*ち\|亢\_s*ぶ\|堂\_s*子\|学\_s*聡\|能\_s*[文之]\|内\_s*匠\|松\_s*明\|奈\_s*子\|幇\_s*間\|切\_s*符\|デ\_s*ィ\_s*ス\|３\_s*ｒ\_s*ｄ\|閾\_s*値\|ソ\_s*\%(ー\_s*[トンプ]\|ロ\_s*ー\)\|ヘ\_s*ー\_s*グ\|ゼ\_s*[インムア]\|セ\_s*\%(オ\|ル\_s*マ\|ロ\_s*\%(ン\|ニ\_s*ア\_s*ス\)\|ラ\_s*ピ\_s*\%(ー\|ス\_s*ト\)\)\|シ\_s*\%(ン\|ッ\_s*ク\|ス\_s*ル\|ア\_s*タ\_s*ー\|ソ\_s*ー\_s*ラ\_s*ス\|オ\_s*ド\_s*ア\|ー\_s*[フタ]\)\|サ\_s*\%([イム]\|ミ\_s*ン\_s*グ\|ウ\_s*ザ\_s*ン\_s*ド\|ラ\_s*ブ\_s*レ\_s*ッ\_s*ド\|ー\_s*\%([ドモ]\|テ\_s*ィ\|ス\_s*ト\_s*ン\|ズ\_s*デ\_s*[イィー]\|マ\_s*ル\)\|ッ\_s*チ\_s*ャ\_s*ー\|ン\_s*\%(ク\|ダ\_s*ー\|キ\_s*ュ\_s*ー\)\|リ\_s*ド\_s*マ\_s*イ\_s*ド\)\|ポ\_s*リ\_s*ペ\_s*プ\_s*チ\_s*ド\|三\_s*\%(和\_s*土\|連\_s*文\_s*字\)\|\\\_s*T\_s*e\_s*X\|文\_s*字\_s*列\|教\_s*科\_s*書\|用\_s*語\|電\_s*\%([視話]\|気\_s*通\_s*信\_s*研\_s*究\_s*所\)\|Ｔ\_s*\%([字ｉ]\|細\_s*胞\|Ｋ\_s*８\_s*０\|ゾ\_s*ー\_s*ン\|バ\_s*ッ\_s*ク\|シ\_s*ャ\_s*ツ\|Ｖ\_s*\%(ニ\_s*ュ\_s*ー\_s*ス\|ゲ\_s*ー\_s*ム\|ド\_s*ラ\_s*マ\|ア\_s*ニ\_s*メ\)\|Ｃ\_s*Ｐ\_s*／\_s*Ｉ\_s*Ｐ\|ａ\_s*ｇ\|ｒ\_s*ｕ\_s*ｅ\_s*Ｔ\_s*ｙ\_s*ｐ\_s*ｅ\|E\_s*Ｘ\|ｅ\_s*[Ｘｌ]\)\|T\_s*\%([bc字mliahe]\|r\_s*i\_s*m\_s*e\_s*n\_s*i\_s*a\_s*c\_s*e\_s*a\_s*e\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\|ゾ\_s*ー\_s*ン\|X\_s*T\_s*フ\_s*ァ\_s*イ\_s*ル\|シ\_s*ャ\_s*ツ\|バ\_s*ッ\_s*ク\|V\_s*\%(ニ\_s*ュ\_s*ー\_s*ス\|ゲ\_s*ー\_s*ム\|ド\_s*ラ\_s*マ\|モ\_s*ニ\_s*タ\|ア\_s*ニ\_s*メ\|シ\_s*ョ\_s*ッ\_s*ピ\_s*ン\_s*グ\)\|C\_s*P\|コ\_s*ー\_s*ド\|-\_s*C\_s*o\_s*d\_s*e\|O\_s*E\_s*I\_s*C\|A\_s*\%(C\|I\_s*N\_s*S\|B\_s*キ\_s*ー\)\|E\_s*L\)\)',
+      \ 'u' : '\%([ｳ孳蛤礼敬恭洞鱗愛潤煩騒粳漆閏患慯悄恙騷愁呻楳梅嫐釉噂褞吽曇紜耘黄云繧慍蘊薀暈運錙怏麗羨卦憾怨恨占卜末嬉心裏浦糶瓜汝己畦疇畆畴畝疎踈宜諾奪姥腕莵兔驢鑿穿嗽魘唸促令項頷訴鷽獺嘯嘘蠢蠕動覘窺伺海萼台詠謌唱唄宴讌転詩謠謳謡疑歌葎鯏鴬鶯ヱゑゐヰ鶉疼堆踞蹲渦舂臼碓羅薄筌食槽朮肯凵魚巧茨廏廐厩鰻午甘秣孫餞馬旨蔚寫暎冩遷噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆雲氏上後喪艮丑潮牛裡鬱欝中袿梁家内紆嫗羽打禹請浮攴得雨有飢熟于埋倦鵜迂生賣挧受撃泛傴憂茹射膿売撲菟盂搏齲右胡承卯攵績産芋討夘兎植饂宇享失烏うｕ¨↑∪уウΥυУUu]\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蟒\_s*蛇\|蠎\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|雅\_s*楽\_s*[頭寮]\|楽\_s*官\|干\_s*莉\|維\_s*納\|太\_s*秦\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|イ\_s*ギ\_s*リ\_s*ス\|オ\_s*マ\_s*ル\|識\_s*別\_s*不\_s*能\|共\_s*\%(用\_s*体\|有\_s*体\)\|ア\_s*\%([スン]\|グ\_s*リ\_s*ー\|ー\_s*\%(シ\_s*ュ\_s*ラ\|ジ\_s*ェ\_s*ン\_s*ト\|バ\_s*ン\)\|ル\_s*テ\_s*ィ\_s*メ\_s*ッ\_s*ト\|ポ\_s*ン\|ッ\_s*\%(プ\|パ\_s*ー\|シ\_s*ャ\_s*ー\)\)\|単\_s*\%(位\|一\_s*化\)\|Ｕ\_s*\%(ボ\_s*ー\_s*ト\|タ\_s*ー\_s*ン\|ネ\_s*ッ\_s*ク\|Ｎ\_s*Ｉ\_s*Ｘ\_s*\%(フ\_s*ェ\_s*ア\_s*ー\|マ\_s*ガ\_s*ジ\_s*ン\)\)\|ユ\_s*\%([タニー]\|ト\_s*\%(リ\_s*ロ\|レ\_s*ヒ\_s*ト\)\|リ\_s*\%(ア\|シ\_s*ー\_s*ズ\)\|プ\_s*シ\_s*ロ\_s*ン\|ネ\_s*ス\_s*コ\|ナ\_s*\%(カ\_s*イ\_s*ト\|イ\_s*テ\_s*ッ\_s*ド\)\|ビ\_s*キ\_s*\%(タ\_s*ス\|ノ\_s*ン\)\)\)',
+      \ 'v' : '\%([ｖ：├値⊥版в↓В∨ヴv]\|ｯ\_s*ｳ\_s*ﾞ\|ッ\_s*ヴ\|っ\_s*ヴ\|ｳ\_s*ﾞ\|チ\_s*ェ\_s*ロ\|ヰ\_s*タ\| \_s*ビ\_s*ク\_s*ト\_s*ー\_s*ル\|視\_s*覚\|仮\_s*想\|ニ\_s*ス\|変\_s*数\|恒\_s*真\|ワ\_s*\%(デ\_s*ィ\_s*ム\|ギ\_s*ナ\|ニ\_s*ス\|セ\_s*リ\_s*ン\|ク\_s*チ\_s*ン\|ル\_s*キ\_s*ュ\_s*ー\_s*レ\|レ\_s*リ\_s*ー\|ー\_s*ニ\_s*ャ\)\|Ｖ\_s*\%(ｃ\|ゾ\_s*ー\_s*ン\|サ\_s*イ\_s*ン\|ネ\_s*ッ\_s*ク\|ゴ\_s*ー\_s*ル\|シ\_s*ネ\|リ\_s*ー\_s*グ\|ｉ\_s*ｅ\_s*ｗ\|ａ\_s*ｌ\_s*ｕ\_s*ｅ\|ｏ\_s*ｌ\_s*ｋ\_s*ｌ\)\|語\_s*彙\|ボ\_s*\%(ス\_s*ト\_s*ー\_s*ク\|ン\_s*ゴ\_s*レ\|ル\_s*\%([ガボトタ]\|テ\_s*\%(ッ\_s*ク\_s*ス\|ー\_s*[ジル]\)\)\|リ\_s*ュ\_s*ー\_s*ム\|ラ\_s*ン\_s*\%(チ\|テ\_s*ィ\_s*ア\|タ\_s*リ\_s*ー\)\|レ\_s*ー\|コ\_s*ー\_s*ダ\|ー\_s*\%([ントグ]\|ル\_s*ト\|ド\_s*ビ\_s*\%(ル\|リ\_s*ア\_s*ン\)\|パ\_s*ル\|ダ\_s*フ\_s*ォ\_s*ン\|カ\_s*\%(ル\|リ\_s*ス\_s*ト\)\)\|キ\_s*ャ\_s*ブ\_s*ラ\_s*リ\|イ\_s*\%([ドス]\|ジ\_s*ャ\_s*ー\|シ\_s*ン\_s*グ\)\)\|ヘ\_s*ッ\_s*ト\|冗\_s*長\_s*な\|垂\_s*直\|フ\_s*\%(ァ\_s*\%(ン\|ド\_s*ー\_s*ツ\)\|ォ\_s*\%(ン\|ル\_s*\%(ク\|カ\_s*ー\)\)\|ェ\_s*ル\_s*メ\_s*ー\_s*ル\)\|ウ\_s*\%(ラ\_s*\%(デ\_s*ィ\_s*ミ\_s*ー\_s*ル\|ジ\_s*\%(ー\_s*ミ\_s*ル\|ミ\_s*ー\_s*ル\|オ\_s*ス\_s*ト\_s*\%(ク\|ッ\_s*ク\)\)\)\|ィ\_s*\%(ン\_s*ナ\|ル\_s*ス\)\|ォ\_s*ッ\_s*カ\|イ\_s*\%(ル\_s*ス\|ン\_s*ナ\_s*ー\)\|ェ\_s*\%(ル\_s*ギ\_s*リ\_s*ウ\_s*ス\|ヌ\_s*ス\)\)\|ビ\_s*\%([アラブバスザ]\|ガ\_s*ー\|ハ\_s*ー\_s*ラ\|タ\_s*ミ\_s*ン\|レ\_s*\%(ッ\_s*ジ\|ロ\_s*イ\)\|ビ\_s*\%(ア\_s*ン\|ッ\_s*ド\)\|ッ\_s*\%(ク\|キ\_s*ー\)\|セ\_s*ン\_s*テ\|ク\_s*\%(タ\_s*ー\|ト\_s*\%(ル\|リ\_s*[ーア]\)\)\|シ\_s*\%(ャ\_s*ス\|ソ\_s*ワ\_s*ー\_s*ズ\)\|ン\_s*\%([チス]\|ソ\_s*ン\|テ\_s*ー\_s*ジ\|セ\_s*ン\_s*ト\)\|ネ\_s*\%(ガ\_s*ー\|グ\_s*レ\_s*ッ\_s*ト\)\|ニ\_s*\%([ール]\|リ\_s*デ\_s*ン\)\|ュ\_s*ー\|エ\_s*ン\_s*チ\_s*ャ\_s*ン\|ジ\_s*\%(ャ\|ッ\_s*ト\|タ\_s*ー\|ョ\_s*\%(ン\|ナ\_s*リ\_s*ー\)\|ュ\_s*ア\_s*\%(ル\|ラ\_s*イ\_s*\%(ズ\|ゼ\_s*ー\_s*シ\_s*ョ\_s*ン\)\)\)\|ダ\_s*ル\|デ\_s*オ\|ル\_s*\%(ゴ\|ヌ\_s*ー\_s*ブ\)\|オ\_s*ラ\|リ\_s*ジ\_s*ア\_s*ン\|ィ\_s*ー\_s*ナ\_s*ス\|ー\_s*\%(ボ\|ル\_s*ス\|ク\_s*ル\|ナ\_s*ス\)\)\|ベ\_s*\%([ガラン]\|ト\_s*ナ\_s*ム\|イ\_s*ダ\_s*ー\|ー\_s*\%(ル\|ダ\_s*ー\)\|テ\_s*ラ\_s*ン\|ッ\_s*セ\_s*ル\|ス\_s*\%([トタパ]\|ビ\_s*オ\)\|ク\_s*\%(タ\|ト\_s*ル\)\|ジ\_s*タ\_s*\%(ブ\_s*ル\|リ\_s*ア\_s*ン\)\|リ\_s*\%([ィー]\|フ\_s*ァ\_s*イ\|サ\_s*イ\_s*ン\)\|ロ\_s*\%(ナ\|シ\_s*テ\_s*ィ\|ー\_s*ナ\|ニ\_s*[カク]\)\|ル\_s*\%(デ\|ベ\_s*ッ\_s*ト\|ダ\_s*ン\|レ\_s*ー\_s*ヌ\|サ\_s*\%(ー\_s*チ\|イ\_s*ユ\)\|モ\_s*ッ\_s*ト\)\|ノ\_s*ム\|ニ\_s*[スヤア]\|ネ\_s*\%(シ\_s*ャ\_s*ン\|チ\_s*ア\|ツ\_s*ィ\_s*ア\|ズ\_s*エ\_s*ラ\)\)\|V\_s*\%(H\_s*L\_s*L\_s*(\_s*V\_s*e\_s*r\_s*y\_s* \_s*H\_s*i\_s*g\_s*h\_s* \_s*L\_s*e\_s*v\_s*e\_s*l\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\_s*)\|ゾ\_s*ー\_s*ン\|サ\_s*イ\_s*ン\|ネ\_s*ッ\_s*ク\|ゴ\_s*ー\_s*ル\|J\_s*E\_s*-\_s*β\|シ\_s*ネ\|リ\_s*ー\_s*グ\|I\_s*S\_s*A\_s*カ\_s*ー\_s*ド\|i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|A\_s*X\|e\_s*r\_s*\%(m\_s*o\_s*n\_s*t\|i\_s*S\_s*i\_s*g\_s*n\)\|a\_s*n\_s*a\_s*d\_s*i\_s*u\_s*m\)\|ブ\_s*\%(イ\|ラ\_s*\%(ド\|ッ\_s*ド\)\|ー\_s*ド\_s*ゥ\_s*ー\)\|バ\_s*\%([ルン]\|イ\_s*\%([アブンオ]\|パ\_s*ー\|タ\_s*\%(ル\|リ\_s*テ\_s*ィ\)\|キ\_s*ン\_s*グ\|ザ\_s*ー\|シ\_s*ャ\)\|ッ\_s*ト\|チ\_s*カ\_s*ン\|ギ\_s*ナ\|ガ\_s*ボ\_s*ン\_s*ド\|ラ\_s*\%(ナ\_s*シ\|エ\_s*テ\_s*ィ\)\|サ\_s*ロ\|ス\_s*\%(コ\|ケ\_s*ス\)\|カ\_s*ン\_s*ス\|ケ\_s*ー\_s*シ\_s*ョ\_s*ン\|キ\_s*ュ\_s*ー\_s*ム\|ウ\_s*チ\_s*ャ\_s*ー\|リ\_s*\%(ン\|エ\_s*ー\_s*シ\_s*ョ\_s*ン\|ュ\_s*ー\|ア\_s*\%(ブ\_s*ル\|ン\_s*ト\)\|ッ\_s*ド\|デ\_s*ー\_s*シ\_s*ョ\_s*ン\)\|ヌ\_s*ア\_s*ツ\|ニ\_s*\%(ラ\|ー\_s*ユ\)\|レ\_s*\%([ラー]\|ロ\_s*ン\|リ\_s*ー\|ン\_s*\%(シ\_s*ア\|チ\_s*ノ\|タ\_s*イ\_s*ン\)\)\|ー\_s*\%([ゴグ]\|チ\_s*ャ\_s*ル\|リ\_s*ト\_s*ゥ\_s*ー\_s*ド\|バ\_s*ル\|ボ\_s*ス\|ベ\_s*ナ\|テ\_s*ィ\_s*カ\_s*ル\|サ\_s*ス\|ジ\_s*\%(ン\|ニ\_s*ア\|ョ\_s*ン\)\|ノ\_s*ン\|ニ\_s*ア\|モ\_s*ン\_s*ト\|ミ\_s*\%(リ\_s*オ\_s*ン\|キ\_s*ュ\_s*ラ\_s*イ\_s*ト\)\)\|ナ\_s*\%(キ\_s*ュ\_s*ラ\_s*ー\|ジ\_s*ウ\_s*ム\)\)\)',
+      \ 'w' : '\%([ｦヲ女翁緒牡小雄汚惜尾男をｳ孳蛤礼敬恭洞鱗愛潤騒粳漆閏慯悄恙騷愁呻楳梅嫐釉噂褞吽曇紜耘云繧慍蘊薀暈運錙怏麗羨U卦憾怨恨占卜末嬉心裏浦糶瓜汝己Υυ畦疇畆畴畝疎踈宜諾奪姥莵兔驢鑿穿嗽魘唸促令項頷訴鷽獺嘯嘘蠢蠕動覘窺伺萼台詠謌唱唄宴讌転詩謠謳謡疑歌葎鯏鴬鶯ヱゑ鶉疼堆踞蹲渦舂臼碓羅薄筌食槽朮肯凵魚巧茨廏廐厩鰻午甘秣孫餞馬旨蔚寫暎冩遷噐器移慈俯映写現虚美笂靭靱靫空鰾萍初蛆氏↑上後喪艮丑潮牛裡鬱欝中袿梁家内紆嫗打禹請浮攴得雨有飢熟于埋倦鵜迂生賣挧受撃泛傴憂茹射膿売撲菟盂搏齲右胡承卯攵績産芋討夘兎植饂宇享失烏うヰ居ゐﾜ叫喚惡÷悪原稿嗤妾蕨童藁鞋笑灣綰萬豌万弯彎椀雲腕碗湾横黄皇往羂罠毫纔微僅患煩伎術厄禍災態業技佗王鰐忘掖弁腋譯腸緜渉亙道航弥亘棉渡綿私隈薈賄淮脇矮猥歪轍海蟠儂∪解頒觧判訣別稚若或枠惑鷲沸詫輪和涌湧我吾把話侘杷訳破萵啝割倭環分琶羽わｗ幅水∧波ウワw]\|ｯ\_s*[ｦヱｳヰﾜ]\|ッ\_s*[ヲヱウヰワ]\|っ\_s*[をゑうゐわ]\|乎\_s*古\_s*止\_s*点\|武\_s*漢\|狼\_s*狽\|夏\_s*枯\_s*草\|蟒\_s*蛇\|蠎\_s*蛇\|譫\_s*言\|琅\_s*珠\|温\_s*[麺気州]\|C\_s*u\_s*c\_s*u\_s*r\_s*b\_s*i\_s*t\_s*a\_s*l\_s*e\_s*s\|自\_s*惚\|采\_s*女\|乳\_s*母\|姨\_s*捨\_s*山\|独\_s*活\|優\_s*\%(婆\_s*[塞夷]\|曇\_s*華\)\|合\_s*格\|親\_s*族\|斥\_s*候\|泡\_s*沫\|雅\_s*楽\_s*[頭寮]\|楽\_s*官\|干\_s*莉\|維\_s*納\|護\_s*田\_s*鳥\_s*尾\|淡\_s*\%(青\|口\_s*醤\_s*油\)\|五\_s*\%(加\|月\_s*蝿\)\|稲\_s*魂\|誓\_s*約\|石\_s*\%(女\|斑\_s*魚\)\|不\_s*生\_s*女\|味\_s*酒\|苜\_s*蓿\|A\_s*r\_s*i\_s*s\_s*t\_s*o\_s*l\_s*o\_s*c\_s*h\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|伝\_s*染\|呆\_s*気\_s*者\|茴\_s*香\|外\_s*郎\|餓\_s*\%(死\|え\_s*死\_s*に\)\|裲\_s*襠\|団\_s*扇\|草\_s*鞋\|（\_s*笑\_s*）\|(\_s*笑\_s*)\|戦\_s*慄\|俳\_s*優\|勿\_s*忘\_s*草\|早\_s*[生稲]\|山\_s*葵\|戯\_s*奴\|度\_s*会\|Ｙ\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|Y\_s*\%(軸\|シ\_s*ャ\_s*ツ\|染\_s*色\_s*体\)\|華\_s*盛\_s*頓\|裙\_s*蔕\_s*菜\|理\_s*[由解]\|公\_s*魚\|病\_s*葉\|大\_s*東\_s*亜\_s*戰\_s*爭\|太\_s*\%(秦\|平\_s*洋\_s*戦\_s*争\)\|歐\_s*州\_s*大\_s*戰\|第\_s*\%(二\_s*次\_s*世\_s*界\_s*大\_s*戦\|一\_s*次\_s*世\_s*界\_s*大\_s*戦\)\|ブ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ロ\_s*ン\_s*グ\|レ\_s*\%(ン\|イ\_s*ス\|ッ\_s*カ\_s*ー\|ス\_s*\%(ラ\_s*ー\|リ\_s*ン\_s*グ\)\)\|リ\_s*\%(ー\_s*ス\|ン\_s*ク\_s*ル\|ス\_s*ト\)\|書\_s*き\_s*込\_s*み\|ラ\_s*\%(ッ\_s*\%([プパ]\|ピ\_s*ン\_s*グ\)\|イ\_s*\%([タト]\|テ\_s*ィ\_s*ン\_s*グ\)\)\|ボ\_s*ル\_s*フ\|フ\_s*\%([ムー]\|ァ\_s*イ\_s*ル\|ィ\_s*\%(ー\_s*ト\|ッ\_s*チ\)\)\|ホ\_s*\%(エ\_s*[ーイア]\|ー\_s*ル\|イ\_s*\%(ー\_s*\%(ル\|ラ\_s*ー\)\|ッ\_s*\%(プ\|ス\_s*ル\|パ\_s*ー\|ト\_s*\%(ニ\_s*ー\|マ\_s*ン\)\)\)\|ワ\_s*\%(イ\|ッ\_s*[トツ]\)\)\|ベ\_s*ル\_s*ナ\_s*ー\|W\_s*\%(S\|N\_s*N\|y\_s*o\_s*m\_s*i\_s*n\_s*g\|O\_s*W\_s*O\_s*W\|I\_s*\%(D\_s*E\|N\_s*T\_s*E\_s*R\_s*P\_s*(\_s*W\_s*i\_s*d\_s*g\_s*e\_s*t\_s* \_s*I\_s*n\_s*t\_s*e\_s*r\_s*p\_s*r\_s*e\_s*t\_s*e\_s*r\_s*)\)\|i\_s*\%(s\_s*c\_s*o\_s*n\_s*s\_s*i\_s*n\|d\_s*g\_s*e\_s*t\|n\_s*d\_s*o\_s*w\_s*s\)\|h\_s*\%(y\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\|o\_s* \_s*d\_s*o\_s*n\_s*e\_s* \_s*i\_s*t\_s*?\)\|E\_s*B\_s*\%(ブ\_s*ラ\_s*ウ\_s*ザ\|マ\_s*ガ\_s*ジ\_s*ン\)\|e\_s*\%(s\_s*t\_s* \_s*V\_s*i\_s*r\_s*g\_s*i\_s*n\_s*i\_s*a\|b\_s*\%(ペ\_s*ー\_s*ジ\|ラ\_s*ジ\_s*オ\|コ\_s*ミ\_s*ッ\_s*ク\|サ\_s*\%(イ\_s*ト\|ー\_s*\%(バ\|ビ\_s*ス\)\)\|ド\_s*ラ\_s*マ\)\)\|a\_s*s\_s*h\_s*i\_s*n\_s*g\_s*t\_s*o\_s*n\|A\_s*V\_s*フ\_s*ァ\_s*イ\_s*ル\)\|警\_s*告\|Ｗ\_s*\%(杯\|ｎ\_s*ｎ\|ｉ\_s*ｎ\_s*ｋ\|ａ\_s*ｒ\_s*ｅ\)\|バ\_s*ル\_s*タ\_s*ー\|ヴ\_s*\%(ュ\_s*ル\_s*ツ\_s*ブ\_s*ル\_s*ク\|ォ\_s*ル\_s*フ\|ィ\_s*\%([ーム]\|ル\_s*\%(ム\|ヘ\_s*ル\_s*ム\)\)\|ェ\_s*\%(ン\_s*ダ\_s*ー\_s*ス\|ル\_s*ナ\_s*ー\|ー\_s*バ\_s*ー\|イ\_s*ユ\)\|ァ\_s*\%(イ\_s*[ンス]\|ー\_s*グ\_s*ナ\_s*ー\|ン\_s*ダ\|ル\_s*\%(タ\_s*ー\|キ\_s*ュ\_s*ー\_s*レ\)\)\)\|T\_s*\%(h\_s*e\_s* \_s*W\_s*o\_s*r\_s*l\_s*d\_s* \_s*W\_s*i\_s*d\_s*e\_s* \_s*W\_s*e\_s*b\_s* \_s*C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|u\_s*n\_s*g\_s*s\_s*t\_s*e\_s*n\)\|ダ\_s*ブ\_s*リ\_s*ュ\_s*ー\|タ\_s*ン\_s*グ\_s*ス\_s*テ\_s*ン\)',
+      \ 'x' : '\%([ｫォぉｪェぇｩゥぅｨィぃｧァぁｘξ×ХхΞx]\|ｯ\_s*[ｫｪｩｨｧ]\|ッ\_s*[ォェゥィァ]\|っ\_s*[ぉぇぅぃぁ]\|シ\_s*ロ\_s*\%(フ\_s*ォ\_s*ン\|ホ\_s*ン\)\|Ｘ\_s*\%([軸線]\|デ\_s*[イー]\|ｖ\_s*ｉ\_s*ｅ\_s*ｗ\|Ｓ\_s*サ\_s*イ\_s*ズ\|Ｌ\_s*\%(ｉ\_s*ｓ\_s*ｐ\|サ\_s*イ\_s*ズ\)\|ウ\_s*ィ\_s*ン\_s*ド\_s*ウ\|端\_s*末\)\|X\_s*\%([軸線]\|C\_s*o\_s*n\_s*s\_s*o\_s*r\_s*t\_s*i\_s*u\_s*m\|デ\_s*[イー]\|P\_s*S\_s*(\_s*e\_s*X\_s*p\_s*a\_s*n\_s*s\_s*i\_s*o\_s*n\_s* \_s*P\_s*a\_s*s\_s*s\_s*i\_s*n\_s*g\_s* \_s*S\_s*t\_s*y\_s*l\_s*e\_s*)\|S\_s*サ\_s*イ\_s*ズ\|l\_s*i\_s*b\|L\_s*\%(i\_s*s\_s*p\|サ\_s*イ\_s*ズ\)\|e\_s*n\_s*o\_s*n\)\|ジ\_s*オ\_s*ン\|ゼ\_s*\%(ビ\_s*ウ\_s*ス\|ロ\_s*\%(ッ\_s*ク\_s*ス\|グ\_s*ラ\_s*フ\_s*ィ\)\)\|ハ\_s*ビ\_s*エ\_s*ル\|ザ\_s*\%(ン\|ビ\_s*エ\_s*ル\)\|キ\_s*\%(シ\_s*\%(ロ\|レ\_s*ン\|リ\_s*ト\_s*ー\_s*ル\)\|セ\_s*ノ\_s*ン\|サ\_s*ン\_s*\%(チ\_s*ン\|タ\_s*ン\)\)\|E\_s*x\_s*t\_s*e\_s*n\_s*s\_s*i\_s*b\_s*l\_s*e\_s* \_s*M\_s*a\_s*r\_s*k\_s*u\_s*p\_s* \_s*L\_s*a\_s*n\_s*g\_s*u\_s*a\_s*g\_s*e\|ク\_s*\%(シ\_s*ー\|ロ\_s*ス\_s*ポ\_s*ス\_s*ト\|セ\_s*\%(ナ\_s*キ\_s*ス\|ノ\_s*フ\_s*ォ\_s*ン\)\|ザ\_s*ヴ\_s*ィ\_s*エ\|サ\_s*\%(イ\|ン\_s*\%(ト\_s*ス\|テ\_s*ィ\_s*ッ\_s*ペ\|チ\_s*ッ\_s*ペ\)\)\|リ\_s*ス\_s*マ\_s*ス\)\|エ\_s*\%(ク\_s*ス\|ッ\_s*ク\_s*ス\)\)',
+      \ 'y' : '\%([ﾖ艾蒿蓬娵嫁齡齢據頼弱歓憙鎧万萬過便婚汚涎捩峪杙翊緘慾欲翌翼抑米比裝粧装澱淀縦誼祥葭悦宜克純圭禎葦慶淑禧美喜芳吉義癰穃慂踴遙榕幺怏曄陶甬瀁燿珱踊暘廱樣蓉恙慵泱姚雍癢瑶昜瘍痒孕窰謠漾鷹瓔煬邀遥拗擁瑤窯徭膺窈殀耀曜庸夭揚葉蛹腰羊熔杳沃壅様妖溶用佯謡陽洋嘉宵蘇甦蘓奸辟横攀豫世与酔縒輿読讀訓預與喚予醉誉余憑能４舁蕷四譱畭譽餘撚呼詠除選飫歟丗代避よﾕ潤赦緩弛聴岼閖梦努纈∴故濯檠穰豐豊倖志裄之幸雪趾梼讓譲牀紫縁浴床攸犹黝俑邑熊猷悒酉蝣蚰囿莠尢蕕佳尤佑〒右郵涌祐侑游猶湧融宥夕幽悠釉友雄憂有楡油諭瘉汰徃柚逾揺弓踰諛愉瑜臾渝遊結覦腴由兪喩揃蝓淘揄輸茹征搖ゆｲηΗ賤鄙卑苟嫌妹湯芋藷夢艷鑪鈩彩鱗色鯆忽綺貸甍答応愈圦杁茵胤飮寅尹婬贇韵隱蚓氤酳霪蔭堙湮吋廴I音慇韻咽淫殞姻隕院允隠殷陰窟巖巌頌祝鰮鰛鰯岩磐鼾歪弋弑抱懐肬贅疣狗戌乾犬諱在坐未汝戒誡警縛今Εε曰禾稻員因蝗印嘶鰍電引躄誘動≦忿鵤錨碇怒霆霹雷凧桴筏Ιι魚菴庵雖尿荊棘茨祈祷命豕猯古伍聿乙鎰鴪軼樹慈悼愴慯労格到至傷鼬頂戴徒致鈑痛板柞沙砂聊些潔諍烈功諫勳勇勲漁諌憇＝憩粹熱粋憤域閾勢勤忙急磯孰焉湶泉厳何弄苛≧鎔范啀毬訝燻息指挑拠絲縷厭營営愛幼緒遑暇糸Ｉ弌壹肆莓苺櫟著市碑鐓礎甃臀弩石牲犧犠池溢佚壱1１鬻毓燠礇粥的戦戰軍郁幾一稲許否飯違居矮ゐ猪五煎彝醫斐逶貽善胆位萎可詑僞鑄熬活容依要斎行怡異衣入逝猗胃洟好矣鋳揖椅去惟云懿熨痿射凍移将囗肄夷率囲姨慰頤忌唯緯逸噫挿鮪伊偽苡彜莞往以韋遺炒謂李生威為維意倚良如彙出淹言亥鰄井蔚痍圍幃渭堰饐医爲癒帷恚偉委詒畏いﾔ稚稍飲鎗鑓槍孀寡鰥Я碼傭雇闇敗吝藪薮殕脂寄宿櫓軈軅簗梁S漸鋏刃灸軟柔和窶鱧奴僕萢優柳喧宅館舘輩族鏃鑰≒籥繹譯葯蜴檪藥龠扼益厄疫躍約役訳薬疾岾疚楊谺邪薯豺犲《》〈〉山邸壥廛豢養社鑢育尉寧廉裕恭泰易休康保安靖妬已瘠弥辭埜辞家輻矢痩屋灼笶八罷冶焼破夜爺谷也殺⇒病耶演⇔野燒遣彌熄椰止哉揶やｙеЕ円￥→↑↓←Ёё─━ユヤヨыイЙYΥυЫйy]\|ｯ\_s*[ﾖﾕｲﾔ]\|ッ\_s*[ヨユイヤ]\|っ\_s*[よゆいや]\|歐\_s*羅\_s*巴\|欧\_s*羅\_s*巴\|尸\_s*童\|蹌\_s*踉\|蹣\_s*跚\|終\_s*夜\|4\_s*\%([項者つ日]\|番\_s*目\|種\_s*類\)\|他\_s*所\|仁\_s*史\|隆\_s*克\|尚\_s*武\|孝\_s*高\|悌\_s*也\|彬\_s*伯\|賀\_s*[子悟]\|栄\_s*伸\|新\_s*生\|昌\_s*[美男]\|宗\_s*生\|暢\_s*[子一]\|永\_s*沈\|８\_s*日\|8\_s*日\|黄\_s*泉\|左\_s*手\|百\_s*合\|L\_s*i\_s*l\_s*i\_s*\%(o\_s*p\_s*s\_s*i\_s*d\_s*a\|a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\)\|Ｕ\_s*\%(字\|タ\_s*ー\_s*ン\)\|鞦\_s*韆\|強\_s*請\|梅\_s*桃\|桜\_s*桃\|靫\_s*負\|宙\_s*美\|礼\_s*暁\|温\_s*\%(雄\|泉\_s*津\)\|長\_s*庚\|昨\_s*夜\|又\_s*木\|木\_s*綿\|E\_s*\%(u\|メ\_s*ー\_s*ル\)\|祖\_s*谷\|文\_s*身\|郎\_s*[女子]\|蕁\_s*麻\|刺\_s*[青草]\|U\_s*\%(字\|タ\_s*ー\_s*ン\|r\_s*t\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\)\|海\_s*[豚参]\|西\_s*表\|鸚\_s*哥\|影\_s*[向青]\|況\_s*ん\_s*や\|所\_s*[以縁謂]\|D\_s*i\_s*a\_s*p\_s*e\_s*n\_s*s\_s*i\_s*a\_s*l\_s*e\_s*s\|藺\_s*草\|J\_s*u\_s*\%(l\_s*i\_s*a\_s*n\_s*i\_s*a\_s*l\_s*e\_s*s\|n\_s*c\_s*a\_s*l\_s*e\_s*s\)\|田\_s*舎\|膝\_s*行\|十\_s*六\_s*夜\|寝\_s*穢\|英\_s*\%([一桃蘭]\|吉\_s*利\)\|斑\_s*鳩\|烏\_s*賊\|玉\_s*筋\_s*魚\|硫\_s*黄\|N\_s*a\_s*j\_s*a\_s*d\_s*a\_s*l\_s*e\_s*s\|牛\_s*膝\|稜\_s*威\|常\_s*春\_s*藤\|5\_s*[つ日]\|５\_s*[つ日]\|惡\_s*戲\|甚\_s*振\|潮\_s*来\|悪\_s*戯\|交\_s*喙\|細\_s*小\_s*魚\|小\_s*魚\|鯨\_s*魚\|鶏\_s*魚\|経\_s*緯\|礒\_s*[山田]\|気\_s*吹\|Ｅ\_s*\%(Ａ\_s*Ｓ\_s*Ｔ\|Ｖ\_s*Ｅ\)\|従\_s*[弟妹姉兄]\|鴨\_s*脚\_s*樹\|公\_s*孫\_s*樹\|G\_s*\%(r\_s*a\_s*m\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*i\_s*f\_s*l\_s*o\_s*r\_s*a\_s*e\|i\_s*n\_s*k\_s*g\_s*o\_s*p\_s*s\_s*i\_s*d\_s*a\)\|銀\_s*杏\|鳶\_s*尾\|巫\_s*子\|神\_s*巫\|無\_s*花\_s*果\|睦\_s*月\|都\_s*方\_s*流\|縊\_s*[殺死首]\|蝟\_s*[集縮]\|埋\_s*け\_s*[火炭]\|不\_s*[可如]\|守\_s*宮\|燕\_s*龍\_s*茶\|両\_s*班\|流\_s*鏑\_s*馬\|柵\_s*原\|箭\_s*[田内]\|R\_s*a\_s*f\_s*f\_s*l\_s*e\_s*s\_s*i\_s*a\_s*\%(c\_s*e\_s*a\_s*e\|l\_s*e\_s*s\)\|自\_s*棄\|火\_s*傷\|徐\_s*ら\|M\_s*y\_s*r\_s*i\_s*c\_s*a\_s*l\_s*e\_s*s\|天\_s*蚕\|倭\_s*絵\|日\_s*本\_s*武\_s*尊\|大\_s*和\|T\_s*\%(h\_s*e\_s*l\_s*i\_s*g\_s*o\_s*n\_s*a\_s*l\_s*e\_s*s\|r\_s*o\_s*c\_s*h\_s*o\_s*d\_s*e\_s*n\_s*d\_s*r\_s*a\_s*c\_s*e\_s*a\_s*e\)\|香\_s*具\_s*師\|玄\_s*孫\|P\_s*\%(o\_s*a\_s*l\_s*e\_s*s\|l\_s*u\_s*m\_s*b\_s*a\_s*g\_s*i\_s*n\_s*a\_s*l\_s*e\_s*s\|a\_s*l\_s*m\_s*a\_s*l\_s*e\_s*s\|r\_s*\%(o\_s*t\_s*e\_s*a\_s*l\_s*e\_s*s\|i\_s*n\_s*c\_s*i\_s*p\_s*e\_s*s\)\)\|A\_s*r\_s*a\_s*c\_s*a\_s*l\_s*e\_s*s\|妥\_s*子\|寿\_s*[詞男]\|Ｙ\_s*\%([談軸]\|シ\_s*ャ\_s*ツ\)\|エ\_s*\%(ホ\_s*バ\|フ\_s*ゲ\_s*ニ\_s*ー\|レ\_s*ヴ\_s*ァ\_s*ン\|ニ\_s*セ\_s*イ\|ー\_s*ル\)\|ワ\_s*イ\)',
+      \ 'z' : '\%([空損存揃園薗底續束足屬∈∋賊続粟族俗属慥僧梍臧噌賍臟贓憎像臓贈象増造曾初沿曽反添ぞ譱然繕禪苒薇千蠕∀髯禅善漸冉前全關関蝉膳錢銭絶噬説勢筮贅脆税攻是責ぜ狡詰桷寸喘鮨附◆惴蘂膸蕋髓蕊隧隋隨瑞髄随厨付圖頭刷鶴津酢逗図廚豆好ず塩嶋島嶌縞橲竺衂衄宍舳忸軸舌祖喰食直凝日實昵印者闍鮭邪蛇麝着鉐惹搦尺雀寂若弱尻侭仞刄臣恁儘潯贐稔進盡仭糂訊俥蕁迅刃靱荏甚靭燼櫁樒塵尽尋陣腎壬人敍莇茹杼洳敘汝蜍耡恕舒縟褥蓐辱溽所抒鋤徐絮序叙助帖穰疂聶疊驤襄淨讓繩禳絛蕘諚仗壌滌繞生靜蟐壤仍茸嬲疉塲乘遶星瀞拯釀躡孃如醤剩娘嬢錠静醸縄女尉饒丈成烝擾嫋穣丞場杖條条蒸貞状攘畳剰冗定浄乗情城上常譲懦愀鷲竪嬬戍得濡咒讐讎就聚笋篤盾徇凖楯詢隼筍蓴惇洵淳閏恂諄馴旬荀潤循醇巡遵順准殉純準襦誦需朮戌宿孰塾珠熟恤術述豎孺呪儒綬樹受授壽揉從澀狃中戎拾廿鞣从縱澁糅蹂神汁獸絨縦渋柔什充十従獣住銃重事迩爺滋除怩尓痔璽至児士寿茲孳染嗣柱寺磁仕治死爾路而仁辞塒時岻粫持恃敷焦字只地轜侍瓷亊知辭餌冶邇弍似祀以子峙二史自畤兒示耳慈司蒔次珥膩じ騒澤沢猿笊晒皿曝鮫参算懴慘竄鏨山殘塹巉懺嶄讒惨暫慚慙斬残実笹酒坂盛三嵜崎桜榴襍雜棹竿雑斉濟西才済劑戝剤材財罪在覚座咲戯冴坐蔵左裂冷藏差醒挫ざｚ→↑ЪЬьъ↓←жЖズゾ零〇〒ザジζЗゼзΖz]\|ｯ\_s*\%(ｿ\_s*ﾞ\|ｾ\_s*ﾞ\|ｽ\_s*ﾞ\|ｼ\_s*ﾞ\|ｻ\_s*ﾞ\)\|ッ\_s*[ゾゼズジザ]\|っ\_s*[ぞぜずじざ]\|ｿ\_s*ﾞ\|簇\_s*生\|双\_s*紙\|草\_s*[履子紙]\|ｾ\_s*ﾞ\|台\_s*詞\|０\_s*次\|撥\_s*条\|発\_s*条\|發\_s*条\|世\_s*阿\_s*弥\|ｽ\_s*ﾞ\|相\_s*撲\|木\_s*菟\|修\_s*法\|杜\_s*撰\|調\_s*所\|徒\_s*[罪刑]\|螟\_s*虫\|芋\_s*茎\|F\_s*i\_s*g\_s*u\_s*r\_s*e\|ｼ\_s*ﾞ\|G\_s*\%(メ\_s*ン\|パ\_s*ン\)\|D\_s*y\|Ｇ\_s*\%(メ\_s*ン\|パ\_s*ン\)\|支\_s*度\|試\_s*合\|２\_s*乗\|2\_s*乗\|J\_s*\%(I\_s*S\_s*コ\_s*ー\_s*ド\|ポ\_s*ッ\_s*プ\|R\_s*東\_s*日\_s*本\)\|獅\_s*子\|甲\_s*乙\_s*丙\_s*丁\_s*戊\_s*己\_s*庚\_s*辛\_s*壬\_s*癸\|k\_s*\$\_s*_\_s*{\_s*e\_s*f\_s*f\_s*}\_s*\$\|爪\_s*哇\|射\_s*礼\|砂\_s*利\|謝\_s*花\|著\_s*語\|杓\_s*子\|深\_s*\%(秘\|大\_s*寺\)\|秦\_s*泉\_s*寺\|沈\_s*\%(香\|丁\_s*花\)\|晨\_s*朝\|濁\_s*世\|判\_s*官\|諍\_s*論\|長\_s*夜\|漏\_s*斗\|焼\_s*酎\|鐘\_s*石\|橈\_s*脚\_s*類\|承\_s*久\|朱\_s*里\|C\_s*a\_s*b\_s*o\_s*m\_s*b\_s*o\_s*i\_s*d\_s*e\_s*a\_s*e\|Ｊ\_s*\%(リ\_s*ー\_s*グ\|ポ\_s*ッ\_s*プ\|Ｕ\_s*Ｎ\_s*Ｋ\_s*Ｏ\)\|絢\_s*子\|頌\_s*偈\|数\_s*珠\|入\_s*[魂牢来洛院内水棺]\|霜\_s*月\|１\_s*\%(２\|６\_s*進\|０\_s*[進月]\|１\_s*月\|８\_s*禁\)\|師\_s*走\|極\_s*月\|紐\_s*帯\|1\_s*\%(0\|1\_s*月\|8\_s*禁\|2\_s*月\)\|ｻ\_s*ﾞ\|搾\_s*菜\|蜊\_s*蛄\|粗\_s*目\|槧\_s*本\|散\_s*切\_s*り\|沙\_s*汰\|柘\_s*榴\|石\_s*榴\|細\_s*工\|亜\_s*鉛\|サ\_s*\%(モ\_s*ラ\|ン\_s*ポ\_s*ー\_s*ニ\_s*ャ\|ラ\_s*ゴ\_s*サ\)\|Z\_s*\%([r軸]\|i\_s*\%(r\_s*c\_s*o\_s*n\_s*i\_s*u\_s*m\|n\_s*c\)\|ガ\_s*ン\_s*ダ\_s*ム\|バ\_s*ッ\_s*フ\_s*ァ\|I\_s*P\_s*フ\_s*ァ\_s*イ\_s*ル\)\|シ\_s*\%(タ\_s*ー\_s*ル\|オ\_s*\%(ン\|ニ\_s*\%(ス\_s*ト\|ズ\_s*ム\)\)\)\|Ｚ\_s*\%([旗軸]\|変\_s*換\|ｉ\_s*ｇ\_s*ｇ\_s*ｙ\)\|ツ\_s*\%(ァ\_s*\%(ラ\_s*ト\_s*ゥ\_s*ス\_s*ト\_s*ラ\|イ\_s*ト\)\|ェ\_s*\%(ナ\_s*ー\|ッ\_s*ペ\_s*リ\_s*ン\|ル\_s*マ\_s*ッ\_s*ト\)\|ィ\_s*\%(ク\_s*ル\_s*ス\|タ\_s*ー\|ー\_s*グ\_s*ラ\_s*ー\|ン\_s*\%(バ\_s*ロ\_s*ン\|マ\_s*ー\_s*マ\_s*ン\)\|ゴ\_s*イ\_s*ネ\_s*ル\)\)\|チ\_s*\%(ク\_s*ル\_s*ス\|ア\_s*ノ\_s*ー\_s*ゼ\|ュ\_s*ー\_s*リ\_s*\%(ヒ\|ッ\_s*ヒ\)\|ャ\_s*ル\_s*ダ\_s*ッ\_s*シ\_s*ュ\|ゴ\_s*イ\_s*ネ\_s*ル\_s*ワ\_s*イ\_s*ゼ\_s*ン\)\)',
+      \ '{' : '[｛{]',
+      \ '|' : '[├┣｜‖│┃|]',
+      \ '}' : '[｝}]',
+      \ '~' : '[¬〜￣~]',
+    \ }
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/overwin.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/overwin.vim
new file mode 100644
index 0000000..ea4d425
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/overwin.vim
@@ -0,0 +1,27 @@
+let s:V = vital#easymotion#new()
+let s:HitAHintMotion = s:V.import('HitAHint.Motion')
+
+call EasyMotion#init()
+
+function! EasyMotion#overwin#move(pattern) abort
+  return s:HitAHintMotion.move(a:pattern, {
+  \   'keys': g:EasyMotion_keys,
+  \   'use_upper': g:EasyMotion_use_upper,
+  \   'highlight': {
+  \     'shade': g:EasyMotion_hl_group_shade,
+  \     'target': g:EasyMotion_hl_group_target,
+  \   },
+  \   'jump_first_target_keys':
+  \     (g:EasyMotion_enter_jump_first ? ["\<CR>"] : []) +
+  \     (g:EasyMotion_space_jump_first ? ["\<Space>"] : []),
+  \   'do_shade': g:EasyMotion_do_shade,
+  \ })
+endfunction
+
+function! EasyMotion#overwin#line() abort
+  return EasyMotion#overwin#move('^')
+endfunction
+
+function! EasyMotion#overwin#w() abort
+  return EasyMotion#overwin#move('\(\<.\|^$\)')
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim b/vim/plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim
new file mode 100644
index 0000000..7e962c8
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/EasyMotion/sticky_table.vim
@@ -0,0 +1,24 @@
+" Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+"
+let EasyMotion#sticky_table#us = {
+      \',' : '<', '.' : '>', '/' : '?',
+      \'1' : '!', '2' : '@', '3' : '#', '4' : '$', '5' : '%',
+      \'6' : '^', '7' : '&', '8' : '*', '9' : '(', '0' : ')', '-' : '_', '=' : '+',
+      \';' : ':', '[' : '{', ']' : '}', '`' : '~', "'" : "\"", '\' : '|',
+      \}
+
+let EasyMotion#sticky_table#jp = {
+      \',' : '<', '.' : '>', '/' : '?',
+      \'1' : '!', '2' : '"', '3' : '#', '4' : '$', '5' : '%',
+      \'6' : '&', '7' : "'", '8' : '(', '9' : ')', '0' : '_', '-' : '=', '^' : '~',
+      \';' : '+', ':' : '*', '[' : '{', ']' : '}', '@' : '`', '\' : '|',
+      \}
+
+" Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/autoload/vital.vim b/vim/plugins/vim-easymotion/autoload/vital.vim
new file mode 100644
index 0000000..f1ba849
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital.vim
@@ -0,0 +1,12 @@
+function! vital#of(name) abort
+  let files = globpath(&runtimepath, 'autoload/vital/' . a:name . '.vital', 1)
+  let file = split(files, "\n")
+  if empty(file)
+    throw 'vital: version file not found: ' . a:name
+  endif
+  let ver = readfile(file[0], 'b')
+  if empty(ver)
+    throw 'vital: invalid version file: ' . a:name
+  endif
+  return vital#_{substitute(ver[0], '\W', '', 'g')}#new()
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion.vim
new file mode 100644
index 0000000..9eba177
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion.vim
@@ -0,0 +1,5 @@
+let s:_plugin_name = expand('<sfile>:t:r')
+
+function! vital#{s:_plugin_name}#new() abort
+  return vital#{s:_plugin_name[1:]}#new()
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim
new file mode 100644
index 0000000..482886d
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Dict.vim
@@ -0,0 +1,116 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Data#Dict#import() abort
+    return map({'pick': '', 'clear': '', 'max_by': '', 'foldl': '', 'swap': '', 'omit': '', 'min_by': '', 'foldr': '', 'make_index': '', 'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Data#Dict#import() abort', printf("return map({'pick': '', 'clear': '', 'max_by': '', 'foldl': '', 'swap': '', 'omit': '', 'min_by': '', 'foldr': '', 'make_index': '', 'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+" Utilities for dictionary.
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Makes a dict from keys and values
+function! s:make(keys, values, ...) abort
+  let dict = {}
+  let fill = a:0 ? a:1 : 0
+  for i in range(len(a:keys))
+    let key = type(a:keys[i]) == type('') ? a:keys[i] : string(a:keys[i])
+    if key ==# ''
+      throw "vital: Data.Dict: Can't use an empty string for key."
+    endif
+    let dict[key] = get(a:values, i, fill)
+  endfor
+  return dict
+endfunction
+
+" Swaps keys and values
+function! s:swap(dict) abort
+  return s:make(values(a:dict), keys(a:dict))
+endfunction
+
+" Makes a index dict from a list
+function! s:make_index(list, ...) abort
+  let value = a:0 ? a:1 : 1
+  return s:make(a:list, [], value)
+endfunction
+
+function! s:pick(dict, keys) abort
+  let new_dict = {}
+  for key in a:keys
+    if has_key(a:dict, key)
+      let new_dict[key] = a:dict[key]
+    endif
+  endfor
+  return new_dict
+endfunction
+
+function! s:omit(dict, keys) abort
+  let new_dict = copy(a:dict)
+  for key in a:keys
+    if has_key(a:dict, key)
+      call remove(new_dict, key)
+    endif
+  endfor
+  return new_dict
+endfunction
+
+function! s:clear(dict) abort
+  for key in keys(a:dict)
+    call remove(a:dict, key)
+  endfor
+  return a:dict
+endfunction
+
+function! s:_max_by(dict, expr) abort
+  let dict = s:swap(map(copy(a:dict), a:expr))
+  let key = dict[max(keys(dict))]
+  return [key, a:dict[key]]
+endfunction
+
+function! s:max_by(dict, expr) abort
+  if empty(a:dict)
+    throw 'vital: Data.Dict: Empty dictionary'
+  endif
+  return s:_max_by(a:dict, a:expr)
+endfunction
+
+function! s:min_by(dict, expr) abort
+  if empty(a:dict)
+    throw 'vital: Data.Dict: Empty dictionary'
+  endif
+  return s:_max_by(a:dict, '-(' . a:expr . ')')
+endfunction
+
+function! s:_foldl(f, init, xs) abort
+  let memo = a:init
+  for [k, v] in a:xs
+    let expr = substitute(a:f, 'v:key', string(k), 'g')
+    let expr = substitute(expr, 'v:val', string(v), 'g')
+    let expr = substitute(expr, 'v:memo', string(memo), 'g')
+    unlet memo
+    let memo = eval(expr)
+  endfor
+  return memo
+endfunction
+
+function! s:foldl(f, init, dict) abort
+  return s:_foldl(a:f, a:init, items(a:dict))
+endfunction
+
+function! s:foldr(f, init, dict) abort
+  return s:_foldl(a:f, a:init, reverse(items(a:dict)))
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim
new file mode 100644
index 0000000..2302cd8
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/List.vim
@@ -0,0 +1,457 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Data#List#import() abort
+    return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'map_accum': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'shift': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Data#List#import() abort', printf("return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'map_accum': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'shift': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+" Utilities for list.
+
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! s:pop(list) abort
+  return remove(a:list, -1)
+endfunction
+
+function! s:push(list, val) abort
+  call add(a:list, a:val)
+  return a:list
+endfunction
+
+function! s:shift(list) abort
+  return remove(a:list, 0)
+endfunction
+
+function! s:unshift(list, val) abort
+  return insert(a:list, a:val)
+endfunction
+
+function! s:cons(x, xs) abort
+  return [a:x] + a:xs
+endfunction
+
+function! s:conj(xs, x) abort
+  return a:xs + [a:x]
+endfunction
+
+" Removes duplicates from a list.
+function! s:uniq(list) abort
+  return s:uniq_by(a:list, 'v:val')
+endfunction
+
+" Removes duplicates from a list.
+function! s:uniq_by(list, f) abort
+  let list = map(copy(a:list), printf('[v:val, %s]', a:f))
+  let i = 0
+  let seen = {}
+  while i < len(list)
+    let key = string(list[i][1])
+    if has_key(seen, key)
+      call remove(list, i)
+    else
+      let seen[key] = 1
+      let i += 1
+    endif
+  endwhile
+  return map(list, 'v:val[0]')
+endfunction
+
+function! s:clear(list) abort
+  if !empty(a:list)
+    unlet! a:list[0 : len(a:list) - 1]
+  endif
+  return a:list
+endfunction
+
+" Concatenates a list of lists.
+" XXX: Should we verify the input?
+function! s:concat(list) abort
+  let memo = []
+  for Value in a:list
+    let memo += Value
+  endfor
+  return memo
+endfunction
+
+" Take each elements from lists to a new list.
+function! s:flatten(list, ...) abort
+  let limit = a:0 > 0 ? a:1 : -1
+  let memo = []
+  if limit == 0
+    return a:list
+  endif
+  let limit -= 1
+  for Value in a:list
+    let memo +=
+          \ type(Value) == type([]) ?
+          \   s:flatten(Value, limit) :
+          \   [Value]
+    unlet! Value
+  endfor
+  return memo
+endfunction
+
+" Sorts a list with expression to compare each two values.
+" a:a and a:b can be used in {expr}.
+function! s:sort(list, expr) abort
+  if type(a:expr) == type(function('function'))
+    return sort(a:list, a:expr)
+  endif
+  let s:expr = a:expr
+  return sort(a:list, 's:_compare')
+endfunction
+
+function! s:_compare(a, b) abort
+  return eval(s:expr)
+endfunction
+
+" Sorts a list using a set of keys generated by mapping the values in the list
+" through the given expr.
+" v:val is used in {expr}
+function! s:sort_by(list, expr) abort
+  let pairs = map(a:list, printf('[v:val, %s]', a:expr))
+  return map(s:sort(pairs,
+  \      'a:a[1] ==# a:b[1] ? 0 : a:a[1] ># a:b[1] ? 1 : -1'), 'v:val[0]')
+endfunction
+
+" Returns a maximum value in {list} through given {expr}.
+" Returns 0 if {list} is empty.
+" v:val is used in {expr}
+function! s:max_by(list, expr) abort
+  if empty(a:list)
+    return 0
+  endif
+  let list = map(copy(a:list), a:expr)
+  return a:list[index(list, max(list))]
+endfunction
+
+" Returns a minimum value in {list} through given {expr}.
+" Returns 0 if {list} is empty.
+" v:val is used in {expr}
+" FIXME: -0x80000000 == 0x80000000
+function! s:min_by(list, expr) abort
+  return s:max_by(a:list, '-(' . a:expr . ')')
+endfunction
+
+" Returns List of character sequence between [a:from, a:to]
+" e.g.: s:char_range('a', 'c') returns ['a', 'b', 'c']
+function! s:char_range(from, to) abort
+  return map(
+  \   range(char2nr(a:from), char2nr(a:to)),
+  \   'nr2char(v:val)'
+  \)
+endfunction
+
+" Returns true if a:list has a:value.
+" Returns false otherwise.
+function! s:has(list, value) abort
+  return index(a:list, a:value) isnot -1
+endfunction
+
+" Returns true if a:list[a:index] exists.
+" Returns false otherwise.
+" NOTE: Returns false when a:index is negative number.
+function! s:has_index(list, index) abort
+  " Return true when negative index?
+  " let index = a:index >= 0 ? a:index : len(a:list) + a:index
+  return 0 <= a:index && a:index < len(a:list)
+endfunction
+
+" similar to Haskell's Data.List.span
+function! s:span(f, xs) abort
+  let border = len(a:xs)
+  for i in range(len(a:xs))
+    if !eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
+      let border = i
+      break
+    endif
+  endfor
+  return border == 0 ? [[], copy(a:xs)] : [a:xs[: border - 1], a:xs[border :]]
+endfunction
+
+" similar to Haskell's Data.List.break
+function! s:break(f, xs) abort
+  return s:span(printf('!(%s)', a:f), a:xs)
+endfunction
+
+" similar to Haskell's Data.List.takeWhile
+function! s:take_while(f, xs) abort
+  return s:span(a:f, a:xs)[0]
+endfunction
+
+" similar to Haskell's Data.List.partition
+function! s:partition(f, xs) abort
+  return [filter(copy(a:xs), a:f), filter(copy(a:xs), '!(' . a:f . ')')]
+endfunction
+
+" similar to Haskell's Prelude.all
+function! s:all(f, xs) abort
+  return !s:any(printf('!(%s)', a:f), a:xs)
+endfunction
+
+" similar to Haskell's Prelude.any
+function! s:any(f, xs) abort
+  return !empty(filter(map(copy(a:xs), a:f), 'v:val'))
+endfunction
+
+" similar to Haskell's Prelude.and
+function! s:and(xs) abort
+  return s:all('v:val', a:xs)
+endfunction
+
+" similar to Haskell's Prelude.or
+function! s:or(xs) abort
+  return s:any('v:val', a:xs)
+endfunction
+
+function! s:map_accum(expr, xs, init) abort
+  let memo = []
+  let init = a:init
+  for x in a:xs
+    let expr = substitute(a:expr, 'v:memo', init, 'g')
+    let expr = substitute(expr, 'v:val', x, 'g')
+    let [tmp, init] = eval(expr)
+    call add(memo, tmp)
+  endfor
+  return memo
+endfunction
+
+" similar to Haskell's Prelude.foldl
+function! s:foldl(f, init, xs) abort
+  let memo = a:init
+  for x in a:xs
+    let expr = substitute(a:f, 'v:val', string(x), 'g')
+    let expr = substitute(expr, 'v:memo', string(memo), 'g')
+    unlet memo
+    let memo = eval(expr)
+  endfor
+  return memo
+endfunction
+
+" similar to Haskell's Prelude.foldl1
+function! s:foldl1(f, xs) abort
+  if len(a:xs) == 0
+    throw 'vital: Data.List: foldl1'
+  endif
+  return s:foldl(a:f, a:xs[0], a:xs[1:])
+endfunction
+
+" similar to Haskell's Prelude.foldr
+function! s:foldr(f, init, xs) abort
+  return s:foldl(a:f, a:init, reverse(copy(a:xs)))
+endfunction
+
+" similar to Haskell's Prelude.fold11
+function! s:foldr1(f, xs) abort
+  if len(a:xs) == 0
+    throw 'vital: Data.List: foldr1'
+  endif
+  return s:foldr(a:f, a:xs[-1], a:xs[0:-2])
+endfunction
+
+" similar to python's zip()
+function! s:zip(...) abort
+  return map(range(min(map(copy(a:000), 'len(v:val)'))), "map(copy(a:000), 'v:val['.v:val.']')")
+endfunction
+
+" similar to zip(), but goes until the longer one.
+function! s:zip_fill(xs, ys, filler) abort
+  if empty(a:xs) && empty(a:ys)
+    return []
+  elseif empty(a:ys)
+    return s:cons([a:xs[0], a:filler], s:zip_fill(a:xs[1 :], [], a:filler))
+  elseif empty(a:xs)
+    return s:cons([a:filler, a:ys[0]], s:zip_fill([], a:ys[1 :], a:filler))
+  else
+    return s:cons([a:xs[0], a:ys[0]], s:zip_fill(a:xs[1 :], a:ys[1: ], a:filler))
+  endif
+endfunction
+
+" Inspired by Ruby's with_index method.
+function! s:with_index(list, ...) abort
+  let base = a:0 > 0 ? a:1 : 0
+  return map(copy(a:list), '[v:val, v:key + base]')
+endfunction
+
+" similar to Ruby's detect or Haskell's find.
+function! s:find(list, default, f) abort
+  for x in a:list
+    if eval(substitute(a:f, 'v:val', string(x), 'g'))
+      return x
+    endif
+  endfor
+  return a:default
+endfunction
+
+" Returns the index of the first element which satisfies the given expr.
+function! s:find_index(xs, f, ...) abort
+  let len = len(a:xs)
+  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : 0
+  let default = a:0 > 1 ? a:2 : -1
+  if start >=# len || start < 0
+    return default
+  endif
+  for i in range(start, len - 1)
+    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
+      return i
+    endif
+  endfor
+  return default
+endfunction
+
+" Returns the index of the last element which satisfies the given expr.
+function! s:find_last_index(xs, f, ...) abort
+  let len = len(a:xs)
+  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : len - 1
+  let default = a:0 > 1 ? a:2 : -1
+  if start >=# len || start < 0
+    return default
+  endif
+  for i in range(start, 0, -1)
+    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
+      return i
+    endif
+  endfor
+  return default
+endfunction
+
+" Similar to find_index but returns the list of indices satisfying the given expr.
+function! s:find_indices(xs, f, ...) abort
+  let len = len(a:xs)
+  let start = a:0 > 0 ? (a:1 < 0 ? len + a:1 : a:1) : 0
+  let result = []
+  if start >=# len || start < 0
+    return result
+  endif
+  for i in range(start, len - 1)
+    if eval(substitute(a:f, 'v:val', string(a:xs[i]), 'g'))
+      call add(result, i)
+    endif
+  endfor
+  return result
+endfunction
+
+" Return non-zero if a:list1 and a:list2 have any common item(s).
+" Return zero otherwise.
+function! s:has_common_items(list1, list2) abort
+  return !empty(filter(copy(a:list1), 'index(a:list2, v:val) isnot -1'))
+endfunction
+
+function! s:intersect(list1, list2) abort
+  let items = []
+  " for funcref
+  for X in a:list1
+    if index(a:list2, X) != -1 && index(items, X) == -1
+      let items += [X]
+    endif
+  endfor
+  return items
+endfunction
+
+" similar to Ruby's group_by.
+function! s:group_by(xs, f) abort
+  let result = {}
+  let list = map(copy(a:xs), printf('[v:val, %s]', a:f))
+  for x in list
+    let Val = x[0]
+    let key = type(x[1]) !=# type('') ? string(x[1]) : x[1]
+    if has_key(result, key)
+      call add(result[key], Val)
+    else
+      let result[key] = [Val]
+    endif
+    unlet Val
+  endfor
+  return result
+endfunction
+
+function! s:_default_compare(a, b) abort
+  return a:a <# a:b ? -1 : a:a ># a:b ? 1 : 0
+endfunction
+
+function! s:binary_search(list, value, ...) abort
+  let Predicate = a:0 >= 1 ? a:1 : 's:_default_compare'
+  let dic = a:0 >= 2 ? a:2 : {}
+  let start = 0
+  let end = len(a:list) - 1
+
+  while 1
+    if start > end
+      return -1
+    endif
+
+    let middle = (start + end) / 2
+
+    let compared = call(Predicate, [a:value, a:list[middle]], dic)
+
+    if compared < 0
+      let end = middle - 1
+    elseif compared > 0
+      let start = middle + 1
+    else
+      return middle
+    endif
+  endwhile
+endfunction
+
+function! s:product(lists) abort
+  let result = [[]]
+  for pool in a:lists
+    let tmp = []
+    for x in result
+      let tmp += map(copy(pool), 'x + [v:val]')
+    endfor
+    let result = tmp
+  endfor
+  return result
+endfunction
+
+function! s:permutations(list, ...) abort
+  if a:0 > 1
+    throw 'vital: Data.List: too many arguments'
+  endif
+  let r = a:0 == 1 ? a:1 : len(a:list)
+  if r > len(a:list)
+    return []
+  elseif r < 0
+    throw 'vital: Data.List: {r} must be non-negative integer'
+  endif
+  let n = len(a:list)
+  let result = []
+  for indices in s:product(map(range(r), 'range(n)'))
+    if len(s:uniq(indices)) == r
+      call add(result, map(indices, 'a:list[v:val]'))
+    endif
+  endfor
+  return result
+endfunction
+
+function! s:combinations(list, r) abort
+  if a:r > len(a:list)
+    return []
+  elseif a:r < 0
+    throw 'vital: Data:List: {r} must be non-negative integer'
+  endif
+  let n = len(a:list)
+  let result = []
+  for indices in s:permutations(range(n), a:r)
+    if s:sort(copy(indices), 'a:a - a:b') == indices
+      call add(result, map(indices, 'a:list[v:val]'))
+    endif
+  endfor
+  return result
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim
new file mode 100644
index 0000000..e9191bc
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Data/Set.vim
@@ -0,0 +1,284 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Data#Set#import() abort
+    return map({'set': '', 'frozenset': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Data#Set#import() abort', printf("return map({'set': '', 'frozenset': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:TRUE = !0
+let s:FALSE = 0
+
+function! s:set(...) abort
+  return call(s:set._new, a:000, s:set)
+endfunction
+
+function! s:frozenset(...) abort
+  return call(s:frozenset._new, a:000, s:frozenset)
+endfunction
+
+function! s:_hash_func(x) abort
+  return a:x
+endfunction
+
+let s:_base_set = {
+\   '_is_set' : s:TRUE,
+\   '_data' : {},
+\   '_hash_func' : function('s:_hash_func')
+\ }
+
+function! s:_base_set._new(...) abort
+  let obj = deepcopy(self)
+  let xs = get(a:, 1, [])
+  let obj._hash_func = get(a:, 2, obj._hash_func)
+  call obj._set_data(xs)
+  return obj
+endfunction
+
+"" Return the union of two sets as a new set.
+" (I.e. all elements that are in either set.)
+function! s:_base_set.union(t) abort
+  let r = deepcopy(self)
+  call r._update(a:t)
+  return r
+endfunction
+let s:_base_set.or = s:_base_set.union
+
+"" Return the intersection of two sets as a new set.
+" (I.e. all elements that are in both sets.)
+function! s:_base_set.intersection(t) abort
+  let t = self._to_set(a:t)
+  let [little, big] = self.len() <= t.len() ? [self, t] : [t, self]
+  return self._new(filter(copy(big.to_list()), 'little.in(v:val)'))
+endfunction
+let s:_base_set.and = s:_base_set.intersection
+
+"" Return the symmetric difference of two sets as a new set.
+" (I.e. all elements that are in exactly one of the sets.)
+function! s:_base_set.symmetric_difference(t) abort
+  let t = self._to_set(a:t)
+  return self._new(filter(copy(self.to_list()), '!t.in(v:val)')
+  \              + filter(copy(t.to_list()), '!self.in(v:val)'))
+endfunction
+let s:_base_set.xor = s:_base_set.symmetric_difference
+
+"" Return the difference of two sets as a new Set.
+function! s:_base_set.difference(t) abort
+  let t = self._to_set(a:t)
+  return self._new(filter(copy(self.to_list()), '!t.in(v:val)'))
+endfunction
+let s:_base_set.sub = s:_base_set.difference
+
+"" Report whether another set contains this set.
+function! s:_base_set.issubset(t) abort
+  let t = self._to_set(a:t)
+  return self.len() > t.len() ? s:FALSE
+  \   : empty(filter(copy(self.to_list()), '!t.in(v:val)'))
+endfunction
+
+"" Report whether this set contains another set.
+function! s:_base_set.issuperset(t) abort
+  let t = self._to_set(a:t)
+  return self.len() < t.len() ? s:FALSE
+  \   : empty(filter(copy(t.to_list()), '!self.in(v:val)'))
+endfunction
+
+" less than equal & greater than equal
+let s:_base_set.le = s:_base_set.issubset
+let s:_base_set.ge = s:_base_set.issuperset
+
+" less than
+function! s:_base_set.lt(t) abort
+  let t = self._to_set(a:t)
+  return self.len() < t.len() && self.issubset(t)
+endfunction
+
+" greater than
+function! s:_base_set.gt(t) abort
+  let t = self._to_set(a:t)
+  return self.len() > t.len() && self.issuperset(t)
+endfunction
+
+function! s:_base_set.len() abort
+  return len(self._data)
+endfunction
+
+function! s:_base_set.to_list() abort
+  return values(self._data)
+endfunction
+
+function! s:_base_set._update(xs) abort
+  for X in (s:_is_set(a:xs) ? a:xs.to_list() : a:xs)
+    call self._add(X)
+    unlet X
+  endfor
+endfunction
+
+function! s:_base_set._add(x) abort
+  let key = self._hash(a:x)
+  if !has_key(self._data, key)
+    let self._data[key] = a:x
+  endif
+endfunction
+
+" Report whether an element is a member of a set.
+function! s:_base_set.in(x) abort
+  return has_key(self._data, self._hash(a:x))
+endfunction
+
+function! s:_base_set._to_set(x) abort
+  return s:_is_set(a:x) ? a:x : self._new(a:x)
+endfunction
+
+function! s:_base_set._clear() abort
+  let self._data = {}
+endfunction
+
+function! s:_base_set._set_data(xs) abort
+  call self._clear()
+  call self._update(a:xs)
+endfunction
+
+function! s:_base_set._hash(x) abort
+  return string(self._hash_func(a:x))
+endfunction
+
+" frozenset: Immutable set class.
+
+let s:frozenset = deepcopy(s:_base_set)
+
+" Set: Mutable set class.
+
+let s:set = deepcopy(s:_base_set)
+
+" Update a set with the union of itself and another.
+function! s:set.update(iterable) abort
+  call self._update(a:iterable)
+endfunction
+
+" Update a set with the union of itself and another.
+function! s:set.ior(t) abort
+  call self.update(a:t)
+  return self
+endfunction
+
+" Update a set with the intersection of itself and another.
+function! s:set.intersection_update(t) abort
+  let r = self.and(a:t).to_list()
+  call self.clear()
+  call self.update(r)
+endfunction
+
+" Update a set with the intersection of itself and another.
+function! s:set.iand(t) abort
+  call self.intersection_update(a:t)
+  return self
+endfunction
+
+" Update a set with the symmetric difference of itself and another.
+function! s:set.symmetric_difference_update(t) abort
+  let t = self._to_set(a:t)
+  if self is t
+    call self.clear()
+    return
+  endif
+  for X in t.to_list()
+    if self.in(X)
+      call self.remove(X)
+    else
+      call self._add(X)
+    endif
+    unlet X
+  endfor
+endfunction
+
+" Update a set with the symmetric difference of itself and another.
+function! s:set.ixor(t) abort
+  call self.symmetric_difference_update(a:t)
+  return self
+endfunction
+
+" Remove all elements of another set from this set.
+function! s:set.difference_update(t) abort
+  let t = self._to_set(a:t)
+  if self is t
+    call self.clear()
+    return
+  endif
+  for X in filter(t.to_list(), 'self.in(v:val)')
+    call self.remove(X)
+    unlet X
+  endfor
+endfunction
+
+" Remove all elements of another set from this set.
+function! s:set.isub(t) abort
+  call self.difference_update(a:t)
+  return self
+endfunction
+
+" Remove all elements from this set.
+function! s:set.clear() abort
+  call self._clear()
+endfunction
+
+"" Add an element to a set.
+" This has no effect if the element is already present.
+function! s:set.add(x) abort
+  return self._add(a:x)
+endfunction
+
+"" Remove an element from a set; it must be a member.
+" If the element is not a member, throw Exception.
+function! s:set.remove(e) abort
+  try
+    unlet self._data[self._hash(a:e)]
+  catch /^Vim\%((\a\+)\)\?:E716/
+    call s:_throw('the element is not a member')
+  endtry
+endfunction
+
+"" Remove an element from a set if it is a member.
+" If the element is not a member, do nothing.
+function! s:set.discard(e) abort
+  try
+    call self.remove(a:e)
+  catch /vital: Data.Set: the element is not a member/
+    " Do nothing
+  endtry
+endfunction
+
+" Remove and return an arbitrary set element.
+function! s:set.pop() abort
+  try
+    let k = keys(self._data)[0]
+  catch /^Vim\%((\a\+)\)\?:E684/
+    call s:_throw('set is empty')
+  endtry
+  let v = self._data[k]
+  unlet self._data[k]
+  return v
+endfunction
+
+" Helper:
+
+function! s:_is_set(x) abort
+  return type(a:x) is type({}) && get(a:x, '_is_set', s:FALSE)
+endfunction
+
+function! s:_throw(message) abort
+  throw 'vital: Data.Set: ' . a:message
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim
new file mode 100644
index 0000000..5735e4c
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Hint.vim
@@ -0,0 +1,126 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#HitAHint#Hint#import() abort
+    return map({'create': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#HitAHint#Hint#import() abort', printf("return map({'create': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+" function() wrapper
+if v:version > 703 || v:version == 703 && has('patch1170')
+  let s:_function = function('function')
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  let s:_s = '<SNR>' . s:_SID() . '_'
+  function! s:_function(fstr) abort
+    return function(substitute(a:fstr, 's:', s:_s, 'g'))
+  endfunction
+endif
+
+function! s:_assert(...) abort
+  return ''
+endfunction
+
+function! s:_vital_loaded(V) abort
+  if a:V.exists('Vim.PowerAssert')
+    let s:assert = a:V.import('Vim.PowerAssert').assert
+  else
+    let s:assert = s:_function('s:_assert')
+  endif
+endfunction
+
+" TERMS:
+"   key: A character to generate hint. e.g. a,b,c,d,e,f,...
+"   hint: A hint is a combination of keys. e.g. a,b,ab,abc,..
+
+" s:create() assigns keys to each targets and generate hint dict.
+" Example:
+"   let targets = [1, 2, 3, 4, 5, 6]
+"   echo s:label(targets, ['a', 'b', 'c'])
+"   " => {
+"     'a': 1,
+"     'b': {
+"       'a': 2,
+"       'b': 3
+"     },
+"     'c': {
+"       'a': 4,
+"       'b': 5,
+"       'c': 6
+"     }
+"   }
+"   Hint-to-target:
+"     a  -> 1
+"     ba -> 2
+"     bb -> 3
+"     ca -> 4
+"     cb -> 5
+"     cc -> 6
+" @param {list<T>} targets
+" @param {list<string>} keys each key should be uniq
+" @return Tree{string: (T|Tree)}
+function! s:create(targets, keys) abort
+  exe s:assert('len(a:keys) > 1')
+  let groups = {}
+  let keys_count = reverse(s:_keys_count(len(a:targets), len(a:keys)))
+
+  let target_idx = 0
+  let key_idx = 0
+  for key_count in keys_count
+    if key_count > 1
+      " We need to create a subgroup
+      " Recurse one level deeper
+      let sub_targets = a:targets[target_idx : target_idx + key_count - 1]
+      let groups[a:keys[key_idx]] = s:create(sub_targets, a:keys)
+    elseif key_count == 1
+      " Assign single target key_idx
+      let groups[a:keys[key_idx]] = a:targets[target_idx]
+    else
+      " No target
+      continue
+    endif
+    let key_idx += 1
+    let target_idx += key_count
+  endfor
+  return groups
+endfunction
+
+" s:_keys_count() generates list which represents how many targets to be
+" assigned to the key.
+" If the count > 1, use tree recursively.
+" Example:
+"   echo s:_keys_count(5, 3)
+"   " => [3, 1, 1]
+"   echo s:_keys_count(8, 3)
+"   " => [3, 3, 2]
+" @param {number} target_len
+" @param {number} keys_len
+function! s:_keys_count(targets_len, keys_len) abort
+  exe s:assert('a:keys_len > 1')
+  let _keys_count = repeat([0], a:keys_len)
+  let is_first_level = 1
+  let targets_left_cnt = a:targets_len
+  while targets_left_cnt > 0
+    let cnt_to_add = is_first_level ? 1 : a:keys_len - 1
+    for i in range(a:keys_len)
+      let _keys_count[i] += cnt_to_add
+      let targets_left_cnt -= cnt_to_add
+      if targets_left_cnt <= 0
+        let _keys_count[i] += targets_left_cnt
+        break
+      endif
+    endfor
+    let is_first_level = 0
+  endwhile
+  exe s:assert('len(_keys_count) is# a:keys_len')
+  return _keys_count
+endfunction
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim
new file mode 100644
index 0000000..0e803d5
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/HitAHint/Motion.vim
@@ -0,0 +1,806 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#HitAHint#Motion#import() abort
+    return map({'deepextend': '', 'gather_poses': '', 'tab2spacelen': '', 'move_f': '', 'setline': '', '_vital_depends': '', 'wincall': '', 'move': '', 'move_to_winpos': '', 'pos2hint_to_line2col2hint': '', 'gather_visible_matched_poses': '', 'move_to_win': '', 'throw': '', 'has_patch': '', 'win2pos2hint_to_w2l2c2h': '', 'move_f2': '', 'new_overwin': '', 'create_win2pos2hint': '', 'pos2poskey': '', 'winnr2poses_to_list': '', 'poskey2pos': '', 'is_in_fold': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#HitAHint#Motion#import() abort', printf("return map({'deepextend': '', 'gather_poses': '', 'tab2spacelen': '', 'move_f': '', 'setline': '', '_vital_depends': '', 'wincall': '', 'move': '', 'move_to_winpos': '', 'pos2hint_to_line2col2hint': '', 'gather_visible_matched_poses': '', 'move_to_win': '', 'throw': '', 'has_patch': '', 'win2pos2hint_to_w2l2c2h': '', 'move_f2': '', 'new_overwin': '', 'create_win2pos2hint': '', 'pos2poskey': '', 'winnr2poses_to_list': '', 'poskey2pos': '', 'is_in_fold': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+function! s:_vital_loaded(V) abort
+  let s:Hint = a:V.import('HitAHint.Hint')
+  let s:PHighlight = a:V.import('Palette.Highlight')
+  let s:Buffer = a:V.import('Vim.Buffer')
+  let s:Prelude = a:V.import('Prelude')
+  let s:Set = a:V.import('Data.Set')
+  let s:Input = a:V.import('Over.Input')
+endfunction
+
+function! s:_vital_depends() abort
+  return [
+  \   'HitAHint.Hint',
+  \   'Palette.Highlight',
+  \   'Vim.Buffer',
+  \   'Prelude',
+  \   'Data.Set',
+  \   'Over.Input',
+  \ ]
+endfunction
+
+let s:TRUE = !0
+let s:FALSE = 0
+let s:DIRECTION = {'forward': 0, 'backward': 1}
+
+" Check Vim version
+function! s:has_patch(major, minor, patch) abort
+  let l:version = (a:major * 100 + a:minor)
+  return has('patch-' . a:major . '.' . a:minor . '.' . a:patch) ||
+    \ (v:version > l:version) ||
+    \ (v:version == l:version && 'patch' . a:patch)
+endfunction
+
+" matchadd('Conceal', {pattern}, {priority}, -1, {'conceal': {char}}}) can
+" highlight pattern and conceal target correctly even if the target is keyword
+" characters.
+" - http://ftp.vim.org/vim/patches/7.4/7.4.792
+" - https://groups.google.com/forum/#!searchin/vim_dev/matchadd$20conceal/vim_dev/8bKa98GhHdk/VOzIBhd1m8YJ
+let s:can_preserve_syntax = s:has_patch(7, 4, 792)
+
+" s:move() moves cursor over/accross window with Hit-A-Hint feature like
+" vim-easymotion
+" @param {dict} config
+function! s:move(pattern, ...) abort
+  let o = s:new_overwin(get(a:, 1, {}))
+  return o.pattern(a:pattern)
+endfunction
+
+function! s:move_f(...) abort
+  echo 'Target: '
+  let c = s:Input.getchar()
+  return s:move(c, get(a:, 1, {}))
+endfunction
+
+function! s:move_f2() abort
+  echo 'Target: '
+  let c = s:Input.getchar()
+  redraw
+  echo 'Target: ' . c
+  let c2 = s:Input.getchar()
+  return s:move(s:Prelude.escape_pattern(c . c2), get(a:, 1, {}))
+endfunction
+
+
+let s:overwin = {
+\   'config': {
+\     'keys': 'asdghklqwertyuiopzxcvbnmfj;',
+\     'use_upper': s:FALSE,
+\     'auto_land': s:TRUE,
+\     'highlight': {
+\       'shade': 'HitAHintShade',
+\       'target': 'HitAHintTarget',
+\       'cursor': 'HitAHintCursor',
+\     },
+\     'jump_first_target_keys': [],
+\     'do_shade': s:TRUE,
+\   }
+\ }
+
+function! s:_init_hl() abort
+  highlight default HitAHintShade ctermfg=242 guifg=#777777
+  highlight default HitAHintTarget ctermfg=81 guifg=#66D9EF
+  " Cursor highlight doesn't exist for some environment with some
+  " colorscheme ref:#275
+  "   e.g.
+  "     - :colorscheme default
+  "     - :colorscheme hybrid
+  if hlexists('Cursor')
+    highlight default link HitAHintCursor Cursor
+  else
+    highlight default HitAHintCursor term=reverse cterm=reverse gui=reverse
+  endif
+endfunction
+
+call s:_init_hl()
+
+augroup vital-hit-a-hint-motion-default-highlight
+  autocmd!
+  autocmd ColorScheme * call s:_init_hl()
+augroup END
+
+
+function! s:new_overwin(...) abort
+  let o = deepcopy(s:overwin)
+  call s:deepextend(o.config, get(a:, 1, {}))
+  return o
+endfunction
+
+function! s:overwin.pattern(pattern) abort
+  let winpos = self.select_winpos(self.gather_poses_overwin(a:pattern), self.config.keys)
+  if winpos is# -1
+  else
+    call s:move_to_winpos(winpos)
+  endif
+endfunction
+
+" @param {{winnr: [lnum, cnum]}}
+function! s:move_to_winpos(winpos) abort
+  let [winnr_str, pos] = a:winpos
+  let winnr = str2nr(winnr_str)
+  let is_win_moved = !(winnr is# winnr())
+  if is_win_moved
+    if exists('#WinLeave')
+      silent doautocmd WinLeave
+    endif
+    call s:move_to_win(winnr)
+  else
+    normal! m`
+  endif
+  call cursor(pos)
+  if is_win_moved && exists('#WinEnter')
+    silent doautocmd WinEnter
+  endif
+endfunction
+
+function! s:overwin.select_winpos(winnr2poses, keys) abort
+  let wposes = s:winnr2poses_to_list(a:winnr2poses)
+  if self.config.auto_land && len(wposes) is# 1
+    return wposes[0]
+  endif
+  call self.set_options()
+  try
+    return self.choose_prompt(s:Hint.create(wposes, a:keys))
+  finally
+    call self.restore_options()
+  endtry
+endfunction
+
+function! s:overwin.set_options() abort
+  " s:move_to_win() takes long time if 'foldmethod' == 'syntax' or 'expr'
+  let self.save_foldmethod = {}
+  for winnr in range(1, winnr('$'))
+    let self.save_foldmethod[winnr] = getwinvar(winnr, '&foldmethod')
+    call setwinvar(winnr, '&foldmethod', 'manual')
+  endfor
+endfunction
+
+function! s:overwin.restore_options() abort
+  for winnr in range(1, winnr('$'))
+    call setwinvar(winnr, '&foldmethod', self.save_foldmethod[winnr])
+  endfor
+endfunction
+
+" s:wpos_to_hint() returns dict whose key is position with window and whose
+" value is the hints.
+" @param Tree{string: ((winnr, (number,number))|Tree)} hint_dict
+" @return {{winnr: {string: list<char>}}} poskey to hint for each window
+" e.g.
+" {
+"   '1': {
+"     '00168:00004': ['b', 'c', 'b'],
+"     '00174:00001': ['b', 'c', 'a'],
+"     '00188:00004': ['b', 'b'],
+"     '00190:00001': ['b', 'a'],
+"     '00191:00016': ['a', 'c'],
+"     '00192:00004': ['a', 'b'],
+"     '00195:00035': ['a', 'a']
+"   },
+"   '3': {
+"     '00168:00004': ['c', 'c', 'c'],
+"     '00174:00001': ['c', 'c', 'b'],
+"     '00188:00004': ['c', 'c', 'a'],
+"     '00190:00001': ['c', 'b'],
+"     '00191:00016': ['c', 'a'],
+"     '00192:00004': ['b', 'c', 'c']
+"   }
+" }
+function! s:create_win2pos2hint(hint_dict) abort
+  return s:_create_win2pos2hint({}, a:hint_dict)
+endfunction
+
+function! s:_create_win2pos2hint(dict, hint_dict, ...) abort
+  let prefix = get(a:, 1, [])
+  for [hint, v] in items(a:hint_dict)
+    if type(v) is# type({})
+      call s:_create_win2pos2hint(a:dict, v, prefix + [hint])
+    else
+      let [winnr, pos] = v
+      let a:dict[winnr] = get(a:dict, winnr, {})
+      let a:dict[winnr][s:pos2poskey(pos)] = prefix + [hint]
+    endif
+    unlet v
+  endfor
+  return a:dict
+endfunction
+
+" s:pos2poskey() convertes pos to poskey to use pos as dictionary keys and
+" sort pos correctly.
+" @param {(number,number)} pos
+" @return string
+" e.g. [1, 1] -> '00001:00001'
+function! s:pos2poskey(pos) abort
+  return join(map(copy(a:pos), "printf('%05d', v:val)"), ':')
+endfunction
+
+" s:poskey2pos() convertes poskey to pos.
+" @param {string} poskey e.g. '00001:00001'
+" @return {(number,number)}
+" e.g. '00001:00001' -> [1, 1]
+function! s:poskey2pos(poskey) abort
+  return map(split(a:poskey, ':'), 'str2nr(v:val)')
+endfunction
+
+function! s:overwin.choose_prompt(hint_dict) abort
+  if empty(a:hint_dict)
+    redraw
+    echo 'No target'
+    return -1
+  endif
+  let hinter = s:Hinter.new(a:hint_dict, self.config)
+  try
+    call hinter.before()
+    call hinter.show_hint()
+    redraw
+    echo 'Target key: '
+    let c = s:Input.getchar()
+    if self.config.use_upper
+      let c = toupper(c)
+    endif
+  catch
+    echo v:throwpoint . ':' . v:exception
+    return -1
+  finally
+    call hinter.after()
+  endtry
+
+  " Jump to first target if target key is in config.jump_first_target_keys.
+  if index(self.config.jump_first_target_keys, c) isnot# -1
+    let c = split(self.config.keys, '\zs')[0]
+  endif
+
+  if has_key(a:hint_dict, c)
+    let target = a:hint_dict[c]
+    return type(target) is# type({}) ? self.choose_prompt(target) : target
+  else
+    redraw
+    echo 'Invalid target: ' . c
+    return -1
+  endif
+endfunction
+
+" Hinter show hints accross window.
+" save_lines: {{winnr: {lnum: string}}}
+" w2l2c2h: winnr to lnum to col num to hints. col2hints is tuple because we
+" need sorted col to hints pair.
+" save_syntax: {{winnr: &syntax}}
+"   {{winnr: {lnum: list<(cnum, list<char>)>}}}
+let s:Hinter = {
+\   'save_lines': {},
+\   'w2l2c2h': {},
+\   'winnrs': [],
+\   'save_syntax': {},
+\   'save_conceallevel': {},
+\   'save_concealcursor': {},
+\   'save_modified': {},
+\   'save_modifiable': {},
+\   'save_readonly': {},
+\   'save_undo': {},
+\   'highlight_ids': {},
+\ }
+
+function! s:Hinter.new(hint_dict, config) abort
+  let s = deepcopy(self)
+  let s.config = a:config
+  call s.init(a:hint_dict)
+  return s
+endfunction
+
+function! s:Hinter.init(hint_dict) abort
+  let win2pos2hint = s:create_win2pos2hint(a:hint_dict)
+  let self.winnrs = sort(map(keys(win2pos2hint), 'str2nr(v:val)'))
+  let self.win2pos2hint = win2pos2hint
+  let self.w2l2c2h = s:win2pos2hint_to_w2l2c2h(win2pos2hint)
+  let self.hl_target_ids = {}
+  for winnr in self.winnrs
+    let self.hl_target_ids[winnr] = []
+  endfor
+  call self._save_lines()
+endfunction
+
+function! s:Hinter.before() abort
+  let self.highlight_id_cursor = matchadd(self.config.highlight.cursor, '\%#', 101)
+  call self.save_options()
+  call self.disable_conceal_in_other_win()
+endfunction
+
+function! s:Hinter.after() abort
+  call matchdelete(self.highlight_id_cursor)
+  call self.restore_env()
+  call self.restore_conceal_in_other_win()
+endfunction
+
+function! s:Hinter._save_lines() abort
+  let nr = winnr()
+  try
+    for [winnr, pos2hint] in items(self.win2pos2hint)
+      call s:move_to_win(winnr)
+      let lnums = map(copy(keys(pos2hint)), 's:poskey2pos(v:val)[0]')
+      let self.save_lines[winnr] = get(self.save_lines, winnr, {})
+      for lnum in lnums
+        let self.save_lines[winnr][lnum] = getline(lnum)
+      endfor
+    endfor
+  finally
+    call s:move_to_win(nr)
+  endtry
+endfunction
+
+function! s:Hinter.restore_lines_for_win(winnr) abort
+  let lnum2line = self.save_lines[a:winnr]
+  for [lnum, line] in items(lnum2line)
+    call s:setline(lnum, line)
+  endfor
+endfunction
+
+function! s:Hinter.save_options() abort
+  for winnr in self.winnrs
+    let self.save_syntax[winnr] = getwinvar(winnr, '&syntax')
+    let self.save_conceallevel[winnr] = getwinvar(winnr, '&conceallevel')
+    let self.save_concealcursor[winnr] = getwinvar(winnr, '&concealcursor')
+    let self.save_modified[winnr] = getwinvar(winnr, '&modified')
+    let self.save_modifiable[winnr] = getwinvar(winnr, '&modifiable')
+    let self.save_readonly[winnr] = getwinvar(winnr, '&readonly')
+  endfor
+endfunction
+
+function! s:Hinter.restore_options() abort
+  for winnr in self.winnrs
+    call setwinvar(winnr, '&conceallevel', self.save_conceallevel[winnr])
+    call setwinvar(winnr, '&concealcursor', self.save_concealcursor[winnr])
+    call setwinvar(winnr, '&modified', self.save_modified[winnr])
+    call setwinvar(winnr, '&modifiable', self.save_modifiable[winnr])
+    call setwinvar(winnr, '&readonly', self.save_readonly[winnr])
+  endfor
+endfunction
+
+function! s:Hinter.modify_env_for_win(winnr) abort
+  let self.save_conceal = s:PHighlight.get('Conceal')
+  let self.save_undo[a:winnr] = s:undo_lock.save()
+
+  setlocal modifiable
+  setlocal noreadonly
+
+  if !s:can_preserve_syntax
+    ownsyntax overwin
+  endif
+
+  setlocal conceallevel=2
+  setlocal concealcursor=ncv
+
+  let self.highlight_ids[a:winnr] = get(self.highlight_ids, a:winnr, [])
+  if self.config.do_shade
+    if !s:can_preserve_syntax
+      syntax clear
+    endif
+    let self.highlight_ids[a:winnr] += [matchadd(self.config.highlight.shade, '\_.*', 100)]
+  endif
+
+  " XXX: other plugins specific handling
+  if getbufvar('%', 'indentLine_enabled', 0)
+    silent! syntax clear IndentLine
+  endif
+endfunction
+
+function! s:Hinter.restore_env() abort
+  call s:PHighlight.set('Conceal', self.save_conceal)
+  let nr = winnr()
+  try
+    for winnr in self.winnrs
+      call s:move_to_win(winnr)
+      call self.restore_lines_for_win(winnr)
+      call self.remove_hints(winnr)
+
+      if !s:can_preserve_syntax && self.config.do_shade
+        let &syntax = self.save_syntax[winnr]
+      endif
+
+      call self.save_undo[winnr].restore()
+
+      for id in self.highlight_ids[winnr]
+        call matchdelete(id)
+      endfor
+
+      " XXX: other plugins specific handling
+      if getbufvar('%', 'indentLine_enabled', 0) && exists(':IndentLinesEnable') is# 2
+        call setbufvar('%', 'indentLine_enabled', 0)
+        :IndentLinesEnable
+      endif
+    endfor
+  catch
+    call s:throw(v:throwpoint . ' ' . v:exception)
+  finally
+    call s:move_to_win(nr)
+  endtry
+
+  call self.restore_options()
+endfunction
+
+let s:undo_lock = {}
+
+function! s:undo_lock.save() abort
+  let undo = deepcopy(self)
+  call undo._save()
+  return undo
+endfunction
+
+function! s:undo_lock._save() abort
+  if undotree().seq_last == 0
+    " if there are no undo history, disable undo feature by setting
+    " 'undolevels' to -1 and restore it.
+    let self.save_undolevels = &l:undolevels
+    let &l:undolevels = -1
+  elseif !s:Buffer.is_cmdwin()
+    " command line window doesn't support :wundo.
+    let self.undofile = tempname()
+    execute 'wundo!' self.undofile
+  else
+    let self.is_cmdwin = s:TRUE
+  endif
+endfunction
+
+function! s:undo_lock.restore() abort
+  if has_key(self, 'save_undolevels')
+    let &l:undolevels = self.save_undolevels
+  endif
+  if has_key(self, 'undofile') && filereadable(self.undofile)
+    silent execute 'rundo' self.undofile
+    call delete(self.undofile)
+  endif
+  if has_key(self, 'is_cmdwin')
+    " XXX: it breaks undo history. AFAIK, there are no way to save and restore
+    " undo history in commandline window.
+    call self.undobreak()
+  endif
+endfunction
+
+function! s:undo_lock.undobreak() abort
+  let old_undolevels = &l:undolevels
+  setlocal undolevels=-1
+  keepjumps call setline('.', getline('.'))
+  let &l:undolevels = old_undolevels
+endfunction
+
+function! s:Hinter.disable_conceal_in_other_win() abort
+  let allwinnrs = s:Set.set(range(1, winnr('$')))
+  let other_winnrs = allwinnrs.sub(self.winnrs).to_list()
+  for w in other_winnrs
+    if 'help' !=# getwinvar(w, '&buftype')
+      call setwinvar(w, 'overwin_save_conceallevel', getwinvar(w, '&conceallevel'))
+      call setwinvar(w, '&conceallevel', 0)
+    endif
+  endfor
+endfunction
+
+function! s:Hinter.restore_conceal_in_other_win() abort
+  let allwinnrs = s:Set.set(range(1, winnr('$')))
+  let other_winnrs = allwinnrs.sub(self.winnrs).to_list()
+  for w in other_winnrs
+    if 'help' !=# getwinvar(w, '&buftype')
+      call setwinvar(w, '&conceallevel', getwinvar(w, 'overwin_save_conceallevel'))
+    endif
+  endfor
+endfunction
+
+" ._pos2hint_to_line2col2hint() converts pos2hint to line2col2hint dict whose
+" key is line number and whose value is list of tuple of col number to hint.
+" line2col2hint is for show hint with replacing line by line.
+" col should be sorted.
+" @param {{string: list<char>}} pos2hint
+" @return {number: [(number, list<char>)]}
+function! s:Hinter._pos2hint_to_line2col2hint(pos2hint) abort
+  let line2col2hint = {}
+  let poskeys = sort(keys(a:pos2hint))
+  for poskey in poskeys
+    let [lnum, cnum] = s:poskey2pos(poskey)
+    let line2col2hint[lnum] = get(line2col2hint, lnum, [])
+    let line2col2hint[lnum] += [[cnum, a:pos2hint[poskey]]]
+  endfor
+  return line2col2hint
+endfunction
+
+function! s:Hinter.show_hint() abort
+  let nr = winnr()
+  try
+    for winnr in self.winnrs
+      call s:move_to_win(winnr)
+      call self._show_hint_for_win(winnr)
+    endfor
+  finally
+    call s:move_to_win(nr)
+  endtry
+endfunction
+
+function! s:Hinter._show_hint_for_win(winnr) abort
+  call self.modify_env_for_win(a:winnr)
+
+  let hints = []
+  for [lnum, col2hint] in items(self.w2l2c2h[a:winnr])
+    let hints += self._show_hint_for_line(a:winnr, lnum, col2hint)
+  endfor
+  " Restore syntax and show hints after replacing all lines for performance.
+  if !s:can_preserve_syntax && !self.config.do_shade
+    let &l:syntax = self.save_syntax[a:winnr]
+  endif
+  execute 'highlight! link Conceal' self.config.highlight.target
+  for [lnum, cnum, char] in hints
+    call self.show_hint_pos(lnum, cnum, char, a:winnr)
+  endfor
+endfunction
+
+function! s:Hinter._show_hint_for_line(winnr, lnum, col2hint) abort
+  let hints = [] " [lnum, cnum, char]
+  let line = self.save_lines[a:winnr][a:lnum]
+  let col_offset = 0
+  let prev_cnum = -1
+  let next_offset = 0
+  for [cnum, hint] in a:col2hint
+    let col_num = cnum + col_offset
+
+    let is_consecutive = cnum is# prev_cnum + 1
+    if !is_consecutive
+      let col_num += next_offset
+    endif
+    let save_next_offset = next_offset
+
+    let [line, offset, next_offset] = self._replace_line_for_hint(col_num, line, hint)
+
+    if is_consecutive
+      let col_offset += save_next_offset
+    endif
+    let col_offset += offset
+
+    let hints = [[a:lnum, col_num, hint[0]]] + hints
+    if len(hint) > 1
+      let hints = [[a:lnum, col_num + 1, hint[1]]] + hints
+    endif
+
+    let prev_cnum = cnum
+  endfor
+  call s:setline(a:lnum, line)
+  return hints
+endfunction
+
+" ._replace_line_for_hint() replaces line to show hints.
+" - It appends space if the line is empty
+" - It replaces <Tab> to space if the target character is <Tab>
+" - It replaces next target character if it's <Tab> and len(hint) > 1
+" Replacing line changes col number, so it returns offset of col number.
+" As for replaceing next target character, the timing to calculate offset
+" depends on the col number of next hint in the same line, so it returns
+" `next_offset` instead of returning offset all at once.
+" @return {(string, number, number)} (line, offset, next_offset)
+function! s:Hinter._replace_line_for_hint(col_num, line, hint) abort
+  let line = a:line
+  let col_num = a:col_num
+  let do_replace_target = !(self.config.do_shade || s:can_preserve_syntax)
+  let target = matchstr(line, '\%' . col_num .'c.')
+  " Append one space for empty line or match at end of line
+  if target is# ''
+    let hintwidth = strdisplaywidth(join(a:hint[:1], ''))
+    let char = do_replace_target ? ' ' : '.'
+    let line .= repeat(char, hintwidth)
+    return [line, hintwidth, 0]
+  endif
+
+  let offset = 0
+  if target is# "\t"
+    let [line, offset] = self._replace_tab_target(col_num, line)
+  elseif strdisplaywidth(target) > 1
+    let line = self._replace_text_to_space(line, col_num, strdisplaywidth(target))
+    let offset = strdisplaywidth(target) - len(target)
+  else
+    if do_replace_target
+      " The priority of :syn-cchar is always under the priority of keywords.
+      " So, Hit-A-Hint replaces targets character with '.'.
+      let space = '.'
+      let line = substitute(line, '\%' . col_num . 'c.', space, '')
+      let offset = len(space) - len(target)
+    endif
+  endif
+
+  let next_offset = 0
+  if len(a:hint) > 1 && target isnot# "\t"
+    " pass [' '] as hint to stop recursion.
+    let [line, next_offset, _] = self._replace_line_for_hint(col_num + offset + 1, line, [' '])
+  endif
+  return [line, offset, next_offset]
+endfunction
+
+" @return {(line, offset)}
+function! s:Hinter._replace_tab_target(col_num, line) abort
+  let space_len = s:tab2spacelen(a:line, a:col_num)
+  let line = self._replace_text_to_space(a:line, a:col_num, space_len)
+  return [line, space_len - 1]
+endfunction
+
+function! s:Hinter._replace_text_to_space(line, col_num, len) abort
+  let target = printf('\%%%dc.', a:col_num)
+  let line = substitute(a:line, target, repeat(' ', a:len), '')
+  return line
+endfunction
+
+function! s:Hinter.show_hint_pos(lnum, cnum, char, winnr) abort
+  let p = '\%'. a:lnum . 'l\%'. a:cnum . 'c.'
+  if s:can_preserve_syntax
+    let self.hl_target_ids[a:winnr] += [matchadd('Conceal', p, 101, -1, {'conceal': a:char})]
+  else
+    exec "syntax match HitAHintTarget '". p . "' contains=NONE containedin=.* conceal cchar=". a:char
+  endif
+endfunction
+
+function! s:Hinter.remove_hints(winnr) abort
+  if s:can_preserve_syntax
+    for id in self.hl_target_ids[a:winnr]
+      call matchdelete(id)
+    endfor
+  else
+    " Clear syntax defined by Hit-A-Hint motion before restoring syntax.
+    syntax clear HitAHintTarget
+  endif
+endfunction
+
+" @param {number} col_num col_num is 1 origin like col()
+function! s:tab2spacelen(line, col_num) abort
+  let before_line = a:col_num > 2 ? a:line[: a:col_num - 2]
+  \   : a:col_num is# 2 ? a:line[0]
+  \   : ''
+  let vcol_num = 1
+  for c in split(before_line, '\zs')
+    let vcol_num += c is# "\t" ? s:_virtual_tab2spacelen(vcol_num) : len(c)
+  endfor
+  return s:_virtual_tab2spacelen(vcol_num)
+endfunction
+
+function! s:_virtual_tab2spacelen(col_num) abort
+  return &tabstop - ((a:col_num - 1) % &tabstop)
+endfunction
+
+function! s:win2pos2hint_to_w2l2c2h(win2pos2hint) abort
+  let w2l2c2h = {}
+  for [winnr, pos2hint] in items(a:win2pos2hint)
+    let w2l2c2h[winnr] = s:pos2hint_to_line2col2hint(pos2hint)
+  endfor
+  return w2l2c2h
+endfunction
+
+" s:pos2hint_to_line2col2hint() converts pos2hint to line2col2hint dict whose
+" key is line number and whose value is list of tuple of col number to hint.
+" line2col2hint is for show hint with replacing line by line.
+" col should be sorted.
+" @param {{string: list<char>}} pos2hint
+" @return {number: [(number, list<char>)]}
+function! s:pos2hint_to_line2col2hint(pos2hint) abort
+  let line2col2hint = {}
+  let poskeys = sort(keys(a:pos2hint))
+  for poskey in poskeys
+    let [lnum, cnum] = s:poskey2pos(poskey)
+    let line2col2hint[lnum] = get(line2col2hint, lnum, [])
+    let line2col2hint[lnum] += [[cnum, a:pos2hint[poskey]]]
+  endfor
+  return line2col2hint
+endfunction
+
+" @param {number} winnr
+function! s:move_to_win(winnr) abort
+  if a:winnr !=# winnr()
+    execute 'noautocmd' a:winnr . 'wincmd w'
+  endif
+endfunction
+
+" @param {regex} pattern
+" @return {{winnr: list<list<(number,number))>}}
+function! s:overwin.gather_poses_overwin(pattern) abort
+  return s:wincall(function('s:gather_poses'), [a:pattern])
+endfunction
+
+" s:gather_poses() aggregates patterm matched positions in visible current
+" window for both direction excluding poses in fold.
+" @return {{list<list<(number,number))>}}
+function! s:gather_poses(pattern) abort
+  let f = s:gather_visible_matched_poses(a:pattern, s:DIRECTION.forward, s:TRUE)
+  let b = s:gather_visible_matched_poses(a:pattern, s:DIRECTION.backward, s:FALSE)
+  return filter(f + b, '!s:is_in_fold(v:val[0])')
+endfunction
+
+" s:gather_visible_matched_poses() aggregates pattern matched positions in visible current
+" window.
+" @param {regex} pattern
+" @param {enum<DIRECTION>} direction see s:DIRECTION
+" @param {bool} allow_cursor_pos_match
+" @return {list<list<(number,number)>>} positions
+function! s:gather_visible_matched_poses(pattern, direction, allow_cursor_pos_match) abort
+  let stop_line = line(a:direction is# s:DIRECTION.forward ? 'w$' : 'w0')
+  let search_flag = (a:direction is# s:DIRECTION.forward ? '' : 'b')
+  let c_flag = a:allow_cursor_pos_match ? 'c' : ''
+  let view = winsaveview()
+  let poses = []
+  keepjumps let pos = searchpos(a:pattern, c_flag . search_flag, stop_line)
+  while pos != [0, 0]
+    let poses += [pos]
+    keepjumps let pos = searchpos(a:pattern, search_flag, stop_line)
+  endwhile
+  call winrestview(view)
+  return poses
+endfunction
+
+" @param {{winnr: list<list<(number,number))>}} winnr2poses
+" @param {number?} first_winnr the top winnr poses in returned list
+" @return {list<{list<(winnr, (number,number))}>}
+function! s:winnr2poses_to_list(winnr2poses, ...) abort
+  let first_winnr = get(a:, 1, winnr())
+  let first_winnr_poses = []
+  let other_poses = []
+  for [winnr_str, poses] in items(a:winnr2poses)
+    let winnr = str2nr(winnr_str)
+    if winnr is# first_winnr
+      let first_winnr_poses = map(copy(poses), '[winnr, v:val]')
+    else
+      let other_poses += map(copy(poses), '[winnr, v:val]')
+    endif
+  endfor
+  return first_winnr_poses + other_poses
+endfunction
+
+" @param {number} lnum line number
+function! s:is_in_fold(lnum) abort
+  return foldclosed(a:lnum) != -1
+endfunction
+
+" @param {funcref} func
+" @param {arglist} list<S>
+" @param {dict?} dict for :h call()
+" @return {{winnr: <T>}}
+function! s:wincall(func, arglist, ...) abort
+  let dict = get(a:, 1, {})
+  let r = {}
+  let start_winnr = winnr()
+  let r[start_winnr] = call(a:func, a:arglist, dict)
+  if s:Buffer.is_cmdwin()
+    return r
+  endif
+  noautocmd wincmd w
+  while winnr() isnot# start_winnr
+    let r[winnr()] = call(a:func, a:arglist, dict)
+    noautocmd wincmd w
+  endwhile
+  return r
+endfunction
+
+" deepextend (nest: 1)
+function! s:deepextend(expr1, expr2) abort
+  let expr2 = copy(a:expr2)
+  for [k, V] in items(a:expr1)
+    if (type(V) is type({}) || type(V) is type([])) && has_key(expr2, k)
+      let a:expr1[k] = extend(a:expr1[k], expr2[k])
+      unlet expr2[k]
+    endif
+    unlet V
+  endfor
+  return extend(a:expr1, expr2)
+endfunction
+
+function! s:setline(lnum, text) abort
+  if getline(a:lnum) isnot# a:text
+    call setline(a:lnum, a:text)
+  endif
+endfunction
+
+function! s:throw(message) abort
+  throw 'vital: HitAHint.Motion: ' . a:message
+endfunction
+
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
new file mode 100644
index 0000000..36ddbbb
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Base.vim
@@ -0,0 +1,606 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Base#import() abort
+    return map({'_vital_depends': '', 'make_plain': '', 'is_input_waiting': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Base#import() abort', printf("return map({'_vital_depends': '', 'make_plain': '', 'is_input_waiting': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:String  = s:V.import("Over.String")
+	let s:Signals = s:V.import("Over.Signals")
+	let s:Input = s:V.import("Over.Input")
+	let s:Keymapping = s:V.import("Over.Keymapping")
+	let s:Module = s:V.import("Over.Commandline.Modules")
+	let s:base.variables.modules = s:Signals.make()
+	function! s:base.variables.modules.get_slot(val)
+		return a:val.slot.module
+	endfunction
+
+	let s:Highlight = s:V.import("Palette.Highlight")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Over.String",
+\		"Over.Signals",
+\		"Over.Input",
+\		"Over.Keymapping",
+\		"Over.Commandline.Modules",
+\		"Palette.Highlight",
+\	]
+endfunction
+
+
+function! s:make(...)
+	let result = deepcopy(s:base)
+	call result.set_prompt(get(a:, 1, ":"))
+	call result.connect(result, "_")
+	return result
+endfunction
+
+
+function! s:make_plain()
+	return deepcopy(s:base)
+endfunction
+
+
+let s:base = {
+\	"line" : {},
+\	"variables" : {
+\		"prompt" : "",
+\		"char" : "",
+\		"input" : "",
+\		"tap_key" : "",
+\		"exit" : 0,
+\		"keymapping" : {},
+\		"suffix" : "",
+\		"is_setted" : 0,
+\	},
+\	"highlights" : {
+\		"prompt" : "NONE",
+\		"cursor" : "VitalOverCommandLineCursor",
+\		"cursor_on" : "VitalOverCommandLineCursorOn",
+\		"cursor_insert" : "VitalOverCommandLineOnCursor",
+\	},
+\}
+
+if exists("s:Signals")
+	let s:base.variables.modules = s:Signals.make()
+	function! s:base.variables.modules.get_slot(val)
+		return a:val.slot.module
+	endfunction
+endif
+
+
+function! s:base.getline()
+	return self.line.str()
+endfunction
+
+
+function! s:base.setline(line)
+	return self.line.set(a:line)
+endfunction
+
+
+function! s:base.char()
+	return self.variables.char
+endfunction
+
+
+function! s:base.setchar(char, ...)
+	" 1 の場合は既に設定されていても上書きする
+	" 0 の場合は既に設定されていれば上書きしない
+	let overwrite = get(a:, 1, 1)
+	if overwrite || self.variables.is_setted == 0
+		let self.variables.input = a:char
+		let self.variables.is_setted = 1
+	endif
+endfunction
+
+
+function! s:base.getpos()
+	return self.line.pos()
+endfunction
+
+
+function! s:base.setpos(pos)
+	return self.line.set_pos(a:pos)
+endfunction
+
+
+function! s:base.tap_keyinput(key)
+	let self.variables.tap_key = a:key
+endfunction
+
+
+function! s:base.untap_keyinput(key)
+	if self.variables.tap_key == a:key
+		let self.variables.tap_key = ""
+		return 1
+	endif
+endfunction
+
+
+function! s:base.get_tap_key()
+	return self.variables.tap_key
+endfunction
+
+
+function! s:base.is_input(key, ...)
+	let prekey = get(a:, 1, "")
+	return self.get_tap_key() ==# prekey
+\		&& self.char() ==# a:key
+" \		&& self.char() == (prekey . a:key)
+endfunction
+
+
+function! s:base.input_key()
+	return self.variables.input_key
+endfunction
+
+
+function! s:base.set_prompt(prompt)
+	let self.variables.prompt = a:prompt
+endfunction
+
+
+function! s:base.get_prompt()
+	return self.variables.prompt
+endfunction
+
+
+function! s:base.set_suffix(str)
+	let self.variables.suffix = a:str
+endfunction
+
+
+function! s:base.get_suffix()
+	return self.variables.suffix
+endfunction
+
+
+function! s:base.insert(word, ...)
+	if a:0
+		call self.line.set(a:1)
+	endif
+	call self.line.input(a:word)
+endfunction
+
+function! s:base.forward()
+	return self.line.forward()
+endfunction
+
+function! s:base.backward()
+	return self.line.backward()
+endfunction
+
+
+function! s:base.backward_word(...)
+	let pat = get(a:, 1, '\k\+\s*\|.')
+	return matchstr(self.backward(), '\%(' . pat . '\)$')
+endfunction
+
+
+function! s:base.connect(module, ...)
+	if type(a:module) == type("")
+		return call(self.connect, [s:Module.make(a:module)] + a:000, self)
+	endif
+	if empty(a:module)
+		return
+	endif
+	let name = a:0 > 0 ? a:1 : a:module.name
+	let slot = self.variables.modules.find_first_by("get(v:val.slot, 'name', '') == " . string(name))
+	if empty(slot)
+		call self.variables.modules.connect({ "name" : name, "module" : a:module })
+	else
+		let slot.slot.module = a:module
+	endif
+" 	let self.variables.modules[name] = a:module
+endfunction
+
+
+function! s:base.disconnect(name)
+	return self.variables.modules.disconnect_by(
+\		"get(v:val.slot, 'name', '') == " . string(a:name)
+\	)
+" 	unlet self.variables.modules[a:name]
+endfunction
+
+
+function! s:base.get_module(name)
+	let slot = self.variables.modules.find_first_by("get(v:val.slot, 'name', '') == " . string(a:name))
+	return empty(slot) ? {} : slot.slot.module
+endfunction
+
+
+function! s:base.callevent(event)
+	call self.variables.modules.sort_by("has_key(v:val.slot.module, 'priority') ? v:val.slot.module.priority('" . a:event . "') : 0")
+	return self.variables.modules.call(a:event, [self])
+" 	call map(filter(copy(self.variables.modules), "has_key(v:val, a:event)"), "v:val." . a:event . "(self)")
+endfunction
+
+
+function! s:base.cmap(lhs, rhs)
+	let self.variables.keymapping[a:lhs] = a:rhs
+endfunction
+
+
+function! s:base.cnoremap(lhs, rhs)
+	let key = s:Keymapping.as_key_config(a:rhs)
+	let key.noremap = 1
+	let self.variables.keymapping[a:lhs] = key
+endfunction
+
+
+function! s:base.cunmap(lhs)
+	unlet self.variables.keymapping[a:lhs]
+endfunction
+
+
+function! s:base.keymapping()
+	return self.__keymapping__()
+endfunction
+
+
+function! s:base.__keymapping__()
+	return {}
+endfunction
+
+
+function! s:base.execute(...)
+	let command = get(a:, 1, self.getline())
+	call self.__execute(command)
+endfunction
+
+
+function! s:base.draw()
+	call self.callevent("on_draw_pre")
+	call self.callevent("on_draw")
+endfunction
+
+
+function! s:base.exit(...)
+	let self.variables.exit = 1
+	let self.variables.exit_code = get(a:, 1, 0)
+endfunction
+
+
+function! s:base.enable_keymapping()
+	let self.variables.enable_keymapping = 1
+endfunction
+
+
+function! s:base.disable_keymapping()
+	let self.variables.enable_keymapping = 0
+endfunction
+
+
+function! s:base.is_enable_keymapping()
+	return self.variables.enable_keymapping
+endfunction
+
+" function! s:base.cancel()
+" 	call self.exit(1)
+" 	call self.__on_cancel()
+" endfunction
+
+
+function! s:base.exit_code()
+	return self.variables.exit_code
+endfunction
+
+
+function! s:base.hl_cursor_on()
+	if exists("self.variables.old_guicursor")
+		set guicursor&
+		let &guicursor = self.variables.old_guicursor
+		unlet self.variables.old_guicursor
+	endif
+
+	if exists("self.variables.old_t_ve")
+		let &t_ve = self.variables.old_t_ve
+		unlet self.variables.old_t_ve
+	endif
+endfunction
+
+
+function! s:base.hl_cursor_off()
+	if exists("self.variables.old_t_ve")
+		return
+	endif
+
+	let self.variables.old_guicursor = &guicursor
+	set guicursor=n:block-NONE
+	let self.variables.old_t_ve = &t_ve
+	set t_ve=
+endfunction
+
+
+function! s:base.start(...)
+	let exit_code = call(self.__main, a:000, self)
+	return exit_code
+endfunction
+
+
+function! s:base.__empty(...)
+endfunction
+
+
+function! s:base.get(...)
+	let Old_execute = self.execute
+	let self.execute = self.__empty
+	try
+		let exit_code = call(self.start, a:000, self)
+		if exit_code == 0
+			return self.getline()
+		endif
+	finally
+		let self.execute = Old_execute
+	endtry
+	return ""
+endfunction
+
+
+function! s:base.input_key_stack()
+	return self.variables.input_key_stack
+endfunction
+
+
+function! s:base.input_key_stack_string()
+	return join(self.variables.input_key_stack, "")
+endfunction
+
+
+function! s:base.set_input_key_stack(stack)
+	let self.variables.input_key_stack = a:stack
+	return self.variables.input_key_stack
+endfunction
+
+
+function! s:base.input_key_stack_pop()
+	return remove(self.input_key_stack(), 0)
+endfunction
+
+
+function! s:base.getchar(...)
+	if empty(self.input_key_stack())
+		return call(s:Input.getchar, a:000, s:Input)
+	endif
+	return self.input_key_stack_pop()
+endfunction
+
+
+function! s:base.__init_variables()
+	let self.variables.tap_key = ""
+	let self.variables.char = ""
+	let self.variables.input = ""
+	let self.variables.exit = 0
+	let self.variables.exit_code = 1
+	let self.variables.enable_keymapping = 1
+	let self.variables.input_key_stack = []
+	let self.line = deepcopy(s:String.make())
+endfunction
+
+
+function! s:_is_valid_highlight(name)
+	let highlight = s:Highlight.get(a:name)
+	if empty(highlight)
+		return 0
+	endif
+
+	if has("gui_running")
+\	&& (has_key(highlight, "guifg") || has_key(highlight, "guibg"))
+		return 1
+	elseif (has_key(highlight, "ctermfg") || has_key(highlight, "ctermbg"))
+		return 1
+	endif
+	return 0
+endfunction
+
+
+function! s:base.__init()
+	call self.__init_variables()
+	call self.hl_cursor_off()
+	if !hlexists(self.highlights.cursor)
+		if s:_is_valid_highlight("Cursor")
+			execute "highlight link " . self.highlights.cursor . " Cursor"
+		else
+			" Workaround by CUI Vim Cursor Highlight
+			" issues #92
+			" https://github.com/osyo-manga/vital-over/issues/92
+			execute "highlight " . self.highlights.cursor . " term=reverse cterm=reverse gui=reverse"
+		endif
+	endif
+	if !hlexists(self.highlights.cursor_on)
+		execute "highlight link " . self.highlights.cursor_on . " " . self.highlights.cursor
+	endif
+	if !hlexists(self.highlights.cursor_insert)
+		execute "highlight " . self.highlights.cursor_insert . " cterm=underline term=underline gui=underline"
+	endif
+endfunction
+
+
+function! s:base.__execute(command)
+	call self.callevent("on_execute_pre")
+	try
+		call self.__execute__(a:command)
+	catch
+		echohl ErrorMsg
+		echom matchstr(v:exception, 'Vim\((\w*)\)\?:\zs.*\ze')
+		echohl None
+		call self.callevent("on_execute_failed")
+	finally
+		call self.callevent("on_execute")
+	endtry
+endfunction
+
+
+function! s:base.__execute__(cmd)
+	execute a:cmd
+endfunction
+
+
+function! s:base.__input_char(char)
+	let char = a:char
+	let self.variables.input_key = char
+	let self.variables.char = char
+	call self.setchar(self.variables.char)
+	let self.variables.is_setted = 0
+	call self.callevent("on_char_pre")
+	call self.insert(self.variables.input)
+	call self.callevent("on_char")
+endfunction
+
+
+function! s:base.__input(input, ...)
+	if a:input == ""
+		return
+	endif
+
+	let self.variables.input_key = a:input
+	if a:0 == 0
+		let keymapping = self.__get_keymapping()
+	else
+		let keymapping = a:1
+	endif
+	if self.is_enable_keymapping()
+		let key = s:Keymapping.unmapping(keymapping, a:input)
+	else
+		let key = a:input
+	endif
+	if key == ""
+		return
+	endif
+
+	call self.set_input_key_stack(s:String.split_by_keys(key))
+	while !(empty(self.input_key_stack()) || self.is_exit())
+		call self.__input_char(self.input_key_stack_pop())
+	endwhile
+endfunction
+
+
+function! s:is_input_waiting(keymapping, input)
+	let num = len(filter(copy(a:keymapping), 'stridx(v:key, a:input) == 0'))
+	return num > 1 || (num == 1 && !has_key(a:keymapping, a:input))
+endfunction
+
+
+function! s:base.__inputting()
+	if !self.is_enable_keymapping()
+		return self.__input(s:Input.getchar())
+	endif
+
+	let input = s:Input.getchar()
+	let old_line = self.getline()
+	let old_pos  = self.getpos()
+	let keymapping = self.__get_keymapping()
+	try
+		let t = reltime()
+		while s:is_input_waiting(keymapping, input)
+\		&& str2nr(reltimestr(reltime(t))) * 1000 < &timeoutlen
+			call self.setline(old_line)
+			call self.insert(input)
+			call self.setpos(old_pos)
+			call self.draw()
+			let input .= s:Input.getchar(0)
+		endwhile
+	finally
+		call self.setline(old_line)
+		call self.setpos(old_pos)
+	endtry
+	call self.__input(input, keymapping)
+endfunction
+
+
+function! s:base.__update()
+" 	call self.callevent("on_update")
+" 	if !getchar(1)
+" 		continue
+" 	endif
+"
+" 	call self.__input(s:getchar(0))
+" 	call self.draw()
+
+	call self.callevent("on_update")
+	call self.__inputting()
+" 	call self.__input(s:Input.getchar())
+	if self.is_exit()
+		return -1
+	endif
+	call self.draw()
+endfunction
+
+
+function! s:base.__main(...)
+	try
+		call self.__init()
+		call self.callevent("on_enter")
+
+		call self.__input(get(a:, 1, ""))
+		call self.draw()
+		while !self.is_exit()
+			try
+				if self.__update()
+					break
+				endif
+			catch
+				call self.callevent("on_exception")
+			endtry
+		endwhile
+	catch
+		echohl ErrorMsg | echom v:throwpoint . " " . v:exception | echohl None
+		let self.variables.exit_code = -1
+	finally
+		call self.__finish()
+		call self.callevent("on_leave")
+	endtry
+	return self.exit_code()
+endfunction
+
+
+function! s:base.__finish()
+	call self.hl_cursor_on()
+endfunction
+
+
+function! s:base.__is_exit()
+	return self.is_exit()
+endfunction
+
+
+function! s:base.is_exit()
+	return self.variables.exit
+endfunction
+
+
+function! s:base.__get_keymapping()
+	let result = {}
+" 	for module in values(self.variables.modules)
+	for module in self.variables.modules.slots()
+		if has_key(module, "keymapping")
+			if module isnot self
+				call extend(result, module.keymapping(self))
+			endif
+		endif
+	endfor
+	return extend(extend(result, self.variables.keymapping), self.keymapping())
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
new file mode 100644
index 0000000..d37d2b4
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules.vim
@@ -0,0 +1,42 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#import() abort
+    return map({'get': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#import() abort', printf("return map({'get': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+endfunction
+
+
+function! s:get(name)
+	if exists("s:" . a:name)
+		return s:{a:name}
+	endif
+	let s:{a:name} = s:V.import('Over.Commandline.Modules.' . a:name)
+	return s:{a:name}
+endfunction
+
+
+function! s:make(name, ...)
+	let module = s:get(a:name)
+	return call(module.make, a:000, module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
new file mode 100644
index 0000000..32e1dd8
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim
@@ -0,0 +1,179 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#BufferComplete#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#BufferComplete#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_uniq(list)
+	let dict = {}
+	for _ in a:list
+		let dict[_] = 0
+	endfor
+	return keys(dict)
+endfunction
+
+
+let s:module = {
+\	"name" : "BufferComplete",
+\}
+
+
+function! s:_buffer_complete()
+	return sort(s:_uniq(filter(split(join(getline(1, '$')), '\W'), '!empty(v:val)')), 1)
+endfunction
+
+
+function! s:_parse_line(line)
+	let keyword = matchstr(a:line, '\zs\w\+\ze$')
+	let pos = strchars(a:line) - strchars(keyword)
+	return [pos, keyword]
+endfunction
+
+
+function! s:_as_statusline(list, count)
+	if empty(a:list)
+		return
+	endif
+	let hl_none = "%#StatusLine#"
+	let hl_select = "%#StatusLineNC#"
+	let tail = " > "
+	let result = a:list[0]
+	let pos = 0
+	for i in range(1, len(a:list)-1)
+		if strdisplaywidth(result . " " . a:list[i]) > &columns - len(tail)
+			if a:count < i
+				break
+			else
+				let pos = -i
+			endif
+			let result = a:list[i]
+		else
+			let result .= (" " . a:list[i])
+		endif
+		if a:count == i
+			let pos = pos + i
+		endif
+	endfor
+	return join(map(split(result, " "), 'v:key == pos ? hl_select . v:val . hl_none : v:val'))
+endfunction
+
+
+function! s:module.get_complete_words()
+	return s:_buffer_complete()
+endfunction
+
+
+function! s:module.complete(cmdline)
+	call s:_finish()
+	let s:old_statusline = &statusline
+
+	let backward = a:cmdline.backward()
+	let [pos, keyword] = s:_parse_line(backward)
+
+	if !exists("s:complete")
+		let s:complete = self.get_complete_words()
+	endif
+	let s:complete_list = filter(copy(s:complete), 'v:val =~ ''^''.keyword')
+	if empty(s:complete_list)
+		return -1
+	endif
+
+	if pos == 0
+		let backward = ""
+	else
+		let backward = join(split(backward, '\zs')[ : pos-1 ], "")
+	endif
+	let s:line = backward . a:cmdline.forward()
+	let s:pos = pos
+	call a:cmdline.setline(s:line)
+
+	let s:count = 0
+endfunction
+
+
+function! s:_finish()
+	if exists("s:old_statusline")
+		let &statusline = s:old_statusline
+		unlet s:old_statusline
+		redrawstatus
+	endif
+endfunction
+
+
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("<Over>(buffer-complete)")
+\		|| a:cmdline.is_input("<Over>(buffer-complete-prev)")
+		if self.complete(a:cmdline) == -1
+			call s:_finish()
+			call a:cmdline.setchar('')
+			return
+		endif
+		if a:cmdline.is_input("<Over>(buffer-complete-prev)")
+			let s:count = len(s:complete_list) - 1
+		endif
+		call a:cmdline.setchar('')
+		call a:cmdline.tap_keyinput("Completion")
+" 	elseif a:cmdline.is_input("\<Tab>", "Completion")
+	elseif a:cmdline.is_input("<Over>(buffer-complete)", "Completion")
+\		|| a:cmdline.is_input("\<Right>", "Completion")
+		call a:cmdline.setchar('')
+		let s:count += 1
+		if s:count >= len(s:complete_list)
+			let s:count = 0
+		endif
+	elseif a:cmdline.is_input("<Over>(buffer-complete-prev)", "Completion")
+\		|| a:cmdline.is_input("\<Left>", "Completion")
+		call a:cmdline.setchar('')
+		let s:count -= 1
+		if s:count < 0
+			let s:count = len(s:complete_list) - 1
+		endif
+	else
+		if a:cmdline.untap_keyinput("Completion")
+			call a:cmdline.callevent("on_char_pre")
+		endif
+		call s:_finish()
+		return
+	endif
+	call a:cmdline.setline(s:line)
+	call a:cmdline.insert(s:complete_list[s:count], s:pos)
+	if len(s:complete_list) > 1
+		let &statusline = s:_as_statusline(s:complete_list, s:count)
+		redrawstatus
+	endif
+	if len(s:complete_list) == 1
+		call a:cmdline.untap_keyinput("Completion")
+	endif
+endfunction
+
+
+function! s:module.on_draw_pre(...)
+" 	redrawstatus
+endfunction
+
+
+function! s:module.on_leave(cmdline)
+	call s:_finish()
+	unlet! s:complete
+endfunction
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
new file mode 100644
index 0000000..0946e86
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim
@@ -0,0 +1,40 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Cancel#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Cancel#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "Cancel"
+\}
+
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("\<Esc>")
+\	|| a:cmdline.is_input("\<C-c>")
+" 		call a:cmdline.cancel()
+		call a:cmdline.exit(1)
+		call a:cmdline.setchar("")
+	endif
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
new file mode 100644
index 0000000..dab1774
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim
@@ -0,0 +1,58 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#CursorMove#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#CursorMove#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:module = {
+\	"name" : "CursorMove"
+\}
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("\<Right>")
+		call a:cmdline.line.next()
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<Left>")
+		call a:cmdline.line.prev()
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-b>")
+\		|| a:cmdline.is_input("\<Home>")
+		call a:cmdline.setline(0)
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-e>")
+\		|| a:cmdline.is_input("\<End>")
+		call a:cmdline.setline(a:cmdline.line.length())
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-Left>")
+\		|| a:cmdline.is_input("\<S-Left>")
+		call a:cmdline.setline(strridx(a:cmdline.backward()[:-2], ' ') + 1)
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-Right>")
+\		|| a:cmdline.is_input("\<S-Right>")
+		let p = stridx(a:cmdline.forward()[1:], ' ')
+		call a:cmdline.setline(p != -1 ? a:cmdline.line.pos() + p + 2 : a:cmdline.line.length())
+		call a:cmdline.setchar('')
+	endif
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
new file mode 100644
index 0000000..a47b1c4
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim
@@ -0,0 +1,56 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Delete#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Delete#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:module = {
+\	"name" : "Delete",
+\}
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("\<C-h>")
+\	|| a:cmdline.is_input("\<BS>")
+		if a:cmdline.line.length() == 0
+			return a:cmdline.exit(1)
+		else
+			call a:cmdline.line.remove_prev()
+			call a:cmdline.setchar('')
+		endif
+	elseif a:cmdline.is_input("\<Del>")
+		call a:cmdline.line.remove_pos()
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-w>")
+		let word = a:cmdline.backward_word()
+		let backward = a:cmdline.backward()[ : -strlen(word)-1 ]
+		call a:cmdline.setline(backward . a:cmdline.line.pos_char() . a:cmdline.forward())
+		call a:cmdline.setline(strchars(backward))
+		call a:cmdline.setchar('')
+	elseif a:cmdline.is_input("\<C-u>")
+		call a:cmdline.setline(a:cmdline.line.pos_char() . a:cmdline.forward())
+		call a:cmdline.setline(0)
+		call a:cmdline.setchar('')
+	endif
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
new file mode 100644
index 0000000..af4baac
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim
@@ -0,0 +1,121 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Doautocmd#import() abort
+    return map({'_vital_depends': '', 'doautocmd_user': '', 'get_cmdline': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Doautocmd#import() abort', printf("return map({'_vital_depends': '', 'doautocmd_user': '', 'get_cmdline': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:E  = s:V.import("Over.Exception")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Over.Exception",
+\	]
+endfunction
+
+
+let s:cache_command = {}
+function! s:doautocmd_user(prefix, command)
+	let group =  a:prefix . "-vital-over-commandline-doautocmd-dummy"
+	if !has_key(s:cache_command, a:prefix)
+		let s:cache_command[a:prefix] = {}
+	endif
+
+	if !has_key(s:cache_command[a:prefix], a:command)
+		execute "autocmd " . group
+\			. " User " . a:command." silent! execute ''"
+
+		if v:version > 703 || v:version == 703 && has("patch438")
+			let s:cache_command[a:prefix][a:command] = "doautocmd <nomodeline> User " . a:command
+		else
+			let s:cache_command[a:prefix][a:command] = "doautocmd User " . a:command
+		endif
+	endif
+
+	execute s:cache_command[a:prefix][a:command]
+endfunction
+
+
+let s:hooks = [
+\	"enter",
+\	"leave",
+\	"char",
+\	"char_pre",
+\	"draw",
+\	"draw_pre",
+\	"execute_pre",
+\	"execute_failed",
+\	"execute",
+\	"exception",
+\]
+
+let s:hooks_camel = [
+\	"Enter",
+\	"Leave",
+\	"Char",
+\	"CharPre",
+\	"Draw",
+\	"DrawPre",
+\	"ExecutePre",
+\	"ExecuteFailed",
+\	"Execute",
+\	"Exception",
+\]
+
+
+let s:module = {
+\	"name" : "Doautocmd",
+\}
+
+
+for s:i in range(len(s:hooks))
+	execute join([
+\		"function! s:module.on_" . s:hooks[s:i] . "(cmdline, ...)",
+\		"	let s:cmdline = a:cmdline",
+\		"	call s:doautocmd_user(self.prefix, self.prefix . " . string(s:hooks_camel[s:i]) . ")",
+\		"endfunction",
+\	], "\n")
+endfor
+
+
+function! s:get_cmdline()
+	if !exists("s:cmdline")
+		execute s:E.throw_cmd("Undefined cmdline object.", "Over.Commandline.Modules.Doautocmd")
+	endif
+	return s:cmdline
+endfunction
+
+
+function! s:make(prefix)
+	if has_key(s:cache_command, a:prefix)
+		unlet! s:cache_command[a:prefix]
+	endif
+	execute "augroup " a:prefix . "-vital-over-commandline-doautocmd-dummy"
+		autocmd!
+	augroup END
+
+	let module = deepcopy(s:module)
+	let module.prefix = a:prefix
+	return module
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
new file mode 100644
index 0000000..92e1681
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim
@@ -0,0 +1,155 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#DrawCommandline#import() abort
+    return map({'suffix': '', 'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#DrawCommandline#import() abort', printf("return map({'suffix': '', 'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "DrawCommandline"
+\}
+
+let s:cmdheight = {}
+
+function! s:cmdheight.save()
+	if has_key(self, "value")
+		return
+	endif
+	let self.value = &cmdheight
+endfunction
+
+function! s:cmdheight.restore()
+	if has_key(self, "value")
+		let &cmdheight = self.value
+		unlet self.value
+	endif
+endfunction
+
+
+function! s:cmdheight.get()
+	return self.value
+endfunction
+
+
+function! s:suffix(left, suffix)
+	let left_len = strdisplaywidth(a:left)
+	let len = &columns - left_len % &columns
+	let len = len + (&columns * (strdisplaywidth(a:suffix) > (len - 1))) - 1
+	return repeat(" ", len - strdisplaywidth(a:suffix)) . a:suffix
+" 	return printf("%" . len . "S", a:suffix)
+endfunction
+
+
+let s:old_width = 0
+function! s:_redraw(cmdline)
+	let left = a:cmdline.get_prompt() . a:cmdline.getline() . (empty(a:cmdline.line.pos_char()) ? " " : "")
+	let width = len(left) + 1
+
+	if a:cmdline.get_suffix() != ""
+		let width += len(s:suffix(left, a:cmdline.get_suffix())) - 1
+	endif
+
+	if &columns >= width && &columns <= s:old_width && s:old_width >= width
+		redraw
+		normal! :
+	elseif &columns <= width
+		normal! :
+	else
+		redraw
+	endif
+	let s:old_width = width
+
+	call s:cmdheight.save()
+	let height = max([(width - 1) / (&columns) + 1, s:cmdheight.get()])
+	if height > &cmdheight || &cmdheight > height
+		let &cmdheight = height
+		redraw
+	endif
+endfunction
+
+
+function! s:_as_echon(str)
+	return "echon " . strtrans(string(a:str))
+endfunction
+
+
+function! s:module.on_draw_pre(cmdline)
+	if empty(a:cmdline.line.pos_char())
+		let cursor = "echohl " . a:cmdline.highlights.cursor . " | echon ' '"
+	else
+		let cursor = "echohl " . a:cmdline.highlights.cursor_on . " | " . s:_as_echon(a:cmdline.line.pos_char())
+	endif
+	let suffix = ""
+	if	a:cmdline.get_suffix() != ""
+		let suffix = s:_as_echon(s:suffix(a:cmdline.get_prompt() . a:cmdline.getline() . repeat(" ", empty(a:cmdline.line.pos_char())), a:cmdline.get_suffix()))
+	endif
+	let self.draw_command  = join([
+\		"echohl " . a:cmdline.highlights.prompt,
+\		s:_as_echon(a:cmdline.get_prompt()),
+\		"echohl NONE",
+\		s:_as_echon(a:cmdline.backward()),
+\		cursor,
+\		"echohl NONE",
+\		s:_as_echon(a:cmdline.forward()),
+\		suffix,
+\	], " | ")
+
+	call s:_redraw(a:cmdline)
+endfunction
+
+
+function! s:_echon(expr)
+	echon strtrans(a:expr)
+endfunction
+
+
+function! s:module.on_draw(cmdline)
+	execute self.draw_command
+" 	execute "echohl" a:cmdline.highlights.prompt
+" 	call s:echon(a:cmdline.get_prompt())
+" 	echohl NONE
+" 	call s:echon(a:cmdline.backward())
+" 	if empty(a:cmdline.line.pos_char())
+" 		execute "echohl" a:cmdline.highlights.cursor
+" 		call s:echon(' ')
+" 	else
+" 		execute "echohl" a:cmdline.highlights.cursor_on
+" 		call s:echon(a:cmdline.line.pos_char())
+" 	endif
+" 	echohl NONE
+" 	call s:echon(a:cmdline.forward())
+" 	if	a:cmdline.get_suffix() != ""
+" 		call s:echon(s:suffix(a:cmdline.get_prompt() . a:cmdline.getline() . repeat(" ", empty(a:cmdline.line.pos_char())), a:cmdline.get_suffix()))
+" 	endif
+endfunction
+
+
+function! s:module.on_execute_pre(...)
+	call s:cmdheight.restore()
+endfunction
+
+
+function! s:module.on_leave(...)
+	call s:cmdheight.restore()
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
new file mode 100644
index 0000000..2ab8655
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim
@@ -0,0 +1,37 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#ExceptionExit#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#ExceptionExit#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "ExceptionExit",
+\}
+
+
+function! s:module.on_exception(cmdline)
+	call a:cmdline.exit(-1)
+endfunction
+
+
+function! s:make(...)
+	let result = deepcopy(s:module)
+	let result.exit_code = get(a:, 1, 0)
+	return result
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
new file mode 100644
index 0000000..87802f4
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim
@@ -0,0 +1,66 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#ExceptionMessage#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#ExceptionMessage#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:vname = expand("<sfile>:h:h:h:h:t")
+
+
+let s:module = {
+\	"name" : "ExceptionMessage",
+\}
+
+
+function! s:module.on_exception(cmdline)
+	let self.exception  = v:exception
+	let self.throwpoint = v:throwpoint
+endfunction
+
+
+function! s:module.on_draw_pre(cmdline)
+	if has_key(self, "exception")
+		call self.message(a:cmdline)
+		unlet self.exception
+	endif
+endfunction
+
+function! s:module.message(...)
+	echohl ErrorMsg
+	execute self.command string(self.prefix . " : " . self.throwpoint . " " . self.exception)
+	echohl None
+endfunction
+
+
+function! s:module.on_leave(cmdline)
+	if has_key(self, "exception")
+		call self.message(a:cmdline)
+		unlet self.exception
+	endif
+endfunction
+
+
+function! s:make(...)
+	let result = deepcopy(s:module)
+	let result.prefix = get(a:, 1, "vital-over(".s:vname.") Exception")
+	let result.command = get(a:, 2, "echom")
+	return result
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
new file mode 100644
index 0000000..f8645eb
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim
@@ -0,0 +1,40 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Exit#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Exit#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "Exit",
+\	"exit_code" : 0
+\}
+
+
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("<Over>(exit)")
+		call a:cmdline.setchar("")
+		call a:cmdline.exit(self.exit_code)
+	endif
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
new file mode 100644
index 0000000..f6a7c57
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim
@@ -0,0 +1,75 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#History#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#History#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "History",
+\	"mode" : "cmd",
+\}
+
+function! s:module.histories()
+	return map(range(1, &history), 'histget(self.mode, v:val * -1)')
+endfunction
+
+function! s:_should_match_cmdline(cmdline)
+	return a:cmdline.is_input("\<Up>")
+\		|| a:cmdline.is_input("\<Down>")
+endfunction
+
+function! s:_reset()
+	let s:cmdhist = []
+	let s:count = 0
+	let s:is_match_mode = 0 " <Up>/<Down>: true, <C-n>/<C-p>: false
+endfunction
+
+function! s:module.on_enter(...)
+	call s:_reset()
+endfunction
+
+function! s:module.on_char_pre(cmdline)
+	if !a:cmdline.is_input("\<Up>") && !a:cmdline.is_input("\<Down>")
+	\	&& !a:cmdline.is_input("\<C-p>") && !a:cmdline.is_input("\<C-n>")
+		call s:_reset()
+		return
+	else
+		if s:count == 0 && empty(s:cmdhist)
+		\	|| s:is_match_mode != s:_should_match_cmdline(a:cmdline)
+			let cmdline = '^' . a:cmdline.getline()
+			let s:is_match_mode = s:_should_match_cmdline(a:cmdline)
+			let s:cmdhist = [a:cmdline.getline()] + (s:is_match_mode ?
+			\	filter(self.histories(), 'v:val =~ cmdline') : self.histories())
+		endif
+	endif
+	call a:cmdline.setchar("")
+	if a:cmdline.is_input("\<Down>") || a:cmdline.is_input("\<C-n>")
+		let s:count = max([s:count - 1, 0])
+	endif
+	if a:cmdline.is_input("\<Up>") || a:cmdline.is_input("\<C-p>")
+		let s:count = min([s:count + 1, len(s:cmdhist)])
+	endif
+	call a:cmdline.setline(get(s:cmdhist, s:count, a:cmdline.getline()))
+endfunction
+
+function! s:make(...)
+	let module = deepcopy(s:module)
+	let module.mode = get(a:, 1, "cmd")
+	return module
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
new file mode 100644
index 0000000..ba5c2b5
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim
@@ -0,0 +1,164 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#InsertRegister#import() abort
+    return map({'_vital_depends': '', 'to_string': '', 'input': '', 'get_cmdline_cword': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#InsertRegister#import() abort', printf("return map({'_vital_depends': '', 'to_string': '', 'input': '', 'get_cmdline_cword': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:String  = s:V.import("Over.String")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Over.String",
+\	]
+endfunction
+
+
+function! s:to_string(expr)
+	return type(a:expr) == type("") ? a:expr : string(a:expr)
+endfunction
+
+
+function! s:input(cmdline)
+	let CR_index = index(a:cmdline.input_key_stack(), "\<CR>")
+	if CR_index != -1
+		let input = a:cmdline.input_key_stack_string()
+		let input = input[ : CR_index-1]
+		call a:cmdline.set_input_key_stack(a:cmdline.input_key_stack()[CR_index+1 : ])
+		return eval(input)
+	endif
+
+	let input_text = ""
+	if !empty(a:cmdline.input_key_stack())
+		let input_text = a:cmdline.input_key_stack_string()
+		call a:cmdline.set_input_key_stack([])
+	endif
+
+	call a:cmdline.hl_cursor_on()
+	try
+		redraw
+		let input = input("=", input_text, "expression")
+		if !empty(input)
+			let input = s:to_string(eval(input))
+		endif
+	catch
+		return ""
+	finally
+		call a:cmdline.hl_cursor_off()
+	endtry
+	return input
+endfunction
+
+
+let s:module = {
+\	"name" : "InsertRegister"
+\}
+
+
+
+function! s:module.reset()
+	let self.cword = expand("<cword>")
+	let self.cWORD = expand("<cWORD>")
+	let self.cfile = expand("<cfile>")
+endfunction
+
+function! s:module.on_enter(...)
+	call self.reset()
+" 	let self.prefix_key = ""
+endfunction
+
+
+function! s:get_cmdline_cword(backward, cword)
+" 	let backward = matchstr(a:backward, '.\{-}\zs\k\+$')
+	let backward = a:backward
+	if &incsearch == 0 || a:cword == "" || a:backward == "" || s:String.index(a:cword, backward) != 0
+		return a:cword
+	endif
+	return a:cword[len(backward) : ]
+endfunction
+
+
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("\<C-r>")
+		call a:cmdline.setchar('"')
+		let self.prefix_key = a:cmdline.input_key()
+		let self.old_line = a:cmdline.getline()
+		let self.old_pos  = a:cmdline.getpos()
+		return
+	elseif exists("self.prefix_key")
+\		&& a:cmdline.get_tap_key() == self.prefix_key
+		call a:cmdline.setline(self.old_line)
+		call a:cmdline.setpos(self.old_pos)
+		let char = a:cmdline.input_key()
+		if char =~ '^[0-9a-zA-z.%#:/"\-*+]$'
+			let register = tr(getreg(char), "\n", "\r")
+			call a:cmdline.setchar(register)
+		elseif char == "="
+			call a:cmdline.setchar(s:input(a:cmdline))
+		elseif char == "\<C-w>"
+			call a:cmdline.setchar(s:get_cmdline_cword(a:cmdline.backward_word(), self.cword))
+		elseif char == "\<C-a>"
+			call a:cmdline.setchar(self.cWORD)
+		elseif char == "\<C-f>"
+			call a:cmdline.setchar(self.cfile)
+		elseif char == "\<C-r>"
+			call a:cmdline.setchar('"')
+		else
+			call a:cmdline.setchar("")
+		endif
+" 		elseif a:cmdline.is_input('=', self.prefix_key)
+" 			call a:cmdline.setchar(s:input(a:cmdline))
+" 		elseif a:cmdline.is_input("\<C-w>", self.prefix_key)
+" 			call a:cmdline.setchar(self.cword)
+" 		elseif a:cmdline.is_input("\<C-a>", self.prefix_key)
+" 			call a:cmdline.setchar(self.cWORD)
+" 		elseif a:cmdline.is_input("\<C-f>", self.prefix_key)
+" 			call a:cmdline.setchar(self.cfile)
+" 		elseif a:cmdline.is_input("\<C-r>", self.prefix_key)
+" 			call a:cmdline.setchar('"')
+" 		else
+" 			call a:cmdline.setchar("")
+" 		endif
+	endif
+endfunction
+
+
+function! s:module.on_char(cmdline)
+	if a:cmdline.is_input("\<C-r>")
+		call a:cmdline.tap_keyinput(self.prefix_key)
+		call a:cmdline.disable_keymapping()
+		call a:cmdline.setpos(a:cmdline.getpos()-1)
+	else
+		if exists("self.prefix_key")
+			call a:cmdline.untap_keyinput(self.prefix_key)
+			call a:cmdline.enable_keymapping()
+			unlet! self.prefix_key
+		endif
+	endif
+endfunction
+
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
new file mode 100644
index 0000000..dc2da35
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim
@@ -0,0 +1,139 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#KeyMapping#import() abort
+    return map({'_vital_depends': '', 'make_emacs': '', 'make_vim_cmdline_mapping': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#KeyMapping#import() abort', printf("return map({'_vital_depends': '', 'make_emacs': '', 'make_vim_cmdline_mapping': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:Keymapping = a:V.import("Palette.Keymapping")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Palette.Keymapping",
+\	]
+endfunction
+
+
+let s:emacs = {
+\	"name" : "KeyMapping_emacs_like"
+\}
+
+function! s:emacs.keymapping(cmdline)
+	return {
+\		"\<C-f>" : {
+\			"key" : "\<Right>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-b>" : {
+\			"key" : "\<Left>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-n>" : {
+\			"key" : "\<Down>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-p>" : {
+\			"key" : "\<Up>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-a>" : {
+\			"key" : "\<Home>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-e>" : {
+\			"key" : "\<End>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<C-d>" : {
+\			"key" : "\<Del>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<A-d>" : {
+\			"key" : "\<C-w>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<A-b>" : {
+\			"key" : "\<S-Left>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\		"\<A-f>" : {
+\			"key" : "\<S-Right>",
+\			"noremap" : 1,
+\			"lock" : 1,
+\		},
+\	}
+endfunction
+
+
+function! s:make_emacs()
+	return deepcopy(s:emacs)
+endfunction
+
+
+let s:vim_cmdline_mapping = {
+\	"name" : "KeyMapping_vim_cmdline_mapping",
+\	"_cmaps" : {}
+\}
+
+function! s:_convert_sid(rhs, sid) abort
+	return substitute(a:rhs, '<SID>', '<SNR>' . a:sid . '_', 'g')
+endfunction
+
+function! s:_auto_cmap()
+	let cmaps = {}
+	let cmap_info = s:Keymapping.rhs_key_list("c", 0, 1)
+	" vital-over currently doesn't support <buffer> mappings
+	for c in filter(cmap_info, "v:val['buffer'] ==# 0")
+		let cmaps[s:Keymapping.escape_special_key(c['lhs'])] = {
+		\   'noremap' : c['noremap'],
+		\   'key'  : s:Keymapping.escape_special_key(s:_convert_sid(c['rhs'], c['sid'])),
+		\   'expr' : s:Keymapping.escape_special_key(c['expr']),
+		\ }
+	endfor
+	return cmaps
+endfunction
+
+
+function! s:vim_cmdline_mapping.on_enter(cmdline)
+	let self._cmaps = s:_auto_cmap()
+endfunction
+
+
+function! s:vim_cmdline_mapping.keymapping(cmdline)
+	return self._cmaps
+endfunction
+
+
+function! s:make_vim_cmdline_mapping()
+	return deepcopy(s:vim_cmdline_mapping)
+endfunction
+
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
new file mode 100644
index 0000000..62f5e16
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim
@@ -0,0 +1,55 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#NoInsert#import() abort
+    return map({'make_special_chars': '', 'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#NoInsert#import() abort', printf("return map({'make_special_chars': '', 'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+let s:module = {
+\	"name" : "NoInsert",
+\	"chars" : []
+\}
+
+
+function! s:module.is_no_insert(char)
+	return index(self.chars, a:char) >= 0
+endfunction
+
+
+function! s:module.on_char_pre(cmdline)
+	if self.is_no_insert(a:cmdline.char())
+		call a:cmdline.setchar("", 0)
+	endif
+endfunction
+
+
+function! s:make(chars)
+	let module = deepcopy(s:module)
+	let module.chars = type(a:chars) == type([]) ? a:chars : [a:chars]
+	return module
+endfunction
+
+
+function! s:make_special_chars()
+	let module = s:make([])
+	function! module.is_no_insert(char)
+		return char2nr(a:char) == 128 || char2nr(a:char) < 27
+	endfunction
+	return module
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
new file mode 100644
index 0000000..67ef760
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim
@@ -0,0 +1,40 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Paste#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Paste#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:module = {
+\	"name" : "Paste"
+\}
+
+function! s:module.on_char_pre(cmdline)
+	if a:cmdline.is_input("<Over>(paste)")
+		let register = v:register == "" ? '"' : v:register
+		call a:cmdline.insert(tr(getreg("*"), "\n", "\r"))
+		call a:cmdline.setchar('')
+	endif
+endfunction
+
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
new file mode 100644
index 0000000..c75e2b0
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim
@@ -0,0 +1,72 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Commandline#Modules#Redraw#import() abort
+    return map({'make': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Commandline#Modules#Redraw#import() abort', printf("return map({'make': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:module = {
+\	"name" : "Redraw",
+\}
+
+function! s:module.on_execute_pre(cmdline)
+	call self.redraw(a:cmdline)
+endfunction
+
+function! s:module.on_enter(...)
+	let self.is_execute = 0
+endfunction
+
+function! s:module.on_execute(...)
+	let self.is_execute = 1
+endfunction
+
+function! s:module.on_execute_failed(...)
+	let self.is_execute = 0
+endfunction
+
+function! s:module.on_leave(cmdline)
+	if self.is_execute == 0 && a:cmdline.exit_code() != -1
+		call self.redraw(a:cmdline)
+	endif
+endfunction
+
+
+" function! s:module.on_draw_pre(cmdline)
+" 	call self.redraw(a:cmdline)
+" endfunction
+
+
+function! s:module.redraw(cmdline)
+	redraw
+	" Workaround for the :set cedit=<C-c>
+	" https://github.com/osyo-manga/vital-over/issues/52
+	" https://github.com/Lokaltog/vim-easymotion/issues/177#issuecomment-53663431
+	if &cedit != "<C-c>"
+\	||(v:version > 704 || v:version == 704 && has("patch441"))
+		normal! :
+	else
+		execute "normal! :\<Esc>"
+	endif
+endfunction
+
+function! s:make()
+	return deepcopy(s:module)
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim
new file mode 100644
index 0000000..fddf3cc
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Exception.vim
@@ -0,0 +1,46 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Exception#import() abort
+    return map({'throw': '', 'throw_cmd': '', 'set_prefix': '', 'error': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Exception#import() abort', printf("return map({'throw': '', 'throw_cmd': '', 'set_prefix': '', 'error': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:vname = expand("<sfile>:h:h:t")
+let s:prefix = printf("vital-over(%s) Exception", s:vname)
+
+function! s:set_prefix(prefix)
+	let s:prefix = a:prefix
+endfunction
+
+function! s:throw_cmd(exp, where)
+	return 'throw ' . string(s:prefix . " : " . a:exp . " in " . a:where)
+endfunction
+
+
+function! s:throw(exp, where)
+	execute s:throw_cmd(a:exp, a:where)
+endfunction
+
+
+function! s:error(text, where)
+	echohl ErrorMsg
+	echom s:prefix . " : " . a:text . " in " . a:where
+	echohl None
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim
new file mode 100644
index 0000000..f4ebd1f
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Input.vim
@@ -0,0 +1,40 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Input#import() abort
+    return map({'getchar': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Input#import() abort', printf("return map({'getchar': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:getchar(...)
+	let mode = get(a:, 1, 0)
+	while 1
+		" Workaround for https://github.com/osyo-manga/vital-over/issues/53
+		try
+			let char = call("getchar", a:000)
+		catch /^Vim:Interrupt$/
+			let char = 3 " <C-c>
+		endtry
+		" Workaround for the <expr> mappings
+		if string(char) !=# "\x80\xfd`"
+			return mode == 1 ? !!char
+\				 : type(char) == type(0) ? nr2char(char) : char
+		endif
+	endwhile
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
new file mode 100644
index 0000000..c96c66c
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Keymapping.vim
@@ -0,0 +1,95 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Keymapping#import() abort
+    return map({'_vital_depends': '', 'unmapping': '', 'as_key_config': '', 'match_key': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Keymapping#import() abort', printf("return map({'_vital_depends': '', 'unmapping': '', 'as_key_config': '', 'match_key': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:String  = s:V.import("Over.String")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Over.String",
+\	]
+endfunction
+
+
+function! s:as_key_config(config)
+	let base = {
+\		"noremap" : 0,
+\		"lock"    : 0,
+\		"expr"    : 0,
+\	}
+	return type(a:config) == type({}) ? extend(base, a:config)
+\		 : extend(base, {
+\		 	"key" : a:config,
+\		 })
+endfunction
+
+
+function! s:match_key(keymapping, key)
+	let keys = sort(keys(a:keymapping))
+	return get(filter(keys, 'stridx(a:key, v:val) == 0'), -1, '')
+endfunction
+
+
+function! s:_safe_eval(expr, ...)
+	call extend(l:, get(a:, 1, {}))
+	let result = get(a:, 2, "")
+	try
+		let result = eval(a:expr)
+	catch
+		echohl ErrorMsg | echom v:exception | echohl None
+	endtry
+	return result
+endfunction
+
+
+function! s:_get_key(conf)
+" 	call extend(l:, a:conf)
+	let self = a:conf
+	return get(a:conf, "expr", 0) ? s:_safe_eval(a:conf.key, l:) : a:conf.key
+endfunction
+
+
+function! s:unmapping(keymapping, key, ...)
+	let is_locking = get(a:, 1, 0)
+	let key = s:match_key(a:keymapping, a:key)
+	if key == ""
+		return s:String.length(a:key) <= 1 ? a:key : s:unmapping(a:keymapping, a:key[0], is_locking) . s:unmapping(a:keymapping, a:key[1:], is_locking)
+	endif
+
+	let map_conf = s:as_key_config(a:keymapping[key])
+
+	let next_input = s:unmapping(a:keymapping, a:key[len(key) : ], is_locking)
+	if map_conf.lock == 0 && is_locking
+		return key . next_input
+	elseif map_conf.lock
+		return s:unmapping(a:keymapping, s:_get_key(map_conf), is_locking) . next_input
+	else
+		return s:unmapping(a:keymapping, s:_get_key(map_conf), map_conf.noremap) . next_input
+	endif
+endfunction
+
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim
new file mode 100644
index 0000000..b787ee7
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/Signals.vim
@@ -0,0 +1,119 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#Signals#import() abort
+    return map({'_vital_depends': '', 'call': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#Signals#import() abort', printf("return map({'_vital_depends': '', 'call': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:L = s:V.import("Data.List")
+endfunction
+
+
+function! s:_vital_depends()
+	return ["Data.List"]
+endfunction
+
+
+let s:base = {
+\	"variables" : {
+\		"slots" : [],
+\		"counter" : 0,
+\	}
+\}
+
+
+function! s:base.connect(slot)
+	let self.variables.counter += 1
+	let slot = { "id" : self.variables.counter, "slot" : a:slot }
+	call add(self.variables.slots, slot)
+	return slot
+endfunction
+
+
+function! s:base.disconnect(slot)
+	if empty(a:slot)
+		return -1
+	endif
+	for i in range(len(self.variables.slots))
+		if self.variables.slots[i].id == a:slot.id
+			unlet self.variables.slots[i]
+			return
+		endif
+	endfor
+	return -1
+endfunction
+
+
+function! s:base.disconnect_by(expr)
+	return self.disconnect(self.find_first_by(a:expr))
+endfunction
+
+
+function! s:call(list, func, ...)
+	let args = get(a:, 1, [])
+	let def = get(a:, 2, 0)
+	return map(copy(a:list), "has_key(v:val, a:func) ? call(v:val.".a:func.", args, v:val) : def")
+endfunction
+
+function! s:base.call(func, ...)
+	return call("s:call", [self.slots(), a:func] + a:000)
+endfunction
+
+
+function! s:base.find_by(expr)
+	return filter(copy(self.variables.slots), a:expr)
+endfunction
+
+
+function! s:base.find_first_by(expr)
+	return get(self.find_by(a:expr), 0, {})
+endfunction
+
+
+function! s:base.sort_by(expr)
+	let self.variables.slots = s:L.sort_by(self.variables.slots, a:expr)
+endfunction
+
+
+function! s:base.get_slot(val)
+	return a:val.slot
+endfunction
+
+
+function! s:base.slots()
+	return map(copy(self.variables.slots), "self.get_slot(v:val)")
+endfunction
+
+
+" function! s:base.dict()
+" 	let result = {}
+" 	for _ in self.variables.slots
+" 		let result[_.id] = _.value
+" 	endfor
+" 	return result
+" endfunction
+
+
+function! s:make()
+	let result = deepcopy(s:base)
+	return result
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim
new file mode 100644
index 0000000..f812ecb
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Over/String.vim
@@ -0,0 +1,164 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Over#String#import() abort
+    return map({'_vital_depends': '', 'length': '', 'index': '', 'split_by_keys': '', 'make': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Over#String#import() abort', printf("return map({'_vital_depends': '', 'length': '', 'index': '', 'split_by_keys': '', 'make': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:List = s:V.import("Data.List")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Data.List",
+\	]
+endfunction
+
+
+function! s:_clamp(x, max, min)
+	return min([max([a:x, a:max]), a:min])
+endfunction
+
+
+let s:base = {}
+
+function! s:base.set(item)
+	return type(a:item) == type("") ? self.set_str(a:item)
+\		 : type(a:item) == type(0)  ? self.set_pos(a:item)
+\		 : self
+endfunction
+
+function! s:base.str()
+	return join(self.list, "")
+endfunction
+
+function! s:base.set_pos(pos)
+	let self.col = s:_clamp(a:pos, 0, self.length())
+	return self
+endfunction
+
+function! s:base.backward()
+	return self.col > 0 ? join(self.list[ : self.col-1], '') : ""
+endfunction
+
+function! s:base.forward()
+	return join(self.list[self.col+1 : ], '')
+endfunction
+
+function! s:base.pos_char()
+	return get(self.list, self.col, "")
+endfunction
+
+function! s:base.set_str(str)
+	let self.list = split(a:str, '\zs')
+	let self.col  = strchars(a:str)
+	return self
+endfunction
+
+function! s:base.pos()
+	return self.col
+endfunction
+
+function! s:base.input(str)
+	call extend(self.list, split(a:str, '\zs'), self.col)
+	let self.col += len(split(a:str, '\zs'))
+	return self
+endfunction
+
+function! s:base.length()
+	return len(self.list)
+endfunction
+
+function! s:base.next()
+	return self.set_pos(self.col + 1)
+endfunction
+
+function! s:base.prev()
+	return self.set_pos(self.col - 1)
+endfunction
+
+function! s:base.remove(index)
+	if a:index < 0 || self.length() <= a:index
+		return ""
+	endif
+	let result = self.list[a:index]
+	unlet self.list[a:index]
+	if a:index < self.col
+		call self.set(self.col - 1)
+	endif
+	return result
+endfunction
+
+function! s:base.remove_pos()
+	return self.remove(self.col)
+endfunction
+
+function! s:base.remove_prev()
+	return self.remove(self.col - 1)
+endfunction
+
+function! s:base.remove_next()
+	return self.remove(self.col + 1)
+endfunction
+
+
+function! s:make(...)
+	let default = get(a:, 1, "")
+	let result = deepcopy(s:base)
+	call result.set(default)
+	return result
+endfunction
+
+" NOTE: old regexpengine has a bug with string which contains binary
+" :echo "\x80" =~ "\\%#=1\x80"   | " => 0
+" But it matches correctly with :h /collection
+" :echo "\x80" =~ "\\%#=1[\x80]" | " => 1
+" http://lingr.com/room/vim/archives/2015/02/13#message-21261450
+let s:_engine = exists("+regexpengine") ? '\%#=2' : ''
+" \<A-]> => Û\xfdQ
+" \<A-@> => À\xfeX
+let s:_regex = exists("+regexpengine")
+\	? "\\%(Û\xfdQ\\|À\xfeX\\|\x80\xfc.\\%(\x80..\\|.\\)\\|\x80..\\|.\\)\\zs"
+\	: "\\%(Û[\xfd]Q\\|À[\xfe]X\\|[\x80][\xfc].\\%([\x80]..\\|.\\)\\|[\x80]..\\|.\\)\\zs"
+function! s:_split_keystring(str, ...)
+	return split(a:str, s:_engine . '\m\%(' . get(a:, 1, '') . s:_regex . '\)')
+endfunction
+
+function! s:split_by_keys(str)
+	return s:_split_keystring(a:str, "\\%(\<Plug>\\|<Over>\\)(.\\{-})\\zs\\|")
+endfunction
+
+function! s:index(haystack, needle, ...)
+	let start = get(a:, 1, 0)
+	let ignorecase = get(a:, 2, &ignorecase)
+	if ignorecase
+		return stridx(tolower(a:haystack), tolower(a:needle), start)
+	else
+		return stridx(a:haystack, a:needle, start)
+	endif
+endfunction
+
+
+function! s:length(str)
+	return len(s:split_by_keys(a:str))
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim
new file mode 100644
index 0000000..0863461
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Capture.vim
@@ -0,0 +1,74 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Palette#Capture#import() abort
+    return map({'extend': '', 'command': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Palette#Capture#import() abort', printf("return map({'extend': '', 'command': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:verbosefiles = []
+
+function! s:_verbosefile_push(file)
+	call add(s:verbosefiles, &verbosefile)
+	let &verbosefile = a:file
+	return a:file
+endfunction
+
+
+function! s:_verbosefile_pop()
+	let filename = &verbosefile
+	let &verbosefile = get(s:verbosefiles, -1)
+	call remove(s:verbosefiles, -1)
+	return filename
+endfunction
+
+
+function! s:_reset()
+	let s:verbosefiles = []
+endfunction
+
+
+function! s:extend(dict, src)
+	for [key, value] in items(a:src)
+		let a:dict[key] = value
+		unlet value
+	endfor
+endfunction
+
+
+function! s:command(cmd, ...)
+	" Workaround : Vim 7.3.xxx in Travis and Ubuntu
+	" https://github.com/osyo-manga/vital-palette/issues/5
+" 	call extend(l:, get(a:, 1, {}))
+	if a:0 > 0
+		call s:extend(l:, a:1)
+	endif
+
+	call s:_verbosefile_push(tempname())
+	try
+		redir =>result
+		silent execute a:cmd
+	finally
+		redir END
+	endtry
+	call s:_verbosefile_pop()
+" 	let result = substitute(result, "<SRN>", "\<SNR>", "g")
+" 	let result = substitute(result, "<SID>", "\<SID>", "g")
+	return result
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim
new file mode 100644
index 0000000..7e62e90
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Highlight.vim
@@ -0,0 +1,133 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Palette#Highlight#import() abort
+    return map({'capture': '', '_vital_depends': '', 'parse': '', 'group_list': '', 'set': '', 'parse_to_name': '', 'links_to': '', 'get': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Palette#Highlight#import() abort', printf("return map({'capture': '', '_vital_depends': '', 'parse': '', 'group_list': '', 'set': '', 'parse_to_name': '', 'links_to': '', 'get': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:Message  = s:V.import("Vim.Message")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Vim.Message",
+\	]
+endfunction
+
+
+function! s:_execute(cmd)
+	execute a:cmd
+endfunction
+
+
+function! s:capture(name)
+	if hlexists(a:name) == 0
+		return ""
+	endif
+	return s:Message.capture("highlight " . a:name)
+endfunction
+
+
+function! s:links_to(highlight)
+	return matchstr(a:highlight, '^\S\+\s\+xxx links to \zs.*\ze$')
+endfunction
+
+
+function! s:parse_to_name(highlight)
+	return matchstr(a:highlight, '^\zs\w\+\ze')
+endfunction
+
+
+function! s:parse(highlight)
+	let highlight = a:highlight
+	
+	if highlight !~# '^\w\+\s\+xxx\s'
+		return {}
+	endif
+
+	let name = s:parse_to_name(a:highlight)
+	let result = { "_name" : name }
+
+	if highlight =~# '^\w\+\s\+xxx cleared'
+		let result.cleared = 1
+		return result
+	endif
+
+	let link = s:links_to(highlight)
+	if link != ""
+		let result.link = link
+		return result
+	endif
+
+	let attrs = [
+\		"term",
+\		"cterm",
+\		"ctermfg",
+\		"ctermbg",
+\		"gui",
+\		"font",
+\		"guifg",
+\		"guibg",
+\		"guisp",
+\	]
+	for attr in attrs
+		let item = matchstr(highlight, '\s' . attr . '=\zs#\?\w\+\ze')
+		if item != ""
+			let result[attr] = item
+		endif
+	endfor
+	return result
+endfunction
+
+
+function! s:get(name, ...)
+	if !hlexists(a:name)
+		return {}
+	endif
+	let result = s:parse(substitute(s:capture(a:name), "\n", "", "g"))
+	if has_key(result, "link") && get(a:, 1, 0)
+		return s:get(result.link, get(a:, 1, 0))
+	else
+		return result
+	endif
+endfunction
+
+
+function! s:set(name, config)
+	if type(a:config) == type("")
+		return s:set(a:config, s:get(a:config))
+	endif
+	if has_key(a:config, "cleared")
+		return s:_execute("highlight clear " . a:name)
+	endif
+	if has_key(a:config, "link")
+		return s:_execute("highlight link " . a:name . " " . a:config.link)
+	endif
+	return s:_execute("highlight " . a:name . " " . join(map(items(filter(a:config, "v:key !=# '_name'")), "v:val[0] . '=' . v:val[1]"), " "))
+endfunction
+
+
+function! s:group_list()
+	let highlights = split(s:Message.capture("highlight"), "\n")
+	return filter(map(highlights, "s:parse_to_name(v:val)"), "v:val != ''")
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim
new file mode 100644
index 0000000..924a22e
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Palette/Keymapping.vim
@@ -0,0 +1,121 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Palette#Keymapping#import() abort
+    return map({'capture': '', '_vital_depends': '', 'escape_special_key': '', 'rhs_key_list': '', 'parse_lhs_list': '', 'lhs_key_list': '', 'capture_list': '', 'parse_lhs': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Palette#Keymapping#import() abort', printf("return map({'capture': '', '_vital_depends': '', 'escape_special_key': '', 'rhs_key_list': '', 'parse_lhs_list': '', 'lhs_key_list': '', 'capture_list': '', 'parse_lhs': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+scriptencoding utf-8
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+let s:modep = "[nvoicsxl]"
+
+
+function! s:_vital_loaded(V)
+	let s:V = a:V
+	let s:Capture  = s:V.import("Palette.Capture")
+endfunction
+
+
+function! s:_vital_depends()
+	return [
+\		"Palette.Capture",
+\	]
+endfunction
+
+
+function! s:_capture(mode)
+	let cmd = "map"
+	if a:mode ==# "!"
+		let cmd = cmd . "!"
+	elseif a:mode =~# "[nvoicsxl]"
+		let cmd = a:mode . cmd
+	endif
+	return s:Capture.command(cmd)
+endfunction
+
+
+function! s:capture(...)
+	let mode = get(a:, 1, "")
+	let modes = split(mode, '\zs')
+	return join(map(modes, "s:_capture(v:val)"), "\n")
+endfunction
+
+
+function! s:_keymapping(str)
+	return a:str =~ '^[!nvoicsxl]\s'
+endfunction
+
+
+function! s:capture_list(...)
+	let mode = get(a:, 1, "")
+	return filter(split(s:capture(mode), "\n"), "s:_keymapping(v:val)")
+endfunction
+
+
+function! s:escape_special_key(key)
+	" Workaround : <C-?> https://github.com/osyo-manga/vital-palette/issues/5
+	if a:key ==# "<^?>"
+		return "\<C-?>"
+	endif
+	execute 'let result = "' . substitute(escape(a:key, '\"'), '\(<.\{-}>\)', '\\\1', 'g') . '"'
+	return result
+endfunction
+
+
+function! s:parse_lhs(text, ...)
+	let mode = get(a:, 1, '[!nvoicsxl]')
+	" NOTE: :map! Surpport : https://github.com/osyo-manga/vital-palette/issues/4
+	if get(a:, 1, "") =~# '[!ci]'
+		let mode = '[!ci]'
+	endif
+	return matchstr(a:text, mode . '\{1,3\}\s*\zs\S\{-}\ze\s\+')
+endfunction
+
+
+function! s:parse_lhs_list(...)
+	let mode = get(a:, 1, "")
+	return map(s:capture_list(mode), "s:parse_lhs(v:val, mode)")
+endfunction
+
+
+function! s:lhs_key_list(...)
+	let mode = get(a:, 1, "")
+	return map(s:parse_lhs_list(mode), "s:escape_special_key(v:val)")
+endfunction
+
+
+function! s:_maparg(name, mode, abbr, dict)
+	" Workaround : <C-?> https://github.com/osyo-manga/vital-palette/issues/5
+	if a:name ==# "<^?>"
+		return maparg("\<C-?>", a:mode, a:abbr, a:dict)
+	endif
+	return maparg(a:name, a:mode, a:abbr, a:dict)
+endfunction
+
+
+function! s:rhs_key_list(...)
+	let mode = get(a:, 1, "")
+	let abbr = get(a:, 2, 0)
+	let dict = get(a:, 3, 0)
+	
+	let result = []
+	for m in split(mode, '\zs')
+		let result += map(s:parse_lhs_list(m), "s:_maparg(v:val, m, abbr, dict)")
+	endfor
+	return filter(result, "empty(v:val) == 0")
+endfunction
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim
new file mode 100644
index 0000000..f123dc6
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Prelude.vim
@@ -0,0 +1,430 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Prelude#import() abort
+    return map({'escape_pattern': '', 'is_funcref': '', 'path2directory': '', 'wcswidth': '', 'is_string': '', 'input_helper': '', 'is_number': '', 'is_cygwin': '', 'path2project_directory': '', 'strwidthpart_reverse': '', 'input_safe': '', 'is_list': '', 'truncate_skipping': '', 'glob': '', 'truncate': '', 'is_dict': '', 'set_default': '', 'is_numeric': '', 'getchar_safe': '', 'substitute_path_separator': '', 'is_mac': '', 'strwidthpart': '', 'getchar': '', 'is_unix': '', 'is_windows': '', 'globpath': '', 'escape_file_searching': '', 'is_float': '', 'smart_execute_command': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Prelude#import() abort', printf("return map({'escape_pattern': '', 'is_funcref': '', 'path2directory': '', 'wcswidth': '', 'is_string': '', 'input_helper': '', 'is_number': '', 'is_cygwin': '', 'path2project_directory': '', 'strwidthpart_reverse': '', 'input_safe': '', 'is_list': '', 'truncate_skipping': '', 'glob': '', 'truncate': '', 'is_dict': '', 'set_default': '', 'is_numeric': '', 'getchar_safe': '', 'substitute_path_separator': '', 'is_mac': '', 'strwidthpart': '', 'getchar': '', 'is_unix': '', 'is_windows': '', 'globpath': '', 'escape_file_searching': '', 'is_float': '', 'smart_execute_command': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+let s:save_cpo = &cpo
+set cpo&vim
+
+if v:version > 703 ||
+\  (v:version == 703 && has('patch465'))
+  function! s:glob(expr) abort
+    return glob(a:expr, 1, 1)
+  endfunction
+else
+  function! s:glob(expr) abort
+    return split(glob(a:expr, 1), '\n')
+  endfunction
+endif
+
+if v:version > 704 ||
+\  (v:version == 704 && has('patch279'))
+  function! s:globpath(path, expr) abort
+    return globpath(a:path, a:expr, 1, 1)
+  endfunction
+else
+  function! s:globpath(path, expr) abort
+    return split(globpath(a:path, a:expr, 1), '\n')
+  endfunction
+endif
+
+" Wrapper functions for type().
+" NOTE: __TYPE_FLOAT = -1 when -float.
+" this doesn't match to anything.
+if has('patch-7.4.2071')
+  let [
+  \   s:__TYPE_NUMBER,
+  \   s:__TYPE_STRING,
+  \   s:__TYPE_FUNCREF,
+  \   s:__TYPE_LIST,
+  \   s:__TYPE_DICT,
+  \   s:__TYPE_FLOAT] = [
+        \   v:t_number,
+        \   v:t_string,
+        \   v:t_func,
+        \   v:t_list,
+        \   v:t_dict,
+        \   v:t_float]
+else
+  let [
+  \   s:__TYPE_NUMBER,
+  \   s:__TYPE_STRING,
+  \   s:__TYPE_FUNCREF,
+  \   s:__TYPE_LIST,
+  \   s:__TYPE_DICT,
+  \   s:__TYPE_FLOAT] = [
+        \   type(3),
+        \   type(''),
+        \   type(function('tr')),
+        \   type([]),
+        \   type({}),
+        \   has('float') ? type(str2float('0')) : -1]
+endif
+
+" Number or Float
+function! s:is_numeric(Value) abort
+  let _ = type(a:Value)
+  return _ ==# s:__TYPE_NUMBER
+  \   || _ ==# s:__TYPE_FLOAT
+endfunction
+
+" Number
+function! s:is_number(Value) abort
+  return type(a:Value) ==# s:__TYPE_NUMBER
+endfunction
+
+" String
+function! s:is_string(Value) abort
+  return type(a:Value) ==# s:__TYPE_STRING
+endfunction
+
+" Funcref
+function! s:is_funcref(Value) abort
+  return type(a:Value) ==# s:__TYPE_FUNCREF
+endfunction
+
+" List
+function! s:is_list(Value) abort
+  return type(a:Value) ==# s:__TYPE_LIST
+endfunction
+
+" Dictionary
+function! s:is_dict(Value) abort
+  return type(a:Value) ==# s:__TYPE_DICT
+endfunction
+
+" Float
+function! s:is_float(Value) abort
+  return type(a:Value) ==# s:__TYPE_FLOAT
+endfunction
+
+
+function! s:truncate_skipping(str, max, footer_width, separator) abort
+  call s:_warn_deprecated('truncate_skipping', 'Data.String.truncate_skipping')
+
+  let width = s:wcswidth(a:str)
+  if width <= a:max
+    let ret = a:str
+  else
+    let header_width = a:max - s:wcswidth(a:separator) - a:footer_width
+    let ret = s:strwidthpart(a:str, header_width) . a:separator
+          \ . s:strwidthpart_reverse(a:str, a:footer_width)
+  endif
+
+  return s:truncate(ret, a:max)
+endfunction
+
+function! s:truncate(str, width) abort
+  " Original function is from mattn.
+  " http://github.com/mattn/googlereader-vim/tree/master
+
+  call s:_warn_deprecated('truncate', 'Data.String.truncate')
+
+  if a:str =~# '^[\x00-\x7f]*$'
+    return len(a:str) < a:width ?
+          \ printf('%-'.a:width.'s', a:str) : strpart(a:str, 0, a:width)
+  endif
+
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  if width > a:width
+    let ret = s:strwidthpart(ret, a:width)
+    let width = s:wcswidth(ret)
+  endif
+
+  if width < a:width
+    let ret .= repeat(' ', a:width - width)
+  endif
+
+  return ret
+endfunction
+
+function! s:strwidthpart(str, width) abort
+  call s:_warn_deprecated('strwidthpart', 'Data.String.strwidthpart')
+
+  if a:width <= 0
+    return ''
+  endif
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  while width > a:width
+    let char = matchstr(ret, '.$')
+    let ret = ret[: -1 - len(char)]
+    let width -= s:wcswidth(char)
+  endwhile
+
+  return ret
+endfunction
+function! s:strwidthpart_reverse(str, width) abort
+  call s:_warn_deprecated('strwidthpart_reverse', 'Data.String.strwidthpart_reverse')
+
+  if a:width <= 0
+    return ''
+  endif
+  let ret = a:str
+  let width = s:wcswidth(a:str)
+  while width > a:width
+    let char = matchstr(ret, '^.')
+    let ret = ret[len(char) :]
+    let width -= s:wcswidth(char)
+  endwhile
+
+  return ret
+endfunction
+
+if v:version >= 703
+  " Use builtin function.
+  function! s:wcswidth(str) abort
+    call s:_warn_deprecated('wcswidth', 'Data.String.wcswidth')
+    return strwidth(a:str)
+  endfunction
+else
+  function! s:wcswidth(str) abort
+    call s:_warn_deprecated('wcswidth', 'Data.String.wcswidth')
+
+    if a:str =~# '^[\x00-\x7f]*$'
+      return strlen(a:str)
+    end
+
+    let mx_first = '^\(.\)'
+    let str = a:str
+    let width = 0
+    while 1
+      let ucs = char2nr(substitute(str, mx_first, '\1', ''))
+      if ucs == 0
+        break
+      endif
+      let width += s:_wcwidth(ucs)
+      let str = substitute(str, mx_first, '', '')
+    endwhile
+    return width
+  endfunction
+
+  " UTF-8 only.
+  function! s:_wcwidth(ucs) abort
+    let ucs = a:ucs
+    if (ucs >= 0x1100
+          \  && (ucs <= 0x115f
+          \  || ucs == 0x2329
+          \  || ucs == 0x232a
+          \  || (ucs >= 0x2e80 && ucs <= 0xa4cf
+          \      && ucs != 0x303f)
+          \  || (ucs >= 0xac00 && ucs <= 0xd7a3)
+          \  || (ucs >= 0xf900 && ucs <= 0xfaff)
+          \  || (ucs >= 0xfe30 && ucs <= 0xfe6f)
+          \  || (ucs >= 0xff00 && ucs <= 0xff60)
+          \  || (ucs >= 0xffe0 && ucs <= 0xffe6)
+          \  || (ucs >= 0x20000 && ucs <= 0x2fffd)
+          \  || (ucs >= 0x30000 && ucs <= 0x3fffd)
+          \  ))
+      return 2
+    endif
+    return 1
+  endfunction
+endif
+
+let s:is_windows = has('win16') || has('win32') || has('win64') || has('win95')
+let s:is_cygwin = has('win32unix')
+let s:is_mac = !s:is_windows && !s:is_cygwin
+      \ && (has('mac') || has('macunix') || has('gui_macvim') ||
+      \   (!isdirectory('/proc') && executable('sw_vers')))
+let s:is_unix = has('unix')
+
+function! s:is_windows() abort
+  return s:is_windows
+endfunction
+
+function! s:is_cygwin() abort
+  return s:is_cygwin
+endfunction
+
+function! s:is_mac() abort
+  return s:is_mac
+endfunction
+
+function! s:is_unix() abort
+  return s:is_unix
+endfunction
+
+function! s:_warn_deprecated(name, alternative) abort
+  try
+    echohl Error
+    echomsg 'Prelude.' . a:name . ' is deprecated!  Please use ' . a:alternative . ' instead.'
+  finally
+    echohl None
+  endtry
+endfunction
+
+function! s:smart_execute_command(action, word) abort
+  execute a:action . ' ' . (a:word ==# '' ? '' : '`=a:word`')
+endfunction
+
+function! s:escape_file_searching(buffer_name) abort
+  return escape(a:buffer_name, '*[]?{}, ')
+endfunction
+
+function! s:escape_pattern(str) abort
+  call s:_warn_deprecated(
+        \ 'escape_pattern',
+        \ 'Data.String.escape_pattern',
+        \)
+  return escape(a:str, '~"\.^$[]*')
+endfunction
+
+function! s:getchar(...) abort
+  let c = call('getchar', a:000)
+  return type(c) == type(0) ? nr2char(c) : c
+endfunction
+
+function! s:getchar_safe(...) abort
+  let c = s:input_helper('getchar', a:000)
+  return type(c) == type('') ? c : nr2char(c)
+endfunction
+
+function! s:input_safe(...) abort
+  return s:input_helper('input', a:000)
+endfunction
+
+function! s:input_helper(funcname, args) abort
+  let success = 0
+  if inputsave() !=# success
+    throw 'vital: Prelude: inputsave() failed'
+  endif
+  try
+    return call(a:funcname, a:args)
+  finally
+    if inputrestore() !=# success
+      throw 'vital: Prelude: inputrestore() failed'
+    endif
+  endtry
+endfunction
+
+function! s:set_default(var, val) abort
+  if !exists(a:var) || type({a:var}) != type(a:val)
+    let {a:var} = a:val
+  endif
+endfunction
+
+function! s:substitute_path_separator(path) abort
+  return s:is_windows ? substitute(a:path, '\\', '/', 'g') : a:path
+endfunction
+
+function! s:path2directory(path) abort
+  return s:substitute_path_separator(isdirectory(a:path) ? a:path : fnamemodify(a:path, ':p:h'))
+endfunction
+
+function! s:_path2project_directory_git(path) abort
+  let parent = a:path
+
+  while 1
+    let path = parent . '/.git'
+    if isdirectory(path) || filereadable(path)
+      return parent
+    endif
+    let next = fnamemodify(parent, ':h')
+    if next == parent
+      return ''
+    endif
+    let parent = next
+  endwhile
+endfunction
+
+function! s:_path2project_directory_svn(path) abort
+  let search_directory = a:path
+  let directory = ''
+
+  let find_directory = s:escape_file_searching(search_directory)
+  let d = finddir('.svn', find_directory . ';')
+  if d ==# ''
+    return ''
+  endif
+
+  let directory = fnamemodify(d, ':p:h:h')
+
+  " Search parent directories.
+  let parent_directory = s:path2directory(
+        \ fnamemodify(directory, ':h'))
+
+  if parent_directory !=# ''
+    let d = finddir('.svn', parent_directory . ';')
+    if d !=# ''
+      let directory = s:_path2project_directory_svn(parent_directory)
+    endif
+  endif
+  return directory
+endfunction
+
+function! s:_path2project_directory_others(vcs, path) abort
+  let vcs = a:vcs
+  let search_directory = a:path
+
+  let find_directory = s:escape_file_searching(search_directory)
+  let d = finddir(vcs, find_directory . ';')
+  if d ==# ''
+    return ''
+  endif
+  return fnamemodify(d, ':p:h:h')
+endfunction
+
+function! s:path2project_directory(path, ...) abort
+  let is_allow_empty = get(a:000, 0, 0)
+  let search_directory = s:path2directory(a:path)
+  let directory = ''
+
+  " Search VCS directory.
+  for vcs in ['.git', '.bzr', '.hg', '.svn']
+    if vcs ==# '.git'
+      let directory = s:_path2project_directory_git(search_directory)
+    elseif vcs ==# '.svn'
+      let directory = s:_path2project_directory_svn(search_directory)
+    else
+      let directory = s:_path2project_directory_others(vcs, search_directory)
+    endif
+    if directory !=# ''
+      break
+    endif
+  endfor
+
+  " Search project file.
+  if directory ==# ''
+    for d in ['build.xml', 'prj.el', '.project', 'pom.xml', 'package.json',
+          \ 'Makefile', 'configure', 'Rakefile', 'NAnt.build',
+          \ 'P4CONFIG', 'tags', 'gtags']
+      let d = findfile(d, s:escape_file_searching(search_directory) . ';')
+      if d !=# ''
+        let directory = fnamemodify(d, ':p:h')
+        break
+      endif
+    endfor
+  endif
+
+  if directory ==# ''
+    " Search /src/ directory.
+    let base = s:substitute_path_separator(search_directory)
+    if base =~# '/src/'
+      let directory = base[: strridx(base, '/src/') + 3]
+    endif
+  endif
+
+  if directory ==# '' && !is_allow_empty
+    " Use original path.
+    let directory = search_directory
+  endif
+
+  return s:substitute_path_separator(directory)
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim
new file mode 100644
index 0000000..a4c3db5
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Buffer.vim
@@ -0,0 +1,187 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Vim#Buffer#import() abort
+    return map({'parse_cmdarg': '', '_vital_depends': '', 'read_content': '', 'get_selected_text': '', 'is_cmdwin': '', 'edit_content': '', 'open': '', 'get_last_selected': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Vim#Buffer#import() abort', printf("return map({'parse_cmdarg': '', '_vital_depends': '', 'read_content': '', 'get_selected_text': '', 'is_cmdwin': '', 'edit_content': '', 'open': '', 'get_last_selected': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+let s:save_cpo = &cpo
+set cpo&vim
+
+function! s:_vital_loaded(V) abort
+  let s:V = a:V
+  let s:P = s:V.import('Prelude')
+  let s:G = s:V.import('Vim.Guard')
+endfunction
+
+function! s:_vital_depends() abort
+  return ['Prelude', 'Vim.Guard']
+endfunction
+
+if exists('*getcmdwintype')
+  function! s:is_cmdwin() abort
+    return getcmdwintype() !=# ''
+  endfunction
+else
+  function! s:is_cmdwin() abort
+    return bufname('%') ==# '[Command Line]'
+  endfunction
+endif
+
+function! s:open(buffer, opener) abort
+  let save_wildignore = &wildignore
+  let &wildignore = ''
+  try
+    if s:P.is_funcref(a:opener)
+      let loaded = !bufloaded(a:buffer)
+      call a:opener(a:buffer)
+    elseif a:buffer is 0 || a:buffer is# ''
+      let loaded = 1
+      silent execute a:opener
+      enew
+    else
+      let loaded = !bufloaded(a:buffer)
+      if s:P.is_string(a:buffer)
+        execute a:opener '`=a:buffer`'
+      elseif s:P.is_number(a:buffer)
+        silent execute a:opener
+        execute a:buffer 'buffer'
+      else
+        throw 'vital: Vim.Buffer: Unknown opener type.'
+      endif
+    endif
+  finally
+    let &wildignore = save_wildignore
+  endtry
+  return loaded
+endfunction
+
+function! s:get_selected_text(...) abort
+  echohl WarningMsg
+  echom "[WARN] s:get_selected_text() is deprecated. Use 's:get_last_selected()'."
+  echohl None
+  return call('s:get_last_selected', a:000)
+endfunction
+
+" Get the last selected text in visual mode
+" without using |gv| to avoid |textlock|.
+" NOTE:
+" * This function uses |gv| only when using |CTRL-V|
+"   because |gv| is the only way to get selected text
+"   when using <C-v>$ .
+"   Please see #192 for the details.
+" * If you don't care about |textlock|,
+"   you can use simple version of this function.
+"   https://github.com/vim-jp/vital.vim/commit/39aae80f3839fdbeebd838ff14d87327a6b889a9
+function! s:get_last_selected() abort
+  if visualmode() ==# "\<C-v>"
+    let save = getreg('"', 1)
+    let save_type = getregtype('"')
+    try
+      normal! gv""y
+      return @"
+    finally
+      call setreg('"', save, save_type)
+    endtry
+  else
+    let [begin, end] = [getpos("'<"), getpos("'>")]
+    let lastchar = matchstr(getline(end[1])[end[2]-1 :], '.')
+    if begin[1] ==# end[1]
+      let lines = [getline(begin[1])[begin[2]-1 : end[2]-2]]
+    else
+      let lines = [getline(begin[1])[begin[2]-1 :]]
+      \         + (end[1] - begin[1] <# 2 ? [] : getline(begin[1]+1, end[1]-1))
+      \         + [getline(end[1])[: end[2]-2]]
+    endif
+    return join(lines, "\n") . lastchar . (visualmode() ==# 'V' ? "\n" : '')
+  endif
+endfunction
+
+function! s:read_content(content, ...) abort
+  let options = extend({
+        \ 'tempfile': '',
+        \ 'fileformat': '',
+        \ 'encoding': '',
+        \ 'binary': 0,
+        \ 'nobinary': 0,
+        \ 'bad': '',
+        \ 'edit': 0,
+        \ 'line': '',
+        \}, get(a:000, 0, {}))
+  let tempfile = empty(options.tempfile) ? tempname() : options.tempfile
+  let optnames = [
+        \ empty(options.fileformat) ? '' : '++ff=' . options.fileformat,
+        \ empty(options.encoding) ? '' : '++enc=' . options.encoding,
+        \ empty(options.binary) ? '' : '++bin',
+        \ empty(options.nobinary) ? '' : '++nobin',
+        \ empty(options.bad) ? '' : '++bad=' . options.bad,
+        \ empty(options.edit) ? '' : '++edit',
+        \]
+  let optname = join(filter(optnames, '!empty(v:val)'))
+  try
+    call writefile(a:content, tempfile)
+    execute printf('keepalt keepjumps %sread %s%s',
+          \ options.line,
+          \ empty(optname) ? '' : optname . ' ',
+          \ fnameescape(tempfile),
+          \)
+  finally
+    call delete(tempfile)
+    execute 'bwipeout!' tempfile
+  endtry
+endfunction
+
+function! s:edit_content(content, ...) abort
+  let options = extend({
+        \ 'edit': 1,
+        \}, get(a:000, 0, {}))
+  let guard = s:G.store(['&l:modifiable'])
+  let saved_view = winsaveview()
+  try
+    let &l:modifiable=1
+    silent keepjumps %delete _
+    silent call s:read_content(a:content, options)
+    silent keepjumps 1delete _
+  finally
+    keepjump call winrestview(saved_view)
+    call guard.restore()
+  endtry
+  setlocal nomodified
+endfunction
+
+function! s:parse_cmdarg(...) abort
+  let cmdarg = get(a:000, 0, v:cmdarg)
+  let options = {}
+  if cmdarg =~# '++enc='
+    let options.encoding = matchstr(cmdarg, '++enc=\zs[^ ]\+\ze')
+  endif
+  if cmdarg =~# '++ff='
+    let options.fileformat = matchstr(cmdarg, '++ff=\zs[^ ]\+\ze')
+  endif
+  if cmdarg =~# '++bad='
+    let options.bad = matchstr(cmdarg, '++bad=\zs[^ ]\+\ze')
+  endif
+  if cmdarg =~# '++bin'
+    let options.binary = 1
+  endif
+  if cmdarg =~# '++nobin'
+    let options.nobinary = 1
+  endif
+  if cmdarg =~# '++edit'
+    let options.edit = 1
+  endif
+  return options
+endfunction
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim
new file mode 100644
index 0000000..6b46c77
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Guard.vim
@@ -0,0 +1,240 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Vim#Guard#import() abort
+    return map({'_vital_depends': '', '_vital_created': '', 'store': '', '_vital_loaded': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Vim#Guard#import() abort', printf("return map({'_vital_depends': '', '_vital_created': '', 'store': '', '_vital_loaded': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+let s:save_cpo = &cpo
+set cpo&vim
+
+" Use a Funcref as a special term _UNDEFINED
+function! s:_undefined() abort
+  return 'undefined'
+endfunction
+let s:_UNDEFINED = function('s:_undefined')
+
+function! s:_vital_loaded(V) abort
+  let s:V = a:V
+  let s:Prelude = s:V.import('Prelude')
+  let s:List = s:V.import('Data.List')
+  let s:Dict = s:V.import('Data.Dict')
+endfunction
+function! s:_vital_depends() abort
+  return ['Prelude', 'Data.List', 'Data.Dict']
+endfunction
+function! s:_vital_created(module) abort
+  " define constant variables
+  if !exists('s:const')
+    let s:const = {}
+    let s:const.is_local_variable_supported =
+        \ v:version > 703 || (v:version == 703 && has('patch560'))
+    " NOTE:
+    " The third argument is available from 7.4.242 but it had bug and that
+    " bug was fixed from 7.4.513
+    let s:const.is_third_argument_of_getreg_supported = has('patch-7.4.513')
+    lockvar s:const
+  endif
+  call extend(a:module, s:const)
+endfunction
+function! s:_throw(msg) abort
+  throw printf('vital: Vim.Guard: %s', a:msg)
+endfunction
+
+let s:option = {}
+function! s:_new_option(name) abort
+  if a:name !~# '^&'
+    call s:_throw(printf(
+          \'An option name "%s" requires to be started from "&"', a:name
+          \))
+  elseif !exists(a:name)
+    call s:_throw(printf(
+          \'An option name "%s" does not exist', a:name
+          \))
+  endif
+  let option = copy(s:option)
+  let option.name = a:name
+  let option.value = eval(a:name)
+  return option
+endfunction
+function! s:option.restore() abort
+  execute printf('let %s = %s', self.name, string(self.value))
+endfunction
+
+let s:register = {}
+function! s:_new_register(name) abort
+  if len(a:name) != 2
+    call s:_throw(printf(
+          \'A register name "%s" requires to be "@" + a single character', a:name
+          \))
+  elseif a:name !~# '^@'
+    call s:_throw(printf(
+          \'A register name "%s" requires to be started from "@"', a:name
+          \))
+  elseif a:name =~# '^@[:.%]$'
+    call s:_throw(printf(
+          \'A register name "%s" is read only', a:name
+          \))
+  elseif a:name !~# '^@[@0-9a-zA-Z#=*+~_/-]$'
+    call s:_throw(printf(
+          \'A register name "%s" does not exist. See ":help let-register"', a:name
+          \))
+  endif
+  let name = a:name ==# '@@' ? '' : a:name[1]
+  let register = copy(s:register)
+  let register.name = name
+  if s:const.is_third_argument_of_getreg_supported
+    let register.value = getreg(name, 1, 1)
+  else
+    let register.value = getreg(name, 1)
+  endif
+  let register.type = getregtype(name)
+  return register
+endfunction
+function! s:register.restore() abort
+  " https://github.com/vim/vim/commit/5a50c2255c447838d08d3b4895a3be3a41cd8eda
+  if has('patch-7.4.243') || self.name !=# '='
+    call setreg(self.name, self.value, self.type)
+  else
+    let @= = self.value
+  endif
+endfunction
+
+let s:environment = {}
+function! s:_new_environment(name) abort
+  if a:name !~# '^\$'
+    call s:_throw(printf(
+          \'An environment variable name "%s" requires to be started from "$"', a:name
+          \))
+  elseif !exists(a:name)
+    call s:_throw(printf(
+          \'An environment variable name "%s" does not exist. While Vim cannot unlet environment variable, it requires to exist', a:name
+          \))
+  endif
+  let environment = copy(s:environment)
+  let environment.name = a:name
+  let environment.value = eval(a:name)
+  return environment
+endfunction
+function! s:environment.restore() abort
+  execute printf('let %s = %s', self.name, string(self.value))
+endfunction
+
+let s:variable = {}
+function! s:_new_variable(name, ...) abort
+  if a:0 == 0
+    let m = matchlist(a:name, '^\([bwtg]:\)\(.*\)$')
+    if empty(m)
+      call s:_throw(printf(
+            \ join([
+            \   'An variable name "%s" requires to start from b:, w:, t:, or g:',
+            \   'while no {namespace} is specified',
+            \ ]),
+            \ a:name,
+            \))
+    endif
+    let [prefix, name] = m[1 : 2]
+    let namespace = eval(prefix)
+  else
+    let name = a:name
+    let namespace = a:1
+  endif
+  let variable = copy(s:variable)
+  let variable.name = name
+  let variable.value = get(namespace, name, s:_UNDEFINED)
+  let variable.value =
+        \ type(variable.value) == type({}) || type(variable.value) == type([])
+        \   ? deepcopy(variable.value)
+        \   : variable.value
+  let variable._namespace = namespace
+  return variable
+endfunction
+function! s:variable.restore() abort
+  " unlet the variable to prevent variable type mis-match in case
+  silent! unlet! self._namespace[self.name]
+  if type(self.value) == type(s:_UNDEFINED) && self.value == s:_UNDEFINED
+    " do nothing, leave the variable as undefined
+  else
+    let self._namespace[self.name] = self.value
+  endif
+endfunction
+
+let s:instance = {}
+function! s:_new_instance(instance, ...) abort
+  let shallow = get(a:000, 0, 0)
+  if !s:Prelude.is_list(a:instance) && !s:Prelude.is_dict(a:instance)
+    call s:_throw(printf(
+          \'An instance "%s" requires to be List or Dictionary', string(a:instance)
+          \))
+  endif
+  let instance = copy(s:instance)
+  let instance.instance = a:instance
+  let instance.values = shallow ? copy(a:instance) : deepcopy(a:instance)
+  return instance
+endfunction
+function! s:instance.restore() abort
+  if s:Prelude.is_list(self.instance)
+    call s:List.clear(self.instance)
+  else
+    call s:Dict.clear(self.instance)
+  endif
+  call extend(self.instance, self.values)
+endfunction
+
+let s:guard = {}
+function! s:store(targets) abort
+  let resources = []
+  for meta in a:targets
+    if s:Prelude.is_list(meta)
+      if len(meta) == 1
+        call add(resources, s:_new_instance(meta[0]))
+      elseif len(meta) == 2
+        if s:Prelude.is_string(meta[0])
+          call add(resources, call('s:_new_variable', meta))
+        else
+          call add(resources, call('s:_new_instance', meta))
+        endif
+      else
+        call s:_throw('List assignment requires one or two elements')
+      endif
+    elseif type(meta) == type('')
+      if meta =~# '^[bwtgls]:'
+        " Note:
+        " To improve an error message, handle l:XXX or s:XXX as well
+        call add(resources, s:_new_variable(meta))
+      elseif meta =~# '^&'
+        call add(resources, s:_new_option(meta))
+      elseif meta =~# '^@'
+        call add(resources, s:_new_register(meta))
+      elseif meta =~# '^\$'
+        call add(resources, s:_new_environment(meta))
+      else
+        call s:_throw(printf(
+              \ 'Unknown value "%s" was specified',
+              \ meta
+              \))
+      endif
+    endif
+    unlet meta
+  endfor
+  let guard = copy(s:guard)
+  let guard._resources = resources
+  return guard
+endfunction
+function! s:guard.restore() abort
+  for resource in self._resources
+    call resource.restore()
+  endfor
+endfunction
+
+let &cpo = s:save_cpo
+unlet! s:save_cpo
+" vim:set et ts=2 sts=2 sw=2 tw=0 fdm=marker:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim
new file mode 100644
index 0000000..ced76b7
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/_easymotion/Vim/Message.vim
@@ -0,0 +1,80 @@
+" ___vital___
+" NOTE: lines between '" ___vital___' is generated by :Vitalize.
+" Do not mofidify the code nor insert new lines before '" ___vital___'
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! vital#_easymotion#Vim#Message#import() abort
+    return map({'capture': '', 'echomsg': '', 'echo': '', 'warn': '', 'get_hit_enter_max_length': '', 'error': ''},  'function("s:" . v:key)')
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  execute join(['function! vital#_easymotion#Vim#Message#import() abort', printf("return map({'capture': '', 'echomsg': '', 'echo': '', 'warn': '', 'get_hit_enter_max_length': '', 'error': ''}, \"function('<SNR>%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n")
+  delfunction s:_SID
+endif
+" ___vital___
+let s:save_cpo = &cpo
+set cpo&vim
+
+
+
+function! s:echo(hl, msg) abort
+  execute 'echohl' a:hl
+  try
+    echo a:msg
+  finally
+    echohl None
+  endtry
+endfunction
+
+function! s:echomsg(hl, msg) abort
+  execute 'echohl' a:hl
+  try
+    for m in split(a:msg, "\n")
+      echomsg m
+    endfor
+  finally
+    echohl None
+  endtry
+endfunction
+
+function! s:error(msg) abort
+  call s:echomsg('ErrorMsg', a:msg)
+endfunction
+
+function! s:warn(msg) abort
+  call s:echomsg('WarningMsg', a:msg)
+endfunction
+
+function! s:capture(command) abort
+  try
+    redir => out
+    silent execute a:command
+  finally
+    redir END
+  endtry
+  return out
+endfunction
+
+" * Get max length of |hit-enter|.
+"   If a string length of a message is greater than the max length,
+"   Vim waits for user input according to |hit-enter|.
+" XXX: Those fixed values may be different between different OSes?
+"      Currently tested on only Windows.
+function! s:get_hit_enter_max_length() abort
+  let maxlen = &columns * &cmdheight - 1
+  if &ruler
+    " TODO
+  endif
+  if &showcmd
+    let maxlen -= 11
+  endif
+  return maxlen
+endfunction
+
+
+
+let &cpo = s:save_cpo
+unlet s:save_cpo
+
+" vim:set et ts=2 sts=2 sw=2 tw=0:
diff --git a/vim/plugins/vim-easymotion/autoload/vital/easymotion.vim b/vim/plugins/vim-easymotion/autoload/vital/easymotion.vim
new file mode 100644
index 0000000..d428cc2
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/easymotion.vim
@@ -0,0 +1,339 @@
+let s:plugin_name = expand('<sfile>:t:r')
+let s:vital_base_dir = expand('<sfile>:h')
+let s:project_root = expand('<sfile>:h:h:h')
+let s:is_vital_vim = s:plugin_name is# 'vital'
+
+let s:loaded = {}
+let s:cache_sid = {}
+
+" function() wrapper
+if v:version > 703 || v:version == 703 && has('patch1170')
+  function! s:_function(fstr) abort
+    return function(a:fstr)
+  endfunction
+else
+  function! s:_SID() abort
+    return matchstr(expand('<sfile>'), '<SNR>\zs\d\+\ze__SID$')
+  endfunction
+  let s:_s = '<SNR>' . s:_SID() . '_'
+  function! s:_function(fstr) abort
+    return function(substitute(a:fstr, 's:', s:_s, 'g'))
+  endfunction
+endif
+
+function! vital#{s:plugin_name}#new() abort
+  return s:new(s:plugin_name)
+endfunction
+
+function! vital#{s:plugin_name}#import(...) abort
+  if !exists('s:V')
+    let s:V = s:new(s:plugin_name)
+  endif
+  return call(s:V.import, a:000, s:V)
+endfunction
+
+let s:Vital = {}
+
+function! s:new(plugin_name) abort
+  let base = deepcopy(s:Vital)
+  let base._plugin_name = a:plugin_name
+  return base
+endfunction
+
+function! s:vital_files() abort
+  if !exists('s:vital_files')
+    let s:vital_files = map(
+    \   s:is_vital_vim ? s:_global_vital_files() : s:_self_vital_files(),
+    \   'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")')
+  endif
+  return copy(s:vital_files)
+endfunction
+let s:Vital.vital_files = s:_function('s:vital_files')
+
+function! s:import(name, ...) abort dict
+  let target = {}
+  let functions = []
+  for a in a:000
+    if type(a) == type({})
+      let target = a
+    elseif type(a) == type([])
+      let functions = a
+    endif
+    unlet a
+  endfor
+  let module = self._import(a:name)
+  if empty(functions)
+    call extend(target, module, 'keep')
+  else
+    for f in functions
+      if has_key(module, f) && !has_key(target, f)
+        let target[f] = module[f]
+      endif
+    endfor
+  endif
+  return target
+endfunction
+let s:Vital.import = s:_function('s:import')
+
+function! s:load(...) abort dict
+  for arg in a:000
+    let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg]
+    let target = split(join(as, ''), '\W\+')
+    let dict = self
+    let dict_type = type({})
+    while !empty(target)
+      let ns = remove(target, 0)
+      if !has_key(dict, ns)
+        let dict[ns] = {}
+      endif
+      if type(dict[ns]) == dict_type
+        let dict = dict[ns]
+      else
+        unlet dict
+        break
+      endif
+    endwhile
+    if exists('dict')
+      call extend(dict, self._import(name))
+    endif
+    unlet arg
+  endfor
+  return self
+endfunction
+let s:Vital.load = s:_function('s:load')
+
+function! s:unload() abort dict
+  let s:loaded = {}
+  let s:cache_sid = {}
+  unlet! s:vital_files
+endfunction
+let s:Vital.unload = s:_function('s:unload')
+
+function! s:exists(name) abort dict
+  if a:name !~# '\v^\u\w*%(\.\u\w*)*$'
+    throw 'vital: Invalid module name: ' . a:name
+  endif
+  return s:_module_path(a:name) isnot# ''
+endfunction
+let s:Vital.exists = s:_function('s:exists')
+
+function! s:search(pattern) abort dict
+  let paths = s:_extract_files(a:pattern, self.vital_files())
+  let modules = sort(map(paths, 's:_file2module(v:val)'))
+  return s:_uniq(modules)
+endfunction
+let s:Vital.search = s:_function('s:search')
+
+function! s:plugin_name() abort dict
+  return self._plugin_name
+endfunction
+let s:Vital.plugin_name = s:_function('s:plugin_name')
+
+function! s:_self_vital_files() abort
+  let builtin = printf('%s/__%s__/', s:vital_base_dir, s:plugin_name)
+  let installed = printf('%s/_%s/', s:vital_base_dir, s:plugin_name)
+  let base = builtin . ',' . installed
+  return split(globpath(base, '**/*.vim', 1), "\n")
+endfunction
+
+function! s:_global_vital_files() abort
+  let pattern = 'autoload/vital/__*__/**/*.vim'
+  return split(globpath(&runtimepath, pattern, 1), "\n")
+endfunction
+
+function! s:_extract_files(pattern, files) abort
+  let tr = {'.': '/', '*': '[^/]*', '**': '.*'}
+  let target = substitute(a:pattern, '\.\|\*\*\?', '\=tr[submatch(0)]', 'g')
+  let regexp = printf('autoload/vital/[^/]\+/%s.vim$', target)
+  return filter(a:files, 'v:val =~# regexp')
+endfunction
+
+function! s:_file2module(file) abort
+  let filename = fnamemodify(a:file, ':p:gs?[\\/]?/?')
+  let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$')
+  return join(split(tail, '[\\/]\+'), '.')
+endfunction
+
+" @param {string} name e.g. Data.List
+function! s:_import(name) abort dict
+  if has_key(s:loaded, a:name)
+    return copy(s:loaded[a:name])
+  endif
+  let module = self._get_module(a:name)
+  if has_key(module, '_vital_created')
+    call module._vital_created(module)
+  endif
+  let export_module = filter(copy(module), 'v:key =~# "^\\a"')
+  " Cache module before calling module.vital_loaded() to avoid cyclic
+  " dependences but remove the cache if module._vital_loaded() fails.
+  " let s:loaded[a:name] = export_module
+  let s:loaded[a:name] = export_module
+  if has_key(module, '_vital_loaded')
+    try
+      call module._vital_loaded(vital#{s:plugin_name}#new())
+    catch
+      unlet s:loaded[a:name]
+      throw 'vital: fail to call ._vital_loaded(): ' . v:exception
+    endtry
+  endif
+  return copy(s:loaded[a:name])
+endfunction
+let s:Vital._import = s:_function('s:_import')
+
+" s:_get_module() returns module object wihch has all script local functions.
+function! s:_get_module(name) abort dict
+  let funcname = s:_import_func_name(self.plugin_name(), a:name)
+  if s:_exists_autoload_func_with_source(funcname)
+    return call(funcname, [])
+  else
+    return s:_get_builtin_module(a:name)
+  endif
+endfunction
+
+function! s:_get_builtin_module(name) abort
+ return s:sid2sfuncs(s:_module_sid(a:name))
+endfunction
+
+if s:is_vital_vim
+  " For vital.vim, we can use s:_get_builtin_module directly
+  let s:Vital._get_module = s:_function('s:_get_builtin_module')
+else
+  let s:Vital._get_module = s:_function('s:_get_module')
+endif
+
+function! s:_import_func_name(plugin_name, module_name) abort
+  return printf('vital#_%s#%s#import', a:plugin_name, s:_dot_to_sharp(a:module_name))
+endfunction
+
+function! s:_module_sid(name) abort
+  let path = s:_module_path(a:name)
+  if !filereadable(path)
+    throw 'vital: module not found: ' . a:name
+  endif
+  let vital_dir = s:is_vital_vim ? '__\w\+__' : printf('_\{1,2}%s\%%(__\)\?', s:plugin_name)
+  let base = join([vital_dir, ''], '[/\\]\+')
+  let p = base . substitute('' . a:name, '\.', '[/\\\\]\\+', 'g')
+  let sid = s:_sid(path, p)
+  if !sid
+    call s:_source(path)
+    let sid = s:_sid(path, p)
+    if !sid
+      throw printf('vital: cannot get <SID> from path: %s', path)
+    endif
+  endif
+  return sid
+endfunction
+
+function! s:_module_path(name) abort
+  return get(s:_extract_files(a:name, s:vital_files()), 0, '')
+endfunction
+
+function! s:_module_sid_base_dir() abort
+  return s:is_vital_vim ? &rtp : s:project_root
+endfunction
+
+function! s:_dot_to_sharp(name) abort
+  return substitute(a:name, '\.', '#', 'g')
+endfunction
+
+" It will sources autoload file if a given func is not already defined.
+function! s:_exists_autoload_func_with_source(funcname) abort
+  if exists('*' . a:funcname)
+    " Return true if a given func is already defined
+    return 1
+  endif
+  " source a file which may include a given func definition and try again.
+  let path = 'autoload/' . substitute(substitute(a:funcname, '#[^#]*$', '.vim', ''), '#', '/', 'g')
+  call s:_runtime(path)
+  return exists('*' . a:funcname)
+endfunction
+
+function! s:_runtime(path) abort
+  execute 'runtime' fnameescape(a:path)
+endfunction
+
+function! s:_source(path) abort
+  execute 'source' fnameescape(a:path)
+endfunction
+
+" @vimlint(EVL102, 1, l:_)
+" @vimlint(EVL102, 1, l:__)
+function! s:_sid(path, filter_pattern) abort
+  let unified_path = s:_unify_path(a:path)
+  if has_key(s:cache_sid, unified_path)
+    return s:cache_sid[unified_path]
+  endif
+  for line in filter(split(s:_redir(':scriptnames'), "\n"), 'v:val =~# a:filter_pattern')
+    let [_, sid, path; __] = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$')
+    if s:_unify_path(path) is# unified_path
+      let s:cache_sid[unified_path] = sid
+      return s:cache_sid[unified_path]
+    endif
+  endfor
+  return 0
+endfunction
+
+function! s:_redir(cmd) abort
+  let [save_verbose, save_verbosefile] = [&verbose, &verbosefile]
+  set verbose=0 verbosefile=
+  redir => res
+    silent! execute a:cmd
+  redir END
+  let [&verbose, &verbosefile] = [save_verbose, save_verbosefile]
+  return res
+endfunction
+
+if filereadable(expand('<sfile>:r') . '.VIM') " is case-insensitive or not
+  let s:_unify_path_cache = {}
+  " resolve() is slow, so we cache results.
+  " Note: On windows, vim can't expand path names from 8.3 formats.
+  " So if getting full path via <sfile> and $HOME was set as 8.3 format,
+  " vital load duplicated scripts. Below's :~ avoid this issue.
+  function! s:_unify_path(path) abort
+    if has_key(s:_unify_path_cache, a:path)
+      return s:_unify_path_cache[a:path]
+    endif
+    let value = tolower(fnamemodify(resolve(fnamemodify(
+    \                   a:path, ':p')), ':~:gs?[\\/]?/?'))
+    let s:_unify_path_cache[a:path] = value
+    return value
+  endfunction
+else
+  function! s:_unify_path(path) abort
+    return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?'))
+  endfunction
+endif
+
+" copied and modified from Vim.ScriptLocal
+let s:SNR = join(map(range(len("\<SNR>")), '"[\\x" . printf("%0x", char2nr("\<SNR>"[v:val])) . "]"'), '')
+function! s:sid2sfuncs(sid) abort
+  let fs = split(s:_redir(printf(':function /^%s%s_', s:SNR, a:sid)), "\n")
+  let r = {}
+  let pattern = printf('\m^function\s<SNR>%d_\zs\w\{-}\ze(', a:sid)
+  for fname in map(fs, 'matchstr(v:val, pattern)')
+    let r[fname] = function(s:_sfuncname(a:sid, fname))
+  endfor
+  return r
+endfunction
+
+"" Return funcname of script local functions with SID
+function! s:_sfuncname(sid, funcname) abort
+  return printf('<SNR>%s_%s', a:sid, a:funcname)
+endfunction
+
+if exists('*uniq')
+  function! s:_uniq(list) abort
+    return uniq(a:list)
+  endfunction
+else
+  function! s:_uniq(list) abort
+    let i = len(a:list) - 1
+    while 0 < i
+      if a:list[i] ==# a:list[i - 1]
+        call remove(a:list, i)
+      endif
+      let i -= 1
+    endwhile
+    return a:list
+  endfunction
+endif
diff --git a/vim/plugins/vim-easymotion/autoload/vital/easymotion.vital b/vim/plugins/vim-easymotion/autoload/vital/easymotion.vital
new file mode 100644
index 0000000..82ea097
--- /dev/null
+++ b/vim/plugins/vim-easymotion/autoload/vital/easymotion.vital
@@ -0,0 +1,20 @@
+easymotion
+882de6964d10595e839ccbcc0fb20b7ff14e43cb
+
+Over.Commandline.Base
+Over.Commandline.Modules.Cancel
+Over.Commandline.Modules.BufferComplete
+Over.Commandline.Modules.Paste
+Over.Commandline.Modules.KeyMapping
+Over.Commandline.Modules.Doautocmd
+Over.Commandline.Modules.CursorMove
+Over.Commandline.Modules.Delete
+Over.Commandline.Modules.Redraw
+Over.Commandline.Modules.InsertRegister
+Over.Commandline.Modules.History
+Over.Commandline.Modules.NoInsert
+Over.Commandline.Modules.Exit
+Over.Commandline.Modules.DrawCommandline
+Over.Commandline.Modules.ExceptionMessage
+Over.Commandline.Modules.ExceptionExit
+HitAHint.Motion
diff --git a/vim/plugins/vim-easymotion/doc/easymotion.txt b/vim/plugins/vim-easymotion/doc/easymotion.txt
new file mode 100644
index 0000000..845681a
--- /dev/null
+++ b/vim/plugins/vim-easymotion/doc/easymotion.txt
@@ -0,0 +1,1232 @@
+*easymotion.txt*	Version 3.0
+
+
+            ______                  __  ___       __  _
+           / ____/____ ________  __/  |/  /____  / /_(_)____  ____
+          / __/  / __ `/ ___/ / / / /|_/ // __ \/ __/ // __ \/ __ \
+         / /___ / /_/ (__  ) /_/ / /  / // /_/ / /_/ // /_/ / / / /
+        /_____/ \__,_/____/\__, /_/  /_/ \____/\__/_/ \____/_/ /_/
+                          /____/
+                                  - Vim motions on speed!
+
+
+==============================================================================
+CONTENTS                                                 *easymotion-contents*
+
+    Introduction ....................... |easymotion-introduction|
+    Usage .............................. |easymotion-usage|
+       Default mappings ................ |easymotion-default-mappings|
+       More mappings ................... |easymotion-more-mappings|
+    Requirements ....................... |easymotion-requirements|
+    Configuration ...................... |easymotion-configuration|
+       EasyMotion_keys ................. |EasyMotion_keys|
+       EasyMotion_do_shade ............. |EasyMotion_do_shade|
+       EasyMotion_do_mapping ........... |EasyMotion_do_mapping|
+       EasyMotion_grouping ............. |EasyMotion_grouping|
+       EasyMotion_smartcase ............ |EasyMotion_smartcase|
+       EasyMotion_smartsign ............ |EasyMotion_smartsign|
+       EasyMotion_use_migemo ........... |EasyMotion_use_migemo|
+       EasyMotion_use_upper  ........... |EasyMotion_use_upper|
+       EasyMotion_enter_jump_first ..... |EasyMotion_enter_jump_first|
+       EasyMotion_prompt ............... |EasyMotion_prompt|
+       EasyMotion_highlight ............ |EasyMotion_highlight|
+       EasyMotion_add_search_history ... |EasyMotion_add_search_history|
+       EasyMotion_off_screen_search .... |EasyMotion_off_screen_search|
+       EasyMotion_disable_two_key_combo. |EasyMotion_disable_two_key_combo|
+       EasyMotion_verbose .............. |EasyMotion_verbose|
+       Custom highlighting ............. |easymotion-custom-hl|
+       Custom mappings ................. |easymotion-custom-mappings|
+           Leader key .................. |easymotion-leader-key|
+           Custom keys ................. |easymotion-custom-keys|
+    License ............................ |easymotion-license|
+    Known bugs ......................... |easymotion-known-bugs|
+    Contributing ....................... |easymotion-contributing|
+    Credits ............................ |easymotion-credits|
+
+==============================================================================
+Introduction                               *easymotion* *easymotion-introduction*
+
+EasyMotion provides a much simpler way to use some motions in vim. It takes
+the <number> out of <number>w or <number>f{char} by highlighting all possible
+choices and allowing you to press one key to jump directly to the target.
+
+When one of the available motions is triggered, all visible text preceding or
+following the cursor is faded, and motion targets are highlighted.
+
+==============================================================================
+Usage                                                        *easymotion-usage*
+
+EasyMotion is triggered by one of the provided mappings (see
+|easymotion-default-mappings| for details).
+
+Example: >
+
+    <cursor>Lorem ipsum dolor sit amet.
+
+Type <Leader><Leader>w to trigger the word motion |w|. See
+|easymotion-leader-key| for details about the leader key. When the
+motion is triggered, the text is updated (no braces are actually added,
+the text is highlighted in red by default): >
+
+    <cursor>Lorem {a}psum {b}olor {c}it {d}met.
+
+Press "c" to jump to the beginning of the word "sit": >
+
+    Lorem ipsum dolor <cursor>sit amet.
+
+Similarly, if you're looking for an "o", you can use the |f| motion.
+Type <Leader><Leader>fo, and all "o" characters are highlighted: >
+
+    <cursor>L{a}rem ipsum d{b}l{c}r sit amet.
+
+Press "b" to jump to the second "o": >
+
+    Lorem ipsum d<cursor>olor sit amet.
+
+And that's it!
+
+------------------------------------------------------------------------------
+Default mappings                                  *easymotion-default-mappings*
+
+The default configuration defines the following mappings in normal,
+visual and operator-pending mode if |g:EasyMotion_do_mapping| is on:
+
+Note: The default leader has been changed to <Leader><Leader> to avoid
+      conflicts with other plugins you may have installed
+
+    Default Mapping      | Details
+    ---------------------|----------------------------------------------
+    <Leader>f{char}      | Find {char} to the right. See |f|.
+    <Leader>F{char}      | Find {char} to the left. See |F|.
+    <Leader>t{char}      | Till before the {char} to the right. See |t|.
+    <Leader>T{char}      | Till after the {char} to the left. See |T|.
+    <Leader>w            | Beginning of word forward. See |w|.
+    <Leader>W            | Beginning of WORD forward. See |W|.
+    <Leader>b            | Beginning of word backward. See |b|.
+    <Leader>B            | Beginning of WORD backward. See |B|.
+    <Leader>e            | End of word forward. See |e|.
+    <Leader>E            | End of WORD forward. See |E|.
+    <Leader>ge           | End of word backward. See |ge|.
+    <Leader>gE           | End of WORD backward. See |gE|.
+    <Leader>j            | Line downward. See |j|.
+    <Leader>k            | Line upward. See |k|.
+    <Leader>n            | Jump to latest "/" or "?" forward. See |n|.
+    <Leader>N            | Jump to latest "/" or "?" backward. See |N|.
+    <Leader>s            | Find(Search) {char} forward and backward.
+                         | See |f| and |F|.
+
+See |easymotion-leader-key| and |mapleader| for details about the leader key.
+See |easymotion-custom-mappings| for customizing the default mappings.
+
+EasyMotion <Plug> table                                *easymotion-plug-table*
+
+    <Plug> Mapping Table | Default
+    ---------------------|----------------------------------------------
+    <Plug>(easymotion-f) | <Leader>f{char}
+    <Plug>(easymotion-F) | <Leader>F{char}
+    <Plug>(easymotion-t) | <Leader>t{char}
+    <Plug>(easymotion-T) | <Leader>T{char}
+    <Plug>(easymotion-w) | <Leader>w
+    <Plug>(easymotion-W) | <Leader>W
+    <Plug>(easymotion-b) | <Leader>b
+    <Plug>(easymotion-B) | <Leader>B
+    <Plug>(easymotion-e) | <Leader>e
+    <Plug>(easymotion-E) | <Leader>E
+    <Plug>(easymotion-ge)| <Leader>ge
+    <Plug>(easymotion-gE)| <Leader>gE
+    <Plug>(easymotion-j) | <Leader>j
+    <Plug>(easymotion-k) | <Leader>k
+    <Plug>(easymotion-n) | <Leader>n
+    <Plug>(easymotion-N) | <Leader>N
+    <Plug>(easymotion-s) | <Leader>s
+
+    More <Plug> Mapping Table         | (No assignment by default)
+    ----------------------------------|---------------------------------
+    <Plug>(easymotion-bd-f)           | See |<Plug>(easymotion-s)|
+    <Plug>(easymotion-bd-t)           | See |<Plug>(easymotion-bd-t)|
+    <Plug>(easymotion-bd-w)           | See |<Plug>(easymotion-bd-w)|
+    <Plug>(easymotion-bd-W)           | See |<Plug>(easymotion-bd-W)|
+    <Plug>(easymotion-bd-e)           | See |<Plug>(easymotion-bd-e)|
+    <Plug>(easymotion-bd-E)           | See |<Plug>(easymotion-bd-E)|
+    <Plug>(easymotion-bd-jk)          | See |<Plug>(easymotion-bd-jk)|
+    <Plug>(easymotion-bd-n)           | See |<Plug>(easymotion-bd-n)|
+    <Plug>(easymotion-jumptoanywhere) | See |<Plug>(easymotion-jumptoanywhere)|
+    <Plug>(easymotion-repeat)         | See |<Plug>(easymotion-repeat)|
+    <Plug>(easymotion-next)           | See |<Plug>(easymotion-next)|
+    <Plug>(easymotion-prev)           | See |<Plug>(easymotion-prev)|
+    <Plug>(easymotion-sol-j)          | See |<Plug>(easymotion-sol-j)|
+    <Plug>(easymotion-sol-k)          | See |<Plug>(easymotion-sol-k)|
+    <Plug>(easymotion-eol-j)          | See |<Plug>(easymotion-eol-j)|
+    <Plug>(easymotion-eol-k)          | See |<Plug>(easymotion-eol-k)|
+    <Plug>(easymotion-iskeyword-w)    | See |<Plug>(easymotion-iskeyword-w)|
+    <Plug>(easymotion-iskeyword-b)    | See |<Plug>(easymotion-iskeyword-b)|
+    <Plug>(easymotion-iskeyword-bd-w) | See |<Plug>(easymotion-iskeyword-bd-w)|
+    <Plug>(easymotion-iskeyword-e)    | See |<Plug>(easymotion-iskeyword-e)|
+    <Plug>(easymotion-iskeyword-ge)   | See |<Plug>(easymotion-iskeyword-ge)|
+    <Plug>(easymotion-iskeyword-bd-e) | See |<Plug>(easymotion-iskeyword-bd-e)|
+    <Plug>(easymotion-vim-n)          | See |<Plug>(easymotion-vim-n)|
+    <Plug>(easymotion-vim-N)          | See |<Plug>(easymotion-vim-N)|
+                                      |
+    Within Line Motion                | See |easymotion-within-line|
+    ----------------------------------|---------------------------------
+    <Plug>(easymotion-sl)             | See |<Plug>(easymotion-sl)|
+    <Plug>(easymotion-fl)             | See |<Plug>(easymotion-fl)|
+    <Plug>(easymotion-Fl)             | See |<Plug>(easymotion-Fl)|
+    <Plug>(easymotion-bd-fl)          | See |<Plug>(easymotion-sl)|
+    <Plug>(easymotion-tl)             | See |<Plug>(easymotion-tl)|
+    <Plug>(easymotion-Tl)             | See |<Plug>(easymotion-Tl)|
+    <Plug>(easymotion-bd-tl)          | See |<Plug>(easymotion-bd-tl)|
+    <Plug>(easymotion-wl)             | See |<Plug>(easymotion-wl)|
+    <Plug>(easymotion-bl)             | See |<Plug>(easymotion-bl)|
+    <Plug>(easymotion-bd-wl)          | See |<Plug>(easymotion-bd-wl)|
+    <Plug>(easymotion-el)             | See |<Plug>(easymotion-el)|
+    <Plug>(easymotion-gel)            | See |<Plug>(easymotion-gel)|
+    <Plug>(easymotion-bd-el)          | See |<Plug>(easymotion-bd-el)|
+    <Plug>(easymotion-lineforward)    | See |<Plug>(easymotion-lineforward)|
+    <Plug>(easymotion-linebackward)   | See |<Plug>(easymotion-linebackward)|
+    <Plug>(easymotion-lineanywhere)   | See |<Plug>(easymotion-lineanywhere)|
+                                      |
+    Multi Input Find Motion           | See |easymotion-multi-input|
+    ----------------------------------|---------------------------------
+    <Plug>(easymotion-s2)             | See |<Plug>(easymotion-s2)|
+    <Plug>(easymotion-f2)             | See |<Plug>(easymotion-f2)|
+    <Plug>(easymotion-F2)             | See |<Plug>(easymotion-F2)|
+    <Plug>(easymotion-bd-f2)          | See |<Plug>(easymotion-s2)|
+    <Plug>(easymotion-t2)             | See |<Plug>(easymotion-t2)|
+    <Plug>(easymotion-T2)             | See |<Plug>(easymotion-T2)|
+    <Plug>(easymotion-bd-t2)          | See |<Plug>(easymotion-bd-t2)|
+                                      |
+    <Plug>(easymotion-sl2)            | See |<Plug>(easymotion-sl2)|
+    <Plug>(easymotion-fl2)            | See |<Plug>(easymotion-fl2)|
+    <Plug>(easymotion-Fl2)            | See |<Plug>(easymotion-Fl2)|
+    <Plug>(easymotion-tl2)            | See |<Plug>(easymotion-tl2)|
+    <Plug>(easymotion-Tl2)            | See |<Plug>(easymotion-Tl2)|
+                                      |
+    <Plug>(easymotion-sn)             | See |<Plug>(easymotion-sn)|
+    <Plug>(easymotion-fn)             | See |<Plug>(easymotion-fn)|
+    <Plug>(easymotion-Fn)             | See |<Plug>(easymotion-Fn)|
+    <Plug>(easymotion-bd-fn)          | See |<Plug>(easymotion-sn)|
+    <Plug>(easymotion-tn)             | See |<Plug>(easymotion-tn)|
+    <Plug>(easymotion-Tn)             | See |<Plug>(easymotion-Tn)|
+    <Plug>(easymotion-bd-tn)          | See |<Plug>(easymotion-bd-tn)|
+                                      |
+    <Plug>(easymotion-sln)            | See |<Plug>(easymotion-sln)|
+    <Plug>(easymotion-fln)            | See |<Plug>(easymotion-fln)|
+    <Plug>(easymotion-Fln)            | See |<Plug>(easymotion-Fln)|
+    <Plug>(easymotion-bd-fln)         | See |<Plug>(easymotion-sln)|
+    <Plug>(easymotion-tln)            | See |<Plug>(easymotion-tln)|
+    <Plug>(easymotion-Tln)            | See |<Plug>(easymotion-Tln)|
+    <Plug>(easymotion-bd-tln)         | See |<Plug>(easymotion-bd-tln)|
+
+    Over Window Motion                | (No assignment by default)
+    ----------------------------------|---------------------------------
+    <Plug>(easymotion-overwin-f)      | See |<Plug>(easymotion-overwin-f)|
+    <Plug>(easymotion-overwin-f2)     | See |<Plug>(easymotion-overwin-f2)|
+    <Plug>(easymotion-overwin-line)   | See |<Plug>(easymotion-overwin-line)|
+    <Plug>(easymotion-overwin-w)      | See |<Plug>(easymotion-overwin-w)|
+
+------------------------------------------------------------------------------
+More mappings                                        *easymotion-more-mappings*
+
+These mappings are not mapped by Default.
+
+Bidirection ~
+
+    Note: bd is short for bidirectional
+
+<Plug>(easymotion-s)                                    *<Plug>(easymotion-s)*
+                                                     *<Plug>(easymotion-bd-f)*
+                Find {char} to bidirection(forward and backward at the same
+                time.) See |f| & |F|.
+
+<Plug>(easymotion-bd-t)                               *<Plug>(easymotion-bd-t)*
+                Till before & after the {char}. See |t| & |T|.
+
+<Plug>(easymotion-bd-w)                               *<Plug>(easymotion-bd-w)*
+                Beginning of word forward and backward. See |w| & |b|.
+
+<Plug>(easymotion-bd-W)                               *<Plug>(easymotion-bd-W)*
+                Beginning of WORD forward and backward. See |W| & |B|.
+
+<Plug>(easymotion-bd-e)                               *<Plug>(easymotion-bd-e)*
+                End of word forward and backward. See |e| & |ge|.
+
+<Plug>(easymotion-bd-E)                               *<Plug>(easymotion-bd-E)*
+                End of WORD forward and backward. See |e| & |ge|.
+
+<Plug>(easymotion-bd-jk)                             *<Plug>(easymotion-bd-jk)*
+                Line downward and upward. See |j| & |k|.
+
+<Plug>(easymotion-bd-n)                               *<Plug>(easymotion-bd-n)*
+                Jump to latest "/" or "?" forward. See |n| & |N|.
+
+                                                *easymotion-overwin-motions*
+Overwin Motions~
+
+Overwin motions supports moving cursor across/over |window|. Since it
+doesn't make sense that moving cursor to other window while |Visual| or
+|Operator-pending| mode, overwin motions only provides mappings for |Normal|
+mode.  Please use |nmap| to use overwin motions. overwin motions only
+supports bi-directional motions.
+
+<Plug>(easymotion-overwin-f){char}          *n_<Plug>(easymotion-overwin-f)*
+                Like |<Plug>(easymotion-s)| or |<Plug>(easymotion-bd-f)|, but
+                supports moving cursor to other window. >
+                nmap <Leader>f <Plug>(easymotion-overwin-f)
+                xmap <Leader>f <Plug>(easymotion-bd-f)
+                omap <Leader>f <Plug>(easymotion-bd-f)
+<
+<Plug>(easymotion-overwin-f2){char}{char}   *n_<Plug>(easymotion-overwin-f2)*
+                Like |<Plug>(easymotion-s2)| or |<Plug>(easymotion-bd-f2)|,
+                but supports moving cursor to other window. >
+                nmap <Leader>s <Plug>(easymotion-overwin-f2)
+                xmap <Leader>s <Plug>(easymotion-bd-f2)
+                omap <Leader>s <Plug>(easymotion-bd-f2)
+<
+<Plug>(easymotion-overwin-line)           *n_<Plug>(easymotion-overwin-line)*
+                Like |<Plug>(easymotion-bd-jk)| but supports moving cursor to
+                other window. >
+                nmap <Leader>L <Plug>(easymotion-overwin-line)
+                xmap <Leader>L <Plug>(easymotion-bd-jk)
+                omap <Leader>L <Plug>(easymotion-bd-jk)
+<
+<Plug>(easymotion-overwin-w)              *n_<Plug>(easymotion-overwin-w)*
+                Like |<Plug>(easymotion-bd-w)| but supports moving cursor to
+                other window. >
+                nmap <Leader>w <Plug>(easymotion-overwin-w)
+                xmap <Leader>w <Plug>(easymotion-bd-w)
+                omap <Leader>w <Plug>(easymotion-bd-w)
+<
+For overwin n-character find motions~
+                          *easymotion-do-not-support-overwin-n-char-motions*
+                Overwin n-character find motions is equivalent to
+                *<Plug>(easymotion-overwin-sn)* (doesn't exist. It's like
+                |<Plug>(easymotion-sn)| but supports moving cursor to other
+                window).
+                EasyMotion itself doesn't support this mapping, but with
+                |incsearch.vim|[1] and incsearch-easymotion.vim[2], you can get
+                equivalent mappings. incsearch.vim is more compatible with
+                Vim's default search and it works with EasyMotion.
+
+                [1] https://github.com/haya14busa/incsearch.vim
+                [2] https://github.com/haya14busa/incsearch-easymotion.vim
+>
+  " You can use other keymappings like <C-l> instead of <CR> if you want to
+  " use these mappings as default search and somtimes want to move cursor with
+  " EasyMotion.
+  function! s:incsearch_config(...) abort
+    return incsearch#util#deepextend(deepcopy({
+    \   'modules': [incsearch#config#easymotion#module({'overwin': 1)],
+    \   'keymap': {
+    \     "\<CR>": '<Over>(easymotion)'
+    \   },
+    \   'is_expr': 0
+    \ }), get(a:, 1, {}))
+  endfunction
+
+  noremap <silent><expr> /  incsearch#go(<SID>incsearch_config())
+  noremap <silent><expr> ?  incsearch#go(<SID>incsearch_config({'command': '?'}))
+  noremap <silent><expr> g/ incsearch#go(<SID>incsearch_config({'is_stay': 1}))
+<
+                                                *easymotion-overwin-limitation*
+Since archtecture of overwin motions is different from other easymotion
+motions, there are some limitations.
+
+    1. Highlight for target is always EasyMotionTarget (|EasyMotion_highlight|)
+       even for two key targets.
+
+Jump To Anywhere ~
+
+<Plug>(easymotion-jumptoanywhere)           *<Plug>(easymotion-jumptoanywhere)*
+                JumpToAnywhere motion!
+                Default: Beginning and End of word, Camelcase, after '_',
+                and after '#'.
+                You can modify this motion behavior by vimrc
+
+    |g:EasyMotion_re_anywhere|:                        *g:EasyMotion_re_anywhere*
+>
+    let g:EasyMotion_re_anywhere = '\v' .
+        \       '(<.|^$)' . '|' .
+        \       '(.>|^$)' . '|' .
+        \       '(\l)\zs(\u)' . '|' .
+        \       '(_\zs.)' . '|' .
+        \       '(#\zs.)'
+<
+    Modified example:
+>
+    let g:EasyMotion_re_anywhere = '\v' .
+        \       '(<.|^)' . '|' .
+        \       '(<.|.$)' . '|' .
+        \       '(\l)\zs(\u)' . '|' .
+<
+Repeat ~
+
+<Plug>(easymotion-repeat)                           *<Plug>(easymotion-repeat)*
+        Repeat last motion!
+
+        Repeat last motion type including input target character.
+        Nothing will happen when previous motion doesn't exist.
+
+        Last Find Motion~
+            With a Find motion (e.g. |<Plug>(easymotion-s)| ), type `<CR>`
+            without input characters to invoke the last find motion. This does
+            not repeat the motion type (e.g. other word motion,
+            <Plug>(easymotion-j) etc...) only input characters.
+
+<Plug>(easymotion-next)                               *<Plug>(easymotion-next)*
+<Plug>(easymotion-prev)                               *<Plug>(easymotion-prev)*
+
+        Jump to next/previous match. This is the only motion that can move to
+        off-screen locations. With set |'wrapscan'| enabled, this motion will
+        also wrap around the end of the file. During this motion, matched
+        text is highlighted. If you don't want highlighting, set
+        |g:EasyMotion_move_highlight| to 0.
+
+        Example:
+>
+            nmap <Leader>; <Plug>(easymotion-next)
+            nmap <Leader>, <Plug>(easymotion-prev)
+<
+        This feature is inspired by and based on vim-sneak. vim-sneak can be
+        downloaded here: https://github.com/justinmk/vim-sneak
+
+EasyMotion dot repeat~
+                                    *easymotion-dotrepeat* *easymotion-textobject*
+
+        This feature requires tpope/vim-repeat
+        https://github.com/tpope/vim-repeat
+
+        All motions support '.' repeat.
+
+        Example:
+>
+        " vimrc:
+        omap z <Plug>(easymotion-t)
+        let g:EasyMotion_keys='hklyuiopnm,qwertzxcvbasdgjf;'
+<
+        Text sample:
+>
+        {cursor}Lorem ipsum dolor sit ame*t*, consectetur adipisicing eli*t*,
+        sed do eiusmod tempor
+<
+        type `dzt` and type first target marker(in this case, `h`)
+>
+        {cursor}*t*, consectetur adipisicing eli*t,* sed do eiusmod tempor
+<
+        from here type '`.`' and you get:
+>
+        *t,* sed do eiusmod tempor
+<
+
+JK Motion ~
+                                                         *easymotion-jk-motion*
+
+JK motion option                    *<Plug>(easymotion-j)* *<Plug>(easymotion-k)*
+                                                    *g:EasyMotion_startofline*
+
+        The default behavior of the |j| and |k| is to move your cursor to the
+        start of the line. Set this option to 0 to force the cursor to stay in
+        the same column If you want to use both movements as separate
+        mappings, set |'g:EasyMotion_startofline'| to 0 and map
+        |<Plug>(easymotion-sol-j)| & |<Plug>(easymotion-sol-k)| to the start
+        of line mapping:
+>
+        let g:EasyMotion_startofline = 0 # keep cursor colum JK motion
+        map <Leader>J <Plug>(easymotion-sol-j)
+        map <Leader>K <Plug>(easymotion-sol-k)
+<
+Default: 1
+
+Start of Line JK motion     *<Plug>(easymotion-sol-j)* *<Plug>(easymotion-sol-k)*
+                                                 *<Plug>(easymotion-sol-bd-jk)*
+
+        Start of line J/K motion
+        Example:
+>
+        map <Leader>J <Plug>(easymotion-sol-j)
+        map <Leader>K <Plug>(easymotion-sol-k)
+<
+End of Line JK motion       *<Plug>(easymotion-eol-j)* *<Plug>(easymotion-eol-k)*
+                                                 *<Plug>(easymotion-eol-bd-jk)*
+
+        End of line J/K motion
+        Example:
+>
+        map <Leader>J <Plug>(easymotion-eol-j)
+        map <Leader>K <Plug>(easymotion-eol-K)
+<
+
+iskeyword compatible word motions           *<Plug>(easymotion-iskeyword-w)*
+                                            *<Plug>(easymotion-iskeyword-b)*
+                                            *<Plug>(easymotion-iskeyword-bd-w)*
+                                            *<Plug>(easymotion-iskeyword-e)*
+                                            *<Plug>(easymotion-iskeyword-ge)*
+                                            *<Plug>(easymotion-iskeyword-bd-e)*
+        Default word motions which EasyMotion provide is not completely
+        compatible with |iskeyword| options. But if you make default word
+        motion completely compatible with it, there will be so many targets
+        that they maybe annoy you, so provide |iskeyword| compatible word
+        motions with another |<Plug>| mappings.
+
+        Example:
+>
+        map <Leader>w <Plug>(easymotion-iskeyword-w)
+        map <Leader>b <Plug>(easymotion-iskeyword-b)
+<
+        NOTE: Within line motions are compatible with |iskeyword| by default.
+
+Search motion respect previous direction
+
+    <Plug>(easymotion-vim-n)                         *<Plug>(easymotion-vim-n)*
+    <Plug>(easymotion-vim-N)                         *<Plug>(easymotion-vim-N)*
+
+    This is vim compatible |n| & |N| easymotion. Unlike |<Plug>(easymotion-n)|
+    and |<Plug>(easymotion-N)| 's direction is always forward or backward,
+    these motions consider previous search direction. 
+
+Within line motion ~
+                                                       *easymotion-within-line*
+
+<Plug>(easymotion-sl)                                   *<Plug>(easymotion-sl)*
+                                                     *<Plug>(easymotion-bd-fl)*
+                This function is same as |<Plug>(easymotion-s)|, except the range
+                is limited to the current cursor line.
+
+<Plug>(easymotion-fl)                                   *<Plug>(easymotion-fl)*
+                This function is same as |<Plug>(easymotion-f)|, except the range
+                is limited to the current cursor line.
+
+<Plug>(easymotion-Fl)                                   *<Plug>(easymotion-Fl)*
+                This function is same as |<Plug>(easymotion-F)|, except the range
+                is limited to the current cursor line.
+
+<Plug>(easymotion-tl)                                   *<Plug>(easymotion-tl)*
+                This function is same as |<Plug>(easymotion-t)|, except the
+                range is limited to the current cursor line.
+
+<Plug>(easymotion-Tl)                                   *<Plug>(easymotion-Tl)*
+                This function is same as |<Plug>(easymotion-T)|, except the
+                range is limited to the current cursor line.
+
+<Plug>(easymotion-bd-tl)                             *<Plug>(easymotion-bd-tl)*
+                This function is same as |<Plug>(easymotion-bd-t)|, except the
+                range is limited to the current cursor line.
+
+<Plug>(easymotion-wl)                                   *<Plug>(easymotion-wl)*
+                This function is same as |<Plug>(easymotion-iskeyword-w)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-bl)                                   *<Plug>(easymotion-bl)*
+                This function is same as |<Plug>(easymotion-iskeyword-b)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-bd-wl)                             *<Plug>(easymotion-bd-wl)*
+                This function is same as |<Plug>(easymotion-iskeyword-bd-w)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-el)                                   *<Plug>(easymotion-el)*
+                This function is same as |<Plug>(easymotion-iskeyword-e)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-gel)                                 *<Plug>(easymotion-gel)*
+                This function is same as |<Plug>(easymotion-iskeyword-ge)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-bd-el)                             *<Plug>(easymotion-bd-el)*
+                This function is same as |<Plug>(easymotion-iskeyword-bd-e)|,
+                except the range is limited to the current cursor line.
+
+<Plug>(easymotion-lineforward)                 *<Plug>(easymotion-lineforward)*
+                This function is similar to
+                |<Plug>(easymotion-jumptoanywhere)|, except the range is
+                limited to the current cursor line in the forward direction.
+
+<Plug>(easymotion-linebackward)               *<Plug>(easymotion-linebackward)*
+                This function is similar to
+                |<Plug>(easymotion-jumptoanywhere)|, except the range is
+                limited to the current cursor line in the backward direction.
+
+<Plug>(easymotion-lineanywhere)               *<Plug>(easymotion-lineanywhere)*
+                This function is same as |<Plug>(easymotion-jumptoanywhere)|,
+                but limited to within the current cursor line.
+
+                You can customize the behavior of this function in your
+                vimrc.
+
+    |g:EasyMotion_re_line_anywhere|:             *g:EasyMotion_re_line_anywhere*
+
+    Default:
+>
+    let g:EasyMotion_re_line_anywhere = '\v' .
+        \       '(<.|^$)' . '|' .
+        \       '(.>|^$)' . '|' .
+        \       '(\l)\zs(\u)' . '|' .
+        \       '(_\zs.)' . '|' .
+        \       '(#\zs.)'
+<
+    Modified example:
+>
+    let g:EasyMotion_re_line_anywhere = '\v' .
+        \       '(<.|^)' . '|' .
+        \       '(>.|.$)' . '|' .
+        \       '(\l)\zs(\u)' . '|' .
+
+Multi Input Find Motion!~
+All Find motions (s,f,F,t,T,sl,fl,Fl,tl,Tl, see below) support this feature!
+(|l| means within line motion)
+    *easymotion-multi-input* *easymotion-two-key* *easymotion-{find}n*
+    *<Plug>(easymotion-{find}n)* *<Plug>(easymotion-{find}2)*
+    *<Plug>(easymotion-s2)* *<Plug>(easymotion-f2)* *<Plug>(easymotion-F2)*
+    *<Plug>(easymotion-t2)* *<Plug>(easymotion-T2)*
+    *<Plug>(easymotion-bd-f2)* *<Plug>(easymotion-bd-t2)*
+    *<Plug>(easymotion-sl2)* *<Plug>(easymotion-fl2)* *<Plug>(easymotion-Fl2)*
+    *<Plug>(easymotion-tl2)* *<Plug>(easymotion-Tl2)*
+    *<Plug>(easymotion-bd-fl2)* *<Plug>(easymotion-bd-tl2)*
+
+    *<Plug>(easymotion-sn)* *<Plug>(easymotion-fn)* *<Plug>(easymotion-Fn)*
+    *<Plug>(easymotion-tn)* *<Plug>(easymotion-Tn)* *<Plug>(easymotion-bd-tn)*
+    *<Plug>(easymotion-sln)* *<Plug>(easymotion-fln)* *<Plug>(easymotion-Fln)*
+    *<Plug>(easymotion-tln)* *<Plug>(easymotion-Tln)* *<Plug>(easymotion-bd-tln)*
+
+EasyMotion provide another find motion by multi input target.
+
+Example:
+>
+    nmap s         <Plug>(easymotion-s2)
+    xmap s         <Plug>(easymotion-s2)
+    omap z         <Plug>(easymotion-s2)
+    nmap <Leader>s <Plug>(easymotion-sn)
+    xmap <Leader>s <Plug>(easymotion-sn)
+    omap <Leader>z <Plug>(easymotion-sn)
+<
+If you like typing two or more characters as targets, similar to vim-smalls
+or vim-seek/vim-sneak, |EasyMotion| also provide this feature. With the above
+keymapping,
+
+    Invoke EasyMotion by two character:
+
+    s{char}{char} (Type s{char}<CR> to use just one {char} is also allowed)
+
+    And you can use as many target characters as you like:
+
+    <Leader>s{char}{char}{char}...<CR>
+
+    You can use <C-h> to delete while typing, and Vim's default |n| & |N|
+    keymappings works after this motion(|<Plug>(easymotion-sn)|) to move next or
+    previous matches.
+
+    Note: the 'n' key motion provides incremental highlighting. If you don't
+          want to highlight incrementally, set |g:EasyMotion_inc_highlight|
+          to 0.
+>
+    let g:EasyMotion_inc_highlight = 0
+<
+
+Find Motion Command Line~
+                                                      *easymotion-command-line*
+    EasyMotion has own command line for find motions, especially for
+    'n' key motion(e.g. |<Plug>(easymotion-sn)|). This command is inspired
+    by over.vim and actually uses over.vim's library. over.vim can be
+    downloaded here:
+
+        https://github.com/osyo-manga/vim-over
+
+        Library: https://github.com/osyo-manga/vital-over
+
+    Note: These settings are experimental. They may be changed in the near
+    future.
+
+    Default Command Line Mappings~
+    Most default mappings work the same as the default command line mappings
+    of Vim. See |cmdline.txt|
+
+    Key Mappings            | Details
+    ----------------------- |----------------------------------------------
+    <CR>                    | Execute EasyMotion.
+    <ESC> or <C-c>          | Cancel
+    <Right> or <C-f>        | Cursor right
+    <Left> or <C-b>         | Cursor left
+    <Home> or <C-a>         | cursor to beginning of command-line
+    <End> or <C-e>          | cursor to end of command-line
+    <BS>  or <C-h>          | Delete one character
+    <C-d>                   | Delete one character at the cursor pos
+    <C-w>                   | Delete the word before the cursor
+    <C-u>                   | Delete all entered characters before the cursor
+    <Up> or <C-p>           | Recall older (previous) search from history
+    <Down> or <C-n>         | Recall more recent (next) search from history
+    <C-r> {0-9a-z"%#:-=.}   | Insert Register. See |c_Ctrl-R|
+    <C-r><C-w>              | Insert the Word under cursor
+    <C-r><C-a>              | Insert the |WORD| under cursor
+    <C-r><C-f>              | Insert the Filename under cursor
+    ------------------------|---------------------------------------
+    <Over>(paste)           | Paste yanked text to the command line
+                            |   Default: <C-v>
+    <Over>(buffer-complete) | Completion of buffer text Default: <C-l>
+    *<Over>(em-scroll-f)*     | Scroll window forward & jump to the next match
+                            |   Default: <Tab>
+    *<Over>(em-scroll-b)*     | Scroll window backward & jump to previous match
+                            |   Default: <S-Tab>
+    *<Over>(em-jumpback)*     | Jump back original cursor position like <C-o>
+                            |   Default: <C-o>
+    *<Over>(em-openallfold)*  | Open all fold
+                            |   Default: <C-z>
+
+    Customize Command Line Mappings~
+                                                         *EMCommandLineNoreMap*
+
+    You can use |EMCommandLineNoreMap| (like |cnoremap|) to customize find
+    motion command line key mappings in your vimrc. This mapping is always
+    nonrecursive, so you should map to |<Over>(em-scroll-f)| and not <Tab>.
+
+    Example:
+>
+    " == EM is short for EasyMotion
+    " Enter by <Space> to excute faster & easily
+    EMCommandLineNoreMap <Space> <CR>
+    EMCommandLineNoreMap <C-j> <Space>
+    " Enter by `;` to excute faster & easily
+    EMCommandLineNoreMap ; <CR>
+    EMCommandLineNoreMap <C-j> ;
+    " Buffer Completion with Ctrl-D
+    EMCommandLineNoreMap <C-d> <Over>(buffer-complete)
+<
+                                                             *EMCommandLineMap*
+                                                           *EMCommandLineUnMap*
+    EasyMotion also provide |EMCommandLineMap| (like |cmap|) and
+    |EMCommandLineUnMap| (like |cunmap|), but you probably don't need
+    these commands because there is no case where it should require
+    recursive mappings.
+
+    Note(again): These settings, especially the keymappings are
+    __EXPERIMENTAL__. They could be changed in the near future. However, they
+    work well and are very useful, so I've released them anyway for now.
+
+==============================================================================
+Requirements                                          *easymotion-requirements*
+
+EasyMotion needs at least vim 7.3 to run without problems.
+Active development and testing is done with vim 7.4 starting from the 2.0
+release of EasyMotion.
+
+Vi-compatible mode must be disabled.
+
+If your vim version is causing you problems with using this plugin, feel free
+to open an issue on github!
+
+Link: https://github.com/easymotion/vim-easymotion/issues
+
+==============================================================================
+Configuration                                        *easymotion-configuration*
+
+EasyMotion will work fine without any configuration, but you can override the
+default behavior by setting configuration variables globally in your |vimrc|
+file.
+
+Example (this will change the target keys and disable shading): >
+
+    let g:EasyMotion_keys = '1234567890'
+    let g:EasyMotion_do_shade = 0
+
+------------------------------------------------------------------------------
+EasyMotion_keys                                               *EasyMotion_keys*
+                                                            *g:EasyMotion_keys*
+
+Set the keys to be used for motion targets. You can have as many (or few)
+keys as you want. It's recommended to add as many keys as you are comfortable
+typing, because here's a lower chance that the motion targets will be grouped
+if many keys are available. However, this has its limits; most people find it
+easier to type 2 lowercase keys than to chord a key with shift, so you may
+want to leave out keys that are harder to type, like capital letters.
+EasyMotion also uses the last keys to group targets, so it's recommended to
+set the last keys to ones that are easier to type, like `f`,`j`,`;`, etc.
+
+Default: 'asdghklqwertyuiopzxcvbnmfj;'
+
+Example:
+>
+    " Lower a-z
+    let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyz'
+    " a-z & A-Z
+    'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    " a-z & A-Z & 0-9
+    'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
+    " qwerty
+    'asdfghjkl;qwertyuiopzxcvbnm'
+    " You can use non-ascii, multibyte key characters as well
+    'asdfghjkl;qwertyuiopzxcvbnmèòàùì'
+<
+
+------------------------------------------------------------------------------
+EasyMotion_do_shade                                       *EasyMotion_do_shade*
+                                                        *g:EasyMotion_do_shade*
+
+The default behavior is to shade the text following the cursor (forward
+motions), preceding the cursor (backward motions), or on either side of the
+cursor (bidirectional motions) to make the motion targets more visible. Set
+this option to 0 if you want to disable text shading.
+
+Default: 1
+
+------------------------------------------------------------------------------
+EasyMotion_do_mapping                                   *EasyMotion_do_mapping*
+                                                      *g:EasyMotion_do_mapping*
+
+Set this option to 0 if you want to disable the default mappings. See
+|easymotion-default-mappings| for details about the default mappings.
+
+Note: If you disable this option, you'll have to map the motions yourself.
+      See |easymotion-custom-mappings| for customizing the default mappings.
+
+Default: 1
+
+------------------------------------------------------------------------------
+EasyMotion_grouping                                       *EasyMotion_grouping*
+                                                        *g:EasyMotion_grouping*
+
+When there are too many possible targets on the screen, the results have to be
+grouped. This configuration option lets you change which grouping algorithm
+you want to use. There are two grouping algorithms available:
+
+    *  Single-key priority (value: 1)
+       -------------------
+
+       This algorithm prioritizes single-key jumps for the targets closest to
+       the cursor and only groups the last jump targets to maximize the amount
+       of single-key jumps.
+
+       This algorithm works recursively and will work with as few keys as two.
+
+       Example (with |EasyMotion_keys| = "abcdef"): >
+
+       x x x x x x x x x
+<
+       The |w| motion is triggered: >
+
+       a b c d e f f f f
+       ^ ^ ^ ^ ^           Direct jump to target
+                 ^ ^ ^ ^   Enter group "f"
+<
+    *  Original (value: 2)
+       --------
+
+       This is the original algorithm which always groups all targets if there
+       are too many possible motion targets.
+
+       Example (with |EasyMotion_keys| = "abcdef"): >
+
+       x x x x x x x x x
+<
+       The |w| motion is triggered: >
+
+       a a a a a a b b b
+       ^ ^ ^ ^ ^ ^         Enter group "a"
+                   ^ ^ ^   Enter group "b"
+
+Default: 1
+
+------------------------------------------------------------------------------
+Smartcase                                                *EasyMotion_smartcase*
+                                                       *g:EasyMotion_smartcase*
+
+Matching target keys by smartcase. You can type target keys more lazily.
+
+Add following description in your vimrc: >
+
+    let g:EasyMotion_smartcase = 1
+
+Default:0
+
+------------------------------------------------------------------------------
+Smartsign                                                *EasyMotion_smartsign*
+                                                *g:EasyMotion_use_smartsign_us*
+                                                *g:EasyMotion_use_smartsign_ja*
+
+Matching signs target keys by smartcase like. E.g. type '1' and it matches
+both '1' and '!' in Find motion.
+
+This feature depends on your keyboard layout, so you must choose which
+keyboard layout you use.
+
+How to discriminate:
+    Shift-2 = @ -> US layout
+    Shift-2 = " -> JP layout
+
+>
+    let g:EasyMotion_use_smartsign_us = 1
+<
+    or
+>
+    let g:EasyMotion_use_smartsign_jp = 1
+<
+
+Default: 0
+
+------------------------------------------------------------------------------
+Migemo                                                  *EasyMotion_use_migemo*
+                                                      *g:EasyMotion_use_migemo*
+
+|Easymotion| can match multibyte Japanese character with alphabetical input.
+For example, '<Leader><Leader>fa' can search 'あ'. This feature doesn't
+require |cmigemo| because |Easymotion| already includes basic regex patterns
+generated by cmigemo.
+
+See http://0xcc.net/migemo/ if you want to know more about migemo.
+
+Add following line to your vimrc to enable this option: >
+
+    let g:EasyMotion_use_migemo = 1
+
+Default:0
+
+This feature is based on rhysd(@Linda_pp)'s clever-f script,
+which can be downloaded here:
+
+https://github.com/rhysd/clever-f.vim
+
+------------------------------------------------------------------------------
+Show target key by upper letter                          *EasyMotion_use_upper*
+                                                       *g:EasyMotion_use_upper*
+
+With this option enabled, |Easymotion| will shows target labels with
+uppercase letters, but allow you to type it in lowercase and have Easymotion
+automatically convert it uppercase.
+
+This feature improve targets' readability.
+
+Example: >
+
+    <cursor>Lorem ipsum dolor sit amet.
+
+Type <Leader><Leader>w and the text is updated: >
+
+    <cursor>Lorem {A}psum {B}olor {C}it {D}met.
+
+Press "c" (<- lowercase!) to jump to the beginning of the word "sit": >
+
+    Lorem ipsum dolor <cursor>sit amet.
+
+Add following description in your vimrc to enable this: >
+
+    let g:EasyMotion_use_upper = 1
+    let g:EasyMotion_keys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ;'
+
+Default:0
+
+Note: Make sure |g:EasyMotion_keys| doesn't include lowercase
+
+This feature is inspired by t9md's vim-smalls, which can be downloaded here:
+
+https://github.com/t9md/vim-smalls
+
+------------------------------------------------------------------------------
+ Jump to first match by Enter or Space            *EasyMotion_enter_jump_first*
+                                                *g:EasyMotion_enter_jump_first*
+                                                  *EasyMotion_space_jump_first*
+                                                *g:EasyMotion_space_jump_first*
+
+Type Enter or Space key and jump to first match (first letter of
+|g:EasyMotion_keys| ).
+
+Set this option to 1 if you want to enable this feature.
+
+Example:
+>
+    let g:EasyMotion_enter_jump_first = 1
+    let g:EasyMotion_space_jump_first = 1
+<
+Default: 0
+
+
+Customize command line prompt                               *EasyMotion_prompt*
+                                                          *g:EasyMotion_prompt*
+
+    Use this command to customize the command line prompt message in find
+    motion. `{n}` is how many characters you type, and if {n} == 1 `(s)` will
+    be ignored.
+
+Sample:
+>
+    let g:EasyMotion_prompt = '{n}>>> '
+<
+Default:
+>
+    let g:EasyMotion_prompt = 'Search for {n} character(s): '
+<
+    This message will be:
+        |<Plug>(easymotion-s)|  -> 'Search for 1 character: '
+        |<Plug>(easymotion-s2)| -> 'Search for 2 characters: '
+        |<Plug>(easymotion-sn)| -> 'Search for characters: '
+
+Customize highlight behavior                             *EasyMotion_highlight*
+                                                   *g:EasyMotion_inc_highlight*
+
+    Using the 'n' key find motion (e.g. |<Plug>(easymotion-sn)|), EasyMotion
+    by default incrementally highlights matched text. If you don't want this
+    feature, set this option to 0
+>
+    let g:EasyMotion_inc_highlight = 0
+<
+    Default: 1
+
+                                                  *g:EasyMotion_move_highlight*
+
+    By default, when using |<Plug>(easymotion-next)| and/or
+    |<Plug>(easymotion-prev)|, EasyMotion highlights matched text until the
+    cursor moves, enters insert mode, or leaves the buffer. If you don't want
+    this feature, set this option to 0.
+>
+    let g:EasyMotion_move_highlight = 0
+<
+    Default: 1
+
+                                               *g:EasyMotion_landing_highlight*
+
+    If you want to keep highlights temporarily after EasyMotion
+    jumps to a destination (with timing set to
+    |g:EasyMotion_move_highlight|), set this option to 0.
+>
+    let g:EasyMotion_landing_highlight = 1
+<
+    Default: 0
+
+EasyMotion_add_search_history                 *g:EasyMotion_add_search_history*
+
+    If you set this option to 1, the 'n' key find motion will add the
+    inputted pattern to vim default search history. If you want to disable
+    this feature, set this value to 0.
+>
+    let g:EasyMotion_add_search_history = 0
+<
+    Default: 1
+
+EasyMotion_off_screen_search                   *g:EasyMotion_off_screen_search*
+
+    If you set this option to 1, the 'n' key find motion will search patterns
+    even outside of the current screen range. If you want to disable this
+    feature, set this value to 0.
+>
+    let g:EasyMotion_off_screen_search = 0
+<
+    Default: 1
+
+EasyMotion_disable_two_key_combo           *g:EasyMotion_disable_two_key_combo*
+
+    If you set this option to 1, you can disable the two key combo feature.
+>
+    let g:EasyMotion_disable_two_key_combo = 1
+<
+    Default: 0
+
+EasyMotion_verbose                       *g:EasyMotion_verbose*
+
+    If you set this option to 0, you can disable all the messages the plugin
+    creates, such as "EasyMotion: Jumping to [l,c]" and "EasyMotion:
+    Cancelled".
+>
+    let g:EasyMotion_verbose = 0
+<
+    Default: 1
+
+------------------------------------------------------------------------------
+Custom highlighting                                      *easymotion-custom-hl*
+
+The default EasyMotion configuration uses two highlighting groups that link
+to groups with default values. The highlighting groups are:
+
+    * EasyMotionTarget
+
+      Highlights motion targets, the default value is bold red
+
+    * EasyMotionTarget2First
+    * EasyMotionTarget2Second
+
+      Highlights motion targets, when target is two keys
+
+    * EasyMotionShade
+
+      Highlights shaded text, the default value is dark gray
+
+    * EasyMotionIncSearch
+    * EasyMotionMoveHL
+
+      Highlights matched pattern of "/" command.
+
+
+There are two ways to override the default colors:
+
+   1) Set the highlighting in your color scheme
+
+      This will only affect a single color scheme. The default red/gray colors
+      will be used if you change the color scheme to one that doesn't assign
+      any EasyMotion colors.
+
+      Example: >
+
+          hi EasyMotionTarget ctermbg=none ctermfg=green
+          hi EasyMotionShade  ctermbg=none ctermfg=blue
+
+          hi EasyMotionTarget2First ctermbg=none ctermfg=red
+          hi EasyMotionTarget2Second ctermbg=none ctermfg=lightred
+
+          hi EasyMotionMoveHL ctermbg=green ctermfg=black
+          hi EasyMotionIncSearch ctermbg=green ctermfg=black
+<
+   2) Set the highlighting in your vimrc
+
+      This is ideal if you want to link the colors to highlighting groups that
+      are available in almost every color scheme, e.g. |ErrorMsg| (usually
+      bright red) and Comment (usually faded). You can be sure that the
+      color scheme's colors will be used instead of the default red/gray
+      if you choose this option.
+
+      Example: >
+
+          hi link EasyMotionTarget ErrorMsg
+          hi link EasyMotionShade  Comment
+
+          hi link EasyMotionTarget2First MatchParen
+          hi link EasyMotionTarget2Second MatchParen
+
+          hi link EasyMotionMoveHL Search
+          hi link EasyMotionIncSearch Search
+<
+
+Use CSApprox                                        *EasyMotion_force_csapprox*
+                                                  *g:EasyMotion_force_csapprox*
+    if you install CSApprox & want to use gui color for EasyMotion, set this
+    option to 1.
+>
+    let g:EasyMotion_force_csapprox = 1
+<
+    Default: 0
+
+------------------------------------------------------------------------------
+Custom mappings                                    *easymotion-custom-mappings*
+
+EasyMotion allows you to customize all default mappings to avoid conflicts
+with existing mappings. It is possible to change the default leader key
+of all mappings to another key or sequence. It is also possible to fine
+tune the plugin to your need by changing every single sequence.
+
+Leader key                        *EasyMotion_leader_key* *easymotion-leader-key*
+                                                    *<Plug>(easymotion-prefix)*
+
+The default leader key can be changed with the |<Plug>(easymotion-prefix)|
+
+Set this keymapping to the key sequence to use as the prefix of the mappings
+described in |easymotion-default-mappings|.
+
+Note: The default leader key has been changed to '<Leader><Leader>' to
+avoid conflicts with other plugins. You can revert to the original
+leader by setting this keymapping in your vimrc: >
+
+    map <Leader> <Plug>(easymotion-prefix)
+<
+Default: '<Leader><Leader>'
+
+Custom Keys                                            *easymotion-custom-keys*
+
+All custom mappings follow the same format: >
+
+    <Plug>(easymotion-{motion})
+<
+Example: >
+
+    map s <Plug>(easymotion-s)
+    map _f <Plug>(easymotion-f)
+    map <C-T> <Plug>(easymotion-T)
+<
+See |easymotion-plug-table| for a table of motions that can be mapped
+and their default values.
+
+==============================================================================
+License                                                    *easymotion-license*
+
+License: MIT license
+
+Copyright (c) 2014-2016 Kim Silkebækken, haya14busa
+
+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.
+
+==============================================================================
+Known bugs                                              *easymotion-known-bugs*
+
+See: https://github.com/easymotion/vim-easymotion/issues
+
+Pull Requests are welcome! :)
+
+==============================================================================
+Contributing                                          *easymotion-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>
+        haya14busa <hayabusa1419@gmail.com> (since version 2.0)
+Source repository: https://github.com/easymotion/vim-easymotion
+
+
+==============================================================================
+Credits                                                    *easymotion-credits*
+
+- Ben Boeckel: ge and WORD motions
+- Drew Neil: operator-pending mappings
+- Rob O'Dwyer: customizable mappings without giving up all defaults
+- Michel D'Hooge: customizable leader
+- Maxime Bourget: search motion, improved JK motion behavior
+- Kearn Holliday: fix jumplist issues
+- Shougo Matsushita: fix CSApprox issue
+- supasorn: two key combos and bidirectional motion
+- mtth: startofline(keep column)
+- bootleq: fixed bufname bug
+- mattn: fix multibyte handling
+- yuex: fix visual mode selection bug (o command)
+
+and more!: https://github.com/easymotion/vim-easymotion/graphs/contributors
+
+EasyMotion is based on Bartlomiej Podolak's great PreciseJump script, which
+can be downloaded here:
+
+http://www.vim.org/scripts/script.php?script_id=3437
+
+Special Thanks for other plugins and the authors:~
+Migemo feature:
+    - Author: rhysd(@Linda_pp)
+    - https://github.com/rhysd/clever-f.vim
+Show uppercase feature:
+    - Author: t9md
+    - https://github.com/t9md/vim-smalls
+Find motion command line:
+    - Author: osyo-manga
+    - https://github.com/osyo-manga/vim-over
+    - Library: https://github.com/osyo-manga/vital-over
+2-key find motion:
+    - Authors: goldfeld & justinmk
+    - https://github.com/goldfeld/vim-seek
+    - https://github.com/justinmk/vim-sneak
+Next/Previous motion:
+    - Author: justinmk
+    - https://github.com/justinmk/vim-sneak
+Dot repeat feature:
+    - Author: tpope
+    - https://github.com/tpope/vim-repeat
+
+==============================================================================
+vim:tw=78:sw=4:ts=8:ft=help:norl:
diff --git a/vim/plugins/vim-easymotion/plugin/EasyMotion.vim b/vim/plugins/vim-easymotion/plugin/EasyMotion.vim
new file mode 100644
index 0000000..ade2b41
--- /dev/null
+++ b/vim/plugins/vim-easymotion/plugin/EasyMotion.vim
@@ -0,0 +1,290 @@
+scriptencoding utf-8
+" EasyMotion - Vim motions on speed!
+"
+" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
+"         haya14busa <hayabusa1419@gmail.com>
+" Source: https://github.com/easymotion/vim-easymotion
+" == Script initialization {{{
+if expand("%:p") ==# expand("<sfile>:p")
+  unlet! g:EasyMotion_loaded
+endif
+if exists('g:EasyMotion_loaded') || &compatible || version < 703
+    finish
+endif
+
+let g:EasyMotion_loaded = 1
+" }}}
+
+" == Saving 'cpoptions' {{{
+let s:save_cpo = &cpo
+set cpo&vim
+" }}}
+
+" == Default configuration {{{
+" -- Option ------------------------------ {{{
+let g:EasyMotion_keys               = get(g:,
+    \ 'EasyMotion_keys', 'asdghklqwertyuiopzxcvbnmfj;')
+    " \ 'EasyMotion_keys', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
+let g:EasyMotion_do_mapping         = get(g: , 'EasyMotion_do_mapping'         , 1)
+let g:EasyMotion_do_shade           = get(g: , 'EasyMotion_do_shade'           , 1)
+let g:EasyMotion_grouping           = get(g: , 'EasyMotion_grouping'           , 1)
+let g:EasyMotion_startofline        = get(g: , 'EasyMotion_startofline'        , 1)
+let g:EasyMotion_smartcase          = get(g: , 'EasyMotion_smartcase'          , 0)
+let g:EasyMotion_skipfoldedline     = get(g: , 'EasyMotion_skipfoldedline'     , 1)
+let g:EasyMotion_use_migemo         = get(g: , 'EasyMotion_use_migemo'         , 0)
+let g:EasyMotion_use_upper          = get(g: , 'EasyMotion_use_upper'          , 0)
+let g:EasyMotion_enter_jump_first   = get(g: , 'EasyMotion_enter_jump_first'   , 0)
+let g:EasyMotion_space_jump_first   = get(g: , 'EasyMotion_space_jump_first'   , 0)
+let g:EasyMotion_inc_highlight      = get(g: , 'EasyMotion_inc_highlight'      , 1)
+let g:EasyMotion_move_highlight     = get(g: , 'EasyMotion_move_highlight'     , 1)
+let g:EasyMotion_landing_highlight  = get(g: , 'EasyMotion_landing_highlight'  , 0)
+let g:EasyMotion_cursor_highlight   = get(g: , 'EasyMotion_cursor_highlight'   , 1)
+let g:EasyMotion_use_regexp         = get(g: , 'EasyMotion_use_regexp'         , 1)
+let g:EasyMotion_add_search_history = get(g: , 'EasyMotion_add_search_history' , 1)
+let g:EasyMotion_off_screen_search  = get(g: , 'EasyMotion_off_screen_search'  , 1)
+let g:EasyMotion_force_csapprox     = get(g: , 'EasyMotion_force_csapprox'     , 0)
+let g:EasyMotion_show_prompt        = get(g: , 'EasyMotion_show_prompt'        , 1)
+let g:EasyMotion_verbose            = get(g: , 'EasyMotion_verbose'            , 1)
+let g:EasyMotion_prompt             =
+    \ get(g: , 'EasyMotion_prompt' , 'Search for {n} character(s): ')
+let g:EasyMotion_command_line_key_mappings =
+    \ get(g: , 'EasyMotion_command_line_key_mappings' , {})
+let g:EasyMotion_disable_two_key_combo     =
+    \ get(g: , 'EasyMotion_disable_two_key_combo' , 0)
+
+"}}}
+
+" }}}
+
+" == <Plug> Mapping {{{
+" Note: bd is short for bidirectional
+"       l is short for (within) line
+
+function! s:motion_map_helper(motions) "{{{
+    for [name, dict] in items(a:motions)
+        let mapargs = []
+        let xmapargs = []
+        if dict.fnc ==# 'S' || dict.fnc ==# 'SL' || dict.fnc ==# 'T' || dict.fnc ==# 'TL'
+            let mapargs  += [dict.cnt, 0, dict.direction]
+            let xmapargs += [dict.cnt, 1, dict.direction]
+        elseif dict.fnc ==# 'Search'
+            let mapargs  += [0, dict.direction, dict.respect_direction]
+            let xmapargs += [1, dict.direction, dict.respect_direction]
+        else
+            let mapargs  += [0, dict.direction]
+            let xmapargs += [1, dict.direction]
+        endif
+
+        silent exec 'noremap  <silent><Plug>(easymotion-'.name.')' .
+            \ '      :<C-u>call EasyMotion#' . dict.fnc . '('. join(mapargs, ',') . ')<CR>'
+        silent exec 'xnoremap <silent><Plug>(easymotion-'.name.')' .
+            \ ' <Esc>:<C-u>call EasyMotion#' . dict.fnc . '('. join(xmapargs, ',') . ')<CR>'
+    " Example:
+    " noremap  <silent><Plug>(easymotion-f2) :<C-u>call EasyMotion#S(2,1,0)<CR>
+    " xnoremap <silent><Plug>(easymotion-f2) <Esc>:<C-u>call EasyMotion#S(2,1,0)<CR>
+    endfor
+endfunction "}}}
+
+" Find Motion: {{{
+call s:motion_map_helper({
+    \ 'f'               : {'fnc' : 'S'  , 'cnt' : 1, 'direction'  : 0},
+    \ 'F'               : {'fnc' : 'S'  , 'cnt' : 1, 'direction'  : 1},
+    \ 's'               : {'fnc' : 'S'  , 'cnt' : 1, 'direction'  : 2},
+    \ 'bd-f'            : {'fnc' : 'S'  , 'cnt' : 1, 'direction'  : 2},
+    \ 't'               : {'fnc' : 'T'  , 'cnt' : 1, 'direction'  : 0},
+    \ 'T'               : {'fnc' : 'T'  , 'cnt' : 1, 'direction'  : 1},
+    \ 'bd-t'            : {'fnc' : 'T'  , 'cnt' : 1, 'direction'  : 2},
+    \ 'fl'              : {'fnc' : 'SL' , 'cnt' : 1, 'direction'  : 0},
+    \ 'Fl'              : {'fnc' : 'SL' , 'cnt' : 1, 'direction'  : 1},
+    \ 'sl'              : {'fnc' : 'SL' , 'cnt' : 1, 'direction'  : 2},
+    \ 'bd-fl'           : {'fnc' : 'SL' , 'cnt' : 1, 'direction'  : 2},
+    \ 'tl'              : {'fnc' : 'TL' , 'cnt' : 1, 'direction'  : 0},
+    \ 'Tl'              : {'fnc' : 'TL' , 'cnt' : 1, 'direction'  : 1},
+    \ 'bd-tl'           : {'fnc' : 'TL' , 'cnt' : 1, 'direction'  : 2},
+    \
+    \ 'f2'              : {'fnc' : 'S'  , 'cnt' : 2, 'direction'  : 0},
+    \ 'F2'              : {'fnc' : 'S'  , 'cnt' : 2, 'direction'  : 1},
+    \ 's2'              : {'fnc' : 'S'  , 'cnt' : 2, 'direction'  : 2},
+    \ 'bd-f2'           : {'fnc' : 'S'  , 'cnt' : 2, 'direction'  : 2},
+    \ 't2'              : {'fnc' : 'T'  , 'cnt' : 2, 'direction'  : 0},
+    \ 'T2'              : {'fnc' : 'T'  , 'cnt' : 2, 'direction'  : 1},
+    \ 'bd-t2'           : {'fnc' : 'T'  , 'cnt' : 2, 'direction'  : 2},
+    \ 'fl2'             : {'fnc' : 'SL' , 'cnt' : 2, 'direction'  : 0},
+    \ 'Fl2'             : {'fnc' : 'SL' , 'cnt' : 2, 'direction'  : 1},
+    \ 'sl2'             : {'fnc' : 'SL' , 'cnt' : 2, 'direction'  : 2},
+    \ 'bd-fl2'          : {'fnc' : 'SL' , 'cnt' : 2, 'direction'  : 2},
+    \ 'tl2'             : {'fnc' : 'TL' , 'cnt' : 2, 'direction'  : 0},
+    \ 'Tl2'             : {'fnc' : 'TL' , 'cnt' : 2, 'direction'  : 1},
+    \ 'bd-tl2'          : {'fnc' : 'TL' , 'cnt' : 2, 'direction'  : 2},
+    \
+    \ 'fn'              : {'fnc' : 'S'  , 'cnt' : -1, 'direction' : 0},
+    \ 'Fn'              : {'fnc' : 'S'  , 'cnt' : -1, 'direction' : 1},
+    \ 'sn'              : {'fnc' : 'S'  , 'cnt' : -1, 'direction' : 2},
+    \ 'bd-fn'           : {'fnc' : 'S'  , 'cnt' : -1, 'direction' : 2},
+    \ 'tn'              : {'fnc' : 'T'  , 'cnt' : -1, 'direction' : 0},
+    \ 'Tn'              : {'fnc' : 'T'  , 'cnt' : -1, 'direction' : 1},
+    \ 'bd-tn'           : {'fnc' : 'T'  , 'cnt' : -1, 'direction' : 2},
+    \ 'fln'             : {'fnc' : 'SL' , 'cnt' : -1, 'direction' : 0},
+    \ 'Fln'             : {'fnc' : 'SL' , 'cnt' : -1, 'direction' : 1},
+    \ 'sln'             : {'fnc' : 'SL' , 'cnt' : -1, 'direction' : 2},
+    \ 'bd-fln'          : {'fnc' : 'SL' , 'cnt' : -1, 'direction' : 2},
+    \ 'tln'             : {'fnc' : 'TL' , 'cnt' : -1, 'direction' : 0},
+    \ 'Tln'             : {'fnc' : 'TL' , 'cnt' : -1, 'direction' : 1},
+    \ 'bd-tln'          : {'fnc' : 'TL' , 'cnt' : -1, 'direction' : 2},
+    \ })
+
+nnoremap <silent> <Plug>(easymotion-overwin-f) :<C-u>call EasyMotion#OverwinF(1)<CR>
+nnoremap <silent> <Plug>(easymotion-overwin-f2) :<C-u>call EasyMotion#OverwinF(2)<CR>
+nnoremap <silent> <Plug>(easymotion-overwin-line) :<C-u>call EasyMotion#overwin#line()<CR>
+nnoremap <silent> <Plug>(easymotion-overwin-w) :<C-u>call EasyMotion#overwin#w()<CR>
+
+"}}}
+
+" -- Word Motion {{{
+call s:motion_map_helper({
+    \ 'w'               : {'fnc' : 'WB' , 'direction' : 0},
+    \ 'b'               : {'fnc' : 'WB' , 'direction' : 1},
+    \ 'bd-w'            : {'fnc' : 'WB' , 'direction' : 2},
+    \ 'W'               : {'fnc' : 'WBW', 'direction' : 0},
+    \ 'B'               : {'fnc' : 'WBW', 'direction' : 1},
+    \ 'bd-W'            : {'fnc' : 'WBW', 'direction' : 2},
+    \ 'iskeyword-w'     : {'fnc' : 'WBK', 'direction' : 0},
+    \ 'iskeyword-b'     : {'fnc' : 'WBK', 'direction' : 1},
+    \ 'iskeyword-bd-w'  : {'fnc' : 'WBK', 'direction' : 2},
+    \
+    \ 'e'               : {'fnc' : 'E'  , 'direction' : 0},
+    \ 'ge'              : {'fnc' : 'E'  , 'direction' : 1},
+    \ 'bd-e'            : {'fnc' : 'E'  , 'direction' : 2},
+    \ 'E'               : {'fnc' : 'EW' , 'direction' : 0},
+    \ 'gE'              : {'fnc' : 'EW' , 'direction' : 1},
+    \ 'bd-E'            : {'fnc' : 'EW' , 'direction' : 2},
+    \ 'iskeyword-e'     : {'fnc' : 'EK' , 'direction' : 0},
+    \ 'iskeyword-ge'    : {'fnc' : 'EK' , 'direction' : 1},
+    \ 'iskeyword-bd-e'  : {'fnc' : 'EK' , 'direction' : 2},
+    \ })
+"}}}
+
+" -- JK Motion {{{
+call s:motion_map_helper({
+    \ 'j'               : {'fnc' : 'JK' , 'direction' : 0},
+    \ 'k'               : {'fnc' : 'JK' , 'direction' : 1},
+    \ 'bd-jk'           : {'fnc' : 'JK' , 'direction' : 2},
+    \ 'sol-j'           : {'fnc' : 'Sol', 'direction' : 0},
+    \ 'sol-k'           : {'fnc' : 'Sol', 'direction' : 1},
+    \ 'sol-bd-jk'       : {'fnc' : 'Sol', 'direction' : 2},
+    \ 'eol-j'           : {'fnc' : 'Eol', 'direction' : 0},
+    \ 'eol-k'           : {'fnc' : 'Eol', 'direction' : 1},
+    \ 'eol-bd-jk'       : {'fnc' : 'Eol', 'direction' : 2},
+    \ })
+"}}}
+
+" -- Search Motion {{{
+call s:motion_map_helper({
+    \ 'n'               : {'fnc' : 'Search', 'direction': 0, 'respect_direction': 0},
+    \ 'N'               : {'fnc' : 'Search', 'direction': 1, 'respect_direction': 0},
+    \ 'bd-n'            : {'fnc' : 'Search', 'direction': 2, 'respect_direction': 0},
+    \ 'vim-n'           : {'fnc' : 'Search', 'direction': 0, 'respect_direction': 1},
+    \ 'vim-N'           : {'fnc' : 'Search', 'direction': 1, 'respect_direction': 1},
+    \ })
+"}}}
+
+" -- Jump To Anywhere Motion {{{
+call s:motion_map_helper({
+    \ 'jumptoanywhere'  : {'fnc' : 'JumpToAnywhere', 'direction': 2},
+    \ })
+"}}}
+
+" -- Line Motion {{{
+call s:motion_map_helper({
+    \ 'wl'              : {'fnc' : 'WBL', 'direction': 0},
+    \ 'bl'              : {'fnc' : 'WBL', 'direction': 1},
+    \ 'bd-wl'           : {'fnc' : 'WBL', 'direction': 2},
+    \ 'el'              : {'fnc' : 'EL' , 'direction': 0},
+    \ 'gel'             : {'fnc' : 'EL' , 'direction': 1},
+    \ 'bd-el'           : {'fnc' : 'EL' , 'direction': 2},
+    \ 'lineforward'     : {'fnc' : 'LineAnywhere', 'direction': 0},
+    \ 'linebackward'    : {'fnc' : 'LineAnywhere', 'direction': 1},
+    \ 'lineanywhere'    : {'fnc' : 'LineAnywhere', 'direction': 2},
+    \ })
+"}}}
+
+" -- Next, Previous Motion {{{
+noremap  <silent><Plug>(easymotion-next)
+    \      :<C-u>call EasyMotion#NextPrevious(0,0)<CR>
+xnoremap <silent><Plug>(easymotion-next)
+    \      :<C-u>call EasyMotion#NextPrevious(1,0)<CR>
+
+noremap  <silent><Plug>(easymotion-prev)
+    \      :<C-u>call EasyMotion#NextPrevious(0,1)<CR>
+xnoremap <silent><Plug>(easymotion-prev)
+    \      :<C-u>call EasyMotion#NextPrevious(1,1)<CR>
+"}}}
+
+" -- Repeat Motion {{{
+noremap  <silent><Plug>(easymotion-repeat)
+    \      :<C-u>call EasyMotion#Repeat(0)<CR>
+xnoremap <silent><Plug>(easymotion-repeat)
+    \ <Esc>:<C-u>call EasyMotion#Repeat(1)<CR>
+
+noremap  <silent><Plug>(easymotion-dotrepeat)
+    \      :<C-u>call EasyMotion#DotRepeat()<CR>
+"}}}
+
+noremap  <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(0)<CR>
+xnoremap <silent><Plug>(easymotion-activate) :<C-u>call EasyMotion#activate(1)<CR>
+" }}}
+
+" == Default key mapping {{{
+if g:EasyMotion_do_mapping == 1
+    " Prepare Prefix: {{{
+    if exists('g:EasyMotion_leader_key')
+        exec 'map ' . g:EasyMotion_leader_key . ' <Plug>(easymotion-prefix)'
+    else
+        if !hasmapto('<Plug>(easymotion-prefix)')
+            map <Leader><Leader> <Plug>(easymotion-prefix)
+        endif
+    endif
+    "}}}
+
+    function! s:default_mapping(motions, do_mapping) "{{{
+        for motion in a:motions
+            " Mapping {{{
+            if exists('g:EasyMotion_mapping_' . motion)
+                " Backward compatible mapping [deprecated]
+                silent exec 'map <silent> ' .
+                    \ eval('g:EasyMotion_mapping_' . motion) . ' <Plug>(easymotion-' . motion . ')'
+            elseif a:do_mapping
+                    \ && !hasmapto('<Plug>(easymotion-' . motion . ')')
+                    \ && empty(maparg('<Plug>(easymotion-prefix)' . motion, 'nov'))
+
+                " Do mapping
+                silent exec 'map <silent> ' .
+                    \'<Plug>(easymotion-prefix)' . motion . ' <Plug>(easymotion-' . motion . ')'
+            endif "}}}
+        endfor
+    endfunction "}}}
+
+    " Default Mapping:
+    call s:default_mapping(
+        \ ['f', 'F', 's', 't', 'T',
+        \  'w', 'W', 'b', 'B', 'e', 'E', 'ge', 'gE',
+        \  'j', 'k', 'n', 'N'], g:EasyMotion_do_mapping)
+endif "}}}
+
+" == CommandLine Mapping {{{
+command! -nargs=*
+\   EMCommandLineNoreMap
+\   call EasyMotion#command_line#cnoremap([<f-args>])
+command! -nargs=*
+\   EMCommandLineMap
+\   call EasyMotion#command_line#cmap([<f-args>])
+command! -nargs=1
+\   EMCommandLineUnMap
+\   call EasyMotion#command_line#cunmap(<f-args>)
+"}}}
+
+" == Restore 'cpoptions' {{{
+let &cpo = s:save_cpo
+unlet s:save_cpo
+" }}}
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/t/compare_movements_spec.vim b/vim/plugins/vim-easymotion/t/compare_movements_spec.vim
new file mode 100644
index 0000000..0ea6341
--- /dev/null
+++ b/vim/plugins/vim-easymotion/t/compare_movements_spec.vim
@@ -0,0 +1,274 @@
+"=============================================================================
+" FILE: t/compare_movements_spec.vim
+" AUTHOR: YggdrasiI
+" Test: https://github.com/kana/vim-vspec
+" Description: EasyMotion keyword movement test with vim-vspec
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+
+" Setup {{{
+let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
+
+" The consumed time depends from the length of the text and could be really high
+" on vimdoc pages. (See it 'Loop through Vim help buffer and compare movements')
+" Reduce this value to stop CompareMovements(...) before it reached the end of the
+" buffer.
+let s:maximal_number_of_compared_movments = 10000
+execute 'set' 'rtp +=./'.s:root_dir
+runtime! plugin/EasyMotion.vim
+" }}}
+
+" Functions for Test {{{
+function! AddLine(str)
+    put =a:str
+endfunction
+
+function! CursorPos()
+    return [line('.'), col('.'), getline('.')[col('.')-1]]
+endfunction
+
+" Nested normal to avoid throwing readonly errors. They abort the testing.
+function TryNormal(str)
+    try
+        exec 'normal ' . a:str
+    catch /^Vim\%((\a\+)\)\=:E21/
+    endtry
+    return 0
+endfunction
+
+let s:to_cursor = {}
+function! s:to_cursor.match(actual, expected)
+    return a:actual == a:expected
+endfunction
+
+" Add metadata about failure.
+function! s:to_cursor.failure_message_for_should(actual, expected)
+    Expect a:actual[0] > 0
+    Expect a:expected[0] > 0
+    Expect a:actual[0] <= getpos('$')[1]
+    Expect a:expected[0] <= getpos('$')[1]
+    Expect a:actual[1] > 0
+    Expect a:expected[1] > 0
+
+    let line1 = getline(a:actual[0])
+    let line2 = getline(a:expected[0])
+    " Change char on cursor to '█'. 
+    let line1 = strpart(l:line1, 0, a:actual[1]-1)
+                \ . '█'
+                \ . strpart(l:line1, a:actual[1])
+    let line2 = strpart(l:line2, 0, a:expected[1]-1)
+                \ . '█'
+                \ . strpart(l:line2, a:expected[1])
+    " Separation of both cases with \n would be nice, but
+    " vim-vspec allow oneliners as return string, only.
+    let msg = 'Line ' . string(a:actual[0]) . ": '" . l:line1
+                \ . "',\x09\x09 Line " . string(a:expected[0]) . ": '" . l:line2 . "'\x0a"
+    return l:msg
+endfunction
+
+function! CompareMovements(movement1, movement2, backward)
+    let jumpmarks = [
+                \ [a:movement1, []],
+                \ [a:movement2, []],
+                \ ]
+
+    " Loop through current buffer in both variants {{
+    for [l:handler, l:list] in l:jumpmarks
+        if a:backward == 1
+            let last_line = line('$')
+            let last_char = len(getline(l:last_line))
+            call cursor(l:last_line, l:last_char)
+        else
+            call cursor([1,1])
+        endif
+
+        let lastpos = [0,0]
+
+        " Centralize line. Otherwise, Easymotion functions aborts
+        " at the end of the (virtual) window.
+        call TryNormal('zz')
+        call TryNormal(l:handler)
+        let curpos = getpos(".")[1:2]
+
+        while l:lastpos != l:curpos 
+            let list += [l:curpos]
+            let lastpos = l:curpos
+            call TryNormal('zz')
+            call TryNormal(l:handler)
+            let curpos = getpos(".")[1:2]
+            " Abort after a fixed number of steps.
+            if len(l:list) > s:maximal_number_of_compared_movments
+                break
+            endif
+        endwhile
+    endfor
+    " }}
+
+    " The resulting lists are stored in l:jumpmarks[*][1], now.
+    let [l:cursor_positions1, l:cursor_positions2] = [ l:jumpmarks[0][1], l:jumpmarks[1][1] ]
+
+    if l:cursor_positions1 == l:cursor_positions2
+        return 0
+    endif
+
+    " Search for first unmatching position. {{
+    let index = 0
+    let len = min([len(l:cursor_positions2), len(l:cursor_positions1)]) 
+    while l:index < l:len
+        Expect l:cursor_positions2[l:index] to_cursor l:cursor_positions1[l:index]
+        let index += 1
+    endwhile
+
+    " Collision with begin or end of file or while loop aborts to early.
+    if a:backward == 1
+        Expect join([a:movement2, ': File begin reached after ', len(l:cursor_positions2), ' steps.'])
+                    \ == join([a:movement1, ': File begin reached after ', len(l:cursor_positions1), ' steps.'])
+    else
+        Expect l:cursor_positions2[l:index-1] to_cursor l:cursor_positions1[l:index]
+        Expect join([a:movement2, ': File end reached after ', len(l:cursor_positions2), ' steps.'])
+                    \ == join([a:movement1, ': File end reached after ', len(l:cursor_positions1), ' steps.'])
+    endif
+    " }}
+
+    return -1
+endfunction
+
+" Hand crafted text with rare cases
+function! InsertTestText1()
+
+    " Blanks at document begin
+    call AddLine('')
+    call AddLine(' ')
+    call AddLine('')
+
+    call AddLine('scriptencoding utf-8')
+    
+    " '^\s*[not-\k]'-case
+    call AddLine('!foo')
+    call AddLine('   !bar')
+
+    call AddLine('<!{}>s!  ')
+
+    " Blanks at document end
+    call AddLine('')
+    call AddLine(' ')
+    call AddLine('')
+endfunction
+
+"}}}
+
+"Keyword word motion {{{
+describe 'Keyword word motion'
+    before
+        new
+        resize 10
+        nmap a <Nop>
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_maximal_jumpmarks  = 2 " Error for value 1 unanalyzed. 
+        nmap <Leader>w <Plug>(easymotion-iskeyword-w)
+        nmap <Leader>b <Plug>(easymotion-iskeyword-b)
+        nmap <Leader>e <Plug>(easymotion-iskeyword-e)
+        nmap <Leader>ge <Plug>(easymotion-iskeyword-ge)
+        nmap <Leader>W <Plug>(easymotion-W)
+        nmap <Leader>B <Plug>(easymotion-B)
+        nmap <Leader>E <Plug>(easymotion-E)
+        nmap <Leader>gE <Plug>(easymotion-gE)
+        call EasyMotion#init()
+        call vspec#customize_matcher('to_cursor', s:to_cursor)
+    end
+
+    after
+        close!
+    end
+
+    it 'Simple test to check setup of this test'
+        " Check if a is remapped to <Nop> to avoid start of insert mode.
+        normal aa\<Esc>
+        Expect getline(1) == ''
+
+        call AddLine('word')
+        Expect CompareMovements('w', 'w', 0) == 0
+        Expect CompareMovements('w', '\wa', 0) == 0
+        Expect CompareMovements('b', '\ba', 1) == 0
+        Expect CompareMovements('e', '\ea', 0) == 0
+        Expect CompareMovements('ge', '\gea', 1) == 0
+        Expect CompareMovements('W', '\Wa', 0) == 0
+        Expect CompareMovements('B', '\Ba', 1) == 0
+        Expect CompareMovements('E', '\Ea', 0) == 0
+        Expect CompareMovements('gE', '\gEa', 1) == 0
+    end
+
+    it 'w'
+        call InsertTestText1()
+        Expect CompareMovements('w', '\wa', 0) == 0
+    end
+
+    it 'b'
+        call InsertTestText1()
+        Expect CompareMovements('b', '\ba', 1) == 0
+    end
+
+    it 'e'
+        call InsertTestText1()
+        Expect CompareMovements('e', '\ea', 0) == 0
+    end
+
+    it 'ge'
+        call InsertTestText1()
+        Expect CompareMovements('ge', '\gea', 1) == 0
+    end
+
+    it 'W'
+        call InsertTestText1()
+        Expect CompareMovements('W', 'W', 0) == 0
+    end
+
+    it 'B'
+        call InsertTestText1()
+        Expect CompareMovements('B', 'B', 1) == 0
+    end
+
+    it 'E'
+        call InsertTestText1()
+        Expect CompareMovements('E', 'E', 0) == 0
+    end
+
+    it 'gE'
+        call InsertTestText1()
+        Expect CompareMovements('gE', 'gE', 1) == 0
+    end
+
+    " Really time consuming test...
+    "it 'Loop through Vim help buffer and compare movements'
+    "    help motion.txt
+    "    Expect expand('%:t') ==# 'motion.txt'
+    "    "Optional: Copy text into editable buffer
+    "    exec "normal! Gygg\<C-W>cP"
+    "    Expect CompareMovements('w', '\wa', 0) == 0
+    "end
+
+end
+"}}}
+
+" __END__  {{{
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
+" }}}
diff --git a/vim/plugins/vim-easymotion/t/easymotion_spec.vim b/vim/plugins/vim-easymotion/t/easymotion_spec.vim
new file mode 100644
index 0000000..df808a3
--- /dev/null
+++ b/vim/plugins/vim-easymotion/t/easymotion_spec.vim
@@ -0,0 +1,1471 @@
+"=============================================================================
+" FILE: t/easymotion_spec.vim
+" AUTHOR: haya14busa
+" Test: https://github.com/kana/vim-vspec
+" Refer: https://github.com/rhysd/clever-f.vim
+" Description: EasyMotion test with vim-vspec
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+
+" Avoid source test files {{{
+if expand("%:p") ==# expand("<sfile>:p")
+  finish
+endif
+"}}}
+
+let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
+execute 'set' 'rtp +=./'.s:root_dir
+runtime! plugin/EasyMotion.vim
+
+" Default settings {{{
+describe 'Default settings'
+    it 'provide default <Plug> mappings for find motion'
+        " Find Motion: {{{
+        " s
+        Expect maparg('<Plug>(easymotion-s)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-s)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-s)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,2)<CR>'
+        " f
+        Expect maparg('<Plug>(easymotion-f)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-f)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-f)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,0)<CR>'
+        " F
+        Expect maparg('<Plug>(easymotion-F)', 'n') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-F)', 'o') ==# ':<C-U>call EasyMotion#S(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-F)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(1,1,1)<CR>'
+        " bd-f
+        Expect maparg('<Plug>(easymotion-bd-f)', 'n') ==# maparg('<Plug>(easymotion-s)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-f)', 'o') ==# maparg('<Plug>(easymotion-s)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-f)', 'v') ==# maparg('<Plug>(easymotion-s)', 'v')
+        " t
+        Expect maparg('<Plug>(easymotion-t)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-t)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-t)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,0)<CR>'
+        " T
+        Expect maparg('<Plug>(easymotion-T)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-T)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-T)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,1)<CR>'
+        " bd-t
+        Expect maparg('<Plug>(easymotion-bd-t)', 'n') ==# ':<C-U>call EasyMotion#T(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-t)', 'o') ==# ':<C-U>call EasyMotion#T(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-t)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(1,1,2)<CR>'
+        " sl
+        Expect maparg('<Plug>(easymotion-sl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,2)<CR>'
+        " fl
+        Expect maparg('<Plug>(easymotion-fl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,0)<CR>'
+        " Fl
+        Expect maparg('<Plug>(easymotion-Fl)', 'n') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fl)', 'o') ==# ':<C-U>call EasyMotion#SL(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(1,1,1)<CR>'
+        " bd-fl
+        Expect maparg('<Plug>(easymotion-bd-fl)', 'n') ==# maparg('<Plug>(easymotion-sl)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-fl)', 'o') ==# maparg('<Plug>(easymotion-sl)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-fl)', 'v') ==# maparg('<Plug>(easymotion-sl)', 'v')
+        " tl
+        Expect maparg('<Plug>(easymotion-tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,0)<CR>'
+        " Tl
+        Expect maparg('<Plug>(easymotion-Tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,1)<CR>'
+        " bd-tl
+        Expect maparg('<Plug>(easymotion-bd-tl)', 'n') ==# ':<C-U>call EasyMotion#TL(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tl)', 'o') ==# ':<C-U>call EasyMotion#TL(1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(1,1,2)<CR>'
+        "}}}
+
+        " Two Char Find Motion: {{{
+        " s2
+        Expect maparg('<Plug>(easymotion-s2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-s2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-s2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,2)<CR>'
+        " f2
+        Expect maparg('<Plug>(easymotion-f2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-f2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-f2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,0)<CR>'
+        " F2
+        Expect maparg('<Plug>(easymotion-F2)', 'n') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-F2)', 'o') ==# ':<C-U>call EasyMotion#S(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-F2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(2,1,1)<CR>'
+        " bd-f2
+        Expect maparg('<Plug>(easymotion-bd-f2)', 'n') ==# maparg('<Plug>(easymotion-s2)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-f2)', 'o') ==# maparg('<Plug>(easymotion-s2)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-f2)', 'v') ==# maparg('<Plug>(easymotion-s2)', 'v')
+        " t2
+        Expect maparg('<Plug>(easymotion-t2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-t2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-t2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,0)<CR>'
+        " T2
+        Expect maparg('<Plug>(easymotion-T2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-T2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-T2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,1)<CR>'
+        " sl2
+        Expect maparg('<Plug>(easymotion-sl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,2)<CR>'
+        " bd-t2
+        Expect maparg('<Plug>(easymotion-bd-t2)', 'n') ==# ':<C-U>call EasyMotion#T(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-t2)', 'o') ==# ':<C-U>call EasyMotion#T(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-t2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(2,1,2)<CR>'
+        " fl2
+        Expect maparg('<Plug>(easymotion-fl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,0)<CR>'
+        " Fl2
+        Expect maparg('<Plug>(easymotion-Fl2)', 'n') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fl2)', 'o') ==# ':<C-U>call EasyMotion#SL(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(2,1,1)<CR>'
+        " bd-fl2
+        Expect maparg('<Plug>(easymotion-bd-fl2)', 'n') ==# maparg('<Plug>(easymotion-sl2)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-fl2)', 'o') ==# maparg('<Plug>(easymotion-sl2)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-fl2)', 'v') ==# maparg('<Plug>(easymotion-sl2)', 'v')
+        " tl2
+        Expect maparg('<Plug>(easymotion-tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,0)<CR>'
+        " Tl2
+        Expect maparg('<Plug>(easymotion-Tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,1)<CR>'
+        " bd-tl2
+        Expect maparg('<Plug>(easymotion-bd-tl2)', 'n') ==# ':<C-U>call EasyMotion#TL(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tl2)', 'o') ==# ':<C-U>call EasyMotion#TL(2,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tl2)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(2,1,2)<CR>'
+        "}}}
+
+        " Multi Char Find Motion: {{{
+        " sn
+        Expect maparg('<Plug>(easymotion-sn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,2)<CR>'
+        " fn
+        Expect maparg('<Plug>(easymotion-fn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,0)<CR>'
+        " Fn
+        Expect maparg('<Plug>(easymotion-Fn)', 'n') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fn)', 'o') ==# ':<C-U>call EasyMotion#S(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#S(-1,1,1)<CR>'
+        " bd-fn
+        Expect maparg('<Plug>(easymotion-bd-fn)', 'n') ==# maparg('<Plug>(easymotion-sn)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-fn)', 'o') ==# maparg('<Plug>(easymotion-sn)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-fn)', 'v') ==# maparg('<Plug>(easymotion-sn)', 'v')
+        " tn
+        Expect maparg('<Plug>(easymotion-tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,0)<CR>'
+        " Tn
+        Expect maparg('<Plug>(easymotion-Tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,1)<CR>'
+        " bd-tn
+        Expect maparg('<Plug>(easymotion-bd-tn)', 'n') ==# ':<C-U>call EasyMotion#T(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tn)', 'o') ==# ':<C-U>call EasyMotion#T(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tn)', 'v') ==# '<Esc>:<C-U>call EasyMotion#T(-1,1,2)<CR>'
+        " sln
+        Expect maparg('<Plug>(easymotion-sln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,2)<CR>'
+        " fln
+        Expect maparg('<Plug>(easymotion-fln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-fln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,0)<CR>'
+        " Fln
+        Expect maparg('<Plug>(easymotion-Fln)', 'n') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fln)', 'o') ==# ':<C-U>call EasyMotion#SL(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Fln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#SL(-1,1,1)<CR>'
+        " bd-fln
+        Expect maparg('<Plug>(easymotion-bd-fln)', 'n') ==# maparg('<Plug>(easymotion-sln)', 'n')
+        Expect maparg('<Plug>(easymotion-bd-fln)', 'o') ==# maparg('<Plug>(easymotion-sln)', 'o')
+        Expect maparg('<Plug>(easymotion-bd-fln)', 'v') ==# maparg('<Plug>(easymotion-sln)', 'v')
+        " tln
+        Expect maparg('<Plug>(easymotion-tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,0)<CR>'
+        " Tln
+        Expect maparg('<Plug>(easymotion-Tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-Tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,1)<CR>'
+        " bd-tln
+        Expect maparg('<Plug>(easymotion-bd-tln)', 'n') ==# ':<C-U>call EasyMotion#TL(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tln)', 'o') ==# ':<C-U>call EasyMotion#TL(-1,0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-tln)', 'v') ==# '<Esc>:<C-U>call EasyMotion#TL(-1,1,2)<CR>'
+        "}}}
+    end
+
+    it 'provide default <Plug> mappings for regex motion'
+        "(is_visual, direction)
+        " direction:
+        "   - 0: forward
+        "   - 1: backward
+        "   - 2: bi-direction
+        " Word Motion: {{{
+        Expect maparg('<Plug>(easymotion-w)', 'n') ==# ':<C-U>call EasyMotion#WB(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-w)', 'o') ==# ':<C-U>call EasyMotion#WB(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-b)', 'n') ==# ':<C-U>call EasyMotion#WB(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-b)', 'o') ==# ':<C-U>call EasyMotion#WB(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-b)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-w)', 'n') ==# ':<C-U>call EasyMotion#WB(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-w)', 'o') ==# ':<C-U>call EasyMotion#WB(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WB(1,2)<CR>'
+        " }}}
+
+        " WORD Motion: {{{
+        Expect maparg('<Plug>(easymotion-W)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-W)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-W)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-B)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-B)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-B)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-W)', 'n') ==# ':<C-U>call EasyMotion#WBW(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-W)', 'o') ==# ':<C-U>call EasyMotion#WBW(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-W)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBW(1,2)<CR>'
+        " }}}
+
+        " Word Motion IsKeyWord: {{{
+        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-b)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'n') ==# ':<C-U>call EasyMotion#WBK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'o') ==# ':<C-U>call EasyMotion#WBK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-w)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBK(1,2)<CR>'
+        " }}}
+
+        " End Of Word Motion: {{{
+        Expect maparg('<Plug>(easymotion-e)', 'n')    ==# ':<C-U>call EasyMotion#E(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-e)', 'o')    ==# ':<C-U>call EasyMotion#E(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-e)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#E(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-ge)', 'n')   ==# ':<C-U>call EasyMotion#E(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-ge)', 'o')   ==# ':<C-U>call EasyMotion#E(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-ge)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#E(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-e)', 'n') ==# ':<C-U>call EasyMotion#E(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-e)', 'o') ==# ':<C-U>call EasyMotion#E(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-e)', 'v') ==# '<Esc>:<C-U>call EasyMotion#E(1,2)<CR>'
+        " }}}
+
+        " END OF WORD Motion: {{{
+        Expect maparg('<Plug>(easymotion-E)', 'n')    ==# ':<C-U>call EasyMotion#EW(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-E)', 'o')    ==# ':<C-U>call EasyMotion#EW(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-E)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EW(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-gE)', 'n')   ==# ':<C-U>call EasyMotion#EW(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-gE)', 'o')   ==# ':<C-U>call EasyMotion#EW(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-gE)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EW(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-E)', 'n') ==# ':<C-U>call EasyMotion#EW(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-E)', 'o') ==# ':<C-U>call EasyMotion#EW(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-E)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EW(1,2)<CR>'
+        " }}}
+
+        " End Of Word Motion IsKeyWord: {{{
+        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'n')    ==# ':<C-U>call EasyMotion#EK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'o')    ==# ':<C-U>call EasyMotion#EK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-e)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EK(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'n')   ==# ':<C-U>call EasyMotion#EK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'o')   ==# ':<C-U>call EasyMotion#EK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-ge)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EK(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'n') ==# ':<C-U>call EasyMotion#EK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'o') ==# ':<C-U>call EasyMotion#EK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-iskeyword-bd-e)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EK(1,2)<CR>'
+        " }}}
+
+        " JK Motion: {{{
+        " default
+        Expect maparg('<Plug>(easymotion-j)', 'n') ==# ':<C-U>call EasyMotion#JK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-j)', 'o') ==# ':<C-U>call EasyMotion#JK(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-k)', 'n') ==# ':<C-U>call EasyMotion#JK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-k)', 'o') ==# ':<C-U>call EasyMotion#JK(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#JK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#JK(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#JK(1,2)<CR>'
+        " start of line
+        Expect maparg('<Plug>(easymotion-sol-j)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-j)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-k)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-k)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#Sol(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#Sol(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-sol-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Sol(1,2)<CR>'
+        " end of line
+        Expect maparg('<Plug>(easymotion-eol-j)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-j)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-j)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-k)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-k)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-k)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'n') ==# ':<C-U>call EasyMotion#Eol(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'o') ==# ':<C-U>call EasyMotion#Eol(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-eol-bd-jk)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Eol(1,2)<CR>'
+        " }}}
+
+        " Search Motion: {{{
+        Expect maparg('<Plug>(easymotion-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-N)', 'n') ==# ':<C-U>call EasyMotion#Search(0,1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-N)', 'o') ==# ':<C-U>call EasyMotion#Search(0,1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-N)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,2,0)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,2,0)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,2,0)<CR>'
+
+        " respect previous direction
+        Expect maparg('<Plug>(easymotion-vim-n)', 'n') ==# ':<C-U>call EasyMotion#Search(0,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-vim-n)', 'o') ==# ':<C-U>call EasyMotion#Search(0,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-vim-n)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-vim-N)', 'n') ==# ':<C-U>call EasyMotion#Search(0,1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-vim-N)', 'o') ==# ':<C-U>call EasyMotion#Search(0,1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-vim-N)', 'v') ==# '<Esc>:<C-U>call EasyMotion#Search(1,1,1)<CR>'
+        " }}}
+
+        " JumpToAnywhere Motion: {{{
+        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'n')
+            \ ==# ':<C-U>call EasyMotion#JumpToAnywhere(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'o')
+            \ ==# ':<C-U>call EasyMotion#JumpToAnywhere(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-jumptoanywhere)', 'v')
+            \ ==# '<Esc>:<C-U>call EasyMotion#JumpToAnywhere(1,2)<CR>'
+        " }}}
+
+        " Repeat Motion: {{{
+        " (is_visual)
+        Expect maparg('<Plug>(easymotion-repeat)', 'n')
+            \ ==# ':<C-U>call EasyMotion#Repeat(0)<CR>'
+        Expect maparg('<Plug>(easymotion-repeat)', 'o')
+            \ ==# ':<C-U>call EasyMotion#Repeat(0)<CR>'
+        Expect maparg('<Plug>(easymotion-repeat)', 'v')
+            \ ==# '<Esc>:<C-U>call EasyMotion#Repeat(1)<CR>'
+        Expect maparg('<Plug>(easymotion-dotrepeat)', 'n')
+            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
+        Expect maparg('<Plug>(easymotion-dotrepeat)', 'o')
+            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
+        Expect maparg('<Plug>(easymotion-dotrepeat)', 'v')
+            \ ==# ':<C-U>call EasyMotion#DotRepeat()<CR>'
+        " }}}
+
+        " Next, Previous motion {{{
+        Expect maparg('<Plug>(easymotion-next)', 'n')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-next)', 'o')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-next)', 'v')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(1,0)<CR>'
+
+        Expect maparg('<Plug>(easymotion-prev)', 'n')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-prev)', 'o')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-prev)', 'v')
+            \ ==# ':<C-U>call EasyMotion#NextPrevious(1,1)<CR>'
+        " }}}
+
+        " Line Motion: {{{
+        " word
+        Expect maparg('<Plug>(easymotion-wl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-wl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-wl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-bl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-wl)', 'n') ==# ':<C-U>call EasyMotion#WBL(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-wl)', 'o') ==# ':<C-U>call EasyMotion#WBL(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-wl)', 'v') ==# '<Esc>:<C-U>call EasyMotion#WBL(1,2)<CR>'
+        " end of word
+        Expect maparg('<Plug>(easymotion-el)', 'n')    ==# ':<C-U>call EasyMotion#EL(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-el)', 'o')    ==# ':<C-U>call EasyMotion#EL(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-el)', 'v')    ==# '<Esc>:<C-U>call EasyMotion#EL(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-gel)', 'n')   ==# ':<C-U>call EasyMotion#EL(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-gel)', 'o')   ==# ':<C-U>call EasyMotion#EL(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-gel)', 'v')   ==# '<Esc>:<C-U>call EasyMotion#EL(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-el)', 'n') ==# ':<C-U>call EasyMotion#EL(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-el)', 'o') ==# ':<C-U>call EasyMotion#EL(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-bd-el)', 'v') ==# '<Esc>:<C-U>call EasyMotion#EL(1,2)<CR>'
+        " LineAnywhere
+        Expect maparg('<Plug>(easymotion-lineforward)', 'n')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-lineforward)', 'o')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,0)<CR>'
+        Expect maparg('<Plug>(easymotion-lineforward)', 'v')
+            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,0)<CR>'
+        Expect maparg('<Plug>(easymotion-linebackward)', 'n')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-linebackward)', 'o')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,1)<CR>'
+        Expect maparg('<Plug>(easymotion-linebackward)', 'v')
+            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,1)<CR>'
+        Expect maparg('<Plug>(easymotion-lineanywhere)', 'n')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-lineanywhere)', 'o')
+            \ ==# ':<C-U>call EasyMotion#LineAnywhere(0,2)<CR>'
+        Expect maparg('<Plug>(easymotion-lineanywhere)', 'v')
+            \ ==# '<Esc>:<C-U>call EasyMotion#LineAnywhere(1,2)<CR>'
+        " }}}
+
+        " Activate {{{
+        Expect maparg('<Plug>(easymotion-activate)', 'n')
+            \ ==# ':<C-U>call EasyMotion#activate(0)<CR>'
+        Expect maparg('<Plug>(easymotion-activate)', 'o')
+            \ ==# ':<C-U>call EasyMotion#activate(0)<CR>'
+        Expect maparg('<Plug>(easymotion-activate)', 'v')
+            \ ==# ':<C-U>call EasyMotion#activate(1)<CR>'
+        " }}}
+    end
+
+    it 'provide autoload functions'
+        try
+            " load autoload functions
+            runtime autoload/EasyMotion.vim
+            runtime autoload/EasyMotion/helper.vim
+            runtime autoload/EasyMotion/cmigemo.vim
+            runtime autoload/EasyMotion/init.vim
+            runtime autoload/EasyMotion/sticky_table.vim
+        catch
+        endtry
+        " autoload/EasyMotion.vim {{{
+        Expect exists('*EasyMotion#hoge') ==# 0
+        Expect exists('*EasyMotion#S') ==# 1
+        Expect exists('*EasyMotion#T') ==# 1
+        Expect exists('*EasyMotion#WB') ==# 1
+        Expect exists('*EasyMotion#WBW') ==# 1
+        Expect exists('*EasyMotion#E') ==# 1
+        Expect exists('*EasyMotion#EW') ==# 1
+        Expect exists('*EasyMotion#JK') ==# 1
+        Expect exists('*EasyMotion#Sol') ==# 1
+        Expect exists('*EasyMotion#Eol') ==# 1
+        Expect exists('*EasyMotion#Search') ==# 1
+        Expect exists('*EasyMotion#JumpToAnywhere') ==# 1
+        Expect exists('*EasyMotion#SL') ==# 1
+        Expect exists('*EasyMotion#TL') ==# 1
+        Expect exists('*EasyMotion#WBL') ==# 1
+        Expect exists('*EasyMotion#EL') ==# 1
+        Expect exists('*EasyMotion#LineAnywhere') ==# 1
+        Expect exists('*EasyMotion#Repeat') ==# 1
+        Expect exists('*EasyMotion#NextPrevious') ==# 1
+        Expect exists('*EasyMotion#DotRepeat') ==# 1
+        "}}}
+    end
+
+    it 'provide variables to customize EasyMotion'
+        " Option {{{
+        Expect g:EasyMotion_keys ==# 'asdghklqwertyuiopzxcvbnmfj;'
+        " Expect g:EasyMotion_keys ==# 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        Expect g:EasyMotion_do_mapping         ==# 1
+        Expect g:EasyMotion_do_shade           ==# 1
+        Expect g:EasyMotion_grouping           ==# 1
+        Expect g:EasyMotion_startofline        ==# 1
+        Expect g:EasyMotion_smartcase          ==# 0
+        Expect g:EasyMotion_skipfoldedline     ==# 1
+        Expect g:EasyMotion_use_migemo         ==# 0
+        Expect g:EasyMotion_use_upper          ==# 0
+        Expect g:EasyMotion_enter_jump_first   ==# 0
+        Expect g:EasyMotion_space_jump_first   ==# 0
+        Expect g:EasyMotion_show_prompt        ==# 1
+        Expect g:EasyMotion_inc_highlight      ==# 1
+        Expect g:EasyMotion_move_highlight     ==# 1
+        Expect g:EasyMotion_landing_highlight  ==# 0
+        Expect g:EasyMotion_cursor_highlight   ==# 1
+        Expect g:EasyMotion_use_regexp         ==# 1
+        Expect g:EasyMotion_add_search_history ==# 1
+        Expect g:EasyMotion_off_screen_search  ==# 1
+        Expect g:EasyMotion_prompt             ==# 'Search for {n} character(s): '
+        Expect g:EasyMotion_command_line_key_mappings ==# {}
+        Expect g:EasyMotion_force_csapprox ==# 0
+        Expect g:EasyMotion_disable_two_key_combo ==# 0
+        " }}}
+
+        " highlight {{{
+        Expect g:EasyMotion_hl_group_target ==# 'EasyMotionTarget'
+        Expect g:EasyMotion_hl2_first_group_target ==# 'EasyMotionTarget2First'
+        Expect g:EasyMotion_hl2_second_group_target ==# 'EasyMotionTarget2Second'
+        Expect g:EasyMotion_hl_group_shade ==# 'EasyMotionShade'
+        " }}}
+    end
+end
+"}}}
+
+function! AddLine(str)
+    put! =a:str
+endfunction
+
+function! CursorPos()
+    return [line('.'), col('.'), getline('.')[col('.')-1]]
+endfunction
+
+" s, f, F, t and T mappings {{{
+describe 's, f, F, t and T mappings'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('poge huga hiyo poyo')
+    end
+
+    after
+        close!
+    end
+
+    " s {{{
+    it 'provide improved forward search like builtin f & F'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal sha
+        Expect CursorPos() == [l,6,'h']
+        Expect CursorPos() != [l,1,'h']
+
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal shb
+        Expect CursorPos() == [l,11,'h']
+
+        normal sh
+        Expect CursorPos() == [l,6,'h']
+
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,19,'o']
+
+        normal spc
+        Expect CursorPos() == [l,19,'o']
+
+        normal spb
+        Expect CursorPos() == [l,1,'p']
+    end
+    "}}}
+    " f {{{
+    it 'provide improved backward search like builtin f'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+
+        normal fha
+        Expect CursorPos() == [l,6,'h']
+        Expect CursorPos() != [l,1,'h']
+
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal fhb
+        Expect CursorPos() == [l,11,'h']
+
+        normal fh
+        Expect CursorPos() == [l,11,'h']
+
+    end
+    " "}}}
+    " F {{{
+    it 'provide improved backward search like builtin F'
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,19,'o']
+
+        normal Fpa
+        Expect CursorPos() == [l,16,'p']
+
+        normal! $
+        normal Fpc
+        Expect CursorPos() == [l,19,'o']
+
+        normal Fpb
+        Expect CursorPos() == [l,1,'p']
+    end
+    " "}}}
+    " t {{{
+    it 'provide t mapping like builtin t'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        Expect CursorPos() != [l,10,'a']
+
+        normal tha
+        Expect CursorPos() == [l,5,' ']
+
+        normal! 0
+        normal thb
+        Expect CursorPos() == [l,10,' ']
+
+        normal! 0
+        normal thc
+        Expect CursorPos() == [l,1,'p']
+    end
+    " }}}
+    " T {{{
+    it 'provide T mapping like builtin T'
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,19,'o']
+        Expect CursorPos() != [l,18,'a']
+
+        normal Toa
+        Expect CursorPos() == [l,18,'y']
+
+        normal! $
+        normal Tob
+        Expect CursorPos() == [l,15,' ']
+
+        normal Toa
+        Expect CursorPos() == [l,3,'g']
+
+        normal! $
+        normal Tod
+        Expect CursorPos() == [l,19,'o']
+
+        normal Toc
+        Expect CursorPos() == [l,3,'g']
+    end
+    "}}}
+    " visual
+    it 'have different context in normal mode and visual mode'
+        let l = line('.')
+        Expect CursorPos() == [l, 1, 'p']
+
+        normal foa
+        Expect CursorPos() == [l, 2, 'o']
+
+        normal vfha
+        Expect CursorPos() == [l, 6, 'h']
+
+        normal fha
+        Expect CursorPos() == [l, 11, 'h']
+
+        normal! d
+        Expect getline('.') == "piyo poyo"
+        Expect CursorPos() == [l, 2, 'i']
+
+        normal! dfpa
+        Expect getline('.') == "poyo"
+        Expect CursorPos() == [l, 2, 'o']
+    end
+end
+"}}}
+
+" a non-existent char {{{
+describe 'a non-existent char'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('poge huga hiyo poyo')
+    end
+
+    after
+        close!
+    end
+
+    " makes no change {{{
+    it 'makes no change'
+        normal! 0
+        let origin = CursorPos()
+
+        normal fd
+        Expect CursorPos() == origin
+        normal f1
+        Expect CursorPos() == origin
+        normal f)
+        Expect CursorPos() == origin
+        normal f^
+        Expect CursorPos() == origin
+        normal fm
+        Expect CursorPos() == origin
+    end
+    "}}}
+end
+"}}}
+
+" when target is in other line, s, f and F mappings {{{
+describe 'when target is in other line, s, f and F mappings'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('foo bar baz')         " L2
+        call AddLine('poge huga hiyo poyo') " L1
+        "            '1234567890123456789'
+        normal! gg0
+    end
+
+    after
+        close!
+    end
+
+    " move cursor forward across lines {{{
+    it 'move cursor forward & backward across lines'
+        normal! 0
+        let l = line('.')
+        Expect col('.') == 1
+
+        normal saa
+        Expect CursorPos() == [l, 9, 'a']
+
+        normal saa
+        Expect CursorPos() == [l+1, 6, 'a']
+
+        normal sob
+        Expect CursorPos() == [l+1, 2, 'o']
+
+        normal! gg0
+        let l = line('.')
+        Expect col('.') == 1
+
+        normal faa
+        Expect CursorPos() == [l, 9, 'a']
+
+        normal faa
+        Expect CursorPos() == [l+1, 6, 'a']
+
+        normal faa
+        Expect CursorPos() == [l+1, 10, 'a']
+
+        normal Faa
+        Expect CursorPos() == [l+1, 6, 'a']
+
+        normal Faa
+        Expect CursorPos() == [l, 9, 'a']
+    end
+    " }}}
+end
+"}}}
+
+" Multibyte characters {{{
+describe 'Multibyte characters'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('ビムかわいいよzビムx')
+        call AddLine('foo bar baz')
+        normal! gg
+    end
+
+    after
+        close!
+    end
+
+    " is supported "{{{
+    it 'is supported'
+        normal! gg0
+        let l = line('.')
+
+        normal fza
+        Expect CursorPos() == [l, 11, 'z']
+        Expect CursorPos() != [l, 1, '2']
+
+        normal fz
+        Expect CursorPos() == [l+1, 22, 'z']
+
+        normal! h
+        normal fxa
+        Expect CursorPos() == [l+1, 29, 'x']
+    end
+    " }}}
+
+end
+"}}}
+
+" EasyMotion#helper#include_multibyte_char {{{
+describe 'EasyMotion#helper#include_multibyte_char'
+
+    it 'return true when the argument includes multibyte char'
+        Expect EasyMotion#helper#include_multibyte_char("あいうえお") ==# 1
+        Expect EasyMotion#helper#include_multibyte_char("aiueoあ") ==# 1
+        Expect EasyMotion#helper#include_multibyte_char("１２3ABC４5") ==# 1
+    end
+
+    it 'return false when the argument does not include multibyte char'
+        Expect EasyMotion#helper#include_multibyte_char("aiueo") ==# 0
+        Expect EasyMotion#helper#include_multibyte_char("this_is_a_pen.") ==# 0
+        Expect EasyMotion#helper#include_multibyte_char("!#$%&'()'") ==# 0
+        Expect EasyMotion#helper#include_multibyte_char("") ==# 0
+    end
+
+end
+"}}}
+
+" migemo support {{{
+describe 'migemo support'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_use_migemo = 1
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('はー，ビムかわいいよビム')
+        normal! gg0
+    end
+
+    after
+        close!
+        let g:clever_f_use_migemo = 0
+    end
+
+    " makes f and F mapping match multibyte characters {{{
+    it 'makes f and F mapping match multibyte characters'
+        normal fba
+        Expect col('.') == 10
+        normal fb
+        Expect col('.') == 31
+        normal Fb
+        Expect col('.') == 10
+        normal $
+        normal Fba
+        Expect col('.') == 31
+        normal Fb
+        Expect col('.') == 10
+    end
+    " }}}
+
+    " makes t and T mapping match multibyte characters {{{
+    it 'makes t and T mapping match multibyte characters'
+        normal tba
+        Expect col('.') == 7
+        normal tb
+        Expect col('.') == 28
+        normal Tb
+        Expect col('.') == 13
+        normal $
+        normal Tba
+        Expect col('.') == 13
+        normal tb
+        Expect col('.') == 28
+    end
+    " }}}
+
+end
+"}}}
+
+" g:EasyMotion_smartcase {{{
+describe 'g:EasyMotion_smartcase'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('poHe huga Hiyo hoyo: poyo();')
+                      1234567890123456789012345678
+        normal! gg0
+        let g:EasyMotion_smartcase = 1
+    end
+
+    after
+        close!
+        let g:EasyMotion_smartcase = 0
+    end
+
+    " makes f smart case {{{
+    it 'makes f smart case'
+        normal fha
+        Expect col('.') == 3
+        normal fha
+        Expect col('.') == 6
+        normal fha
+        Expect col('.') == 11
+        normal fh
+        Expect col('.') == 16
+        normal Fha
+        Expect col('.') == 11
+
+        normal! 0
+        normal fHa
+        Expect col('.') == 3
+        normal fH
+        Expect col('.') == 11
+        normal fHa
+        Expect col('.') == 11
+        normal FH
+        Expect col('.') == 3
+    end
+    "}}}
+
+    " makes t smart case {{{
+    it 'makes t smart case'
+        normal! $
+        normal Tha
+        Expect col('.') == 17
+        normal Tha
+        Expect col('.') == 12
+        normal Tha
+        Expect col('.') == 7
+        normal Th
+        Expect col('.') == 4
+        normal tha
+        Expect col('.') == 5
+
+        normal! $
+        normal THa
+        Expect col('.') == 12
+        normal TH
+        Expect col('.') == 4
+        normal tH
+        Expect col('.') == 10
+    end
+    " }}}
+
+    " makes no effect on searching signs {{{
+    it 'makes no effect on searching signs'
+        normal! 0
+        normal f;
+        Expect col('.') == 28
+        normal! 0
+        normal f:
+        Expect col('.') == 20
+        normal f:
+        Expect col('.') == 20
+    end
+    " }}}
+end
+"}}}
+
+" g:EasyMotion_smartsign {{{
+describe 'g:EasyMotion_smartsign'
+
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('poHe huga Hiyo hoyo: poyo();')
+        "             1234567890123456789012345678
+        normal! gg0
+        let g:EasyMotion_smartcase = 1
+        let g:EasyMotion_use_smartsign_us = 1
+    end
+
+    after
+        close!
+        let g:EasyMotion_smartcase = 0
+        let g:EasyMotion_use_smartsign_us = 0
+    end
+
+    " makes f smart sign {{{
+    it 'makes f smart case'
+        normal! 0
+        normal f;
+        Expect col('.') == 1
+        normal f;a
+        Expect col('.') == 20
+        normal f;
+        Expect col('.') == 28
+
+        normal! 0
+        normal f:
+        Expect col('.') == 20
+        normal f:
+        Expect col('.') == 20
+    end
+    "}}}
+
+    " makes t,T smart sign {{{
+    it 'makes t,T smart case'
+        normal! 0
+        normal t;
+        Expect col('.') == 1
+        normal t;a
+        Expect col('.') == 19
+        normal t;
+        Expect col('.') == 27
+        normal! $
+        Expect col('.') == 28
+        normal T;
+        Expect col('.') == 21
+    end
+    "}}}
+end
+"}}}
+
+" Next & Previous {{{
+describe '<Plug>(easymotion-next) & <Plug>(easymotion-prev)'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        map ; <Plug>(easymotion-next)
+        map , <Plug>(easymotion-prev)
+        set wrapscan
+        call EasyMotion#init()
+        call AddLine('poge huga hiyo poyo')
+        "             1234567890123456789
+    end
+
+    after
+        close!
+    end
+
+    " provide next & previous motion to replace `;`, `,` {{{
+    it 'provide next & previous motion to replace `;`, `,`'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal sha
+        Expect CursorPos() == [l,6,'h']
+
+        normal ;
+        Expect CursorPos() == [l,11,'h']
+
+        normal ,
+        Expect CursorPos() == [l,6,'h']
+
+        " wrapscan
+        normal ,
+        Expect CursorPos() == [l,11,'h']
+        normal ;
+        Expect CursorPos() == [l,6,'h']
+
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,19,'o']
+
+        normal ,
+        Expect CursorPos() == [l,11,'h']
+
+    end
+    "}}}
+
+    " next & previous motion count {{{
+    it 'next & previous motion count'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal sha
+        Expect CursorPos() == [l,6,'h']
+
+        normal ;
+        Expect CursorPos() == [l,11,'h']
+
+        normal 2,
+        Expect CursorPos() == [l,11,'h']
+
+        " wrapscan
+        normal 4,
+        Expect CursorPos() == [l,11,'h']
+        normal 3;
+        Expect CursorPos() == [l,6,'h']
+
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,19,'o']
+
+        normal ,
+        Expect CursorPos() == [l,11,'h']
+
+    end
+    "}}}
+end
+"}}}
+
+" Jumplist {{{
+describe 'EasyMotion is jump motion'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map s <Plug>(easymotion-s)
+        call EasyMotion#init()
+        call AddLine('poge huga hiyo poyo')
+        "             1234567890123456789
+    end
+
+    after
+        close!
+    end
+
+    " <C-o> could jump back to previous location {{{
+    it '<C-o> could jump back to previous location'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal sha
+        Expect CursorPos() == [l,6,'h']
+
+        exec "normal! \<C-o>"
+        Expect CursorPos() == [l,1,'p']
+
+        normal! ``
+        Expect CursorPos() == [l,6,'h']
+        normal! ``
+        Expect CursorPos() == [l,1,'p']
+        normal! ``
+        Expect CursorPos() == [l,6,'h']
+
+        normal! $
+        Expect CursorPos() == [l,19,'o']
+        normal spa
+        Expect CursorPos() == [l,16,'p']
+        exec "normal! \<C-o>"
+        Expect CursorPos() == [l,19,'o']
+    end
+    "}}}
+end
+"}}}
+
+" Regexp {{{
+describe 'EasyMotion regexp'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_use_regexp = 1
+        map s <Plug>(easymotion-sn)
+        call EasyMotion#init()
+        call AddLine('poge1 2huga 3hiyo 4poyo')
+        "             12345678901234567890123
+    end
+
+    after
+        let g:EasyMotion_use_regexp = 0
+        close!
+    end
+
+    " <C-o> could jump back to previous location {{{
+    it 'provide regexp motion'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        exe "normal s\\d\<CR>a"
+        Expect CursorPos() == [l,5,'1']
+
+        normal! 0
+        Expect CursorPos() == [l,1,'p']
+        exe "normal s\\d\<CR>c"
+        Expect CursorPos() == [l,13,'3']
+
+        exe "normal s\$\<CR>a"
+        Expect CursorPos() == [l,23,'o']
+
+        exe "normal s\^\<CR>b"
+        Expect CursorPos() == [l,1,'p']
+    end
+    "}}}
+end
+"}}}
+
+" bi-directional t motion {{{
+describe 'bi-directional t motion'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_use_regexp = 1
+        map t <Plug>(easymotion-bd-t)
+        call EasyMotion#init()
+        call AddLine('poge1 2huga 3hiyo 4poyo')
+        "             12345678901234567890123
+    end
+
+    after
+        let g:EasyMotion_use_regexp = 0
+        close!
+    end
+
+    " provide bidirectional motion with one key mapping {{{
+    it 'provide bidirectional motion with one key mapping'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal thb
+        Expect CursorPos() == [l,13,'3']
+
+        normal! h
+        Expect CursorPos() == [l,12,' ']
+
+        normal thb
+        Expect CursorPos() == [l,9,'u']
+
+    end
+    "}}}
+end
+"}}}
+
+" off-screen search {{{
+describe 'off-screen search'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_off_screen_search = 1
+        map s/ <Plug>(easymotion-sn)
+        map f/ <Plug>(easymotion-fn)
+        map F/ <Plug>(easymotion-Fn)
+        map t/ <Plug>(easymotion-tn)
+        map T/ <Plug>(easymotion-Tn)
+        call EasyMotion#init()
+        call AddLine('deco-chan deco-chan')
+        call AddLine('vim')
+        for i in range(50)
+            call AddLine('poge1 2huga 3hiyo 4poyo')
+        endfor
+        "             12345678901234567890123
+    end
+
+    after
+        let g:EasyMotion_off_screen_search = 0
+        close!
+    end
+
+    " provide search with off-screen range {{{
+    it 'provide search with off-screen range'
+        normal! gg0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+
+        exec "normal s/vim\<CR>"
+        Expect CursorPos() == [51,1,'v']
+
+        normal! gg0
+        exec "normal f/im\<CR>"
+        Expect CursorPos() == [51,2,'i']
+
+        set wrapscan
+        Expect &wrapscan == 1
+        normal! gg0
+        exec "normal F/im\<CR>"
+        Expect CursorPos() == [51,2,'i']
+
+        " Cancel
+        normal! gg0
+        exec "normal s/vim\<Esc>"
+        Expect CursorPos() == [l,1,'p']
+
+        " Label
+        normal! gg0
+        exec "normal s/deco-chan\<CR>\<Esc>"
+        Expect CursorPos() == [l,1,'p']
+
+        normal! gg0
+        exec "normal s/deco-chan\<CR>a"
+        Expect CursorPos() == [52,1,'d']
+
+        normal! gg0
+        exec "normal s/deco-chan\<CR>b"
+        Expect CursorPos() == [52,11,'d']
+
+        normal! gg0
+        exec "normal t/chan\<CR>a"
+        Expect CursorPos() == [52,5,'-']
+
+        normal! gg0
+        exec "normal t/chan\<CR>b"
+        Expect CursorPos() == [52,15,'-']
+
+    end
+    "}}}
+end
+
+describe 'dot notoff-screen search'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_off_screen_search = 0
+        map s/ <Plug>(easymotion-sn)
+        call EasyMotion#init()
+        call AddLine('deco-chan deco-chan')
+        call AddLine('vim')
+        for i in range(50)
+            call AddLine('poge1 2huga 3hiyo 4poyo')
+        endfor
+        "             12345678901234567890123
+    end
+
+    after
+        close!
+    end
+
+    " provide search with off-screen range {{{
+    it 'provide search with off-screen range'
+        normal! gg0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+
+        exec "normal s/vim\<CR>"
+        Expect CursorPos() != [51,1,'v']
+        Expect CursorPos() == [l,1,'p']
+    end
+    "}}}
+end
+"}}}
+
+" off-screen search scroll {{{
+describe 'off-screen search scroll'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        let g:EasyMotion_off_screen_search = 1
+        map / <Plug>(easymotion-sn)
+        call EasyMotion#init()
+        call AddLine('deco-chan deco-chan')
+        call AddLine('vim')
+        for i in range(500)
+            call AddLine('poge1 2huga 3hiyo 4poyo')
+        endfor
+        call AddLine('deco-chan deco-chan')
+        "             12345678901234567890123
+    end
+
+    after
+        let g:EasyMotion_off_screen_search = 0
+        close!
+    end
+
+    " provide scroll {{{
+    it 'provide scroll'
+        normal! gg0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'d']
+
+        normal! gg0
+        exec "normal /deco-chan\<CR>"
+        Expect CursorPos() == [l,11,'d']
+
+        normal! gg0
+        exec "normal /deco-chan\<Tab>\<CR>a"
+        Expect CursorPos() == [503,1,'d']
+
+    end
+    "}}}
+end
+"}}}
+
+"Word motion {{{
+describe 'Word motion'
+    before
+        new
+        let g:EasyMotion_keys = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+        map w <Plug>(easymotion-w)
+        map b <Plug>(easymotion-b)
+        map <Leader>w <Plug>(easymotion-iskeyword-w)
+        map <Leader>b <Plug>(easymotion-iskeyword-b)
+        call EasyMotion#init()
+        call AddLine('vim vim vim')
+        call AddLine('poge1 2huga 3hiyo 4poyo 5:test')
+        "             12345678901234567890123
+        " 0        1         2         3
+        " 123456789012345678901234567890
+        " poge1 2huga 3hiyo 4poyo 5:test
+        " vim vim vim
+    end
+
+    after
+        close!
+    end
+
+    " Word motion {{
+    it 'Word motion'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'p']
+        normal wc
+        Expect CursorPos() == [l,19,'4']
+
+        normal bb
+        Expect CursorPos() == [l,7,'2']
+
+        normal! 0
+        Expect CursorPos() == [l,1,'p']
+
+        normal wh
+        Expect CursorPos() == [2,9,'v']
+        normal bh
+        Expect CursorPos() == [l,1,'p']
+    end
+    "}}
+end
+
+describe 'Verbose'
+    before
+        new
+        map s <Plug>(easymotion-s)
+        map f <Plug>(easymotion-f)
+        map F <Plug>(easymotion-F)
+        map t <Plug>(easymotion-t)
+        map T <Plug>(easymotion-T)
+        call EasyMotion#init()
+        call AddLine('some words in the sentence')
+    end
+
+    after
+        close!
+    end
+
+    it 'Verbose global variable'
+        Expect g:EasyMotion_verbose ==# 1
+    end
+
+    it 'Turned On'
+        let g:EasyMotion_verbose = 1
+        let &verbosefile = tempname()
+        normal sa
+        " TODO: l:tmp_name_verbose should have one line
+    end
+    it 'Turned Off'
+        let g:EasyMotion_verbose = 0
+        let &verbosefile = &verbosefile
+        normal s_
+        " TODO: l:tmp_name_not_verbose should have no lines
+    end
+end
+"}}}
+
+" vim: fdm=marker:et:ts=4:sw=4:sts=4
diff --git a/vim/plugins/vim-easymotion/t/operator_pending_spec.vim b/vim/plugins/vim-easymotion/t/operator_pending_spec.vim
new file mode 100644
index 0000000..80a0999
--- /dev/null
+++ b/vim/plugins/vim-easymotion/t/operator_pending_spec.vim
@@ -0,0 +1,110 @@
+"=============================================================================
+" FILE: t/operator_pending_spec.vim
+" AUTHOR: haya14busa
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+
+" Avoid source test files {{{
+if expand("%:p") ==# expand("<sfile>:p")
+  finish
+endif
+"}}}
+
+" Setup {{{
+let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
+execute 'set' 'rtp +=./'.s:root_dir
+runtime! plugin/EasyMotion.vim
+"}}}
+
+" Functions for Test {{{
+function! AddLine(str)
+    put! =a:str
+endfunction
+
+function! CursorPos()
+    return [line('.'), col('.'), getline('.')[col('.')-1]]
+endfunction
+"}}}
+
+
+" NOTE:
+"   I cannot test inclusive motion because mode() doesn't works well with
+"   vim-vspec
+
+" word motions {{{
+describe 'word motions'
+    before
+        new
+        let g:EasyMotion_keys = '123456789'
+        omap f <Plug>(easymotion-f)
+        omap w <Plug>(easymotion-w)
+        omap b <Plug>(easymotion-b)
+        call EasyMotion#init()
+        call AddLine('vim deco vim deco vim deco')
+        "             123456789012345678901234567890
+    end
+
+    after
+        close!
+    end
+
+    it '<Plug>(easymotion-w)'
+        " Default position
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,'v']
+
+        normal dw1
+        Expect CursorPos() == [l,1,'d']
+        normal! u
+        normal! 0
+        Expect CursorPos() == [l,1,'v']
+
+        normal dw2
+        Expect CursorPos() == [l,1,'v']
+        normal! 0
+        normal! u
+        normal! 0
+        Expect CursorPos() == [l,1,'v']
+    end
+
+    it '<Plug>(easymotion-b)'
+        " Default position
+        normal! $
+        let l = line('.')
+        Expect CursorPos() == [l,26,'o']
+
+        normal db1
+        Expect CursorPos() == [l,23,'o']
+        normal! u
+        normal! $
+        Expect CursorPos() == [l,26,'o']
+
+        normal db2
+        Expect CursorPos() == [l,19,'o']
+        normal! u
+        normal! $
+        Expect CursorPos() == [l,26,'o']
+    end
+end
+"}}}
+
diff --git a/vim/plugins/vim-easymotion/t/smartsign_spec.vim b/vim/plugins/vim-easymotion/t/smartsign_spec.vim
new file mode 100644
index 0000000..20fbb05
--- /dev/null
+++ b/vim/plugins/vim-easymotion/t/smartsign_spec.vim
@@ -0,0 +1,575 @@
+"=============================================================================
+" FILE: t/smartsign_spec.vim
+" AUTHOR: haya14busa
+" License: MIT license  {{{
+"     Permission is hereby granted, free of charge, to any person obtaining
+"     a copy of this software and associated documentation files (the
+"     "Software"), to deal in the Software without restriction, including
+"     without limitation the rights to use, copy, modify, merge, publish,
+"     distribute, sublicense, and/or sell copies of the Software, and to
+"     permit persons to whom the Software is furnished to do so, subject to
+"     the following conditions:
+"
+"     The above copyright notice and this permission notice shall be included
+"     in all copies or substantial portions of the Software.
+"
+"     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+"     OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+"     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+"     IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+"     CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+"     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+"     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+" }}}
+"=============================================================================
+
+" Test for `smartsign` feature for find motions
+
+" Avoid source test files {{{
+if expand("%:p") ==# expand("<sfile>:p")
+  finish
+endif
+"}}}
+
+" Setup {{{
+let s:root_dir = matchstr(system('git rev-parse --show-cdup'), '[^\n]\+')
+execute 'set' 'rtp +=./'.s:root_dir
+runtime! plugin/EasyMotion.vim
+"}}}
+
+" Functions for Test {{{
+function! AddLine(str)
+    put! =a:str
+endfunction
+
+function! CursorPos()
+    return [line('.'), col('.'), getline('.')[col('.')-1]]
+endfunction
+"}}}
+
+" Smartsign configulation {{{
+describe 'Smartsign configulation'
+    it 'provide default dictionary'
+        let smartdict_us = g:EasyMotion#sticky_table#us
+        let smartdict_jp = g:EasyMotion#sticky_table#jp
+        Expect smartdict_us !=# {}
+        Expect smartdict_jp !=# {}
+    end
+end
+"}}}
+
+" Basic Smartsign feature with 1-key findmotions with US layout {{{
+describe 'Basic Smartsign feature with 1-key findmotions with US layout'
+    before
+        new
+        let g:EasyMotion_keys = '123456789'
+        let g:EasyMotion_use_smartsign_us = 1
+        map s <Plug>(easymotion-s)
+        call EasyMotion#init()
+        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
+        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
+        call AddLine(' ,< .> /?')
+        "             123456789012345678901234567890
+        "                      1         2         3
+        "
+        " ',' : '<', '.' : '>', '/' : '?',
+        " '1' : '!', '2' : '@', '3' : '#', '4' : '$', '5' : '%',
+        " '6' : '^', '7' : '&', '8' : '*', '9' : '(', '0' : ')', '-' : '_', '=' : '+',
+        " ';' : ':', '[' : '{', ']' : '}', '`' : '~', "'" : "\"", '\' : '|',
+    end
+
+    after
+        close!
+    end
+
+    it 'works well for all sign as a target char'
+        " Default position
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+
+        " ,<
+        normal s,1
+        Expect CursorPos() == [l,2,',']
+        normal! 0
+        normal s,2
+        Expect CursorPos() == [l,3,'<']
+        normal! 0
+        normal s<1
+        Expect CursorPos() == [l,3,'<']
+        normal! 0
+        normal s,3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+
+        " .>
+        normal s.1
+        Expect CursorPos() == [l,5,'.']
+        normal! 0
+        normal s.2
+        Expect CursorPos() == [l,6,'>']
+        normal! 0
+        normal s>1
+        Expect CursorPos() == [l,6,'>']
+        normal! 0
+        normal s.3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+
+        " /?
+        normal s/1
+        Expect CursorPos() == [l,8,'/']
+        normal! 0
+        normal s/2
+        Expect CursorPos() == [l,9,'?']
+        normal! 0
+        normal s?1
+        Expect CursorPos() == [l,9,'?']
+        normal! 0
+        normal s/3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+
+        " 1!
+        normal s11
+        Expect CursorPos() == [l+1,2,'1']
+        normal! 0
+        normal s12
+        Expect CursorPos() == [l+1,3,'!']
+        normal! 0
+        normal s!1
+        Expect CursorPos() == [l+1,3,'!']
+        normal! 0
+        normal s13
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 2@
+        normal s21
+        Expect CursorPos() == [l+1,5,'2']
+        normal! 0
+        normal s22
+        Expect CursorPos() == [l+1,6,'@']
+        normal! 0
+        normal s@1
+        Expect CursorPos() == [l+1,6,'@']
+        normal! 0
+        normal s23
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 3#
+        normal s31
+        Expect CursorPos() == [l+1,8,'3']
+        normal! 0
+        normal s32
+        Expect CursorPos() == [l+1,9,'#']
+        normal! 0
+        normal s#1
+        Expect CursorPos() == [l+1,9,'#']
+        normal! 0
+        normal s33
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 4$
+        normal s41
+        Expect CursorPos() == [l+1,11,'4']
+        normal! 0
+        normal s42
+        Expect CursorPos() == [l+1,12,'$']
+        normal! 0
+        normal s$1
+        Expect CursorPos() == [l+1,12,'$']
+        normal! 0
+        normal s43
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 5%
+        normal s51
+        Expect CursorPos() == [l+1,14,'5']
+        normal! 0
+        normal s52
+        Expect CursorPos() == [l+1,15,'%']
+        normal! 0
+        normal s%1
+        Expect CursorPos() == [l+1,15,'%']
+        normal! 0
+        normal s53
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 6^
+        normal s61
+        Expect CursorPos() == [l+1,17,'6']
+        normal! 0
+        normal s62
+        Expect CursorPos() == [l+1,18,'^']
+        normal! 0
+        normal s^1
+        Expect CursorPos() == [l+1,18,'^']
+        normal! 0
+        normal s63
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 7&
+        normal s71
+        Expect CursorPos() == [l+1,20,'7']
+        normal! 0
+        normal s72
+        Expect CursorPos() == [l+1,21,'&']
+        normal! 0
+        normal s&1
+        Expect CursorPos() == [l+1,21,'&']
+        normal! 0
+        normal s73
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 8*
+        normal s81
+        Expect CursorPos() == [l+1,23,'8']
+        normal! 0
+        normal s82
+        Expect CursorPos() == [l+1,24,'*']
+        normal! 0
+        normal s*1
+        Expect CursorPos() == [l+1,24,'*']
+        normal! 0
+        normal s83
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 9(
+        normal s91
+        Expect CursorPos() == [l+1,26,'9']
+        normal! 0
+        normal s92
+        Expect CursorPos() == [l+1,27,'(']
+        normal! 0
+        normal s(1
+        Expect CursorPos() == [l+1,27,'(']
+        normal! 0
+        normal s93
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " 0)
+        normal s01
+        Expect CursorPos() == [l+1,29,'0']
+        normal! 0
+        normal s02
+        Expect CursorPos() == [l+1,30,')']
+        normal! 0
+        normal s)1
+        Expect CursorPos() == [l+1,30,')']
+        normal! 0
+        normal s03
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+
+        " -_
+        normal s-1
+        Expect CursorPos() == [l+2,2,'-']
+        normal! 0
+        normal s-2
+        Expect CursorPos() == [l+2,3,'_']
+        normal! 0
+        normal s_1
+        Expect CursorPos() == [l+2,3,'_']
+        normal! 0
+        normal s-3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " =+
+        normal s=1
+        Expect CursorPos() == [l+2,5,'=']
+        normal! 0
+        normal s=2
+        Expect CursorPos() == [l+2,6,'+']
+        normal! 0
+        normal s+1
+        Expect CursorPos() == [l+2,6,'+']
+        normal! 0
+        normal s=3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " ;:
+        normal s;1
+        Expect CursorPos() == [l+2,8,';']
+        normal! 0
+        normal s;2
+        Expect CursorPos() == [l+2,9,':']
+        normal! 0
+        normal s:1
+        Expect CursorPos() == [l+2,9,':']
+        normal! 0
+        normal s;3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " [{
+        normal s[1
+        Expect CursorPos() == [l+2,11,'[']
+        normal! 0
+        normal s[2
+        Expect CursorPos() == [l+2,12,'{']
+        normal! 0
+        normal s{1
+        Expect CursorPos() == [l+2,12,'{']
+        normal! 0
+        normal s[3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " ]}
+        normal s]1
+        Expect CursorPos() == [l+2,14,']']
+        normal! 0
+        normal s]2
+        Expect CursorPos() == [l+2,15,'}']
+        normal! 0
+        normal s}1
+        Expect CursorPos() == [l+2,15,'}']
+        normal! 0
+        normal s]3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " `~
+        normal s`1
+        Expect CursorPos() == [l+2,17,'`']
+        normal! 0
+        normal s`2
+        Expect CursorPos() == [l+2,18,'~']
+        normal! 0
+        normal s~1
+        Expect CursorPos() == [l+2,18,'~']
+        normal! 0
+        normal s`3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " '"
+        normal s'1
+        Expect CursorPos() == [l+2,20,'''']
+        normal! 0
+        normal s'2
+        Expect CursorPos() == [l+2,21,'"']
+        normal! 0
+        normal s"1
+        Expect CursorPos() == [l+2,21,'"']
+        normal! 0
+        normal s'3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+
+        " \|
+        normal s\1
+        Expect CursorPos() == [l+2,23,'\']
+        normal! 0
+        normal s\2
+        Expect CursorPos() == [l+2,24,'|']
+        normal! 0
+        normal s|1
+        Expect CursorPos() == [l+2,24,'|']
+        normal! 0
+        normal s\3
+        Expect CursorPos() == [l+2,1,' ']
+        normal! 0
+    end
+end
+"}}}
+
+" Smartsign with 2-key find motions with US layout {{{
+describe 'Smartsign with 2-key find motions with US layout'
+    before
+        new
+        let g:EasyMotion_keys = '123456789'
+        let g:EasyMotion_use_smartsign_us = 1
+        map s <Plug>(easymotion-s2)
+        call EasyMotion#init()
+        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
+        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
+        call AddLine(' ,< .> /?')
+        call AddLine(' -_ =+ ;: [{ ]} `~ ''" \|')
+        call AddLine(' 1! 2@ 3# 4$ 5% 6^ 7& 8* 9( 0)')
+        call AddLine(' ,< .> /?')
+        "             123456789012345678901234567890
+        "                      1         2         3
+    end
+
+    after
+        close!
+    end
+
+    it 'works well'
+        " Default position
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+
+        " ,<
+        normal s,,1
+        Expect CursorPos() == [l,2,',']
+        normal! 0
+        Expect CursorPos() == [l,1,' ']
+        normal s,,3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal s, 1
+        Expect CursorPos() == [l,3,'<']
+        normal! 0
+        normal s<<1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal s,<1
+        Expect CursorPos() == [l,2,',']
+        normal! 0
+        normal s<,1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+    end
+    it ': s,,3'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+        normal s,,3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+    end
+
+    it 'escape * asterisc #151'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+        normal s1*22
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal s8*1
+        Expect CursorPos() == [l+1,23,'8']
+        normal! 0
+        normal s881
+        Expect CursorPos() == [l+1,23,'8']
+        normal! 0
+        normal s**1
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+        normal s*81
+        Expect CursorPos() == [l+1,1,' ']
+        normal! 0
+    end
+end
+"}}}
+
+" Smartsign with 2-key find motions with JP layout {{{
+describe 'Smartsign with 2-key find motions with JP layout'
+    before
+        new
+        let g:EasyMotion_keys = '123456789'
+        let g:EasyMotion_use_smartsign_jp = 1
+        map s <Plug>(easymotion-s2)
+        call EasyMotion#init()
+        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
+        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
+        call AddLine(' ,< .> /?')
+        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
+        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
+        call AddLine(' ,< .> /?')
+        "             123456789012345678901234567890
+        "                      1         2         3
+        "
+        "',' : '<', '.' : '>', '/' : '?',
+        "'1' : '!', '2' : '"', '3' : '#', '4' : '$', '5' : '%',
+        "'6' : '&', '7' : "'", '8' : '(', '9' : ')', '0' : '_', '-' : '=', '^' : '~',
+        "';' : '+', ':' : '*', '[' : '{', ']' : '}', '@' : '`', '\' : '|',
+        "
+    end
+
+    after
+        close!
+    end
+
+    it 'works well'
+        " Default position
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+
+        " ,<
+        normal s,,1
+        Expect CursorPos() == [l,2,',']
+        normal! 0
+        Expect CursorPos() == [l,1,' ']
+        normal s,,3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal s, 1
+        Expect CursorPos() == [l,3,'<']
+        normal! 0
+        normal s<<1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal s,<1
+        Expect CursorPos() == [l,2,',']
+        normal! 0
+        normal s<,1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+    end
+    it ': s,,3'
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+        normal s,,3
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+    end
+end
+"}}}
+
+" Smartsign with n-key find search motions {{{
+describe 'Smartsign with n-key find search motions'
+    before
+        new
+        let g:EasyMotion_keys = '123456789'
+        let g:EasyMotion_use_smartsign_jp = 1
+        map / <Plug>(easymotion-sn)
+        call EasyMotion#init()
+        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
+        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
+        call AddLine(' ,< .> /?')
+        call AddLine(' -= ^~ ;+ :* [{ ]} @` \|')
+        call AddLine(' 1! 2" 3# 4$ 5% 6& 7'' 8( 9) 0_')
+        call AddLine(' ,< .> /?')
+    end
+
+    after
+        close!
+    end
+
+    it 'do not work'
+        " Default position
+        normal! 0
+        let l = line('.')
+        Expect CursorPos() == [l,1,' ']
+
+        " ,<
+        normal /,,1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+        normal /,<1
+        Expect CursorPos() == [l,1,' ']
+        normal! 0
+    end
+end
+"}}}
+
+" __END__  {{{
+" vim: expandtab softtabstop=4 shiftwidth=4
+" vim: foldmethod=marker
+" }}}
diff --git a/vim/plugins/vim-fugitive/.gitignore b/vim/plugins/vim-fugitive/.gitignore
new file mode 100644
index 0000000..0a56e3f
--- /dev/null
+++ b/vim/plugins/vim-fugitive/.gitignore
@@ -0,0 +1 @@
+/doc/tags
diff --git a/vim/plugins/vim-fugitive/CONTRIBUTING.markdown b/vim/plugins/vim-fugitive/CONTRIBUTING.markdown
new file mode 100644
index 0000000..e651dca
--- /dev/null
+++ b/vim/plugins/vim-fugitive/CONTRIBUTING.markdown
@@ -0,0 +1,18 @@
+Before reporting a bug, you should try stripping down your Vim configuration
+and removing other plugins.  The sad truth about VimScript is that it is
+fraught with incompatibilities waiting to happen.  I'm happy to work around
+them where I can, but it's up to you to isolate the conflict.
+
+Fugitive is particularly prone to regressions due to Git version issues,
+platform issues, and interactions with other plugins.  I end up bisecting a
+lot more than other projects, and thus I'm especially meticulous here about
+maintaining a clean, readable, history.  Squash and force push any requested
+changes to a pull request.  And if your [commit message
+sucks](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+I'm not going to accept it.  Period.
+
+Beyond that, don't be shy about asking before patching.  What takes you hours
+might take me minutes simply because I have both domain knowledge and a
+perverse knowledge of VimScript so vast that many would consider it a symptom
+of mental illness.  On the flip side, some ideas I'll reject no matter how
+good the implementation is.  "Send a patch" is an edge case answer in my book.
diff --git a/vim/plugins/vim-fugitive/README.markdown b/vim/plugins/vim-fugitive/README.markdown
new file mode 100644
index 0000000..a5f91f6
--- /dev/null
+++ b/vim/plugins/vim-fugitive/README.markdown
@@ -0,0 +1,124 @@
+# fugitive.vim
+
+I'm not going to lie to you; fugitive.vim may very well be the best
+Git wrapper of all time.  Check out these features:
+
+View any blob, tree, commit, or tag in the repository with `:Gedit` (and
+`:Gsplit`, `:Gvsplit`, `:Gtabedit`, ...).  Edit a file in the index and
+write to it to stage the changes.  Use `:Gdiff` to bring up the staged
+version of the file side by side with the working tree version and use
+Vim's diff handling capabilities to stage a subset of the file's
+changes.
+
+Bring up the output of `git status` with `:Gstatus`.  Press `-` to
+`add`/`reset` a file's changes, or `p` to `add`/`reset` `--patch`.  And guess
+what `:Gcommit` does!
+
+`:Gblame` brings up an interactive vertical split with `git blame`
+output.  Press enter on a line to edit the commit where the line
+changed, or `o` to open it in a split.  When you're done, use `:Gedit`
+in the historic buffer to go back to the work tree version.
+
+`:Gmove` does a `git mv` on a file and simultaneously renames the
+buffer.  `:Gdelete` does a `git rm` on a file and simultaneously deletes
+the buffer.
+
+Use `:Ggrep` to search the work tree (or any arbitrary commit) with
+`git grep`, skipping over that which is not tracked in the repository.
+`:Glog` loads all previous revisions of a file into the quickfix list so
+you can iterate over them and watch the file evolve!
+
+`:Gread` is a variant of `git checkout -- filename` that operates on the
+buffer rather than the filename.  This means you can use `u` to undo it
+and you never get any warnings about the file changing outside Vim.
+`:Gwrite` writes to both the work tree and index versions of a file,
+making it like `git add` when called from a work tree file and like
+`git checkout` when called from the index or a blob in history.
+
+Use `:Gbrowse` to open the current file on the web front-end of your favorite
+hosting provider, with optional line range (try it in visual mode!).  Built-in
+support is provided for `git instaweb`, and plugins are available for popular
+providers such as [GitHub][rhubarb.vim], [GitLab][fugitive-gitlab.vim], and
+[Bitbucket][fubitive.vim].
+
+[rhubarb.vim]: https://github.com/tpope/vim-rhubarb
+[fugitive-gitlab.vim]: https://github.com/shumphrey/fugitive-gitlab.vim
+[fubitive.vim]: https://github.com/tommcdo/vim-fubitive
+
+Add `%{fugitive#statusline()}` to `'statusline'` to get an indicator
+with the current branch in (surprise!) your statusline.
+
+Last but not least, there's `:Git` for running any arbitrary command,
+and `Git!` to open the output of a command in a temp file.
+
+## Screencasts
+
+* [A complement to command line git](http://vimcasts.org/e/31)
+* [Working with the git index](http://vimcasts.org/e/32)
+* [Resolving merge conflicts with vimdiff](http://vimcasts.org/e/33)
+* [Browsing the git object database](http://vimcasts.org/e/34)
+* [Exploring the history of a git repository](http://vimcasts.org/e/35)
+
+## Installation
+
+If you don't have a preferred installation method, one option is to install
+[pathogen.vim](https://github.com/tpope/vim-pathogen), and then copy
+and paste:
+
+    cd ~/.vim/bundle
+    git clone git://github.com/tpope/vim-fugitive.git
+    vim -u NONE -c "helptags vim-fugitive/doc" -c q
+
+If your Vim version is below 7.2, I recommend also installing
+[vim-git](https://github.com/tpope/vim-git) for syntax highlighting and
+other Git niceties.
+
+## FAQ
+
+> I installed the plugin and started Vim.  Why don't any of the commands
+> exist?
+
+Fugitive cares about the current file, not the current working
+directory.  Edit a file from the repository.
+
+> I opened a new tab.  Why don't any of the commands exist?
+
+Fugitive cares about the current file, not the current working
+directory.  Edit a file from the repository.
+
+> Why is `:Gbrowse` not using the right browser?
+
+`:Gbrowse` delegates to `git web--browse`, which is less than perfect
+when it comes to finding the right browser.  You can tell it the correct
+browser to use with `git config --global web.browser ...`.  On OS X, for
+example, you might want to set this to `open`.  See `git web--browse --help`
+for details.
+
+> Here's a patch that automatically opens the quickfix window after
+> `:Ggrep`.
+
+This is a great example of why I recommend asking before patching.
+There are valid arguments to be made both for and against automatically
+opening the quickfix window.  Whenever I have to make an arbitrary
+decision like this, I ask what Vim would do.  And Vim does not open a
+quickfix window after `:grep`.
+
+Luckily, it's easy to implement the desired behavior without changing
+fugitive.vim.  The following autocommand will cause the quickfix window
+to open after any grep invocation:
+
+    autocmd QuickFixCmdPost *grep* cwindow
+
+## Self-Promotion
+
+Like fugitive.vim? Follow the repository on
+[GitHub](https://github.com/tpope/vim-fugitive) and vote for it on
+[vim.org](http://www.vim.org/scripts/script.php?script_id=2975).  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/vim-fugitive/doc/fugitive.txt b/vim/plugins/vim-fugitive/doc/fugitive.txt
new file mode 100644
index 0000000..b591803
--- /dev/null
+++ b/vim/plugins/vim-fugitive/doc/fugitive.txt
@@ -0,0 +1,361 @@
+*fugitive.txt*  A Git wrapper so awesome, it should be illegal
+
+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                                    *fugitive*
+
+Whenever you edit a file from a Git repository, a set of commands is defined
+that serve as a gateway to Git.
+
+COMMANDS                                        *fugitive-commands*
+
+These commands are local to the buffers in which they work (generally, buffers
+that are part of Git repositories).
+
+                                                *fugitive-:Git*
+:Git [args]             Run an arbitrary git command. Similar to :!git [args]
+                        but chdir to the repository tree first.
+
+                                                *fugitive-:Git!*
+:Git! [args]            Like |:Git|, but capture the output into a temp file,
+                        and edit that temp file.
+
+                                                *fugitive-:Gcd*
+:Gcd [directory]        |:cd| relative to the repository.
+
+                                                *fugitive-:Glcd*
+:Glcd [directory]       |:lcd| relative to the repository.
+
+                                                *fugitive-:Gstatus*
+:Gstatus                Bring up the output of git-status in the preview
+                        window.  The following maps, which work on the cursor
+                        line file where sensible, are provided:
+
+                        g?    show this help
+                        <C-N> next file
+                        <C-P> previous file
+                        <CR>  |:Gedit|
+                        -     |:Git| add
+                        -     |:Git| reset (staged files)
+                        a     Show alternative format
+                        cA    |:Gcommit| --amend --reuse-message=HEAD
+                        ca    |:Gcommit| --amend
+                        cc    |:Gcommit|
+                        cva   |:Gcommit| --amend --verbose
+                        cvc   |:Gcommit| --verbose
+                        D     |:Gdiff|
+                        ds    |:Gsdiff|
+                        dp    |:Git!| diff (p for patch; use :Gw to apply)
+                        dp    |:Git| add --intent-to-add (untracked files)
+                        dv    |:Gvdiff|
+                        O     |:Gtabedit|
+                        o     |:Gsplit|
+                        p     |:Git| add --patch
+                        p     |:Git| reset --patch (staged files)
+                        q     close status
+                        r     reload status
+                        S     |:Gvsplit|
+                        U     |:Git| checkout
+                        U     |:Git| checkout HEAD (staged files)
+                        U     |:Git| clean (untracked files)
+                        U     |:Git| rm (unmerged files)
+
+                                                *fugitive-:Gcommit*
+:Gcommit [args]         A wrapper around git-commit.  If there is nothing
+                        to commit, |:Gstatus| is called instead.  Unless the
+                        arguments given would skip the invocation of an editor
+                        (e.g., -m), a split window will be used to obtain a
+                        commit message, or a new tab if -v is given.  Write
+                        and close that window (:wq or |:Gwrite|) to finish the
+                        commit.  Unlike when running the actual git-commit
+                        command, it is possible (but unadvisable) to alter the
+                        index with commands like git-add and git-reset while a
+                        commit message is pending.
+
+                                                *fugitive-:Gmerge*
+:Gmerge [args]          Calls git-merge and loads errors and conflicted files
+                        into the quickfix list.  Opens a |:Gcommit| style
+                        split window for the commit message if the merge
+                        succeeds.  If called during a merge conflict, the
+                        conflicted files from the current index are loaded
+                        into the quickfix list.
+
+                                                *fugitive-:Gpull*
+:Gpull [args]           Like |:Gmerge|, but for git-pull.
+
+                                                *fugitive-:Gpush*
+:Gpush [args]           Invoke git-push, load the results into the quickfix
+                        list, and invoke |:cwindow| to reveal any errors.
+                        |:Dispatch| is used if available for asynchronous
+                        invocation.
+
+                                                *fugitive-:Gfetch*
+:Gfetch [args]          Like |:Gpush|, but for git-fetch.
+
+                                                *fugitive-:Ggrep*
+:Ggrep[!] [args]        |:grep|[!] with git-grep as 'grepprg'.
+
+                                                *fugitive-:Glgrep*
+:Glgrep[!] [args]       |:lgrep|[!] with git-grep as 'grepprg'.
+
+                                                *fugitive-:Glog*
+:Glog [args]            Load all previous revisions of the current file into
+                        the quickfix list.  Additional git-log arguments can
+                        be given (for example, --reverse).  If "--" appears as
+                        an argument, no file specific filtering is done, and
+                        previous commits rather than previous file revisions
+                        are loaded.
+
+:{range}Glog [args]     Use git-log -L to load previous revisions of the given
+                        range of the current file into the quickfix list.  The
+                        cursor is positioned on the first line of the first
+                        diff hunk for each commit.
+
+                                                *fugitive-:Gllog*
+:Gllog [args]           Like |:Glog|, but use the location list instead of the
+                        quickfix list.
+
+                                        *fugitive-:Gedit* *fugitive-:Ge*
+:Gedit [revision]       |:edit| a |fugitive-revision|.
+
+                                                *fugitive-:Gsplit*
+:Gsplit [revision]      |:split| a |fugitive-revision|.
+
+                                                *fugitive-:Gvsplit*
+:Gvsplit [revision]     |:vsplit| a |fugitive-revision|.
+
+                                                *fugitive-:Gtabedit*
+:Gtabedit [revision]    |:tabedit| a |fugitive-revision|.
+
+                                                *fugitive-:Gpedit*
+:Gpedit [revision]      |:pedit| a |fugitive-revision|.
+
+:Gsplit! [args]                 *fugitive-:Gsplit!* *fugitive-:Gvsplit!*
+:Gvsplit! [args]                *fugitive-:Gtabedit!* *fugitive-:Gpedit!*
+:Gtabedit! [args]       Like |:Git!|, but open the resulting temp file in a
+:Gpedit! [args]         split, tab, or preview window.
+
+                                                *fugitive-:Gread*
+:Gread [revision]       Empty the buffer and |:read| a |fugitive-revision|.
+                        When the argument is omitted, this is similar to
+                        git-checkout on a work tree file or git-add on a stage
+                        file, but without writing anything to disk.
+
+:{range}Gread [revision]
+                        |:read| in a |fugitive-revision| after {range}.
+
+                                                *fugitive-:Gread!*
+:Gread! [args]          Empty the buffer and |:read| the output of a Git
+                        command.  For example, :Gread! show HEAD:%.
+
+:{range}Gread! [args]  |:read| the output of a Git command after {range}.
+
+                                        *fugitive-:Gw* *fugitive-:Gwrite*
+:Gwrite                 Write to the current file's path and stage the results.
+                        When run in a work tree file, it is effectively git
+                        add.  Elsewhere, it is effectively git-checkout.  A
+                        great deal of effort is expended to behave sensibly
+                        when the work tree or index version of the file is
+                        open in another buffer.
+
+:Gwrite {path}          You can give |:Gwrite| an explicit path of where in
+                        the work tree to write.  You can also give a path like
+                        :0:foo.txt or even :0 to write to just that stage in
+                        the index.
+
+                                                *fugitive-:Gwq*
+:Gwq [path]             Like |:Gwrite| followed by |:quit| if the write
+                        succeeded.
+
+:Gwq! [path]            Like |:Gwrite|! followed by |:quit|! if the write
+                        succeeded.
+
+                                                *fugitive-:Gdiff*
+:Gdiff [revision]       Perform a |vimdiff| against the current file in the
+                        given revision.  With no argument, the version in the
+                        index is used (which means a three-way diff during a
+                        merge conflict, making it a git-mergetool
+                        alternative).  The newer of the two files is placed
+                        to the right or bottom, depending on 'diffopt' and
+                        the width of the window relative to 'textwidth'.  Use
+                        |do| and |dp| and write to the index file to simulate
+                        "git add --patch". For the three-way diff, there is
+                        also d2o and d3o pulling the hunk to the middle from
+                        the left or the right window, respectively.
+
+                                                *fugitive-:Gsdiff*
+:Gsdiff [revision]      Like |:Gdiff|, but always split horizontally.
+
+                                                *fugitive-:Gvdiff*
+:Gvdiff [revision]      Like |:Gdiff|, but always split vertically.
+
+                                                *fugitive-:Gmove*
+:Gmove {destination}    Wrapper around git-mv that renames the buffer
+                        afterward.  The destination is relative to the current
+                        directory except when started with a /, in which case
+                        it is relative to the work tree.  Add a ! to pass -f.
+
+                                                *fugitive-:Gdelete*
+:Gdelete                Wrapper around git-rm that deletes the buffer
+                        afterward.  When invoked in an index file, --cached is
+                        passed.  Add a ! to pass -f and forcefully discard the
+                        buffer.
+
+                                                *fugitive-:Gremove*
+:Gremove                Like :Gdelete, but keep the (now empty) buffer around.
+
+                                                *fugitive-:Gblame*
+:Gblame [flags]         Run git-blame on the file and open the results in a
+                        scroll bound vertical split.  You can give any of
+                        ltfnsewMC as flags and they will be passed along to
+                        git-blame.  The following maps, which work on the
+                        cursor line commit where sensible, are provided:
+
+                        g?    show this help
+                        A     resize to end of author column
+                        C     resize to end of commit column
+                        D     resize to end of date/time column
+                        q     close blame and return to blamed window
+                        gq    q, then |:Gedit| to return to work tree version
+                        <CR>  q, then open commit
+                        o     open commit in horizontal split
+                        O     open commit in new tab
+                        -     reblame at commit
+                        ~     reblame at [count]th first grandparent
+                        P     reblame at [count]th parent (like HEAD^[count])
+
+:[range]Gblame [flags]  Run git-blame on the given range.
+
+                                                *fugitive-:Gbrowse*
+:Gbrowse                Open the current file, blob, tree, commit, or tag
+                        in your browser at the upstream hosting provider.
+                        If a range is given, it is appropriately appended to
+                        the URL as an anchor.
+
+                        Upstream providers can be added by installing an
+                        appropriate Vim plugin.  For example, GitHub can be
+                        supported by installing rhubarb.vim, available at
+                        <https://github.com/tpope/vim-rhubarb>.
+
+                        The hosting provider is determined by looking at the
+                        remote for the current or specified branch and falls
+                        back to "origin".  In the special case of a "."
+                        remote, a local instance of git-instaweb will be
+                        started and used.
+
+:Gbrowse {revision}     Like :Gbrowse, but for a given |fugitive-revision|.  A
+                        useful value here is -, which ties the URL to the
+                        latest commit rather than a volatile branch.
+
+:Gbrowse [...]@{remote} Force using the given remote rather than the remote
+                        for the current branch.  The remote is used to
+                        determine which GitHub repository to link to.
+
+:{range}Gbrowse [args]  Appends an anchor to the URL that emphasizes the
+                        selected lines.  You almost certainly want to give a
+                        "-" argument in this case to force the URL to include
+                        an exact revision.
+
+:[range]Gbrowse! [args] Like :Gbrowse, but put the URL on the clipboard rather
+                        than opening it.
+
+MAPPINGS                                        *fugitive-mappings*
+
+These maps are available everywhere.
+
+                                                *fugitive-c_CTRL-R_CTRL-G*
+<C-R><C-G>              On the command line, recall the path to the current
+                        object (that is, a representation of the object
+                        recognized by |:Gedit|).
+
+                                                *fugitive-y_CTRL-G*
+["x]y<C-G>              Yank the commit SHA and path to the current object.
+
+These maps are available in Git objects.
+
+                                                *fugitive-<CR>*
+<CR>                    Jump to the revision under the cursor.
+
+                                                *fugitive-o*
+o                       Jump to the revision under the cursor in a new split.
+
+                                                *fugitive-S*
+S                       Jump to the revision under the cursor in a new
+                        vertical split.
+
+                                                *fugitive-O*
+O                       Jump to the revision under the cursor in a new tab.
+
+                                                *fugitive--*
+-                       Go to the tree containing the current tree or blob.
+
+                                                *fugitive-~*
+~                       Go to the current file in the [count]th first
+                        ancestor.
+
+                                                *fugitive-P*
+P                       Go to the current file in the [count]th parent.
+
+                                                *fugitive-C*
+C                       Go to the commit containing the current file.
+
+                                                *fugitive-.*
+.                       Start a |:| command line with the current revision
+                        prepopulated at the end of the line.
+
+                                                *fugitive-a*
+a                       Show the current tag, commit, or tree in an alternate
+                        format.
+
+SPECIFYING REVISIONS                            *fugitive-revision*
+
+Fugitive revisions are similar to Git revisions as defined in the "SPECIFYING
+REVISIONS" section in the git-rev-parse man page.  For commands that accept an
+optional revision, the default is the file in the index for work tree files
+and the work tree file for everything else.  Example revisions follow.
+
+Revision        Meaning ~
+HEAD            .git/HEAD
+master          .git/refs/heads/master
+HEAD^{}         The commit referenced by HEAD
+HEAD^           The parent of the commit referenced by HEAD
+HEAD:           The tree referenced by HEAD
+/HEAD           The file named HEAD in the work tree
+Makefile        The file named Makefile in the work tree
+HEAD^:Makefile  The file named Makefile in the parent of HEAD
+:Makefile       The file named Makefile in the index (writable)
+-               The current file in HEAD
+^               The current file in the previous commit
+~3              The current file 3 commits ago
+:               .git/index (Same as |:Gstatus|)
+:0              The current file in the index
+:1              The current file's common ancestor during a conflict
+:2              The current file in the target branch during a conflict
+:3              The current file in the merged branch during a conflict
+:/foo           The most recent commit with "foo" in the message
+
+STATUSLINE                                      *fugitive-statusline*
+
+                                                *fugitive#statusline()*
+Add %{fugitive#statusline()} to your statusline to get an indicator including
+the current branch and the currently edited file's commit.  If you don't have
+a statusline, this one matches the default when 'ruler' is set:
+>
+    set statusline=%<%f\ %h%m%r%{fugitive#statusline()}%=%-14.(%l,%c%V%)\ %P
+<
+                                                *fugitive#head(...)*
+Use fugitive#head() to return the name of the current branch. If the current
+HEAD is detached, fugitive#head() will return the empty string, unless the
+optional argument is given, in which case the hash of the current commit will
+be truncated to the given number of characters.
+
+ABOUT                                           *fugitive-about*
+
+Grab the latest version or report a bug on GitHub:
+
+http://github.com/tpope/vim-fugitive
+
+ vim:tw=78:et:ft=help:norl:
diff --git a/vim/plugins/vim-fugitive/plugin/fugitive.vim b/vim/plugins/vim-fugitive/plugin/fugitive.vim
new file mode 100644
index 0000000..fba368d
--- /dev/null
+++ b/vim/plugins/vim-fugitive/plugin/fugitive.vim
@@ -0,0 +1,3126 @@
+" fugitive.vim - A Git wrapper so awesome, it should be illegal
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.2
+" GetLatestVimScripts: 2975 1 :AutoInstall: fugitive.vim
+
+if exists('g:loaded_fugitive') || &cp
+  finish
+endif
+let g:loaded_fugitive = 1
+
+if !exists('g:fugitive_git_executable')
+  let g:fugitive_git_executable = 'git'
+endif
+
+" Section: Utility
+
+function! s:function(name) abort
+  return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),''))
+endfunction
+
+function! s:sub(str,pat,rep) abort
+  return substitute(a:str,'\v\C'.a:pat,a:rep,'')
+endfunction
+
+function! s:gsub(str,pat,rep) abort
+  return substitute(a:str,'\v\C'.a:pat,a:rep,'g')
+endfunction
+
+function! s:winshell() abort
+  return &shell =~? 'cmd' || exists('+shellslash') && !&shellslash
+endfunction
+
+function! s:shellesc(arg) abort
+  if a:arg =~ '^[A-Za-z0-9_/.-]\+$'
+    return a:arg
+  elseif s:winshell()
+    return '"'.s:gsub(s:gsub(a:arg, '"', '""'), '\%', '"%"').'"'
+  else
+    return shellescape(a:arg)
+  endif
+endfunction
+
+function! s:fnameescape(file) abort
+  if exists('*fnameescape')
+    return fnameescape(a:file)
+  else
+    return escape(a:file," \t\n*?[{`$\\%#'\"|!<")
+  endif
+endfunction
+
+function! s:throw(string) abort
+  let v:errmsg = 'fugitive: '.a:string
+  throw v:errmsg
+endfunction
+
+function! s:warn(str) abort
+  echohl WarningMsg
+  echomsg a:str
+  echohl None
+  let v:warningmsg = a:str
+endfunction
+
+function! s:shellslash(path) abort
+  if s:winshell()
+    return s:gsub(a:path,'\\','/')
+  else
+    return a:path
+  endif
+endfunction
+
+let s:executables = {}
+
+function! s:executable(binary) abort
+  if !has_key(s:executables, a:binary)
+    let s:executables[a:binary] = executable(a:binary)
+  endif
+  return s:executables[a:binary]
+endfunction
+
+let s:git_versions = {}
+
+function! s:git_command() abort
+  return get(g:, 'fugitive_git_command', g:fugitive_git_executable)
+endfunction
+
+function! fugitive#git_version(...) abort
+  if !has_key(s:git_versions, g:fugitive_git_executable)
+    let s:git_versions[g:fugitive_git_executable] = matchstr(system(g:fugitive_git_executable.' --version'), "\\S\\+\n")
+  endif
+  return s:git_versions[g:fugitive_git_executable]
+endfunction
+
+function! s:recall() abort
+  let rev = s:sub(s:buffer().rev(), '^/', '')
+  if rev ==# ':'
+    return matchstr(getline('.'),'^#\t\%([[:alpha:] ]\+: *\)\=\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$\|^\d\{6} \x\{40\} \d\t\zs.*')
+  elseif s:buffer().type('tree')
+    let file = matchstr(getline('.'), '\t\zs.*')
+    if empty(file) && line('.') > 2
+      let file = s:sub(getline('.'), '/$', '')
+    endif
+    if !empty(file) && rev !~# ':$'
+      return rev . '/' . file
+    else
+      return rev . file
+    endif
+  endif
+  return rev
+endfunction
+
+function! s:add_methods(namespace, method_names) abort
+  for name in a:method_names
+    let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name)
+  endfor
+endfunction
+
+let s:commands = []
+function! s:command(definition) abort
+  let s:commands += [a:definition]
+endfunction
+
+function! s:define_commands() abort
+  for command in s:commands
+    exe 'command! -buffer '.command
+  endfor
+endfunction
+
+let s:abstract_prototype = {}
+
+" Section: Initialization
+
+function! fugitive#is_git_dir(path) abort
+  let path = s:sub(a:path, '[\/]$', '') . '/'
+  return getfsize(path.'HEAD') > 10 && (
+        \ isdirectory(path.'objects') && isdirectory(path.'refs') ||
+        \ getftype(path.'commondir') ==# 'file')
+endfunction
+
+function! fugitive#extract_git_dir(path) abort
+  if s:shellslash(a:path) =~# '^fugitive://.*//'
+    return matchstr(s:shellslash(a:path), '\C^fugitive://\zs.\{-\}\ze//')
+  endif
+  if isdirectory(a:path)
+    let path = fnamemodify(a:path, ':p:s?[\/]$??')
+  else
+    let path = fnamemodify(a:path, ':p:h:s?[\/]$??')
+  endif
+  let root = s:shellslash(resolve(path))
+  let previous = ""
+  while root !=# previous
+    if root =~# '\v^//%([^/]+/?)?$'
+      " This is for accessing network shares from Cygwin Vim. There won't be
+      " any git directory called //.git or //serverName/.git so let's avoid
+      " checking for them since such checks are extremely slow.
+      break
+    endif
+    if index(split($GIT_CEILING_DIRECTORIES, ':'), root) >= 0
+      break
+    endif
+    if root ==# $GIT_WORK_TREE && fugitive#is_git_dir($GIT_DIR)
+      return simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??'))
+    endif
+    if fugitive#is_git_dir($GIT_DIR)
+      " Ensure that we've cached the worktree
+      call s:configured_tree(simplify(fnamemodify(expand($GIT_DIR), ':p:s?[\/]$??')))
+      if has_key(s:dir_for_worktree, root)
+        return s:dir_for_worktree[root]
+      endif
+    endif
+    let dir = s:sub(root, '[\/]$', '') . '/.git'
+    let type = getftype(dir)
+    if type ==# 'dir' && fugitive#is_git_dir(dir)
+      return dir
+    elseif type ==# 'link' && fugitive#is_git_dir(dir)
+      return resolve(dir)
+    elseif type !=# '' && filereadable(dir)
+      let line = get(readfile(dir, '', 1), 0, '')
+      if line =~# '^gitdir: \.' && fugitive#is_git_dir(root.'/'.line[8:-1])
+        return simplify(root.'/'.line[8:-1])
+      elseif line =~# '^gitdir: ' && fugitive#is_git_dir(line[8:-1])
+        return line[8:-1]
+      endif
+    elseif fugitive#is_git_dir(root)
+      return root
+    endif
+    let previous = root
+    let root = fnamemodify(root, ':h')
+  endwhile
+  return ''
+endfunction
+
+function! fugitive#detect(path) abort
+  if exists('b:git_dir') && (b:git_dir ==# '' || b:git_dir =~# '/$')
+    unlet b:git_dir
+  endif
+  if !exists('b:git_dir')
+    let dir = fugitive#extract_git_dir(a:path)
+    if dir !=# ''
+      let b:git_dir = dir
+      if empty(fugitive#buffer().path())
+        silent! exe haslocaldir() ? 'lcd .' : 'cd .'
+      endif
+    endif
+  endif
+  if exists('b:git_dir')
+    if exists('#User#FugitiveBoot')
+      try
+        let [save_mls, &modelines] = [&mls, 0]
+        doautocmd User FugitiveBoot
+      finally
+        let &mls = save_mls
+      endtry
+    endif
+    if !exists('g:fugitive_no_maps')
+      cnoremap <buffer> <expr> <C-R><C-G> fnameescape(<SID>recall())
+      nnoremap <buffer> <silent> y<C-G> :call setreg(v:register, <SID>recall())<CR>
+    endif
+    let buffer = fugitive#buffer()
+    if expand('%:p') =~# '://'
+      call buffer.setvar('&path', s:sub(buffer.getvar('&path'), '^\.%(,|$)', ''))
+    endif
+    if stridx(buffer.getvar('&tags'), escape(b:git_dir, ', ')) == -1
+      if filereadable(b:git_dir.'/tags')
+        call buffer.setvar('&tags', escape(b:git_dir.'/tags', ', ').','.buffer.getvar('&tags'))
+      endif
+      if &filetype !=# '' && filereadable(b:git_dir.'/'.&filetype.'.tags')
+        call buffer.setvar('&tags', escape(b:git_dir.'/'.&filetype.'.tags', ', ').','.buffer.getvar('&tags'))
+      endif
+    endif
+    try
+      let [save_mls, &modelines] = [&mls, 0]
+      call s:define_commands()
+      doautocmd User Fugitive
+    finally
+      let &mls = save_mls
+    endtry
+  endif
+endfunction
+
+augroup fugitive
+  autocmd!
+  autocmd BufNewFile,BufReadPost * call fugitive#detect(expand('%:p'))
+  autocmd FileType           netrw call fugitive#detect(expand('%:p'))
+  autocmd User NERDTreeInit,NERDTreeNewRoot call fugitive#detect(b:NERDTreeRoot.path.str())
+  autocmd VimEnter * if expand('<amatch>')==''|call fugitive#detect(getcwd())|endif
+  autocmd CmdWinEnter * call fugitive#detect(expand('#:p'))
+  autocmd BufWinLeave * execute getwinvar(+bufwinnr(+expand('<abuf>')), 'fugitive_leave')
+augroup END
+
+" Section: Repository
+
+let s:repo_prototype = {}
+let s:repos = {}
+let s:worktree_for_dir = {}
+let s:dir_for_worktree = {}
+
+function! s:repo(...) abort
+  let dir = a:0 ? a:1 : (exists('b:git_dir') && b:git_dir !=# '' ? b:git_dir : fugitive#extract_git_dir(expand('%:p')))
+  if dir !=# ''
+    if has_key(s:repos, dir)
+      let repo = get(s:repos, dir)
+    else
+      let repo = {'git_dir': dir}
+      let s:repos[dir] = repo
+    endif
+    return extend(extend(repo, s:repo_prototype, 'keep'), s:abstract_prototype, 'keep')
+  endif
+  call s:throw('not a git repository: '.expand('%:p'))
+endfunction
+
+function! fugitive#repo(...) abort
+  return call('s:repo', a:000)
+endfunction
+
+function! s:repo_dir(...) dict abort
+  return join([self.git_dir]+a:000,'/')
+endfunction
+
+function! s:configured_tree(git_dir) abort
+  if !has_key(s:worktree_for_dir, a:git_dir)
+    let s:worktree_for_dir[a:git_dir] = ''
+    let config_file = a:git_dir . '/config'
+    if filereadable(config_file)
+      let config = readfile(config_file,'',10)
+      call filter(config,'v:val =~# "^\\s*worktree *="')
+      if len(config) == 1
+        let worktree = matchstr(config[0], '= *\zs.*')
+      endif
+    elseif filereadable(a:git_dir . '/gitdir')
+      let worktree = fnamemodify(readfile(a:git_dir . '/gitdir')[0], ':h')
+      if worktree ==# '.'
+        unlet! worktree
+      endif
+    endif
+    if exists('worktree')
+      let s:worktree_for_dir[a:git_dir] = worktree
+      let s:dir_for_worktree[s:worktree_for_dir[a:git_dir]] = a:git_dir
+    endif
+  endif
+  if s:worktree_for_dir[a:git_dir] =~# '^\.'
+    return simplify(a:git_dir . '/' . s:worktree_for_dir[a:git_dir])
+  else
+    return s:worktree_for_dir[a:git_dir]
+  endif
+endfunction
+
+function! s:repo_tree(...) dict abort
+  if self.dir() =~# '/\.git$'
+    let dir = self.dir()[0:-6]
+    if dir !~# '/'
+      let dir .= '/'
+    endif
+  else
+    let dir = s:configured_tree(self.git_dir)
+  endif
+  if dir ==# ''
+    call s:throw('no work tree')
+  else
+    return join([dir]+a:000,'/')
+  endif
+endfunction
+
+function! s:repo_bare() dict abort
+  if self.dir() =~# '/\.git$'
+    return 0
+  else
+    return s:configured_tree(self.git_dir) ==# ''
+  endif
+endfunction
+
+function! s:repo_translate(spec) dict abort
+  let refs = self.dir('refs/')
+  if filereadable(self.dir('commondir'))
+    let refs = simplify(self.dir(get(readfile(self.dir('commondir'), 1), 0, ''))) . '/refs/'
+  endif
+  if a:spec ==# '.' || a:spec ==# '/.'
+    return self.bare() ? self.dir() : self.tree()
+  elseif a:spec =~# '^/\=\.git$' && self.bare()
+    return self.dir()
+  elseif a:spec =~# '^/\=\.git/'
+    return self.dir(s:sub(a:spec, '^/=\.git/', ''))
+  elseif a:spec =~# '^/'
+    return self.tree().a:spec
+  elseif a:spec =~# '^:[0-3]:'
+    return 'fugitive://'.self.dir().'//'.a:spec[1].'/'.a:spec[3:-1]
+  elseif a:spec ==# ':'
+    if $GIT_INDEX_FILE =~# '/[^/]*index[^/]*\.lock$' && fnamemodify($GIT_INDEX_FILE,':p')[0:strlen(self.dir())] ==# self.dir('') && filereadable($GIT_INDEX_FILE)
+      return fnamemodify($GIT_INDEX_FILE,':p')
+    else
+      return self.dir('index')
+    endif
+  elseif a:spec =~# '^:/'
+    let ref = self.rev_parse(matchstr(a:spec,'.[^:]*'))
+    return 'fugitive://'.self.dir().'//'.ref
+  elseif a:spec =~# '^:'
+    return 'fugitive://'.self.dir().'//0/'.a:spec[1:-1]
+  elseif a:spec ==# '@'
+    return self.dir('HEAD')
+  elseif a:spec =~# 'HEAD\|^refs/' && a:spec !~ ':' && filereadable(refs . '../' . a:spec)
+    return simplify(refs . '../' . a:spec)
+  elseif filereadable(refs.a:spec)
+    return refs.a:spec
+  elseif filereadable(refs.'tags/'.a:spec)
+    return refs.'tags/'.a:spec
+  elseif filereadable(refs.'heads/'.a:spec)
+    return refs.'heads/'.a:spec
+  elseif filereadable(refs.'remotes/'.a:spec)
+    return refs.'remotes/'.a:spec
+  elseif filereadable(refs.'remotes/'.a:spec.'/HEAD')
+    return refs.'remotes/'.a:spec.'/HEAD'
+  else
+    try
+      let ref = self.rev_parse(matchstr(a:spec,'[^:]*'))
+      let path = s:sub(matchstr(a:spec,':.*'),'^:','/')
+      return 'fugitive://'.self.dir().'//'.ref.path
+    catch /^fugitive:/
+      return self.tree(a:spec)
+    endtry
+  endif
+endfunction
+
+function! s:repo_head(...) dict abort
+    let head = s:repo().head_ref()
+
+    if head =~# '^ref: '
+      let branch = s:sub(head,'^ref: %(refs/%(heads/|remotes/|tags/)=)=','')
+    elseif head =~# '^\x\{40\}$'
+      " truncate hash to a:1 characters if we're in detached head mode
+      let len = a:0 ? a:1 : 0
+      let branch = len ? head[0:len-1] : ''
+    else
+      return ''
+    endif
+
+    return branch
+endfunction
+
+call s:add_methods('repo',['dir','tree','bare','translate','head'])
+
+function! s:repo_git_command(...) dict abort
+  let git = s:git_command() . ' --git-dir='.s:shellesc(self.git_dir)
+  return git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
+endfunction
+
+function! s:repo_git_chomp(...) dict abort
+  let git = g:fugitive_git_executable . ' --git-dir='.s:shellesc(self.git_dir)
+  let output = git.join(map(copy(a:000),'" ".s:shellesc(v:val)'),'')
+  return s:sub(system(output),'\n$','')
+endfunction
+
+function! s:repo_git_chomp_in_tree(...) dict abort
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let dir = getcwd()
+  try
+    execute cd s:fnameescape(s:repo().tree())
+    return call(s:repo().git_chomp, a:000, s:repo())
+  finally
+    execute cd s:fnameescape(dir)
+  endtry
+endfunction
+
+function! s:repo_rev_parse(rev) dict abort
+  let hash = self.git_chomp('rev-parse','--verify',a:rev)
+  if hash =~ '\<\x\{40\}$'
+    return matchstr(hash,'\<\x\{40\}$')
+  endif
+  call s:throw('rev-parse '.a:rev.': '.hash)
+endfunction
+
+call s:add_methods('repo',['git_command','git_chomp','git_chomp_in_tree','rev_parse'])
+
+function! s:repo_dirglob(base) dict abort
+  let base = s:sub(a:base,'^/','')
+  let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*/')),"\n")
+  call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]')
+  return matches
+endfunction
+
+function! s:repo_superglob(base) dict abort
+  if a:base =~# '^/' || a:base !~# ':'
+    let results = []
+    if a:base !~# '^/'
+      let heads = ["HEAD","ORIG_HEAD","FETCH_HEAD","MERGE_HEAD"]
+      let heads += sort(split(s:repo().git_chomp("rev-parse","--symbolic","--branches","--tags","--remotes"),"\n"))
+      " Add any stashes.
+      if filereadable(s:repo().dir('refs/stash'))
+        let heads += ["stash"]
+        let heads += sort(split(s:repo().git_chomp("stash","list","--pretty=format:%gd"),"\n"))
+      endif
+      call filter(heads,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
+      let results += heads
+    endif
+    if !self.bare()
+      let base = s:sub(a:base,'^/','')
+      let matches = split(glob(self.tree(s:gsub(base,'/','*&').'*')),"\n")
+      call map(matches,'s:shellslash(v:val)')
+      call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val')
+      call map(matches,'v:val[ strlen(self.tree())+(a:base !~ "^/") : -1 ]')
+      let results += matches
+    endif
+    return results
+
+  elseif a:base =~# '^:'
+    let entries = split(self.git_chomp('ls-files','--stage'),"\n")
+    call map(entries,'s:sub(v:val,".*(\\d)\\t(.*)",":\\1:\\2")')
+    if a:base !~# '^:[0-3]\%(:\|$\)'
+      call filter(entries,'v:val[1] == "0"')
+      call map(entries,'v:val[2:-1]')
+    endif
+    call filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
+    return entries
+
+  else
+    let tree = matchstr(a:base,'.*[:/]')
+    let entries = split(self.git_chomp('ls-tree',tree),"\n")
+    call map(entries,'s:sub(v:val,"^04.*\\zs$","/")')
+    call map(entries,'tree.s:sub(v:val,".*\t","")')
+    return filter(entries,'v:val[ 0 : strlen(a:base)-1 ] ==# a:base')
+  endif
+endfunction
+
+call s:add_methods('repo',['dirglob','superglob'])
+
+function! s:repo_config(conf) dict abort
+  return matchstr(s:repo().git_chomp('config',a:conf),"[^\r\n]*")
+endfun
+
+function! s:repo_user() dict abort
+  let username = s:repo().config('user.name')
+  let useremail = s:repo().config('user.email')
+  return username.' <'.useremail.'>'
+endfun
+
+function! s:repo_aliases() dict abort
+  if !has_key(self,'_aliases')
+    let self._aliases = {}
+    for line in split(self.git_chomp('config','-z','--get-regexp','^alias[.]'),"\1")
+      let self._aliases[matchstr(line, '\.\zs.\{-}\ze\n')] = matchstr(line, '\n\zs.*')
+    endfor
+  endif
+  return self._aliases
+endfunction
+
+call s:add_methods('repo',['config', 'user', 'aliases'])
+
+function! s:repo_keywordprg() dict abort
+  let args = ' --git-dir='.escape(self.dir(),"\\\"' ")
+  if has('gui_running') && !has('win32')
+    return s:git_command() . ' --no-pager' . args . ' log -1'
+  else
+    return s:git_command() . args . ' show'
+  endif
+endfunction
+
+call s:add_methods('repo',['keywordprg'])
+
+" Section: Buffer
+
+let s:buffer_prototype = {}
+
+function! s:buffer(...) abort
+  let buffer = {'#': bufnr(a:0 ? a:1 : '%')}
+  call extend(extend(buffer,s:buffer_prototype,'keep'),s:abstract_prototype,'keep')
+  if buffer.getvar('git_dir') !=# ''
+    return buffer
+  endif
+  call s:throw('not a git repository: '.expand('%:p'))
+endfunction
+
+function! fugitive#buffer(...) abort
+  return s:buffer(a:0 ? a:1 : '%')
+endfunction
+
+function! s:buffer_getvar(var) dict abort
+  return getbufvar(self['#'],a:var)
+endfunction
+
+function! s:buffer_setvar(var,value) dict abort
+  return setbufvar(self['#'],a:var,a:value)
+endfunction
+
+function! s:buffer_getline(lnum) dict abort
+  return get(getbufline(self['#'], a:lnum), 0, '')
+endfunction
+
+function! s:buffer_repo() dict abort
+  return s:repo(self.getvar('git_dir'))
+endfunction
+
+function! s:buffer_type(...) dict abort
+  if self.getvar('fugitive_type') != ''
+    let type = self.getvar('fugitive_type')
+  elseif fnamemodify(self.spec(),':p') =~# '.\git/refs/\|\.git/\w*HEAD$'
+    let type = 'head'
+  elseif self.getline(1) =~ '^tree \x\{40\}$' && self.getline(2) == ''
+    let type = 'tree'
+  elseif self.getline(1) =~ '^\d\{6\} \w\{4\} \x\{40\}\>\t'
+    let type = 'tree'
+  elseif self.getline(1) =~ '^\d\{6\} \x\{40\}\> \d\t'
+    let type = 'index'
+  elseif isdirectory(self.spec())
+    let type = 'directory'
+  elseif self.spec() == ''
+    let type = 'null'
+  else
+    let type = 'file'
+  endif
+  if a:0
+    return !empty(filter(copy(a:000),'v:val ==# type'))
+  else
+    return type
+  endif
+endfunction
+
+if has('win32')
+
+  function! s:buffer_spec() dict abort
+    let bufname = bufname(self['#'])
+    let retval = ''
+    for i in split(bufname,'[^:]\zs\\')
+      let retval = fnamemodify((retval==''?'':retval.'\').i,':.')
+    endfor
+    return s:shellslash(fnamemodify(retval,':p'))
+  endfunction
+
+else
+
+  function! s:buffer_spec() dict abort
+    let bufname = bufname(self['#'])
+    return s:shellslash(bufname == '' ? '' : fnamemodify(bufname,':p'))
+  endfunction
+
+endif
+
+function! s:buffer_name() dict abort
+  return self.spec()
+endfunction
+
+function! s:buffer_commit() dict abort
+  return matchstr(self.spec(),'^fugitive://.\{-\}//\zs\w*')
+endfunction
+
+function! s:cpath(path) abort
+  if exists('+fileignorecase') && &fileignorecase
+    return tolower(a:path)
+  else
+    return a:path
+  endif
+endfunction
+
+function! s:buffer_path(...) dict abort
+  let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
+  if rev != ''
+    let rev = s:sub(rev,'\w*','')
+  elseif s:cpath(self.spec()[0 : len(self.repo().dir())]) ==#
+        \ s:cpath(self.repo().dir() . '/')
+    let rev = '/.git'.self.spec()[strlen(self.repo().dir()) : -1]
+  elseif !self.repo().bare() &&
+        \ s:cpath(self.spec()[0 : len(self.repo().tree())]) ==#
+        \ s:cpath(self.repo().tree() . '/')
+    let rev = self.spec()[strlen(self.repo().tree()) : -1]
+  endif
+  return s:sub(s:sub(rev,'.\zs/$',''),'^/',a:0 ? a:1 : '')
+endfunction
+
+function! s:buffer_rev() dict abort
+  let rev = matchstr(self.spec(),'^fugitive://.\{-\}//\zs.*')
+  if rev =~ '^\x/'
+    return ':'.rev[0].':'.rev[2:-1]
+  elseif rev =~ '.'
+    return s:sub(rev,'/',':')
+  elseif self.spec() =~ '\.git/index$'
+    return ':'
+  elseif self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
+    return self.spec()[strlen(self.repo().dir())+1 : -1]
+  else
+    return self.path('/')
+  endif
+endfunction
+
+function! s:buffer_sha1() dict abort
+  if self.spec() =~ '^fugitive://' || self.spec() =~ '\.git/refs/\|\.git/.*HEAD$'
+    return self.repo().rev_parse(self.rev())
+  else
+    return ''
+  endif
+endfunction
+
+function! s:buffer_expand(rev) dict abort
+  if a:rev =~# '^:[0-3]$'
+    let file = a:rev.self.path(':')
+  elseif a:rev =~# '^[-:]/$'
+    let file = '/'.self.path()
+  elseif a:rev =~# '^-'
+    let file = 'HEAD^{}'.a:rev[1:-1].self.path(':')
+  elseif a:rev =~# '^@{'
+    let file = 'HEAD'.a:rev.self.path(':')
+  elseif a:rev =~# '^[~^]'
+    let commit = s:sub(self.commit(),'^\d=$','HEAD')
+    let file = commit.a:rev.self.path(':')
+  else
+    let file = a:rev
+  endif
+  return s:sub(s:sub(file,'\%$',self.path()),'\.\@<=/$','')
+endfunction
+
+function! s:buffer_containing_commit() dict abort
+  if self.commit() =~# '^\d$'
+    return ':'
+  elseif self.commit() =~# '.'
+    return self.commit()
+  else
+    return 'HEAD'
+  endif
+endfunction
+
+function! s:buffer_up(...) dict abort
+  let rev = self.rev()
+  let c = a:0 ? a:1 : 1
+  while c
+    if rev =~# '^[/:]$'
+      let rev = 'HEAD'
+    elseif rev =~# '^:'
+      let rev = ':'
+    elseif rev =~# '^refs/[^^~:]*$\|^[^^~:]*HEAD$'
+      let rev .= '^{}'
+    elseif rev =~# '^/\|:.*/'
+      let rev = s:sub(rev, '.*\zs/.*', '')
+    elseif rev =~# ':.'
+      let rev = matchstr(rev, '^[^:]*:')
+    elseif rev =~# ':$'
+      let rev = rev[0:-2]
+    else
+      return rev.'~'.c
+    endif
+    let c -= 1
+  endwhile
+  return rev
+endfunction
+
+call s:add_methods('buffer',['getvar','setvar','getline','repo','type','spec','name','commit','path','rev','sha1','expand','containing_commit','up'])
+
+" Section: Git
+
+call s:command("-bang -nargs=? -complete=customlist,s:GitComplete Git :execute s:Git(<bang>0,<q-args>)")
+
+function! s:ExecuteInTree(cmd) abort
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let dir = getcwd()
+  try
+    execute cd s:fnameescape(s:repo().tree())
+    execute a:cmd
+  finally
+    execute cd s:fnameescape(dir)
+  endtry
+endfunction
+
+function! s:Git(bang, args) abort
+  if a:bang
+    return s:Edit('edit', 1, a:args)
+  endif
+  let git = s:git_command()
+  if has('gui_running') && !has('win32')
+    let git .= ' --no-pager'
+  endif
+  let args = matchstr(a:args,'\v\C.{-}%($|\\@<!%(\\\\)*\|)@=')
+  if exists(':terminal')
+    let dir = s:repo().tree()
+    if expand('%') != ''
+      -tabedit %
+    else
+      -tabnew
+    endif
+    execute 'lcd' fnameescape(dir)
+    execute 'terminal' git args
+  else
+    call s:ExecuteInTree('!'.git.' '.args)
+    if has('win32')
+      call fugitive#reload_status()
+    endif
+  endif
+  return matchstr(a:args, '\v\C\\@<!%(\\\\)*\|\zs.*')
+endfunction
+
+function! fugitive#git_commands() abort
+  if !exists('s:exec_path')
+    let s:exec_path = s:sub(system(g:fugitive_git_executable.' --exec-path'),'\n$','')
+  endif
+  return map(split(glob(s:exec_path.'/git-*'),"\n"),'s:sub(v:val[strlen(s:exec_path)+5 : -1],"\\.exe$","")')
+endfunction
+
+function! s:GitComplete(A, L, P) abort
+  if strpart(a:L, 0, a:P) !~# ' [[:alnum:]-]\+ '
+    let cmds = fugitive#git_commands()
+    return filter(sort(cmds+keys(s:repo().aliases())), 'strpart(v:val, 0, strlen(a:A)) ==# a:A')
+  else
+    return s:repo().superglob(a:A)
+  endif
+endfunction
+
+" Section: Gcd, Glcd
+
+function! s:DirComplete(A,L,P) abort
+  let matches = s:repo().dirglob(a:A)
+  return matches
+endfunction
+
+call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Gcd  :exe 'cd<bang>'  s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))")
+call s:command("-bar -bang -nargs=? -complete=customlist,s:DirComplete Glcd :exe 'lcd<bang>' s:fnameescape(s:repo().bare() ? s:repo().dir(<q-args>) : s:repo().tree(<q-args>))")
+
+" Section: Gstatus
+
+call s:command("-bar Gstatus :execute s:Status()")
+augroup fugitive_status
+  autocmd!
+  if !has('win32')
+    autocmd FocusGained,ShellCmdPost * call fugitive#reload_status()
+    autocmd BufDelete term://* call fugitive#reload_status()
+  endif
+augroup END
+
+function! s:Status() abort
+  try
+    Gpedit :
+    wincmd P
+    setlocal foldmethod=syntax foldlevel=1
+    nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+  return ''
+endfunction
+
+function! fugitive#reload_status() abort
+  if exists('s:reloading_status')
+    return
+  endif
+  try
+    let s:reloading_status = 1
+    let mytab = tabpagenr()
+    for tab in [mytab] + range(1,tabpagenr('$'))
+      for winnr in range(1,tabpagewinnr(tab,'$'))
+        if getbufvar(tabpagebuflist(tab)[winnr-1],'fugitive_type') ==# 'index'
+          execute 'tabnext '.tab
+          if winnr != winnr()
+            execute winnr.'wincmd w'
+            let restorewinnr = 1
+          endif
+          try
+            if !&modified
+              call s:BufReadIndex()
+            endif
+          finally
+            if exists('restorewinnr')
+              wincmd p
+            endif
+            execute 'tabnext '.mytab
+          endtry
+        endif
+      endfor
+    endfor
+  finally
+    unlet! s:reloading_status
+  endtry
+endfunction
+
+function! s:stage_info(lnum) abort
+  let filename = matchstr(getline(a:lnum),'^#\t\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
+  let lnum = a:lnum
+  if has('multi_byte_encoding')
+    let colon = '\%(:\|\%uff1a\)'
+  else
+    let colon = ':'
+  endif
+  while lnum && getline(lnum) !~# colon.'$'
+    let lnum -= 1
+  endwhile
+  if !lnum
+    return ['', '']
+  elseif (getline(lnum+1) =~# '^# .*\<git \%(reset\|rm --cached\) ' && getline(lnum+2) ==# '#') || getline(lnum) ==# '# Changes to be committed:'
+    return [matchstr(filename, colon.' *\zs.*'), 'staged']
+  elseif (getline(lnum+1) =~# '^# .*\<git add ' && getline(lnum+2) ==# '#' && getline(lnum+3) !~# colon.'  ') || getline(lnum) ==# '# Untracked files:'
+    return [filename, 'untracked']
+  elseif getline(lnum+2) =~# '^# .*\<git checkout ' || getline(lnum) ==# '# Changes not staged for commit:'
+    return [matchstr(filename, colon.' *\zs.*'), 'unstaged']
+  elseif getline(lnum+2) =~# '^# .*\<git \%(add\|rm\)' || getline(lnum) ==# '# Unmerged paths:'
+    return [matchstr(filename, colon.' *\zs.*'), 'unmerged']
+  else
+    return ['', 'unknown']
+  endif
+endfunction
+
+function! s:StageNext(count) abort
+  for i in range(a:count)
+    call search('^#\t.*','W')
+  endfor
+  return '.'
+endfunction
+
+function! s:StagePrevious(count) abort
+  if line('.') == 1 && exists(':CtrlP') && get(g:, 'ctrl_p_map') =~? '^<c-p>$'
+    return 'CtrlP '.fnameescape(s:repo().tree())
+  else
+    for i in range(a:count)
+      call search('^#\t.*','Wbe')
+    endfor
+    return '.'
+  endif
+endfunction
+
+function! s:StageReloadSeek(target,lnum1,lnum2) abort
+  let jump = a:target
+  let f = matchstr(getline(a:lnum1-1),'^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*')
+  if f !=# '' | let jump = f | endif
+  let f = matchstr(getline(a:lnum2+1),'^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\zs.*')
+  if f !=# '' | let jump = f | endif
+  silent! edit!
+  1
+  redraw
+  call search('^#\t\%([[:alpha:] ]\+: *\|.*\%uff1a *\)\=\V'.jump.'\%( ([^()[:digit:]]\+)\)\=\$','W')
+endfunction
+
+function! s:StageUndo() abort
+  let [filename, section] = s:stage_info(line('.'))
+  if empty(filename)
+    return ''
+  endif
+  let repo = s:repo()
+  let hash = repo.git_chomp('hash-object', '-w', filename)
+  if !empty(hash)
+    if section ==# 'untracked'
+      call repo.git_chomp_in_tree('clean', '-f', '--', filename)
+    elseif section ==# 'unmerged'
+      call repo.git_chomp_in_tree('rm', '--', filename)
+    elseif section ==# 'unstaged'
+      call repo.git_chomp_in_tree('checkout', '--', filename)
+    else
+      call repo.git_chomp_in_tree('checkout', 'HEAD', '--', filename)
+    endif
+    call s:StageReloadSeek(filename, line('.'), line('.'))
+    let @" = hash
+    return 'checktime|redraw|echomsg ' .
+          \ string('To restore, :Git cat-file blob '.hash[0:6].' > '.filename)
+  endif
+endfunction
+
+function! s:StageDiff(diff) abort
+  let [filename, section] = s:stage_info(line('.'))
+  if filename ==# '' && section ==# 'staged'
+    return 'Git! diff --no-ext-diff --cached'
+  elseif filename ==# ''
+    return 'Git! diff --no-ext-diff'
+  elseif filename =~# ' -> '
+    let [old, new] = split(filename,' -> ')
+    execute 'Gedit '.s:fnameescape(':0:'.new)
+    return a:diff.' HEAD:'.s:fnameescape(old)
+  elseif section ==# 'staged'
+    execute 'Gedit '.s:fnameescape(':0:'.filename)
+    return a:diff.' -'
+  else
+    execute 'Gedit '.s:fnameescape('/'.filename)
+    return a:diff
+  endif
+endfunction
+
+function! s:StageDiffEdit() abort
+  let [filename, section] = s:stage_info(line('.'))
+  let arg = (filename ==# '' ? '.' : filename)
+  if section ==# 'staged'
+    return 'Git! diff --no-ext-diff --cached '.s:shellesc(arg)
+  elseif section ==# 'untracked'
+    let repo = s:repo()
+    call repo.git_chomp_in_tree('add','--intent-to-add',arg)
+    if arg ==# '.'
+      silent! edit!
+      1
+      if !search('^# .*:\n#.*\n# .*"git checkout \|^# Changes not staged for commit:$','W')
+        call search('^# .*:$','W')
+      endif
+    else
+      call s:StageReloadSeek(arg,line('.'),line('.'))
+    endif
+    return ''
+  else
+    return 'Git! diff --no-ext-diff '.s:shellesc(arg)
+  endif
+endfunction
+
+function! s:StageToggle(lnum1,lnum2) abort
+  if a:lnum1 == 1 && a:lnum2 == 1
+    return 'Gedit /.git|call search("^index$", "wc")'
+  endif
+  try
+    let output = ''
+    for lnum in range(a:lnum1,a:lnum2)
+      let [filename, section] = s:stage_info(lnum)
+      let repo = s:repo()
+      if getline('.') =~# '^# .*:$'
+        if section ==# 'staged'
+          call repo.git_chomp_in_tree('reset','-q')
+          silent! edit!
+          1
+          if !search('^# .*:\n# .*"git add .*\n#\n\|^# Untracked files:$','W')
+            call search('^# .*:$','W')
+          endif
+          return ''
+        elseif section ==# 'unstaged'
+          call repo.git_chomp_in_tree('add','-u')
+          silent! edit!
+          1
+          if !search('^# .*:\n# .*"git add .*\n#\n\|^# Untracked files:$','W')
+            call search('^# .*:$','W')
+          endif
+          return ''
+        else
+          call repo.git_chomp_in_tree('add','.')
+          silent! edit!
+          1
+          call search('^# .*:$','W')
+          return ''
+        endif
+      endif
+      if filename ==# ''
+        continue
+      endif
+      execute lnum
+      if section ==# 'staged'
+        if filename =~ ' -> '
+          let files_to_unstage = split(filename,' -> ')
+        else
+          let files_to_unstage = [filename]
+        endif
+        let filename = files_to_unstage[-1]
+        let cmd = ['reset','-q','--'] + files_to_unstage
+      elseif getline(lnum) =~# '^#\tdeleted:'
+        let cmd = ['rm','--',filename]
+      elseif getline(lnum) =~# '^#\tmodified:'
+        let cmd = ['add','--',filename]
+      else
+        let cmd = ['add','-A','--',filename]
+      endif
+      if !exists('first_filename')
+        let first_filename = filename
+      endif
+      let output .= call(repo.git_chomp_in_tree,cmd,s:repo())."\n"
+    endfor
+    if exists('first_filename')
+      call s:StageReloadSeek(first_filename,a:lnum1,a:lnum2)
+    endif
+    echo s:sub(s:gsub(output,'\n+','\n'),'\n$','')
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+  return 'checktime'
+endfunction
+
+function! s:StagePatch(lnum1,lnum2) abort
+  let add = []
+  let reset = []
+
+  for lnum in range(a:lnum1,a:lnum2)
+    let [filename, section] = s:stage_info(lnum)
+    if getline('.') =~# '^# .*:$' && section ==# 'staged'
+      return 'Git reset --patch'
+    elseif getline('.') =~# '^# .*:$' && section ==# 'unstaged'
+      return 'Git add --patch'
+    elseif getline('.') =~# '^# .*:$' && section ==# 'untracked'
+      return 'Git add -N .'
+    elseif filename ==# ''
+      continue
+    endif
+    if !exists('first_filename')
+      let first_filename = filename
+    endif
+    execute lnum
+    if filename =~ ' -> '
+      let reset += [split(filename,' -> ')[1]]
+    elseif section ==# 'staged'
+      let reset += [filename]
+    elseif getline(lnum) !~# '^#\tdeleted:'
+      let add += [filename]
+    endif
+  endfor
+  try
+    if !empty(add)
+      execute "Git add --patch -- ".join(map(add,'s:shellesc(v:val)'))
+    endif
+    if !empty(reset)
+      execute "Git reset --patch -- ".join(map(reset,'s:shellesc(v:val)'))
+    endif
+    if exists('first_filename')
+      silent! edit!
+      1
+      redraw
+      call search('^#\t\%([[:alpha:] ]\+: *\)\=\V'.first_filename.'\%( ([^()[:digit:]]\+)\)\=\$','W')
+    endif
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+  return 'checktime'
+endfunction
+
+" Section: Gcommit
+
+call s:command("-nargs=? -complete=customlist,s:CommitComplete Gcommit :execute s:Commit(<q-args>)")
+
+function! s:Commit(args, ...) abort
+  let repo = a:0 ? a:1 : s:repo()
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let dir = getcwd()
+  let msgfile = repo.dir('COMMIT_EDITMSG')
+  let outfile = tempname()
+  let errorfile = tempname()
+  try
+    try
+      execute cd s:fnameescape(repo.tree())
+      if s:winshell()
+        let command = ''
+        let old_editor = $GIT_EDITOR
+        let $GIT_EDITOR = 'false'
+      else
+        let command = 'env GIT_EDITOR=false '
+      endif
+      let command .= repo.git_command('commit').' '.a:args
+      if &shell =~# 'csh'
+        noautocmd silent execute '!('.command.' > '.outfile.') >& '.errorfile
+      elseif a:args =~# '\%(^\| \)-\%(-interactive\|p\|-patch\)\>'
+        noautocmd execute '!'.command.' 2> '.errorfile
+      else
+        noautocmd silent execute '!'.command.' > '.outfile.' 2> '.errorfile
+      endif
+      let error = v:shell_error
+    finally
+      execute cd s:fnameescape(dir)
+    endtry
+    if !has('gui_running')
+      redraw!
+    endif
+    if !error
+      if filereadable(outfile)
+        for line in readfile(outfile)
+          echo line
+        endfor
+      endif
+      return ''
+    else
+      let errors = readfile(errorfile)
+      let error = get(errors,-2,get(errors,-1,'!'))
+      if error =~# 'false''\=\.$'
+        let args = a:args
+        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-[esp]|--edit|--interactive|--patch|--signoff)%($| )','')
+        let args = s:gsub(args,'%(%(^| )-- )@<!%(^| )@<=%(-c|--reedit-message|--reuse-message|-F|--file|-m|--message)%(\s+|\=)%(''[^'']*''|"%(\\.|[^"])*"|\\.|\S)*','')
+        let args = s:gsub(args,'%(^| )@<=[%#]%(:\w)*','\=expand(submatch(0))')
+        let args = s:sub(args, '\ze -- |$', ' --no-edit --no-interactive --no-signoff')
+        let args = '-F '.s:shellesc(msgfile).' '.args
+        if args !~# '\%(^\| \)--cleanup\>'
+          let args = '--cleanup=strip '.args
+        endif
+        if bufname('%') == '' && line('$') == 1 && getline(1) == '' && !&mod
+          execute 'keepalt edit '.s:fnameescape(msgfile)
+        elseif a:args =~# '\%(^\| \)-\%(-verbose\|\w*v\)\>'
+          execute 'keepalt -tabedit '.s:fnameescape(msgfile)
+        elseif s:buffer().type() ==# 'index'
+          execute 'keepalt edit '.s:fnameescape(msgfile)
+          execute (search('^#','n')+1).'wincmd+'
+          setlocal nopreviewwindow
+        else
+          execute 'keepalt split '.s:fnameescape(msgfile)
+        endif
+        let b:fugitive_commit_arguments = args
+        setlocal bufhidden=wipe filetype=gitcommit
+        return '1'
+      elseif error ==# '!'
+        return s:Status()
+      else
+        call s:throw(empty(error)?join(errors, ' '):error)
+      endif
+    endif
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  finally
+    if exists('old_editor')
+      let $GIT_EDITOR = old_editor
+    endif
+    call delete(outfile)
+    call delete(errorfile)
+    call fugitive#reload_status()
+  endtry
+endfunction
+
+function! s:CommitComplete(A,L,P) abort
+  if a:A =~ '^-' || type(a:A) == type(0) " a:A is 0 on :Gcommit -<Tab>
+    let args = ['-C', '-F', '-a', '-c', '-e', '-i', '-m', '-n', '-o', '-q', '-s', '-t', '-u', '-v', '--all', '--allow-empty', '--amend', '--author=', '--cleanup=', '--dry-run', '--edit', '--file=', '--fixup=', '--include', '--interactive', '--message=', '--no-verify', '--only', '--quiet', '--reedit-message=', '--reuse-message=', '--signoff', '--squash=', '--template=', '--untracked-files', '--verbose']
+    return filter(args,'v:val[0 : strlen(a:A)-1] ==# a:A')
+  else
+    return s:repo().superglob(a:A)
+  endif
+endfunction
+
+function! s:FinishCommit() abort
+  let args = getbufvar(+expand('<abuf>'),'fugitive_commit_arguments')
+  if !empty(args)
+    call setbufvar(+expand('<abuf>'),'fugitive_commit_arguments','')
+    return s:Commit(args, s:repo(getbufvar(+expand('<abuf>'),'git_dir')))
+  endif
+  return ''
+endfunction
+
+" Section: Gmerge, Gpull
+
+call s:command("-nargs=? -bang -complete=custom,s:RevisionComplete Gmerge " .
+      \ "execute s:Merge('merge', <bang>0, <q-args>)")
+call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpull " .
+      \ "execute s:Merge('pull --progress', <bang>0, <q-args>)")
+
+function! s:RevisionComplete(A, L, P) abort
+  return s:repo().git_chomp('rev-parse', '--symbolic', '--branches', '--tags', '--remotes')
+        \ . "\nHEAD\nFETCH_HEAD\nORIG_HEAD"
+endfunction
+
+function! s:RemoteComplete(A, L, P) abort
+  let remote = matchstr(a:L, ' \zs\S\+\ze ')
+  if !empty(remote)
+    let matches = split(s:repo().git_chomp('ls-remote', remote), "\n")
+    call filter(matches, 'v:val =~# "\t" && v:val !~# "{"')
+    call map(matches, 's:sub(v:val, "^.*\t%(refs/%(heads/|tags/)=)=", "")')
+  else
+    let matches = split(s:repo().git_chomp('remote'), "\n")
+  endif
+  return join(matches, "\n")
+endfunction
+
+function! fugitive#cwindow() abort
+  if &buftype == 'quickfix'
+    cwindow
+  else
+    botright cwindow
+    if &buftype == 'quickfix'
+      wincmd p
+    endif
+  endif
+endfunction
+
+let s:common_efm = ''
+      \ . '%+Egit:%.%#,'
+      \ . '%+Eusage:%.%#,'
+      \ . '%+Eerror:%.%#,'
+      \ . '%+Efatal:%.%#,'
+      \ . '%-G%.%#%\e[K%.%#,'
+      \ . '%-G%.%#%\r%.%\+'
+
+function! s:Merge(cmd, bang, args) abort
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let cwd = getcwd()
+  let [mp, efm] = [&l:mp, &l:efm]
+  let had_merge_msg = filereadable(s:repo().dir('MERGE_MSG'))
+  try
+    let &l:errorformat = ''
+          \ . '%-Gerror:%.%#false''.,'
+          \ . '%-G%.%# ''git commit'' %.%#,'
+          \ . '%+Emerge:%.%#,'
+          \ . s:common_efm . ','
+          \ . '%+ECannot %.%#: You have unstaged changes.,'
+          \ . '%+ECannot %.%#: Your index contains uncommitted changes.,'
+          \ . '%+EThere is no tracking information for the current branch.,'
+          \ . '%+EYou are not currently on a branch. Please specify which,'
+          \ . 'CONFLICT (%m): %f deleted in %.%#,'
+          \ . 'CONFLICT (%m): Merge conflict in %f,'
+          \ . 'CONFLICT (%m): Rename \"%f\"->%.%#,'
+          \ . 'CONFLICT (%m): Rename %.%#->%f %.%#,'
+          \ . 'CONFLICT (%m): There is a directory with name %f in %.%#,'
+          \ . '%+ECONFLICT %.%#,'
+          \ . '%+EKONFLIKT %.%#,'
+          \ . '%+ECONFLIT %.%#,'
+          \ . "%+EXUNG \u0110\u1ed8T %.%#,"
+          \ . "%+E\u51b2\u7a81 %.%#,"
+          \ . 'U%\t%f'
+    if a:cmd =~# '^merge' && empty(a:args) &&
+          \ (had_merge_msg || isdirectory(s:repo().dir('rebase-apply')) ||
+          \  !empty(s:repo().git_chomp('diff-files', '--diff-filter=U')))
+      let &l:makeprg = g:fugitive_git_executable.' diff-files --name-status --diff-filter=U'
+    else
+      let &l:makeprg = s:sub(s:git_command() . ' ' . a:cmd .
+            \ (a:args =~# ' \%(--no-edit\|--abort\|-m\)\>' ? '' : ' --edit') .
+            \ ' ' . a:args, ' *$', '')
+    endif
+    if !empty($GIT_EDITOR) || has('win32')
+      let old_editor = $GIT_EDITOR
+      let $GIT_EDITOR = 'false'
+    else
+      let &l:makeprg = 'env GIT_EDITOR=false ' . &l:makeprg
+    endif
+    execute cd fnameescape(s:repo().tree())
+    silent noautocmd make!
+  catch /^Vim\%((\a\+)\)\=:E211/
+    let err = v:exception
+  finally
+    redraw!
+    let [&l:mp, &l:efm] = [mp, efm]
+    if exists('old_editor')
+      let $GIT_EDITOR = old_editor
+    endif
+    execute cd fnameescape(cwd)
+  endtry
+  call fugitive#reload_status()
+  if empty(filter(getqflist(),'v:val.valid'))
+    if !had_merge_msg && filereadable(s:repo().dir('MERGE_MSG'))
+      cclose
+      return 'Gcommit --no-status -n -t '.s:shellesc(s:repo().dir('MERGE_MSG'))
+    endif
+  endif
+  let qflist = getqflist()
+  let found = 0
+  for e in qflist
+    if !empty(e.bufnr)
+      let found = 1
+      let e.pattern = '^<<<<<<<'
+    endif
+  endfor
+  call fugitive#cwindow()
+  if found
+    call setqflist(qflist, 'r')
+    if !a:bang
+      return 'cfirst'
+    endif
+  endif
+  return exists('err') ? 'echoerr '.string(err) : ''
+endfunction
+
+" Section: Ggrep, Glog
+
+if !exists('g:fugitive_summary_format')
+  let g:fugitive_summary_format = '%s'
+endif
+
+call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Ggrep :execute s:Grep('grep',<bang>0,<q-args>)")
+call s:command("-bang -nargs=? -complete=customlist,s:EditComplete Glgrep :execute s:Grep('lgrep',<bang>0,<q-args>)")
+call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Glog :call s:Log('grep<bang>',<line1>,<count>,<f-args>)")
+call s:command("-bar -bang -nargs=* -range=0 -complete=customlist,s:EditComplete Gllog :call s:Log('lgrep<bang>',<line1>,<count>,<f-args>)")
+
+function! s:Grep(cmd,bang,arg) abort
+  let grepprg = &grepprg
+  let grepformat = &grepformat
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let dir = getcwd()
+  try
+    execute cd s:fnameescape(s:repo().tree())
+    let &grepprg = s:repo().git_command('--no-pager', 'grep', '-n', '--no-color')
+    let &grepformat = '%f:%l:%m,%m %f match%ts,%f'
+    exe a:cmd.'! '.escape(matchstr(a:arg,'\v\C.{-}%($|[''" ]\@=\|)@='),'|')
+    let list = a:cmd =~# '^l' ? getloclist(0) : getqflist()
+    for entry in list
+      if bufname(entry.bufnr) =~ ':'
+        let entry.filename = s:repo().translate(bufname(entry.bufnr))
+        unlet! entry.bufnr
+        let changed = 1
+      elseif a:arg =~# '\%(^\| \)--cached\>'
+        let entry.filename = s:repo().translate(':0:'.bufname(entry.bufnr))
+        unlet! entry.bufnr
+        let changed = 1
+      endif
+    endfor
+    if a:cmd =~# '^l' && exists('changed')
+      call setloclist(0, list, 'r')
+    elseif exists('changed')
+      call setqflist(list, 'r')
+    endif
+    if !a:bang && !empty(list)
+      return (a:cmd =~# '^l' ? 'l' : 'c').'first'.matchstr(a:arg,'\v\C[''" ]\zs\|.*')
+    else
+      return matchstr(a:arg,'\v\C[''" ]\|\zs.*')
+    endif
+  finally
+    let &grepprg = grepprg
+    let &grepformat = grepformat
+    execute cd s:fnameescape(dir)
+  endtry
+endfunction
+
+function! s:Log(cmd, line1, line2, ...) abort
+  let path = s:buffer().path('/')
+  if path =~# '^/\.git\%(/\|$\)' || index(a:000,'--') != -1
+    let path = ''
+  endif
+  let cmd = ['--no-pager', 'log', '--no-color']
+  let cmd += ['--pretty=format:fugitive://'.s:repo().dir().'//%H'.path.'::'.g:fugitive_summary_format]
+  if empty(filter(a:000[0 : index(a:000,'--')],'v:val !~# "^-"'))
+    if s:buffer().commit() =~# '\x\{40\}'
+      let cmd += [s:buffer().commit()]
+    elseif s:buffer().path() =~# '^\.git/refs/\|^\.git/.*HEAD$'
+      let cmd += [s:buffer().path()[5:-1]]
+    endif
+  end
+  let cmd += map(copy(a:000),'s:sub(v:val,"^\\%(%(:\\w)*)","\\=fnamemodify(s:buffer().path(),submatch(1))")')
+  if path =~# '/.'
+    if a:line2
+      let cmd += ['-L', a:line1 . ',' . a:line2 . ':' . path[1:-1]]
+    else
+      let cmd += ['--', path[1:-1]]
+    endif
+  endif
+  let grepformat = &grepformat
+  let grepprg = &grepprg
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let dir = getcwd()
+  try
+    execute cd s:fnameescape(s:repo().tree())
+    let &grepprg = escape(call(s:repo().git_command,cmd,s:repo()),'%#')
+    let &grepformat = '%Cdiff %.%#,%C--- %.%#,%C+++ %.%#,%Z@@ -%\d%\+\,%\d%\+ +%l\,%\d%\+ @@,%-G-%.%#,%-G+%.%#,%-G %.%#,%A%f::%m,%-G%.%#'
+    exe a:cmd
+  finally
+    let &grepformat = grepformat
+    let &grepprg = grepprg
+    execute cd s:fnameescape(dir)
+  endtry
+endfunction
+
+" Section: Gedit, Gpedit, Gsplit, Gvsplit, Gtabedit, Gread
+
+function! s:Edit(cmd,bang,...) abort
+  let buffer = s:buffer()
+  if a:cmd !~# 'read'
+    if &previewwindow && getbufvar('','fugitive_type') ==# 'index'
+      if winnr('$') == 1
+        let tabs = (&go =~# 'e' || !has('gui_running')) && &stal && (tabpagenr('$') >= &stal)
+        execute 'rightbelow' (&lines - &previewheight - &cmdheight - tabs - 1 - !!&laststatus).'new'
+      elseif winnr('#')
+        wincmd p
+      else
+        wincmd w
+      endif
+      if &diff
+        let mywinnr = winnr()
+        for winnr in range(winnr('$'),1,-1)
+          if winnr != mywinnr && getwinvar(winnr,'&diff')
+            execute winnr.'wincmd w'
+            close
+            if winnr('$') > 1
+              wincmd p
+            endif
+          endif
+        endfor
+        diffoff!
+      endif
+    endif
+  endif
+
+  if a:bang
+    let arglist = map(copy(a:000), 's:gsub(v:val, ''\\@<!%(\\\\)*\zs[%#]'', ''\=s:buffer().expand(submatch(0))'')')
+    let args = join(arglist, ' ')
+    if a:cmd =~# 'read'
+      let git = buffer.repo().git_command()
+      let last = line('$')
+      silent call s:ExecuteInTree((a:cmd ==# 'read' ? '$read' : a:cmd).'!'.git.' --no-pager '.args)
+      if a:cmd ==# 'read'
+        silent execute '1,'.last.'delete_'
+      endif
+      call fugitive#reload_status()
+      diffupdate
+      return 'redraw|echo '.string(':!'.git.' '.args)
+    else
+      let temp = resolve(tempname())
+      if has('win32')
+        let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
+      endif
+      let s:temp_files[s:cpath(temp)] = { 'dir': buffer.repo().dir(), 'args': arglist }
+      silent execute a:cmd.' '.temp
+      if a:cmd =~# 'pedit'
+        wincmd P
+      endif
+      let echo = s:Edit('read',1,args)
+      silent write!
+      setlocal buftype=nowrite nomodified filetype=git foldmarker=<<<<<<<,>>>>>>>
+      if getline(1) !~# '^diff '
+        setlocal readonly nomodifiable
+      endif
+      if a:cmd =~# 'pedit'
+        wincmd p
+      endif
+      return echo
+    endif
+    return ''
+  endif
+
+  if a:0 && a:1 == ''
+    return ''
+  elseif a:0
+    let file = buffer.expand(join(a:000, ' '))
+  elseif expand('%') ==# ''
+    let file = ':'
+  elseif buffer.commit() ==# '' && buffer.path('/') !~# '^/.git\>'
+    let file = buffer.path(':')
+  else
+    let file = buffer.path('/')
+  endif
+  try
+    let file = buffer.repo().translate(file)
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+  if file !~# '^fugitive:'
+    let file = s:sub(file, '/$', '')
+  endif
+  if a:cmd ==# 'read'
+    return 'silent %delete_|read '.s:fnameescape(file).'|silent 1delete_|diffupdate|'.line('.')
+  else
+    return a:cmd.' '.s:fnameescape(file)
+  endif
+endfunction
+
+function! s:EditComplete(A,L,P) abort
+  return map(s:repo().superglob(a:A), 'fnameescape(v:val)')
+endfunction
+
+function! s:EditRunComplete(A,L,P) abort
+  if a:L =~# '^\w\+!'
+    return s:GitComplete(a:A,a:L,a:P)
+  else
+    return s:repo().superglob(a:A)
+  endif
+endfunction
+
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Ge       :execute s:Edit('edit<bang>',0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gedit    :execute s:Edit('edit<bang>',0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gpedit   :execute s:Edit('pedit',<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gsplit   :execute s:Edit('split',<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gvsplit  :execute s:Edit('vsplit',<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditRunComplete Gtabedit :execute s:Edit('tabedit',<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -count -complete=customlist,s:EditRunComplete Gread :execute s:Edit((!<count> && <line1> ? '' : <count>).'read',<bang>0,<f-args>)")
+
+" Section: Gwrite, Gwq
+
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwrite :execute s:Write(<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gw :execute s:Write(<bang>0,<f-args>)")
+call s:command("-bar -bang -nargs=* -complete=customlist,s:EditComplete Gwq :execute s:Wq(<bang>0,<f-args>)")
+
+function! s:Write(force,...) abort
+  if exists('b:fugitive_commit_arguments')
+    return 'write|bdelete'
+  elseif expand('%:t') == 'COMMIT_EDITMSG' && $GIT_INDEX_FILE != ''
+    return 'wq'
+  elseif s:buffer().type() == 'index'
+    return 'Gcommit'
+  elseif s:buffer().path() ==# '' && getline(4) =~# '^+++ '
+    let filename = getline(4)[6:-1]
+    setlocal buftype=
+    silent write
+    setlocal buftype=nowrite
+    if matchstr(getline(2),'index [[:xdigit:]]\+\.\.\zs[[:xdigit:]]\{7\}') ==# s:repo().rev_parse(':0:'.filename)[0:6]
+      let err = s:repo().git_chomp('apply','--cached','--reverse',s:buffer().spec())
+    else
+      let err = s:repo().git_chomp('apply','--cached',s:buffer().spec())
+    endif
+    if err !=# ''
+      let v:errmsg = split(err,"\n")[0]
+      return 'echoerr v:errmsg'
+    elseif a:force
+      return 'bdelete'
+    else
+      return 'Gedit '.fnameescape(filename)
+    endif
+  endif
+  let mytab = tabpagenr()
+  let mybufnr = bufnr('')
+  let path = a:0 ? join(a:000, ' ') : s:buffer().path()
+  if empty(path)
+    return 'echoerr '.string('fugitive: cannot determine file path')
+  endif
+  if path =~# '^:\d\>'
+    return 'write'.(a:force ? '! ' : ' ').s:fnameescape(s:repo().translate(s:buffer().expand(path)))
+  endif
+  let always_permitted = (s:buffer().path() ==# path && s:buffer().commit() =~# '^0\=$')
+  if !always_permitted && !a:force && s:repo().git_chomp_in_tree('diff','--name-status','HEAD','--',path) . s:repo().git_chomp_in_tree('ls-files','--others','--',path) !=# ''
+    let v:errmsg = 'fugitive: file has uncommitted changes (use ! to override)'
+    return 'echoerr v:errmsg'
+  endif
+  let file = s:repo().translate(path)
+  let treebufnr = 0
+  for nr in range(1,bufnr('$'))
+    if fnamemodify(bufname(nr),':p') ==# file
+      let treebufnr = nr
+    endif
+  endfor
+
+  if treebufnr > 0 && treebufnr != bufnr('')
+    let temp = tempname()
+    silent execute '%write '.temp
+    for tab in [mytab] + range(1,tabpagenr('$'))
+      for winnr in range(1,tabpagewinnr(tab,'$'))
+        if tabpagebuflist(tab)[winnr-1] == treebufnr
+          execute 'tabnext '.tab
+          if winnr != winnr()
+            execute winnr.'wincmd w'
+            let restorewinnr = 1
+          endif
+          try
+            let lnum = line('.')
+            let last = line('$')
+            silent execute '$read '.temp
+            silent execute '1,'.last.'delete_'
+            silent write!
+            silent execute lnum
+            let did = 1
+          finally
+            if exists('restorewinnr')
+              wincmd p
+            endif
+            execute 'tabnext '.mytab
+          endtry
+        endif
+      endfor
+    endfor
+    if !exists('did')
+      call writefile(readfile(temp,'b'),file,'b')
+    endif
+  else
+    execute 'write! '.s:fnameescape(s:repo().translate(path))
+  endif
+
+  if a:force
+    let error = s:repo().git_chomp_in_tree('add', '--force', '--', path)
+  else
+    let error = s:repo().git_chomp_in_tree('add', '--', path)
+  endif
+  if v:shell_error
+    let v:errmsg = 'fugitive: '.error
+    return 'echoerr v:errmsg'
+  endif
+  if s:buffer().path() ==# path && s:buffer().commit() =~# '^\d$'
+    set nomodified
+  endif
+
+  let one = s:repo().translate(':1:'.path)
+  let two = s:repo().translate(':2:'.path)
+  let three = s:repo().translate(':3:'.path)
+  for nr in range(1,bufnr('$'))
+    let name = fnamemodify(bufname(nr), ':p')
+    if bufloaded(nr) && !getbufvar(nr,'&modified') && (name ==# one || name ==# two || name ==# three)
+      execute nr.'bdelete'
+    endif
+  endfor
+
+  unlet! restorewinnr
+  let zero = s:repo().translate(':0:'.path)
+  silent execute 'doautocmd BufWritePost' s:fnameescape(zero)
+  for tab in range(1,tabpagenr('$'))
+    for winnr in range(1,tabpagewinnr(tab,'$'))
+      let bufnr = tabpagebuflist(tab)[winnr-1]
+      let bufname = fnamemodify(bufname(bufnr), ':p')
+      if bufname ==# zero && bufnr != mybufnr
+        execute 'tabnext '.tab
+        if winnr != winnr()
+          execute winnr.'wincmd w'
+          let restorewinnr = 1
+        endif
+        try
+          let lnum = line('.')
+          let last = line('$')
+          silent execute '$read '.s:fnameescape(file)
+          silent execute '1,'.last.'delete_'
+          silent execute lnum
+          set nomodified
+          diffupdate
+        finally
+          if exists('restorewinnr')
+            wincmd p
+          endif
+          execute 'tabnext '.mytab
+        endtry
+        break
+      endif
+    endfor
+  endfor
+  call fugitive#reload_status()
+  return 'checktime'
+endfunction
+
+function! s:Wq(force,...) abort
+  let bang = a:force ? '!' : ''
+  if exists('b:fugitive_commit_arguments')
+    return 'wq'.bang
+  endif
+  let result = call(s:function('s:Write'),[a:force]+a:000)
+  if result =~# '^\%(write\|wq\|echoerr\)'
+    return s:sub(result,'^write','wq')
+  else
+    return result.'|quit'.bang
+  endif
+endfunction
+
+augroup fugitive_commit
+  autocmd!
+  autocmd VimLeavePre,BufDelete COMMIT_EDITMSG execute s:sub(s:FinishCommit(), '^echoerr (.*)', 'echohl ErrorMsg|echo \1|echohl NONE')
+augroup END
+
+" Section: Gpush, Gfetch
+
+call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gpush  execute s:Dispatch('<bang>', 'push '.<q-args>)")
+call s:command("-nargs=? -bang -complete=custom,s:RemoteComplete Gfetch execute s:Dispatch('<bang>', 'fetch '.<q-args>)")
+
+function! s:Dispatch(bang, args)
+  let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+  let cwd = getcwd()
+  let [mp, efm, cc] = [&l:mp, &l:efm, get(b:, 'current_compiler', '')]
+  try
+    let b:current_compiler = 'git'
+    let &l:errorformat = s:common_efm
+    let &l:makeprg = substitute(s:git_command() . ' ' . a:args, '\s\+$', '', '')
+    execute cd fnameescape(s:repo().tree())
+    if exists(':Make') == 2
+      noautocmd Make
+    else
+      silent noautocmd make!
+      redraw!
+      return 'call fugitive#cwindow()'
+    endif
+    return ''
+  finally
+    let [&l:mp, &l:efm, b:current_compiler] = [mp, efm, cc]
+    if empty(cc) | unlet! b:current_compiler | endif
+    execute cd fnameescape(cwd)
+  endtry
+endfunction
+
+" Section: Gdiff
+
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gdiff :execute s:Diff('',<bang>0,<f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gvdiff :execute s:Diff('keepalt vert ',<bang>0,<f-args>)")
+call s:command("-bang -bar -nargs=* -complete=customlist,s:EditComplete Gsdiff :execute s:Diff('keepalt ',<bang>0,<f-args>)")
+
+augroup fugitive_diff
+  autocmd!
+  autocmd BufWinLeave *
+        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 2 |
+        \   call s:diffoff_all(getbufvar(+expand('<abuf>'), 'git_dir')) |
+        \ endif
+  autocmd BufWinEnter *
+        \ if s:can_diffoff(+expand('<abuf>')) && s:diff_window_count() == 1 |
+        \   call s:diffoff() |
+        \ endif
+augroup END
+
+function! s:can_diffoff(buf) abort
+  return getwinvar(bufwinnr(a:buf), '&diff') &&
+        \ !empty(getbufvar(a:buf, 'git_dir')) &&
+        \ !empty(getwinvar(bufwinnr(a:buf), 'fugitive_diff_restore'))
+endfunction
+
+function! fugitive#can_diffoff(buf) abort
+  return s:can_diffoff(a:buf)
+endfunction
+
+function! s:diff_modifier(count) abort
+  let fdc = matchstr(&diffopt, 'foldcolumn:\zs\d\+')
+  if &diffopt =~# 'horizontal' && &diffopt !~# 'vertical'
+    return 'keepalt '
+  elseif &diffopt =~# 'vertical'
+    return 'keepalt vert '
+  elseif winwidth(0) <= a:count * ((&tw ? &tw : 80) + (empty(fdc) ? 2 : fdc))
+    return 'keepalt '
+  else
+    return 'keepalt vert '
+  endif
+endfunction
+
+function! s:diff_window_count() abort
+  let c = 0
+  for nr in range(1,winnr('$'))
+    let c += getwinvar(nr,'&diff')
+  endfor
+  return c
+endfunction
+
+function! s:diff_restore() abort
+  let restore = 'setlocal nodiff noscrollbind'
+        \ . ' scrollopt=' . &l:scrollopt
+        \ . (&l:wrap ? ' wrap' : ' nowrap')
+        \ . ' foldlevel=999'
+        \ . ' foldmethod=' . &l:foldmethod
+        \ . ' foldcolumn=' . &l:foldcolumn
+        \ . ' foldlevel=' . &l:foldlevel
+        \ . (&l:foldenable ? ' foldenable' : ' nofoldenable')
+  if has('cursorbind')
+    let restore .= (&l:cursorbind ? ' ' : ' no') . 'cursorbind'
+  endif
+  return restore
+endfunction
+
+function! s:diffthis() abort
+  if !&diff
+    let w:fugitive_diff_restore = s:diff_restore()
+    diffthis
+  endif
+endfunction
+
+function! s:diffoff() abort
+  if exists('w:fugitive_diff_restore')
+    execute w:fugitive_diff_restore
+    unlet w:fugitive_diff_restore
+  else
+    diffoff
+  endif
+endfunction
+
+function! s:diffoff_all(dir) abort
+  let curwin = winnr()
+  for nr in range(1,winnr('$'))
+    if getwinvar(nr,'&diff')
+      if nr != winnr()
+        execute nr.'wincmd w'
+        let restorewinnr = 1
+      endif
+      if exists('b:git_dir') && b:git_dir ==# a:dir
+        call s:diffoff()
+      endif
+    endif
+  endfor
+  execute curwin.'wincmd w'
+endfunction
+
+function! s:buffer_compare_age(commit) dict abort
+  let scores = {':0': 1, ':1': 2, ':2': 3, ':': 4, ':3': 5}
+  let my_score    = get(scores,':'.self.commit(),0)
+  let their_score = get(scores,':'.a:commit,0)
+  if my_score || their_score
+    return my_score < their_score ? -1 : my_score != their_score
+  elseif self.commit() ==# a:commit
+    return 0
+  endif
+  let base = self.repo().git_chomp('merge-base',self.commit(),a:commit)
+  if base ==# self.commit()
+    return -1
+  elseif base ==# a:commit
+    return 1
+  endif
+  let my_time    = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',self.commit())
+  let their_time = +self.repo().git_chomp('log','--max-count=1','--pretty=format:%at',a:commit)
+  return my_time < their_time ? -1 : my_time != their_time
+endfunction
+
+call s:add_methods('buffer',['compare_age'])
+
+function! s:Diff(vert,keepfocus,...) abort
+  let args = copy(a:000)
+  let post = ''
+  if get(args, 0) =~# '^+'
+    let post = remove(args, 0)[1:-1]
+  endif
+  let vert = empty(a:vert) ? s:diff_modifier(2) : a:vert
+  if exists(':DiffGitCached')
+    return 'DiffGitCached'
+  elseif (empty(args) || args[0] == ':') && s:buffer().commit() =~# '^[0-1]\=$' && s:repo().git_chomp_in_tree('ls-files', '--unmerged', '--', s:buffer().path()) !=# ''
+    let vert = empty(a:vert) ? s:diff_modifier(3) : a:vert
+    let nr = bufnr('')
+    execute 'leftabove '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':2')))
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
+    let nr2 = bufnr('')
+    call s:diffthis()
+    wincmd p
+    execute 'rightbelow '.vert.'split' s:fnameescape(fugitive#repo().translate(s:buffer().expand(':3')))
+    execute 'nnoremap <buffer> <silent> dp :diffput '.nr.'<Bar>diffupdate<CR>'
+    let nr3 = bufnr('')
+    call s:diffthis()
+    wincmd p
+    call s:diffthis()
+    execute 'nnoremap <buffer> <silent> d2o :diffget '.nr2.'<Bar>diffupdate<CR>'
+    execute 'nnoremap <buffer> <silent> d3o :diffget '.nr3.'<Bar>diffupdate<CR>'
+    return post
+  elseif len(args)
+    let arg = join(args, ' ')
+    if arg ==# ''
+      return post
+    elseif arg ==# '/'
+      let file = s:buffer().path('/')
+    elseif arg ==# ':'
+      let file = s:buffer().path(':0:')
+    elseif arg =~# '^:/.'
+      try
+        let file = s:repo().rev_parse(arg).s:buffer().path(':')
+      catch /^fugitive:/
+        return 'echoerr v:errmsg'
+      endtry
+    else
+      let file = s:buffer().expand(arg)
+    endif
+    if file !~# ':' && file !~# '^/' && s:repo().git_chomp('cat-file','-t',file) =~# '^\%(tag\|commit\)$'
+      let file = file.s:buffer().path(':')
+    endif
+  else
+    let file = s:buffer().path(s:buffer().commit() == '' ? ':0:' : '/')
+  endif
+  try
+    let spec = s:repo().translate(file)
+    let commit = matchstr(spec,'\C[^:/]//\zs\x\+')
+    let restore = s:diff_restore()
+    if exists('+cursorbind')
+      setlocal cursorbind
+    endif
+    let w:fugitive_diff_restore = restore
+    if s:buffer().compare_age(commit) < 0
+      execute 'rightbelow '.vert.'diffsplit '.s:fnameescape(spec)
+    else
+      execute 'leftabove '.vert.'diffsplit '.s:fnameescape(spec)
+    endif
+    let &l:readonly = &l:readonly
+    redraw
+    let w:fugitive_diff_restore = restore
+    let winnr = winnr()
+    if getwinvar('#', '&diff')
+      wincmd p
+      if !a:keepfocus
+        call feedkeys(winnr."\<C-W>w", 'n')
+      endif
+    endif
+    return post
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+" Section: Gmove, Gremove
+
+function! s:Move(force,destination) abort
+  if a:destination =~# '^/'
+    let destination = a:destination[1:-1]
+  else
+    let destination = s:shellslash(fnamemodify(s:sub(a:destination,'[%#]%(:\w)*','\=expand(submatch(0))'),':p'))
+    if destination[0:strlen(s:repo().tree())] ==# s:repo().tree('')
+      let destination = destination[strlen(s:repo().tree('')):-1]
+    endif
+  endif
+  if isdirectory(s:buffer().spec())
+    " Work around Vim parser idiosyncrasy
+    let discarded = s:buffer().setvar('&swapfile',0)
+  endif
+  let message = call(s:repo().git_chomp_in_tree,['mv']+(a:force ? ['-f'] : [])+['--', s:buffer().path(), destination], s:repo())
+  if v:shell_error
+    let v:errmsg = 'fugitive: '.message
+    return 'echoerr v:errmsg'
+  endif
+  let destination = s:repo().tree(destination)
+  if isdirectory(destination)
+    let destination = fnamemodify(s:sub(destination,'/$','').'/'.expand('%:t'),':.')
+  endif
+  call fugitive#reload_status()
+  if s:buffer().commit() == ''
+    if isdirectory(destination)
+      return 'keepalt edit '.s:fnameescape(destination)
+    else
+      return 'keepalt saveas! '.s:fnameescape(destination)
+    endif
+  else
+    return 'file '.s:fnameescape(s:repo().translate(':0:'.destination))
+  endif
+endfunction
+
+function! s:MoveComplete(A,L,P) abort
+  if a:A =~ '^/'
+    return s:repo().superglob(a:A)
+  else
+    let matches = split(glob(a:A.'*'),"\n")
+    call map(matches,'v:val !~ "/$" && isdirectory(v:val) ? v:val."/" : v:val')
+    return matches
+  endif
+endfunction
+
+function! s:Remove(after, force) abort
+  if s:buffer().commit() ==# ''
+    let cmd = ['rm']
+  elseif s:buffer().commit() ==# '0'
+    let cmd = ['rm','--cached']
+  else
+    let v:errmsg = 'fugitive: rm not supported here'
+    return 'echoerr v:errmsg'
+  endif
+  if a:force
+    let cmd += ['--force']
+  endif
+  let message = call(s:repo().git_chomp_in_tree,cmd+['--',s:buffer().path()],s:repo())
+  if v:shell_error
+    let v:errmsg = 'fugitive: '.s:sub(message,'error:.*\zs\n\(.*-f.*',' (add ! to force)')
+    return 'echoerr '.string(v:errmsg)
+  else
+    call fugitive#reload_status()
+    return a:after . (a:force ? '!' : '')
+  endif
+endfunction
+
+augroup fugitive_remove
+  autocmd!
+  autocmd User Fugitive if s:buffer().commit() =~# '^0\=$' |
+        \ exe "command! -buffer -bar -bang -nargs=1 -complete=customlist,s:MoveComplete Gmove :execute s:Move(<bang>0,<q-args>)" |
+        \ exe "command! -buffer -bar -bang Gremove :execute s:Remove('edit',<bang>0)" |
+        \ exe "command! -buffer -bar -bang Gdelete :execute s:Remove('bdelete',<bang>0)" |
+        \ endif
+augroup END
+
+" Section: Gblame
+
+augroup fugitive_blame
+  autocmd!
+  autocmd BufReadPost *.fugitiveblame setfiletype fugitiveblame
+  autocmd FileType fugitiveblame setlocal nomodeline | if exists('b:git_dir') | let &l:keywordprg = s:repo().keywordprg() | endif
+  autocmd Syntax fugitiveblame call s:BlameSyntax()
+  autocmd User Fugitive if s:buffer().type('file', 'blob') | exe "command! -buffer -bar -bang -range=0 -nargs=* Gblame :execute s:Blame(<bang>0,<line1>,<line2>,<count>,[<f-args>])" | endif
+  autocmd ColorScheme,GUIEnter * call s:RehighlightBlame()
+augroup END
+
+function! s:linechars(pattern) abort
+  let chars = strlen(s:gsub(matchstr(getline('.'), a:pattern), '.', '.'))
+  if exists('*synconcealed') && &conceallevel > 1
+    for col in range(1, chars)
+      let chars -= synconcealed(line('.'), col)[0]
+    endfor
+  endif
+  return chars
+endfunction
+
+function! s:Blame(bang,line1,line2,count,args) abort
+  if exists('b:fugitive_blamed_bufnr')
+    return 'bdelete'
+  endif
+  try
+    if s:buffer().path() == ''
+      call s:throw('file or blob required')
+    endif
+    if filter(copy(a:args),'v:val !~# "^\\%(--root\|--show-name\\|-\\=\\%([ltfnsew]\\|[MC]\\d*\\)\\+\\)$"') != []
+      call s:throw('unsupported option')
+    endif
+    call map(a:args,'s:sub(v:val,"^\\ze[^-]","-")')
+    let cmd = ['--no-pager', 'blame', '--show-number'] + a:args
+    if s:buffer().commit() =~# '\D\|..'
+      let cmd += [s:buffer().commit()]
+    else
+      let cmd += ['--contents', '-']
+    endif
+    let cmd += ['--', s:buffer().path()]
+    let basecmd = escape(call(s:repo().git_command,cmd,s:repo()),'!')
+    try
+      let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+      if !s:repo().bare()
+        let dir = getcwd()
+        execute cd s:fnameescape(s:repo().tree())
+      endif
+      if a:count
+        execute 'write !'.substitute(basecmd,' blame ',' blame -L '.a:line1.','.a:line2.' ','g')
+      else
+        let error = resolve(tempname())
+        let temp = error.'.fugitiveblame'
+        if &shell =~# 'csh'
+          silent! execute '%write !('.basecmd.' > '.temp.') >& '.error
+        else
+          silent! execute '%write !'.basecmd.' > '.temp.' 2> '.error
+        endif
+        if exists('l:dir')
+          execute cd s:fnameescape(dir)
+          unlet dir
+        endif
+        if v:shell_error
+          call s:throw(join(readfile(error),"\n"))
+        endif
+        for winnr in range(winnr('$'),1,-1)
+          call setwinvar(winnr, '&scrollbind', 0)
+          if exists('+cursorbind')
+            call setwinvar(winnr, '&cursorbind', 0)
+          endif
+          if getbufvar(winbufnr(winnr), 'fugitive_blamed_bufnr')
+            execute winbufnr(winnr).'bdelete'
+          endif
+        endfor
+        let bufnr = bufnr('')
+        let restore = 'call setwinvar(bufwinnr('.bufnr.'),"&scrollbind",0)'
+        if exists('+cursorbind')
+          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&cursorbind",0)'
+        endif
+        if &l:wrap
+          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&wrap",1)'
+        endif
+        if &l:foldenable
+          let restore .= '|call setwinvar(bufwinnr('.bufnr.'),"&foldenable",1)'
+        endif
+        setlocal scrollbind nowrap nofoldenable
+        if exists('+cursorbind')
+          setlocal cursorbind
+        endif
+        let top = line('w0') + &scrolloff
+        let current = line('.')
+        if has('win32')
+          let temp = fnamemodify(fnamemodify(temp, ':h'), ':p').fnamemodify(temp, ':t')
+        endif
+        let s:temp_files[s:cpath(temp)] = { 'dir': s:repo().dir(), 'args': cmd }
+        exe 'keepalt leftabove vsplit '.temp
+        let b:fugitive_blamed_bufnr = bufnr
+        let w:fugitive_leave = restore
+        let b:fugitive_blame_arguments = join(a:args,' ')
+        execute top
+        normal! zt
+        execute current
+        if exists('+cursorbind')
+          setlocal cursorbind
+        endif
+        setlocal nomodified nomodifiable nonumber scrollbind nowrap foldcolumn=0 nofoldenable winfixwidth filetype=fugitiveblame
+        if exists('+concealcursor')
+          setlocal concealcursor=nc conceallevel=2
+        endif
+        if exists('+relativenumber')
+          setlocal norelativenumber
+        endif
+        execute "vertical resize ".(s:linechars('.\{-\}\ze\s\+\d\+)')+1)
+        nnoremap <buffer> <silent> <F1> :help fugitive-:Gblame<CR>
+        nnoremap <buffer> <silent> g?   :help fugitive-:Gblame<CR>
+        nnoremap <buffer> <silent> q    :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete','^-1','','')<CR>
+        nnoremap <buffer> <silent> gq   :exe substitute(bufwinnr(b:fugitive_blamed_bufnr).' wincmd w<Bar>'.bufnr('').'bdelete<Bar>if expand("%:p") =~# "^fugitive:[\\/][\\/]"<Bar>Gedit<Bar>endif','^-1','','')<CR>
+        nnoremap <buffer> <silent> <CR> :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR>
+        nnoremap <buffer> <silent> -    :<C-U>exe <SID>BlameJump('')<CR>
+        nnoremap <buffer> <silent> P    :<C-U>exe <SID>BlameJump('^'.v:count1)<CR>
+        nnoremap <buffer> <silent> ~    :<C-U>exe <SID>BlameJump('~'.v:count1)<CR>
+        nnoremap <buffer> <silent> i    :<C-U>exe <SID>BlameCommit("exe 'norm q'<Bar>edit")<CR>
+        nnoremap <buffer> <silent> o    :<C-U>exe <SID>BlameCommit((&splitbelow ? "botright" : "topleft")." split")<CR>
+        nnoremap <buffer> <silent> O    :<C-U>exe <SID>BlameCommit("tabedit")<CR>
+        nnoremap <buffer> <silent> A    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze [0-9:/+-][0-9:/+ -]* \d\+)')+1+v:count)<CR>
+        nnoremap <buffer> <silent> C    :<C-u>exe "vertical resize ".(<SID>linechars('^\S\+')+1+v:count)<CR>
+        nnoremap <buffer> <silent> D    :<C-u>exe "vertical resize ".(<SID>linechars('.\{-\}\ze\d\ze\s\+\d\+)')+1-v:count)<CR>
+        redraw
+        syncbind
+      endif
+    finally
+      if exists('l:dir')
+        execute cd s:fnameescape(dir)
+      endif
+    endtry
+    return ''
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:BlameCommit(cmd) abort
+  let cmd = s:Edit(a:cmd, 0, matchstr(getline('.'),'\x\+'))
+  if cmd =~# '^echoerr'
+    return cmd
+  endif
+  let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]')
+  let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
+  if path ==# ''
+    let path = s:buffer(b:fugitive_blamed_bufnr).path()
+  endif
+  execute cmd
+  if search('^diff .* b/\M'.escape(path,'\').'$','W')
+    call search('^+++')
+    let head = line('.')
+    while search('^@@ \|^diff ') && getline('.') =~# '^@@ '
+      let top = +matchstr(getline('.'),' +\zs\d\+')
+      let len = +matchstr(getline('.'),' +\d\+,\zs\d\+')
+      if lnum >= top && lnum <= top + len
+        let offset = lnum - top
+        if &scrolloff
+          +
+          normal! zt
+        else
+          normal! zt
+          +
+        endif
+        while offset > 0 && line('.') < line('$')
+          +
+          if getline('.') =~# '^[ +]'
+            let offset -= 1
+          endif
+        endwhile
+        return 'normal! zv'
+      endif
+    endwhile
+    execute head
+    normal! zt
+  endif
+  return ''
+endfunction
+
+function! s:BlameJump(suffix) abort
+  let commit = matchstr(getline('.'),'^\^\=\zs\x\+')
+  if commit =~# '^0\+$'
+    let commit = ':0'
+  endif
+  let lnum = matchstr(getline('.'),' \zs\d\+\ze\s\+[([:digit:]]')
+  let path = matchstr(getline('.'),'^\^\=\x\+\s\+\zs.\{-\}\ze\s*\d\+ ')
+  if path ==# ''
+    let path = s:buffer(b:fugitive_blamed_bufnr).path()
+  endif
+  let args = b:fugitive_blame_arguments
+  let offset = line('.') - line('w0')
+  let bufnr = bufnr('%')
+  let winnr = bufwinnr(b:fugitive_blamed_bufnr)
+  if winnr > 0
+    exe winnr.'wincmd w'
+  endif
+  execute s:Edit('edit', 0, commit.a:suffix.':'.path)
+  execute lnum
+  if winnr > 0
+    exe bufnr.'bdelete'
+  endif
+  if exists(':Gblame')
+    execute 'Gblame '.args
+    execute lnum
+    let delta = line('.') - line('w0') - offset
+    if delta > 0
+      execute 'normal! '.delta."\<C-E>"
+    elseif delta < 0
+      execute 'normal! '.(-delta)."\<C-Y>"
+    endif
+    syncbind
+  endif
+  return ''
+endfunction
+
+let s:hash_colors = {}
+
+function! s:BlameSyntax() abort
+  let b:current_syntax = 'fugitiveblame'
+  let conceal = has('conceal') ? ' conceal' : ''
+  let arg = exists('b:fugitive_blame_arguments') ? b:fugitive_blame_arguments : ''
+  syn match FugitiveblameBoundary "^\^"
+  syn match FugitiveblameBlank                      "^\s\+\s\@=" nextgroup=FugitiveblameAnnotation,fugitiveblameOriginalFile,FugitiveblameOriginalLineNumber skipwhite
+  syn match FugitiveblameHash       "\%(^\^\=\)\@<=\<\x\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite
+  syn match FugitiveblameUncommitted "\%(^\^\=\)\@<=\<0\{7,40\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite
+  syn region FugitiveblameAnnotation matchgroup=FugitiveblameDelimiter start="(" end="\%( \d\+\)\@<=)" contained keepend oneline
+  syn match FugitiveblameTime "[0-9:/+-][0-9:/+ -]*[0-9:/+-]\%( \+\d\+)\)\@=" contained containedin=FugitiveblameAnnotation
+  exec 'syn match FugitiveblameLineNumber         " *\d\+)\@=" contained containedin=FugitiveblameAnnotation'.conceal
+  exec 'syn match FugitiveblameOriginalFile       " \%(\f\+\D\@<=\|\D\@=\f\+\)\%(\%(\s\+\d\+\)\=\s\%((\|\s*\d\+)\)\)\@=" contained nextgroup=FugitiveblameOriginalLineNumber,FugitiveblameAnnotation skipwhite'.(arg =~# 'f' ? '' : conceal)
+  exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s(\)\@=" contained nextgroup=FugitiveblameAnnotation skipwhite'.(arg =~# 'n' ? '' : conceal)
+  exec 'syn match FugitiveblameOriginalLineNumber " *\d\+\%(\s\+\d\+)\)\@=" contained nextgroup=FugitiveblameShort skipwhite'.(arg =~# 'n' ? '' : conceal)
+  syn match FugitiveblameShort              " \d\+)" contained contains=FugitiveblameLineNumber
+  syn match FugitiveblameNotCommittedYet "(\@<=Not Committed Yet\>" contained containedin=FugitiveblameAnnotation
+  hi def link FugitiveblameBoundary           Keyword
+  hi def link FugitiveblameHash               Identifier
+  hi def link FugitiveblameUncommitted        Ignore
+  hi def link FugitiveblameTime               PreProc
+  hi def link FugitiveblameLineNumber         Number
+  hi def link FugitiveblameOriginalFile       String
+  hi def link FugitiveblameOriginalLineNumber Float
+  hi def link FugitiveblameShort              FugitiveblameDelimiter
+  hi def link FugitiveblameDelimiter          Delimiter
+  hi def link FugitiveblameNotCommittedYet    Comment
+  let seen = {}
+  for lnum in range(1, line('$'))
+    let hash = matchstr(getline(lnum), '^\^\=\zs\x\{6\}')
+    if hash ==# '' || hash ==# '000000' || has_key(seen, hash)
+      continue
+    endif
+    let seen[hash] = 1
+    if &t_Co > 16 && get(g:, 'CSApprox_loaded') && !empty(findfile('autoload/csapprox/per_component.vim', escape(&rtp, ' ')))
+          \ && empty(get(s:hash_colors, hash))
+      let [s, r, g, b; __] = map(matchlist(hash, '\(\x\x\)\(\x\x\)\(\x\x\)'), 'str2nr(v:val,16)')
+      let color = csapprox#per_component#Approximate(r, g, b)
+      if color == 16 && &background ==# 'dark'
+        let color = 8
+      endif
+      let s:hash_colors[hash] = ' ctermfg='.color
+    else
+      let s:hash_colors[hash] = ''
+    endif
+    exe 'syn match FugitiveblameHash'.hash.'       "\%(^\^\=\)\@<='.hash.'\x\{1,34\}\>" nextgroup=FugitiveblameAnnotation,FugitiveblameOriginalLineNumber,fugitiveblameOriginalFile skipwhite'
+  endfor
+  call s:RehighlightBlame()
+endfunction
+
+function! s:RehighlightBlame() abort
+  for [hash, cterm] in items(s:hash_colors)
+    if !empty(cterm) || has('gui_running') || has('termguicolors') && &termguicolors
+      exe 'hi FugitiveblameHash'.hash.' guifg=#'.hash.get(s:hash_colors, hash, '')
+    else
+      exe 'hi link FugitiveblameHash'.hash.' Identifier'
+    endif
+  endfor
+endfunction
+
+" Section: Gbrowse
+
+call s:command("-bar -bang -range=0 -nargs=* -complete=customlist,s:EditComplete Gbrowse :execute s:Browse(<bang>0,<line1>,<count>,<f-args>)")
+
+let s:redirects = {}
+
+function! s:Browse(bang,line1,count,...) abort
+  try
+    let validremote = '\.\|\.\=/.*\|[[:alnum:]_-]\+\%(://.\{-\}\)\='
+    if a:0
+      let remote = matchstr(join(a:000, ' '),'@\zs\%('.validremote.'\)$')
+      let rev = substitute(join(a:000, ' '),'@\%('.validremote.'\)$','','')
+    else
+      let remote = ''
+      let rev = ''
+    endif
+    if rev ==# ''
+      let expanded = s:buffer().rev()
+    elseif rev ==# ':'
+      let expanded = s:buffer().path('/')
+    else
+      let expanded = s:buffer().expand(rev)
+    endif
+    let full = s:repo().translate(expanded)
+    let commit = ''
+    if full =~# '^fugitive://'
+      let commit = matchstr(full,'://.*//\zs\w\w\+')
+      let path = matchstr(full,'://.*//\w\+\zs/.*')
+      if commit =~ '..'
+        let type = s:repo().git_chomp('cat-file','-t',commit.s:sub(path,'^/',':'))
+        let branch = matchstr(expanded, '^[^:]*')
+      else
+        let type = 'blob'
+      endif
+      let path = path[1:-1]
+    elseif s:repo().bare()
+      let path = '.git/' . full[strlen(s:repo().dir())+1:-1]
+      let type = ''
+    else
+      let path = full[strlen(s:repo().tree())+1:-1]
+      if path =~# '^\.git/'
+        let type = ''
+      elseif isdirectory(full)
+        let type = 'tree'
+      else
+        let type = 'blob'
+      endif
+    endif
+    if type ==# 'tree' && !empty(path)
+      let path = s:sub(path, '/\=$', '/')
+    endif
+    if path =~# '^\.git/.*HEAD' && filereadable(s:repo().dir(path[5:-1]))
+      let body = readfile(s:repo().dir(path[5:-1]))[0]
+      if body =~# '^\x\{40\}$'
+        let commit = body
+        let type = 'commit'
+        let path = ''
+      elseif body =~# '^ref: refs/'
+        let path = '.git/' . matchstr(body,'ref: \zs.*')
+      endif
+    endif
+
+    let merge = ''
+    if path =~# '^\.git/refs/remotes/.'
+      if empty(remote)
+        let remote = matchstr(path, '^\.git/refs/remotes/\zs[^/]\+')
+        let branch = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+      else
+        let merge = matchstr(path, '^\.git/refs/remotes/[^/]\+/\zs.\+')
+        let path = '.git/refs/heads/'.merge
+      endif
+    elseif path =~# '^\.git/refs/heads/.'
+      let branch = path[16:-1]
+    elseif !exists('branch')
+      let branch = s:repo().head()
+    endif
+    if !empty(branch)
+      let r = s:repo().git_chomp('config','branch.'.branch.'.remote')
+      let m = s:repo().git_chomp('config','branch.'.branch.'.merge')[11:-1]
+      if r ==# '.' && !empty(m)
+        let r2 = s:repo().git_chomp('config','branch.'.m.'.remote')
+        if r2 !~# '^\.\=$'
+          let r = r2
+          let m = s:repo().git_chomp('config','branch.'.m.'.merge')[11:-1]
+        endif
+      endif
+      if empty(remote)
+        let remote = r
+      endif
+      if r ==# '.' || r ==# remote
+        let merge = m
+        if path =~# '^\.git/refs/heads/.'
+          let path = '.git/refs/heads/'.merge
+        endif
+      endif
+    endif
+
+    if empty(commit) && path !~# '^\.git/'
+      if a:line1 && !a:count && !empty(merge)
+        let commit = merge
+      else
+        let commit = s:repo().rev_parse('HEAD')
+      endif
+    endif
+
+    if empty(remote)
+      let remote = '.'
+      let remote_for_url = 'origin'
+    else
+      let remote_for_url = remote
+    endif
+    if fugitive#git_version() =~# '^[01]\.\|^2\.[0-6]\.'
+      let raw = s:repo().git_chomp('config','remote.'.remote_for_url.'.url')
+    else
+      let raw = s:repo().git_chomp('remote','get-url',remote_for_url)
+    endif
+    if raw ==# ''
+      let raw = remote
+    endif
+
+    if raw =~# '^https\=://' && s:executable('curl')
+      if !has_key(s:redirects, raw)
+        let s:redirects[raw] = matchstr(system('curl -I ' .
+              \ s:shellesc(raw . '/info/refs?service=git-upload-pack')),
+              \ 'Location: \zs\S\+\ze/info/refs?')
+      endif
+      if len(s:redirects[raw])
+        let raw = s:redirects[raw]
+      endif
+    endif
+
+    for Handler in g:fugitive_browse_handlers
+      let url = call(Handler, [{
+            \ 'repo': s:repo(),
+            \ 'remote': raw,
+            \ 'revision': 'No longer provided',
+            \ 'commit': commit,
+            \ 'path': path,
+            \ 'type': type,
+            \ 'line1': a:count > 0 ? a:line1 : 0,
+            \ 'line2': a:count > 0 ? a:count : 0}])
+      if !empty(url)
+        break
+      endif
+    endfor
+
+    if empty(url) && raw ==# '.'
+      call s:throw("Instaweb failed to start")
+    elseif empty(url)
+      call s:throw("'".remote."' is not a supported remote")
+    endif
+
+    let url = s:gsub(url, '[ <>]', '\="%".printf("%02X",char2nr(submatch(0)))')
+    if a:bang
+      if has('clipboard')
+        let @+ = url
+      endif
+      return 'echomsg '.string(url)
+    elseif exists(':Browse') == 2
+      return 'echomsg '.string(url).'|Browse '.url
+    else
+      if !exists('g:loaded_netrw')
+        runtime! autoload/netrw.vim
+      endif
+      if exists('*netrw#BrowseX')
+        return 'echomsg '.string(url).'|call netrw#BrowseX('.string(url).', 0)'
+      else
+        return 'echomsg '.string(url).'|call netrw#NetrwBrowseX('.string(url).', 0)'
+      endif
+    endif
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:github_url(opts, ...) abort
+  if a:0 || type(a:opts) != type({})
+    return ''
+  endif
+  let domain_pattern = 'github\.com'
+  let domains = exists('g:fugitive_github_domains') ? g:fugitive_github_domains : []
+  for domain in domains
+    let domain_pattern .= '\|' . escape(split(domain, '://')[-1], '.')
+  endfor
+  let repo = matchstr(get(a:opts, 'remote'), '^\%(https\=://\|git://\|git@\)\=\zs\('.domain_pattern.'\)[/:].\{-\}\ze\%(\.git\)\=$')
+  if repo ==# ''
+    return ''
+  endif
+  call s:warn('Install rhubarb.vim for GitHub support')
+  return 'https://github.com/tpope/vim-rhubarb'
+endfunction
+
+function! s:instaweb_url(opts) abort
+  if a:opts.remote !=# '.'
+    return ''
+  endif
+  let output = a:opts.repo.git_chomp('instaweb','-b','unknown')
+  if output =~# 'http://'
+    let root = matchstr(output,'http://.*').'/?p='.fnamemodify(a:opts.repo.dir(),':t')
+  else
+    return ''
+  endif
+  if a:opts.path =~# '^\.git/refs/.'
+    return root . ';a=shortlog;h=' . matchstr(a:opts.path,'^\.git/\zs.*')
+  elseif a:opts.path =~# '^\.git\>'
+    return root
+  endif
+  let url = root
+  if a:opts.commit =~# '^\x\{40\}$'
+    if a:opts.type ==# 'commit'
+      let url .= ';a=commit'
+    endif
+    let url .= ';h=' . a:opts.repo.rev_parse(a:opts.commit . (a:opts.path == '' ? '' : ':' . a:opts.path))
+  else
+    if a:opts.type ==# 'blob' && empty(a:opts.commit)
+      let url .= ';h='.a:opts.repo.git_chomp('hash-object', '-w', a:opts.path)
+    else
+      try
+        let url .= ';h=' . a:opts.repo.rev_parse((a:opts.commit == '' ? 'HEAD' : ':' . a:opts.commit) . ':' . a:opts.path)
+      catch /^fugitive:/
+        call s:throw('fugitive: cannot browse uncommitted file')
+      endtry
+    endif
+    let root .= ';hb=' . matchstr(a:opts.repo.head_ref(),'[^ ]\+$')
+  endif
+  if a:opts.path !=# ''
+    let url .= ';f=' . a:opts.path
+  endif
+  if get(a:opts, 'line1')
+    let url .= '#l' . a:opts.line1
+  endif
+  return url
+endfunction
+
+if !exists('g:fugitive_browse_handlers')
+  let g:fugitive_browse_handlers = []
+endif
+
+call extend(g:fugitive_browse_handlers,
+      \ [s:function('s:github_url'), s:function('s:instaweb_url')])
+
+" Section: File access
+
+function! s:ReplaceCmd(cmd,...) abort
+  let fn = expand('%:p')
+  let tmp = tempname()
+  let prefix = ''
+  try
+    if a:0 && a:1 != ''
+      if s:winshell()
+        let old_index = $GIT_INDEX_FILE
+        let $GIT_INDEX_FILE = a:1
+      else
+        let prefix = 'env GIT_INDEX_FILE='.s:shellesc(a:1).' '
+      endif
+    endif
+    let redir = ' > '.tmp
+    if &shellpipe =~ '2>&1'
+      let redir .= ' 2>&1'
+    endif
+    if s:winshell()
+      let cmd_escape_char = &shellxquote == '(' ?  '^' : '^^^'
+      call system('cmd /c "'.prefix.s:gsub(a:cmd,'[<>]', cmd_escape_char.'&').redir.'"')
+    elseif &shell =~# 'fish'
+      call system(' begin;'.prefix.a:cmd.redir.';end ')
+    else
+      call system(' ('.prefix.a:cmd.redir.') ')
+    endif
+  finally
+    if exists('old_index')
+      let $GIT_INDEX_FILE = old_index
+    endif
+  endtry
+  silent exe 'keepalt file '.tmp
+  try
+    silent edit!
+  finally
+    try
+      silent exe 'keepalt file '.s:fnameescape(fn)
+    catch /^Vim\%((\a\+)\)\=:E302/
+    endtry
+    call delete(tmp)
+    if fnamemodify(bufname('$'), ':p') ==# tmp
+      silent execute 'bwipeout '.bufnr('$')
+    endif
+    silent exe 'doau BufReadPost '.s:fnameescape(fn)
+  endtry
+endfunction
+
+function! s:BufReadIndex() abort
+  if !exists('b:fugitive_display_format')
+    let b:fugitive_display_format = filereadable(expand('%').'.lock')
+  endif
+  let b:fugitive_display_format = b:fugitive_display_format % 2
+  let b:fugitive_type = 'index'
+  try
+    let b:git_dir = s:repo().dir()
+    setlocal noro ma nomodeline
+    if fnamemodify($GIT_INDEX_FILE !=# '' ? $GIT_INDEX_FILE : b:git_dir . '/index', ':p') ==# expand('%:p')
+      let index = ''
+    else
+      let index = expand('%:p')
+    endif
+    if b:fugitive_display_format
+      call s:ReplaceCmd(s:repo().git_command('ls-files','--stage'),index)
+      set ft=git nospell
+    else
+      let cd = exists('*haslocaldir') && haslocaldir() ? 'lcd' : 'cd'
+      let dir = getcwd()
+      if fugitive#git_version() =~# '^0\|^1\.[1-7]\.'
+        let cmd = s:repo().git_command('status')
+      else
+        let cmd = s:repo().git_command(
+              \ '-c', 'status.displayCommentPrefix=true',
+              \ '-c', 'color.status=false',
+              \ '-c', 'status.short=false',
+              \ 'status')
+      endif
+      try
+        execute cd s:fnameescape(s:repo().tree())
+        call s:ReplaceCmd(cmd, index)
+      finally
+        execute cd s:fnameescape(dir)
+      endtry
+      set ft=gitcommit
+      set foldtext=fugitive#foldtext()
+    endif
+    setlocal ro noma nomod noswapfile
+    if &bufhidden ==# ''
+      setlocal bufhidden=delete
+    endif
+    call s:JumpInit()
+    nunmap   <buffer>          P
+    nunmap   <buffer>          ~
+    nnoremap <buffer> <silent> <C-N> :<C-U>execute <SID>StageNext(v:count1)<CR>
+    nnoremap <buffer> <silent> <C-P> :<C-U>execute <SID>StagePrevious(v:count1)<CR>
+    nnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line('.'),line('.')+v:count1-1)<CR>
+    xnoremap <buffer> <silent> - :<C-U>silent execute <SID>StageToggle(line("'<"),line("'>"))<CR>
+    nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += 1<Bar>exe <SID>BufReadIndex()<CR>
+    nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= 1<Bar>exe <SID>BufReadIndex()<CR>
+    nnoremap <buffer> <silent> C :<C-U>Gcommit<CR>
+    nnoremap <buffer> <silent> cA :<C-U>Gcommit --amend --reuse-message=HEAD<CR>
+    nnoremap <buffer> <silent> ca :<C-U>Gcommit --amend<CR>
+    nnoremap <buffer> <silent> cc :<C-U>Gcommit<CR>
+    nnoremap <buffer> <silent> cva :<C-U>Gcommit --amend --verbose<CR>
+    nnoremap <buffer> <silent> cvc :<C-U>Gcommit --verbose<CR>
+    nnoremap <buffer> <silent> D :<C-U>execute <SID>StageDiff('Gdiff')<CR>
+    nnoremap <buffer> <silent> dd :<C-U>execute <SID>StageDiff('Gdiff')<CR>
+    nnoremap <buffer> <silent> dh :<C-U>execute <SID>StageDiff('Gsdiff')<CR>
+    nnoremap <buffer> <silent> ds :<C-U>execute <SID>StageDiff('Gsdiff')<CR>
+    nnoremap <buffer> <silent> dp :<C-U>execute <SID>StageDiffEdit()<CR>
+    nnoremap <buffer> <silent> dv :<C-U>execute <SID>StageDiff('Gvdiff')<CR>
+    nnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>
+    xnoremap <buffer> <silent> p :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
+    nnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line('.'),line('.')+v:count1-1)<CR>
+    xnoremap <buffer> <silent> P :<C-U>execute <SID>StagePatch(line("'<"),line("'>"))<CR>
+    nnoremap <buffer> <silent> q :<C-U>if bufnr('$') == 1<Bar>quit<Bar>else<Bar>bdelete<Bar>endif<CR>
+    nnoremap <buffer> <silent> r :<C-U>edit<CR>
+    nnoremap <buffer> <silent> R :<C-U>edit<CR>
+    nnoremap <buffer> <silent> U :<C-U>execute <SID>StageUndo()<CR>
+    nnoremap <buffer> <silent> g?   :help fugitive-:Gstatus<CR>
+    nnoremap <buffer> <silent> <F1> :help fugitive-:Gstatus<CR>
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:FileRead() abort
+  try
+    let repo = s:repo(fugitive#extract_git_dir(expand('<amatch>')))
+    let path = s:sub(s:sub(matchstr(expand('<amatch>'),'fugitive://.\{-\}//\zs.*'),'/',':'),'^\d:',':&')
+    let hash = repo.rev_parse(path)
+    if path =~ '^:'
+      let type = 'blob'
+    else
+      let type = repo.git_chomp('cat-file','-t',hash)
+    endif
+    " TODO: use count, if possible
+    return "read !".escape(repo.git_command('cat-file',type,hash),'%#\')
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:BufReadIndexFile() abort
+  try
+    let b:fugitive_type = 'blob'
+    let b:git_dir = s:repo().dir()
+    try
+      call s:ReplaceCmd(s:repo().git_command('cat-file','blob',s:buffer().sha1()))
+    finally
+      if &bufhidden ==# ''
+        setlocal bufhidden=delete
+      endif
+      setlocal noswapfile
+    endtry
+    return ''
+  catch /^fugitive: rev-parse/
+    silent exe 'doau BufNewFile '.s:fnameescape(expand('%:p'))
+    return ''
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+function! s:BufWriteIndexFile() abort
+  let tmp = tempname()
+  try
+    let path = matchstr(expand('<amatch>'),'//\d/\zs.*')
+    let stage = matchstr(expand('<amatch>'),'//\zs\d')
+    silent execute 'write !'.s:repo().git_command('hash-object','-w','--stdin').' > '.tmp
+    let sha1 = readfile(tmp)[0]
+    let old_mode = matchstr(s:repo().git_chomp('ls-files','--stage',path),'^\d\+')
+    if old_mode == ''
+      let old_mode = executable(s:repo().tree(path)) ? '100755' : '100644'
+    endif
+    let info = old_mode.' '.sha1.' '.stage."\t".path
+    call writefile([info],tmp)
+    if s:winshell()
+      let error = system('type '.s:gsub(tmp,'/','\\').'|'.s:repo().git_command('update-index','--index-info'))
+    else
+      let error = system(s:repo().git_command('update-index','--index-info').' < '.tmp)
+    endif
+    if v:shell_error == 0
+      setlocal nomodified
+      if exists('#BufWritePost')
+        execute 'doautocmd BufWritePost '.s:fnameescape(expand('%:p'))
+      endif
+      call fugitive#reload_status()
+      return ''
+    else
+      return 'echoerr '.string('fugitive: '.error)
+    endif
+  finally
+    call delete(tmp)
+  endtry
+endfunction
+
+function! s:BufReadObject() abort
+  try
+    setlocal noro ma
+    let b:git_dir = s:repo().dir()
+    let hash = s:buffer().sha1()
+    if !exists("b:fugitive_type")
+      let b:fugitive_type = s:repo().git_chomp('cat-file','-t',hash)
+    endif
+    if b:fugitive_type !~# '^\%(tag\|commit\|tree\|blob\)$'
+      return "echoerr ".string("fugitive: unrecognized git type '".b:fugitive_type."'")
+    endif
+    let firstline = getline('.')
+    if !exists('b:fugitive_display_format') && b:fugitive_type != 'blob'
+      let b:fugitive_display_format = +getbufvar('#','fugitive_display_format')
+    endif
+
+    if b:fugitive_type !=# 'blob'
+      setlocal nomodeline
+    endif
+
+    let pos = getpos('.')
+    silent keepjumps %delete_
+    setlocal endofline
+
+    try
+      if b:fugitive_type ==# 'tree'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd(s:repo().git_command('ls-tree',hash))
+        else
+          call s:ReplaceCmd(s:repo().git_command('show','--no-color',hash))
+        endif
+      elseif b:fugitive_type ==# 'tag'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
+        else
+          call s:ReplaceCmd(s:repo().git_command('cat-file','-p',hash))
+        endif
+      elseif b:fugitive_type ==# 'commit'
+        let b:fugitive_display_format = b:fugitive_display_format % 2
+        if b:fugitive_display_format
+          call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
+        else
+          call s:ReplaceCmd(s:repo().git_command('show','--no-color','--pretty=format:tree%x20%T%nparent%x20%P%nauthor%x20%an%x20<%ae>%x20%ad%ncommitter%x20%cn%x20<%ce>%x20%cd%nencoding%x20%e%n%n%s%n%n%b',hash))
+          keepjumps call search('^parent ')
+          if getline('.') ==# 'parent '
+            silent keepjumps delete_
+          else
+            silent keepjumps s/\%(^parent\)\@<! /\rparent /ge
+          endif
+          keepjumps let lnum = search('^encoding \%(<unknown>\)\=$','W',line('.')+3)
+          if lnum
+            silent keepjumps delete_
+          end
+          keepjumps 1
+        endif
+      elseif b:fugitive_type ==# 'blob'
+        call s:ReplaceCmd(s:repo().git_command('cat-file',b:fugitive_type,hash))
+        setlocal nomodeline
+      endif
+    finally
+      keepjumps call setpos('.',pos)
+      setlocal ro noma nomod noswapfile
+      if &bufhidden ==# ''
+        setlocal bufhidden=delete
+      endif
+      if b:fugitive_type !=# 'blob'
+        setlocal filetype=git foldmethod=syntax
+        nnoremap <buffer> <silent> a :<C-U>let b:fugitive_display_format += v:count1<Bar>exe <SID>BufReadObject()<CR>
+        nnoremap <buffer> <silent> i :<C-U>let b:fugitive_display_format -= v:count1<Bar>exe <SID>BufReadObject()<CR>
+      else
+        call s:JumpInit()
+      endif
+    endtry
+
+    return ''
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+endfunction
+
+augroup fugitive_files
+  autocmd!
+  autocmd BufReadCmd  index{,.lock}
+        \ if fugitive#is_git_dir(expand('<amatch>:p:h')) |
+        \   exe s:BufReadIndex() |
+        \ elseif filereadable(expand('<amatch>')) |
+        \   read <amatch> |
+        \   1delete |
+        \ endif
+  autocmd FileReadCmd fugitive://**//[0-3]/**          exe s:FileRead()
+  autocmd BufReadCmd  fugitive://**//[0-3]/**          exe s:BufReadIndexFile()
+  autocmd BufWriteCmd fugitive://**//[0-3]/**          exe s:BufWriteIndexFile()
+  autocmd BufReadCmd  fugitive://**//[0-9a-f][0-9a-f]* exe s:BufReadObject()
+  autocmd FileReadCmd fugitive://**//[0-9a-f][0-9a-f]* exe s:FileRead()
+  autocmd FileType git
+        \ if exists('b:git_dir') |
+        \  call s:JumpInit() |
+        \ endif
+  autocmd FileType git,gitcommit,gitrebase
+        \ if exists('b:git_dir') |
+        \   call s:GFInit() |
+        \ endif
+augroup END
+
+" Section: Temp files
+
+if !exists('s:temp_files')
+  let s:temp_files = {}
+endif
+
+augroup fugitive_temp
+  autocmd!
+  autocmd BufNewFile,BufReadPost *
+        \ if has_key(s:temp_files,s:cpath(expand('<afile>:p'))) |
+        \   let b:git_dir = s:temp_files[s:cpath(expand('<afile>:p'))].dir |
+        \   let b:git_type = 'temp' |
+        \   let b:git_args = s:temp_files[s:cpath(expand('<afile>:p'))].args |
+        \   call fugitive#detect(expand('<afile>:p')) |
+        \   setlocal bufhidden=delete nobuflisted |
+        \   nnoremap <buffer> <silent> q    :<C-U>bdelete<CR>|
+        \ endif
+augroup END
+
+" Section: Go to file
+
+nnoremap <SID>: :<C-U><C-R>=v:count ? v:count : ''<CR>
+function! s:GFInit(...) abort
+  cnoremap <buffer> <expr> <Plug><cfile> fugitive#cfile()
+  if !exists('g:fugitive_no_maps') && empty(mapcheck('gf', 'n'))
+    nmap <buffer> <silent> gf          <SID>:find <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W>f     <SID>:sfind <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W><C-F> <SID>:sfind <Plug><cfile><CR>
+    nmap <buffer> <silent> <C-W>gf  <SID>:tabfind <Plug><cfile><CR>
+  endif
+endfunction
+
+function! s:JumpInit(...) abort
+  nnoremap <buffer> <silent> <CR>    :<C-U>exe <SID>GF("edit")<CR>
+  if !&modifiable
+    nnoremap <buffer> <silent> o     :<C-U>exe <SID>GF("split")<CR>
+    nnoremap <buffer> <silent> S     :<C-U>exe <SID>GF("vsplit")<CR>
+    nnoremap <buffer> <silent> O     :<C-U>exe <SID>GF("tabedit")<CR>
+    nnoremap <buffer> <silent> -     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().up(v:count1))<Bar> if fugitive#buffer().type('tree')<Bar>call search('^'.escape(expand('#:t'),'.*[]~\').'/\=$','wc')<Bar>endif<CR>
+    nnoremap <buffer> <silent> P     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().commit().'^'.v:count1.<SID>buffer().path(':'))<CR>
+    nnoremap <buffer> <silent> ~     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().commit().'~'.v:count1.<SID>buffer().path(':'))<CR>
+    nnoremap <buffer> <silent> C     :<C-U>exe <SID>Edit('edit',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer> <silent> cc    :<C-U>exe <SID>Edit('edit',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer> <silent> co    :<C-U>exe <SID>Edit('split',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer> <silent> cS    :<C-U>exe <SID>Edit('vsplit',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer> <silent> cO    :<C-U>exe <SID>Edit('tabedit',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer> <silent> cP    :<C-U>exe <SID>Edit('pedit',0,<SID>buffer().containing_commit())<CR>
+    nnoremap <buffer>          .     : <C-R>=fnameescape(<SID>recall())<CR><Home>
+  endif
+endfunction
+
+function! s:cfile() abort
+  try
+    let buffer = s:buffer()
+    let myhash = buffer.sha1()
+    if myhash ==# '' && getline(1) =~# '^\%(commit\|tag\) \w'
+      let myhash = matchstr(getline(1),'^\w\+ \zs\S\+')
+    endif
+
+    if buffer.type('tree')
+      let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
+      if showtree && line('.') > 2
+        return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(getline('.'),'/$','')]
+      elseif getline('.') =~# '^\d\{6\} \l\{3,8\} \x\{40\}\t'
+        return [buffer.commit().':'.s:buffer().path().(buffer.path() =~# '^$\|/$' ? '' : '/').s:sub(matchstr(getline('.'),'\t\zs.*'),'/$','')]
+      endif
+
+    elseif buffer.type('blob')
+      let ref = expand("<cfile>")
+      try
+        let sha1 = buffer.repo().rev_parse(ref)
+      catch /^fugitive:/
+      endtry
+      if exists('sha1')
+        return [ref]
+      endif
+
+    else
+
+      let dcmds = []
+
+      " Index
+      if getline('.') =~# '^\d\{6\} \x\{40\} \d\t'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        let file = ':'.s:sub(matchstr(getline('.'),'\d\t.*'),'\t',':')
+        return [file]
+
+      elseif getline('.') =~# '^#\trenamed:.* -> '
+        let file = '/'.matchstr(getline('.'),' -> \zs.*')
+        return [file]
+      elseif getline('.') =~# '^#\t\(\k\| \)\+\p\?: *.'
+        let file = '/'.matchstr(getline('.'),': *\zs.\{-\}\ze\%( ([^()[:digit:]]\+)\)\=$')
+        return [file]
+      elseif getline('.') =~# '^#\t.'
+        let file = '/'.matchstr(getline('.'),'#\t\zs.*')
+        return [file]
+      elseif getline('.') =~# ': needs merge$'
+        let file = '/'.matchstr(getline('.'),'.*\ze: needs merge$')
+        return [file, 'Gdiff!']
+
+      elseif getline('.') ==# '# Not currently on any branch.'
+        return ['HEAD']
+      elseif getline('.') =~# '^# On branch '
+        let file = 'refs/heads/'.getline('.')[12:]
+        return [file]
+      elseif getline('.') =~# "^# Your branch .*'"
+        let file = matchstr(getline('.'),"'\\zs\\S\\+\\ze'")
+        return [file]
+      endif
+
+      let showtree = (getline(1) =~# '^tree ' && getline(2) == "")
+
+      if getline('.') =~# '^ref: '
+        let ref = strpart(getline('.'),5)
+
+      elseif getline('.') =~# '^commit \x\{40\}\>'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        return [ref]
+
+      elseif getline('.') =~# '^parent \x\{40\}\>'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        let line = line('.')
+        let parent = 0
+        while getline(line) =~# '^parent '
+          let parent += 1
+          let line -= 1
+        endwhile
+        return [ref]
+
+      elseif getline('.') =~ '^tree \x\{40\}$'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        if s:repo().rev_parse(myhash.':') == ref
+          let ref = myhash.':'
+        endif
+        return [ref]
+
+      elseif getline('.') =~# '^object \x\{40\}$' && getline(line('.')+1) =~ '^type \%(commit\|tree\|blob\)$'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        let type = matchstr(getline(line('.')+1),'type \zs.*')
+
+      elseif getline('.') =~# '^\l\{3,8\} '.myhash.'$'
+        let ref = buffer.rev()
+
+      elseif getline('.') =~# '^\l\{3,8\} \x\{40\}\>'
+        let ref = matchstr(getline('.'),'\x\{40\}')
+        echoerr "warning: unknown context ".matchstr(getline('.'),'^\l*')
+
+      elseif getline('.') =~# '^[+-]\{3\} [abciow12]\=/'
+        let ref = getline('.')[4:]
+
+      elseif getline('.') =~# '^[+-]' && search('^@@ -\d\+,\d\+ +\d\+,','bnW')
+        let type = getline('.')[0]
+        let lnum = line('.') - 1
+        let offset = 0
+        while getline(lnum) !~# '^@@ -\d\+,\d\+ +\d\+,'
+          if getline(lnum) =~# '^[ '.type.']'
+            let offset += 1
+          endif
+          let lnum -= 1
+        endwhile
+        let offset += matchstr(getline(lnum), type.'\zs\d\+')
+        let ref = getline(search('^'.type.'\{3\} [abciow12]/','bnW'))[4:-1]
+        let dcmds = [offset, 'normal!zv']
+
+      elseif getline('.') =~# '^rename from '
+        let ref = 'a/'.getline('.')[12:]
+      elseif getline('.') =~# '^rename to '
+        let ref = 'b/'.getline('.')[10:]
+
+      elseif getline('.') =~# '^@@ -\d\+,\d\+ +\d\+,'
+        let diff = getline(search('^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)', 'bcnW'))
+        let offset = matchstr(getline('.'), '+\zs\d\+')
+
+        let dref = matchstr(diff, '\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(diff, '\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiff! +'.offset
+
+      elseif getline('.') =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)'
+        let dref = matchstr(getline('.'),'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(getline('.'),'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiff!'
+
+      elseif getline('.') =~# '^index ' && getline(line('.')-1) =~# '^diff --git \%([abciow12]/.*\|/dev/null\) \%([abciow12]/.*\|/dev/null\)'
+        let line = getline(line('.')-1)
+        let dref = matchstr(line,'\Cdiff --git \zs\%([abciow12]/.*\|/dev/null\)\ze \%([abciow12]/.*\|/dev/null\)')
+        let ref = matchstr(line,'\Cdiff --git \%([abciow12]/.*\|/dev/null\) \zs\%([abciow12]/.*\|/dev/null\)')
+        let dcmd = 'Gdiff!'
+
+      elseif line('$') == 1 && getline('.') =~ '^\x\{40\}$'
+        let ref = getline('.')
+
+      elseif expand('<cword>') =~# '^\x\{7,40\}\>'
+        return [expand('<cword>')]
+
+      else
+        let ref = ''
+      endif
+
+      let prefixes = {
+            \ '1': '',
+            \ '2': '',
+            \ 'b': ':0:',
+            \ 'i': ':0:',
+            \ 'o': '',
+            \ 'w': ''}
+
+      if len(myhash)
+        let prefixes.a = myhash.'^:'
+        let prefixes.b = myhash.':'
+      endif
+      let ref = substitute(ref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '')
+      if exists('dref')
+        let dref = substitute(dref, '^\(\w\)/', '\=get(prefixes, submatch(1), "HEAD:")', '')
+      endif
+
+      if ref ==# '/dev/null'
+        " Empty blob
+        let ref = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
+      endif
+
+      if exists('dref')
+        return [ref, dcmd . ' ' . s:fnameescape(dref)] + dcmds
+      elseif ref != ""
+        return [ref] + dcmds
+      endif
+
+    endif
+    return []
+  endtry
+endfunction
+
+function! s:GF(mode) abort
+  try
+    let results = s:cfile()
+  catch /^fugitive:/
+    return 'echoerr v:errmsg'
+  endtry
+  if len(results)
+    return s:Edit(a:mode, 0, results[0]).join(map(results[1:-1], '"|".v:val'), '')
+  else
+    return ''
+  endif
+endfunction
+
+function! fugitive#cfile() abort
+  let pre = ''
+  let results = s:cfile()
+  if empty(results)
+    let cfile = expand('<cfile>')
+    if &includeexpr =~# '\<v:fname\>'
+      sandbox let cfile = eval(substitute(&includeexpr, '\C\<v:fname\>', '\=string(cfile)', 'g'))
+    endif
+    return cfile
+  elseif len(results) > 1
+    let pre = '+' . join(map(results[1:-1], 'escape(v:val, " ")'), '\|') . ' '
+  endif
+  return pre . s:fnameescape(fugitive#repo().translate(results[0]))
+endfunction
+
+" Section: Statusline
+
+function! s:repo_head_ref() dict abort
+  if !filereadable(self.dir('HEAD'))
+    return ''
+  endif
+  return readfile(self.dir('HEAD'))[0]
+endfunction
+
+call s:add_methods('repo',['head_ref'])
+
+function! fugitive#statusline(...) abort
+  if !exists('b:git_dir')
+    return ''
+  endif
+  let status = ''
+  if s:buffer().commit() != ''
+    let status .= ':' . s:buffer().commit()[0:7]
+  endif
+  let status .= '('.fugitive#head(7).')'
+  if &statusline =~# '%[MRHWY]' && &statusline !~# '%[mrhwy]'
+    return ',GIT'.status
+  else
+    return '[Git'.status.']'
+  endif
+endfunction
+
+function! fugitive#head(...) abort
+  if !exists('b:git_dir')
+    return ''
+  endif
+
+  return s:repo().head(a:0 ? a:1 : 0)
+endfunction
+
+augroup fugitive_statusline
+  autocmd!
+  autocmd User Flags call Hoist('buffer', function('fugitive#statusline'))
+augroup END
+
+" Section: Folding
+
+function! fugitive#foldtext() abort
+  if &foldmethod !=# 'syntax'
+    return foldtext()
+  elseif getline(v:foldstart) =~# '^diff '
+    let [add, remove] = [-1, -1]
+    let filename = ''
+    for lnum in range(v:foldstart, v:foldend)
+      if filename ==# '' && getline(lnum) =~# '^[+-]\{3\} [abciow12]/'
+        let filename = getline(lnum)[6:-1]
+      endif
+      if getline(lnum) =~# '^+'
+        let add += 1
+      elseif getline(lnum) =~# '^-'
+        let remove += 1
+      elseif getline(lnum) =~# '^Binary '
+        let binary = 1
+      endif
+    endfor
+    if filename ==# ''
+      let filename = matchstr(getline(v:foldstart), '^diff .\{-\} [abciow12]/\zs.*\ze [abciow12]/')
+    endif
+    if filename ==# ''
+      let filename = getline(v:foldstart)[5:-1]
+    endif
+    if exists('binary')
+      return 'Binary: '.filename
+    else
+      return (add<10&&remove<100?' ':'') . add . '+ ' . (remove<10&&add<100?' ':'') . remove . '- ' . filename
+    endif
+  elseif getline(v:foldstart) =~# '^# .*:$'
+    let lines = getline(v:foldstart, v:foldend)
+    call filter(lines, 'v:val =~# "^#\t"')
+    cal map(lines,'s:sub(v:val, "^#\t%(modified: +|renamed: +)=", "")')
+    cal map(lines,'s:sub(v:val, "^([[:alpha:] ]+): +(.*)", "\\2 (\\1)")')
+    return getline(v:foldstart).' '.join(lines, ', ')
+  endif
+  return foldtext()
+endfunction
+
+augroup fugitive_foldtext
+  autocmd!
+  autocmd User Fugitive
+        \ if &filetype =~# '^git\%(commit\)\=$' && &foldtext ==# 'foldtext()' |
+        \    set foldtext=fugitive#foldtext() |
+        \ endif
+augroup END
diff --git a/vim/plugins/vim-hug-neovim-rpc/.gitignore b/vim/plugins/vim-hug-neovim-rpc/.gitignore
new file mode 100644
index 0000000..bab7f1b
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/.gitignore
@@ -0,0 +1,3 @@
+
+*.pyc
+__pycache__
diff --git a/vim/plugins/vim-hug-neovim-rpc/README.md b/vim/plugins/vim-hug-neovim-rpc/README.md
new file mode 100644
index 0000000..2623c4e
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/README.md
@@ -0,0 +1,158 @@
+
+# vim-hug-neovim-rpc
+
+This is an **experimental project**, trying to build a compatibility layer for
+[neovim rpc client](https://github.com/neovim/python-client) working on vim8.
+I started this project because I want to fix the [vim8
+support](https://github.com/roxma/nvim-completion-manager/issues/14) issue for
+[nvim-completion-manager](https://github.com/roxma/nvim-completion-manager).
+
+Since this is a general purpose module, other plugins needing rpc support may
+benefit from this project. However, there're many neovim rpc methods I haven't
+implemented yet, which make this an experimental plugin. **Please fork and
+open a PR if you get any idea on improving it**.
+
+***Tip: for porting neovim rplugin to vim8, you might need
+[roxma/nvim-yarp](https://github.com/roxma/nvim-yarp)***
+
+![screencast](https://cloud.githubusercontent.com/assets/4538941/23102626/9e1bd928-f6e7-11e6-8fa2-2776f70819d9.gif)
+
+## Requirements
+
+
+1. vim8
+2. If `has('pythonx')` and `set pyxversion=3`
+    - same requirements as `4. has('python3')`
+2. Else if `has('pythonx')` and `set pyxversion=2`
+    - same requirements as `5. has('python')`
+4. Else if `has('python3')`
+    - [neovim/python-client](https://github.com/neovim/python-client). (`pip3
+        install neovim`). There should be no error when you execute `:python3
+        import neovim`
+5. Else if `has('python')`
+    - [neovim/python-client](https://github.com/neovim/python-client). (`pip
+        install neovim`). There should be no error when you execute `:python
+        import neovim`
+6. `set encoding=utf-8` in your vimrc.
+
+***Use `:echo neovim_rpc#serveraddr()` to test the installation***. It should print
+something like `127.0.0.1:51359`.
+
+## API
+
+| Function                                     | Similar to neovim's                            |
+|----------------------------------------------|------------------------------------------------|
+| `neovim_rpc#serveraddr()`                    | `v:servername`                                 |
+| `neovim_rpc#jobstart(cmd,...)`               | `jobstart({cmd}[, {opts}])`                    |
+| `neovim_rpc#jobstop(jobid)`                  | `jobstop({job})`                               |
+| `neovim_rpc#rpcnotify(channel,event,...)`    | `rpcnotify({channel}, {event}[, {args}...])`   |
+| `neovim_rpc#rpcrequest(channel, event, ...)` | `rpcrequest({channel}, {method}[, {args}...])` |
+
+Note that `neovim_rpc#jobstart` only support these options:
+
+- `on_stdout`
+- `on_stderr`
+- `on_exit`
+- `detach`
+
+## Incompatibility issues
+
+- Cannot pass `Funcref` object to python client. Pass function name instead.
+- Python `None` will be converted to `''` instead of `v:null` into vimscript.
+  See [vim#2246](https://github.com/vim/vim/issues/2246)
+- The following neovim-only API will be ignored quietly:
+    - `nvim_buf_add_highlight`
+    - `nvim_buf_clear_highlight`
+
+## Overall Implementation
+
+```
+   "vim-hug-neovim-rpc - Sequence Diagram"
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+
+┌───┐            ┌──────────┐                  ┌───────────┐                    ┌──────┐
+│VIM│            │VIM Server│                  │NVIM Server│                    │Client│
+└─┬─┘            └────┬─────┘                  └─────┬─────┘                    └──┬───┘
+  │   Launch thread   │                              │                             │
+  │───────────────────>                              │                             │
+  │                   │                              │                             │
+  │                  Launch thread                   │                             │
+  │─────────────────────────────────────────────────>│                             │
+  │                   │                              │                             │
+  │ `ch_open` connect │                              │                             │
+  │───────────────────>                              │                             │
+  │                   │                              │                             │
+  │                   │────┐                         │                             │
+  │                   │    │ Launch VimHandler thread│                             │
+  │                   │<───┘                         │                             │
+  │                   │                              │                             │
+  │                   │                              │           Connect           │
+  │                   │                              │<─────────────────────────────
+  │                   │                              │                             │
+  │                   │                              ────┐
+  │                   │                                  │ Launch NvimHandler thread
+  │                   │                              <───┘
+  │                   │                              │                             │
+  │                   │                              │    Request (msgpack rpc)    │
+  │                   │                              │<─────────────────────────────
+  │                   │                              │                             │
+  │                   │                              ────┐                         │
+  │                   │                                  │ Request enqueue         │
+  │                   │                              <───┘                         │
+  │                   │                              │                             │
+  │                   │     notify (method call)     │                             │
+  │                   │ <────────────────────────────│                             │
+  │                   │                              │                             │
+  │ notify (json rpc) │                              │                             │
+  │<───────────────────                              │                             │
+  │                   │                              │                             │
+  ────┐                                              │                             │
+      │ Request dequeue                              │                             │
+  <───┘                                              │                             │
+  │                   │                              │                             │
+  ────┐               │                              │                             │
+      │ Process       │                              │                             │
+  <───┘               │                              │                             │
+  │                   │                              │                             │
+  │                   │      Send response (msgpack rpc)                           │
+  │────────────────────────────────────────────────────────────────────────────────>
+┌─┴─┐            ┌────┴─────┐                  ┌─────┴─────┐                    ┌──┴───┐
+│VIM│            │VIM Server│                  │NVIM Server│                    │Client│
+└───┘            └──────────┘                  └───────────┘                    └──────┘
+```
+
+<!-- 
+@startuml
+
+title "vim-hug-neovim-rpc - Sequence Diagram"
+
+VIM -> "VIM Server": Launch thread
+VIM -> "NVIM Server": Launch thread
+VIM -> "VIM Server": `ch_open` connect
+"VIM Server" -> "VIM Server": Launch VimHandler thread
+
+Client-> "NVIM Server": Connect
+"NVIM Server" -> "NVIM Server": Launch NvimHandler thread
+Client -> "NVIM Server": Request (msgpack rpc)
+"NVIM Server" -> "NVIM Server": Request enqueue
+"NVIM Server" -> "VIM Server": notify (method call)
+"VIM Server" -> VIM: notify (json rpc)
+VIM -> VIM: Request dequeue 
+VIM -> VIM: Process
+VIM -> Client: Send response (msgpack rpc)
+
+@enduml
+-->
+
+## Debugging
+
+Add logging settigns to your vimrc. Log files will be generated with prefix
+`/tmp/nvim_log`. An alternative is to export environment variables before
+starting vim/nvim.
+
+```vim
+let $NVIM_PYTHON_LOG_FILE="/tmp/nvim_log"
+let $NVIM_PYTHON_LOG_LEVEL="DEBUG"
+```
+
diff --git a/vim/plugins/vim-hug-neovim-rpc/autoload/neovim_rpc.vim b/vim/plugins/vim-hug-neovim-rpc/autoload/neovim_rpc.vim
new file mode 100644
index 0000000..d0fdb19
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/autoload/neovim_rpc.vim
@@ -0,0 +1,181 @@
+
+
+if has('pythonx')
+	let s:py = 'pythonx'
+	let s:pyeval = function('pyxeval')
+elseif has('python3')
+	let s:py = 'python3'
+	let s:pyeval = function('py3eval')
+else
+	let s:py = 'python'
+	let s:pyeval = function('pyeval')
+endif
+
+func! neovim_rpc#serveraddr()
+	if exists('g:_neovim_rpc_nvim_server')
+		return g:_neovim_rpc_nvim_server
+	endif
+
+    " must be utf-8
+    if &encoding !=? "utf-8"
+        throw '[vim-hug-neovim-rpc] requires `:set encoding=utf-8`'
+    endif
+
+    try
+        execute s:py . ' import neovim'
+    catch
+        call neovim_rpc#_error("failed executing: " . s:py . " import neovim")
+        call neovim_rpc#_error(v:exception)
+        throw '[vim-hug-neovim-rpc] requires `:' . s:py . ' import neovim` command to work'
+    endtry
+
+	execute s:py . ' import neovim_rpc_server'
+	let l:servers = s:pyeval('neovim_rpc_server.start()')
+
+	let g:_neovim_rpc_nvim_server     = l:servers[0]
+	let g:_neovim_rpc_vim_server = l:servers[1]
+
+	let g:_neovim_rpc_main_channel = ch_open(g:_neovim_rpc_vim_server)
+
+	" close channel before vim exit
+	" au VimLeavePre *  let s:leaving = 1 | execute s:py . ' neovim_rpc_server.stop()'
+
+	" identify myself
+	call ch_sendexpr(g:_neovim_rpc_main_channel,'neovim_rpc_setup')
+
+	return g:_neovim_rpc_nvim_server
+endfunc
+
+" elegant python function call wrapper
+func! neovim_rpc#pyxcall(func,...)
+	execute s:py . ' import vim, json'
+    let g:neovim_rpc#_tmp_args = copy(a:000)
+	let l:ret = s:pyeval(a:func . '(*vim.vars["neovim_rpc#_tmp_args"])')
+    unlet g:neovim_rpc#_tmp_args
+    return l:ret
+endfunc
+
+" supported opt keys:
+" - on_stdout
+" - on_stderr
+" - on_exit
+" - detach
+func! neovim_rpc#jobstart(cmd,...)
+
+	let l:opts = {}
+	if len(a:000)
+		let l:opts = a:1
+	endif
+
+	let l:real_opts = {'mode': 'raw'}
+	if has_key(l:opts,'detach') && l:opts['detach']
+		let l:real_opts['stoponexit'] = ''
+	endif
+
+	if has_key(l:opts,'on_stdout')
+		let l:real_opts['out_cb'] = function('neovim_rpc#_on_stdout')
+	endif
+	if has_key(l:opts,'on_stderr')
+		let l:real_opts['err_cb'] = function('neovim_rpc#_on_stderr')
+	endif
+    let l:real_opts['exit_cb'] = function('neovim_rpc#_on_exit')
+
+	let l:job   = job_start(a:cmd, l:real_opts)
+	let l:jobid = ch_info(l:job)['id']
+
+	let g:_neovim_rpc_jobs[l:jobid] = {'cmd':a:cmd, 'opts': l:opts, 'job': l:job}
+
+	return l:jobid
+endfunc
+
+func! neovim_rpc#jobstop(jobid)
+	let l:job = g:_neovim_rpc_jobs[a:jobid]['job']
+	return job_stop(l:job)
+endfunc
+
+func! neovim_rpc#rpcnotify(channel,event,...)
+	call neovim_rpc#pyxcall('neovim_rpc_server.rpcnotify',a:channel,a:event,a:000)
+endfunc
+
+let s:rspid = 1
+func! neovim_rpc#rpcrequest(channel, event, ...)
+    let s:rspid = s:rspid + 1
+
+    " a unique key for storing response
+    let rspid = '' . s:rspid
+
+    " neovim's rpcrequest doesn't have timeout
+    let opt = {'timeout': 24 * 60 * 60 * 1000}
+    let args = ['rpcrequest', a:channel, a:event, a:000, rspid]
+    call ch_evalexpr(g:_neovim_rpc_main_channel, args, opt)
+
+    let expr = 'json.dumps(neovim_rpc_server.responses.pop("' . rspid . '"))'
+
+	execute s:py ' import neovim_rpc_server, json'
+    let [err, result] = json_decode(s:pyeval(expr))
+    if err
+        if type(err) == type('')
+            throw err
+        endif
+        throw err[1]
+    endif
+    return result
+endfunc
+
+func! neovim_rpc#_on_stdout(job,data)
+	let l:jobid = ch_info(a:job)['id']
+	let l:opts = g:_neovim_rpc_jobs[l:jobid]['opts']
+	" convert to neovim style function call
+	call call(l:opts['on_stdout'],[l:jobid,split(a:data,"\n",1),'stdout'],l:opts)
+endfunc
+
+func! neovim_rpc#_on_stderr(job,data)
+	let l:jobid = ch_info(a:job)['id']
+	let l:opts = g:_neovim_rpc_jobs[l:jobid]['opts']
+	" convert to neovim style function call
+	call call(l:opts['on_stderr'],[l:jobid,split(a:data,"\n",1),'stderr'],l:opts)
+endfunc
+
+func! neovim_rpc#_on_exit(job,status)
+	let l:jobid = ch_info(a:job)['id']
+	let l:opts = g:_neovim_rpc_jobs[l:jobid]['opts']
+	unlet g:_neovim_rpc_jobs[l:jobid]
+    if has_key(l:opts, 'on_exit')
+        " convert to neovim style function call
+        call call(l:opts['on_exit'],[l:jobid,a:status,'exit'],l:opts)
+    endif
+endfunc
+
+func! neovim_rpc#_callback()
+	execute s:py . ' neovim_rpc_server.process_pending_requests()'
+endfunc
+
+let g:_neovim_rpc_main_channel = -1
+let g:_neovim_rpc_jobs = {}
+
+let s:leaving = 0
+
+func! neovim_rpc#_error(msg)
+    if mode() == 'i'
+        " NOTE: side effect, sorry, but this is necessary
+        set nosmd
+    endif
+    echohl ErrorMsg
+    echom '[vim-hug-neovim-rpc] ' . a:msg
+    echohl None
+endfunc
+
+func! neovim_rpc#_nvim_err_write(msg)
+    if mode() == 'i'
+        " NOTE: side effect, sorry, but this is necessary
+        set nosmd
+    endif
+    echohl ErrorMsg
+    let g:error = a:msg
+    echom a:msg
+    echohl None
+endfunc
+
+func! neovim_rpc#_nvim_out_write(msg)
+    echom a:msg
+endfunc
diff --git a/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_methods.py b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_methods.py
new file mode 100644
index 0000000..1d57a65
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_methods.py
@@ -0,0 +1,100 @@
+# vim:set et sw=4 ts=8:
+import vim
+import json
+import msgpack
+
+# vim's python binding doesn't have the `call` method, wrap it here
+def nvim_call_function(method,args):
+    vim.vars['_neovim_rpc_tmp_args'] = args
+    # vim.eval('getcurpos()') return an array of string, it should be an array
+    # of int.  Use json_encode to workaround this
+    return vim.bindeval('call("%s",g:_neovim_rpc_tmp_args)' % method)
+
+def nvim_get_current_buf():
+    return vim.current.buffer
+
+def nvim_list_bufs():
+    return list(vim.buffers)
+
+# {'return_type': 'Integer', 'since': 1, 'method': True, 'parameters': [['Buffer', 'buffer']], 'name': 'nvim_buf_get_number'}
+def nvim_buf_get_number(buf):
+    return buf.number
+
+def nvim_buf_get_name(buffer):
+    return buffer.name
+
+def nvim_get_var(name):
+    return vim.vars[name]
+
+def nvim_set_var(name,val):
+    vim.vars[name] = val
+    return val
+
+def nvim_buf_get_var(buffer,name):
+    return json.loads(vim.eval('json_encode(getbufvar(%s, "%s"))' % (buffer.number, name)))
+
+def nvim_buf_set_var(buffer,name,val):
+    buffer.vars[name] = val
+
+def nvim_buf_get_lines(buffer,start,end,*args):
+    if start < 0:
+        start = len(buffer) + 1 + start
+    if end < 0:
+        end = len(buffer) + 1 + end
+    return buffer[start:end]
+
+def nvim_eval(expr):
+    return nvim_call_function('eval',[expr])
+
+def nvim_buf_set_lines(buffer,start,end,err,lines):
+    if start < 0:
+        start = len(buffer) + 1 + start
+    if end < 0:
+        end = len(buffer) + 1 + end
+    buffer[start:end] = lines
+
+    if nvim_call_function('bufwinnr',[buffer.number])!=-1:
+        # vim needs' redraw to update the screen, it seems to be a bug
+        vim.command('redraw')
+
+buffer_set_lines = nvim_buf_set_lines
+
+def buffer_line_count(buffer):
+    return len(buffer)
+
+def nvim_buf_line_count(buffer):
+    return len(buffer)
+
+def nvim_get_option(name):
+    return vim.options[name]
+
+def nvim_buf_get_option(buf, name):
+    return buf.options[name]
+
+def nvim_set_option(name, val):
+    vim.options[name] = val
+
+def nvim_command(cmd):
+    vim.command(cmd)
+
+def nvim_get_current_win():
+    return vim.current.window
+
+def nvim_win_get_cursor(window):
+    return window.cursor
+
+def nvim_out_write(s):
+    nvim_call_function('neovim_rpc#_nvim_out_write', [s])
+
+def nvim_err_write(s):
+    nvim_call_function('neovim_rpc#_nvim_err_write', [s])
+
+# NOTE https://github.com/autozimu/LanguageClient-neovim/pull/151#issuecomment-339198527
+# TODO
+def nvim_buf_add_highlight(buf, src_id, *args):
+    return src_id
+
+# NOTE https://github.com/autozimu/LanguageClient-neovim/pull/151#issuecomment-339198527
+# TODO
+def nvim_buf_clear_highlight(*args):
+    pass
diff --git a/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_protocol.py b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_protocol.py
new file mode 100644
index 0000000..6d3ce14
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_protocol.py
@@ -0,0 +1,56 @@
+import json
+import socket
+import sys
+import os
+import threading
+import vim
+import logging
+import msgpack
+import neovim_rpc_server_api_info
+import neovim_rpc_methods
+import threading
+import socket
+import time
+from neovim.api.common import decode_if_bytes
+
+BUFFER_TYPE = type(vim.current.buffer)
+BUFFER_TYPE_ID = neovim_rpc_server_api_info.API_INFO['types']['Buffer']['id']
+WINDOW_TYPE = type(vim.current.window)
+WINDOW_TYPE_ID = neovim_rpc_server_api_info.API_INFO['types']['Window']['id']
+
+def walk(fn, obj):
+    if type(obj) in [list, tuple, vim.List]:
+        return list(walk(fn, o) for o in obj)
+    if type(obj) in [dict, vim.Dictionary]:
+        return dict((walk(fn, k), walk(fn, v)) for k, v in
+                    obj.items())
+    return fn(obj)
+
+def from_client(msg):
+
+    def handler(obj):
+        if type(obj) is msgpack.ExtType:
+            if obj.code == BUFFER_TYPE_ID:
+                return vim.buffers[msgpack.unpackb(obj.data)]
+            if obj.code == WINDOW_TYPE_ID:
+                return vim.windows[msgpack.unpackb(obj.data) - 1]
+        elif obj is None:
+            return ''
+        if sys.version_info.major!=2:
+            # python3 needs decode
+            obj = decode_if_bytes(obj)
+        return obj
+
+    return walk(handler,msg)
+
+def to_client(msg):
+    def handler( obj):
+        if type(obj) == BUFFER_TYPE:
+            return msgpack.ExtType(BUFFER_TYPE_ID, msgpack.packb(obj.number))
+        if type(obj) == WINDOW_TYPE:
+            return msgpack.ExtType(WINDOW_TYPE_ID, msgpack.packb(obj.number))
+        if type(obj) == vim.Function:
+            return obj.name
+        return obj
+    return walk(handler, msg)
+
diff --git a/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server.py b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server.py
new file mode 100644
index 0000000..ee11f77
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server.py
@@ -0,0 +1,436 @@
+# vim:set et sw=4 ts=8:
+
+import json
+import socket
+import sys
+import os
+import threading
+import vim
+import logging
+import msgpack
+import neovim_rpc_server_api_info
+import neovim_rpc_methods
+import threading
+import socket
+import time
+import subprocess
+from neovim.api import common as neovim_common
+import neovim_rpc_protocol
+
+vim_error = vim.Function('neovim_rpc#_error')
+
+# protable devnull
+if sys.version_info.major==2:
+    DEVNULL = open(os.devnull, 'wb')
+else:
+    from subprocess import DEVNULL
+
+
+if sys.version_info.major == 2:
+    from Queue import Queue, Empty as QueueEmpty
+else:
+    from queue import Queue, Empty as QueueEmpty
+
+# NVIM_PYTHON_LOG_FILE=nvim.log NVIM_PYTHON_LOG_LEVEL=INFO vim test.md
+
+try:
+    # Python 3
+    import socketserver
+except ImportError:
+    # Python 2
+    import SocketServer as socketserver
+
+# globals
+logger = logging.getLogger(__name__)
+# supress the annoying error message: 
+#     No handlers could be found for logger "neovim_rpc_server"
+logger.addHandler(logging.NullHandler())
+
+request_queue = Queue()
+responses = {}
+
+def _channel_id_new():
+    with _channel_id_new._lock:
+        _channel_id_new._counter += 1
+        return _channel_id_new._counter
+# static local
+_channel_id_new._counter = 0
+_channel_id_new._lock = threading.Lock()
+
+
+class VimHandler(socketserver.BaseRequestHandler):
+
+    _lock = threading.Lock()
+    _sock = None
+
+    @classmethod
+    def notify(cls,cmd="call neovim_rpc#_callback()"):
+        try:
+            if not VimHandler._sock:
+                return
+            with VimHandler._lock:
+                encoded = json.dumps(['ex', cmd])
+                logger.info("sending notification: %s",encoded)
+                VimHandler._sock.send(encoded.encode('utf-8'))
+        except Exception as ex:
+            logger.exception('VimHandler notify exception for [%s]: %s', cmd, ex)
+
+    @classmethod
+    def notify_exited(cls,channel):
+        try:
+            cmd = "call neovim_rpc#_on_exit(%s)" % channel
+            cls.notify(cmd)
+        except Exception as ex:
+            logger.exception('notify_exited for channel [%s] exception: %s',channel,ex)
+
+    # each connection is a thread
+    def handle(self):
+        logger.info("=== socket opened ===")
+        data = None
+        while True:
+            try:
+                rcv = self.request.recv(4096)
+                # 16k buffer by default
+                if data:
+                    data += rcv
+                else:
+                    data = rcv
+            except socket.error:
+                logger.info("=== socket error ===")
+                break
+            except IOError:
+                logger.info("=== socket closed ===")
+                break
+            if len(rcv) == 0:
+                logger.info("=== socket closed ===")
+                break
+            logger.info("received: %s", data)
+            try:
+                decoded = json.loads(data.decode('utf-8'))
+            except ValueError:
+                logger.exception("json decoding failed, wait for more data")
+                continue
+            data = None
+
+            # Send a response if the sequence number is positive.
+            # Negative numbers are used for "eval" responses.
+            if len(decoded)>=2 and  decoded[0] >= 0 and decoded[1] == 'neovim_rpc_setup':
+
+                VimHandler._sock = self.request
+
+                # initial setup
+                encoded = json.dumps(['ex', "scall neovim_rpc#_callback()"])
+                logger.info("sending {0}".format(encoded))
+                self.request.send(encoded.encode('utf-8'))
+
+            else:
+                # recognize as rpcrequest
+                reqid = decoded[0]
+                channel = decoded[1][1]
+                event = decoded[1][2]
+                args = decoded[1][3]
+                rspid = decoded[1][4]
+                NvimHandler.request(self.request, 
+                                    channel, 
+                                    reqid,
+                                    event,
+                                    args,
+                                    rspid)
+
+                # wait for response
+
+class SocketToStream():
+
+    def __init__(self,sock):
+        self._sock = sock
+
+    def read(self,cnt):
+        if cnt>4096:
+            cnt = 4096
+        return self._sock.recv(cnt)
+
+    def write(self,w):
+        return self._sock.send(w)
+
+class NvimHandler(socketserver.BaseRequestHandler):
+
+    channel_sockets = {}
+
+    def handle(self):
+
+        logger.info("=== socket opened for client ===")
+
+        channel = _channel_id_new()
+
+        sock = self.request
+        chinfo = dict(sock=sock)
+        NvimHandler.channel_sockets[channel] = chinfo
+
+        try:
+            f = SocketToStream(sock)
+            unpacker = msgpack.Unpacker(f)
+            for unpacked in unpacker:
+                logger.info("unpacked: %s", unpacked)
+
+                # response format:
+                #   - msg[0]: 1
+                #   - msg[1]: the request id
+                #   - msg[2]: error(if any), format: [code,str]
+                #   - msg[3]: result(if not errored)
+                if int(unpacked[0]) == 1:
+                    unpacked = neovim_rpc_protocol.from_client(unpacked)
+                    reqid = int(unpacked[1])
+                    rspid, vimsock = chinfo[reqid]
+                    err = unpacked[2]
+                    result = unpacked[3]
+                    # VIM fails to parse response when there a sleep in neovim
+                    # client. I cannot figure out why. Use global responses to
+                    # workaround this issue.
+                    responses[rspid] = [err, result]
+                    content = [reqid, '']
+                    tosend = json.dumps(content)
+                    # vimsock.send
+                    vimsock.send(tosend.encode('utf-8'))
+                    chinfo.pop(reqid)
+                    continue
+
+
+                request_queue.put((f,channel,unpacked))
+                # notify vim in order to process request in main thread, and
+                # avoiding the stupid json protocol
+                VimHandler.notify()
+
+            logger.info('channel %s closed.', channel)
+
+        except:
+            logger.exception('unpacker failed.')
+        finally:
+            try:
+                NvimHandler.channel_sockets.pop(channel)
+                sock.close()
+            except:
+                pass
+
+    @classmethod
+    def notify(cls,channel,event,args):
+        try:
+            channel = int(channel)
+            if channel not in cls.channel_sockets:
+                logger.info("channel[%s] not in NvimHandler", channel)
+                return
+            sock = cls.channel_sockets[channel]['sock']
+
+            # notification format:
+            #   - msg[0] type, which is 2
+            #   - msg[1] method
+            #   - msg[2] arguments
+            content = [2, event, args]
+
+            logger.info("notify channel[%s]: %s", channel, content)
+            packed = msgpack.packb(neovim_rpc_protocol.to_client(content))
+            sock.send(packed)
+        except Exception as ex:
+            logger.exception("notify failed: %s", ex)
+
+    @classmethod
+    def request(cls, vimsock, channel, reqid, event, args, rspid):
+        try:
+            reqid = int(reqid)
+            channel = int(channel)
+            chinfo = cls.channel_sockets[channel]
+
+            if channel not in cls.channel_sockets:
+                logger.info("channel[%s] not in NvimHandler", channel)
+                return
+
+            sock = chinfo['sock']
+            # request format:
+            #   - msg[0] type, which is 0
+            #   - msg[1] request id
+            #   - msg[2] method
+            #   - msg[3] arguments
+            content = [0, reqid, event, args]
+
+            chinfo[reqid] = [rspid, vimsock]
+
+            logger.info("request channel[%s]: %s", channel, content)
+            packed = msgpack.packb(neovim_rpc_protocol.to_client(content))
+            sock.send(packed)
+        except Exception as ex:
+            logger.exception("request failed: %s", ex)
+
+    @classmethod
+    def shutdown(cls):
+        # close all sockets
+        for channel in list(cls.channel_sockets.keys()):
+            chinfo = cls.channel_sockets.get(channel,None)
+            if chinfo:
+                sock = chinfo['sock']
+                logger.info("closing client %s", channel)
+                # if don't shutdown the socket, vim will never exit because the
+                # recv thread is still blocking
+                sock.shutdown(socket.SHUT_RDWR)
+                sock.close()
+
+
+# copied from neovim python-client/neovim/__init__.py
+def _setup_logging(name):
+    """Setup logging according to environment variables."""
+    logger = logging.getLogger(__name__)
+    if 'NVIM_PYTHON_LOG_FILE' in os.environ:
+        prefix = os.environ['NVIM_PYTHON_LOG_FILE'].strip()
+        major_version = sys.version_info[0]
+        logfile = '{}_py{}_{}'.format(prefix, major_version, name)
+        handler = logging.FileHandler(logfile, 'w', encoding='utf-8')
+        handler.formatter = logging.Formatter(
+            '%(asctime)s [%(levelname)s @ '
+            '%(filename)s:%(funcName)s:%(lineno)s] %(process)s - %(message)s')
+        logging.root.addHandler(handler)
+        level = logging.INFO
+        if 'NVIM_PYTHON_LOG_LEVEL' in os.environ:
+            l = getattr(logging,
+                        os.environ['NVIM_PYTHON_LOG_LEVEL'].strip(),
+                        level)
+            if isinstance(l, int):
+                level = l
+        logger.setLevel(level)
+
+def start():
+
+    _setup_logging('neovim_rpc_server')
+
+    class ThreadedTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+        pass
+
+    # 0 for random port
+    global _vim_server
+    global _nvim_server
+    _vim_server = ThreadedTCPServer(("127.0.0.1", 0), VimHandler)
+    _nvim_server = ThreadedTCPServer(("127.0.0.1", 0), NvimHandler)
+    _vim_server.daemon_threads = True
+    _nvim_server.daemon_threads = True
+
+    # Start a thread with the server -- that thread will then start one
+    # more thread for each request
+    main_server_thread = threading.Thread(target=_vim_server.serve_forever)
+    clients_server_thread = threading.Thread(target=_nvim_server.serve_forever)
+
+    # Exit the server thread when the main thread terminates
+    main_server_thread.daemon = True
+    main_server_thread.start()
+    clients_server_thread.daemon = True
+    clients_server_thread.start()
+
+    return ["{addr[0]}:{addr[1]}".format(addr=_nvim_server.server_address), "{addr[0]}:{addr[1]}".format(addr=_vim_server.server_address)]
+
+def process_pending_requests():
+
+    logger.info("process_pending_requests")
+    while True:
+
+        item = None
+        try:
+
+            item = request_queue.get(False)
+
+            f, channel, msg = item
+
+            msg = neovim_rpc_protocol.from_client(msg)
+
+            logger.info("get msg from channel [%s]: %s", channel, msg)
+
+            # request format:
+            #   - msg[0] type, which is 0
+            #   - msg[1] request id
+            #   - msg[2] method
+            #   - msg[3] arguments
+
+            # notification format:
+            #   - msg[0] type, which is 2
+            #   - msg[1] method
+            #   - msg[2] arguments
+
+            if msg[0] == 0:
+                #request
+
+                req_typed, req_id, method, args = msg
+
+                try:
+                    err=None
+                    result = _process_request(channel,method,args)
+                except Exception as ex:
+                    logger.exception("process failed: %s", ex)
+                    # error uccor
+                    err = [1,str(ex)]
+                    result = None
+
+                result = [1,req_id,err,result]
+                logger.info("sending result: %s", result)
+                packed = msgpack.packb(neovim_rpc_protocol.to_client(result))
+                f.write(packed)
+                logger.info("sent")
+            if msg[0] == 2:
+                # notification
+                req_typed, method, args = msg
+                try:
+                    result = _process_request(channel,method,args)
+                    logger.info('notification process result: [%s]', result)
+                except Exception as ex:
+                    logger.exception("process failed: %s", ex)
+
+        except QueueEmpty as em:
+            pass
+        except Exception as ex:
+            logger.exception("exception during process: %s", ex)
+        finally:
+            if item:
+                request_queue.task_done()
+            else:
+                # item==None means the queue is empty
+                break
+
+def _process_request(channel,method,args):
+    if method=='vim_get_api_info':
+        # this is the first request send from neovim client
+        api_info = neovim_rpc_server_api_info.API_INFO
+        return [channel,api_info]
+    if hasattr(neovim_rpc_methods,method):
+        return getattr(neovim_rpc_methods,method)(*args)
+    else:
+        logger.error("method %s not implemented", method)
+        vim_error("rpc method [%s] not implemented in pythonx/neovim_rpc_methods.py. Please send PR or contact the mantainer." % method)
+        raise Exception('%s not implemented' % method)
+
+def rpcnotify(channel,method,args):
+    NvimHandler.notify(channel,method,args)
+
+
+def stop():
+
+    logger.info("stop begin")
+
+    # close tcp channel server
+    _nvim_server.shutdown()
+    _nvim_server.server_close()
+
+    # close the main channel
+    try:
+        vim.command('call ch_close(g:_neovim_rpc_main_channel)')
+    except Exception as ex:
+        logger.info("ch_close failed: %s", ex)
+
+    # remove all sockets
+    NvimHandler.shutdown()
+
+    try:
+        # stop the main channel
+        _vim_server.shutdown()
+    except Exception as ex:
+        logger.info("_vim_server shutodwn failed: %s", ex)
+
+    try:
+        _vim_server.server_close()
+    except Exception as ex:
+        logger.info("_vim_server close failed: %s", ex)
+
+
diff --git a/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server_api_info.py b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server_api_info.py
new file mode 100644
index 0000000..bb54cb9
--- /dev/null
+++ b/vim/plugins/vim-hug-neovim-rpc/pythonx/neovim_rpc_server_api_info.py
@@ -0,0 +1,2374 @@
+
+
+# result of neovim `api_info()`
+API_INFO = {
+    "version": {
+        "major": 0,
+        "api_level": 1,
+        "api_prerelease": False,
+        "patch": 7,
+        "api_compatible": 0,
+        "minor": 1
+    },
+    "types": {
+        "Window": {
+            "id": 1,
+            "prefix": "nvim_win_"
+        },
+        "Tabpage": {
+            "id": 2,
+            "prefix": "nvim_tabpage_"
+        },
+        "Buffer": {
+            "id": 0,
+            "prefix": "nvim_buf_"
+        }
+    },
+    "functions": [
+        {
+            "method": True,
+            "name": "nvim_buf_line_count",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_get_line",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "index"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_set_line",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "index"
+                ],
+                [
+                    "String",
+                    "line"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_del_line",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "index"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_get_line_slice",
+            "return_type": "ArrayOf(String)",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "include_start"
+                ],
+                [
+                    "Boolean",
+                    "include_end"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_lines",
+            "return_type": "ArrayOf(String)",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "strict_indexing"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_set_line_slice",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "include_start"
+                ],
+                [
+                    "Boolean",
+                    "include_end"
+                ],
+                [
+                    "ArrayOf(String)",
+                    "replacement"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_set_lines",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "strict_indexing"
+                ],
+                [
+                    "ArrayOf(String)",
+                    "replacement"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_set_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_del_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_set_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_del_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_number",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_name",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_set_name",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "buffer_insert",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "lnum"
+                ],
+                [
+                    "ArrayOf(String)",
+                    "lines"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_get_mark",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_add_highlight",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "src_id"
+                ],
+                [
+                    "String",
+                    "hl_group"
+                ],
+                [
+                    "Integer",
+                    "line"
+                ],
+                [
+                    "Integer",
+                    "col_start"
+                ],
+                [
+                    "Integer",
+                    "col_end"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_buf_clear_highlight",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "src_id"
+                ],
+                [
+                    "Integer",
+                    "line_start"
+                ],
+                [
+                    "Integer",
+                    "line_end"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_list_wins",
+            "return_type": "ArrayOf(Window)",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_set_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_del_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "tabpage_set_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "tabpage_del_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_get_win",
+            "return_type": "Window",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_get_number",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_tabpage_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_ui_attach",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Integer",
+                    "width"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ],
+                [
+                    "Dictionary",
+                    "options"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "ui_attach",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Integer",
+                    "width"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ],
+                [
+                    "Boolean",
+                    "enable_rgb"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "name": "nvim_ui_detach",
+            "return_type": "void",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_ui_try_resize",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Integer",
+                    "width"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_ui_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_command",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "command"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_feedkeys",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "keys"
+                ],
+                [
+                    "String",
+                    "mode"
+                ],
+                [
+                    "Boolean",
+                    "escape_csi"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_input",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "keys"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_replace_termcodes",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ],
+                [
+                    "Boolean",
+                    "from_part"
+                ],
+                [
+                    "Boolean",
+                    "do_lt"
+                ],
+                [
+                    "Boolean",
+                    "special"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_command_output",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_eval",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "expr"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_call_function",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "fname"
+                ],
+                [
+                    "Array",
+                    "args"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_strwidth",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_list_runtime_paths",
+            "return_type": "ArrayOf(String)",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_current_dir",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "dir"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_current_line",
+            "return_type": "String",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_current_line",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "line"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_del_current_line",
+            "return_type": "void",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_del_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_del_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "name": "nvim_get_vvar",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_out_write",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_err_write",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_err_writeln",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_list_bufs",
+            "return_type": "ArrayOf(Buffer)",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_current_buf",
+            "return_type": "Buffer",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_current_buf",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_list_wins",
+            "return_type": "ArrayOf(Window)",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_current_win",
+            "return_type": "Window",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_current_win",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_list_tabpages",
+            "return_type": "ArrayOf(Tabpage)",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_current_tabpage",
+            "return_type": "Tabpage",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_set_current_tabpage",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_subscribe",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "event"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_unsubscribe",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "event"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_color_by_name",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_color_map",
+            "return_type": "Dictionary",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_get_api_info",
+            "return_type": "Array",
+            "parameters": [],
+            "since": 1
+        },
+        {
+            "method": False,
+            "name": "nvim_call_atomic",
+            "return_type": "Array",
+            "parameters": [
+                [
+                    "Array",
+                    "calls"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_buf",
+            "return_type": "Buffer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_cursor",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_set_cursor",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "ArrayOf(Integer, 2)",
+                    "pos"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_height",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_set_height",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_width",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_set_width",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "Integer",
+                    "width"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_set_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_del_var",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "window_set_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "window_del_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_position",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_tabpage",
+            "return_type": "Tabpage",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_get_number",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "name": "nvim_win_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 1
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_line_count",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_lines",
+            "return_type": "ArrayOf(String)",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "strict_indexing"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_set_lines",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "start"
+                ],
+                [
+                    "Integer",
+                    "end"
+                ],
+                [
+                    "Boolean",
+                    "strict_indexing"
+                ],
+                [
+                    "ArrayOf(String)",
+                    "replacement"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_number",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_name",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_set_name",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_get_mark",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_add_highlight",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "src_id"
+                ],
+                [
+                    "String",
+                    "hl_group"
+                ],
+                [
+                    "Integer",
+                    "line"
+                ],
+                [
+                    "Integer",
+                    "col_start"
+                ],
+                [
+                    "Integer",
+                    "col_end"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "buffer_clear_highlight",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ],
+                [
+                    "Integer",
+                    "src_id"
+                ],
+                [
+                    "Integer",
+                    "line_start"
+                ],
+                [
+                    "Integer",
+                    "line_end"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "tabpage_get_windows",
+            "return_type": "ArrayOf(Window)",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "tabpage_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "tabpage_get_window",
+            "return_type": "Window",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "tabpage_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "ui_detach",
+            "return_type": "void",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "ui_try_resize",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Integer",
+                    "width"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_command",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "command"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_feedkeys",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "keys"
+                ],
+                [
+                    "String",
+                    "mode"
+                ],
+                [
+                    "Boolean",
+                    "escape_csi"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_input",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "keys"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_replace_termcodes",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ],
+                [
+                    "Boolean",
+                    "from_part"
+                ],
+                [
+                    "Boolean",
+                    "do_lt"
+                ],
+                [
+                    "Boolean",
+                    "special"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_command_output",
+            "return_type": "String",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_eval",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "expr"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_call_function",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "fname"
+                ],
+                [
+                    "Array",
+                    "args"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_strwidth",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_list_runtime_paths",
+            "return_type": "ArrayOf(String)",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_change_directory",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "dir"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_current_line",
+            "return_type": "String",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_current_line",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "line"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_del_current_line",
+            "return_type": "void",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_vvar",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_out_write",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_err_write",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_report_error",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "str"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_buffers",
+            "return_type": "ArrayOf(Buffer)",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_current_buffer",
+            "return_type": "Buffer",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_current_buffer",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Buffer",
+                    "buffer"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_windows",
+            "return_type": "ArrayOf(Window)",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_current_window",
+            "return_type": "Window",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_current_window",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_tabpages",
+            "return_type": "ArrayOf(Tabpage)",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_current_tabpage",
+            "return_type": "Tabpage",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_set_current_tabpage",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Tabpage",
+                    "tabpage"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_subscribe",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "event"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_unsubscribe",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "String",
+                    "event"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_name_to_color",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_color_map",
+            "return_type": "Dictionary",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": False,
+            "deprecated_since": 1,
+            "name": "vim_get_api_info",
+            "return_type": "Array",
+            "parameters": [],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_buffer",
+            "return_type": "Buffer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_cursor",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_set_cursor",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "ArrayOf(Integer, 2)",
+                    "pos"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_height",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_set_height",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "Integer",
+                    "height"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_width",
+            "return_type": "Integer",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_set_width",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "Integer",
+                    "width"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_var",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_option",
+            "return_type": "Object",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_set_option",
+            "return_type": "void",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ],
+                [
+                    "String",
+                    "name"
+                ],
+                [
+                    "Object",
+                    "value"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_position",
+            "return_type": "ArrayOf(Integer, 2)",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_get_tabpage",
+            "return_type": "Tabpage",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        },
+        {
+            "method": True,
+            "deprecated_since": 1,
+            "name": "window_is_valid",
+            "return_type": "Boolean",
+            "parameters": [
+                [
+                    "Window",
+                    "window"
+                ]
+            ],
+            "since": 0
+        }
+    ],
+    "error_types": {
+        "Validation": {
+            "id": 1
+        },
+        "Exception": {
+            "id": 0
+        }
+    }
+}
diff --git a/vim/plugins/vim-latex-live-preview/.editorconfig b/vim/plugins/vim-latex-live-preview/.editorconfig
new file mode 100644
index 0000000..01ea300
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.editorconfig
@@ -0,0 +1,10 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+max_line_length = 80
diff --git a/vim/plugins/vim-latex-live-preview/.github/CONTRIBUTING.md b/vim/plugins/vim-latex-live-preview/.github/CONTRIBUTING.md
new file mode 100644
index 0000000..edfdf54
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.github/CONTRIBUTING.md
@@ -0,0 +1,17 @@
+How to contribute
+=================
+
+Hey! If you are reading this, that means you may want to contribute to this project, and that is awesome :tada:
+
+There are several ways to contribute, and all of them are essential to make the best vim latex live preview plugin ever.
+
+You may have run into a bug or you may have an idea on how to enhance the plugin. Feel free to open an
+[issue](https://github.com/xuhdev/vim-latex-live-preview/issues) or to add a comment to an existing one.
+
+You may want to write a fix or implement a new feature. Please do so and open a [pull
+request](https://github.com/xuhdev/vim-latex-live-preview/pulls)!
+
+This project is still small enough so that we will be glad to help you if you have any further questions.
+
+Happy contributing :heart:
+
diff --git a/vim/plugins/vim-latex-live-preview/.github/ISSUE_TEMPLATE.md b/vim/plugins/vim-latex-live-preview/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..4da817a
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,26 @@
+## Expected behavior
+
+Tell us what should happen
+
+## Actual behavior
+
+Tell us what happens instead
+
+## Steps to reproduce
+
+Tell us how it occurs
+
+1.
+1.
+1.
+
+## System configuration
+
+- **Vim version**:
+
+```bash
+# output of `vim --version`
+```
+
+- **Platform**:
+
diff --git a/vim/plugins/vim-latex-live-preview/.github/PULL_REQUEST_TEMPLATE.md b/vim/plugins/vim-latex-live-preview/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..1cb220d
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,17 @@
+<!-- Template from https://github.com/rails/rails/blob/master/.github/pull_request_template.md -->
+## Summary
+
+Provide a general description of the code changes in your pull request... were there any bugs you had fixed? If so,
+mention them. If these bugs have open GitHub issues, be sure to tag them here as well, to keep the conversation linked
+together.
+
+## Other Information
+
+If there's anything else that's important and relevant to your pull request, mention that information here. This could
+include benchmarks, or other information.
+
+If you are updating any of the CHANGELOG files or are asked to update the CHANGELOG files by reviewers, please add the
+CHANGELOG entry at the top of the relevant section.
+
+Thanks for contributing to `vim-latex-live-preview`!
+
diff --git a/vim/plugins/vim-latex-live-preview/.github/stale.yml b/vim/plugins/vim-latex-live-preview/.github/stale.yml
new file mode 100644
index 0000000..717fb4b
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.github/stale.yml
@@ -0,0 +1,23 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale Issue or Pull Request is closed
+daysUntilClose: 30
+# Issues or Pull Requests with these labels will never be considered stale
+exemptLabels:
+  - enhancement
+  - bug
+# Label to use when marking as stale
+staleLabel: stale
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed after 30 days if no further activity
+  occurs, but feel free to re-open a closed issue if needed.
+
+  Thanks for contributing to vim-llp!
+# Comment to post when removing the stale label. Set to `false` to disable
+unmarkComment: false
+# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
+closeComment: false
diff --git a/vim/plugins/vim-latex-live-preview/.gitignore b/vim/plugins/vim-latex-live-preview/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/vim-latex-live-preview/CHANGELOG.md b/vim/plugins/vim-latex-live-preview/CHANGELOG.md
new file mode 100644
index 0000000..be86c7b
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/CHANGELOG.md
@@ -0,0 +1,22 @@
+Unreleased
+----------
+
+### Added
+
+- [[`e33ee6c`](https://github.com/xuhdev/vim-latex-live-preview/commit/e33ee6c)] - Support multiple files project [#26](https://github.com/xuhdev/vim-latex-live-preview/pull/26)
+- [[`bf5259b`](https://github.com/xuhdev/vim-latex-live-preview/commit/bf5259b)] - Support bibliography [#3](https://github.com/xuhdev/vim-latex-live-preview/pull/3)
+
+### Fixed
+
+- [[`cbf5a1d`](https://github.com/xuhdev/vim-latex-live-preview/commit/cbf5a1d)] - Support paths and filenames containing spaces [#35](https://github.com/xuhdev/vim-latex-live-preview/issues/35)
+- [[`8cdc672`](https://github.com/xuhdev/vim-latex-live-preview/commit/8cdc672)] - Early exit on compilation failure [#25](https://github.com/xuhdev/vim-latex-live-preview/pull/25)
+
+0.1.0 (Apr 16, 2013)
+--------------------
+
+- First release
+
+<!--
+vim: tw=0
+-->
+
diff --git a/vim/plugins/vim-latex-live-preview/COPYING b/vim/plugins/vim-latex-live-preview/COPYING
new file mode 100644
index 0000000..94a9ed0
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/COPYING
@@ -0,0 +1,674 @@
+                    GNU 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.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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 3 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, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/vim/plugins/vim-latex-live-preview/README.md b/vim/plugins/vim-latex-live-preview/README.md
new file mode 100644
index 0000000..71aac38
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/README.md
@@ -0,0 +1,156 @@
+A Vim Plugin for Lively Previewing LaTeX PDF Output
+===================================================
+
+This plugin provides a live preview of the output PDF of your LaTeX file. The
+display of the output PDF file will be updated lively as you type (just hold
+the cursor and you will see the PDF file updated). Currently,
+vim-latex-live-preview only support UNIX-like systems. [Please let me know if
+you have any suggestions.](.github/CONTRIBUTING.md)
+
+Table of Contents
+-----------------
+
+- [Installation](#installation)
+- [Usage](#usage)
+- [Configuration](#configuration)
+- [Known issues](#known-issues)
+- [Screenshot](#screenshot)
+
+Installation
+------------
+
+Before installing, you need to make sure your Vim version is later than 7.3,
+and is compiled with `+python` feature.
+
+### [vim-plug](https://github.com/junegunn/vim-plug)
+
+Add the plugin in the vim-plug section of your `~/.vimrc`:
+
+```vim
+call plug#begin('~/.vim/plugged')
+[...]
+" A Vim Plugin for Lively Previewing LaTeX PDF Output
+Plug 'xuhdev/vim-latex-live-preview', { 'for': 'tex' }
+[...]
+call plug#end()
+```
+
+Then reload the config and install the new plugin. Run inside `vim`:
+
+```vim
+:so ~/.vimrc
+:PlugInstall
+```
+
+### [Vundle](https://github.com/VundleVim/Vundle.vim)
+
+Add the plugin in the Vundle section of your `~/.vimrc`:
+
+```vim
+call vundle#begin()
+[...]
+" A Vim Plugin for Lively Previewing LaTeX PDF Output
+Plugin 'xuhdev/vim-latex-live-preview'
+[...]
+call vundle#end()
+```
+
+Then reload the config and install the new plugin. Run inside `vim`:
+
+```vim
+:so ~/.vimrc
+:PluginInstall
+```
+
+### Manually
+
+Copy `plugin/latexlivepreview.vim` to `~/.vim/plugin`.
+
+Usage
+-----
+
+Simply execute `:LLPStartPreview` to launch the previewer. Then try to type in
+Vim and you should see the live update. The updating time could be set by Vim's
+['updatetime'][] option. If your pdf viewer crashes when updates happen, you can
+try to set 'updatetime' to a higher value to make it update less frequently. The
+suggested value of 'updatetime' is `1000`.
+
+If the root file is not the file you are currently editing, you can specify it
+by executing `:LLPStartPreview <root-filename>` or executing `:LLPStartPreview`
+with the following declaration in the first line of your source file:
+
+```latex
+% !TEX root = <root-filename>
+```
+
+The path to the root file can be an absolute path or a relative path, in which
+case it is **relative to the parent directory of the current file**.
+
+:warning: if `<root-filename>` contains special characters (such as space), they
+must be escaped manually.
+
+Configuration
+-------------
+
+### PDF viewer
+
+By default, you need to have [evince][] or [okular][] installed as pdf viewers.
+But you can specify your own viewer by setting `g:livepreview_previewer`
+option in your `.vimrc`:
+
+```vim
+let g:livepreview_previewer = 'your_viewer'
+```
+
+Please note that not every pdf viewer could work with this plugin. Currently
+evince and okular are known to work well. You can find a list of known working
+pdf viewers [here](https://github.com/xuhdev/vim-latex-live-preview/wiki/Known-Working-PDF-Viewers).
+
+### TeX engine
+
+`LLP` uses `pdflatex` as default engine to output a PDF to be previewed. It
+fallbacks to `xelatex` if `pdflatex` is not present. These defaults can be
+overridden by setting `g:livepreview_engine` variable:
+
+```vim
+let g:livepreview_engine = 'your_engine' . ' [options]'
+```
+
+Known issues
+------------
+
+### Swap error
+
+An error `E768: Swap file exists` may occur. See
+[issue #7](https://github.com/xuhdev/vim-latex-live-preview/issues/7) to avoid
+swap filename collision.
+
+### Project tree
+
+Currently, root file must be in the same directory or upper in the project tree
+(otherwise, one has to save file to update the preview).
+
+### E492: Not an editor command: LLPStartPreview
+Check Issue [#12](https://github.com/xuhdev/vim-latex-live-preview/issues/12), provided the plugin is correctly installed, this is likely a **Python** issue.
+
+### Python-related Issues 
+
+* 2.7 vs 3.5: 
+This is an ongoing issue: [#12](https://github.com/xuhdev/vim-latex-live-preview/issues/12)
+
+* python/dyn
+See Issue [#24](https://github.com/xuhdev/vim-latex-live-preview/issues/24), currently ```vim-latex-live-preview``` does not support ```python/dyn``` and Vim must be recompiled with Python support. 
+
+
+Screenshot
+----------
+
+![Screenshot with Evince](misc/screenshot-evince.gif)
+
+<!--
+The screenshot is at ./misc/screenshot-evince.gif
+-->
+
+['updatetime']: http://vimdoc.sourceforge.net/htmldoc/options.html#%27updatetime%27
+[evince]: http://projects.gnome.org/evince/
+[okular]: http://okular.kde.org/
diff --git a/vim/plugins/vim-latex-live-preview/doc/vim-latex-live-preview.txt b/vim/plugins/vim-latex-live-preview/doc/vim-latex-live-preview.txt
new file mode 100644
index 0000000..6b12077
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/doc/vim-latex-live-preview.txt
@@ -0,0 +1,31 @@
+*vim-latex-live-preview.txt*
+
+File: vim-latex-live-preview.txt
+Version: 0.1.0
+Original Author and Current Maintainer: Hong Xu <hong@topbug.net>
+Last Change: 16 Apr 2013
+Homepage: https://github.com/xuhdev/vim-latex-live-preview#readme
+Git repo: https://github.com/xuhdev/vim-latex-live-preview
+Description: A Vim Plugin for Lively Previewing LaTeX PDF Output
+ 
+License:
+    Copyright (C) 2012-2013 Hong Xu
+
+    This file is part of vim-latex-live-preview.
+
+    vim-latex-live-preview 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 3 of the License, or (at your
+    option) any later version.
+
+    vim-latex-live-preview 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 vim-latex-live-preview.  If not, see <http://www.gnu.org/licenses/>.
+
+Please see the README file for documentation:
+
+https://github.com/xuhdev/vim-latex-live-preview#readme
diff --git a/vim/plugins/vim-latex-live-preview/misc/mkzip.sh b/vim/plugins/vim-latex-live-preview/misc/mkzip.sh
new file mode 100755
index 0000000..f471f79
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/misc/mkzip.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+zip vim-latex-live-preview.zip ../plugin/*.vim ../doc/*.txt
diff --git a/vim/plugins/vim-latex-live-preview/misc/screenshot-evince.gif b/vim/plugins/vim-latex-live-preview/misc/screenshot-evince.gif
new file mode 100644
index 0000000..4af494e
Binary files /dev/null and b/vim/plugins/vim-latex-live-preview/misc/screenshot-evince.gif differ
diff --git a/vim/plugins/vim-latex-live-preview/plugin/latexlivepreview.vim b/vim/plugins/vim-latex-live-preview/plugin/latexlivepreview.vim
new file mode 100644
index 0000000..f4a315a
--- /dev/null
+++ b/vim/plugins/vim-latex-live-preview/plugin/latexlivepreview.vim
@@ -0,0 +1,276 @@
+" Copyright (C) 2012 Hong Xu
+
+" This file is part of vim-live-preview.
+
+" vim-live-preview 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 3 of the License, or (at your option)
+" any later version.
+
+" vim-live-preview 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
+" vim-live-preview.  If not, see <http://www.gnu.org/licenses/>.
+
+
+if v:version < 700
+    finish
+endif
+
+" Check whether this script is already loaded
+if exists("g:loaded_vim_live_preview")
+    finish
+endif
+let g:loaded_vim_live_preview = 1
+
+" Check mkdir feature
+if (!exists("*mkdir"))
+    echohl ErrorMsg
+    echo 'vim-llp: mkdir required'
+    echohl None
+    finish
+endif
+
+" Setup python
+if (has('python3'))
+    let s:py_exe = 'python3'
+elseif (has('python'))
+    let s:py_exe = 'python'
+else
+    echohl ErrorMsg
+    echo 'vim-llp: python required'
+    echohl None
+    finish
+endif
+
+let s:saved_cpo = &cpo
+set cpo&vim
+
+let s:previewer = ''
+
+" Run a shell command in background
+function! s:RunInBackground(cmd)
+
+execute s:py_exe "<< EEOOFF"
+
+try:
+    subprocess.Popen(
+            vim.eval('a:cmd'),
+            shell = True,
+            universal_newlines = True,
+            stdout=open(os.devnull, 'w'), stderr=subprocess.STDOUT)
+
+except:
+    pass
+EEOOFF
+endfunction
+
+function! s:Compile()
+
+    if !exists('b:livepreview_buf_data') ||
+                \ has_key(b:livepreview_buf_data, 'preview_running') == 0
+        return
+    endif
+
+    " Change directory to handle properly sourced files with \input and bib
+    " TODO: get rid of lcd
+    execute 'lcd ' . b:livepreview_buf_data['root_dir']
+
+    " Write the current buffer in a temporary file
+    silent exec 'write! ' . b:livepreview_buf_data['tmp_src_file']
+
+    call s:RunInBackground(b:livepreview_buf_data['run_cmd'])
+
+    lcd -
+endfunction
+
+function! s:StartPreview(...)
+    let b:livepreview_buf_data = {}
+
+    let b:livepreview_buf_data['py_exe'] = s:py_exe
+
+    " Create a temp directory for current buffer
+    execute s:py_exe "<< EEOOFF"
+vim.command("let b:livepreview_buf_data['tmp_dir'] = '" +
+        tempfile.mkdtemp(prefix="vim-latex-live-preview-") + "'")
+EEOOFF
+
+    let b:livepreview_buf_data['tmp_src_file'] =
+                \ b:livepreview_buf_data['tmp_dir'] .
+                \ expand('%:p:r')
+
+    " Guess the root file which will be compiled, using first the argument
+    " passed, then the first line declaration of the source file and
+    " eventually fallback to the current file.
+    " TODO: emulate -parse-first-line properly
+    let l:root_line = substitute(getline(1),
+                \ '\v^\s*\%\s*!tex\s*root\s*\=\s*(.*)\s*$',
+                \ '\1', '')
+    if (a:0 > 0)
+        let l:root_file = fnamemodify(a:1, ':p')
+    elseif (l:root_line != getline(1) && strlen(l:root_line) > 0)                       " TODO: existence of `% !TEX` declaration condition must be cleaned...
+        let l:root_file = fnamemodify(l:root_line, ':p')
+    else
+        let l:root_file = b:livepreview_buf_data['tmp_src_file']
+    endif
+
+    " Hack for complex project trees: recreate the tree in tmp_dir
+    " Build tree for tmp_src_file (copy of the current buffer)
+    let l:tmp_src_dir = fnamemodify(b:livepreview_buf_data['tmp_src_file'], ':p:h')
+    if (!isdirectory(l:tmp_src_dir))
+        silent call mkdir(l:tmp_src_dir, 'p')
+    endif
+    " Build tree for root_file (main tex file, which might be tmp_src_file,
+    " ie. the current file)
+    if (l:root_file == b:livepreview_buf_data['tmp_src_file'])                          " if root file is the current file
+        let l:tmp_root_dir = l:tmp_src_dir
+    else
+        let l:tmp_root_dir = b:livepreview_buf_data['tmp_dir'] . fnamemodify(l:root_file, ':p:h')
+        if (!isdirectory(l:tmp_root_dir))
+            silent call mkdir(l:tmp_root_dir, 'p')
+        endif
+    endif
+
+    " Escape pathnames
+    let l:root_file = fnameescape(l:root_file)
+    let l:tmp_root_dir = fnameescape(l:tmp_root_dir)
+    let b:livepreview_buf_data['tmp_dir'] = fnameescape(b:livepreview_buf_data['tmp_dir'])
+    let b:livepreview_buf_data['tmp_src_file'] = fnameescape(b:livepreview_buf_data['tmp_src_file'])
+
+    " Change directory to handle properly sourced files with \input and bib
+    " TODO: get rid of lcd
+    if (l:root_file == b:livepreview_buf_data['tmp_src_file'])                          " if root file is the current file
+        let b:livepreview_buf_data['root_dir'] = fnameescape(expand('%:p:h'))
+    else
+        let b:livepreview_buf_data['root_dir'] = fnamemodify(l:root_file, ':p:h')
+    endif
+    execute 'lcd ' . b:livepreview_buf_data['root_dir']
+
+    " Write the current buffer in a temporary file
+    silent exec 'write! ' . b:livepreview_buf_data['tmp_src_file']
+
+    let l:tmp_out_file = l:tmp_root_dir . '/' .
+                \ fnamemodify(l:root_file, ':t:r') . '.pdf'
+
+    let b:livepreview_buf_data['run_cmd'] =
+                \ 'env ' .
+                \       'TEXMFOUTPUT=' . l:tmp_root_dir . ' ' .
+                \       'TEXINPUTS=' . l:tmp_root_dir
+                \                    . ':' . b:livepreview_buf_data['root_dir']
+                \                    . ': ' .
+                \ s:engine . ' ' .
+                \       '-shell-escape ' .
+                \       '-interaction=nonstopmode ' .
+                \       '-output-directory=' . l:tmp_root_dir . ' ' .
+                \       l:root_file
+                " lcd can be avoided thanks to root_dir in TEXINPUTS
+
+    silent call system(b:livepreview_buf_data['run_cmd'])
+    if v:shell_error != 0
+        echo 'Failed to compile'
+        lcd -
+        return
+    endif
+
+    " Enable compilation of bibliography:
+    let l:bib_files = split(glob(b:livepreview_buf_data['root_dir'] . '/**/*.bib'))     " TODO: fails if unused bibfiles
+    if len(l:bib_files) > 0
+        for bib_file in l:bib_files
+            let bib_fn = fnamemodify(bib_file, ':t')
+            call writefile(readfile(bib_file),
+                        \ l:tmp_root_dir . '/' . bib_fn)                                " TODO: may fail if same bibfile names in different dirs
+        endfor
+
+        " Update compile command with bibliography
+        let b:livepreview_buf_data['run_cmd'] =
+                \       'env ' .
+                \               'TEXMFOUTPUT=' . l:tmp_root_dir . ' ' .
+                \               'TEXINPUTS=' . l:tmp_root_dir
+                \                            . ':' . b:livepreview_buf_data['root_dir']
+                \                            . ': ' .
+                \       'bibtex ' . l:tmp_root_dir . '/*.aux' .
+                \ ' && ' .
+                \       b:livepreview_buf_data['run_cmd']
+
+        silent call system(b:livepreview_buf_data['run_cmd'])
+    endif
+    if v:shell_error != 0
+        echo 'Failed to compile bibliography'
+        lcd -
+        return
+    endif
+
+    call s:RunInBackground(s:previewer . ' ' . l:tmp_out_file)
+
+    lcd -
+
+    let b:livepreview_buf_data['preview_running'] = 1
+endfunction
+
+" Initialization code
+function! s:Initialize()
+    let l:ret = 0
+    execute s:py_exe "<< EEOOFF"
+try:
+    import vim
+    import tempfile
+    import subprocess
+    import os
+except:
+    vim.command('let l:ret = 1')
+EEOOFF
+
+    if l:ret != 0
+        return 'Python initialization failed.'
+    endif
+
+    " Get the tex engine
+    if exists('g:livepreview_engine')
+        let s:engine = g:livepreview_engine
+    else
+        for possible_engine in ['pdflatex', 'xelatex']
+            if executable(possible_engine)
+                let s:engine = possible_engine
+                break
+            endif
+        endfor
+    endif
+
+    " Get the previewer
+    if exists('g:livepreview_previewer')
+        let s:previewer = g:livepreview_previewer
+    else
+        for possible_previewer in ['evince', 'okular']
+            if executable(possible_previewer)
+                let s:previewer = possible_previewer
+                break
+            endif
+        endfor
+    endif
+
+    return 0
+endfunction
+
+
+let s:init_msg = s:Initialize()
+
+if type(s:init_msg) == type('')
+    echohl ErrorMsg
+    echo 'vim-live-preview: ' . s:init_msg
+    echohl None
+endif
+
+unlet! s:init_msg
+
+command! -nargs=* LLPStartPreview call s:StartPreview(<f-args>)
+
+autocmd CursorHold,CursorHoldI,BufWritePost * call s:Compile()
+
+let &cpo = s:saved_cpo
+unlet! s:saved_cpo
+
+" vim703: cc=80
+" vim:fdm=marker et ts=4 tw=78 sw=4
diff --git a/vim/plugins/vim-nerdtree-tabs/.gitignore b/vim/plugins/vim-nerdtree-tabs/.gitignore
new file mode 100644
index 0000000..926ccaa
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/.gitignore
@@ -0,0 +1 @@
+doc/tags
diff --git a/vim/plugins/vim-nerdtree-tabs/CHANGELOG.md b/vim/plugins/vim-nerdtree-tabs/CHANGELOG.md
new file mode 100644
index 0000000..dcdca99
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/CHANGELOG.md
@@ -0,0 +1,113 @@
+# vim-nerdtree-tabs changelog
+
+## v1.4.7
+
+* Add smart auto NERDTree open.
+
+## v1.4.6
+
+* Add NERDTreeTabsFind function.
+
+## v1.4.5
+
+* Add NERDTreeFocusToggle function. (Thanks orthez.)
+
+* More general refactoring and cleanup. (Thanks techlivezheng.)
+
+## v1.4.4
+
+* Option to always focus file window after startup. (Thanks rr-.)
+
+## v1.4.3
+
+* Partial fix for #32. When directory is given as an argument, two nerdtrees
+  are open, but both now point into the correct directory. (Thanks szajbus.)
+
+## v1.4.2
+
+* Friendlier when using together with MiniBufExplorer. (Thanks techlivezheng.)
+
+* Do not open NERDTree by default when starting Vim in diff mode. (Thanks
+  techlivezheng.)
+
+## v1.4.1
+
+* Fix "cd into" feature for paths that include spaces. (Thanks nybblr.)
+
+## v1.4.0
+
+* When synchronizing NERDTree scroll and cursor position, synchronize also
+  NERDTree window width. (Thanks EinfachToll.)
+
+* When Vim is given a directory as a parameter, `:cd` into it. (Thanks DAddYE.)
+
+* New commands `NERDTreeTabsOpen`, `NERDTreeTabsClose` and
+  `NERDTreeMirrorOpen`. They are not a new functionality, just externalize
+  stuff that was previously accessible only inside the plugin.
+
+* New commands `NERDTreeSteppedOpen` and `NERDTreeSteppedClose` for combined
+  opening/closing of a NERDTree and focus switching. Works locally for a tab.
+  (Thanks ereOn.)
+
+* Fixed an error when restoring a session caused by accessing an undefined
+  variable. (Thanks ereOn.)
+
+* Fixed opening two NERDTrees when `NERDTreeHijackNetrw = 1` and launching
+  with a directory name as a parameter.
+
+## v1.3.0
+
+* Focus synchronization - ability to have focus on NERDTree after tab switch
+  if and only if it was focused before tab switch. Switched on by default.
+
+## v1.2.1
+
+* Smart startup focus fixed.
+
+## v1.2.0
+
+* Loading process refactoring (should fix some glitches and hopefully not
+  break anything else). Directory structure has changed in this release,
+  a new pull of the repository is required for the plugin to work properly.
+
+## v1.1.2
+
+* Smart focus - on startup, focus NERDTree if opening a directory, focus the
+  file when opening a file.
+
+## v1.1.1
+
+* About 50% speedup when toggling NERDTree on across all tabs.
+
+## v1.1.0
+
+* Meaningful tab names feature doesn't collide with opening new tabs silently.
+  To accomplish that, tab switching now preserves window focus. The original
+  behavior that always kept focus in the window with file being edited can be
+  restored by `let g:nerdtree_tabs_focus_on_files = 1`.
+* Removed glitches when sourcing the plugin more than once.
+
+## v1.0.1
+
+* Plugin is usable with vundle.
+
+## v1.0.0
+
+* NERDTree view synchronization (cursor position and scroll) across tabs
+* Fix: focus is now on NERDTree when opening it in all tabs.
+* If you create more NERDTree instances, nerdtree-tabs now tries hard to sync
+  all tabs to the last opened one.
+
+## v0.2.0
+
+* Better solution for opening NERDTree on tab creation (fixes wrong behavior in
+  improbable situations)
+* Global variables for configuration
+* Tab autoclose
+* Option to open NERDTree on console vim startup, stays false by default
+* Readme
+
+
+## v0.1.0
+
+* New mappings and a command, otherwise original functionality preserved while making it namespaced
diff --git a/vim/plugins/vim-nerdtree-tabs/LICENSE b/vim/plugins/vim-nerdtree-tabs/LICENSE
new file mode 100644
index 0000000..67db858
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/LICENSE
@@ -0,0 +1,175 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
diff --git a/vim/plugins/vim-nerdtree-tabs/README.md b/vim/plugins/vim-nerdtree-tabs/README.md
new file mode 100644
index 0000000..cc8ca31
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/README.md
@@ -0,0 +1,146 @@
+# NERDTree and tabs together in Vim, painlessly
+
+## Features
+
+This plugin aims at making NERDTree feel like a true panel, independent of tabs.
+
+* **Just one NERDTree**, always and ever. It will always look the same in
+  all tabs, including expanded/collapsed nodes, scroll position etc.
+
+* Open in all tabs / close in all tabs. Do this via `:NERDTreeTabsToggle`
+
+* Meaningful tab captions for inactive tabs. No more captions like 'NERD_tree_1'.
+
+* When you close a file, the tab closes with it. No NERDTree hanging open.
+
+* Autoopen NERDTree on GVim / MacVim startup.
+
+Many of these features can be switched off. See section Configuration.
+
+## Installation
+
+1. If you haven't already, install NERDTree (see https://github.com/scrooloose/nerdtree)
+
+2.  Install the plugin **through Pathogen**:
+
+        cd ~/.vim/bundle
+        git clone https://github.com/jistr/vim-nerdtree-tabs.git
+
+    Or **through Vundle**:
+
+        Bundle 'jistr/vim-nerdtree-tabs'
+
+    Or **through Janus**:
+
+        cd ~/.janus
+        git clone https://github.com/jistr/vim-nerdtree-tabs.git
+
+3. Map :NERDTreeTabsToggle command to some combo so you don't have to type it.
+   Alternatively, you can use plug-mapping instead of a command, like this:
+
+        map <Leader>n <plug>NERDTreeTabsToggle<CR>
+
+4. Celebrate.
+
+## Commands and Mappings
+
+Vim-nerdtree-tabs provides these commands:
+
+* `:NERDTreeTabsOpen` switches NERDTree on for all tabs.
+
+* `:NERDTreeTabsClose` switches NERDTree off for all tabs.
+
+* `:NERDTreeTabsToggle` toggles NERDTree on/off for all tabs.
+
+* `:NERDTreeTabsFind` find currently opened file and select it
+
+* `:NERDTreeMirrorOpen` acts as `:NERDTreeMirror`, but smarter: When opening,
+  it first tries to use an existing tree (i.e. previously closed in this tab or
+  perform a mirror of another tab's tree). If all this fails, a new tree is
+  created. It is recommended that you use this command instead of
+  `:NERDTreeMirror`.
+
+* `:NERDTreeMirrorToggle` toggles NERDTree on/off in current tab, using
+  the same behavior as `:NERDTreeMirrorOpen`.
+
+* `:NERDTreeSteppedOpen` focuses the NERDTree, opening one first if none is present.
+
+* `:NERDTreeSteppedClose` unfocuses the NERDTree, or closes/hides it if it was
+  not focused.
+
+* `:NERDTreeFocusToggle` focus the NERDTree or create it if focus is
+  on a file, unfocus NERDTree if focus is on NERDTree
+
+There are also plug-mappings available with the same functionality:
+
+* `<plug>NERDTreeTabsOpen`
+* `<plug>NERDTreeTabsClose`
+* `<plug>NERDTreeTabsToggle`
+* `<plug>NERDTreeTabsFind`
+* `<plug>NERDTreeMirrorOpen`
+* `<plug>NERDTreeMirrorToggle`
+* `<plug>NERDTreeSteppedOpen`
+* `<plug>NERDTreeSteppedClose`
+
+## Configuration
+
+You can switch on/off some features of the plugin by setting global vars to 1
+(for on) or 0 (for off) in your vimrc. Here are the options and their default
+values:
+
+* `g:nerdtree_tabs_open_on_gui_startup` (default: `1`)  
+  Open NERDTree on gvim/macvim startup. (When set to `2`, 
+  open only if directory was given as startup argument).
+
+* `g:nerdtree_tabs_open_on_console_startup` (default: `0`)  
+  Open NERDTree on console vim startup. (When set to `2`, 
+  open only if directory was given as startup argument).
+
+* `g:nerdtree_tabs_no_startup_for_diff` (default: `1`)  
+  Do not open NERDTree if vim starts in diff mode
+
+* `g:nerdtree_tabs_smart_startup_focus` (default: `1`)  
+  On startup, focus NERDTree if opening a directory, focus file if opening
+  a file. (When set to `2`, always focus file window after startup).
+
+* `g:nerdtree_tabs_open_on_new_tab` (default: `1`)  
+  Open NERDTree on new tab creation (if NERDTree was globally opened by
+  :NERDTreeTabsToggle)
+
+* `g:nerdtree_tabs_meaningful_tab_names` (default: `1`)  
+  Unfocus NERDTree when leaving a tab for descriptive tab names
+
+* `g:nerdtree_tabs_autoclose` (default: `1`)  
+  Close current tab if there is only one window in it and it's NERDTree
+
+* `g:nerdtree_tabs_synchronize_view` (default: `1`)  
+  Synchronize view of all NERDTree windows (scroll and cursor position)
+
+* `g:nerdtree_tabs_synchronize_focus` (default: `1`)  
+  Synchronize focus when switching windows (focus NERDTree after tab switch
+  if and only if it was focused before tab switch)
+
+* `g:nerdtree_tabs_focus_on_files` (default: `0`)  
+  When switching into a tab, make sure that focus is on the file window,
+  not in the NERDTree window. (Note that this can get annoying if you use
+  NERDTree's feature "open in new tab silently", as you will lose focus on the
+  NERDTree.)
+
+* `g:nerdtree_tabs_startup_cd` (default: `1`)  
+  When given a directory name as a command line parameter when launching Vim,
+  `:cd` into it.
+
+* `g:nerdtree_tabs_autofind` (default: `0`)  
+  Automatically find and select currently opened file in NERDTree.
+
+### Example
+
+To run NERDTreeTabs on console vim startup, put into your .vimrc:
+
+    let g:nerdtree_tabs_open_on_console_startup=1
+
+## Credits
+
+The tab autoclose feature is stolen from Carl Lerche & Yehuda Katz's
+[Janus](https://github.com/carlhuda/janus). Thanks, guys!
+
diff --git a/vim/plugins/vim-nerdtree-tabs/doc/vim-nerdtree-tabs.txt b/vim/plugins/vim-nerdtree-tabs/doc/vim-nerdtree-tabs.txt
new file mode 100644
index 0000000..95335fb
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/doc/vim-nerdtree-tabs.txt
@@ -0,0 +1,123 @@
+# NERDTree and tabs together in Vim, painlessly          *vim-nerdtree-tabs*
+                                                             *nerdtree-tabs*
+
+## Installation
+
+1. Copy the plugin to your vim config dir (via pathogen or any way you want).
+
+2. Map :NERDTreeTabsToggle command to some combo so you don't have to type it.
+   Alternatively, you can use plug-mapping instead of a command, like this:
+
+        map <Leader>n <plug>NERDTreeTabsToggle<CR>
+
+3. Celebrate.
+
+## Features
+
+In short, this vim plugin aims at making **NERDTree feel like a true panel**,
+independent of tabs. That is done by keeping NERDTree synchronized between
+tabs as much as possible. Read on for details.
+
+### One command, open everywhere, close everywhere
+
+You'll get a new command: `:NERDTreeTabsToggle`
+
+For the needs of most of us, this will be the only command needed to operate
+NERDTree. Press it once, NERDTree opens in all tabs (even in new tabs created
+from now on); press it again, NERDTree closes in all tabs.
+
+### Just one NERDTree
+
+Tired of having a fully collapsed NERDTree every time you open a new tab?
+Vim-nerdtree-tabs will keep them all synchronized. You will get just one
+NERDTree buffer for all your tabs.
+
+### Sync to the max
+
+All NERDTree windows will always have the same scroll and cursor position.
+
+### Meaningful tab captions
+
+You know the feeling when you want to switch to *that file* and you have 8 tabs
+open and they are all named 'NERD_tree_1'? Won't happen again. When leaving
+a tab, vim-nerdtree-tabs moves focus out of NERDTree so that the tab caption is
+the name of the file you are editing.
+
+### Close the file = close the tab
+
+A tab with NERDTree and a file won't hang open when you close the file window.
+NERDTree will close automatically and so will the tab.
+
+### Autoopen on startup
+
+NERDTree will open automatically on GVim/MacVim startup. You can configure it
+to open on console Vim as well, but this is disabled by default.
+
+## Commands and mappings
+
+Vim-nerdtree-tabs defines two commands:
+                                                          *:NERDTreeTabsToggle*
+* `:NERDTreeTabsToggle` switches NERDTree on/off for all tabs.
+
+                                                        *:NERDTreeMirrorToggle*
+* `:NERDTreeMirrorToggle` acts as `:NERDTreeToggle`, but smarter: When opening,
+  it first tries to use an existing tree (i.e. previously closed in this tab or
+  perform a mirror of another tab's tree). If all this fails, a new tree is
+  created. **It is recommended that you always use this command instead of
+  `:NERDTreeToggle`.**
+
+There are also plug-mappings available with the same functionality:
+
+* `<plug>NERDTreeTabsToggle`
+* `<plug>NERDTreeMirrorToggle`
+
+## Configuration
+
+You can switch on/off some features of the plugin by setting global vars to 1
+(for on) or 0 (for off) in your vimrc. Here are the options and their default
+values:
+
+* `let g:nerdtree_tabs_open_on_gui_startup = 1`  
+  Open NERDTree on gvim/macvim startup
+
+* `let g:nerdtree_tabs_open_on_console_startup = 0`  
+  Open NERDTree on console vim startup
+
+* `let g:nerdtree_tabs_no_startup_for_diff = 1`  
+  Do not open NERDTree if vim starts in diff mode
+
+* `let g:nerdtree_tabs_smart_startup_focus = 1`  
+  On startup - focus NERDTree when opening a directory, focus the file if
+  editing a specified file. When set to `2`, always focus file after startup.
+
+* `let g:nerdtree_tabs_open_on_new_tab = 1`  
+  Open NERDTree on new tab creation (if NERDTree was globally opened by
+  :NERDTreeTabsToggle)
+
+* `let g:nerdtree_tabs_meaningful_tab_names = 1`  
+  Unfocus NERDTree when leaving a tab for descriptive tab names
+
+* `let g:nerdtree_tabs_autoclose = 1`  
+  Close current tab if there is only one window in it and it's NERDTree
+
+* `let g:nerdtree_tabs_synchronize_view = 1`  
+  Synchronize view of all NERDTree windows (scroll and cursor position)
+
+* `let g:nerdtree_tabs_synchronize_focus = 1`  
+  Synchronize focus when switching tabs (focus NERDTree after tab switch
+  if and only if it was focused before tab switch)
+
+* `let g:nerdtree_tabs_focus_on_files = 0`  
+  When switching into a tab, make sure that focus is on the file window,
+  not in the NERDTree window. (Note that this can get annoying if you use
+  NERDTree's feature "open in new tab silently", as you will lose focus on the
+  NERDTree.)
+
+* `g:nerdtree_tabs_startup_cd = 1`  
+  When starting up with a directory name as a parameter, cd into it
+
+## Credits
+
+* The tab autoclose feature is stolen from Carl Lerche & Yehuda Katz's
+  [Janus](https://github.com/carlhuda/janus). Thanks, guys!
+
diff --git a/vim/plugins/vim-nerdtree-tabs/nerdtree_plugin/vim-nerdtree-tabs.vim b/vim/plugins/vim-nerdtree-tabs/nerdtree_plugin/vim-nerdtree-tabs.vim
new file mode 100644
index 0000000..8a2de2f
--- /dev/null
+++ b/vim/plugins/vim-nerdtree-tabs/nerdtree_plugin/vim-nerdtree-tabs.vim
@@ -0,0 +1,631 @@
+" === plugin configuration variables === {{{
+"
+" Open NERDTree on gvim/macvim startup. When set to `2`,
+" open only if directory was given as startup argument.
+if !exists('g:nerdtree_tabs_open_on_gui_startup')
+  let g:nerdtree_tabs_open_on_gui_startup = 1
+endif
+
+" Open NERDTree on console vim startup (off by default). When set to `2`,
+" open only if directory was given as startup argument.
+if !exists('g:nerdtree_tabs_open_on_console_startup')
+  let g:nerdtree_tabs_open_on_console_startup = 0
+endif
+
+" do not open NERDTree if vim starts in diff mode
+if !exists('g:nerdtree_tabs_no_startup_for_diff')
+    let g:nerdtree_tabs_no_startup_for_diff = 1
+endif
+
+" On startup - focus NERDTree when opening a directory, focus the file if
+" editing a specified file. When set to `2`, always focus file after startup.
+if !exists('g:nerdtree_tabs_smart_startup_focus')
+  let g:nerdtree_tabs_smart_startup_focus = 1
+endif
+
+" Open NERDTree on new tab creation if NERDTree was globally opened
+" by :NERDTreeTabsToggle
+if !exists('g:nerdtree_tabs_open_on_new_tab')
+  let g:nerdtree_tabs_open_on_new_tab = 1
+endif
+
+" unfocus NERDTree when leaving a tab so that you have descriptive tab names
+" and not names like 'NERD_tree_1'
+if !exists('g:nerdtree_tabs_meaningful_tab_names')
+  let g:nerdtree_tabs_meaningful_tab_names = 1
+endif
+
+" close current tab if there is only one window in it and it's NERDTree
+if !exists('g:nerdtree_tabs_autoclose')
+  let g:nerdtree_tabs_autoclose = 1
+endif
+
+" synchronize view of all NERDTree windows (scroll and cursor position)
+if !exists('g:nerdtree_tabs_synchronize_view')
+  let g:nerdtree_tabs_synchronize_view = 1
+endif
+
+" synchronize focus when switching tabs (focus NERDTree after tab switch
+" if and only if it was focused before tab switch)
+if !exists('g:nerdtree_tabs_synchronize_focus')
+  let g:nerdtree_tabs_synchronize_focus = 1
+endif
+
+" when switching into a tab, make sure that focus will always be in file
+" editing window, not in NERDTree window (off by default)
+if !exists('g:nerdtree_tabs_focus_on_files')
+  let g:nerdtree_tabs_focus_on_files = 0
+endif
+
+" when starting up with a directory name as a parameter, cd into it
+if !exists('g:nerdtree_tabs_startup_cd')
+  let g:nerdtree_tabs_startup_cd = 1
+endif
+
+" automatically find and select currently opened file
+if !exists('g:nerdtree_tabs_autofind')
+  let g:nerdtree_tabs_autofind = 0
+endif
+"
+" }}}
+" === plugin mappings === {{{
+"
+noremap <silent> <script> <Plug>NERDTreeTabsOpen     :call <SID>NERDTreeOpenAllTabs()
+noremap <silent> <script> <Plug>NERDTreeTabsClose    :call <SID>NERDTreeCloseAllTabs()
+noremap <silent> <script> <Plug>NERDTreeTabsToggle   :call <SID>NERDTreeToggleAllTabs()
+noremap <silent> <script> <Plug>NERDTreeTabsFind     :call <SID>NERDTreeFindFile()
+noremap <silent> <script> <Plug>NERDTreeMirrorOpen   :call <SID>NERDTreeMirrorOrCreate()
+noremap <silent> <script> <Plug>NERDTreeMirrorToggle :call <SID>NERDTreeMirrorToggle()
+noremap <silent> <script> <Plug>NERDTreeSteppedOpen  :call <SID>NERDTreeSteppedOpen()
+noremap <silent> <script> <Plug>NERDTreeSteppedClose :call <SID>NERDTreeSteppedClose()
+noremap <silent> <script> <Plug>NERDTreeFocusToggle  :call <SID>NERDTreeFocusToggle()
+"
+" }}}
+" === plugin commands === {{{
+"
+command! NERDTreeTabsOpen     call <SID>NERDTreeOpenAllTabs()
+command! NERDTreeTabsClose    call <SID>NERDTreeCloseAllTabs()
+command! NERDTreeTabsToggle   call <SID>NERDTreeToggleAllTabs()
+command! NERDTreeTabsFind     call <SID>NERDTreeFindFile()
+command! NERDTreeMirrorOpen   call <SID>NERDTreeMirrorOrCreate()
+command! NERDTreeMirrorToggle call <SID>NERDTreeMirrorToggle()
+command! NERDTreeSteppedOpen  call <SID>NERDTreeSteppedOpen()
+command! NERDTreeSteppedClose call <SID>NERDTreeSteppedClose()
+command! NERDTreeFocusToggle  call <SID>NERDTreeFocusToggle()
+"
+" }}}
+" === plugin functions === {{{
+"
+" === NERDTree manipulation (opening, closing etc.) === {{{
+"
+" s:NERDTreeMirrorOrCreate() {{{
+"
+" switch NERDTree on for current tab -- mirror it if possible, otherwise create it
+fun! s:NERDTreeMirrorOrCreate()
+  let l:nerdtree_open = s:IsNERDTreeOpenInCurrentTab()
+
+  " if NERDTree is not active in the current tab, try to mirror it
+  if !l:nerdtree_open
+    let l:previous_winnr = winnr("$")
+
+    silent NERDTreeMirror
+
+    " if the window count of current tab didn't increase after NERDTreeMirror,
+    " it means NERDTreeMirror was unsuccessful and a new NERDTree has to be created
+    if l:previous_winnr == winnr("$")
+      silent NERDTreeToggle
+    endif
+  endif
+endfun
+
+" }}}
+" s:NERDTreeMirrorToggle() {{{
+"
+" toggle NERDTree in current tab, use mirror if possible
+fun! s:NERDTreeMirrorToggle()
+  let l:nerdtree_open = s:IsNERDTreeOpenInCurrentTab()
+
+  if l:nerdtree_open
+    silent NERDTreeClose
+  else
+    call s:NERDTreeMirrorOrCreate()
+  endif
+endfun
+
+" }}}
+" s:NERDTreeOpenAllTabs() {{{
+"
+" switch NERDTree on for all tabs while making sure there is only one NERDTree buffer
+fun! s:NERDTreeOpenAllTabs()
+  let s:nerdtree_globally_active = 1
+
+  " tabdo doesn't preserve current tab - save it and restore it afterwards
+  let l:current_tab = tabpagenr()
+  tabdo call s:NERDTreeMirrorOrCreate()
+  exe 'tabn ' . l:current_tab
+endfun
+
+" }}}
+" s:NERDTreeCloseAllTabs() {{{
+"
+" close NERDTree across all tabs
+fun! s:NERDTreeCloseAllTabs()
+  let s:nerdtree_globally_active = 0
+
+  " tabdo doesn't preserve current tab - save it and restore it afterwards
+  let l:current_tab = tabpagenr()
+  tabdo silent NERDTreeClose
+  exe 'tabn ' . l:current_tab
+endfun
+
+" }}}
+" s:NERDTreeToggleAllTabs() {{{
+"
+" toggle NERDTree in current tab and match the state in all other tabs
+fun! s:NERDTreeToggleAllTabs()
+  let l:nerdtree_open = s:IsNERDTreeOpenInCurrentTab()
+  let s:disable_handlers_for_tabdo = 1
+
+  if l:nerdtree_open
+    call s:NERDTreeCloseAllTabs()
+  else
+    call s:NERDTreeOpenAllTabs()
+    " force focus to NERDTree in current tab
+    if exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) != -1
+      exe bufwinnr(t:NERDTreeBufName) . "wincmd w"
+    endif
+  endif
+
+  let s:disable_handlers_for_tabdo = 0
+endfun
+
+" }}}
+" s:NERDTreeSteppedOpen() {{{
+"
+" focus the NERDTree view, creating one first if none is present
+fun! s:NERDTreeSteppedOpen()
+  if !s:IsCurrentWindowNERDTree()
+    if s:IsNERDTreeOpenInCurrentTab()
+      call s:NERDTreeFocus()
+    else
+      call s:NERDTreeMirrorOrCreate()
+    endif
+  endif
+endfun
+
+" }}}
+" s:NERDTreeSteppedClose{() {{{
+"
+" unfocus the NERDTree view or closes it if it hadn't had focus at the time of
+" the call
+fun! s:NERDTreeSteppedClose()
+  if s:IsCurrentWindowNERDTree()
+    call s:NERDTreeUnfocus()
+  else
+    let l:nerdtree_open = s:IsNERDTreeOpenInCurrentTab()
+
+    if l:nerdtree_open
+      silent NERDTreeClose
+    endif
+  endif
+endfun
+
+" }}}
+" s:NERDTreeFocusToggle() {{{
+"
+" focus the NERDTree view or creates it if in a file,
+" or unfocus NERDTree view if in NERDTree
+fun! s:NERDTreeFocusToggle()
+  let s:disable_handlers_for_tabdo = 1
+  if s:IsCurrentWindowNERDTree()
+    call s:NERDTreeUnfocus()
+  else
+    if !s:IsNERDTreeOpenInCurrentTab()
+      call s:NERDTreeOpenAllTabs()
+    endif
+    call s:NERDTreeFocus()
+  endif
+  let s:disable_handlers_for_tabdo = 0
+endfun
+" }}}
+"
+" === NERDTree manipulation (opening, closing etc.) === }}}
+" === focus functions === {{{
+"
+" s:NERDTreeFocus() {{{
+"
+" if the current window is NERDTree, move focus to the next window
+fun! s:NERDTreeFocus()
+  if !s:IsCurrentWindowNERDTree() && exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) != -1
+    exe bufwinnr(t:NERDTreeBufName) . "wincmd w"
+  endif
+endfun
+
+" }}}
+" s:NERDTreeUnfocus() {{{
+"
+" if the current window is NERDTree, move focus to the next window
+fun! s:NERDTreeUnfocus()
+  " save current window so that it's focus can be restored after switching
+  " back to this tab
+  let t:NERDTreeTabLastWindow = winnr()
+  if s:IsCurrentWindowNERDTree()
+    let l:winNum = s:NextNormalWindow()
+    if l:winNum != -1
+      exec l:winNum.'wincmd w'
+    else
+      wincmd w
+    endif
+  endif
+endfun
+
+" }}}
+" s:NERDTreeRestoreFocus() {{{
+"
+" restore focus to the window that was focused before leaving current tab
+fun! s:NERDTreeRestoreFocus()
+  if g:nerdtree_tabs_synchronize_focus
+    if s:is_nerdtree_globally_focused
+      call s:NERDTreeFocus()
+    elseif exists("t:NERDTreeTabLastWindow") && exists("t:NERDTreeBufName") && t:NERDTreeTabLastWindow != bufwinnr(t:NERDTreeBufName)
+      exe t:NERDTreeTabLastWindow . "wincmd w"
+    endif
+  elseif exists("t:NERDTreeTabLastWindow")
+    exe t:NERDTreeTabLastWindow . "wincmd w"
+  endif
+endfun
+
+" }}}
+" s:SaveGlobalFocus() {{{
+"
+fun! s:SaveGlobalFocus()
+  let s:is_nerdtree_globally_focused = s:IsCurrentWindowNERDTree()
+endfun
+
+" }}}
+" s:IfFocusOnStartup() {{{
+"
+fun! s:IfFocusOnStartup()
+  return strlen(bufname('$')) == 0 || !getbufvar('$', '&modifiable')
+endfun
+
+" }}}
+"
+" === focus functions === }}}
+" === utility functions === {{{
+"
+" s:NextNormalWindow() {{{
+"
+" find next window with a normal buffer
+fun! s:NextNormalWindow()
+  let l:i = 1
+  while(l:i <= winnr('$'))
+    let l:buf = winbufnr(l:i)
+
+    " skip unlisted buffers
+    if buflisted(l:buf) == 0
+      let l:i = l:i + 1
+      continue
+    endif
+
+    " skip un-modifiable buffers
+    if getbufvar(l:buf, '&modifiable') != 1
+      let l:i = l:i + 1
+      continue
+    endif
+
+    " skip temporary buffers with buftype set
+    if empty(getbufvar(l:buf, "&buftype")) != 1
+      let l:i = l:i + 1
+      continue
+    endif
+
+    return l:i
+  endwhile
+  return -1
+endfun
+
+" }}}
+" s:CloseIfOnlyNerdTreeLeft() {{{
+"
+" Close all open buffers on entering a window if the only
+" buffer that's left is the NERDTree buffer
+fun! s:CloseIfOnlyNerdTreeLeft()
+  if exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) != -1 && winnr("$") == 1
+    q
+  endif
+endfun
+
+" }}}
+" s:IsCurrentWindowNERDTree() {{{
+"
+" returns 1 if current window is NERDTree, false otherwise
+fun! s:IsCurrentWindowNERDTree()
+  return exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) == winnr()
+endfun
+
+" }}}
+" s:IsNERDTreeOpenInCurrentTab() {{{
+"
+" check if NERDTree is open in current tab
+fun! s:IsNERDTreeOpenInCurrentTab()
+  return exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) != -1
+endfun
+
+" }}}
+" s:IsNERDTreePresentInCurrentTab() {{{
+"
+" check if NERDTree is present in current tab (not necessarily visible)
+fun! s:IsNERDTreePresentInCurrentTab()
+  return exists("t:NERDTreeBufName")
+endfun
+
+" }}}
+"
+" === utility functions === }}}
+" === NERDTree view manipulation (scroll and cursor positions) === {{{
+"
+" s:SaveNERDTreeViewIfPossible() {{{
+"
+fun! s:SaveNERDTreeViewIfPossible()
+  if exists("t:NERDTreeBufName") && bufwinnr(t:NERDTreeBufName) == winnr()
+    " save scroll and cursor etc.
+    let s:nerdtree_view = winsaveview()
+
+    " save NERDTree window width
+    let s:nerdtree_width = winwidth(winnr())
+
+    " save buffer name (to be able to correct desync by commands spawning
+    " a new NERDTree instance)
+    let s:nerdtree_buffer = bufname("%")
+  endif
+endfun
+
+" }}}
+" s:RestoreNERDTreeViewIfPossible() {{{
+"
+fun! s:RestoreNERDTreeViewIfPossible()
+  " if nerdtree exists in current tab, it is the current window and if saved
+  " state is available, restore it
+  let l:view_state_saved = exists('s:nerdtree_view') && exists('s:nerdtree_width')
+  if s:IsNERDTreeOpenInCurrentTab() && l:view_state_saved
+    let l:current_winnr = winnr()
+    let l:nerdtree_winnr = bufwinnr(t:NERDTreeBufName)
+
+    " switch to NERDTree window
+    exe l:nerdtree_winnr . "wincmd w"
+    " load the correct NERDTree buffer if not already loaded
+    if exists('s:nerdtree_buffer') && t:NERDTreeBufName != s:nerdtree_buffer
+      silent NERDTreeClose
+      silent NERDTreeMirror
+    endif
+    " restore cursor, scroll and window width
+    call winrestview(s:nerdtree_view)
+    exe "vertical resize " . s:nerdtree_width
+
+    " switch back to whatever window was focused before
+    exe l:current_winnr . "wincmd w"
+  endif
+endfun
+
+" }}}
+" s:NERDTreeFindFile() {{{
+"
+fun! s:NERDTreeFindFile()
+  if s:IsNERDTreeOpenInCurrentTab()
+    silent NERDTreeFind
+  endif
+endfun
+
+" }}}
+"
+" === NERDTree view manipulation (scroll and cursor positions) === }}}
+"
+" === plugin functions ===  }}}
+" === plugin event handlers === {{{
+"
+" s:LoadPlugin() {{{
+"
+fun! s:LoadPlugin()
+  if exists('g:nerdtree_tabs_loaded')
+    return
+  endif
+
+  let g:NERDTreeHijackNetrw = 0
+
+  let s:disable_handlers_for_tabdo = 0
+
+  " global on/off NERDTree state
+  " the exists check is to enable script reloading without resetting the state
+  if !exists('s:nerdtree_globally_active')
+    let s:nerdtree_globally_active = 0
+  endif
+
+  " global focused/unfocused NERDTree state
+  " the exists check is to enable script reloading without resetting the state
+  if !exists('s:is_nerdtree_globally_focused')
+    call s:SaveGlobalFocus()
+  end
+
+  augroup NERDTreeTabs
+    autocmd!
+    autocmd VimEnter * call <SID>VimEnterHandler()
+    autocmd TabEnter * call <SID>TabEnterHandler()
+    autocmd TabLeave * call <SID>TabLeaveHandler()
+    autocmd WinEnter * call <SID>WinEnterHandler()
+    autocmd WinLeave * call <SID>WinLeaveHandler()
+    autocmd BufWinEnter * call <SID>BufWinEnterHandler()
+    autocmd BufRead * call <SID>BufReadHandler()
+  augroup END
+
+  let g:nerdtree_tabs_loaded = 1
+endfun
+
+" }}}
+" s:VimEnterHandler() {{{
+"
+fun! s:VimEnterHandler()
+  let l:open_nerd_tree_on_startup = (g:nerdtree_tabs_open_on_console_startup == 1 && !has('gui_running')) ||
+                                  \ (g:nerdtree_tabs_open_on_gui_startup == 1 && has('gui_running'))
+
+  let l:open_directory_on_startup = isdirectory(argv(0)) &&
+			  \ ((g:nerdtree_tabs_open_on_console_startup == 2 && !has('gui_running')) ||
+			  \ (g:nerdtree_tabs_open_on_gui_startup == 2 && has('gui_running')))
+
+  if g:nerdtree_tabs_no_startup_for_diff && &diff
+      let l:open_nerd_tree_on_startup = 0
+  endif
+
+  " this makes sure that globally_active is true when using 'gvim .'
+  let s:nerdtree_globally_active = l:open_nerd_tree_on_startup
+
+  " if the argument to vim is a directory, cd into it
+  if l:open_directory_on_startup || g:nerdtree_tabs_startup_cd && isdirectory(argv(0))
+    exe 'cd ' . escape(argv(0), '\ ')
+  endif
+
+
+  if l:open_nerd_tree_on_startup || l:open_directory_on_startup
+    let l:focus_file = !s:IfFocusOnStartup()
+    let l:main_bufnr = bufnr('%')
+
+    if !s:IsNERDTreePresentInCurrentTab()
+      call s:NERDTreeOpenAllTabs()
+    endif
+
+    if (l:focus_file && g:nerdtree_tabs_smart_startup_focus == 1) ||
+			    \ g:nerdtree_tabs_smart_startup_focus == 2 ||
+			    \ l:open_directory_on_startup
+      exe bufwinnr(l:main_bufnr) . "wincmd w"
+    endif
+
+    if l:open_directory_on_startup
+      " close buffer not connected to NERDTree and open connected one
+      new
+      exe bufwinnr(l:main_bufnr) . "wincmd w"
+      quit
+
+      if g:nerdtree_tabs_smart_startup_focus != 2
+        NERDTreeFocus
+      endif
+    endif
+    if g:nerdtree_tabs_autofind
+      call s:NERDTreeFindFile()
+      call s:NERDTreeUnfocus()
+    endif
+  endif
+endfun
+
+" }}} s:NewTabCreated {{{
+"
+" A flag to indicate that a new tab has just been created.
+"
+" We will handle the remaining work for this newly created tab separately in
+" BufWinEnter event.
+"
+let s:NewTabCreated = 0
+
+" }}}
+" s:TabEnterHandler() {{{
+"
+fun! s:TabEnterHandler()
+  if s:disable_handlers_for_tabdo
+    return
+  endif
+
+  if g:nerdtree_tabs_open_on_new_tab && s:nerdtree_globally_active && !s:IsNERDTreeOpenInCurrentTab()
+    call s:NERDTreeMirrorOrCreate()
+
+    " move focus to the previous window
+    wincmd p
+
+    " Turn on the 'NewTabCreated' flag
+    let s:NewTabCreated = 1
+  endif
+
+  if g:nerdtree_tabs_synchronize_view
+    call s:RestoreNERDTreeViewIfPossible()
+  endif
+
+  if g:nerdtree_tabs_focus_on_files
+    call s:NERDTreeUnfocus()
+  " Do not restore focus on newly created tab here
+  elseif !s:NewTabCreated
+    call s:NERDTreeRestoreFocus()
+  endif
+endfun
+
+" }}}
+" s:TabLeaveHandler() {{{
+"
+fun! s:TabLeaveHandler()
+  if g:nerdtree_tabs_meaningful_tab_names
+    call s:SaveGlobalFocus()
+    call s:NERDTreeUnfocus()
+  endif
+endfun
+
+" }}}
+" s:WinEnterHandler() {{{
+"
+fun! s:WinEnterHandler()
+  if s:disable_handlers_for_tabdo
+    return
+  endif
+
+  if g:nerdtree_tabs_autoclose
+    call s:CloseIfOnlyNerdTreeLeft()
+  endif
+endfun
+
+" }}}
+" s:WinLeaveHandler() {{{
+"
+fun! s:WinLeaveHandler()
+  if s:disable_handlers_for_tabdo
+    return
+  endif
+
+  if g:nerdtree_tabs_synchronize_view
+    call s:SaveNERDTreeViewIfPossible()
+  endif
+endfun
+
+" }}}
+" s:BufWinEnterHandler() {{{
+"
+" BufWinEnter event only gets triggered after a new buffer has been
+" successfully loaded, it is a proper time to finish the remaining
+" work for newly opened tab.
+"
+fun! s:BufWinEnterHandler()
+  if s:NewTabCreated
+    " Turn off the 'NewTabCreated' flag
+    let s:NewTabCreated = 0
+
+    " Restore focus to NERDTree if necessary
+    if !g:nerdtree_tabs_focus_on_files
+      call s:NERDTreeRestoreFocus()
+    endif
+  endif
+endfun
+
+" }}}
+" s:BufReadHandler() {{{
+"
+" BufRead event gets triggered after a new buffer has been
+" successfully read from file.
+"
+fun! s:BufReadHandler()
+  " Refresh NERDTree to show currently opened file
+  if g:nerdtree_tabs_autofind
+    call s:NERDTreeFindFile()
+    call s:NERDTreeUnfocus()
+  endif
+endfun
+
+" }}}
+"
+" === plugin event handlers === }}}
+
+call s:LoadPlugin()
diff --git a/vim/plugins/vim-python-pep8-indent/.gitignore b/vim/plugins/vim-python-pep8-indent/.gitignore
new file mode 100644
index 0000000..a01ee28
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/.gitignore
@@ -0,0 +1 @@
+.*.swp
diff --git a/vim/plugins/vim-python-pep8-indent/.travis.yml b/vim/plugins/vim-python-pep8-indent/.travis.yml
new file mode 100644
index 0000000..e31bfcd
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/.travis.yml
@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+    - 1.9.3
+before_install: sudo apt-get install vim-gtk
+before_script:
+    - "export DISPLAY=:99.0"
+    - "sh -e /etc/init.d/xvfb start"
+    - "bundle install"
+    - "vim --version"
+script: bundle exec rspec
diff --git a/vim/plugins/vim-python-pep8-indent/CONTRIBUTING.rst b/vim/plugins/vim-python-pep8-indent/CONTRIBUTING.rst
new file mode 100644
index 0000000..8e1fc2f
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/CONTRIBUTING.rst
@@ -0,0 +1,30 @@
+How To Contribute
+=================
+
+``vim-python-pep8-indent`` is always open for suggestions and contributions by generous developers.
+I’ve collected a few tips to get you started.
+
+Please:
+
+- *Always* add tests for your code.
+- Add yourself to the AUTHORS.rst file in an alphabetical fashion by first name – no matter how big or small your changes are.
+- Write `good commit messages`_.
+
+
+Running Tests
+-------------
+
+- They are written in Ruby_ (sorry :() using vimrunner_ which requires rspec_.
+- The tests go into ``spec/indent/indent_spec.rb``.
+  Look at the ``describe`` blocks to get the hang of it.
+- Run the tests with the command::
+
+   $ rspec spec
+
+Thank you for considering to contribute!
+
+
+.. _Ruby: https://www.ruby-lang.org/
+.. _`good commit messages`: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
+.. _vimrunner: https://github.com/AndrewRadev/vimrunner
+.. _rspec: https://github.com/rspec/rspec
diff --git a/vim/plugins/vim-python-pep8-indent/COPYING.txt b/vim/plugins/vim-python-pep8-indent/COPYING.txt
new file mode 100644
index 0000000..0e259d4
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/COPYING.txt
@@ -0,0 +1,121 @@
+Creative Commons Legal Code
+
+CC0 1.0 Universal
+
+    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
+    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
+    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
+    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
+    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
+    HEREUNDER.
+
+Statement of Purpose
+
+The laws of most jurisdictions throughout the world automatically confer
+exclusive Copyright and Related Rights (defined below) upon the creator
+and subsequent owner(s) (each and all, an "owner") of an original work of
+authorship and/or a database (each, a "Work").
+
+Certain owners wish to permanently relinquish those rights to a Work for
+the purpose of contributing to a commons of creative, cultural and
+scientific works ("Commons") that the public can reliably and without fear
+of later claims of infringement build upon, modify, incorporate in other
+works, reuse and redistribute as freely as possible in any form whatsoever
+and for any purposes, including without limitation commercial purposes.
+These owners may contribute to the Commons to promote the ideal of a free
+culture and the further production of creative, cultural and scientific
+works, or to gain reputation or greater distribution for their Work in
+part through the use and efforts of others.
+
+For these and/or other purposes and motivations, and without any
+expectation of additional consideration or compensation, the person
+associating CC0 with a Work (the "Affirmer"), to the extent that he or she
+is an owner of Copyright and Related Rights in the Work, voluntarily
+elects to apply CC0 to the Work and publicly distribute the Work under its
+terms, with knowledge of his or her Copyright and Related Rights in the
+Work and the meaning and intended legal effect of CC0 on those rights.
+
+1. Copyright and Related Rights. A Work made available under CC0 may be
+protected by copyright and related or neighboring rights ("Copyright and
+Related Rights"). Copyright and Related Rights include, but are not
+limited to, the following:
+
+  i. the right to reproduce, adapt, distribute, perform, display,
+     communicate, and translate a Work;
+ ii. moral rights retained by the original author(s) and/or performer(s);
+iii. publicity and privacy rights pertaining to a person's image or
+     likeness depicted in a Work;
+ iv. rights protecting against unfair competition in regards to a Work,
+     subject to the limitations in paragraph 4(a), below;
+  v. rights protecting the extraction, dissemination, use and reuse of data
+     in a Work;
+ vi. database rights (such as those arising under Directive 96/9/EC of the
+     European Parliament and of the Council of 11 March 1996 on the legal
+     protection of databases, and under any national implementation
+     thereof, including any amended or successor version of such
+     directive); and
+vii. other similar, equivalent or corresponding rights throughout the
+     world based on applicable law or treaty, and any national
+     implementations thereof.
+
+2. Waiver. To the greatest extent permitted by, but not in contravention
+of, applicable law, Affirmer hereby overtly, fully, permanently,
+irrevocably and unconditionally waives, abandons, and surrenders all of
+Affirmer's Copyright and Related Rights and associated claims and causes
+of action, whether now known or unknown (including existing as well as
+future claims and causes of action), in the Work (i) in all territories
+worldwide, (ii) for the maximum duration provided by applicable law or
+treaty (including future time extensions), (iii) in any current or future
+medium and for any number of copies, and (iv) for any purpose whatsoever,
+including without limitation commercial, advertising or promotional
+purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
+member of the public at large and to the detriment of Affirmer's heirs and
+successors, fully intending that such Waiver shall not be subject to
+revocation, rescission, cancellation, termination, or any other legal or
+equitable action to disrupt the quiet enjoyment of the Work by the public
+as contemplated by Affirmer's express Statement of Purpose.
+
+3. Public License Fallback. Should any part of the Waiver for any reason
+be judged legally invalid or ineffective under applicable law, then the
+Waiver shall be preserved to the maximum extent permitted taking into
+account Affirmer's express Statement of Purpose. In addition, to the
+extent the Waiver is so judged Affirmer hereby grants to each affected
+person a royalty-free, non transferable, non sublicensable, non exclusive,
+irrevocable and unconditional license to exercise Affirmer's Copyright and
+Related Rights in the Work (i) in all territories worldwide, (ii) for the
+maximum duration provided by applicable law or treaty (including future
+time extensions), (iii) in any current or future medium and for any number
+of copies, and (iv) for any purpose whatsoever, including without
+limitation commercial, advertising or promotional purposes (the
+"License"). The License shall be deemed effective as of the date CC0 was
+applied by Affirmer to the Work. Should any part of the License for any
+reason be judged legally invalid or ineffective under applicable law, such
+partial invalidity or ineffectiveness shall not invalidate the remainder
+of the License, and in such case Affirmer hereby affirms that he or she
+will not (i) exercise any of his or her remaining Copyright and Related
+Rights in the Work or (ii) assert any associated claims and causes of
+action with respect to the Work, in either case contrary to Affirmer's
+express Statement of Purpose.
+
+4. Limitations and Disclaimers.
+
+ a. No trademark or patent rights held by Affirmer are waived, abandoned,
+    surrendered, licensed or otherwise affected by this document.
+ b. Affirmer offers the Work as-is and makes no representations or
+    warranties of any kind concerning the Work, express, implied,
+    statutory or otherwise, including without limitation warranties of
+    title, merchantability, fitness for a particular purpose, non
+    infringement, or the absence of latent or other defects, accuracy, or
+    the present or absence of errors, whether or not discoverable, all to
+    the greatest extent permissible under applicable law.
+ c. Affirmer disclaims responsibility for clearing rights of other persons
+    that may apply to the Work or any use thereof, including without
+    limitation any person's Copyright and Related Rights in the Work.
+    Further, Affirmer disclaims responsibility for obtaining any necessary
+    consents, permissions or other rights required for any use of the
+    Work.
+ d. Affirmer understands and acknowledges that Creative Commons is not a
+    party to this document and has no duty or obligation with respect to
+    this CC0 or use of the Work.
diff --git a/vim/plugins/vim-python-pep8-indent/Gemfile b/vim/plugins/vim-python-pep8-indent/Gemfile
new file mode 100644
index 0000000..3696729
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/Gemfile
@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+gem "vimrunner", "0.3.2"
+gem "rspec"
diff --git a/vim/plugins/vim-python-pep8-indent/README.rst b/vim/plugins/vim-python-pep8-indent/README.rst
new file mode 100644
index 0000000..3a8bf3c
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/README.rst
@@ -0,0 +1,124 @@
+vim-python-pep8-indent
+======================
+
+.. image:: https://travis-ci.org/Vimjas/vim-python-pep8-indent.png?branch=master
+   :target: https://travis-ci.org/Vimjas/vim-python-pep8-indent
+
+This small script modifies Vim_’s indentation behavior to comply with PEP8_ and my aesthetic preferences.
+Most importantly::
+
+   foobar(foo,
+          bar)
+
+and::
+
+   foobar(
+      foo,
+      bar
+   )
+
+
+Installation
+------------
+
+
+Pathogen
+^^^^^^^^
+
+Follow the instructions on installing Pathogen_ and then:
+
+.. code-block:: shell-session
+
+   $ cd ~/.vim/bundle
+   $ git clone https://github.com/Vimjas/vim-python-pep8-indent.git
+
+
+Vundle
+^^^^^^
+
+Follow the instructions on installing Vundle_ and add the appropriate plugin line into your ``.vimrc``:
+
+.. code-block:: vim
+
+   Plugin 'Vimjas/vim-python-pep8-indent'
+
+
+NeoBundle
+^^^^^^^^^
+
+Follow the instructions on installing NeoBundle_ and add the appropriate NeoBundle line into your ``.vimrc``:
+
+.. code-block:: vim
+
+   NeoBundle 'Vimjas/vim-python-pep8-indent'
+
+
+Configuration
+-------------
+
+python_pep8_indent_multiline_string
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+You can configure the initial indentation of multiline strings using ``g:python_pep8_indent_multiline_string`` (which can also be set per buffer).
+This defaults to ``0``, which means that multiline strings are not indented.
+``-1`` and positive values will be used as-is, where ``-1`` is a special value for Vim's ``indentexpr``, and will keep the existing indent (using Vim's ``autoindent`` setting).
+``-2`` is meant to be used for strings that are wrapped with ``textwrap.dedent`` etc.  It will add a level of indentation if the multiline string started in the previous line, without any content in it already::
+
+   testdir.makeconftest("""
+       _
+
+With content already, it will be aligned to the opening parenthesis::
+
+   testdir.makeconftest("""def pytest_addoption(parser):
+                        _
+
+Existing indentation (including ``0``) in multiline strings will be kept, so this setting only applies to the indentation of new/empty lines.
+
+
+Notes
+-----
+
+Please note that Kirill Klenov’s python-mode_ ships its own version of this bundle.
+Therefore, if you want to use this version specifically, you’ll have to disable python-mode’s using:
+
+.. code-block:: vim
+
+   let g:pymode_indent = 0
+
+
+License and Authorship
+----------------------
+
+This script is based on one from Vim’s official `script repo`_  that was *not* originally written by me.
+Unfortunately the indentation was off by one character in one case and the script hasn’t been updated since 2005.
+
+Even more unfortunately, I wasn’t able to reach any of the original authors/maintainers:
+**David Bustos** and **Eric Mc Sween**.
+
+So I fixed the annoyance with the help of `Steve Losh`_ and am putting it out here so you don’t have to patch the original yourself.
+The original patch is still available here_.
+
+Over the time a lot more improvements have been contributed_ by `generous people`_.
+
+I’d like to thank the original authors here for their work and release it hereby to the *Public Domain* (using the CC0_ licence) since I hope that would be in their spirit.
+If anyone with a say in this objects, please let me_ know immediately.
+Also, if someone is in contact with one of them, I would appreciate being introduced.
+
+While my Vimscript_ skills are still feeble, I intend to maintain it for now.
+This mainly means that I’ll triage through bugs and pull requests but won’t be fixing much myself.
+
+
+.. _Vim: http://www.vim.org/
+.. _PEP8: http://www.python.org/dev/peps/pep-0008/
+.. _`script repo`: http://www.vim.org/scripts/script.php?script_id=974
+.. _`Steve Losh`: http://stevelosh.com/
+.. _here: https://gist.github.com/2965846
+.. _Neobundle: https://github.com/Shougo/neobundle.vim
+.. _Pathogen: https://github.com/tpope/vim-pathogen
+.. _python-mode: https://github.com/klen/python-mode
+.. _`Vimscript`: http://learnvimscriptthehardway.stevelosh.com/
+.. _vundle: https://github.com/gmarik/Vundle.vim
+.. _me: https://hynek.me/
+.. _CC0: http://creativecommons.org/publicdomain/zero/1.0/
+.. _contributed: https://github.com/hynek/vim-python-pep8-indent/blob/master/CONTRIBUTING.rst
+.. _`generous people`: https://github.com/hynek/vim-python-pep8-indent/graphs/contributors
diff --git a/vim/plugins/vim-python-pep8-indent/indent/python.vim b/vim/plugins/vim-python-pep8-indent/indent/python.vim
new file mode 100644
index 0000000..8a479f4
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/indent/python.vim
@@ -0,0 +1,425 @@
+" PEP8 compatible Python indent file
+" Language:         Python
+" Maintainer:       Daniel Hahler <https://daniel.hahler.de/>
+" Prev 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)
+" License:          CC0
+"
+" vim-python-pep8-indent - A nicer Python indentation style for vim.
+" Written in 2004 by David Bustos <bustos@caltech.edu>
+" Maintained from 2004-2005 by Eric Mc Sween <em@tomcom.de>
+" Maintained from 2013 by Hynek Schlawack <hs@ox.cx>
+" Maintained from 2017 by Daniel Hahler <https://daniel.hahler.de/>
+"
+" To the extent possible under law, the author(s) have dedicated all copyright
+" and related and neighboring rights to this software to the public domain
+" worldwide. This software is distributed without any warranty.
+" You should have received a copy of the CC0 Public Domain Dedication along
+" with this software. If not, see
+" <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+    finish
+endif
+let b:did_indent = 1
+
+setlocal expandtab
+setlocal nolisp
+setlocal autoindent
+setlocal indentexpr=GetPythonPEPIndent(v:lnum)
+setlocal indentkeys=!^F,o,O,<:>,0),0],0},=elif,=except
+setlocal tabstop=4
+setlocal softtabstop=4
+setlocal shiftwidth=4
+
+if !exists('g:python_pep8_indent_multiline_string')
+    let g:python_pep8_indent_multiline_string = 0
+endif
+
+let s:maxoff = 50
+let s:block_rules = {
+            \ '^\s*elif\>': ['if', 'elif'],
+            \ '^\s*except\>': ['try', 'except'],
+            \ '^\s*finally\>': ['try', 'except', 'else']
+            \ }
+let s:block_rules_multiple = {
+            \ '^\s*else\>': ['if', 'elif', 'for', 'try', 'except'],
+            \ }
+let s:paren_pairs = ['()', '{}', '[]']
+if &ft == 'pyrex' || &ft == 'cython'
+    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except|cdef|cpdef)>'
+else
+    let b:control_statement = '\v^\s*(class|def|if|while|with|for|except)>'
+endif
+let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
+
+" Skip strings and comments. Return 1 for chars to skip.
+" jedi* refers to syntax definitions from jedi-vim for call signatures, which
+" are inserted temporarily into the buffer.
+let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
+            \ '=~? "\\vstring|comment|jedi\\S"'
+
+let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
+            \ '=~? "\\vcomment|jedi\\S"'
+
+" Also ignore anything concealed.
+" Wrapper around synconcealed for older Vim (7.3.429, used on Travis CI).
+function! s:is_concealed(line, col)
+    let concealed = synconcealed(a:line, a:col)
+    return len(concealed) && concealed[0]
+endfunction
+if has('conceal')
+    let s:skip_special_chars .= '|| s:is_concealed(line("."), col("."))'
+endif
+
+
+let s:skip_search = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
+            \ '=~? "comment"'
+
+" Use 'shiftwidth()' instead of '&sw'.
+" (Since Vim patch 7.3.629, 'shiftwidth' can be set to 0 to follow 'tabstop').
+if exists('*shiftwidth')
+    function! s:sw()
+        return shiftwidth()
+    endfunction
+else
+    function! s:sw()
+        return &sw
+    endfunction
+endif
+
+function! s:pair_sort(x, y)
+    if a:x[0] == a:y[0]
+        return a:x[1] == a:y[1] ? 0 : a:x[1] > a:y[1] ? 1 : -1
+    else
+        return a:x[0] > a:y[0] ? 1 : -1
+    endif
+endfunction
+
+" Find backwards the closest open parenthesis/bracket/brace.
+function! s:find_opening_paren(...)
+    " optional arguments: line and column (defaults to 1) to search around
+    if a:0 > 0
+        let view = winsaveview()
+        call cursor(a:1, a:0 > 1 ? a:2 : 1)
+        let ret = s:find_opening_paren()
+        call winrestview(view)
+        return ret
+    endif
+
+    let stopline = max([0, line('.') - s:maxoff])
+
+    " Return if cursor is in a comment.
+    exe 'if' s:skip_search '| return [0, 0] | endif'
+
+    let positions = []
+    for p in s:paren_pairs
+        call add(positions, searchpairpos(
+           \ '\V'.p[0], '', '\V'.p[1], 'bnW', s:skip_special_chars, stopline))
+    endfor
+
+    " Remove empty matches and return the type with the closest match
+    call filter(positions, 'v:val[0]')
+    call sort(positions, 's:pair_sort')
+
+    return get(positions, -1, [0, 0])
+endfunction
+
+" Find the start of a multi-line statement
+function! s:find_start_of_multiline_statement(lnum)
+    let lnum = a:lnum
+    while lnum > 0
+        if getline(lnum - 1) =~ '\\$'
+            let lnum = prevnonblank(lnum - 1)
+        else
+            let [paren_lnum, _] = s:find_opening_paren(lnum)
+            if paren_lnum < 1
+                return lnum
+            else
+                let lnum = paren_lnum
+            endif
+        endif
+    endwhile
+endfunction
+
+" Find possible indent(s) of the block starter that matches the current line.
+function! s:find_start_of_block(lnum, types, multiple)
+    let r = []
+    let types = copy(a:types)
+    let re = '\V\^\s\*\('.join(a:types, '\|').'\)\>'
+    let lnum = a:lnum
+    let last_indent = indent(lnum) + 1
+    while lnum > 0 && last_indent > 0
+        let indent = indent(lnum)
+        if indent < last_indent
+            for type in types
+                let re = '\v^\s*'.type.'>'
+                if getline(lnum) =~# re
+                    if !a:multiple
+                        return [indent]
+                    endif
+                    if index(r, indent) == -1
+                        let r += [indent]
+                    endif
+                    " Remove any handled type, e.g. 'if'.
+                    call remove(types, index(types, type))
+                endif
+            endfor
+            let last_indent = indent(lnum)
+        endif
+        let lnum = prevnonblank(lnum - 1)
+    endwhile
+    return r
+endfunction
+
+" Is "expr" true for every position in "lnum", beginning at "start"?
+" (optionally up to a:1 / 4th argument)
+function! s:match_expr_on_line(expr, lnum, start, ...)
+    let text = getline(a:lnum)
+    let end = a:0 ? a:1 : len(text)
+    if a:start > end
+        return 1
+    endif
+    let save_pos = getpos('.')
+    let r = 1
+    for i in range(a:start, end)
+        call cursor(a:lnum, i)
+        if !(eval(a:expr) || text[i-1] =~ '\s')
+            let r = 0
+            break
+        endif
+    endfor
+    call setpos('.', save_pos)
+    return r
+endfunction
+
+" Line up with open parenthesis/bracket/brace.
+function! s:indent_like_opening_paren(lnum)
+    let [paren_lnum, paren_col] = s:find_opening_paren(a:lnum)
+    if paren_lnum <= 0
+        return -2
+    endif
+    let text = getline(paren_lnum)
+    let base = indent(paren_lnum)
+
+    let nothing_after_opening_paren = s:match_expr_on_line(
+                \ s:skip_after_opening_paren, paren_lnum, paren_col+1)
+    let starts_with_closing_paren = getline(a:lnum) =~ '^\s*[])}]'
+
+    if nothing_after_opening_paren
+        if starts_with_closing_paren
+            let res = base
+        else
+            let res = base + s:sw()
+        endif
+    else
+        " Indent to match position of opening paren.
+        let res = paren_col
+    endif
+
+    " If this line is the continuation of a control statement
+    " indent further to distinguish the continuation line
+    " from the next logical line.
+    if text =~# b:control_statement && res == base + s:sw()
+        return base + s:sw() * 2
+    else
+        return res
+    endif
+endfunction
+
+" Match indent of first block of this type.
+function! s:indent_like_block(lnum)
+    let text = getline(a:lnum)
+    for [multiple, block_rules] in [
+                \ [0, s:block_rules],
+                \ [1, s:block_rules_multiple]]
+        for [line_re, blocks] in items(block_rules)
+            if text !~# line_re
+                continue
+            endif
+
+            let indents = s:find_start_of_block(a:lnum - 1, blocks, multiple)
+            if !len(indents)
+                return -1
+            endif
+            if len(indents) == 1
+                return indents[0]
+            endif
+
+            " Multiple valid indents, e.g. for 'else' with both try and if.
+            let indent = indent(a:lnum)
+            if index(indents, indent) != -1
+                " The indent is valid, keep it.
+                return indent
+            endif
+            " Fallback to the first/nearest one.
+            return indents[0]
+        endfor
+    endfor
+    return -2
+endfunction
+
+function! s:indent_like_previous_line(lnum)
+    let lnum = prevnonblank(a:lnum - 1)
+
+    " No previous line, keep current indent.
+    if lnum < 1
+      return -1
+    endif
+
+    let text = getline(lnum)
+    let start = s:find_start_of_multiline_statement(lnum)
+    let base = indent(start)
+    let current = indent(a:lnum)
+
+    " Jump to last character in previous line.
+    call cursor(lnum, len(text))
+    let ignore_last_char = eval(s:skip_special_chars)
+
+    " Search for final colon that is not inside something to be ignored.
+    while 1
+        let curpos = getpos(".")[2]
+        if curpos == 1 | break | endif
+        if eval(s:skip_special_chars) || text[curpos-1] =~ '\s'
+            normal! h
+            continue
+        elseif text[curpos-1] == ':'
+            return base + s:sw()
+        endif
+        break
+    endwhile
+
+    if text =~ '\\$' && !ignore_last_char
+        " If this line is the continuation of a control statement
+        " indent further to distinguish the continuation line
+        " from the next logical line.
+        if getline(start) =~# b:control_statement
+            return base + s:sw() * 2
+        endif
+
+        " Nest (other) explicit continuations only one level deeper.
+        return base + s:sw()
+    endif
+
+    " If the previous statement was a stop-execution statement or a pass
+    if getline(start) =~# s:stop_statement
+        " Remove one level of indentation if the user hasn't already dedented
+        if indent(a:lnum) > base - s:sw()
+            return base - s:sw()
+        endif
+        " Otherwise, trust the user
+        return -1
+    endif
+
+    if s:is_dedented_already(current, base)
+        return -1
+    endif
+
+    " In all other cases, line up with the start of the previous statement.
+    return base
+endfunction
+
+" If this line is dedented and the number of indent spaces is valid
+" (multiple of the indentation size), trust the user.
+function! s:is_dedented_already(current, base)
+    let dedent_size = a:current - a:base
+    return (dedent_size < 0 && a:current % s:sw() == 0) ? 1 : 0
+endfunction
+
+" Is the syntax at lnum (and optionally cnum) a python string?
+function! s:is_python_string(lnum, ...)
+    let line = getline(a:lnum)
+    let linelen = len(line)
+    if linelen < 1
+      let linelen = 1
+    endif
+    let cols = a:0 ? type(a:1) != type([]) ? [a:1] : a:1 : range(1, linelen)
+    for cnum in cols
+        if match(map(synstack(a:lnum, cnum),
+                    \ 'synIDattr(v:val,"name")'), 'python\S*String') == -1
+            return 0
+        end
+    endfor
+    return 1
+endfunction
+
+function! GetPythonPEPIndent(lnum)
+    " First line has indent 0
+    if a:lnum == 1
+        return 0
+    endif
+
+    let line = getline(a:lnum)
+    let prevline = getline(a:lnum-1)
+
+    " Multilinestrings: continous, docstring or starting.
+    if s:is_python_string(a:lnum-1, len(prevline))
+                \ && (s:is_python_string(a:lnum, 1)
+                \     || match(line, '^\%("""\|''''''\)') != -1)
+
+        " Indent closing quotes as the line with the opening ones.
+        let match_quotes = match(line, '^\s*\zs\%("""\|''''''\)')
+        if match_quotes != -1
+            " closing multiline string
+            let quotes = line[match_quotes:match_quotes+2]
+            let pairpos = searchpairpos(quotes, '', quotes, 'b')
+            if pairpos[0] != 0
+                return indent(pairpos[0])
+            else
+                " TODO: test to cover this!
+            endif
+        endif
+
+        if s:is_python_string(a:lnum-1)
+            " Previous line is (completely) a string.
+            return indent(a:lnum-1)
+        endif
+
+        if match(prevline, '^\s*\%("""\|''''''\)') != -1
+            " docstring.
+            return indent(a:lnum-1)
+        endif
+
+        let indent_multi = get(b:, 'python_pep8_indent_multiline_string',
+                    \ get(g:, 'python_pep8_indent_multiline_string', 0))
+        if match(prevline, '\v%("""|'''''')$') != -1
+            " Opening multiline string, started in previous line.
+            if (&autoindent && indent(a:lnum) == indent(a:lnum-1))
+                        \ || match(line, '\v^\s+$') != -1
+                " <CR> with empty line or to split up 'foo("""bar' into
+                " 'foo("""' and 'bar'.
+                if indent_multi == -2
+                    return indent(a:lnum-1) + s:sw()
+                endif
+                return indent_multi
+            endif
+        endif
+
+        " Keep existing indent.
+        if match(line, '\v^\s*\S') != -1
+            return -1
+        endif
+
+        if indent_multi != -2
+            return indent_multi
+        endif
+
+        return s:indent_like_opening_paren(a:lnum)
+    endif
+
+    " Parens: If we can find an open parenthesis/bracket/brace, line up with it.
+    let indent = s:indent_like_opening_paren(a:lnum)
+    if indent >= -1
+        return indent
+    endif
+
+    " Blocks: Match indent of first block of this type.
+    let indent = s:indent_like_block(a:lnum)
+    if indent >= -1
+        return indent
+    endif
+
+    return s:indent_like_previous_line(a:lnum)
+endfunction
diff --git a/vim/plugins/vim-python-pep8-indent/spec/indent/indent_spec.rb b/vim/plugins/vim-python-pep8-indent/spec/indent/indent_spec.rb
new file mode 100644
index 0000000..342b301
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/spec/indent/indent_spec.rb
@@ -0,0 +1,537 @@
+require "spec_helper"
+
+shared_examples_for "vim" do
+
+  before(:each) {
+    # clear buffer
+    vim.normal 'gg"_dG'
+
+    # Insert two blank lines.
+    # The first line is a corner case in this plugin that would shadow the
+    # correct behaviour of other tests. Thus we explicitly jump to the first
+    # line when we require so.
+    vim.feedkeys 'i\<CR>\<CR>\<ESC>'
+  }
+
+  describe "when using the indent plugin" do
+    it "sets the indentexpr and indentkeys options" do
+      vim.command("set indentexpr?").should include "GetPythonPEPIndent("
+      vim.command("set indentkeys?").should include "=elif"
+    end
+
+    it "sets autoindent and expandtab" do
+      vim.command("set autoindent?").should match(/\s*autoindent/)
+      vim.command("set expandtab?").should match(/\s*expandtab/)
+    end
+  end
+
+  describe "when entering the first line" do
+    before { vim.feedkeys '0ggipass' }
+
+    it "does not indent" do
+      indent.should == 0
+      proposed_indent.should == 0
+    end
+
+    it "does not indent when using '=='" do
+      vim.normal "=="
+      indent.should == 0
+    end
+  end
+
+  describe "when after a '(' that is at the end of its line" do
+    before { vim.feedkeys 'itest(\<CR>' }
+
+    it "indents by one level" do
+      proposed_indent.should == shiftwidth
+      vim.feedkeys 'something'
+      indent.should == shiftwidth
+      vim.normal '=='
+      indent.should == shiftwidth
+    end
+
+    it "puts the closing parenthesis at the same level" do
+      vim.feedkeys ')'
+      indent.should == 0
+    end
+  end
+
+  describe "when after an '(' that is followed by something" do
+    before { vim.feedkeys 'itest(something,\<CR>' }
+
+    it "lines up on following lines" do
+      indent.should == 5
+      vim.feedkeys 'more,\<CR>'
+      indent.should == 5
+    end
+
+    it "lines up the closing parenthesis" do
+      vim.feedkeys ')'
+      indent.should == 5
+    end
+
+    it "does not touch the closing parenthesis if it is already indented further" do
+      vim.feedkeys '  )'
+      indent.should == 7
+    end
+  end
+
+  describe "when after an '{' that is followed by a comment" do
+    before { vim.feedkeys 'imydict = {  # comment\<CR>' }
+
+    it "indent by one level" do
+      indent.should == shiftwidth
+      vim.feedkeys '1: 1,\<CR>'
+      indent.should == shiftwidth
+    end
+
+    it "lines up the closing parenthesis" do
+      vim.feedkeys '}'
+      indent.should == 0
+    end
+  end
+
+  describe "when using gq to reindent a '(' that is" do
+    before { vim.feedkeys 'itest(' }
+    it "something and has a string without spaces at the end" do
+      vim.feedkeys 'something_very_long_blaaaaaaaaa, "some_very_long_string_blaaaaaaaaaaaaaaaaaaaa"\<esc>gqq'
+      indent.should == 5
+    end
+  end
+
+  describe "when after multiple parens of different types" do
+    it "indents by one level" do
+      vim.feedkeys 'if({\<CR>'
+      indent.should == shiftwidth
+    end
+
+    it "lines up with the last paren" do
+      vim.feedkeys 'ifff({123: 456,\<CR>'
+      indent.should == 5
+    end
+  end
+
+  describe "when '#' is contained in a string that is followed by a colon" do
+    it "indents by one level" do
+        vim.feedkeys 'iif "some#thing" == "test":#test\<CR>pass'
+        indent.should == shiftwidth
+    end
+  end
+
+  describe "when '#' is not contained in a string and is followed by a colon" do
+    it "does not indent" do
+        vim.feedkeys 'iif "some#thing" == "test"#:test\<CR>'
+        indent.should == 0
+    end
+  end
+
+  describe "when inside an unfinished string" do
+    it "does not indent" do
+      vim.feedkeys 'i"test:\<ESC>'
+      vim.echo('synIDattr(synID(line("."), col("."), 0), "name")'
+              ).downcase.should include 'string'
+      vim.feedkeys 'a\<CR>'
+      proposed_indent.should == 0
+      indent.should == 0
+    end
+
+    it "does not dedent" do
+      vim.feedkeys 'iif True:\<CR>"test:\<ESC>'
+      vim.echo('synIDattr(synID(line("."), col("."), 0), "name")'
+              ).downcase.should include 'string'
+      proposed_indent.should == shiftwidth
+      indent.should == shiftwidth
+    end
+  end
+
+  describe "when the previous line has a colon in a string" do
+    before { vim.feedkeys 'itest(":".join(["1","2"]))\<CR>' }
+    it "does not indent" do
+      vim.feedkeys 'if True:'
+      indent.should == 0
+      proposed_indent.should == 0
+    end
+  end
+
+  describe "when the previous line has a list slice" do
+    it "does not indent" do
+      vim.feedkeys 'ib = a[2:]\<CR>'
+      indent.should == 0
+      proposed_indent.should == 0
+    end
+  end
+
+  describe "when using simple control structures" do
+      it "indents shiftwidth spaces" do
+          vim.feedkeys 'iwhile True:\<CR>pass'
+          indent.should == shiftwidth
+      end
+  end
+
+  describe "when using a function definition" do
+      it "indents shiftwidth spaces" do
+          vim.feedkeys 'idef long_function_name(\<CR>arg'
+          indent.should == shiftwidth * 2
+      end
+  end
+
+  describe "when using a class definition" do
+      it "indents shiftwidth spaces" do
+          vim.feedkeys 'iclass Foo(\<CR>'
+          indent.should == shiftwidth * 2
+      end
+  end
+
+  describe "when writing an 'else' block" do
+    it "aligns to the preceeding 'for' block" do
+      vim.feedkeys 'ifor x in "abc":\<CR>pass\<CR>else:'
+      indent.should == 0
+    end
+
+    it "aligns to the preceeding 'if' block" do
+      vim.feedkeys 'ifor x in "abc":\<CR>if True:\<CR>pass\<CR>else:'
+      indent.should == shiftwidth
+    end
+  end
+
+  describe "when using parens and control statements" do
+    it "avoids ambiguity by using extra indentation" do
+      vim.feedkeys 'iif (111 and\<CR>'
+      if shiftwidth == 4
+        indent.should == shiftwidth * 2
+      else
+        indent.should == 4
+      end
+      vim.feedkeys '222):\<CR>'
+      indent.should == shiftwidth
+      vim.feedkeys 'pass\<CR>'
+      indent.should == 0
+    end
+
+    it "still aligns parens properly if not ambiguous" do
+      vim.feedkeys 'iwhile (111 and\<CR>'
+      indent.should == 7
+      vim.feedkeys '222):\<CR>'
+      indent.should == shiftwidth
+      vim.feedkeys 'pass\<CR>'
+      indent.should == 0
+    end
+
+    it "still handles multiple parens correctly" do
+      vim.feedkeys 'iif (111 and (222 and 333\<CR>'
+      indent.should == 13
+      vim.feedkeys 'and 444\<CR>'
+      indent.should == 13
+      vim.feedkeys ')\<CR>'
+      if shiftwidth == 4
+        indent.should == shiftwidth * 2
+      else
+        indent.should == 4
+      end
+      vim.feedkeys 'and 555):\<CR>'
+      indent.should == shiftwidth
+      vim.feedkeys 'pass\<CR>'
+      indent.should == 0
+    end
+  end
+
+  describe "when a line breaks with a manual '\\'" do
+    it "indents shiftwidth spaces on normal line" do
+        vim.feedkeys 'ivalue = test + \\\\\<CR>'
+        indent.should == shiftwidth
+    end
+
+    it "indents 2x shiftwidth spaces for control structures" do
+        vim.feedkeys 'iif somevalue == xyz and \\\\\<CR>'
+        indent.should == shiftwidth * 2
+    end
+
+    it "indents relative to line above" do
+        vim.feedkeys 'i\<TAB>value = test + \\\\\<CR>'
+        indent.should == shiftwidth * 2
+    end
+  end
+
+  describe "when current line is dedented compared to previous line" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>y = True\<CR>\<ESC>' }
+     it "and current line has a valid indentation (Part 1)" do
+        vim.feedkeys '0i\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+
+     it "and current line has a valid indentation (Part 2)" do
+        vim.feedkeys '0i\<TAB>\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+
+     it "and current line has an invalid indentation" do
+        vim.feedkeys 'i    while True:\<CR>'
+        indent.should == previous_indent + shiftwidth
+     end
+  end
+
+  describe "when current line is dedented compared to the last non-empty line" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>y = True\<CR>\<CR>\<ESC>' }
+     it "and current line has a valid indentation" do
+        vim.feedkeys '0i\<TAB>if y:'
+        proposed_indent.should == -1
+     end
+  end
+
+  describe "when an 'if' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>if x:\<CR>' }
+     it "an elif, it lines up with the 'if'" do
+        vim.feedkeys 'elif y:'
+        indent.should == shiftwidth * 2
+     end
+
+     it "an 'else', it lines up with the 'if'" do
+        vim.feedkeys 'else:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+  describe "when an 'if' contains a try-except" do
+     before {
+       vim.feedkeys 'iif x:\<CR>try:\<CR>pass\<CR>except:\<CR>pass\<CR>'
+       indent.should == shiftwidth
+     }
+     it "an 'else' should be indented to the try" do
+       vim.feedkeys 'else:'
+       indent.should == shiftwidth
+       proposed_indent.should == shiftwidth
+     end
+     it "an 'else' should keep the indent of the 'if'" do
+       vim.feedkeys 'else:\<ESC><<'
+       indent.should == 0
+       proposed_indent.should == 0
+     end
+  end
+
+  describe "when a 'for' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>for x in y:\<CR>' }
+     it "an 'else', it lines up with the 'for'" do
+        vim.feedkeys 'else:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+  describe "when an 'else' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>else:\<CR>XXX\<CR>' }
+     it "a 'finally', it lines up with the 'else'" do
+        vim.feedkeys 'finally:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+
+  describe "when a 'try' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>try:\<CR>' }
+     it "an 'except', it lines up with the 'try'" do
+        vim.feedkeys 'except:'
+        indent.should == shiftwidth * 2
+     end
+
+     it "an 'else', it lines up with the 'try'" do
+        vim.feedkeys 'else:'
+        indent.should == shiftwidth * 2
+     end
+
+     it "a 'finally', it lines up with the 'try'" do
+        vim.feedkeys 'finally:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+  describe "when an 'except' is followed by" do
+     before { vim.feedkeys 'i\<TAB>\<TAB>except:\<CR>' }
+     it "an 'else', it lines up with the 'except'" do
+        vim.feedkeys 'else:'
+        indent.should == shiftwidth * 2
+     end
+
+     it "another 'except', it lines up with the previous 'except'" do
+        vim.feedkeys 'except:'
+        indent.should == shiftwidth * 2
+     end
+
+     it "a 'finally', it lines up with the 'except'" do
+        vim.feedkeys 'finally:'
+        indent.should == shiftwidth * 2
+     end
+  end
+
+  describe "when an else is used inside of a nested if" do
+    before { vim.feedkeys 'iif foo:\<CR>\<TAB>if bar:\<CR>\<TAB>\<TAB>pass\<CR>' }
+    it "indents an else to the inner if" do
+      vim.feedkeys 'else:'
+      indent.should == shiftwidth * 2
+    end
+  end
+
+  describe "when jedi-vim call signatures are used" do
+    before { vim.command 'syn match jediFunction "JEDI_CALL_SIGNATURE" keepend extend' }
+
+    it "ignores the call signature after a colon" do
+      vim.feedkeys 'iif True:  JEDI_CALL_SIGNATURE\<CR>'
+      indent.should == shiftwidth
+    end
+
+    it "ignores the call signature after a function" do
+      vim.feedkeys 'idef f(  JEDI_CALL_SIGNATURE\<CR>'
+      indent.should == shiftwidth * 2
+    end
+  end
+end
+
+shared_examples_for "multiline strings" do
+  describe "when after an '(' that is followed by an unfinished string" do
+    before { vim.feedkeys 'itest("""' }
+
+    it "it indents the next line" do
+      vim.feedkeys '\<CR>'
+      expected_proposed, expected_indent = multiline_indent(0, shiftwidth)
+      proposed_indent.should == expected_proposed
+      indent.should == expected_indent
+    end
+
+    it "with contents it indents the second line to the parenthesis" do
+      vim.feedkeys 'second line\<CR>'
+      expected_proposed, expected_indent = multiline_indent(0, 5)
+      proposed_indent.should == expected_proposed
+      indent.should == expected_indent
+    end
+  end
+
+  describe "when after assigning an unfinished string" do
+    before { vim.feedkeys 'itest = """' }
+
+    it "it indents the next line" do
+      vim.feedkeys '\<CR>'
+      expected_proposed, expected_indent = multiline_indent(0, shiftwidth)
+      proposed_indent.should == expected_proposed
+      indent.should == expected_indent
+    end
+  end
+
+  describe "when after assigning an unfinished string" do
+    before { vim.feedkeys 'i    test = """' }
+
+    it "it indents the next line" do
+      vim.feedkeys '\<CR>'
+      expected_proposed, expected_indent = multiline_indent(4, shiftwidth + 4)
+      proposed_indent.should == expected_proposed
+      indent.should == expected_indent
+    end
+  end
+
+  describe "when after assigning a finished string" do
+    before { vim.feedkeys 'i    test = ""' }
+
+    it "it does indent the next line" do
+      vim.feedkeys '\<CR>'
+      indent.should == 4
+    end
+
+    it "and writing a new string, it does indent the next line" do
+      vim.feedkeys '\<CR>""'
+      indent.should == 4
+    end
+  end
+
+  describe "when after a docstring" do
+    before { vim.feedkeys 'i    """' }
+    it "it does indent the next line to the docstring" do
+      vim.feedkeys '\<CR>'
+      indent.should == 4
+      proposed_indent.should == 4
+    end
+  end
+
+  describe "when after a docstring with contents" do
+    before { vim.feedkeys 'i    """First line' }
+    it "it does indent the next line to the docstring" do
+      vim.feedkeys '\<CR>'
+      indent.should == 4
+      proposed_indent.should == 4
+    end
+  end
+
+  describe "when breaking a string after opening parenthesis" do
+    before { vim.feedkeys 'i    foo("""bar<Left><Left><Left>' }
+    it "it does indent the next line as after an opening multistring" do
+      vim.feedkeys '\<CR>'
+      expected_proposed, expected_indent = multiline_indent(4, 4 + shiftwidth)
+      indent.should == expected_indent
+      proposed_indent.should == expected_proposed
+    end
+  end
+end
+
+describe "vim when using width of 4" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+  }
+  it_behaves_like "vim"
+end
+
+describe "vim when using width of 3" do
+  before {
+    vim.command("set sw=3 ts=3 sts=3 et")
+  }
+  it_behaves_like "vim"
+end
+
+describe "vim when not using python_pep8_indent_multiline_string" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+    vim.command("unlet! g:python_pep8_indent_multiline_string")
+  }
+  it_behaves_like "multiline strings"
+end
+
+describe "vim when using python_pep8_indent_multiline_first=0" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+    vim.command("let g:python_pep8_indent_multiline_string=0")
+  }
+  it_behaves_like "multiline strings"
+end
+
+describe "vim when using python_pep8_indent_multiline_string=-1" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+    vim.command("let g:python_pep8_indent_multiline_string=-1")
+  }
+  it_behaves_like "multiline strings"
+end
+
+describe "vim when using python_pep8_indent_multiline_string=-2" do
+  before {
+    vim.command("set sw=4 ts=4 sts=4 et")
+    vim.command("let g:python_pep8_indent_multiline_string=-2")
+  }
+  it_behaves_like "multiline strings"
+end
+
+describe "vim for cython" do
+  before {
+    vim.command "enew"
+    vim.command "set ft=cython"
+    vim.command "runtime indent/python.vim"
+  }
+
+  describe "when using a cdef function definition" do
+      it "indents shiftwidth spaces" do
+          vim.feedkeys 'icdef long_function_name(\<CR>arg'
+          indent.should == shiftwidth * 2
+      end
+  end
+
+  describe "when using a cpdef function definition" do
+      it "indents shiftwidth spaces" do
+          vim.feedkeys 'icpdef long_function_name(\<CR>arg'
+          indent.should == shiftwidth * 2
+      end
+  end
+end
diff --git a/vim/plugins/vim-python-pep8-indent/spec/spec_helper.rb b/vim/plugins/vim-python-pep8-indent/spec/spec_helper.rb
new file mode 100644
index 0000000..46ad026
--- /dev/null
+++ b/vim/plugins/vim-python-pep8-indent/spec/spec_helper.rb
@@ -0,0 +1,52 @@
+require 'vimrunner'
+require 'vimrunner/rspec'
+
+Vimrunner::RSpec.configure do |config|
+  # Use a single Vim instance for the test suite. Set to false to use an
+  # instance per test (slower, but can be easier to manage).
+  # FIXME: reuse_server = true seems to hang after a certain number of test cases
+  #  - Travis CI hangs after 15 successful tests.
+  #  - Locally it may hang also, with Vim and Xorg using 100% CPU.
+  # Therefore default to false in both cases.
+  config.reuse_server = ENV['CI'] ? false : false
+
+  config.start_vim do
+    vim = Vimrunner.start
+
+    plugin_path = File.expand_path('../..', __FILE__)
+
+    # add_plugin appends the path to the rtp... :(
+    # vim.add_plugin(plugin_path, 'indent/python.vim')
+
+    vim.command "set rtp^=#{plugin_path}"
+    vim.command "runtime syntax/python.vim"
+    vim.command "runtime indent/python.vim"
+
+    def shiftwidth
+      @shiftwidth ||= vim.echo("exists('*shiftwidth') ? shiftwidth() : &sw").to_i
+    end
+    def tabstop
+      @tabstop ||= vim.echo("&tabstop").to_i
+    end
+    def indent
+      vim.echo("indent('.')").to_i
+    end
+    def previous_indent
+      pline = vim.echo("line('.')").to_i - 1
+      vim.echo("indent('#{pline}')").to_i
+    end
+    def proposed_indent
+      line = vim.echo("line('.')")
+      col = vim.echo("col('.')")
+      indent_value = vim.echo("GetPythonPEPIndent(#{line})").to_i
+      vim.command("call cursor(#{line}, #{col})")
+      return indent_value
+    end
+    def multiline_indent(prev, default)
+      i = vim.echo("get(g:, 'python_pep8_indent_multiline_string', 0)").to_i
+      return (i == -2 ? default : i), i < 0 ? (i == -1 ? prev : default) : i
+    end
+
+    vim
+  end
+end
diff --git a/vim/plugins/vim-yankstack/.gitignore b/vim/plugins/vim-yankstack/.gitignore
new file mode 100644
index 0000000..655a368
--- /dev/null
+++ b/vim/plugins/vim-yankstack/.gitignore
@@ -0,0 +1,2 @@
+.rvmrc
+doc/tags
diff --git a/vim/plugins/vim-yankstack/Gemfile b/vim/plugins/vim-yankstack/Gemfile
new file mode 100644
index 0000000..f2e1aba
--- /dev/null
+++ b/vim/plugins/vim-yankstack/Gemfile
@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+gem "vimbot", :git => "git@github.com:maxbrunsfeld/vimbot.git"
+gem "rspec"
diff --git a/vim/plugins/vim-yankstack/Gemfile.lock b/vim/plugins/vim-yankstack/Gemfile.lock
new file mode 100644
index 0000000..c17e2f4
--- /dev/null
+++ b/vim/plugins/vim-yankstack/Gemfile.lock
@@ -0,0 +1,25 @@
+GIT
+  remote: git@github.com:maxbrunsfeld/vimbot.git
+  revision: 489cb3283a89d3e7891d9d9765188179c764317b
+  specs:
+    vimbot (0.0.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.1.3)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rspec
+  vimbot!
diff --git a/vim/plugins/vim-yankstack/README.md b/vim/plugins/vim-yankstack/README.md
new file mode 100644
index 0000000..2fcfc76
--- /dev/null
+++ b/vim/plugins/vim-yankstack/README.md
@@ -0,0 +1,134 @@
+yankstack.vim
+=============
+
+Author:  Max Brunsfeld <http://www.github.com/maxbrunsfeld>
+
+[Yankstack.vim](https://github.com/maxbrunsfeld/vim-yankstack) is a
+lightweight implementation of the Emacs 'kill ring' for Vim.  It allows you to
+yank and delete things without worrying about losing the text that you yanked
+previously. It effectively turns your default register into a stack, and lets
+you cycle through the items in the stack after doing a paste.
+
+This plugin is intended to be a simpler alternative to the
+[yankring](https://github.com/chrismetcalf/vim-yankring) plugin. It has a fairly
+complete [test suite](https://github.com/maxbrunsfeld/vim-yankstack/blob/master/spec/yankstack/yankstack_spec.rb)
+based on [rspec](https://www.relishapp.com/rspec)
+and [vimbot](https://github.com/maxbrunsfeld/vimbot).
+
+## Installation ##
+
+I recommend loading your plugins with
+[vundle](https://github.com/gmarik/vundle) or 
+[pathogen](https://github.com/tpope/vim-pathogen).
+
+## Key Mappings ##
+
+By default, yankstack adds only 2 key bindings, in normal and visual modes:
+
+- ```meta-p```  - cycle *backward* through your history of yanks
+- ```meta-shift-p```  - cycle *forwards* through your history of yanks
+
+After pasting some text using ```p``` or ```P```, you can cycle through your
+yank history using these commands. Typing either of these keys *without* pasting first 
+will do a normal paste (the same as typing `p`). This also works in insert mode.
+
+### the 'meta' key
+
+If you're using MacVim, and you want to use
+this plugin's default key bindings (or any bindings involving the `option`
+key), you must ```:set macmeta```. On Linux, you may have issues with the meta key if your terminal is running in 7bit mode.
+Instructions for dealing with this can be found on the [wiki](https://github.com/maxbrunsfeld/vim-yankstack/wiki/Linux-terminal-configurations-for-correct-meta-key-handling)
+
+## Commands ##
+
+You can see the contents of the yank-stack using the ```:Yanks``` command.
+Its output is similar to the ```:registers``` command.
+
+## Configuration ##
+
+Yankstack defines two plugin mappings that you can map to keys of your choosing.
+The same mappings work in normal and insert modes.
+
+- ```<Plug>yankstack_substitute_older_paste``` - cycle backwards through your history of yanks
+- ```<Plug>yankstack_substitute_newer_paste``` - cycle forwards through your history of yanks
+
+For example, if you wanted to define some mappings based on your 'leader' key,
+you could do this:
+
+```
+nmap <leader>p <Plug>yankstack_substitute_older_paste
+nmap <leader>P <Plug>yankstack_substitute_newer_paste
+```
+
+Also, if you want to load yankstack without the default key mappings, just
+``` let g:yankstack_map_keys = 0 ```
+in your .vimrc file.
+
+## Compatibility ##
+
+Yankstack works by mapping the yank and paste keys to functions that do some
+book-keeping before calling through to the normal yank/paste keys. You may want
+to define your own mappings of the yank and paste keys. For example, I like to
+map the ```Y``` key to ```y$```, so that it behaves the same as ```D``` and
+```C```. The yankstack mappings need to happen **before** you define any such
+mappings of your own. To achieve this, just call ```yankstack#setup()``` in
+your vimrc, before defining your mappings:
+
+```
+call yankstack#setup()
+nmap Y y$
+" other mappings involving y, d, c, etc
+```
+
+You can also prevent certain keys from being remapped by setting the `g:yankstack_yank_keys`
+to the keys of your choosing. For example, if you only want Yankstack to remap `y` and `d`:
+
+```
+let g:yankstack_yank_keys = ['y', 'd']
+```
+
+## Contributing, Feedback ##
+
+I'd enjoy hearing anybody's feedback on yankstack, and welcome any contribution.
+Check it out on [github](https://github.com/maxbrunsfeld/vim-yankstack)!
+
+## Changelog ##
+
+
+### 1.0.6 (2014-08-04)
+  - Allow customization of the list of keys to be remapped.
+
+### 1.0.5 (2012-07-19)
+  - Fix bug where on certain versions of vim, the first time you tried
+    to cycle through your yanks after doing a normal paste, an extra
+    paste was created.
+
+### 1.0.4 (2012-07-01)
+  - Make it so that yankstack-cycling keys cause a normal paste if they are
+    used without pasting first. Fix stack-cycling in insert-mode.
+
+### 1.0.3 (2012-05-04):
+  - Fix bug when overwriting text in select mode. This was causing
+    problems for snipMate users.
+
+### 1.0.2 (2012-4-20):
+  - Add test coverage using rspec and [vimbot](https://github.com/maxbrunsfeld/vimbot)!
+  - Perfect the behavior of the yankstack when pasting over text in visual
+    mode
+  - Fix bug where 's' and 'S' didn't push to the yankstack
+
+### 1.0.1 (2012-2-11):
+  - Change default key bindings, update readme, add link to github page.
+
+### 1.0.1 (2011-12-08):
+  - Fix bug when displaying empty yanks.
+
+### 1.0.0 (2011-12-04):
+  - Remove unnecessary dependency on the undotree() function. Plugin should
+    now work on any recent version of vim.
+
+## License ##
+Copyright (c) Max Brunsfeld.  Distributed under the same terms as Vim itself.
+See the vim license.
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/vim-yankstack/autoload/yankstack.vim b/vim/plugins/vim-yankstack/autoload/yankstack.vim
new file mode 100644
index 0000000..8feb49e
--- /dev/null
+++ b/vim/plugins/vim-yankstack/autoload/yankstack.vim
@@ -0,0 +1,197 @@
+" yankstack.vim - keep track of your history of yanked/killed text
+"
+" Maintainer:   Max Brunsfeld <https://github.com/maxbrunsfeld>
+" Version:      1.0.6
+" Todo:
+"
+
+let s:yankstack_tail = []
+let g:yankstack_size = 30
+let s:last_paste = { 'changedtick': -1, 'key': '', 'mode': 'n', 'count': 1, 'register': '' }
+
+if !exists('g:yankstack_yank_keys')
+  let g:yankstack_yank_keys = ['c', 'C', 'd', 'D', 's', 'S', 'x', 'X', 'y', 'Y']
+endif
+
+function! s:yank_with_key(key)
+  call s:before_yank()
+  return a:key
+endfunction
+
+function! s:paste_with_key(key, mode, register, count)
+  return s:paste_from_yankstack(a:key, a:mode, a:register, a:count, 1)
+endfunction
+
+function! s:paste_from_yankstack(key, mode, register, count, is_new)
+  let keys = a:count . a:key
+  let keys = (a:register == s:default_register()) ? keys : ('"' . a:register . keys)
+  let s:last_paste = { 'key': a:key, 'mode': a:mode, 'register': a:register, 'count': a:count, 'changedtick': -1 }
+  call feedkeys("\<Plug>yankstack_after_paste", "m")
+
+  if a:mode == 'n'
+    exec 'normal!' keys
+  elseif a:mode == 'v'
+    if a:is_new
+      call s:before_yank()
+      call feedkeys("\<Plug>yankstack_substitute_older_paste", "t")
+      exec 'normal! gv' . keys
+    else
+      let head = s:get_yankstack_head()
+      exec 'normal! gv' . keys
+      call s:set_yankstack_head(head)
+    endif
+
+  " In insert mode, this function's return value is used in an
+  " expression mapping. In other modes, it is called for its
+  " side effects only.
+  elseif a:mode == 'i'
+    return keys
+  endif
+
+  silent! call repeat#setreg(a:register)
+  silent! call repeat#set(a:key, a:count)
+endfunction
+
+function! s:substitute_paste(offset, current_mode)
+  if s:last_change_was_paste()
+    silent undo
+    call s:yankstack_rotate(a:offset)
+    return s:paste_from_yankstack(s:last_paste.key, s:last_paste.mode, s:last_paste.register, s:last_paste.count, 0)
+  else
+    return s:paste_from_yankstack(s:default_paste_key(a:current_mode), a:current_mode, v:register, '', 1)
+  endif
+endfunction
+
+function! s:before_yank()
+  let head = s:get_yankstack_head()
+  if !empty(head.text) && (empty(s:yankstack_tail) || (head != s:yankstack_tail[0]))
+    call insert(s:yankstack_tail, head)
+    let s:yankstack_tail = s:yankstack_tail[: g:yankstack_size-1]
+  endif
+endfunction
+
+function! s:yankstack_rotate(offset)
+  if empty(s:yankstack_tail) | return | endif
+  let offset_left = a:offset
+  while offset_left != 0
+    let head = s:get_yankstack_head()
+    if offset_left > 0
+      let entry = remove(s:yankstack_tail, 0)
+      call add(s:yankstack_tail, head)
+      let offset_left -= 1
+    elseif offset_left < 0
+      let entry = remove(s:yankstack_tail, -1)
+      call insert(s:yankstack_tail, head)
+      let offset_left += 1
+    endif
+    call s:set_yankstack_head(entry)
+  endwhile
+endfunction
+
+function! s:get_yankstack_head()
+  let reg = s:default_register()
+  return { 'text': getreg(reg), 'type': getregtype(reg) }
+endfunction
+
+function! s:set_yankstack_head(entry)
+  let reg = s:default_register()
+  call setreg(reg, a:entry.text, a:entry.type)
+endfunction
+
+function! s:after_paste()
+  let s:last_paste.changedtick = b:changedtick
+endfunction
+
+function! s:last_change_was_paste()
+  return b:changedtick == s:last_paste.changedtick
+endfunction
+
+function! s:default_register()
+  let clipboard_flags = split(&clipboard, ',')
+  if index(clipboard_flags, 'unnamedplus') >= 0
+    return "+"
+  elseif index(clipboard_flags, 'unnamed') >= 0
+    return "*"
+  else
+    return "\""
+  endif
+endfunction
+
+function! s:default_paste_key(mode)
+  if a:mode == 'i'
+    return "\<C-g>u\<C-r>" . s:default_register()
+  else
+    return "p"
+  endif
+endfunction
+
+function! g:Yankstack()
+  return [s:get_yankstack_head()] + s:yankstack_tail
+endfunction
+
+command! -nargs=0 Yanks call s:show_yanks()
+function! s:show_yanks()
+  echohl WarningMsg | echo "--- Yanks ---" | echohl None
+  let i = 0
+  for yank in g:Yankstack()
+    call s:show_yank(yank, i)
+    let i += 1
+  endfor
+endfunction
+
+function! s:show_yank(yank, index)
+  let index = printf("%-4d", a:index)
+  let lines = split(a:yank.text, '\n')
+  let line = empty(lines) ? '' : lines[0]
+  let line = substitute(line, '\t', repeat(' ', &tabstop), 'g')
+  if len(line) > 80 || len(lines) > 1
+    let line = line[: 80] . '…'
+  endif
+
+  echohl Directory | echo  index
+  echohl None      | echon line
+  echohl None
+endfunction
+
+function! yankstack#setup()
+  if exists('g:yankstack_did_setup') | return | endif
+  let g:yankstack_did_setup = 1
+
+  let paste_keys = ['p', 'P', 'gp', 'gP']
+  let word_characters = split("qwertyuiopasdfghjklzxcvbnm1234567890_", '\zs')
+
+  for key in g:yankstack_yank_keys
+    exec 'nnoremap <silent> <expr>'  key '<SID>yank_with_key("' . key . '")'
+    exec 'xnoremap <silent> <expr>'  key '<SID>yank_with_key("' . key . '")'
+  endfor
+
+  for key in paste_keys
+    exec 'nnoremap <silent>' key ':<C-u>call <SID>paste_with_key("' . key . '", "n", v:register, v:count1)<CR>'
+    exec 'xnoremap <silent>' key ':<C-u>call <SID>paste_with_key("' . key . '", "v", v:register, v:count1)<CR>'
+  endfor
+
+  for key in word_characters
+    exec 'smap <expr>' key '<SID>yank_with_key("' . key . '")'
+  endfor
+endfunction
+
+nnoremap <silent> <Plug>yankstack_substitute_older_paste :<C-u>call <SID>substitute_paste(v:count1, 'n')<CR>
+nnoremap <silent> <Plug>yankstack_substitute_newer_paste :<C-u>call <SID>substitute_paste(-v:count1, 'n')<CR>
+xnoremap <silent> <Plug>yankstack_substitute_older_paste :<C-u>call <SID>substitute_paste(v:count1, 'v')<CR>
+xnoremap <silent> <Plug>yankstack_substitute_newer_paste :<C-u>call <SID>substitute_paste(-v:count1, 'v')<CR>
+inoremap <silent> <Plug>yankstack_substitute_older_paste <C-r>=<SID>substitute_paste(v:count1, 'i')<CR>
+inoremap <silent> <Plug>yankstack_substitute_newer_paste <C-r>=<SID>substitute_paste(-v:count1, 'i')<CR>
+
+nnoremap <silent> <Plug>yankstack_after_paste :call <SID>after_paste()<CR>
+xnoremap <silent> <Plug>yankstack_after_paste :<C-u>call <SID>after_paste()<CR>
+inoremap <silent> <Plug>yankstack_after_paste <C-o>:call <SID>after_paste()<CR>
+
+if !exists('g:yankstack_map_keys') || g:yankstack_map_keys
+  nmap <M-p> <Plug>yankstack_substitute_older_paste
+  xmap <M-p> <Plug>yankstack_substitute_older_paste
+  imap <M-p> <Plug>yankstack_substitute_older_paste
+  nmap <M-P> <Plug>yankstack_substitute_newer_paste
+  xmap <M-P> <Plug>yankstack_substitute_newer_paste
+  imap <M-P> <Plug>yankstack_substitute_newer_paste
+endif
+
diff --git a/vim/plugins/vim-yankstack/doc/yankstack.txt b/vim/plugins/vim-yankstack/doc/yankstack.txt
new file mode 100644
index 0000000..2a7dee5
--- /dev/null
+++ b/vim/plugins/vim-yankstack/doc/yankstack.txt
@@ -0,0 +1,124 @@
+*yankstack.txt*     Plugin for storing and cycling through yanked text strings.
+
+Author:  Max Brunsfeld <http://www.github.com/maxbrunsfeld>
+
+|yankstack-introduction|    Introduction
+|yankstack-installation|    Installation
+|yankstack-initialization|  Initialization
+|yankstack-commands|        Commands
+|yankstack-configuration|   Configuration
+|yankstack-changelog|       Changelog
+
+INTRODUCTION                                    *yankstack-introduction*
+
+[Yankstack.vim](https://github.com/maxbrunsfeld/vim-yankstack) is a
+lightweight implementation of the Emacs 'kill ring' for Vim. It allows you to
+yank and delete things without worrying about losing the text that you yanked
+previously. It effectively turns your default register into a stack, and lets
+you cycle through the items in the stack after doing a paste.
+
+This plugin is intended to be a simpler alternative to the {Yankring} plugin
+(https://github.com/chrismetcalf/vim-yankring).
+
+INSTALLATION                                    *yankstack-installation*
+
+I recommend loading your plugins with {Pathogen}
+(https://github.com/tpope/vim-pathogen), so you can just clone this repo into
+your "bundle" directory.
+
+KEY MAPPINGS                                    *yankstack-mappings*
+
+By default, yankstack adds only 2 key mappings, in normal and visual modes:
+
+Mapping         Action ~
+meta-p          cycle backward through your history of yanks
+meta-shift-p    cycle forwards through your history of yanks
+
+After pasting some text using |p| or |P|, you can cycle through your
+yank history using these commands.
+
+Typing either of these keys without pasting first will do a normal paste
+(the same as typing `p`). This also works in insert mode.
+
+A note about the meta key - if you're using MacVim, and you want to use
+this plugin's default key bindings (or any bindings involving the `option`
+key), you must :set |macmeta|.
+
+COMMANDS                                        *yankstack-commands*
+
+You can see the contents of the yank-stack using the :Yanks command.
+Its output is similar to the |registers| command. >
+
+  :Yanks                  (lists the contents of the yank-stack)
+
+CONFIGURATION                                   *yankstack-configuration*
+
+If you want to load yankstack without defining any of the default key
+mappings, just add >
+
+   let g:yankstack_map_keys = 0
+
+to your |.vimrc| file.
+
+Yankstack defines three plugin mappings that you can map to keys of your
+choosing. The same mappings work in normal and insert modes.
+
+Mapping Name                               Action ~
+<Plug>yankstack_substitute_older_paste     cycle BACKWARDs through your history of yanks
+<Plug>yankstack_substitute_newer_paste     cycle FORWARDS through your history of yanks
+
+For example, if you wanted to define some mappings based on your |leader| key, you could do this: >
+
+  nmap <leader>p <Plug>yankstack_substitute_older_paste
+  nmap <leader>P <Plug>yankstack_substitute_newer_paste
+
+
+COMPATIBILITY                                   *yankstack-compatibility*
+
+Yankstack works by mapping the yank and paste keys to functions that do some
+book-keeping before calling through to the normal yank/paste keys. You may
+want to define your own mappings of the yank and paste keys. For example, I
+like to map the |Y| key to "y$", so that it behaves the same as |D| and |C|.
+The yankstack mappings need to happen **BEFORE** you define any such
+mappings of your own. To achieve this, just call 'yankstack#setup()'in your
+|vimrc|, before defining your mappings: >
+
+  call yankstack#setup()
+  nmap Y y$
+
+CHANGELOG                                       *yankstack-changelog*
+
+1.0.5 (2012-07-19)
+  - Fix bug where on certain versions of vim, the first time you tried
+    to cycle through your yanks after doing a normal paste, an extra
+    paste was created.
+
+1.0.4 (2012-07-01)
+  - Make it so that yankstack-cycling keys cause a normal paste if they are
+    used without pasting first. Fix stack-cycling in insert-mode.
+
+1.0.3 (2012-05-04):
+  - Fix bug when overwriting text in select mode. This was causing
+    problems for snipMate users.
+
+1.0.2 (2012-4-20):
+  - Add test coverage using rspec and [vimbot](https://github.com/maxbrunsfeld/vimbot)!
+  - Perfect the behavior of the yankstack when pasting over text in visual
+    mode
+  - Fix bug where 's' and 'S' didn't push to the yankstack
+
+1.0.1 (2012-02-11):
+  - Change default key bindings, update readme, add link to github page.
+
+1.0.1 (2011-12-08):
+  - Fix bug when displaying empty yanks.
+
+1.0 (2011-12-04):
+  - Remove unnecessary dependency on the undotree() function. Plugin should
+    now work on any recent version of vim.
+
+                                                *yankstack-license*
+Copyright (c) Max Brunsfeld.  Distributed under the same terms as Vim itself.
+See |license|.
+
+ vim:tw=78:ts=8:ft=help:norl:
diff --git a/vim/plugins/vim-yankstack/plugin/yankstack.vim b/vim/plugins/vim-yankstack/plugin/yankstack.vim
new file mode 100644
index 0000000..a5ad03b
--- /dev/null
+++ b/vim/plugins/vim-yankstack/plugin/yankstack.vim
@@ -0,0 +1 @@
+call yankstack#setup()
diff --git a/vim/plugins/vim-yankstack/spec/fixtures/repeat.vim b/vim/plugins/vim-yankstack/spec/fixtures/repeat.vim
new file mode 100644
index 0000000..e8fe723
--- /dev/null
+++ b/vim/plugins/vim-yankstack/spec/fixtures/repeat.vim
@@ -0,0 +1,115 @@
+" repeat.vim - Let the repeat command repeat plugin maps
+" Maintainer:   Tim Pope
+" Version:      1.1
+" GetLatestVimScripts: 2136 1 :AutoInstall: repeat.vim
+
+" Installation:
+" Place in either ~/.vim/plugin/repeat.vim (to load at start up) or
+" ~/.vim/autoload/repeat.vim (to load automatically as needed).
+"
+" License:
+" Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
+" See :help license
+"
+" Developers:
+" Basic usage is as follows:
+"
+"   silent! call repeat#set("\<Plug>MappingToRepeatCommand",3)
+"
+" The first argument is the mapping that will be invoked when the |.| key is
+" pressed.  Typically, it will be the same as the mapping the user invoked.
+" This sequence will be stuffed into the input queue literally.  Thus you must
+" encode special keys by prefixing them with a backslash inside double quotes.
+"
+" The second argument is the default count.  This is the number that will be
+" prefixed to the mapping if no explicit numeric argument was given.  The
+" value of the v:count variable is usually correct and it will be used if the
+" second parameter is omitted.  If your mapping doesn't accept a numeric
+" argument and you never want to receive one, pass a value of -1.
+"
+" Make sure to call the repeat#set function _after_ making changes to the
+" file.
+"
+" For mappings that use a register and want the same register used on
+" repetition, use:
+"
+"   silent! call repeat#setreg("\<Plug>MappingToRepeatCommand", v:register)
+"
+" This function can (and probably needs to be) called before making changes to
+" the file (as those typically clear v:register).  Therefore, the call sequence
+" in your mapping will look like this:
+"
+"   nnoremap <silent> <Plug>MyMap
+"   \   :<C-U>execute 'silent! call repeat#setreg("\<lt>Plug>MyMap", v:register)'<Bar>
+"   \   call <SID>MyFunction(v:register, ...)<Bar>
+"   \   silent! call repeat#set("\<lt>Plug>MyMap")<CR>
+
+if exists("g:loaded_repeat") || &cp || v:version < 700
+    finish
+endif
+let g:loaded_repeat = 1
+
+let g:repeat_tick = -1
+let g:repeat_reg = ['', '']
+
+" Special function to avoid spurious repeats in a related, naturally repeating
+" mapping when your repeatable mapping doesn't increase b:changedtick.
+function! repeat#invalidate()
+    let g:repeat_tick = -1
+endfunction
+
+function! repeat#set(sequence,...)
+    let g:repeat_sequence = a:sequence
+    let g:repeat_count = a:0 ? a:1 : v:count
+    let g:repeat_tick = b:changedtick
+endfunction
+
+function! repeat#setreg(sequence,register)
+    let g:repeat_reg = [a:sequence, a:register]
+endfunction
+
+function! repeat#run(count)
+    if g:repeat_tick == b:changedtick
+        let r = ''
+        if g:repeat_reg[0] ==# g:repeat_sequence && !empty(g:repeat_reg[1])
+            if g:repeat_reg[1] ==# '='
+                " This causes a re-evaluation of the expression on repeat, which
+                " is what we want.
+                let r = '"=' . getreg('=', 1) . "\<CR>"
+            else
+                let r = '"' . g:repeat_reg[1]
+            endif
+        endif
+
+        let c = g:repeat_count
+        let s = g:repeat_sequence
+        let cnt = c == -1 ? "" : (a:count ? a:count : (c ? c : ''))
+        call feedkeys(r . cnt, 'n')
+        call feedkeys(s)
+    else
+        call feedkeys((a:count ? a:count : '') . '.', 'n')
+    endif
+endfunction
+
+function! repeat#wrap(command,count)
+    let preserve = (g:repeat_tick == b:changedtick)
+    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo' ? 'zv' : '')
+    if preserve
+        let g:repeat_tick = b:changedtick
+    endif
+endfunction
+
+nnoremap <silent> .     :<C-U>call repeat#run(v:count)<CR>
+nnoremap <silent> u     :<C-U>call repeat#wrap('u',v:count)<CR>
+if maparg('U','n') ==# ''
+    nnoremap <silent> U     :<C-U>call repeat#wrap('U',v:count)<CR>
+endif
+nnoremap <silent> <C-R> :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
+
+augroup repeatPlugin
+    autocmd!
+    autocmd BufLeave,BufWritePre,BufReadPre * let g:repeat_tick = (g:repeat_tick == b:changedtick || g:repeat_tick == 0) ? 0 : -1
+    autocmd BufEnter,BufWritePost * if g:repeat_tick == 0|let g:repeat_tick = b:changedtick|endif
+augroup END
+
+" vim:set ft=vim et sw=4 sts=4:
diff --git a/vim/plugins/vim-yankstack/spec/spec_helper.rb b/vim/plugins/vim-yankstack/spec/spec_helper.rb
new file mode 100644
index 0000000..8fa4b47
--- /dev/null
+++ b/vim/plugins/vim-yankstack/spec/spec_helper.rb
@@ -0,0 +1,9 @@
+require "vimbot"
+
+PLUGIN_ROOT = File.expand_path("../..", __FILE__)
+VIM_REPEAT_PATH = File.expand_path("spec/fixtures/repeat.vim", PLUGIN_ROOT)
+
+RSpec.configure do |c|
+  c.alias_it_should_behave_like_to :it_has_behavior, 'has behavior:'
+end
+
diff --git a/vim/plugins/vim-yankstack/spec/yankstack/yankstack_spec.rb b/vim/plugins/vim-yankstack/spec/yankstack/yankstack_spec.rb
new file mode 100644
index 0000000..327fb5f
--- /dev/null
+++ b/vim/plugins/vim-yankstack/spec/yankstack/yankstack_spec.rb
@@ -0,0 +1,343 @@
+require "spec_helper"
+
+describe "Yankstack" do
+  let(:vim) { Vimbot::Driver.new }
+
+  before(:all) do
+    vim.start
+
+    vim.set "visualbell"
+    vim.set "noerrorbells"
+    vim.set "macmeta"
+
+    vim.set "runtimepath+=#{PLUGIN_ROOT}"
+    vim.runtime "plugin/yankstack.vim"
+
+    vim.source VIM_REPEAT_PATH
+  end
+
+  after(:all)   { vim.stop }
+  before(:each) { vim.clear_buffer }
+
+  shared_examples "yanking and pasting" do
+    let(:yank_keys) { "yw" }
+
+    before do
+      vim.insert "first_line<CR>", "second_line<CR>", "third_line<CR>", "fourth_line"
+      vim.normal "gg"
+      vim.normal yank_keys, 'j', yank_keys, 'j', yank_keys, 'j', yank_keys
+    end
+
+    it "pushes every yanked string to the :Yanks stack" do
+      yank_entries[0].should match /0\s+fourth_line/
+      yank_entries[1].should match /1\s+third_line/
+      yank_entries[2].should match /2\s+second_line/
+      yank_entries[3].should match /3\s+first_line/
+    end
+
+    describe "yanking with different keys" do
+      before do
+        vim.normal "A", "<CR>", "line to delete", "<Esc>", "^"
+      end
+
+      keys_that_change_register = [
+        'cc', 'C',
+        'dd', 'D',
+        's', 'S',
+        'x', 'X',
+        'yy', 'Y'
+      ]
+
+      keys_that_change_register.each do |key|
+        it "pushes to the stack when deleting text with '#{key}'" do
+          vim.normal key
+          yank_entries[1].should match /1\s+fourth_line/
+        end
+      end
+
+      it "pushes to the stack when overwriting text in select mode" do
+        vim.type "V"
+        vim.type "<c-g>", "this overwrites the last line"
+        yank_entries[0].should include "line to delete"
+        yank_entries[1].should include "fourth_line"
+      end
+    end
+
+    context "in normal mode" do
+      before { vim.normal "o", "<Esc>" }
+
+      describe "pasting a string with 'p'" do
+        before { vim.normal "p" }
+
+        it "pastes the most recently yanked string" do
+          vim.line_number.should == 5
+          vim.line.should == "fourth_line"
+        end
+
+        describe "pressing the repeat key with '.'" do
+          it "pastes again" do
+            pending unless File.exists?(VIM_REPEAT_PATH)
+
+            vim.type "."
+            vim.line.should == "fourth_linefourth_line"
+          end
+        end
+
+        describe "typing the 'cycle paste' key" do
+          before { vim.normal "<M-p>" }
+
+          it "replaces the pasted string with the previously yanked text" do
+            vim.line.should == "third_line"
+          end
+
+          it "rotates the previously yanked text to the top of the yank stack" do
+            yank_entries[0].should include 'third_line'
+            yank_entries[1].should include 'second_line'
+            yank_entries[2].should include 'first_line'
+            yank_entries[-1].should include 'fourth_line'
+          end
+
+          it "rotates through the yanks when pressed multiple times" do
+            vim.normal "<M-p>"
+            vim.line.should == "second_line"
+            vim.normal "<M-p>"
+            vim.line.should == "first_line"
+
+            vim.normal "<M-P>"
+            vim.line.should == "second_line"
+            vim.normal "<M-P>"
+            vim.line.should == "third_line"
+            vim.normal "<M-P>"
+            vim.line.should == "fourth_line"
+          end
+        end
+      end
+
+      describe "typing the `substitute_older_paste` key without pasting first" do
+        before { vim.type "<M-p>" }
+
+        it "pastes the most recently yanked string" do
+          vim.line_number.should == 5
+          vim.line.should == "fourth_line"
+        end
+
+        describe "typing the 'cycle paste' key" do
+          before { vim.normal "<M-p>" }
+
+          it "replaces the pasted text with the previously yanked text" do
+            vim.line.should == "third_line"
+          end
+        end
+      end
+
+      describe "typing the `substitute_newer_paste` key without pasting first" do
+        before { vim.type "<M-P>" }
+
+        it "pastes the most recently yanked string" do
+          vim.line_number.should == 5
+          vim.line.should == "fourth_line"
+        end
+
+        describe "typing the 'cycle paste' key" do
+          before { vim.normal "<M-p>" }
+
+          it "replaces the pasted text with the previously yanked text" do
+            vim.line.should == "third_line"
+          end
+        end
+      end
+
+      it "allows pasting from a non-default register" do
+        reg = 'a'
+        vim.normal "gg"
+        vim.normal %("#{reg}y$)
+        vim.normal "G"
+
+        vim.normal %("#{reg}p)
+        vim.line.should == "first_line"
+      end
+
+      it "allows pasting with a count" do
+        vim.normal "3p"
+        vim.line_number.should == 5
+        vim.line.should == "fourth_line" * 3
+      end
+    end
+
+    context "in visual mode, with text highlighted" do
+      before do
+        vim.normal "A<CR>", "line to overwrite"
+        vim.normal "V"
+      end
+
+      describe "pasting a string with 'p'" do
+        before do
+          vim.type "p"
+        end
+
+        it "overwrites the selection with the most recently yanked string" do
+          vim.line.should == "fourth_line"
+        end
+
+        it "moves the the overwritten text to the bottom of the stack" do
+          yank_entries[0].should include "fourth_line"
+          yank_entries[1].should include "third_line"
+          yank_entries[2].should include "second_line"
+          yank_entries[-1].should include "line to overwrite"
+        end
+
+        describe "typing the 'cycle older paste' key" do
+          before { vim.normal "<M-p>" }
+
+          it "replaces the pasted text with the previously yanked text" do
+            vim.line.should == "third_line"
+          end
+
+          it "moves the previously yanked text to the top of the stack" do
+            yank_entries[0].should include "third_line"
+            yank_entries[1].should include "second_line"
+            yank_entries[2].should include "first_line"
+            yank_entries[-2].should include "line to overwrite"
+            yank_entries[-1].should include "fourth_line"
+          end
+
+          describe "typing the 'cycle newer paste' key" do
+            before { vim.normal "<M-P>" }
+
+            it "replaces the pasted text with the previously yanked text" do
+              vim.line.should == "fourth_line"
+            end
+
+            it "moves the previously yanked text to the top of the stack" do
+              yank_entries[0].should include "fourth_line"
+              yank_entries[1].should include "third_line"
+              yank_entries[2].should include "second_line"
+              yank_entries[3].should include "first_line"
+              yank_entries[-1].should include "line to overwrite"
+            end
+          end
+        end
+      end
+
+      describe "typing the `substitute_older_paste` key without pasting first" do
+        before { vim.type "<M-p>" }
+
+        it "overwrites the selection with the most recently yanked string" do
+          vim.line_number.should == 5
+          vim.line.should == "fourth_line"
+        end
+      end
+
+      describe "typing the `substitute_newer_paste` key without pasting first" do
+        before { vim.type "<M-P>" }
+
+        it "overwrites the selection with the most recently yanked string" do
+          vim.line_number.should == 5
+          vim.line.should == "fourth_line"
+        end
+      end
+
+      it "allows pasting with a count" do
+        vim.type "3p"
+
+        vim.line_number.should == 5
+        vim.line.should == "fourth_line"
+
+        vim.normal 'j'
+        vim.line_number.should == 6
+        vim.line.should == "fourth_line"
+
+        vim.normal 'j'
+        vim.line_number.should == 7
+        vim.line.should == "fourth_line"
+      end
+    end
+
+    context "in insert mode" do
+      before do
+        vim.normal "A<Cr>", "()", "<Left>"
+        vim.type "<M-p>"
+      end
+
+      describe "typing the `substitute_older_paste` after a character-wise yank" do
+        it "pastes the most recently yanked text after the cursor" do
+          vim.line_number.should == 5
+          vim.line.should == "(fourth_line)"
+        end
+
+        it "stays in insert mode, with the cursor at the end of the pasted text" do
+          vim.should be_in_insert_mode
+          vim.column_number.should == "(fourth_line".length + 1
+        end
+
+        describe "typing the `substitute_older_paste` key again" do
+          before { vim.type "<M-p>" }
+
+          it "replaces the pasted text with the previously yanked text" do
+            vim.line_number.should == 5
+            vim.line.should == "(third_line)"
+          end
+
+          it "stays in insert mode, with the cursor at the end of the pasted text" do
+            vim.should be_in_insert_mode
+            vim.column_number.should == "(third_line".length+1
+          end
+
+          it "rotates the previously yanked text to the top of the yank stack" do
+            yank_entries[0].should include 'third_line'
+            yank_entries[1].should include 'second_line'
+            yank_entries[2].should include 'first_line'
+            yank_entries[-1].should include 'fourth_line'
+          end
+
+          it "rotates through the yanks when pressed multiple times" do
+            vim.type "<M-p>"
+            vim.line_number.should == 5
+            vim.line.should == "(second_line)"
+
+            vim.type "<M-p>"
+            vim.line_number.should == 5
+            vim.line.should == "(first_line)"
+
+            vim.type "<M-P>"
+            vim.line_number.should == 5
+            vim.line.should == "(second_line)"
+
+            vim.type "<M-P>"
+            vim.line_number.should == 5
+            vim.line.should == "(third_line)"
+
+            vim.type "<M-P>"
+            vim.line_number.should == 5
+            vim.line.should == "(fourth_line)"
+          end
+        end
+      end
+
+      describe "typing `substitute_older_paste` after a line-wise yank" do
+        let(:yank_keys) { "yy" }
+
+        xit "pastes and puts the cursor after the pasted text" do
+          vim.line_number.should == 6
+          vim.line.should == ")"
+          vim.type "<Up>"
+          vim.line.should == "(fourth_line"
+        end
+      end
+    end
+  end
+
+  describe "when using the normal default register" do
+    it_has_behavior "yanking and pasting"
+  end
+
+  describe "when using the system clipboard as the default register" do
+    before { vim.set "clipboard", "unnamed" }
+    it_has_behavior "yanking and pasting"
+  end
+
+  def yank_entries
+    @yank_entries ||= vim.command("Yanks").split("\n")[1..-1]
+  end
+end
+
diff --git a/vim/snippets/bootstrap-snippets/README.md b/vim/snippets/bootstrap-snippets/README.md
new file mode 100644
index 0000000..6bcb562
--- /dev/null
+++ b/vim/snippets/bootstrap-snippets/README.md
@@ -0,0 +1,72 @@
+# Bootstrap Snippets
+
+HTML and Haml snippets for [Twitter Bootstrap 3.3.2](http://getbootstrap.com/) markup, for the Vim plugin [snipMate](https://github.com/garbas/vim-snipmate).
+
+![Animation](https://cloud.githubusercontent.com/assets/227274/5981940/c07ea88c-a901-11e4-859d-d87eeff19354.gif)
+
+## Dependencies
+
+- [vim-snipmate](https://github.com/garbas/vim-snipmate)
+- [tlib\_vim](https://github.com/tomtom/tlib_vim)
+- [vim-addon-mw-utils](https://github.com/MarcWeber/vim-addon-mw-utils)
+
+## Installation using [Pathogen](https://github.com/tpope/vim-pathogen)
+
+    $ cd ~/.vim
+    $ mkdir bundle
+    $ cd bundle
+
+    # Install dependencies:
+    $ git clone https://github.com/garbas/vim-snipmate.git
+    $ git clone https://github.com/tomtom/tlib_vim.git
+    $ git clone https://github.com/MarcWeber/vim-addon-mw-utils.git
+
+    # Install bootstrap-snippets
+    $ git clone -b bootstrap-3-3-2 git://github.com/bonsaiben/bootstrap-snippets.git
+
+
+## Usage
+
+In an html or haml file, type a trigger name in Insert mode, and press `Tab` to expand it into HTML markup.
+
+Trigger names are meant to be as predictable as possible without being too long or redundant.
+
+Most trigger names correspond directly to the relevant tag or class name, minus hyphens. For example, `btnprimary` becomes:
+
+```html
+<button type="button" class="btn btn-primary">Default</button>
+```
+
+##### Buttons
+
+Markup with `.btn` class uses the `<button>` tag by default, however there is usually a corresponding `<a>` tag version with the same trigger preceded by an `a`. For example, with `btnprimary` there is also `abtnprimary` which becomes:
+
+```html
+<a href="#" class="btn btn-primary" role="button">Primary</a>
+```
+
+See Trigger Glossary below for a full list of triggers.
+
+## Filetypes
+
+By default html snippets will only work in html files, or file formats associated with the html filetype in vim. If you are using a format like Ruby ERB (`.html.erb`) and the html snippets are not working, you may have to tell Vim to associate `.html.erb` files with the html filetype, for example:
+
+```vim
+autocmd BufRead,BufNewFile *.html.erb set filetype=html
+```
+
+## Autocomplete
+
+bootstrap-snippets ships with a dictionary file containing all of the triggers. This can be used as a vim dictionary for autocomplete (Insert mode CTRL+N/CTRL+P).
+
+Add the dictionary file and enable dictionary autocomplete:
+
+```vim
+set dictionary+=~/.vim/bundle/bootstrap-snippets/dictionary
+set complete+=k
+```
+
+## Trigger Glossary
+
+You can find a trigger glossary in the Wiki [here](https://github.com/bonsaiben/bootstrap-snippets/wiki/Trigger-Glossary).
+
diff --git a/vim/snippets/bootstrap-snippets/addon-info.json b/vim/snippets/bootstrap-snippets/addon-info.json
new file mode 100644
index 0000000..706598a
--- /dev/null
+++ b/vim/snippets/bootstrap-snippets/addon-info.json
@@ -0,0 +1,9 @@
+{
+  "name" : "bootstrap-snippets",
+  "author" : "Benjamin Sullivan",
+  "maintainer" : "Benjamin Sullivan",
+  "repository" : {"type": "git", "url": "git://github.com/bonsaiben/bootstrap-snippets.git"},
+  "dependencies" : {
+  },
+  "description" : "Bootstrap 3.2.2 snippets for snipMate"
+}
diff --git a/vim/snippets/bootstrap-snippets/dictionary b/vim/snippets/bootstrap-snippets/dictionary
new file mode 100644
index 0000000..6e60b2a
--- /dev/null
+++ b/vim/snippets/bootstrap-snippets/dictionary
@@ -0,0 +1,348 @@
+abbr
+abtn
+abtnactive
+abtnblock
+abtncollapse
+abtndanger
+abtndefault
+abtndisabled
+abtngroup
+abtngroupjustified
+abtninfo
+abtnlg
+abtnlink
+abtnprimary
+abtnsm
+abtnsuccess
+abtnwarning
+abtnxs
+accordian
+address
+affix
+alert
+alertdanger
+alertdismissible
+alertinfo
+alertlink
+alertsuccess
+alertwarning
+alistgroupitem
+alistgroupitemcontent
+alistgroupitemdanger
+alistgroupiteminfo
+alistgroupitemsuccess
+alistgroupitemwarning
+apopover
+apopoverbottom
+apopoverdismissible
+apopoverleft
+apopoverright
+apopovertop
+atooltip
+atooltipbottom
+atooltipleft
+atooltipright
+atooltiptop
+badge
+badgebtn
+badgenav
+basictemplate
+bgdanger
+bginfo
+bgprimary
+bgsuccess
+bgwarning
+blockquote
+blockquotereverse
+blockquotesource
+bootstrapcdn
+breadcrumb
+btn
+btnactive
+btnblock
+btncollapse
+btndanger
+btndefault
+btndisabled
+btndropdown
+btndropdownsplit
+btndropup
+btngroup
+btngroupcheckbox
+btngroupjustified
+btngrouplg
+btngroupradio
+btngroupsm
+btngroupvertical
+btngroupxs
+btninfo
+btnlg
+btnlink
+btnprimary
+btnsingletoggle
+btnsm
+btnstatetext
+btnsuccess
+btntoolbar
+btnwarning
+btnxs
+caret
+carousel
+centerblock
+checkbox
+checkboxhaserror
+checkboxhassuccess
+checkboxhaswarning
+checkboxinline
+clearfix
+close
+code
+collg
+collgoffset
+collgpull
+collgpush
+colmd
+colmdoffset
+colmdpull
+colmdpush
+colsm
+colsmoffset
+colsmpull
+colsmpush
+colxs
+colxsoffset
+colxspull
+colxspush
+container
+containerfluid
+del
+divider
+dl
+dlhorizontal
+dropdown
+dropdownheader
+dropdownmenuright
+em
+embedresponsive
+fieldsetdisabled
+form
+formcontrolstatic
+formgrouphaserror
+formgrouphasfeedback
+formgrouphassuccess
+formgrouphaswarning
+formgrouplg
+formgroupsm
+formhorizontal
+forminline
+glyphicon
+h1
+h1small
+h2
+h2small
+h3
+h3small
+h4
+h4small
+h5
+h5small
+h6
+h6small
+hidden
+hiddenlg
+hiddenmd
+hiddenprint
+hiddensm
+hiddenxs
+html5
+imgcircle
+imgresponsive
+imgrounded
+imgthumbnail
+initialism
+input
+inputbtn
+inputdisabled
+inputgroup
+inputgroupbtn
+inputgroupbtndropdown
+inputgroupcheckbox
+inputgrouplg
+inputgroupradio
+inputgroupsm
+inputhelpblock
+inputlg
+inputreadonly
+inputsm
+ins
+invisible
+jumbotron
+jumbotroncontainer
+kbd
+label
+labeldanger
+labeldefault
+labelinfo
+labelprimary
+labelsuccess
+labelwarning
+lead
+lidisabled
+listgroup
+listgroupitem
+listgroupitembadge
+listgroupitemcontent
+listgroupitemdanger
+listgroupitemdisabled
+listgroupiteminfo
+listgroupitemsuccess
+listgroupitemwarning
+listinline
+listunstyled
+mark
+media
+mediabody
+mediabottom
+medialeft
+medialist
+mediamiddle
+mediaright
+modal
+modallg
+modalsm
+navbar
+navbarbtn
+navbarfixedbottom
+navbarfixedtop
+navbarform
+navbarinverse
+navbarlink
+navbarstatictop
+navbartext
+navpills
+navpillsdropdown
+navpillsjustified
+navpillsstacked
+navtabs
+navtabsdropdown
+navtabsjustified
+ol
+p
+pageheader
+pager
+pageraligned
+pagination
+paginationlg
+paginationsm
+panel
+panelbody
+paneldanger
+paneldefault
+panelfooter
+panelheading
+panelheadingtitle
+panelinfo
+panellistgroup
+panelprimary
+panelsuccess
+paneltable
+panelwarning
+popover
+popoverbottom
+popoverleft
+popoverright
+popovertop
+pre
+progress
+progressdanger
+progressinfo
+progressstacked
+progressstriped
+progressstripedactive
+progresssuccess
+progresswarning
+pullleft
+pullright
+radio
+radioinline
+row
+s
+samp
+scrollspy
+select
+selectlg
+selectmultiple
+selectsm
+show
+small
+sronlyfocusable
+strong
+submitbtn
+table
+tablebordered
+tablecondensed
+tablehover
+tableresponsive
+tablestriped
+tabpanel
+tdactive
+tddanger
+tdinfo
+tdsuccess
+tdwarning
+textarea
+textcapitalize
+textcenter
+textdanger
+texthide
+textinfo
+textjustify
+textleft
+textlowercase
+textmuted
+textnowrap
+textprimary
+textright
+textsuccess
+textuppercase
+textwarning
+thactive
+thdanger
+thinfo
+thsuccess
+thumbnail
+thumbnailcontent
+thwarning
+tooltip
+tooltipbottom
+tooltipleft
+tooltipright
+tooltiptop
+tractive
+trdanger
+trinfo
+trsuccess
+trwarning
+u
+ul
+var
+viewport
+viewportnozoom
+visiblelgblock
+visiblelginline
+visiblelginlineblock
+visiblemdblock
+visiblemdinline
+visiblemdinlineblock
+visibleprintblock
+visibleprintinline
+visibleprintinlineblock
+visiblesmblock
+visiblesminline
+visiblesminlineblock
+visiblexsblock
+visiblexsinline
+visiblexsinlineblock
+well
+welllg
+wellsm
diff --git a/vim/snippets/bootstrap-snippets/snippets/haml.snippets b/vim/snippets/bootstrap-snippets/snippets/haml.snippets
new file mode 100644
index 0000000..fb57c2c
--- /dev/null
+++ b/vim/snippets/bootstrap-snippets/snippets/haml.snippets
@@ -0,0 +1,1729 @@
+snippet bootstrapcdn Bootstrap
+	/ Latest compiled and minified CSS
+	%link{:href => "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css", :rel => "stylesheet"}
+	
+	/ Optional theme
+	%link{:href => "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css", :rel => "stylesheet"}
+	
+	/ Latest compiled and minified JavaScript
+	%script{:src => "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"}
+
+
+snippet basictemplate Bootstrap
+	!!!
+	%html{:lang => "en"}
+	  %head
+	    %meta{:charset => "utf-8"}
+	    %meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}
+	    %meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}
+	    %title Bootstrap 101 Template
+	
+	    / Bootstrap
+	    %link{:href => "css/bootstrap.min.css", :rel => "stylesheet"}
+	
+	    / HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries
+	    / WARNING: Respond.js doesn't work if you view the page via file://
+	    /[if lt IE 9]
+	      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+	      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+	  %body
+	    %h1 Hello, world!
+	
+	    / jQuery (necessary for Bootstrap's JavaScript plugins)
+	    %script{:src => "https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"}
+	    / Include all compiled plugins (below), or include individual files as needed
+	    %script{:src => "js/bootstrap.min.js"}
+
+
+snippet html5 Bootstrap
+	!!!
+	%html{:lang => "en"}
+	  ${1:...}
+
+
+snippet viewport Bootstrap
+	%meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}
+
+snippet viewportnozoom Bootstrap
+	%meta{:content => "width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no", :name => "viewport"}
+
+
+snippet container Bootstrap
+	.container
+	  ${1:...}
+
+snippet containerfluid Bootstrap
+	.container-fluid
+	  ${1:...}
+
+
+snippet row Bootstrap
+	.row
+	  ${1:...}
+
+snippet colxs Bootstrap
+	.col-xs-${1:1}
+	  ${2:...}
+
+snippet colsm Bootstrap
+	.col-sm-${1:1}
+	  ${2:...}
+
+snippet colmd Bootstrap
+	.col-md-${1:1}
+	  ${2:...}
+
+snippet collg Bootstrap
+	.col-lg-${1:1}
+	  ${2:...}
+
+snippet colxsoffset Bootstrap
+	.col-xs-offset-${1:1}
+	  ${2:...}
+
+snippet colsmoffset Bootstrap
+	.col-sm-offset-${1:1}
+	  ${2:...}
+
+snippet colmdoffset Bootstrap
+	.col-md-offset-${1:1}
+	  ${2:...}
+
+snippet collgoffset Bootstrap
+	.col-lg-offset-${1:1}
+	  ${2:...}
+
+snippet colxspush Bootstrap
+	.col-xs-push-${1:1}
+	  ${2:...}
+
+snippet colsmpush Bootstrap
+	.col-sm-push-${1:1}
+	  ${2:...}
+
+snippet colmdpush Bootstrap
+	.col-md-push-${1:1}
+	  ${2:...}
+
+snippet collgpush Bootstrap
+	.col-lg-push-${1:1}
+	  ${2:...}
+
+snippet colxspull Bootstrap
+	.col-xs-pull-${1:1}
+	  ${2:...}
+
+snippet colsmpull Bootstrap
+	.col-sm-pull-${1:1}
+	  ${2:...}
+
+snippet colmdpull Bootstrap
+	.col-md-pull-${1:1}
+	  ${2:...}
+
+snippet collgpull Bootstrap
+	.col-lg-pull-${1:1}
+	  ${2:...}
+
+
+snippet h1 Bootstrap
+	%h1 ${1:Bootstrap heading}
+
+snippet h2 Bootstrap
+	%h2 ${1:Bootstrap heading}
+
+snippet h3 Bootstrap
+	%h3 ${1:Bootstrap heading}
+
+snippet h4 Bootstrap
+	%h4 ${1:Bootstrap heading}
+
+snippet h5 Bootstrap
+	%h5 ${1:Bootstrap heading}
+
+snippet h6 Bootstrap
+	%h6 ${1:Bootstrap heading}
+
+
+snippet h1small Bootstrap
+	%h1
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet h2small Bootstrap
+	%h2
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet h3small Bootstrap
+	%h3
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet h4small Bootstrap
+	%h4
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet h5small Bootstrap
+	%h5
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet h6small Bootstrap
+	%h6
+	  ${1:Bootstrap heading}
+	  %small ${2:Secondary text}
+
+snippet p Bootstrap
+	%p ${1:...}
+
+snippet lead Bootstrap
+	%p.lead ${1:...}
+
+snippet mark Bootstrap
+	%mark ${1:hightlight}
+
+snippet del Bootstrap
+	%del ${1:This line of text is meant to be treated as deleted text.}
+
+snippet s Bootstrap
+	%s ${1:This line of text is meant to be treated as no longer accurate.}
+
+snippet ins Bootstrap
+	%ins ${1:This line of text is meant to be treated as an addition to the document.}
+
+snippet u Bootstrap
+	%u ${1:This line of text will render as underlined}
+
+snippet small Bootstrap
+	%small ${1:This line of text is meant to be treated as fine print.}
+
+snippet strong Bootstrap
+	%strong ${1:bold text}
+
+snippet em Bootstrap
+	%em ${1:italicized text}
+
+snippet textleft Bootstrap
+	%p.text-left ${1:Left aligned text.}
+
+snippet textcenter Bootstrap
+	%p.text-center ${1:Center aligned text.}
+
+snippet textright Bootstrap
+	%p.text-right ${1:Right aligned text.}
+
+snippet textjustify Bootstrap
+	%p.text-justify ${1:Justified text.}
+
+snippet textnowrap Bootstrap
+	%p.text-nowrap ${1:No wrap text.}
+
+
+snippet textlowercase Bootstrap
+	%p.text-lowercase ${1:Lowercased text.}
+
+snippet textuppercase Bootstrap
+	%p.text-uppercase ${1:Uppercased text.}
+
+snippet textcapitalize Bootstrap
+	%p.text-capitalize ${1:Capitalized text.}
+
+snippet abbr Bootstrap
+	%abbr{:title => "${1:attribute}"} ${2:attr}
+
+
+snippet initialism Bootstrap
+	%abbr.initialism{:title => "${1:HyperText Markup Language}"} ${2:HTML}
+
+snippet address Bootstrap
+	%address
+	  %strong ${1:Twitter, Inc.}
+	  %br
+	  ${2:795 Folsom Ave, Suite 600}
+	  %br
+	  ${3:San Francisco, CA 94107}
+	  %br
+	  %abbr{:title => "Phone"} P: ${4:(123) 456-7890}
+	
+	%address
+	  %strong ${5:Full Name}
+	  %br
+	  %a{:href => "mailto:#"} ${6:first.last@example.com}
+
+snippet blockquote Bootstrap
+	%blockquote
+	  %p ${1:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.}
+
+snippet blockquotesource Bootstrap
+	%blockquote
+	  %p ${1:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.}
+	  %footer
+	    ${2:Someone famous in}
+	    %cite{:title => "${3:Source Title}"} $3
+
+snippet blockquotereverse Bootstrap
+	%blockquote.blockquote-reverse
+	  ${1:...}
+
+snippet ul Bootstrap
+	%ul
+	  %li ${1:...}
+
+snippet ol Bootstrap
+	%ol
+	  %li ${1:...}
+
+snippet listunstyled Bootstrap
+	%ul.list-unstyled
+	  %li ${1:...}
+
+snippet listinline Bootstrap
+	%ul.list-inline
+	  %li ${1:...}
+
+snippet dl Bootstrap
+	%dl
+	  %dt ${1:...}
+	  %dd ${2:...}
+
+snippet dlhorizontal Bootstrap
+	%dl.dl-horizontal
+	  %dt ${1:...}
+	  %dd ${2:...}
+
+
+
+snippet code Bootstrap
+	%code ${1:&lt;section&gt;}
+
+snippet kbd Bootstrap
+	%kbd ${1:cd}
+
+snippet pre Bootstrap
+	%pre ${1:&lt;p&gt;Sample text here...&lt;/p&gt;}
+
+snippet var Bootstrap
+	%var ${1:x}
+
+
+snippet samp Bootstrap
+	%samp ${1:This text is meant to be treated as sample output from a computer program.}
+
+
+
+snippet table Bootstrap
+	%table.table
+	  ${1:...}
+
+snippet tablestriped Bootstrap
+	%table.table.table-striped
+	  ${1:...}
+
+snippet tablebordered Bootstrap
+	%table.table.table-bordered
+	  ${1:...}
+
+snippet tablehover Bootstrap
+	%table.table.table-hover
+	  ${1:...}
+
+snippet tablecondensed Bootstrap
+	%table.table.table-condensed
+	  ${1:...}
+
+
+snippet tractive Bootstrap
+	%tr.active ${1:...}
+
+snippet trsuccess Bootstrap
+	%tr.success ${1:...}
+
+snippet trwarning Bootstrap
+	%tr.warning ${1:...}
+
+snippet trdanger Bootstrap
+	%tr.danger ${1:...}
+
+snippet trinfo Bootstrap
+	%tr.info ${1:...}
+
+
+snippet tdactive Bootstrap
+	%td.active ${1:...}
+
+snippet tdsuccess Bootstrap
+	%td.success ${1:...}
+
+snippet tdwarning Bootstrap
+	%td.warning ${1:...}
+
+snippet tddanger Bootstrap
+	%td.danger ${1:...}
+
+snippet tdinfo Bootstrap
+	%td.info ${1:...}
+
+
+snippet thactive Bootstrap
+	%th.active ${1:...}
+
+snippet thsuccess Bootstrap
+	%th.success ${1:...}
+
+snippet thwarning Bootstrap
+	%th.warning ${1:...}
+
+snippet thdanger Bootstrap
+	%th.danger ${1:...}
+
+snippet thinfo Bootstrap
+	%th.info ${1:...}
+
+snippet tableresponsive Bootstrap
+	%div.table-responsive
+	  %table.table
+	    ${1:...}
+
+
+snippet form Bootstrap
+	%form
+	  .form-group
+	    %label{:for => "exampleInputEmail1"} Email address
+	    %input#exampleInputEmail1.form-control{:placeholder => "Enter email", :type => "email"}
+	  .form-group
+	    %label{:for => "exampleInputPassword1"} Password
+	    %input#exampleInputPassword1.form-control{:placeholder => "Password", :type => "password"}
+	  .form-group
+	    %label{:for => "exampleInputFile"} File input
+	    %input#exampleInputFile{:type => "file"}
+	    %p.help-block Example block-level help text here.
+	  .checkbox
+	    %label
+	      %input{:type => "checkbox"}
+	      Check me out
+	  %button.btn.btn-default{:type => "submit"} Submit
+
+snippet forminline Bootstrap
+	%form.form-inline
+	  .form-group
+	    %label.sr-only{:for => "exampleInputEmail3"} Email address
+	    %input#exampleInputEmail3.form-control{:placeholder => "Enter email", :type => "email"}/
+	  .form-group
+	    %label.sr-only{:for => "exampleInputPassword3"} Password
+	    %input#exampleInputPassword3.form-control{:placeholder => "Password", :type => "password"}/
+	  .checkbox
+	    %label
+	      %input{:type => "checkbox"}/
+	      Remember me
+	  %button.btn.btn-default{:type => "submit"} Sign in
+
+snippet formhorizontal Bootstrap
+	%form.form-horizontal
+	  .form-group
+	    %label.col-sm-2.control-label{:for => "inputEmail3"} Email
+	    .col-sm-10
+	      %input#inputEmail3.form-control{:placeholder => "Email", :type => "email"}
+	  .form-group
+	    %label.col-sm-2.control-label{:for => "inputPassword3"} Password
+	    .col-sm-10
+	      %input#inputPassword3.form-control{:placeholder => "Password", :type => "password"}
+	  .form-group
+	    .col-sm-offset-2.col-sm-10
+	      .checkbox
+	        %label
+	          %input{:type => "checkbox"}
+	          Remember me
+	  .form-group
+	    .col-sm-offset-2.col-sm-10
+	      %button.btn.btn-default{:type => "submit"} Sign in
+
+snippet input Bootstrap
+	%input.form-control{:type => "text", :placeholder => "${1:Text input}"}
+
+snippet textarea Bootstrap
+	%textarea.form-control{:rows => "3"}
+
+snippet checkbox Bootstrap
+	.checkbox
+	  %label
+	    %input{:type => "checkbox", :value => "${1:}"}
+	    ${2:Option one is this and that&mdash;be sure to include why it's great}
+
+snippet radio Bootstrap
+	.radio
+	  %label
+	    %input{:checked => "checked", :id => "${2:optionsRadios1}", :name => "${1:optionsRadios}", :type => "radio", :value => "${3:option1}"}
+	    ${4:Option one is this and that—be sure to include why it's great}
+	.radio
+	  %label
+	    %input{:id => "${6:optionsRadios2}", :name => "${5:optionsRadios}", :type => "radio", :value => "${7:option2}"}
+	    ${8:Option two can be something else and selecting it will deselect option one}
+
+snippet checkboxinline Bootstrap
+	%label.checkbox-inline
+	  %input{:id => "${1:inlineCheckbox1}", :type => "checkbox", :value => "${2:option1}"}
+	  ${3:1}
+
+snippet radioinline Bootstrap
+	%label.radio-inline
+	  %input{:id => "${2:inlineRadio1}", :name => "${1:inlineRadioOptions}", :type => "radio", :value => "${3:option1}"}
+	  ${4:1}
+	%label.radio-inline
+	  %input{:id => "${6:inlineRadio2}", :name => "${5:inlineRadioOptions}", :type => "radio", :value => "${7:option2}"}
+	  ${8:2}
+
+snippet select Bootstrap
+	%select.form-control
+	  %option ${1:1}
+	  %option ${2:2}
+
+snippet selectmultiple Bootstrap
+	%select.form-control{:multiple => "multiple"}
+	  %option ${1:1}
+	  %option ${2:2}
+
+snippet formcontrolstatic Bootstrap
+	.form-group
+	  %label.col-sm-2.control-label ${1:Email}
+	  .col-sm-10
+	    %p.form-control-static ${2:email@example.com}
+
+snippet inputdisabled Bootstrap
+	%input.form-control{:disabled => "disabled", :id => "${1:disabledInput}", :placeholder => "${2:Disabled input here...}", :type => "text"}
+
+snippet fieldsetdisabled Bootstrap
+	%fieldset{:disabled => "disabled"}
+	  .form-group
+	    %label{:for => "disabledTextInput"} Disabled input
+	    %input#disabledTextInput.form-control{:placeholder => "Disabled input", :type => "text"}
+	  .form-group
+	    %label{:for => "disabledSelect"} Disabled select menu
+	    %select#disabledSelect.form-control
+	      %option Disabled select
+	  .checkbox
+	    %label
+	      %input{:type => "checkbox"}
+	      Can't check this
+	  %button.btn.btn-primary{:type => "submit"} Submit
+
+snippet inputreadonly Bootstrap
+	%input.form-control{:placeholder => "${1:Readonly input here...}", :readonly => "readonly", :type => "text"}
+
+snippet formgrouphassuccess Bootstrap
+	.form-group.has-success
+	  %label.control-label{:for => "$2"} ${1:Input with success}
+	  %input.form-control{:id => "${2:inputSuccess1}", :type => "text"}
+
+snippet formgrouphaswarning Bootstrap
+	.form-group.has-warning
+	  %label.control-label{:for => "$2"} ${1:Input with warning}
+	  %input.form-control{:id => "${2:inputWarning1}", :type => "text"}
+
+snippet formgrouphaserror Bootstrap
+	.form-group.has-error
+	  %label.control-label{:for => "$2"} ${1:Input with error}
+	  %input.form-control{:id => "${2:inputError1}", :type => "text"}
+
+snippet checkboxhassuccess Bootstrap
+	.has-success
+	  .checkbox
+	    %label
+	      %input{:id => "${1:checkboxSuccess}", :type => "checkbox", :value => "${2:option1}"}
+	      ${3:Checkbox with success}
+
+snippet checkboxhaswarning Bootstrap
+	.has-warning
+	  .checkbox
+	    %label
+	      %input{:id => "${1:checkboxWarning}", :type => "checkbox", :value => "${2:option1}"}
+	      ${3:Checkbox with warning}
+
+
+snippet checkboxhaserror Bootstrap
+	.has-error
+	  .checkbox
+	    %label
+	      %input{:id => "${1:checkboxError}", :type => "checkbox", :value => "${2:option1}"}
+	      ${3:Checkbox with error}
+
+
+snippet formgrouphasfeedback Bootstrap
+	.form-group.has-success.has-feedback
+	  %label.control-label{:for => "$3"} ${1:Input group with success}
+	  .input-group
+	    %span.input-group-addon ${2:@}
+	    %input.form-control{"aria-describedby" => "$3Status", :id => "${3:inputGroupSuccess1}", :type => "text"}
+	  %span.glyphicon.glyphicon-ok.form-control-feedback{"aria-hidden" => "true"}
+	  %span.sr-only{:id => "$3Status"} (success)
+
+snippet inputlg Bootstrap
+	%input.form-control.input-lg{:placeholder => "${1:.input-lg}", :type => "text"}
+
+snippet inputsm Bootstrap
+	%input.form-control.input-sm{:placeholder => "${1:.input-sm}", :type => "text"}
+
+snippet selectlg Bootstrap
+	%select.form-control.input-lg ${1:...}
+
+snippet selectsm Bootstrap
+	%select.form-control.input-sm ${1:...}
+
+snippet formgrouplg Bootstrap
+	.form-group.form-group-lg
+	  %label.col-sm-2.control-label{:for => "$2"} ${1:Large label}
+	  .col-sm-10
+	    %input.form-control{:id => "${2:formGroupInputLarge}", :placeholder => "${3:Large input}", :type => "text"}
+
+snippet formgroupsm Bootstrap
+	.form-group.form-group-sm
+	  %label.col-sm-2.control-label{:for => "$2"} ${1:Small label}
+	  .col-sm-10
+	    %input.form-control{:id => "${2:formGroupInputSmall}", :placeholder => "${3:Small input}", :type => "text"}
+
+snippet inputhelpblock Bootstrap
+	%label.sr-only{:for => "$2"} ${1:Input with help text}
+	%input.form-control{"aria-describedby" => "$3", :id => "${2:inputHelpBlock}", :type => "text"}
+	%span.help-block{:id => "${3:helpBlock}"} ${4:A block of help text that breaks onto a new line and may extend beyond one line.}
+
+snippet btn Bootstrap
+	%button.btn.btn-default{:type => "submit"} ${1:Button}
+
+snippet abtn Bootstrap
+	%a.btn.btn-default{:href => "${1:#}", :role => "button"} ${2:Link}
+
+snippet inputbtn Bootstrap
+	%input.btn.btn-default{:type => "button", :value => "${1:Input}"}
+
+snippet submitbtn Bootstrap
+	%input.btn.btn-default{:type => "submit", :value => "${1:Submit}"}
+
+snippet btndefault Bootstrap
+	%button.btn.btn-default{:type => "button"} ${1:Default}
+
+snippet abtndefault Bootstrap
+	%a.btn.btn-default{:href => "${1:#}", :role => "button"} ${2:Default}
+
+snippet btnprimary Bootstrap
+	%button.btn.btn-primary{:type => "button"} Primary
+
+snippet abtnprimary Bootstrap
+	%a.btn.btn-primary{:href => "${1:#}", :role => "button"} ${2:Primary}
+
+snippet btnsuccess Bootstrap
+	%button.btn.btn-success{:type => "button"} ${1:Success}
+
+snippet abtnsuccess Description
+	%a.btn.btn-success{:href => "${1:#}", :role => "button"} ${2:Success}
+
+snippet btninfo Bootstrap
+	%button.btn.btn-info{:type => "button"} ${1:Info}
+
+snippet abtninfo Bootstrap
+	%a.btn.btn-info{:href => "${1:#}", :role => "button"} ${2:Info}
+
+snippet btnwarning Bootstrap
+	%button.btn.btn-warning{:type => "button"} ${1:Warning}
+
+snippet abtnwarning Bootstrap
+	%a.btn.btn-warning{:href => "${1:#}", :role => "button"} ${2:Warning}
+
+snippet btndanger Bootstrap
+	%button.btn.btn-danger{:type => "button"} ${1:Danger}
+
+snippet abtndanger Bootstrap
+	%a.btn.btn-danger{:href => "${1:#}", :role => "button"} ${2:Danger}
+
+snippet btnlink Bootstrap
+	%button.btn.btn-link{:type => "button"} ${1:Link}
+
+snippet abtnlink Bootstrap
+	%a.btn.btn-link{:href => "${1:#}", :role => "button"} ${2:Link}
+
+snippet btnlg Bootstrap
+	%button.btn.btn-default.btn-lg{:type => "button"} ${1:Large button}
+
+snippet abtnlg Bootstrap
+	%a.btn.btn-default.btn-lg{:href => "${1:#}", :role => "button"} ${2:Large button}
+
+snippet btnsm Bootstrap
+	%button.btn.btn-default.btn-sm{:type => "button"} ${1:Small button}
+
+snippet abtnsm Bootstrap
+	%a.btn.btn-default.btn-sm{:href => "${1:#}", :role => "button"} ${2:Small button}
+
+snippet btnxs Bootstrap
+	%button.btn.btn-default.btn-xs{:type => "button"} ${1:Extra small button}
+
+snippet abtnxs Bootstrap
+	%a.btn.btn-default.btn-xs{:href => "${1:#}", :role => "button"} ${2:Extra small button}
+
+snippet btnblock Bootstrap
+	%button.btn.btn-default.btn-block{:type => "button"} ${1:Block level button}
+
+snippet abtnblock Bootstrap
+	%a.btn.btn-default.btn-block{:href => "${1:#}", :role => "button"} ${2:Block level button}
+
+snippet btnactive Bootstrap
+	%button.btn.btn-default.active{:type => "button"} ${1:Button}
+
+snippet abtnactive Bootstrap
+	%a.btn.btn-default.active{:href => "${1:#}", :role => "button"} ${2:Link}
+
+snippet btndisabled Bootstrap
+	%button.btn.btn-default{:disabled => "disabled", :type => "button"} ${1:Button}
+
+snippet abtndisabled Bootstrap
+	%a.btn.btn-default.disabled{:href => "${1:#}", :role => "button"} ${2:Link}
+
+snippet imgresponsive Bootstrap
+	%img.img-responsive{:alt => "${2:Responsive image}", :src => "${1:...}"}
+
+snippet imgrounded Bootstrap
+	%img.img-rounded{:alt => "${2:...}", :src => "${1:...}"}
+
+snippet imgcircle Bootstrap
+	%img.img-circle{:alt => "${2:...}", :src => "${1:...}"}
+
+snippet imgthumbnail Bootstrap
+	%img.img-thumbnail{:alt => "${2:...}", :src => "${1:...}"}
+
+snippet textmuted Bootstrap
+	%p.text-muted ${1:...}
+
+snippet textprimary Bootstrap
+	%p.text-primary ${1:...}
+
+snippet textsuccess Bootstrap
+	%p.text-success ${1:...}
+
+snippet textinfo Bootstrap
+	%p.text-info ${1:...}
+
+snippet textwarning Bootstrap
+	%p.text-warning ${1:...}
+
+snippet textdanger Bootstrap
+	%p.text-danger ${1:...}
+
+snippet bgprimary Bootstrap
+	%p.bg-primary ${1:...}
+
+snippet bgsuccess Bootstrap
+	%p.bg-success ${1:...}
+
+snippet bginfo Bootstrap
+	%p.bg-info ${1:...}
+
+snippet bgwarning Bootstrap
+	%p.bg-warning ${1:...}
+
+snippet bgdanger Bootstrap
+	%p.bg-danger ${1:...}
+
+snippet close Bootstrap
+	%button.close{"aria-label" => "Close", :type => "button"}
+	  %span{"aria-hidden" => "true"} ×
+
+snippet caret Bootstrap
+	%span.caret
+
+snippet pullleft Bootstrap
+	.pull-left ${1:...}
+
+snippet pullright Bootstrap
+	.pull-right ${1:...}
+
+snippet centerblock Bootstrap
+	.center-block ${1:...}
+
+snippet clearfix Bootstrap
+	.clearfix ${1:...}
+
+snippet show Bootstrap
+	.show ${1:...}
+
+snippet hidden Bootstrap
+	.hidden ${1:...}
+
+snippet invisible Bootstrap
+	.invisible ${1:...}
+
+snippet sronlyfocusable Bootstrap
+	%a.sr-only.sr-only-focusable{:href => "${1:#content}"} ${2:Skip to main content}
+
+snippet texthide Bootstrap
+	%h1.text-hide ${1:Custom heading}
+
+snippet hiddenxs Bootstrap
+	.hidden-xs ${1:...}
+
+snippet hiddensm Bootstrap
+	.hidden-sm ${1:...}
+
+snippet hiddenmd Bootstrap
+	.hidden-md ${1:...}
+
+snippet hiddenlg Bootstrap
+	.hidden-lg ${1:...}
+
+snippet visiblexsblock Bootstrap
+	.visible-xs-block ${1:...}
+
+snippet visiblexsinline Bootstrap
+	.visible-xs-inline ${1:...}
+
+snippet visiblexsinlineblock Bootstrap
+	.visible-xs-inline-block ${1:...}
+
+snippet visiblesmblock Bootstrap
+	.visible-sm-block ${1:...}
+
+snippet visiblesminline Bootstrap
+	.visible-sm-inline ${1:...}
+
+snippet visiblesminlineblock Bootstrap
+	.visible-sm-inline-block ${1:...}
+
+snippet visiblemdblock Bootstrap
+	.visible-md-block ${1:...}
+
+snippet visiblemdinline Bootstrap
+	.visible-md-inline ${1:...}
+
+snippet visiblemdinlineblock Bootstrap
+	.visible-md-inline-block ${1:...}
+
+snippet visiblelgblock Bootstrap
+	.visible-lg-block ${1:...}
+
+snippet visiblelginline Bootstrap
+	.visible-lg-inline ${1:...}
+
+snippet visiblelginlineblock Bootstrap
+	.visible-lg-inline-block ${1:...}
+
+snippet visibleprintblock Bootstrap
+	.visible-print-block ${1:...}
+
+snippet visibleprintinline Bootstrap
+	.visible-print-inline ${1:...}
+
+snippet visibleprintinlineblock Bootstrap
+	.visible-print-inline-block ${1:...}
+
+snippet hiddenprint Bootstrap
+	.hidden-print ${1:...}
+
+snippet glyphicon Bootstrap
+	%span.glyphicon{"aria-hidden" => "true", :class => "glyphicon-${1:heart}"}
+
+snippet dropdown Bootstrap
+	.dropdown
+	  %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "true", "data-toggle" => "dropdown", :id => "${1:dropdownMenu1}", :type => "button"}
+	    ${2:Dropdown}
+	    %span.caret
+	  %ul.dropdown-menu{"aria-labelledby" => "$1", :role => "menu"}
+	    %li{:role => "presentation"}
+	      %a{:href => "${3:#}", :role => "menuitem", :tabindex => "-1"} ${4:Action}
+	    %li{:role => "presentation"}
+	      %a{:href => "${5:#}", :role => "menuitem", :tabindex => "-1"} ${6:Another action}
+
+snippet dropdownmenuright Bootstrap
+	%ul.dropdown-menu.dropdown-menu-right{"aria-labelledby" => "${1:dLabel}", :role => "menu"}
+	  ${2:...}
+
+snippet dropdownheader Bootstrap
+	%li.dropdown-header{:role => "presentation"} ${1:...}
+
+snippet divider Bootstrap
+	%li.divider{:role => "presentation"}
+
+snippet lidisabled Bootstrap
+	%li.disabled{:role => "presentation"}
+	  %a{:href => "${1:#}", :role => "menuitem", :tabindex => "-1"} ${2:...}
+
+snippet btngroup Bootstrap
+	.btn-group{"aria-label" => "${1:...}", :role => "group"}
+	  %button.btn.btn-default{:type => "button"} ${2:Left}
+	  %button.btn.btn-default{:type => "button"} ${3:Middle}
+	  %button.btn.btn-default{:type => "button"} ${4:Right}
+
+snippet abtngroup Bootstrap
+	.btn-group{"aria-label" => "${1:...}", :role => "group"}
+	  %a.btn.btn-default{:href => "${2:#}", :role => "button"} ${3:Left}
+	  %a.btn.btn-default{:href => "${4:#}", :role => "button"} ${5:Middle}
+	  %a.btn.btn-default{:href => "${6:#}", :role => "button"} ${7:Right}
+
+snippet btntoolbar Bootstrap
+	.btn-toolbar{"aria-label" => "${1:...}", :role => "toolbar"}
+	  .btn-group{"aria-label" => "${2:...}", :role => "group"} ${3:...}
+	  .btn-group{"aria-label" => "${4:...}", :role => "group"} ${5:...}
+	  .btn-group{"aria-label" => "${6:...}", :role => "group"} ${7:...}
+
+snippet btngrouplg Bootstrap
+	.btn-group.btn-group-lg{"aria-label" => "${1:...}", :role => "group"} ${2:...}
+
+snippet btngroupsm Bootstrap
+	.btn-group.btn-group-sm{"aria-label" => "${1:...}", :role => "group"} ${2:...}
+
+snippet btngroupxs Bootstrap
+	.btn-group.btn-group-xs{"aria-label" => "${1:...}", :role => "group"} ${2:...}
+
+snippet btngroupvertical Bootstrap
+	.btn-group-vertical{"aria-label" => "${1:...}", :role => "group"}
+	  ${2:...}
+
+snippet btngroupjustified Bootstrap
+	.btn-group.btn-group-justified{"aria-label" => "${1:...}", :role => "group"}
+	  .btn-group{:role => "group"}
+	    %button.btn.btn-default{:type => "button"} ${2:Left}
+	  .btn-group{:role => "group"}
+	    %button.btn.btn-default{:type => "button"} ${3:Middle}
+	  .btn-group{:role => "group"}
+	    %button.btn.btn-default{:type => "button"} ${4:Right}
+
+snippet abtngroupjustified Bootstrap
+	.btn-group.btn-group-justified{"aria-label" => "${1:...}", :role => "group"}
+	  %a.btn.btn-default{:href => "#", :role => "button"} ${2:Left}
+	  %a.btn.btn-default{:href => "#", :role => "button"} ${3:Middle}
+	  %a.btn.btn-default{:href => "#", :role => "button"} ${4:Right}
+
+snippet btndropdown Bootstrap
+	.btn-group
+	  %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
+	    ${1:Action}
+	    %span.caret
+	  %ul.dropdown-menu{:role => "menu"}
+	    %li
+	      %a{:href => "${1:#}"} ${2:Action}
+	    %li
+	      %a{:href => "${3:#}"} ${4:Another action}
+	    %li
+	      %a{:href => "${5:#}"} ${6:Something else here}
+	    %li.divider
+	    %li
+	      %a{:href => "${7:#}"} ${8:Separated link}
+
+snippet btndropdownsplit Bootstrap
+	.btn-group
+	  %button.btn.btn-danger{:type => "button"} ${1:Action}
+	  %button.btn.btn-danger.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
+	    %span.caret
+	    %span.sr-only Toggle Dropdown
+	  %ul.dropdown-menu{:role => "menu"}
+	    %li
+	      %a{:href => "${1:#}"} ${2:Action}
+	    %li
+	      %a{:href => "${3:#}"} ${4:Another} action
+	    %li
+	      %a{:href => "${5:#}"} ${6:Something} else here
+	    %li.divider
+	    %li
+	      %a{:href => "${7:#}"} ${8:Separated} link
+
+snippet btndropup Bootstrap
+	.btn-group.dropup
+	  %button.btn.btn-default{:type => "button"} ${1:Dropup}
+	  %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
+	    %span.caret
+	    %span.sr-only Toggle Dropdown
+	  %ul.dropdown-menu{:role => "menu"}
+	    ${2:/Dropdown menu links}
+
+snippet inputgroup Bootstrap
+	.input-group
+	  %span.input-group-addon ${1:$}
+	  %input.form-control{"aria-label" => "${2:Amount (to the nearest dollar)}", :type => "text"}
+	  %span.input-group-addon ${3:.00}
+
+snippet inputgrouplg Bootstrap
+	.input-group.input-group-lg
+	  %span.input-group-addon{:id => "${1:sizing-addon1}"} ${2:@}
+	  %input.form-control{"aria-describedby" => "$1", :placeholder => "${3:Username}", :type => "text"}
+
+snippet inputgroupsm Bootstrap
+	.input-group.input-group-sm
+	  %span.input-group-addon{:id => "${1:sizing-addon3}"} ${2:@}
+	  %input.form-control{"aria-describedby" => "$1", :placeholder => "${3:Username}", :type => "text"}
+
+snippet inputgroupcheckbox Bootstrap
+	.input-group
+	  %span.input-group-addon
+	    %input{"aria-label" => "${1:...}", :type => "checkbox"}
+	  %input.form-control{"aria-label" => "${2:...}", :type => "text"}
+
+snippet inputgroupradio Bootstrap
+	.input-group
+	  %span.input-group-addon
+	    %input{"aria-label" => "${1:...}", :type => "radio"}
+	  %input.form-control{"aria-label" => "${2:...}", :type => "text"}
+
+snippet inputgroupbtn Bootstrap
+	.input-group
+	  %input.form-control{:placeholder => "${1:Search for...}", :type => "text"}
+	  %span.input-group-btn
+	    %button.btn.btn-default{:type => "button"} ${2:Go!}
+
+snippet inputgroupbtndropdown Bootstrap
+	.input-group
+	  %input.form-control{"aria-label" => "${1:...}", :type => "text"}
+	  .input-group-btn
+	    %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :type => "button"}
+	      ${2:Action}
+	      %span.caret
+	    %ul.dropdown-menu.dropdown-menu-right{:role => "menu"}
+	      %li
+	        %a{:href => "${3:#}"} ${4:Action}
+	      %li
+	        %a{:href => "${5:#}"} ${6:Another action}
+	      %li
+	        %a{:href => "${6:#}"} ${8:Something else here}
+	      %li.divider
+	      %li
+	        %a{:href => "${9:#}"} ${10:Separated link}
+
+snippet navtabs Bootstrap
+	%ul.nav.nav-tabs
+	  %li.active{:role => "presentation"}
+	    %a{:href => "${1:#}"} ${2:Home}
+	  %li{:role => "presentation"}
+	    %a{:href => "${3:#}"} ${4:Profile}
+	  %li{:role => "presentation"}
+	    %a{:href => "${5:#}"} ${6:Messages}
+
+snippet navpills Bootstrap
+	%ul.nav.nav-pills
+	  %li.active{:role => "presentation"}
+	    %a{:href => "${1:#}"} ${2:Home}
+	  %li{:role => "presentation"}
+	    %a{:href => "${3:#}"} ${4:Profile}
+	  %li{:role => "presentation"}
+	    %a{:href => "${5:#}"} ${6:Messages}
+
+snippet navpillsstacked Bootstrap
+	%ul.nav.nav-pills.nav-stacked
+	  ${1:...}
+
+snippet navtabsjustified Bootstrap
+	%ul.nav.nav-tabs.nav-justified
+	  ${1:...}
+
+snippet navpillsjustified Bootstrap
+	%ul.nav.nav-pills.nav-justified
+	  ${1:...}
+
+snippet navtabsdropdown Bootstrap
+	%ul.nav.nav-tabs
+	  %li.dropdown{:role => "presentation"}
+	    %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+	      ${1:Dropdown}
+	      %span.caret
+	    %ul.dropdown-menu{:role => "menu"}
+	      ${2:...}
+
+snippet navpillsdropdown Bootstrap
+	%ul.nav.nav-pills
+	  %li.dropdown{:role => "presentation"}
+	    %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+	      ${1:Dropdown}
+	      %span.caret
+	    %ul.dropdown-menu{:role => "menu"}
+	      ${2:...}
+
+snippet navbar Bootstrap
+	%nav.navbar.navbar-default
+	  .container-fluid
+	    / Brand and toggle get grouped for better mobile display
+	    .navbar-header
+	      %button.navbar-toggle.collapsed{"data-target" => "#bs-example-navbar-collapse-1", "data-toggle" => "collapse", :type => "button"}
+	        %span.sr-only Toggle navigation
+	        %span.icon-bar
+	        %span.icon-bar
+	        %span.icon-bar
+	      %a.navbar-brand{:href => "#"} Brand
+	    / Collect the nav links, forms, and other content for toggling
+	    #bs-example-navbar-collapse-1.collapse.navbar-collapse
+	      %ul.nav.navbar-nav
+	        %li.active
+	          %a{:href => "#"}
+	            Link
+	            %span.sr-only (current)
+	        %li
+	          %a{:href => "#"} Link
+	        %li.dropdown
+	          %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+	            Dropdown
+	            %span.caret
+	          %ul.dropdown-menu{:role => "menu"}
+	            %li
+	              %a{:href => "#"} Action
+	            %li
+	              %a{:href => "#"} Another action
+	            %li
+	              %a{:href => "#"} Something else here
+	            %li.divider
+	            %li
+	              %a{:href => "#"} Separated link
+	            %li.divider
+	            %li
+	              %a{:href => "#"} One more separated link
+	      %form.navbar-form.navbar-left{:role => "search"}
+	        .form-group
+	          %input.form-control{:placeholder => "Search", :type => "text"}
+	        %button.btn.btn-default{:type => "submit"} Submit
+	      %ul.nav.navbar-nav.navbar-right
+	        %li
+	          %a{:href => "#"} Link
+	        %li.dropdown
+	          %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#", :role => "button"}
+	            Dropdown
+	            %span.caret
+	          %ul.dropdown-menu{:role => "menu"}
+	            %li
+	              %a{:href => "#"} Action
+	            %li
+	              %a{:href => "#"} Another action
+	            %li
+	              %a{:href => "#"} Something else here
+	            %li.divider
+	            %li
+	              %a{:href => "#"} Separated link
+
+snippet navbarform Bootstrap
+	%form.navbar-form.navbar-left{:role => "search"}
+	  .form-group
+	    %input.form-control{:placeholder => "${1:Search}", :type => "text"}
+	  %button.btn.btn-default{:type => "submit"} ${2:Submit}
+
+snippet navbarbtn Bootstrap
+	%button.btn.btn-default.navbar-btn{:type => "button"} ${1:Sign in}
+
+snippet navbartext Bootstrap
+	%p.navbar-text ${1:Signed in as Mark Otto}
+
+snippet navbarlink Bootstrap
+	%a.navbar-link{:href => "${1:#}"} ${2:Mark Otto}
+
+snippet navbarfixedtop Bootstrap
+	%nav.navbar.navbar-default.navbar-fixed-top
+	  .container
+	    ${1:...}
+
+snippet navbarfixedbottom Bootstrap
+	%nav.navbar.navbar-default.navbar-fixed-bottom
+	  .container
+	    ${1:...}
+
+snippet navbarstatictop Bootstrap
+	%nav.navbar.navbar-default.navbar-static-top
+	  .container
+	    ${1:...}
+
+snippet navbarinverse Bootstrap
+	%nav.navbar.navbar-inverse
+	  ${1:...}
+
+snippet breadcrumb Bootstrap
+	%ol.breadcrumb
+	  %li
+	    %a{:href => "${1:#}"} ${2:Home}
+	  %li
+	    %a{:href => "${3:#}"} ${4:Library}
+	  %li.active ${5:Data}
+
+snippet pagination Bootstrap
+	%nav
+	  %ul.pagination
+	    %li.disabled
+	      %a{"aria-label" => "Previous", :href => "#"}
+	        %span{"aria-hidden" => "true"} «
+	    %li.active
+	      %a{:href => "#"} 1
+	    %li
+	      %a{:href => "#"} 2
+	    %li
+	      %a{:href => "#"} 3
+	    %li
+	      %a{:href => "#"} 4
+	    %li
+	      %a{:href => "#"} 5
+	    %li
+	      %a{"aria-label" => "Next", :href => "#"}
+	        %span{"aria-hidden" => "true"} »
+
+snippet paginationlg Bootstrap
+	%nav
+	  %ul.pagination.pagination-lg ${1:...}
+
+snippet paginationsm Bootstrap
+	%nav
+	  %ul.pagination.pagination-sm ${1:...}
+
+snippet pager Bootstrap
+	%nav
+	  %ul.pager
+	    %li
+	      %a{:href => "${1:#}"} ${2:Previous}
+	    %li
+	      %a{:href => "${3:#}"} ${4:Next}
+
+snippet pageraligned Bootstrap
+	%nav
+	  %ul.pager
+	    %li.previous
+	      %a{:href => "${1:#}"}
+	        %span{"aria-hidden" => "true"} ←
+	        ${2:Older}
+	    %li.next
+	      %a{:href => "${3:#}"}
+	        ${4:Newer}
+	        %span{"aria-hidden" => "true"} →
+
+snippet label Bootstrap
+	%span.label.label-default ${1:Default}
+
+snippet labeldefault Bootstrap
+	%span.label.label-default ${1:Default}
+
+snippet labelprimary Bootstrap
+	%span.label.label-primary ${1:Primary}
+
+snippet labelsuccess Bootstrap
+	%span.label.label-success ${1:Success}
+
+snippet labelinfo Bootstrap
+	%span.label.label-info ${1:Info}
+
+snippet labelwarning Bootstrap
+	%span.label.label-warning ${1:Warning}
+
+snippet labeldanger Bootstrap
+	%span.label.label-danger ${1:Danger}
+
+snippet badge Bootstrap
+	%a{:href => "${1:#}"}
+	  ${2:Inbox}
+	  %span.badge ${3:42}
+
+snippet badgebtn Bootstrap
+	%button.btn.btn-primary{:type => "button"}
+	  ${1:Messages}
+	  %span.badge ${2:4}
+
+snippet badgenav Bootstrap
+	%ul.nav.nav-pills{:role => "tablist"}
+	  %li.active{:role => "presentation"}
+	    %a{:href => "${1:#}"}
+	      ${2:Home}
+	      %span.badge ${3:42}
+	  %li{:role => "presentation"}
+	    %a{:href => "${4:#}"} ${5:Profile}
+	  %li{:role => "presentation"}
+	    %a{:href => "${6:#}"}
+	      ${7:Messages}
+	      %span.badge ${8:3}
+
+snippet jumbotron Bootstrap
+	.jumbotron
+	  %h1 ${1:Hello, world!}
+	  %p ${2:...}
+	  %p
+	    %a.btn.btn-primary.btn-lg{:href => "${3:#}", :role => "button"} ${4:Learn more}
+
+snippet jumbotroncontainer Bootstrap
+	.jumbotron
+	  .container
+	    ${1:...}
+
+snippet pageheader Bootstrap
+	.page-header
+	  %h1
+	    ${1:Example page header}
+	    %small ${2:Subtext for header}
+
+snippet thumbnail Bootstrap
+	%a.thumbnail{:href => "${1:#}"}
+	  %img{:alt => "${3:...}", :src => "${2:...}"}
+
+snippet thumbnailcontent Bootstrap
+	.thumbnail
+	  %img{:alt => "${2:...}", :src => "${1:...}"}
+	  .caption
+	    %h3 ${3:Thumbnail label}
+	    %p ${4:...}
+	    %p
+	      %a.btn.btn-primary{:href => "${5:#}", :role => "button"} ${6:Button}
+	      %a.btn.btn-default{:href => "${7:#}", :role => "button"} ${8:Button}
+
+snippet alert Bootstrap
+	.alert.alert-success{:role => "alert"} ${1:...}
+
+snippet alertsuccess Bootstrap
+	.alert.alert-success{:role => "alert"} ${1:...}
+
+snippet alertinfo Bootstrap
+	.alert.alert-info{:role => "alert"} ${1:...}
+
+snippet alertwarning Bootstrap
+	.alert.alert-warning{:role => "alert"} ${1:...}
+
+snippet alertdanger Bootstrap
+	.alert.alert-danger{:role => "alert"} ${1:...}
+
+snippet alertdismissible Bootstrap
+	.alert.alert-dismissible{:class => "alert-${1:warning}", :role => "alert"}
+	  %button.close{"aria-label" => "Close", "data-dismiss" => "alert", :type => "button"}
+	    %span{"aria-hidden" => "true"} ×
+	  %strong ${2:Warning!}
+	  ${3:Better check yourself, you're not looking too good.}
+
+snippet alertlink Bootstrap
+	.alert.alert-success{:role => "alert"}
+	  %a.alert-link{:href => "${1:#}"} ${2:...}
+
+snippet progress Bootstrap
+	.progress
+	  .progress-bar{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:60}", :role => "progressbar", :style => "width: $1%;"}
+	    %span.sr-only $1% Complete
+
+snippet progresssuccess Bootstrap
+	.progress
+	  .progress-bar.progress-bar-success{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:40}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progressinfo Bootstrap
+	.progress
+	  .progress-bar.progress-bar-info{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:20}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progresswarning Bootstrap
+	.progress
+	  .progress-bar.progress-bar-warning{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:60}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progressdanger Bootstrap
+	.progress
+	  .progress-bar.progress-bar-danger{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:80}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progressstriped Bootstrap
+	.progress
+	  .progress-bar.progress-bar-success.progress-bar-striped{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:40}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progressstripedactive Bootstrap
+	.progress
+	  .progress-bar.progress-bar-striped.active{"aria-valuemax" => "${3:100}", "aria-valuemin" => "${2:0}", "aria-valuenow" => "${1:45}", :role => "progressbar", :style => "width: $1%"}
+	    %span.sr-only $1% Complete
+
+snippet progressstacked Bootstrap
+	.progress
+	  .progress-bar.progress-bar-success{:style => "width: ${1:35}%"}
+	    %span.sr-only $1% Complete (success)
+	  .progress-bar.progress-bar-warning.progress-bar-striped{:style => "width: ${2:20}%"}
+	    %span.sr-only $2% Complete (warning)
+	  .progress-bar.progress-bar-danger{:style => "width: ${3:10}%"}
+	    %span.sr-only $3% Complete (danger)
+
+snippet media Bootstrap
+	.media
+	  .media-left
+	    %a{:href => "${1:#}"}
+	      %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+	  .media-body
+	    %h4.media-heading ${4:Media heading}
+	    ${5:...}
+
+snippet medialeft Bootstrap
+	.media-left
+	  %a{:href => "${1:#}"}
+	    %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+
+snippet mediabody Bootstrap
+	.media-body
+	  %h4.media-heading ${1:Media heading}
+	  ${2:...}
+
+snippet mediaright Bootstrap
+	.media-right
+	  %a{:href => "${1:#}"}
+	    %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+
+snippet mediamiddle Bootstrap
+	.media-left.media-middle
+	  %a{:href => "${1:#}"}
+	    %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+
+snippet mediabottom Bootstrap
+	.media-left.media-bottom
+	  %a{:href => "${1:#}"}
+	    %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+
+snippet medialist Bootstrap
+	%ul.media-list
+	  %li.media
+	    .media-left
+	      %a{:href => "${1:#}"}
+	        %img.media-object{:alt => "${3:...}", :src => "${2:...}"}
+	    .media-body
+	      %h4.media-heading ${4:Media heading}
+	      ${5:...}
+
+snippet listgroup Bootstrap
+	%ul.list-group
+	  %li.list-group-item ${1:Cras justo odio}
+	  %li.list-group-item ${2:Dapibus ac facilisis in}
+	  %li.list-group-item ${3:Morbi leo risus}
+	  %li.list-group-item ${4:Porta ac consectetur ac}
+	  %li.list-group-item ${5:Vestibulum at eros}
+
+snippet listgroupitem Bootstrap
+	%li.list-group-item ${1:Cras justo odio}
+
+snippet listgroupitembadge Bootstrap
+	%li.list-group-item
+	  %span.badge ${1:14}
+	  ${2:Cras justo odio}
+
+snippet alistgroupitem Bootstrap
+	%a.list-group-item.active{:href => "${1:#}"} ${2:Cras justo odio}
+
+snippet listgroupitemdisabled Bootstrap
+	%a.list-group-item.disabled{:href => "${1:#}"} ${2:Cras justo odio}
+
+snippet listgroupitemsuccess Bootstrap
+	%li.list-group-item.list-group-item-success ${1:Dapibus ac facilisis in}
+
+snippet listgroupiteminfo Bootstrap
+	%li.list-group-item.list-group-item-info ${1:Cras sit amet nibh libero}
+
+snippet listgroupitemwarning Bootstrap
+	%li.list-group-item.list-group-item-warning ${1:Porta ac consectetur ac}
+
+snippet listgroupitemdanger Bootstrap
+	%li.list-group-item.list-group-item-danger ${1:Vestibulum at eros}
+
+snippet alistgroupitemsuccess Bootstrap
+	%a.list-group-item.list-group-item-success{:href => "${1:#}"} ${2:Dapibus ac facilisis in}
+
+snippet alistgroupiteminfo Bootstrap
+	%a.list-group-item.list-group-item-info{:href => "${1:#}"} ${2:Cras sit amet nibh libero}
+
+snippet alistgroupitemwarning Bootstrap
+	%a.list-group-item.list-group-item-warning{:href => "${1:#}"} ${2:Porta ac consectetur ac}
+
+snippet alistgroupitemdanger Bootstrap
+	%a.list-group-item.list-group-item-danger{:href => "${1:#}"} ${2:Vestibulum at eros}
+
+snippet listgroupitemcontent Bootstrap
+	%li.list-group-item
+	  %h4.list-group-item-heading ${1:List group item heading}
+	  %p.list-group-item-text ${2:...}
+
+snippet alistgroupitemcontent Bootstrap
+	%a.list-group-item.active{:href => "${1:#}"}
+	  %h4.list-group-item-heading ${2:List group item heading}
+	  %p.list-group-item-text ${3:...}
+
+snippet panel Bootstrap
+	.panel.panel-default
+	  .panel-body
+	    ${1:Basic panel example}
+
+snippet panelheading Bootstrap
+	.panel-heading ${1:Panel heading without title}
+
+snippet panelheadingtitle Bootstrap
+	.panel-heading
+	  %h3.panel-title ${1:Panel title}
+
+snippet panelbody Bootstrap
+	.panel-body
+	  ${1:Panel content}
+
+snippet panelfooter Bootstrap
+	.panel-footer ${1:Panel footer}
+
+snippet paneldefault Bootstrap
+	.panel.panel-default
+	  .panel-body
+	    ${1:Basic panel example}
+
+snippet panelprimary Bootstrap
+	.panel.panel-primary ${1:...}
+
+snippet panelsuccess Bootstrap
+	.panel.panel-success ${1:...}
+
+snippet panelinfo Bootstrap
+	.panel.panel-info ${1:...}
+
+snippet panelwarning Bootstrap
+	.panel.panel-warning ${1:...}
+
+snippet paneldanger Bootstrap
+	.panel.panel-danger ${1:...}
+
+snippet paneltable Bootstrap
+	.panel.panel-default
+	  / Default panel contents
+	  .panel-heading ${1:Panel heading}
+	  .panel-body
+	    %p ${2:...}
+	  / Table
+	  %table.table
+	    ${3:...}
+
+snippet panellistgroup Bootstrap
+	.panel.panel-default
+	  / Default panel contents
+	  .panel-heading ${1:Panel heading}
+	  .panel-body
+	    %p ${2:...}
+	  / List group
+	  %ul.list-group
+	    %li.list-group-item ${3:Cras justo odio}
+	    %li.list-group-item ${4:Dapibus ac facilisis in}
+	    %li.list-group-item ${5:Morbi leo risus}
+	    %li.list-group-item ${6:Porta ac consectetur ac}
+	    %li.list-group-item ${7:Vestibulum at eros}
+
+snippet embedresponsive Bootstrap
+	/ 16:9 aspect ratio
+	.embed-responsive.embed-responsive-16by9
+	  %iframe.embed-responsive-item{:src => "${1:...}"}
+	/ 4:3 aspect ratio
+	.embed-responsive.embed-responsive-4by3
+	  %iframe.embed-responsive-item{:src => "${2:...}"}
+
+snippet well Bootstrap
+	.well ${1:...}
+
+snippet welllg Bootstrap
+	.well.well-lg ${1:...}
+
+snippet wellsm Bootstrap
+	.well.well-sm ${1:...}
+
+snippet modal Bootstrap
+	.modal.fade
+	  .modal-dialog
+	    .modal-content
+	      .modal-header
+	        %button.close{"aria-label" => "Close", "data-dismiss" => "modal", :type => "button"}
+	          %span{"aria-hidden" => "true"} ×
+	        %h4.modal-title ${1:Modal title}
+	      .modal-body
+	        %p ${2:One fine body…}
+	      .modal-footer
+	        %button.btn.btn-default{"data-dismiss" => "modal", :type => "button"} ${3:Close}
+	        %button.btn.btn-primary{:type => "button"} ${4:Save changes}
+
+snippet modallg Bootstrap
+	.modal.fade.bs-example-modal-lg{"aria-hidden" => "true", "aria-labelledby" => "${1:myLargeModalLabel}", :role => "dialog", :tabindex => "-1"}
+	  .modal-dialog.modal-lg
+	    .modal-content
+	      ${2:...}
+
+snippet modalsm Bootstrap
+	.modal.fade.bs-example-modal-sm{"aria-hidden" => "true", "aria-labelledby" => "${1:mySmallModalLabel}", :role => "dialog", :tabindex => "-1"}
+	  .modal-dialog.modal-sm
+	    .modal-content
+	      ${2:...}
+
+snippet scrollspy Bootstrap
+	%div{:class => "${1:navbar-example}"}
+	  %ul.nav.nav-tabs{:role => "tablist"}
+	    ${2:...}
+
+snippet tabpanel Bootstrap
+	%div{:role => "tabpanel"}
+	  / Nav tabs
+	  %ul.nav.nav-tabs{:role => "tablist"}
+	    %li.active{:role => "presentation"}
+	      %a{"aria-controls" => "$1", "data-toggle" => "tab", :href => "#${1:home}", :role => "tab"} ${2:Home}
+	    %li{:role => "presentation"}
+	      %a{"aria-controls" => "$3", "data-toggle" => "tab", :href => "#${3:profile}", :role => "tab"} ${4:Profile}
+	    %li{:role => "presentation"}
+	      %a{"aria-controls" => "$5", "data-toggle" => "tab", :href => "#${5:messages}", :role => "tab"} ${6:Messages}
+	    %li{:role => "presentation"}
+	      %a{"aria-controls" => "$7", "data-toggle" => "tab", :href => "#${7:settings}", :role => "tab"} ${8:Settings}
+	  / Tab panes
+	  .tab-content
+	    .tab-pane.active{:id => "$1", :role => "tabpanel"} ${9:...}
+	    .tab-pane{:id => "$3", :role => "tabpanel"} ${10:...}
+	    .tab-pane{:id => "$5", :role => "tabpanel"} ${11:...}
+	    .tab-pane{:id => "$7", :role => "tabpanel"} ${12:...}
+
+snippet tooltip Bootstrap
+	%button.btn.btn-default{"data-toggle" => "tooltip", :title => "$1", :type => "button"} ${1:Tooltip on left}
+
+snippet atooltip Bootstrap
+	%a.btn.btn-default{"data-toggle" => "tooltip", :href => "${1:#}", :title => "$2"} ${2:Tooltip on left}
+
+snippet tooltiptop Bootstrap
+	%button.btn.btn-default{"data-placement" => "top", "data-toggle" => "tooltip", :title => "$1", :type => "button"} ${1:Tooltip on top}
+
+snippet atooltiptop Bootstrap
+	%a.btn.btn-default{"data-placement" => "top", "data-toggle" => "tooltip", :href => "${1:#}", :title => "$2"} ${2:Tooltip on top}
+
+snippet tooltipleft Bootstrap
+%button.btn.btn-default{"data-placement" => "left", "data-toggle" => "tooltip", :title => "$1", :type => "button"} ${1:Tooltip on left}
+	
+	snippet atooltipleft Bootstrap
+		%a.btn.btn-default{"data-placement" => "left", "data-toggle" => "tooltip", :href => "${1:#}", :title => "$2"} ${2:Tooltip on left}
+
+snippet tooltipbottom Bootstrap
+	%button.btn.btn-default{"data-placement" => "bottom", "data-toggle" => "tooltip", :title => "$1", :type => "button"} ${1:Tooltip on bottom}
+
+snippet atooltipbottom Bootstrap
+	%a.btn.btn-default{"data-placement" => "bottom", "data-toggle" => "tooltip", :href => "${1:#}", :title => "$2"} ${2:Tooltip on bottom}
+
+snippet tooltipright Bootstrap
+	%button.btn.btn-default{"data-placement" => "right", "data-toggle" => "tooltip", :title => "$1", :type => "button"} ${1:Tooltip on right}
+
+snippet atooltipright Bootstrap
+	%a.btn.btn-default{"data-placement" => "right", "data-toggle" => "tooltip", :href => "${1:#}", :title => "$2"} ${2:Tooltip on right}
+
+snippet popover Bootstrap
+	%button.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-toggle" => "popover", :title => "${1:Popover title}", :type => "button"} ${3:Click to toggle popover}
+
+snippet apopover Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-toggle" => "popover", :role => "button", :title => "${1:Dismissible popover}"} ${3:Dismissible popover}
+
+snippet popovertop Bootstrap
+	%button.btn.btn-default{"data-container" => "body", "data-content" => "${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}", "data-placement" => "top", "data-toggle" => "popover", :type => "button"}
+	  ${2:Popover on top}
+
+snippet apopovertop Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-placement" => "top", "data-toggle" => "popover", :role => "button", :title => "${1:Popover on top}"} ${3:Popover on top}
+
+snippet popoverleft Bootstrap
+	%button.btn.btn-default{"data-container" => "body", "data-content" => "${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}", "data-placement" => "left", "data-toggle" => "popover", :type => "button"}
+	  ${2:Popover on left}
+
+snippet apopoverleft Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-placement" => "left", "data-toggle" => "popover", :role => "button", :title => "${1:Popover on left}"} ${3:Popover on left}
+
+snippet popoverbottom Bootstrap
+	%button.btn.btn-default{"data-container" => "body", "data-content" => "${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}", "data-placement" => "bottom", "data-toggle" => "popover", :type => "button"}
+	  ${2:Popover on bottom}
+
+snippet apopoverbottom Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-placement" => "bottom", "data-toggle" => "popover", :role => "button", :title => "${1:Popover on bottom}"} ${3:Popover on bottom}
+
+snippet popoverright Bootstrap
+	%button.btn.btn-default{"data-container" => "body", "data-content" => "${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}", "data-placement" => "right", "data-toggle" => "popover", :type => "button"}
+	  ${2:Popover on right}
+
+snippet apopoverright Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}", "data-placement" => "right", "data-toggle" => "popover", :role => "button", :title => "${1:Popover on right}"} ${3:Popover on right}
+
+snippet apopoverdismissible Bootstrap
+	%a.btn.btn-default{"data-content" => "${2:And here's some amazing content. It's very engaging. Right?}", "data-toggle" => "popover", "data-trigger" => "focus", :role => "button", :tabindex => "0", :title => "${1:Dismissible popover}"} ${3:Dismissible popover}
+
+snippet btnstatetext Bootstrap
+	%button.btn.btn-default{:autocomplete => "off", "data-" => "", :id => "${1:myButton}", :type => "button"}
+	  ${4:Loading state}
+
+snippet btnsingletoggle Bootstrap
+	%button.btn.btn-default{"aria-pressed" => "false", :autocomplete => "off", "data-toggle" => "button", :type => "button"}
+	  ${1:Single toggle}
+
+snippet btngroupcheckbox Bootstrap
+	.btn-group{"data-toggle" => "buttons"}
+	  %label.btn.btn-primary.active
+	    %input{:autocomplete => "off", :checked => "checked", :type => "checkbox"}
+	    ${1:Checkbox 1 (pre-checked)}
+	  %label.btn.btn-primary
+	    %input{:autocomplete => "off", :type => "checkbox"}
+	    ${2:Checkbox 2}
+	  %label.btn.btn-primary
+	    %input{:autocomplete => "off", :type => "checkbox"}
+	    ${3:Checkbox 3}
+
+snippet btngroupradio Bootstrap
+	.btn-group{"data-toggle" => "buttons"}
+	  %label.btn.btn-primary.active
+	    %input{:autocomplete => "off", :checked => "checked", :id => "${2:option1}", :name => "${1:options}", :type => "radio"}
+	    ${3:Radio 1 (preselected)}
+	  %label.btn.btn-primary
+	    %input{:autocomplete => "off", :id => "${4:option2}", :name => "$1", :type => "radio"}
+	    ${5:Radio 2}
+	  %label.btn.btn-primary
+	    %input{:autocomplete => "off", :id => "${6:option3}", :name => "$1", :type => "radio"}
+	    ${7:Radio 3}
+
+snippet btncollapse Bootstrap
+	%button.btn.btn-primary{"aria-controls" => "$2", "aria-expanded" => "false", "data-target" => "#$2", "data-toggle" => "collapse", :type => "button"}
+	  ${1:Button with data-target}
+	.collapse{:id => "${2:collapseExample}"}
+	  .well
+	    ${3:...}
+
+snippet abtncollapse Bootstrap
+	%a.btn.btn-primary{"aria-controls" => "$2", "aria-expanded" => "false", "data-toggle" => "collapse", :href => "#$2"}
+	  ${1:Link with href}
+	.collapse{:id => "${2:collapseExample}"}
+	  .well
+	    ${3:...}
+
+snippet accordian Bootstrap
+	#accordion.panel-group{"aria-multiselectable" => "true", :role => "tablist"}
+	  .panel.panel-default
+	    #headingOne.panel-heading{:role => "tab"}
+	      %h4.panel-title
+	        %a{"aria-controls" => "collapseOne", "aria-expanded" => "true", "data-parent" => "#accordion", "data-toggle" => "collapse", :href => "#collapseOne"}
+	          Collapsible Group Item #1
+	    #collapseOne.panel-collapse.collapse.in{"aria-labelledby" => "headingOne", :role => "tabpanel"}
+	      .panel-body
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+	  .panel.panel-default
+	    #headingTwo.panel-heading{:role => "tab"}
+	      %h4.panel-title
+	        %a.collapsed{"aria-controls" => "collapseTwo", "aria-expanded" => "false", "data-parent" => "#accordion", "data-toggle" => "collapse", :href => "#collapseTwo"}
+	          Collapsible Group Item #2
+	    #collapseTwo.panel-collapse.collapse{"aria-labelledby" => "headingTwo", :role => "tabpanel"}
+	      .panel-body
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+	  .panel.panel-default
+	    #headingThree.panel-heading{:role => "tab"}
+	      %h4.panel-title
+	        %a.collapsed{"aria-controls" => "collapseThree", "aria-expanded" => "false", "data-parent" => "#accordion", "data-toggle" => "collapse", :href => "#collapseThree"}
+	          Collapsible Group Item #3
+	    #collapseThree.panel-collapse.collapse{"aria-labelledby" => "headingThree", :role => "tabpanel"}
+	      .panel-body
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+
+snippet carousel Bootstrap
+	#carousel-example-generic.carousel.slide{"data-ride" => "carousel"}
+	  / Indicators
+	  %ol.carousel-indicators
+	    %li.active{"data-slide-to" => "0", "data-target" => "#carousel-example-generic"}
+	    %li{"data-slide-to" => "1", "data-target" => "#carousel-example-generic"}
+	    %li{"data-slide-to" => "2", "data-target" => "#carousel-example-generic"}
+	  / Wrapper for slides
+	  .carousel-inner{:role => "listbox"}
+	    .item.active
+	      %img{:alt => "...", :src => "..."}
+	      .carousel-caption
+	        \...
+	    .item
+	      %img{:alt => "...", :src => "..."}
+	      .carousel-caption
+	        \...
+	    \...
+	  / Controls
+	  %a.left.carousel-control{"data-slide" => "prev", :href => "#carousel-example-generic", :role => "button"}
+	    %span.glyphicon.glyphicon-chevron-left{"aria-hidden" => "true"}
+	    %span.sr-only Previous
+	  %a.right.carousel-control{"data-slide" => "next", :href => "#carousel-example-generic", :role => "button"}
+	    %span.glyphicon.glyphicon-chevron-right{"aria-hidden" => "true"}
+	    %span.sr-only Next
+
+snippet affix Bootstrap
+	%div{"data-offset-bottom" => "${2:200}", "data-offset-top" => "${1:60}", "data-spy" => "affix"}
+  ${3:...}
+
diff --git a/vim/snippets/bootstrap-snippets/snippets/html.snippets b/vim/snippets/bootstrap-snippets/snippets/html.snippets
new file mode 100644
index 0000000..c522340
--- /dev/null
+++ b/vim/snippets/bootstrap-snippets/snippets/html.snippets
@@ -0,0 +1,2010 @@
+snippet bootstrapcdn Bootstrap
+	<!-- Latest compiled and minified CSS -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+	
+	<!-- Optional theme -->
+	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
+	
+	<!-- Latest compiled and minified JavaScript -->
+	<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
+
+
+snippet basictemplate Bootstrap
+	<!DOCTYPE html>
+	<html lang="en">
+	  <head>
+	    <meta charset="utf-8">
+	    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+	    <meta name="viewport" content="width=device-width, initial-scale=1">
+	    <title>Bootstrap 101 Template</title>
+	
+	    <!-- Bootstrap -->
+	    <link href="css/bootstrap.min.css" rel="stylesheet">
+	
+	    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+	    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+	    <!--[if lt IE 9]>
+	      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+	      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+	    <![endif]-->
+	  </head>
+	  <body>
+	    <h1>Hello, world!</h1>
+	
+	    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+	    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+	    <!-- Include all compiled plugins (below), or include individual files as needed -->
+	    <script src="js/bootstrap.min.js"></script>
+	  </body>
+	</html>
+
+
+
+snippet html5 Bootstrap
+	<!DOCTYPE html>
+	<html lang="en">
+	  ${1:...}
+	</html>
+
+
+snippet viewport Bootstrap
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+
+snippet viewportnozoom Bootstrap
+	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+
+
+snippet container Bootstrap
+	<div class="container">
+	  ${1:...}
+	</div>
+
+snippet containerfluid Bootstrap
+	<div class="container-fluid">
+	  ${1:...}
+	</div>
+
+
+snippet row Bootstrap
+	<div class="row">
+	  ${1:...}
+	</div>
+
+snippet colxs Bootstrap
+	<div class="col-xs-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colsm Bootstrap
+	<div class="col-sm-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colmd Bootstrap
+	<div class="col-md-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet collg Bootstrap
+	<div class="col-lg-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colxsoffset Bootstrap
+	<div class="col-xs-offset-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colsmoffset Bootstrap
+	<div class="col-sm-offset-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colmdoffset Bootstrap
+	<div class="col-md-offset-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet collgoffset Bootstrap
+	<div class="col-lg-offset-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colxspush Bootstrap
+	<div class="col-xs-push-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colsmpush Bootstrap
+	<div class="col-sm-push-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colmdpush Bootstrap
+	<div class="col-md-push-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet collgpush Bootstrap
+	<div class="col-lg-push-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colxspull Bootstrap
+	<div class="col-xs-pull-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colsmpull Bootstrap
+	<div class="col-sm-pull-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet colmdpull Bootstrap
+	<div class="col-md-pull-${1:1}">
+	  ${2:...}
+	</div>
+
+snippet collgpull Bootstrap
+	<div class="col-lg-pull-${1:1}">
+	  ${2:...}
+	</div>
+
+
+snippet h1 Bootstrap
+	<h1>${1:Bootstrap heading}</h1>
+
+snippet h2 Bootstrap
+	<h2>${1:Bootstrap heading}</h2>
+
+snippet h3 Bootstrap
+	<h3>${1:Bootstrap heading}</h3>
+
+snippet h4 Bootstrap
+	<h4>${1:Bootstrap heading}</h4>
+
+snippet h5 Bootstrap
+	<h5>${1:Bootstrap heading}</h5>
+
+snippet h6 Bootstrap
+	<h6>${1:Bootstrap heading}</h6>
+
+
+snippet h1small Bootstrap
+	<h1>${1:Bootstrap heading} <small>${2:Secondary text}</small></h1>
+
+snippet h2small Bootstrap
+	<h2>${1:Bootstrap heading} <small>${2:Secondary text}</small></h2>
+
+snippet h3small Bootstrap
+	<h3>${1:Bootstrap heading} <small>${2:Secondary text}</small></h3>
+
+snippet h4small Bootstrap
+	<h4>${1:Bootstrap heading} <small>${2:Secondary text}</small></h4>
+
+snippet h5small Bootstrap
+	<h5>${1:Bootstrap heading} <small>${2:Secondary text}</small></h5>
+
+snippet h6small Bootstrap
+	<h6>${1:Bootstrap heading} <small>${2:Secondary text}</small></h6>
+
+snippet p Bootstrap
+	<p>${1:...}</p>
+
+snippet lead Bootstrap
+	<p class="lead">${1:...}</p>
+
+snippet mark Bootstrap
+	<mark>${1:hightlight}</mark>
+
+snippet del Bootstrap
+	<del>${1:This line of text is meant to be treated as deleted text.}</del>
+
+snippet s Bootstrap
+	<s>${1:This line of text is meant to be treated as no longer accurate.}</s>
+
+snippet ins Bootstrap
+	<ins>${1:This line of text is meant to be treated as an addition to the document.}</ins>
+
+snippet u Bootstrap
+	<u>${1:This line of text will render as underlined}</u>
+
+snippet small Bootstrap
+	<small>${1:This line of text is meant to be treated as fine print.}</small>
+
+snippet strong Bootstrap
+	<strong>${1:bold text}</strong>
+
+snippet em Bootstrap
+	<em>${1:italicized text}</em>
+
+snippet textleft Bootstrap
+	<p class="text-left">${1:Left aligned text.}</p>
+
+snippet textcenter Bootstrap
+	<p class="text-center">${1:Center aligned text.}</p>
+
+snippet textright Bootstrap
+	<p class="text-right">${1:Right aligned text.}</p>
+
+snippet textjustify Bootstrap
+	<p class="text-justify">${1:Justified text.}</p>
+
+snippet textnowrap Bootstrap
+	<p class="text-nowrap">${1:No wrap text.}</p>
+
+
+snippet textlowercase Bootstrap
+	<p class="text-lowercase">${1:Lowercased text.}</p>
+
+snippet textuppercase Bootstrap
+	<p class="text-uppercase">${1:Uppercased text.}</p>
+
+snippet textcapitalize Bootstrap
+	<p class="text-capitalize">${1:Capitalized text.}</p>
+
+snippet abbr Bootstrap
+	<abbr title="${1:attribute}">${2:attr}</abbr>
+
+
+snippet initialism Bootstrap
+	<abbr title="${1:HyperText Markup Language}" class="initialism">${2:HTML}</abbr>
+
+snippet address Bootstrap
+	<address>
+	  <strong>${1:Twitter, Inc.}</strong><br>
+	  ${2:795 Folsom Ave, Suite 600}<br>
+	  ${3:San Francisco, CA 94107}<br>
+	  <abbr title="Phone">P:</abbr> ${4:(123) 456-7890}
+	</address>
+	
+	<address>
+	  <strong>${5:Full Name}</strong><br>
+	  <a href="mailto:#">${6:first.last@example.com}</a>
+	</address>
+
+snippet blockquote Bootstrap
+	<blockquote>
+	  <p>${1:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.}</p>
+	</blockquote>
+
+snippet blockquotesource Bootstrap
+	<blockquote>
+	  <p>${1:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante.}</p>
+	  <footer>${2:Someone famous in} <cite title="${3:Source Title}">$3</cite></footer>
+	</blockquote>
+
+snippet blockquotereverse Bootstrap
+	<blockquote class="blockquote-reverse">
+	  ${1:...}
+	</blockquote>
+
+snippet ul Bootstrap
+	<ul>
+	  <li>${1:...}</li>
+	</ul>
+
+snippet ol Bootstrap
+	<ol>
+	  <li>${1:...}</li>
+	</ol>
+
+snippet listunstyled Bootstrap
+	<ul class="list-unstyled">
+	  <li>${1:...}</li>
+	</ul>
+
+snippet listinline Bootstrap
+	<ul class="list-inline">
+	  <li>${1:...}</li>
+	</ul>
+
+snippet dl Bootstrap
+	<dl>
+	  <dt>${1:...}</dt>
+	  <dd>${2:...}</dd>
+	</dl>
+
+snippet dlhorizontal Bootstrap
+	<dl class="dl-horizontal">
+	  <dt>${1:...}</dt>
+	  <dd>${2:...}</dd>
+	</dl>
+
+
+
+snippet code Bootstrap
+	<code>${1:&lt;section&gt;}</code>
+
+snippet kbd Bootstrap
+	<kbd>${1:cd}</kbd>
+
+snippet pre Bootstrap
+	<pre>${1:&lt;p&gt;Sample text here...&lt;/p&gt;}</pre>
+
+snippet var Bootstrap
+	<var>${1:x}</var>
+
+
+snippet samp Bootstrap
+	<samp>${1:This text is meant to be treated as sample output from a computer program.}</samp>
+
+
+
+snippet table Bootstrap
+	<table class="table">
+	  ${1:...}
+	</table>
+
+snippet tablestriped Bootstrap
+	<table class="table table-striped">
+	  ${1:...}
+	</table>
+
+snippet tablebordered Bootstrap
+	<table class="table table-bordered">
+	  ${1:...}
+	</table>
+
+snippet tablehover Bootstrap
+	<table class="table table-hover">
+	  ${1:...}
+	</table>
+
+snippet tablecondensed Bootstrap
+	<table class="table table-condensed">
+	  ${1:...}
+	</table>
+
+
+snippet tractive Bootstrap
+	<tr class="active">${1:...}</tr>
+
+snippet trsuccess Bootstrap
+	<tr class="success">${1:...}</tr>
+
+snippet trwarning Bootstrap
+	<tr class="warning">${1:...}</tr>
+
+snippet trdanger Bootstrap
+	<tr class="danger">${1:...}</tr>
+
+snippet trinfo Bootstrap
+	<tr class="info">${1:...}</tr>
+
+
+snippet tdactive Bootstrap
+	<td class="active">${1:...}</td>
+
+snippet tdsuccess Bootstrap
+	<td class="success">${1:...}</td>
+
+snippet tdwarning Bootstrap
+	<td class="warning">${1:...}</td>
+
+snippet tddanger Bootstrap
+	<td class="danger">${1:...}</td>
+
+snippet tdinfo Bootstrap
+	<td class="info">${1:...}</td>
+
+
+snippet thactive Bootstrap
+	<th class="active">${1:...}</th>
+
+snippet thsuccess Bootstrap
+	<th class="success">${1:...}</th>
+
+snippet thwarning Bootstrap
+	<th class="warning">${1:...}</th>
+
+snippet thdanger Bootstrap
+	<th class="danger">${1:...}</th>
+
+snippet thinfo Bootstrap
+	<th class="info">${1:...}</th>
+
+snippet tableresponsive Bootstrap
+	<div class="table-responsive">
+	  <table class="table">
+	    ${1:...}
+	  </table>
+	</div>
+
+
+
+snippet form Bootstrap
+	<form>
+	  <div class="form-group">
+	    <label for="exampleInputEmail1">Email address</label>
+	    <input type="email" class="form-control" id="exampleInputEmail1" placeholder="Enter email">
+	  </div>
+	  <div class="form-group">
+	    <label for="exampleInputPassword1">Password</label>
+	    <input type="password" class="form-control" id="exampleInputPassword1" placeholder="Password">
+	  </div>
+	  <div class="form-group">
+	    <label for="exampleInputFile">File input</label>
+	    <input type="file" id="exampleInputFile">
+	    <p class="help-block">Example block-level help text here.</p>
+	  </div>
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox"> Check me out
+	    </label>
+	  </div>
+	  <button type="submit" class="btn btn-default">Submit</button>
+	</form>
+
+snippet forminline Bootstrap
+	<form class="form-inline">
+	  <div class="form-group">
+	    <label class="sr-only" for="exampleInputEmail3">Email address</label>
+	    <input type="email" class="form-control" id="exampleInputEmail3" placeholder="Enter email">
+	  </div>
+	  <div class="form-group">
+	    <label class="sr-only" for="exampleInputPassword3">Password</label>
+	    <input type="password" class="form-control" id="exampleInputPassword3" placeholder="Password">
+	  </div>
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox"> Remember me
+	    </label>
+	  </div>
+	  <button type="submit" class="btn btn-default">Sign in</button>
+	</form>
+
+snippet formhorizontal Bootstrap
+	<form class="form-horizontal">
+	  <div class="form-group">
+	    <label for="inputEmail3" class="col-sm-2 control-label">Email</label>
+	    <div class="col-sm-10">
+	      <input type="email" class="form-control" id="inputEmail3" placeholder="Email">
+	    </div>
+	  </div>
+	  <div class="form-group">
+	    <label for="inputPassword3" class="col-sm-2 control-label">Password</label>
+	    <div class="col-sm-10">
+	      <input type="password" class="form-control" id="inputPassword3" placeholder="Password">
+	    </div>
+	  </div>
+	  <div class="form-group">
+	    <div class="col-sm-offset-2 col-sm-10">
+	      <div class="checkbox">
+	        <label>
+	          <input type="checkbox"> Remember me
+	        </label>
+	      </div>
+	    </div>
+	  </div>
+	  <div class="form-group">
+	    <div class="col-sm-offset-2 col-sm-10">
+	      <button type="submit" class="btn btn-default">Sign in</button>
+	    </div>
+	  </div>
+	</form>
+
+snippet input Bootstrap
+	<input type="text" class="form-control" placeholder="${1:Text input}">
+
+snippet textarea Bootstrap
+	<textarea class="form-control" rows="3"></textarea>
+
+snippet checkbox Bootstrap
+	<div class="checkbox">
+	  <label>
+	    <input type="checkbox" value="${1:}">
+	    ${2:Option one is this and that&mdash;be sure to include why it's great}
+	  </label>
+	</div>
+
+snippet radio Bootstrap
+	<div class="radio">
+	  <label>
+	    <input type="radio" name="${1:optionsRadios}" id="${2:optionsRadios1}" value="${3:option1}" checked>
+	    ${4:Option one is this and that&mdash;be sure to include why it's great}
+	  </label>
+	</div>
+	<div class="radio">
+	  <label>
+	    <input type="radio" name="${5:optionsRadios}" id="${6:optionsRadios2}" value="${7:option2}">
+	    ${8:Option two can be something else and selecting it will deselect option one}
+	  </label>
+	</div>
+
+snippet checkboxinline Bootstrap
+	<label class="checkbox-inline">
+	  <input type="checkbox" id="${1:inlineCheckbox1}" value="${2:option1}"> ${3:1}
+	</label>
+
+snippet radioinline Bootstrap
+	<label class="radio-inline">
+	  <input type="radio" name="${1:inlineRadioOptions}" id="${2:inlineRadio1}" value="${3:option1}"> ${4:1}
+	</label>
+	<label class="radio-inline">
+	  <input type="radio" name="${5:inlineRadioOptions}" id="${6:inlineRadio2}" value="${7:option2}"> ${8:2}
+	</label>
+
+snippet select Bootstrap
+	<select class="form-control">
+	  <option>${1:1}</option>
+	  <option>${2:2}</option>
+	</select>
+
+snippet selectmultiple Bootstrap
+	<select multiple class="form-control">
+	  <option>${1:1}</option>
+	  <option>${2:2}</option>
+	</select>
+
+snippet formcontrolstatic Bootstrap
+	<div class="form-group">
+	  <label class="col-sm-2 control-label">${1:Email}</label>
+	  <div class="col-sm-10">
+	    <p class="form-control-static">${2:email@example.com}</p>
+	  </div>
+	</div>
+
+snippet inputdisabled Bootstrap
+	<input class="form-control" id="${1:disabledInput}" type="text" placeholder="${2:Disabled input here...}" disabled>
+
+snippet fieldsetdisabled Bootstrap
+	<fieldset disabled>
+	  <div class="form-group">
+	    <label for="disabledTextInput">Disabled input</label>
+	    <input type="text" id="disabledTextInput" class="form-control" placeholder="Disabled input">
+	  </div>
+	  <div class="form-group">
+	    <label for="disabledSelect">Disabled select menu</label>
+	    <select id="disabledSelect" class="form-control">
+	      <option>Disabled select</option>
+	    </select>
+	  </div>
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox"> Can't check this
+	    </label>
+	  </div>
+	  <button type="submit" class="btn btn-primary">Submit</button>
+	</fieldset>
+
+snippet inputreadonly Bootstrap
+	<input class="form-control" type="text" placeholder="${1:Readonly input here...}" readonly>
+
+snippet formgrouphassuccess Bootstrap
+	<div class="form-group has-success">
+	  <label class="control-label" for="$2">${1:Input with success}</label>
+	  <input type="text" class="form-control" id="${2:inputSuccess1}">
+	</div>
+
+snippet formgrouphaswarning Bootstrap
+	<div class="form-group has-warning">
+	  <label class="control-label" for="$2">${1:Input with warning}</label>
+	  <input type="text" class="form-control" id="${2:inputWarning1}">
+	</div>
+
+snippet formgrouphaserror Bootstrap
+	<div class="form-group has-error">
+	  <label class="control-label" for="$2">${1:Input with error}</label>
+	  <input type="text" class="form-control" id="${2:inputError1}">
+	</div>
+
+snippet checkboxhassuccess Bootstrap
+	<div class="has-success">
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox" id="${1:checkboxSuccess}" value="${2:option1}">
+	      ${3:Checkbox with success}
+	    </label>
+	  </div>
+	</div>
+
+snippet checkboxhaswarning Bootstrap
+	<div class="has-warning">
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox" id="${1:checkboxWarning}" value="${2:option1}">
+	      ${3:Checkbox with warning}
+	    </label>
+	  </div>
+	</div>
+
+snippet checkboxhaserror Bootstrap
+	<div class="has-error">
+	  <div class="checkbox">
+	    <label>
+	      <input type="checkbox" id="${1:checkboxError}" value="${2:option1}">
+	      ${3:Checkbox with error}
+	    </label>
+	  </div>
+	</div>
+
+
+snippet formgrouphasfeedback Bootstrap
+	<div class="form-group has-success has-feedback">
+	  <label class="control-label" for="$3">${1:Input group with success}</label>
+	  <div class="input-group">
+	    <span class="input-group-addon">${2:@}</span>
+	    <input type="text" class="form-control" id="${3:inputGroupSuccess1}" aria-describedby="$3Status">
+	  </div>
+	  <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
+	  <span id="$3Status" class="sr-only">(success)</span>
+	</div>
+
+snippet inputlg Bootstrap
+	<input class="form-control input-lg" type="text" placeholder="${1:.input-lg}">
+
+snippet inputsm Bootstrap
+	<input class="form-control input-sm" type="text" placeholder="${1:.input-sm}">
+
+snippet selectlg Bootstrap
+	<select class="form-control input-lg">${1:...}</select>
+
+snippet selectsm Bootstrap
+	<select class="form-control input-sm">${1:...}</select>
+
+snippet formgrouplg Bootstrap
+	<div class="form-group form-group-lg">
+	  <label class="col-sm-2 control-label" for="$2">${1:Large label}</label>
+	  <div class="col-sm-10">
+	    <input class="form-control" type="text" id="${2:formGroupInputLarge}" placeholder="${3:Large input}">
+	  </div>
+	</div>
+
+snippet formgroupsm Bootstrap
+	<div class="form-group form-group-sm">
+	  <label class="col-sm-2 control-label" for="$2">${1:Small label}</label>
+	  <div class="col-sm-10">
+	    <input class="form-control" type="text" id="${2:formGroupInputSmall}" placeholder="${3:Small input}">
+	  </div>
+	</div>
+
+snippet inputhelpblock Bootstrap
+	<label class="sr-only" for="$2">${1:Input with help text}</label>
+	<input type="text" id="${2:inputHelpBlock}" class="form-control" aria-describedby="$3">
+	<span id="${3:helpBlock}" class="help-block">${4:A block of help text that breaks onto a new line and may extend beyond one line.}</span>
+
+
+
+
+snippet btn Bootstrap
+	<button class="btn btn-default" type="submit">${1:Button}</button>
+
+snippet abtn Bootstrap
+	<a class="btn btn-default" href="${1:#}" role="button">${2:Link}</a>
+
+snippet inputbtn Bootstrap
+	<input class="btn btn-default" type="button" value="${1:Input}">
+
+snippet submitbtn Bootstrap
+	<input class="btn btn-default" type="submit" value="${1:Submit}">
+
+
+snippet btndefault Bootstrap
+	<button type="button" class="btn btn-default">${1:Default}</button>
+
+snippet abtndefault Bootstrap
+	<a href="${1:#}" class="btn btn-default" role="button">${2:Default}</a>
+
+snippet btnprimary Bootstrap
+	<button type="button" class="btn btn-primary">Primary</button>
+
+snippet abtnprimary Bootstrap
+	<a href="${1:#}" class="btn btn-primary" role="button">${2:Primary}</a>
+
+snippet btnsuccess Bootstrap
+	<button type="button" class="btn btn-success">${1:Success}</button>
+
+snippet abtnsuccess Description
+	<a href="${1:#}" class="btn btn-success" role="button">${2:Success}</a>
+
+snippet btninfo Bootstrap
+	<button type="button" class="btn btn-info">${1:Info}</button>
+
+snippet abtninfo Bootstrap
+	<a href="${1:#}" class="btn btn-info" role="button">${2:Info}</a>
+
+snippet btnwarning Bootstrap
+	<button type="button" class="btn btn-warning">${1:Warning}</button>
+
+snippet abtnwarning Bootstrap
+	<a href="${1:#}" class="btn btn-warning" role="button">${2:Warning}</a>
+
+snippet btndanger Bootstrap
+	<button type="button" class="btn btn-danger">${1:Danger}</button>
+
+snippet abtndanger Bootstrap
+	<a href="${1:#}" class="btn btn-danger" role="button">${2:Danger}</a>
+
+snippet btnlink Bootstrap
+	<button type="button" class="btn btn-link">${1:Link}</button>
+
+snippet abtnlink Bootstrap
+	<a href="${1:#}" class="btn btn-link" role="button">${2:Link}</a>
+
+
+snippet btnlg Bootstrap
+	<button type="button" class="btn btn-default btn-lg">${1:Large button}</button>
+
+snippet abtnlg Bootstrap
+	<a href="${1:#}" class="btn btn-default btn-lg" role="button">${2:Large button}</a>
+
+snippet btnsm Bootstrap
+	<button type="button" class="btn btn-default btn-sm">${1:Small button}</button>
+
+snippet abtnsm Bootstrap
+	<a href="${1:#}" class="btn btn-default btn-sm" role="button">${2:Small button}</a>
+
+snippet btnxs Bootstrap
+	<button type="button" class="btn btn-default btn-xs">${1:Extra small button}</button>
+
+snippet abtnxs Bootstrap
+	<a href="${1:#}" class="btn btn-default btn-xs" role="button">${2:Extra small button}</a>
+
+snippet btnblock Bootstrap
+	<button type="button" class="btn btn-default btn-block">${1:Block level button}</button>
+
+snippet abtnblock Bootstrap
+	<a href="${1:#}" class="btn btn-default btn-block" role="button">${2:Block level button}</a>
+
+snippet btnactive Bootstrap
+	<button type="button" class="btn btn-default active">${1:Button}</button>
+
+snippet abtnactive Bootstrap
+	<a href="${1:#}" class="btn btn-default active" role="button">${2:Link}</a>
+
+snippet btndisabled Bootstrap
+	<button type="button" class="btn btn-default" disabled="disabled">${1:Button}</button>
+
+snippet abtndisabled Bootstrap
+	<a href="${1:#}" class="btn btn-default disabled" role="button">${2:Link}</a>
+
+
+
+snippet imgresponsive Bootstrap
+	<img src="${1:...}" class="img-responsive" alt="${2:Responsive image}">
+
+snippet imgrounded Bootstrap
+	<img src="${1:...}" alt="${2:...}" class="img-rounded">
+
+snippet imgcircle Bootstrap
+	<img src="${1:...}" alt="${2:...}" class="img-circle">
+
+snippet imgthumbnail Bootstrap
+	<img src="${1:...}" alt="${2:...}" class="img-thumbnail">
+
+
+
+snippet textmuted Bootstrap
+	<p class="text-muted">${1:...}</p>
+
+snippet textprimary Bootstrap
+	<p class="text-primary">${1:...}</p>
+
+snippet textsuccess Bootstrap
+	<p class="text-success">${1:...}</p>
+
+snippet textinfo Bootstrap
+	<p class="text-info">${1:...}</p>
+
+snippet textwarning Bootstrap
+	<p class="text-warning">${1:...}</p>
+
+snippet textdanger Bootstrap
+	<p class="text-danger">${1:...}</p>
+
+
+snippet bgprimary Bootstrap
+	<p class="bg-primary">${1:...}</p>
+
+snippet bgsuccess Bootstrap
+	<p class="bg-success">${1:...}</p>
+
+snippet bginfo Bootstrap
+	<p class="bg-info">${1:...}</p>
+
+snippet bgwarning Bootstrap
+	<p class="bg-warning">${1:...}</p>
+
+snippet bgdanger Bootstrap
+	<p class="bg-danger">${1:...}</p>
+
+snippet close Bootstrap
+	<button type="button" class="close" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+
+snippet caret Bootstrap
+	<span class="caret"></span>
+
+
+snippet pullleft Bootstrap
+	<div class="pull-left">${1:...}</div>
+
+snippet pullright Bootstrap
+	<div class="pull-right">${1:...}</div>
+
+snippet centerblock Bootstrap
+	<div class="center-block">${1:...}</div>
+
+snippet clearfix Bootstrap
+	<div class="clearfix">${1:...}</div>
+
+
+snippet show Bootstrap
+	<div class="show">${1:...}</div>
+
+snippet hidden Bootstrap
+	<div class="hidden">${1:...}</div>
+
+snippet invisible Bootstrap
+	<div class="invisible">${1:...}</div>
+
+snippet sronlyfocusable Bootstrap
+	<a class="sr-only sr-only-focusable" href="${1:#content}">${2:Skip to main content}</a>
+
+snippet texthide Bootstrap
+	<h1 class="text-hide">${1:Custom heading}</h1>
+
+
+snippet hiddenxs Bootstrap
+	<div class="hidden-xs">${1:...}</div>
+
+snippet hiddensm Bootstrap
+	<div class="hidden-sm">${1:...}</div>
+
+snippet hiddenmd Bootstrap
+	<div class="hidden-md">${1:...}</div>
+
+snippet hiddenlg Bootstrap
+	<div class="hidden-lg">${1:...}</div>
+
+snippet visiblexsblock Bootstrap
+	<div class="visible-xs-block">${1:...}</div>
+
+snippet visiblexsinline Bootstrap
+	<div class="visible-xs-inline">${1:...}</div>
+
+snippet visiblexsinlineblock Bootstrap
+	<div class="visible-xs-inline-block">${1:...}</div>
+
+snippet visiblesmblock Bootstrap
+	<div class="visible-sm-block">${1:...}</div>
+
+snippet visiblesminline Bootstrap
+	<div class="visible-sm-inline">${1:...}</div>
+
+snippet visiblesminlineblock Bootstrap
+	<div class="visible-sm-inline-block">${1:...}</div>
+
+snippet visiblemdblock Bootstrap
+	<div class="visible-md-block">${1:...}</div>
+
+snippet visiblemdinline Bootstrap
+	<div class="visible-md-inline">${1:...}</div>
+
+snippet visiblemdinlineblock Bootstrap
+	<div class="visible-md-inline-block">${1:...}</div>
+
+snippet visiblelgblock Bootstrap
+	<div class="visible-lg-block">${1:...}</div>
+
+snippet visiblelginline Bootstrap
+	<div class="visible-lg-inline">${1:...}</div>
+
+snippet visiblelginlineblock Bootstrap
+	<div class="visible-lg-inline-block">${1:...}</div>
+
+snippet visibleprintblock Bootstrap
+	<div class="visible-print-block">${1:...}</div>
+
+snippet visibleprintinline Bootstrap
+	<div class="visible-print-inline">${1:...}</div>
+
+snippet visibleprintinlineblock Bootstrap
+	<div class="visible-print-inline-block">${1:...}</div>
+
+snippet hiddenprint Bootstrap
+	<div class="hidden-print">${1:...}</div>
+
+
+
+
+snippet glyphicon Bootstrap
+	<span class="glyphicon glyphicon-${1:heart}" aria-hidden="true"></span>
+
+
+snippet dropdown Bootstrap
+	<div class="dropdown">
+	  <button class="btn btn-default dropdown-toggle" type="button" id="${1:dropdownMenu1}" data-toggle="dropdown" aria-expanded="true">
+	    ${2:Dropdown}
+	    <span class="caret"></span>
+	  </button>
+	  <ul class="dropdown-menu" role="menu" aria-labelledby="$1">
+	    <li role="presentation"><a role="menuitem" tabindex="-1" href="${3:#}">${4:Action}</a></li>
+	    <li role="presentation"><a role="menuitem" tabindex="-1" href="${5:#}">${6:Another action}</a></li>
+	  </ul>
+	</div>
+
+snippet dropdownmenuright Bootstrap
+	<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="${1:dLabel}">
+	  ${2:...}
+	</ul>
+
+snippet dropdownheader Bootstrap
+	<li role="presentation" class="dropdown-header">${1:...}</li>
+
+snippet divider Bootstrap
+	<li role="presentation" class="divider"></li>
+
+snippet lidisabled Bootstrap
+	<li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="${1:#}">${2:...}</a></li>
+
+
+snippet btngroup Bootstrap
+	<div class="btn-group" role="group" aria-label="${1:...}">
+	  <button type="button" class="btn btn-default">${2:Left}</button>
+	  <button type="button" class="btn btn-default">${3:Middle}</button>
+	  <button type="button" class="btn btn-default">${4:Right}</button>
+	</div>
+
+snippet abtngroup Bootstrap
+	<div class="btn-group" role="group" aria-label="${1:...}">
+	  <a class="btn btn-default" href="${2:#}" role="button">${3:Left}</a>
+	  <a class="btn btn-default" href="${4:#}" role="button">${5:Middle}</a>
+	  <a class="btn btn-default" href="${6:#}" role="button">${7:Right}</a>
+	</div>
+
+snippet btntoolbar Bootstrap
+	<div class="btn-toolbar" role="toolbar" aria-label="${1:...}">
+	  <div class="btn-group" role="group" aria-label="${2:...}">${3:...}</div>
+	  <div class="btn-group" role="group" aria-label="${4:...}">${5:...}</div>
+	  <div class="btn-group" role="group" aria-label="${6:...}">${7:...}</div>
+	</div>
+
+snippet btngrouplg Bootstrap
+	<div class="btn-group btn-group-lg" role="group" aria-label="${1:...}">${2:...}</div>
+
+snippet btngroupsm Bootstrap
+	<div class="btn-group btn-group-sm" role="group" aria-label="${1:...}">${2:...}</div>
+
+snippet btngroupxs Bootstrap
+	<div class="btn-group btn-group-xs" role="group" aria-label="${1:...}">${2:...}</div>
+
+snippet btngroupvertical Bootstrap
+	<div class="btn-group-vertical" role="group" aria-label="${1:...}">
+	  ${2:...}
+	</div>
+
+snippet btngroupjustified Bootstrap
+	<div class="btn-group btn-group-justified" role="group" aria-label="${1:...}">
+	  <div class="btn-group" role="group">
+	    <button type="button" class="btn btn-default">${2:Left}</button>
+	  </div>
+	  <div class="btn-group" role="group">
+	    <button type="button" class="btn btn-default">${3:Middle}</button>
+	  </div>
+	  <div class="btn-group" role="group">
+	    <button type="button" class="btn btn-default">${4:Right}</button>
+	  </div>
+	</div>
+
+snippet abtngroupjustified Bootstrap
+	<div class="btn-group btn-group-justified" role="group" aria-label="${1:...}">
+	  <a class="btn btn-default" href="#" role="button">${2:Left}</a>
+	  <a class="btn btn-default" href="#" role="button">${3:Middle}</a>
+	  <a class="btn btn-default" href="#" role="button">${4:Right}</a>
+	</div>
+
+
+snippet btndropdown Bootstrap
+	<div class="btn-group">
+	  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+	    ${1:Action} <span class="caret"></span>
+	  </button>
+	  <ul class="dropdown-menu" role="menu">
+	    <li><a href="${1:#}">${2:Action}</a></li>
+	    <li><a href="${3:#}">${4:Another action}</a></li>
+	    <li><a href="${5:#}">${6:Something else here}</a></li>
+	    <li class="divider"></li>
+	    <li><a href="${7:#}">${8:Separated link}</a></li>
+	  </ul>
+	</div>
+
+snippet btndropdownsplit Bootstrap
+	<div class="btn-group">
+	  <button type="button" class="btn btn-danger">${1:Action}</button>
+	  <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+	    <span class="caret"></span>
+	    <span class="sr-only">Toggle Dropdown</span>
+	  </button>
+	  <ul class="dropdown-menu" role="menu">
+	    <li><a href="${1:#}">${2:Action}</a></li>
+	    <li><a href="${3:#}">${4:Another} action</a></li>
+	    <li><a href="${5:#}">${6:Something} else here</a></li>
+	    <li class="divider"></li>
+	    <li><a href="${7:#}">${8:Separated} link</a></li>
+	  </ul>
+	</div>
+
+snippet btndropup Bootstrap
+	<div class="btn-group dropup">
+	  <button type="button" class="btn btn-default">${1:Dropup}</button>
+	  <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+	    <span class="caret"></span>
+	    <span class="sr-only">Toggle Dropdown</span>
+	  </button>
+	  <ul class="dropdown-menu" role="menu">
+	    ${2:<!-- Dropdown menu links -->}
+	  </ul>
+	</div>
+
+
+snippet inputgroup Bootstrap
+	<div class="input-group">
+	  <span class="input-group-addon">${1:$}</span>
+	  <input type="text" class="form-control" aria-label="${2:Amount (to the nearest dollar)}">
+	  <span class="input-group-addon">${3:.00}</span>
+	</div>
+
+snippet inputgrouplg Bootstrap
+	<div class="input-group input-group-lg">
+	  <span class="input-group-addon" id="${1:sizing-addon1}">${2:@}</span>
+	  <input type="text" class="form-control" placeholder="${3:Username}" aria-describedby="$1">
+	</div>
+
+snippet inputgroupsm Bootstrap
+	<div class="input-group input-group-sm">
+	  <span class="input-group-addon" id="${1:sizing-addon3}">${2:@}</span>
+	  <input type="text" class="form-control" placeholder="${3:Username}" aria-describedby="$1">
+	</div>
+
+snippet inputgroupcheckbox Bootstrap
+	<div class="input-group">
+	  <span class="input-group-addon">
+	    <input type="checkbox" aria-label="${1:...}">
+	  </span>
+	  <input type="text" class="form-control" aria-label="${2:...}">
+	</div>
+
+snippet inputgroupradio Bootstrap
+	<div class="input-group">
+	  <span class="input-group-addon">
+	    <input type="radio" aria-label="${1:...}">
+	  </span>
+	  <input type="text" class="form-control" aria-label="${2:...}">
+	</div>
+
+snippet inputgroupbtn Bootstrap
+	<div class="input-group">
+	  <input type="text" class="form-control" placeholder="${1:Search for...}">
+	  <span class="input-group-btn">
+	    <button class="btn btn-default" type="button">${2:Go!}</button>
+	  </span>
+	</div>
+
+snippet inputgroupbtndropdown Bootstrap
+	<div class="input-group">
+	  <input type="text" class="form-control" aria-label="${1:...}">
+	  <div class="input-group-btn">
+	    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">${2:Action} <span class="caret"></span></button>
+	    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+	      <li><a href="${3:#}">${4:Action}</a></li>
+	      <li><a href="${5:#}">${6:Another action}</a></li>
+	      <li><a href="${6:#}">${8:Something else here}</a></li>
+	      <li class="divider"></li>
+	      <li><a href="${9:#}">${10:Separated link}</a></li>
+	    </ul>
+	  </div><!-- /btn-group -->
+	</div>
+
+
+
+snippet navtabs Bootstrap
+	<ul class="nav nav-tabs">
+	  <li role="presentation" class="active"><a href="${1:#}">${2:Home}</a></li>
+	  <li role="presentation"><a href="${3:#}">${4:Profile}</a></li>
+	  <li role="presentation"><a href="${5:#}">${6:Messages}</a></li>
+	</ul>
+
+snippet navpills Bootstrap
+	<ul class="nav nav-pills">
+	  <li role="presentation" class="active"><a href="${1:#}">${2:Home}</a></li>
+	  <li role="presentation"><a href="${3:#}">${4:Profile}</a></li>
+	  <li role="presentation"><a href="${5:#}">${6:Messages}</a></li>
+	</ul>
+
+snippet navpillsstacked Bootstrap
+	<ul class="nav nav-pills nav-stacked">
+	  ${1:...}
+	</ul>
+
+snippet navtabsjustified Bootstrap
+	<ul class="nav nav-tabs nav-justified">
+	  ${1:...}
+	</ul>
+
+snippet navpillsjustified Bootstrap
+	<ul class="nav nav-pills nav-justified">
+	  ${1:...}
+	</ul>
+
+snippet navtabsdropdown Bootstrap
+	<ul class="nav nav-tabs">
+	  <li role="presentation" class="dropdown">
+	    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
+	      ${1:Dropdown} <span class="caret"></span>
+	    </a>
+	    <ul class="dropdown-menu" role="menu">
+	      ${2:...}
+	    </ul>
+	  </li>
+	</ul>
+
+snippet navpillsdropdown Bootstrap
+	<ul class="nav nav-pills">
+	  <li role="presentation" class="dropdown">
+	    <a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-expanded="false">
+	      ${1:Dropdown} <span class="caret"></span>
+	    </a>
+	    <ul class="dropdown-menu" role="menu">
+	      ${2:...}
+	    </ul>
+	  </li>
+	</ul>
+
+
+
+
+snippet navbar Bootstrap
+	<nav class="navbar navbar-default">
+	  <div class="container-fluid">
+	    <!-- Brand and toggle get grouped for better mobile display -->
+	    <div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <a class="navbar-brand" href="#">Brand</a>
+	    </div>
+	
+	    <!-- Collect the nav links, forms, and other content for toggling -->
+	    <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+	      <ul class="nav navbar-nav">
+	        <li class="active"><a href="#">Link <span class="sr-only">(current)</span></a></li>
+	        <li><a href="#">Link</a></li>
+	        <li class="dropdown">
+	          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
+	          <ul class="dropdown-menu" role="menu">
+	            <li><a href="#">Action</a></li>
+	            <li><a href="#">Another action</a></li>
+	            <li><a href="#">Something else here</a></li>
+	            <li class="divider"></li>
+	            <li><a href="#">Separated link</a></li>
+	            <li class="divider"></li>
+	            <li><a href="#">One more separated link</a></li>
+	          </ul>
+	        </li>
+	      </ul>
+	      <form class="navbar-form navbar-left" role="search">
+	        <div class="form-group">
+	          <input type="text" class="form-control" placeholder="Search">
+	        </div>
+	        <button type="submit" class="btn btn-default">Submit</button>
+	      </form>
+	      <ul class="nav navbar-nav navbar-right">
+	        <li><a href="#">Link</a></li>
+	        <li class="dropdown">
+	          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Dropdown <span class="caret"></span></a>
+	          <ul class="dropdown-menu" role="menu">
+	            <li><a href="#">Action</a></li>
+	            <li><a href="#">Another action</a></li>
+	            <li><a href="#">Something else here</a></li>
+	            <li class="divider"></li>
+	            <li><a href="#">Separated link</a></li>
+	          </ul>
+	        </li>
+	      </ul>
+	    </div><!-- /.navbar-collapse -->
+	  </div><!-- /.container-fluid -->
+	</nav>
+
+snippet navbarform Bootstrap
+	<form class="navbar-form navbar-left" role="search">
+	  <div class="form-group">
+	    <input type="text" class="form-control" placeholder="${1:Search}">
+	  </div>
+	  <button type="submit" class="btn btn-default">${2:Submit}</button>
+	</form>
+
+snippet navbarbtn Bootstrap
+	<button type="button" class="btn btn-default navbar-btn">${1:Sign in}</button>
+
+snippet navbartext Bootstrap
+	<p class="navbar-text">${1:Signed in as Mark Otto}</p>
+
+snippet navbarlink Bootstrap
+	<a href="${1:#}" class="navbar-link">${2:Mark Otto}</a>
+
+snippet navbarfixedtop Bootstrap
+	<nav class="navbar navbar-default navbar-fixed-top">
+	  <div class="container">
+	    ${1:...}
+	  </div>
+	</nav>
+
+snippet navbarfixedbottom Bootstrap
+	<nav class="navbar navbar-default navbar-fixed-bottom">
+	  <div class="container">
+	    ${1:...}
+	  </div>
+	</nav>
+
+snippet navbarstatictop Bootstrap
+	<nav class="navbar navbar-default navbar-static-top">
+	  <div class="container">
+	    ${1:...}
+	  </div>
+	</nav>
+
+snippet navbarinverse Bootstrap
+	<nav class="navbar navbar-inverse">
+	  ${1:...}
+	</nav>
+
+
+
+
+snippet breadcrumb Bootstrap
+	<ol class="breadcrumb">
+	  <li><a href="${1:#}">${2:Home}</a></li>
+	  <li><a href="${3:#}">${4:Library}</a></li>
+	  <li class="active">${5:Data}</li>
+	</ol>
+
+
+
+snippet pagination Bootstrap
+	<nav>
+	  <ul class="pagination">
+	    <li class="disabled">
+	      <a href="#" aria-label="Previous">
+	        <span aria-hidden="true">&laquo;</span>
+	      </a>
+	    </li>
+	    <li class="active"><a href="#">1</a></li>
+	    <li><a href="#">2</a></li>
+	    <li><a href="#">3</a></li>
+	    <li><a href="#">4</a></li>
+	    <li><a href="#">5</a></li>
+	    <li>
+	      <a href="#" aria-label="Next">
+	        <span aria-hidden="true">&raquo;</span>
+	      </a>
+	    </li>
+	  </ul>
+	</nav>
+
+snippet paginationlg Bootstrap
+	<nav><ul class="pagination pagination-lg">${1:...}</ul></nav>
+
+snippet paginationsm Bootstrap
+	<nav><ul class="pagination pagination-sm">${1:...}</ul></nav>
+
+snippet pager Bootstrap
+	<nav>
+	  <ul class="pager">
+	    <li><a href="${1:#}">${2:Previous}</a></li>
+	    <li><a href="${3:#}">${4:Next}</a></li>
+	  </ul>
+	</nav>
+
+snippet pageraligned Bootstrap
+	<nav>
+	  <ul class="pager">
+	    <li class="previous"><a href="${1:#}"><span aria-hidden="true">&larr;</span> ${2:Older}</a></li>
+	    <li class="next"><a href="${3:#}">${4:Newer} <span aria-hidden="true">&rarr;</span></a></li>
+	  </ul>
+	</nav>
+
+
+
+snippet label Bootstrap
+	<span class="label label-default">${1:Default}</span>
+
+snippet labeldefault Bootstrap
+	<span class="label label-default">${1:Default}</span>
+
+snippet labelprimary Bootstrap
+	<span class="label label-primary">${1:Primary}</span>
+
+snippet labelsuccess Bootstrap
+	<span class="label label-success">${1:Success}</span>
+
+snippet labelinfo Bootstrap
+	<span class="label label-info">${1:Info}</span>
+
+snippet labelwarning Bootstrap
+	<span class="label label-warning">${1:Warning}</span>
+
+snippet labeldanger Bootstrap
+	<span class="label label-danger">${1:Danger}</span>
+
+
+
+snippet badge Bootstrap
+	<a href="${1:#}">${2:Inbox} <span class="badge">${3:42}</span></a>
+
+snippet badgebtn Bootstrap
+	<button class="btn btn-primary" type="button">
+	  ${1:Messages} <span class="badge">${2:4}</span>
+	</button>
+
+snippet badgenav Bootstrap
+	<ul class="nav nav-pills" role="tablist">
+	  <li role="presentation" class="active"><a href="${1:#}">${2:Home} <span class="badge">${3:42}</span></a></li>
+	  <li role="presentation"><a href="${4:#}">${5:Profile}</a></li>
+	  <li role="presentation"><a href="${6:#}">${7:Messages} <span class="badge">${8:3}</span></a></li>
+	</ul>
+
+
+snippet jumbotron Bootstrap
+	<div class="jumbotron">
+	  <h1>${1:Hello, world!}</h1>
+	  <p>${2:...}</p>
+	  <p><a class="btn btn-primary btn-lg" href="${3:#}" role="button">${4:Learn more}</a></p>
+	</div>
+
+snippet jumbotroncontainer Bootstrap
+	<div class="jumbotron">
+	  <div class="container">
+	    ${1:...}
+	  </div>
+	</div>
+
+
+
+snippet pageheader Bootstrap
+	<div class="page-header">
+	  <h1>${1:Example page header} <small>${2:Subtext for header}</small></h1>
+	</div>
+
+
+
+snippet thumbnail Bootstrap
+	<a href="${1:#}" class="thumbnail">
+	  <img src="${2:...}" alt="${3:...}">
+	</a>
+
+snippet thumbnailcontent Bootstrap
+	<div class="thumbnail">
+	  <img src="${1:...}" alt="${2:...}">
+	  <div class="caption">
+	    <h3>${3:Thumbnail label}</h3>
+	    <p>${4:...}</p>
+	    <p><a href="${5:#}" class="btn btn-primary" role="button">${6:Button}</a> <a href="${7:#}" class="btn btn-default" role="button">${8:Button}</a></p>
+	  </div>
+	</div>
+
+
+
+snippet alert Bootstrap
+	<div class="alert alert-success" role="alert">${1:...}</div>
+
+snippet alertsuccess Bootstrap
+	<div class="alert alert-success" role="alert">${1:...}</div>
+
+snippet alertinfo Bootstrap
+	<div class="alert alert-info" role="alert">${1:...}</div>
+
+snippet alertwarning Bootstrap
+	<div class="alert alert-warning" role="alert">${1:...}</div>
+
+snippet alertdanger Bootstrap
+	<div class="alert alert-danger" role="alert">${1:...}</div>
+
+snippet alertdismissible Bootstrap
+	<div class="alert alert-${1:warning} alert-dismissible" role="alert">
+	  <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	  <strong>${2:Warning!}</strong> ${3:Better check yourself, you're not looking too good.}
+	</div>
+
+snippet alertlink Bootstrap
+	<div class="alert alert-success" role="alert">
+	  <a href="${1:#}" class="alert-link">${2:...}</a>
+	</div>
+
+
+
+snippet progress Bootstrap
+	<div class="progress">
+	  <div class="progress-bar" role="progressbar" aria-valuenow="${1:60}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%;">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progresssuccess Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="${1:40}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progressinfo Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="${1:20}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progresswarning Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="${1:60}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progressdanger Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="${1:80}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progressstriped Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-success progress-bar-striped" role="progressbar" aria-valuenow="${1:40}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progressstripedactive Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-striped active" role="progressbar" aria-valuenow="${1:45}" aria-valuemin="${2:0}" aria-valuemax="${3:100}" style="width: $1%">
+	    <span class="sr-only">$1% Complete</span>
+	  </div>
+	</div>
+
+snippet progressstacked Bootstrap
+	<div class="progress">
+	  <div class="progress-bar progress-bar-success" style="width: ${1:35}%">
+	    <span class="sr-only">$1% Complete (success)</span>
+	  </div>
+	  <div class="progress-bar progress-bar-warning progress-bar-striped" style="width: ${2:20}%">
+	    <span class="sr-only">$2% Complete (warning)</span>
+	  </div>
+	  <div class="progress-bar progress-bar-danger" style="width: ${3:10}%">
+	    <span class="sr-only">$3% Complete (danger)</span>
+	  </div>
+	</div>
+
+
+
+snippet media Bootstrap
+	<div class="media">
+	  <div class="media-left">
+	    <a href="${1:#}">
+	      <img class="media-object" src="${2:...}" alt="${3:...}">
+	    </a>
+	  </div>
+	  <div class="media-body">
+	    <h4 class="media-heading">${4:Media heading}</h4>
+	    ${5:...}
+	  </div>
+	</div>
+
+snippet medialeft Bootstrap
+	<div class="media-left">
+	  <a href="${1:#}">
+	    <img class="media-object" src="${2:...}" alt="${3:...}">
+	  </a>
+	</div>
+
+snippet mediabody Bootstrap
+	<div class="media-body">
+	  <h4 class="media-heading">${1:Media heading}</h4>
+	  ${2:...}
+	</div>
+
+snippet mediaright Bootstrap
+	<div class="media-right">
+	  <a href="${1:#}">
+	    <img class="media-object" src="${2:...}" alt="${3:...}">
+	  </a>
+	</div>
+
+snippet mediamiddle Bootstrap
+	<div class="media-left media-middle">
+	  <a href="${1:#}">
+	    <img class="media-object" src="${2:...}" alt="${3:...}">
+	  </a>
+	</div>
+
+snippet mediabottom Bootstrap
+	<div class="media-left media-bottom">
+	  <a href="${1:#}">
+	    <img class="media-object" src="${2:...}" alt="${3:...}">
+	  </a>
+	</div>
+
+snippet medialist Bootstrap
+	<ul class="media-list">
+	  <li class="media">
+	    <div class="media-left">
+	      <a href="${1:#}">
+	        <img class="media-object" src="${2:...}" alt="${3:...}">
+	      </a>
+	    </div>
+	    <div class="media-body">
+	      <h4 class="media-heading">${4:Media heading}</h4>
+	      ${5:...}
+	    </div>
+	  </li>
+	</ul>
+
+
+snippet listgroup Bootstrap
+	<ul class="list-group">
+	  <li class="list-group-item">${1:Cras justo odio}</li>
+	  <li class="list-group-item">${2:Dapibus ac facilisis in}</li>
+	  <li class="list-group-item">${3:Morbi leo risus}</li>
+	  <li class="list-group-item">${4:Porta ac consectetur ac}</li>
+	  <li class="list-group-item">${5:Vestibulum at eros}</li>
+	</ul>
+
+snippet listgroupitem Bootstrap
+	<li class="list-group-item">${1:Cras justo odio}</li>
+
+snippet listgroupitembadge Bootstrap
+	<li class="list-group-item">
+	  <span class="badge">${1:14}</span>
+	  ${2:Cras justo odio}
+	</li>
+
+snippet alistgroupitem Bootstrap
+	<a href="${1:#}" class="list-group-item active">${2:Cras justo odio}</a>
+
+snippet listgroupitemdisabled Bootstrap
+	<a href="${1:#}" class="list-group-item disabled">${2:Cras justo odio}</a>
+
+snippet listgroupitemsuccess Bootstrap
+	<li class="list-group-item list-group-item-success">${1:Dapibus ac facilisis in}</li>
+
+snippet listgroupiteminfo Bootstrap
+	<li class="list-group-item list-group-item-info">${1:Cras sit amet nibh libero}</li>
+
+snippet listgroupitemwarning Bootstrap
+	<li class="list-group-item list-group-item-warning">${1:Porta ac consectetur ac}</li>
+
+snippet listgroupitemdanger Bootstrap
+	<li class="list-group-item list-group-item-danger">${1:Vestibulum at eros}</li>
+
+snippet alistgroupitemsuccess Bootstrap
+	<a href="${1:#}" class="list-group-item list-group-item-success">${2:Dapibus ac facilisis in}</a>
+
+snippet alistgroupiteminfo Bootstrap
+	<a href="${1:#}" class="list-group-item list-group-item-info">${2:Cras sit amet nibh libero}</a>
+
+snippet alistgroupitemwarning Bootstrap
+	<a href="${1:#}" class="list-group-item list-group-item-warning">${2:Porta ac consectetur ac}</a>
+
+snippet alistgroupitemdanger Bootstrap
+	<a href="${1:#}" class="list-group-item list-group-item-danger">${2:Vestibulum at eros}</a>
+
+snippet listgroupitemcontent Bootstrap
+	<li class="list-group-item">
+	  <h4 class="list-group-item-heading">${1:List group item heading}</h4>
+	  <p class="list-group-item-text">${2:...}</p>
+	</li>
+
+snippet alistgroupitemcontent Bootstrap
+	<a href="${1:#}" class="list-group-item active">
+	  <h4 class="list-group-item-heading">${2:List group item heading}</h4>
+	  <p class="list-group-item-text">${3:...}</p>
+	</a>
+
+
+
+
+snippet panel Bootstrap
+	<div class="panel panel-default">
+	  <div class="panel-body">
+	    ${1:Basic panel example}
+	  </div>
+	</div>
+
+snippet panelheading Bootstrap
+	<div class="panel-heading">${1:Panel heading without title}</div>
+
+snippet panelheadingtitle Bootstrap
+	<div class="panel-heading">
+	  <h3 class="panel-title">${1:Panel title}</h3>
+	</div>
+
+snippet panelbody Bootstrap
+	<div class="panel-body">
+	  ${1:Panel content}
+	</div>
+
+snippet panelfooter Bootstrap
+	<div class="panel-footer">${1:Panel footer}</div>
+
+snippet paneldefault Bootstrap
+	<div class="panel panel-default">
+	  <div class="panel-body">
+	    ${1:Basic panel example}
+	  </div>
+	</div>
+
+snippet panelprimary Bootstrap
+	<div class="panel panel-primary">${1:...}</div>
+
+snippet panelsuccess Bootstrap
+	<div class="panel panel-success">${1:...}</div>
+
+snippet panelinfo Bootstrap
+	<div class="panel panel-info">${1:...}</div>
+
+snippet panelwarning Bootstrap
+	<div class="panel panel-warning">${1:...}</div>
+
+snippet paneldanger Bootstrap
+	<div class="panel panel-danger">${1:...}</div>
+
+snippet paneltable Bootstrap
+	<div class="panel panel-default">
+	  <!-- Default panel contents -->
+	  <div class="panel-heading">${1:Panel heading}</div>
+	  <div class="panel-body">
+	    <p>${2:...}</p>
+	  </div>
+	
+	  <!-- Table -->
+	  <table class="table">
+	    ${3:...}
+	  </table>
+	</div>
+
+snippet panellistgroup Bootstrap
+	<div class="panel panel-default">
+	  <!-- Default panel contents -->
+	  <div class="panel-heading">${1:Panel heading}</div>
+	  <div class="panel-body">
+	    <p>${2:...}</p>
+	  </div>
+	
+	  <!-- List group -->
+	  <ul class="list-group">
+	    <li class="list-group-item">${3:Cras justo odio}</li>
+	    <li class="list-group-item">${4:Dapibus ac facilisis in}</li>
+	    <li class="list-group-item">${5:Morbi leo risus}</li>
+	    <li class="list-group-item">${6:Porta ac consectetur ac}</li>
+	    <li class="list-group-item">${7:Vestibulum at eros}</li>
+	  </ul>
+	</div>
+
+
+
+snippet embedresponsive Bootstrap
+	<!-- 16:9 aspect ratio -->
+	<div class="embed-responsive embed-responsive-16by9">
+	  <iframe class="embed-responsive-item" src="${1:...}"></iframe>
+	</div>
+	
+	<!-- 4:3 aspect ratio -->
+	<div class="embed-responsive embed-responsive-4by3">
+	  <iframe class="embed-responsive-item" src="${2:...}"></iframe>
+	</div>
+
+
+
+snippet well Bootstrap
+	<div class="well">${1:...}</div>
+
+snippet welllg Bootstrap
+	<div class="well well-lg">${1:...}</div>
+
+snippet wellsm Bootstrap
+	<div class="well well-sm">${1:...}</div>
+
+
+
+
+snippet modal Bootstrap
+	<div class="modal fade">
+	  <div class="modal-dialog">
+	    <div class="modal-content">
+	      <div class="modal-header">
+	        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+	        <h4 class="modal-title">${1:Modal title}</h4>
+	      </div>
+	      <div class="modal-body">
+	        <p>${2:One fine body&hellip;}</p>
+	      </div>
+	      <div class="modal-footer">
+	        <button type="button" class="btn btn-default" data-dismiss="modal">${3:Close}</button>
+	        <button type="button" class="btn btn-primary">${4:Save changes}</button>
+	      </div>
+	    </div><!-- /.modal-content -->
+	  </div><!-- /.modal-dialog -->
+	</div><!-- /.modal -->
+
+snippet modallg Bootstrap
+	<div class="modal fade bs-example-modal-lg" tabindex="-1" role="dialog" aria-labelledby="${1:myLargeModalLabel}" aria-hidden="true">
+	  <div class="modal-dialog modal-lg">
+	    <div class="modal-content">
+	      ${2:...}
+	    </div>
+	  </div>
+	</div>
+
+snippet modalsm Bootstrap
+	<div class="modal fade bs-example-modal-sm" tabindex="-1" role="dialog" aria-labelledby="${1:mySmallModalLabel}" aria-hidden="true">
+	  <div class="modal-dialog modal-sm">
+	    <div class="modal-content">
+	      ${2:...}
+	    </div>
+	  </div>
+	</div>
+
+
+
+snippet scrollspy Bootstrap
+	<body data-spy="scroll" data-target=".$1">
+	  <div class="${1:navbar-example}">
+	    <ul class="nav nav-tabs" role="tablist">
+	      ${2:...}
+	    </ul>
+	  </div>
+	</body>
+
+
+snippet tabpanel Bootstrap
+	<div role="tabpanel">
+	
+	  <!-- Nav tabs -->
+	  <ul class="nav nav-tabs" role="tablist">
+	    <li role="presentation" class="active"><a href="#${1:home}" aria-controls="$1" role="tab" data-toggle="tab">${2:Home}</a></li>
+	    <li role="presentation"><a href="#${3:profile}" aria-controls="$3" role="tab" data-toggle="tab">${4:Profile}</a></li>
+	    <li role="presentation"><a href="#${5:messages}" aria-controls="$5" role="tab" data-toggle="tab">${6:Messages}</a></li>
+	    <li role="presentation"><a href="#${7:settings}" aria-controls="$7" role="tab" data-toggle="tab">${8:Settings}</a></li>
+	  </ul>
+	
+	  <!-- Tab panes -->
+	  <div class="tab-content">
+	    <div role="tabpanel" class="tab-pane active" id="$1">${9:...}</div>
+	    <div role="tabpanel" class="tab-pane" id="$3">${10:...}</div>
+	    <div role="tabpanel" class="tab-pane" id="$5">${11:...}</div>
+	    <div role="tabpanel" class="tab-pane" id="$7">${12:...}</div>
+	  </div>
+	
+	</div>
+
+
+snippet tooltip Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="tooltip" title="$1">${1:Tooltip on left}</button>
+
+snippet atooltip Bootstrap
+	<a href="${1:#}" class="btn btn-default" data-toggle="tooltip" title="$2">${2:Tooltip on left}</a>
+
+snippet tooltiptop Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="$1">${1:Tooltip on top}</button>
+
+snippet atooltiptop Bootstrap
+	<a href="${1:#}" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="$2">${2:Tooltip on top}</a>
+
+snippet tooltipleft Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="$1">${1:Tooltip on left}</button>
+
+snippet atooltipleft Bootstrap
+	<a href="${1:#}" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="$2">${2:Tooltip on left}</a>
+
+snippet tooltipbottom Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="$1">${1:Tooltip on bottom}</button>
+
+snippet atooltipbottom Bootstrap
+	<a href="${1:#}" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="$2">${2:Tooltip on bottom}</a>
+
+snippet tooltipright Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="$1">${1:Tooltip on right}</button>
+
+snippet atooltipright Bootstrap
+	<a href="${1:#}" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="$2">${2:Tooltip on right}</a>
+
+
+
+snippet popover Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="popover" title="${1:Popover title}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Click to toggle popover}</button>
+
+snippet apopover Bootstrap
+	<a class="btn btn-default" role="button" data-toggle="popover" title="${1:Dismissible popover}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Dismissible popover}</a>
+
+snippet popovertop Bootstrap
+	<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="top" data-content="${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}">
+	  ${2:Popover on top}
+	</button>
+
+snippet apopovertop Bootstrap
+	<a class="btn btn-default" role="button" data-toggle="popover" data-placement="top" title="${1:Popover on top}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Popover on top}</a>
+
+snippet popoverleft Bootstrap
+	<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="left" data-content="${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}">
+	  ${2:Popover on left}
+	</button>
+
+snippet apopoverleft Bootstrap
+	<a class="btn btn-default" role="button" data-toggle="popover" data-placement="left" title="${1:Popover on left}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Popover on left}</a>
+
+snippet popoverbottom Bootstrap
+	<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content="${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}">
+	  ${2:Popover on bottom}
+	</button>
+
+snippet apopoverbottom Bootstrap
+	<a class="btn btn-default" role="button" data-toggle="popover" data-placement="bottom" title="${1:Popover on bottom}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Popover on bottom}</a>
+
+snippet popoverright Bootstrap
+	<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="right" data-content="${1:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}">
+	  ${2:Popover on right}
+	</button>
+
+snippet apopoverright Bootstrap
+	<a class="btn btn-default" role="button" data-toggle="popover" data-placement="right" title="${1:Popover on right}" data-content="${2:Vivamus sagittis lacus vel augue laoreet rutrum faucibus.}">${3:Popover on right}</a>
+
+snippet apopoverdismissible Bootstrap
+	<a tabindex="0" class="btn btn-default" role="button" data-toggle="popover" data-trigger="focus" title="${1:Dismissible popover}" data-content="${2:And here's some amazing content. It's very engaging. Right?}">${3:Dismissible popover}</a>
+
+
+
+snippet btnstatetext Bootstrap
+	<button type="button" id="${1:myButton}" data-${2:loading}-text="${3:Loading...}" class="btn btn-default" autocomplete="off">
+	  ${4:Loading state}
+	</button>
+
+snippet btnsingletoggle Bootstrap
+	<button type="button" class="btn btn-default" data-toggle="button" aria-pressed="false" autocomplete="off">
+	  ${1:Single toggle}
+	</button>
+
+snippet btngroupcheckbox Bootstrap
+	<div class="btn-group" data-toggle="buttons">
+	  <label class="btn btn-primary active">
+	    <input type="checkbox" autocomplete="off" checked> ${1:Checkbox 1 (pre-checked)}
+	  </label>
+	  <label class="btn btn-primary">
+	    <input type="checkbox" autocomplete="off"> ${2:Checkbox 2}
+	  </label>
+	  <label class="btn btn-primary">
+	    <input type="checkbox" autocomplete="off"> ${3:Checkbox 3}
+	  </label>
+	</div>
+
+snippet btngroupradio Bootstrap
+	<div class="btn-group" data-toggle="buttons">
+	  <label class="btn btn-primary active">
+	    <input type="radio" name="${1:options}" id="${2:option1}" autocomplete="off" checked> ${3:Radio 1 (preselected)}
+	  </label>
+	  <label class="btn btn-primary">
+	    <input type="radio" name="$1" id="${4:option2}" autocomplete="off"> ${5:Radio 2}
+	  </label>
+	  <label class="btn btn-primary">
+	    <input type="radio" name="$1" id="${6:option3}" autocomplete="off"> ${7:Radio 3}
+	  </label>
+	</div>
+
+
+
+snippet btncollapse Bootstrap
+	<button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#$2" aria-expanded="false" aria-controls="$2">
+	  ${1:Button with data-target}
+	</button>
+	<div class="collapse" id="${2:collapseExample}">
+	  <div class="well">
+	    ${3:...}
+	  </div>
+	</div>
+
+snippet abtncollapse Bootstrap
+	<a class="btn btn-primary" data-toggle="collapse" href="#$2" aria-expanded="false" aria-controls="$2">
+	  ${1:Link with href}
+	</a>
+	<div class="collapse" id="${2:collapseExample}">
+	  <div class="well">
+	    ${3:...}
+	  </div>
+	</div>
+
+snippet accordian Bootstrap
+	<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+	  <div class="panel panel-default">
+	    <div class="panel-heading" role="tab" id="headingOne">
+	      <h4 class="panel-title">
+	        <a data-toggle="collapse" data-parent="#accordion" href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+	          Collapsible Group Item #1
+	        </a>
+	      </h4>
+	    </div>
+	    <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="headingOne">
+	      <div class="panel-body">
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+	      </div>
+	    </div>
+	  </div>
+	  <div class="panel panel-default">
+	    <div class="panel-heading" role="tab" id="headingTwo">
+	      <h4 class="panel-title">
+	        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo">
+	          Collapsible Group Item #2
+	        </a>
+	      </h4>
+	    </div>
+	    <div id="collapseTwo" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingTwo">
+	      <div class="panel-body">
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+	      </div>
+	    </div>
+	  </div>
+	  <div class="panel panel-default">
+	    <div class="panel-heading" role="tab" id="headingThree">
+	      <h4 class="panel-title">
+	        <a class="collapsed" data-toggle="collapse" data-parent="#accordion" href="#collapseThree" aria-expanded="false" aria-controls="collapseThree">
+	          Collapsible Group Item #3
+	        </a>
+	      </h4>
+	    </div>
+	    <div id="collapseThree" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingThree">
+	      <div class="panel-body">
+	        Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
+	      </div>
+	    </div>
+	  </div>
+	</div>
+
+
+
+snippet carousel Bootstrap
+	<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
+	  <!-- Indicators -->
+	  <ol class="carousel-indicators">
+	    <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
+	    <li data-target="#carousel-example-generic" data-slide-to="1"></li>
+	    <li data-target="#carousel-example-generic" data-slide-to="2"></li>
+	  </ol>
+	
+	  <!-- Wrapper for slides -->
+	  <div class="carousel-inner" role="listbox">
+	    <div class="item active">
+	      <img src="..." alt="...">
+	      <div class="carousel-caption">
+	        ...
+	      </div>
+	    </div>
+	    <div class="item">
+	      <img src="..." alt="...">
+	      <div class="carousel-caption">
+	        ...
+	      </div>
+	    </div>
+	    ...
+	  </div>
+	
+	  <!-- Controls -->
+	  <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
+	    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
+	    <span class="sr-only">Previous</span>
+	  </a>
+	  <a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
+	    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
+	    <span class="sr-only">Next</span>
+	  </a>
+	</div>
+
+
+
+snippet affix Bootstrap
+	<div data-spy="affix" data-offset-top="${1:60}" data-offset-bottom="${2:200}">
+	  ${3:...}
+	</div>
+
+
+
diff --git a/vim/snippets/snipmate-snippets-bib/README.rst b/vim/snippets/snipmate-snippets-bib/README.rst
new file mode 100644
index 0000000..a645d56
--- /dev/null
+++ b/vim/snippets/snipmate-snippets-bib/README.rst
@@ -0,0 +1,57 @@
+Snipmate.vim support for BibTeX files
+=====================================
+
+This plugin provides some snippets
+for writing BibTeX (``.bib``) files.
+
+The supported entry types are:
+``Article``,
+``Book``,
+``Booklet``,
+``Conference``,
+``InBook``,
+``InCollection``,
+``InProceedings``,
+``Manual``,
+``MastersThesis``,
+``Misc``,
+``PhDThesis``,
+``Proceedings``,
+``TechReport`` and
+``Unpublished``.
+The trigger words are these names converted to lower case.
+Most of the optional fields (such as ``annote`` and ``eprint``) are not included.
+
+I tested this plugin against `garbas's Snipmate fork`_.
+If it doesn't work with your own configuration, please let me know.
+
+.. _garbas's Snipmate fork: https://github.com/garbas/vim-snipmate
+
+Dependencies
+------------
+* Vim (of course)
+* Snipmate_.
+
+Installation
+------------
+This addon is compatible with Pathogen_ and Vundle_.
+If you use one of them,
+you are awesome so you'll know what to do.
+
+I pretend to support installation with VAM_ as well,
+but I haven't tried it.
+
+If you are an old-fashioned Vimmer,
+just drop the bib.snippets_ file
+into the ``snippets`` directory
+of your Snipmate install.
+
+.. _Snipmate: https://github.com/garbas/vim-snipmate
+.. _Pathogen: https://github.com/tpope/vim-pathogen
+.. _VAM: https://github.com/MarcWeber/vim-addon-manager
+.. _bib.snippets: https://github.com/rbonvall/snipmate-snippets-bib/blob/master/snippets/bib.snippets
+
+Author
+------
+Roberto Bonvallet <rbonvall@gmail.com>
+
diff --git a/vim/snippets/snipmate-snippets-bib/addon-info.json b/vim/snippets/snipmate-snippets-bib/addon-info.json
new file mode 100644
index 0000000..fdf95e6
--- /dev/null
+++ b/vim/snippets/snipmate-snippets-bib/addon-info.json
@@ -0,0 +1,15 @@
+{
+  "name" : "snipmate-snippets-bib",
+  "author" : "Roberto Bonvallet <rbonvall@gmail.com>",
+  "repository" : {
+    "type": "git",
+    "url": "git://github.com/rbonvall/snipmate-snippets-bib.git"
+  },
+  "dependencies" : {
+    "snipmate": {
+      "type": "git",
+      "url": "https://github.com/garbas/vim-snipmate.git"
+    }
+  },
+  "description" : "Snipmate.vim support for BibTeX files."
+}
diff --git a/vim/snippets/snipmate-snippets-bib/snippets/bib.snippets b/vim/snippets/snipmate-snippets-bib/snippets/bib.snippets
new file mode 100644
index 0000000..2fa837c
--- /dev/null
+++ b/vim/snippets/snipmate-snippets-bib/snippets/bib.snippets
@@ -0,0 +1,93 @@
+# Based on http://pts.szit.bme.hu/bibtex-cheat-sheet.txt
+# Most optional fields are not included.
+snippet article
+	@Article{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		journal = {${4:journal}},
+		year = ${5:year},
+	}
+snippet book
+	@Book{ ${1:id},
+		${2:author/editor} = {${3:$2s separated by "and"}},
+		title = {${4:title}},
+		publisher = {${5:publisher}},
+		year = ${6:year},
+	}
+snippet booklet
+	@Booklet{ ${1:id},
+		title = {${2:title}},
+		author = {${3:authors separated by "and"}},
+	}
+snippet conference
+	@Conference{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		booktitle = {${4:book title}},
+		year = ${5:year},
+	}
+snippet inbook
+	@InBook{ ${1:id},
+		${2:author/editor} = {${3:$2s separated by "and"}},
+		title = {${4:title}},
+		${5:chapter/pages} = {${6:$5}},
+		publisher = {${7:publisher}},
+		year = ${8:year},
+	}
+snippet incollection
+	@InCollection{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		booktitle = {${4:book title}},
+		year = ${5:year},
+	}
+snippet inproceedings
+	@InProceedings{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		booktitle = {${4:book title}},
+		year = ${5:year},
+	}
+snippet manual
+	@Manual{ ${1:id},
+		title = {${2:title}},
+		author = {${3:authors separated by "and"}},
+	}
+snippet masters
+	@MastersThesis{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		school = {${4:school}},
+		year = ${5:year},
+	}
+snippet misc
+	@Misc{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+	}
+snippet phd
+	@PhDThesis{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		school = {${4:school}},
+		year = ${5:year},
+	}
+snippet proceedings
+	@Proceedings{ ${1:id},
+		title = {${2:title}},
+		year = {${3:year}},
+	}
+snippet techreport
+	@TechReport{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		institution = {${4:institution}},
+		year = ${5:year},
+	}
+snippet unpublished
+	@Unpublished{ ${1:id},
+		author = {${2:authors separated by "and"}},
+		title = {${3:title}},
+		note = {${4:note}},
+	}
+
diff --git a/vim/snippets/vim-snippets/.gitignore b/vim/snippets/vim-snippets/.gitignore
new file mode 100644
index 0000000..f3d74a9
--- /dev/null
+++ b/vim/snippets/vim-snippets/.gitignore
@@ -0,0 +1,2 @@
+*.pyc
+*~
diff --git a/vim/snippets/vim-snippets/.travis.yml b/vim/snippets/vim-snippets/.travis.yml
new file mode 100644
index 0000000..74f2796
--- /dev/null
+++ b/vim/snippets/vim-snippets/.travis.yml
@@ -0,0 +1,8 @@
+language: c
+sudo: false
+
+notifications:
+  email: false
+
+script:
+  - ./tests.sh
diff --git a/vim/snippets/vim-snippets/AUTHORS b/vim/snippets/vim-snippets/AUTHORS
new file mode 100644
index 0000000..907daef
--- /dev/null
+++ b/vim/snippets/vim-snippets/AUTHORS
@@ -0,0 +1,383 @@
+Authors
+===============================================================================
+
+Generated with "git log --oneline --pretty="%an" | sort | uniq > AUTHORS
+
+Aaron Broder
+Adnan Zafar
+afolmert
+aisensiy
+Alexander Ross
+Alexandre de Oliveira
+Alexey Shevchenko
+Alex Tan
+Allen.M
+Alvin Chan
+ALX-Liu-Xiao
+Andrea Giardini
+Andreas Krennmair
+Andreas Steinel
+Andrei Cristian Petcu
+Andrej Radovic
+Andre Walker
+Andrey Paskal
+Andy Waite
+Angel Alonso
+Ángel Alonso
+Anne Douwe Bouma
+Anthony Wilson
+Arvind
+ashfinal
+Audrius Kažukauskas
+Austin Wood
+Aydar Khabibullin
+babybeasimple
+Benjamin Nørgaard
+Bernhard Graf
+Bill Casarin
+binaryplease
+Björn
+Björn-Egil Dahlberg
+BlackEagle
+Boone Severson
+bounceme
+Bradlee Speice
+Brandon Dulaney
+Brandon Hilkert
+Brian Hogan
+Brian van Burken
+Bruno Sutic
+Camilo Payan
+carme
+Cézar Antáres
+Chad Paradis
+Chen Zhongzheng
+Ches Martin
+ChickenNuggers
+Chipairon
+Chris Dueck
+Chris Nicola
+Chris Sims
+Christian
+Christian Höltje
+Christian Neumüller
+Christopher Joslyn
+chrisyue
+Ciro Santilli
+Ciro Santilli 六四事件 法轮功
+Claudio Maradonna
+Connor Atherton
+Cooper LeBrun
+Corentin Peuvrel
+Craig Paterson
+Craig P Jolicoeur
+crazymaster
+daa84
+Daeyun Shin
+Dale Roberts
+Daniel Hahler
+Dan Loewenherz
+Danny Navarro
+daoo
+Darrell Hamilton
+David Arvelo
+David Barnett
+David C. Bishop
+David Deryl Downey - AKA Deryl R. Doucette
+David Rodríguez de Dios
+David Sanson
+dengyaolong
+Derek Morey
+dhilipsiva
+djdt
+Dmitry Dementev
+Donny Yang
+DSIW
+dzikie drożdże
+Eduardo Gurgel
+Eli Gundry
+emzap79
+Enric Lluelles
+Enrico Maria De Angelis
+Erich Heine
+Erik Westrup
+Ernest
+Eugene Kalinin
+Eustaquio Rangel
+Eustáquio Rangel
+Fatih Arslan
+Felix Jung
+Filipe Giusti
+Florent Lévigne
+Florian Sattler
+frans
+Fuad Saud
+Gabriel Chavez
+Gaël Chamoulaud
+Gea-Suan Lin
+George Guimarães
+George Lee
+Georgios Samaras
+Gert
+gfixler
+Gilad Peleg
+gk
+goonnow
+Gueunet Charles
+Gui Lin
+guneysus
+Gustavo Chain
+Gustavo Ferreira
+Hans-Guenter
+Harald Wartig
+Henrik Kjelsberg
+HIRAKI Satoru
+Holger Rapp
+Honza
+Honza Pokorny
+hulufei
+Igor Goldvekht
+Ilker Cetinkaya
+indi
+Indra Susila
+Ionică Bizău
+Iuri Fernandes
+Jack Stalnaker
+Jacobo de Vera
+Jacques Kvam
+jake romer
+Jakub Stasiak
+James Turley
+Jan Mollowitz
+Jason S. Jones
+Jean Jordaan
+Jeffrey Tratner
+Jens Hoepken
+jiangyc0
+Jim Deville
+Jinzhu
+Joey Curtin
+Johannes Wienke
+jonasac
+Jonas Bygdén
+Jonathan Martin
+Jorge García
+Jorge López Pérez
+Joseph Lin
+Josh Bode
+Josh Davis
+Josh Matthews
+Josh Vandergrift
+Josh Wainwright
+JuanPablo
+Julian Bennecker
+Julien Deniau
+Julien Pivard
+Julien Stechele
+Julien STECHELE
+Kalinin Eugene
+kenshin54
+Kentaro Imai
+Kevin Koltz
+Kevin Lui
+Kevin Mees
+Kevin Murray
+Kevin Schaul
+Konstantin
+Konstantin Gorodinskiy
+Laas Toom
+Laurent Georget
+laxtiz
+Leandro Moreira
+Leonardo B
+Leonidez Acosta
+linduxed
+Li Xin
+Louis
+Louis Pilfold
+Lucas Hoffmann
+Luis Carlos Cruz
+Luis Carlos Cruz Carballo
+Luiz Gonzaga dos Santos Filho
+majjoha
+mangege
+Marc Camuzat
+Marcelo D Montu
+Marcelo Jacobus
+Marcin Kulik
+Marcus Kammer
+Marc Weber
+Mario de Frutos
+Markus Benning
+marocchino
+Martin Atukunda
+Martin Heuschober
+Martxel Lasa
+Matěj Cepl
+Mathew Attlee
+Mathieu Comandon
+Matthew Barry
+Matthias Viehweger
+Mattia Tezzele
+Matt Rasband
+Matt Stevens
+Mauro Porras P
+Maximiliano Robaina
+Mayeu (Cast)
+Meng Zhuo
+Michael Gehring
+Michael Hinrichs
+Michael Rutter
+Michael Thessel
+Michi Huber
+Mickey
+midchildan
+Mike Foley
+Mike Smullin
+Miki Tebeka
+Minjong Chung
+M. Maxwell Watson
+mMontu
+mockturtl
+m-pilia
+Muhammad Hallaj Subery
+mwcz
+Namit
+Nan Cloudio Jiang
+Nan Zheng
+Nate Mara
+netei
+Ngo The Trung
+Nguyen Le
+Nick Janetakis
+Nicklasos
+Nick Papanastasiou
+Nicolas G. Querol
+Nico Suhl
+No Ducks
+Norman Messtorff
+obaoba
+oddlydrawn
+Oleg Voronkovich
+Ole Hansen
+Oliver Andrich
+Ondrej Slinták
+onemanstartup
+opennota
+Paco Esteban
+Panagiotis Mavrogiorgos
+Paolo Cretaro
+Pascal
+Paulo Romeira
+Pawel Jankowski
+phcerdan
+Philippe Mongeau
+Philipp Jovanovic
+Piotr Jawniak
+Piotr Yordanov
+Pirogov Evgenij
+Pompeu
+Povilas Balzaravicius Pawka
+Procras
+protream
+pydave
+r4d2
+Radosław Szymczyszyn
+Ralph-Wang
+Raül Torralba
+raydeal
+rcolombo
+Rekky
+René
+Rene Vergara
+Renzo Poddighe
+Reyes Yang
+ricardogcolombo
+Ricardo Jesus
+Rich Layte
+Roberto Miranda
+robin
+Robin Grindrod
+Rok Garbas
+Roland Sommer
+Rory McNamara
+rsw0x
+rtorralba
+Ruben Vereecken
+Ryan Bright
+Ryan Pineo
+Ryan Wang
+Sam Shepherd
+Santiago Gallego
+sasidhar-d
+Sathors
+Sebastian Röder
+Sebastian Wiesner
+Sergey Lebedev
+Sergey Zasenko
+Serhiy Oplakanets
+SevereOverfl0w
+Simeon F. Willbanks
+Simeon Willbanks
+Simon Désaulniers
+sirex
+skv
+Sokovikov
+Srijan Choudhary
+Steeve
+stefan
+Stephen Tudor
+Stephen Woods
+Steve Brown
+Steven Humphrey
+Steven Oliver
+Stuart Grimshaw
+Sudar
+¨switch87¨
+Tevin Zhang
+theocrite
+Thiago de Arruda
+Thomas Duerr
+Thomas Szymanski
+tinyladi
+Tobias Witt
+Tobie Warburton
+Tomasz Wisniewski
+Tom Vincent
+Tony
+Tony Narlock
+toogley
+Torbjørn Vatn
+tormaroe
+ToruIwashita
+Travis Holton
+Trevor Sullivan
+troydm
+tUrG0n
+twabiko
+Tyler Ball
+tyronepost
+Tyrone Post
+Vadim Khohlov
+Vincent Hsu
+Vladimir Rybas
+Vladislav Khvostov
+Vorzard
+Vzaa
+Waldecir Santos
+Wildsky Fann
+William Ma
+William Travis Holton
+X4fyr
+xz.zhang
+Yamamoto Yuji
+Yannick Brehon
+yerv000
+Yike Lu
+yuhuanbo
+Yu Huanbo
+Yves Lange
+yvhn
+zauguin
+Zaven Muradyan
+ZPH
diff --git a/vim/snippets/vim-snippets/LICENSE b/vim/snippets/vim-snippets/LICENSE
new file mode 100644
index 0000000..495ced2
--- /dev/null
+++ b/vim/snippets/vim-snippets/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2011 see AUTHORS
+
+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/snippets/vim-snippets/README.md b/vim/snippets/vim-snippets/README.md
new file mode 100644
index 0000000..5567c5d
--- /dev/null
+++ b/vim/snippets/vim-snippets/README.md
@@ -0,0 +1,254 @@
+snipMate & UltiSnip Snippets
+============================
+
+[![Build Status](https://travis-ci.org/honza/vim-snippets.svg)](https://travis-ci.org/honza/vim-snippets)
+
+This repository contains snippets files for various programming languages.
+
+It is community-maintained and many people have contributed snippet files and
+other improvements already.
+
+Contents
+--------
+
+- `snippets/*`: snippets using snipMate format
+- `UltiSnips/*`: snippets using UltiSnips format
+
+Snippet engines supporting vim-snippets
+----------------------------------------
+
+There are different forks of snippet engines which allow the user to insert
+snippets by typing the name of a snippet hitting the expansion mapping.
+
+- [github.com/SirVer/ultisnips](https://github.com/SirVer/ultisnips):   
+  python, supports all snippets in this repo.
+- [github.com/garbas/vim-snipmate](https://github.com/garbas/vim-snipmate):   
+  VimL, snipmate-snippets, engine sometimes behaves strange. Supports
+  snippets/*
+- [github.com/Shougo/neosnippet](https://github.com/Shougo/neosnippet.vim):   
+  VimL, supports snippets/* with some configuration.
+- [github.com/drmingdrmer/xptemplate](https://github.com/drmingdrmer/xptemplate):
+  Totally different syntax, does not read snippets contained in this file, but
+  it is also very powerful. It does not support vim-snippets (just listing it
+  here for completeness)
+
+There tries to be a more comprehensive list (which still is incomplete) here:
+http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html
+
+UltiSnips has additional features such as high speed, nesting snippets,
+expanding snippets in snippets and offers powerful transformations on text in
+snippets (like visual selections or placeholder texts).
+
+Which one to use? If you have python give
+[SirVer/ultisnips](https://github.com/SirVer/ultisnips) a try because its fast
+and has the most features.
+
+If you have VimL only (vim without python support) your best option is using
+[garbas/vim-snipmate](https://github.com/garbas/vim-snipmate) and cope with the
+minor bugs found in the engine.
+
+Q: Should "snipMate be deprecated in favour of UltiSnips"?
+
+A: No, because snipMate is VimL, and UltiSnips requires Python.
+Some people want to use snippets without having to install Vim with Python
+support. Yes - this sucks.
+
+One solution would be: Use snippets if they are good enough, but allow overriding them
+in UltiSnips. This would avoid most duplication while still serving most users.
+AFAIK there is a nested-placeholder branch for snipMate too. snipMate is still
+improved by Adnan Zafar. So maybe time is not ready to make a final decision yet.
+
+[github issue/discussion](https://github.com/honza/vim-snippets/issues/363)
+
+Vendor Snippets
+---------------
+
+Additional library and framework snippets are available for UltiSnips users in
+the `UltiSnips/` directory. These files are removed from the default language
+namespaces to prevent them from all being loaded automatically. If there is a
+separate library, framework, or package you would like to support open a pull
+request!
+
+Additional snippets can be added to the current buffer with the
+`:UltiSnipsAddFiletypes` command followed by the snippet name without the
+"snippets" ending. For example, to add the JavaScript Jasmine snippets, run:
+`:UltiSnipsAddFiletypes javascript-jasmine`. To have this snippet loaded
+everytime a JavaScript file is opened or created you can add the command to your
+ -`.vim/ftplugin/javascript.vim` file. Another way is to add
+ `autocmd FileType js UltiSnipsAddFiletypes javascript-jasmine` in your `.vimrc`.
+
+
+For more see the UltiSnips docs (`:help UltiSnips`).
+
+Installation
+------------
+
+First be aware that there are many options, see "Snippet engines" above.
+Second be aware than there are [tons of plugin managers](http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html)
+which is why Marc Weber thinks that it doesn't make sense to repeat the same
+repetitive information everywhere.
+
+*Recommended way:*
+[vim-addon-manager](https://github.com/MarcWeber/vim-addon-manager) (because Marc Weber wrote it for exactly
+this reason, it supports simple dependency management). E.g. you're done by this
+line in your `.vimrc`:
+
+```vim
+" assuming you want to use snipmate snippet engine
+ActivateAddons vim-snippets snipmate
+```
+
+[vim-pi](https://bitbucket.org/vimcommunity/vim-pi/issue/90/we-really-need-a-web-interface)
+Is the place to discuss plugin managers and repository resources.
+
+About how to install snipMate see [snipmate@garbas](https://github.com/garbas/vim-snipmate)
+
+(Bundle, Pathogen, git clone - keywords to make people find this link by ctrl-f search)
+I know that I should be reading the docs of the snippet engine, just let me copy paste into my `.vimrc`:
+[See this pull request](https://github.com/honza/vim-snippets/pull/307/files).
+
+TROUBLE
+=======
+
+If you still have trouble getting this to work create a GitHub ticket, ask on
+IRC or the mailing list.
+
+Policies / for contributors
+---------------------------
+
+Some snippets are useful for almost all languages, so let's try to have the same
+triggers for them:
+
+```
+if : if without else
+ife: if $1 else $2
+eif : else if ($1) { .. }
+el  : else ..
+wh  : while (cond) ...
+```
+
+Don't add useless placeholder default texts like:
+
+```
+if (${1:condition}){
+  ${0:some code here}
+}
+```
+instead use:
+
+```
+if (${1}){
+  ${0:${VISUAL}}
+}
+```
+
+Exception: Functions which are used less often, such as Vim's `matchall()`, `matchstr()`
+functions which case hints may be helpful to remember order. In the VimL case
+get vim-dev plugin which has function completion
+
+Thus for conditions (while, if ..) and block bodies just use ${N} - Thanks
+
+When the snippet can be used to wrap existing code leverage `${VISUAL}`
+
+Open questions:
+What about one line if ee then .. else .. vs if \n .. then \n ... \n else \n .. ?
+Which additional policies to add?
+Discuss at: https://github.com/honza/vim-snippets/issues/230
+
+*folding markers*:
+Until further work is done on `vim-snipmate`, please don't add folding markers
+into snippets. `vim-snipmate` has some comments about how to patch all snippets
+on the fly adding those.
+
+Currently all snippets from UltiSnips have been put into UltiSnips - some work
+on merging should be done (dropping duplicates etc). Also see engines section above.
+
+Related repositories
+--------------------
+
+We also encourage people to maintain sets of snippets for particular use cases
+so that all users can benefit from them.  People can list their snippet repositories here:
+
+* https://github.com/rbonvall/snipmate-snippets-bib (snippets for BibTeX files)
+* https://github.com/sudar/vim-arduino-snippets (snippets for Arduino files)
+* https://github.com/zedr/zope-snipmate-bundle.git (snippets for Python, TAL and ZCML)
+* https://github.com/bonsaiben/bootstrap-snippets (snippets for Twitter Bootstrap markup, in HTML and Haml)
+* https://github.com/sniphpets (advanced snippets for PHP, Symfony 2/3, Doctrine and etc.)
+
+Installation using VAM: https://github.com/MarcWeber/vim-addon-manager
+
+Future - ideas - examples
+-------------------------
+
+[overview snippet engines](http://vim-wiki.mawercer.de/wiki/topic/text-snippets-skeletons-templates.html)
+If you have ideas you can add them to that list of "snippet engine features by example".
+
+Historical notes
+----------------
+
+[vim-snipmate][1] was originally started by [Michael Sanders][2] who has now
+unfortunately abandoned the project. [Rok Garbas][3] is now maintaining a
+[fork][4] of the project in hopes of improving the existing code base.
+
+Versions / dialects / ..
+========================
+
+There are some issues, such as newer language versions may require other
+snippets than older. If this exists we currently recommend doing this:
+
+* add snippets/ruby.snippets (common snippets)
+* add snippets/ruby-1.8.snippets (1.8 only)
+* add snippets/ruby-1.9.snippets (1.9 only)
+
+then configure https://github.com/garbas/vim-snipmate this way:
+
+```vim
+let g:snipMate = {}
+let g:snipMate.scope_aliases = {}
+let g:snipMate.scope_aliases['ruby'] = 'ruby,ruby-rails,ruby-1.9'
+```
+
+If it happens that you work on a project requiring ruby-1.8 snippets instead,
+consider using `vim-addon-local-vimrc` and override the filetypes.
+
+Well - of course it may not make sense to create a new file for each
+ruby-library-version triplet. Sometimes postfixing a name such as
+
+```
+migrate_lib_20_down
+migrate_lib_20_up
+```
+
+will do it then if syntax has changed.
+
+Language maintainers
+--------------------
+
+No one can really be proficient in all programming languages. If you would like
+to maintain snippets for a language, please get in touch.
+
+Notes: People are interested in snippets - and their interest may wane again.
+This list is kept up-to-date on a best effort basis.
+
+* Elixir - [lpil](https://github.com/lpil), [iurifq](https://github.com/iurifq)
+* Falcon - [steveno](https://github.com/steveno)
+* HTML Django - [honza](http://github.com/honza)
+* Javascript - [honza](http://github.com/honza)
+* Markdown - [honza](http://github.com/honza)
+* PHP - [chrisyue](http://github.com/chrisyue)
+* Python - [honza](http://github.com/honza)
+* Ruby - [taq](http://github.com/taq)
+* Scala - [gorodinskiy](https://github.com/gorodinskiy)
+* Supercollider - [lpil](https://github.com/lpil)
+
+License
+-------
+
+Just as the original snipMate plugin, all the snippets are licensed under the
+terms of the MIT license.
+
+[1]: http://github.com/garbas/vim-snipmate
+[2]: http://github.com/msanders
+[3]: http://github.com/garbas
+[4]: http://github.com/garbas/vim-snipmate
+[7]: http://github.com/SirVer/ultisnips
diff --git a/vim/snippets/vim-snippets/UltiSnips/README b/vim/snippets/vim-snippets/UltiSnips/README
new file mode 100644
index 0000000..41d8592
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/README
@@ -0,0 +1,17 @@
+This directory contains the snippets for UltiSnips.
+https://github.com/sirver/ultisnips
+
+Standing On The Shoulders of Giants
+===================================
+
+The snippets have been collected from various other project which I want to
+express my gratitude for. My main source for inspiration where the following
+two projects:
+
+   TextMate: http://svn.textmate.org/trunk/Bundles/
+   SnipMate: http://code.google.com/p/snipmate/
+
+UltiSnips has seen contributions by many individuals. Those contributions have
+been merged into this collection seamlessly and without further comments.
+
+-- vim:ft=rst:nospell:
diff --git a/vim/snippets/vim-snippets/UltiSnips/ada.snippets b/vim/snippets/vim-snippets/UltiSnips/ada.snippets
new file mode 100644
index 0000000..bea2a6c
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/ada.snippets
@@ -0,0 +1,282 @@
+priority -50
+
+global !p
+
+def ada_case(word):
+	out = word[0].upper()
+	for i in range(1, len(word)):
+		if word[i] == '-':
+			out = out + '.'
+		elif word[i - 1] == '_' or word[i - 1] == '-':
+			out = out + word[i].upper()
+		else:
+			out = out + word[i]
+	return out
+
+endglobal
+
+snippet wi "with"
+with $1;$0
+endsnippet
+
+snippet pac "package"
+package ${1:`!p snip.rv = ada_case(snip.basename)`} is
+	$0
+end $1;
+endsnippet
+
+snippet pacb "package body"
+package body ${1:`!p snip.rv = ada_case(snip.basename)`} is
+	$0
+end $1;
+endsnippet
+
+snippet ent "entry ... when"
+entry $1($2) when $3 is
+begin
+	$0
+end $1;
+endsnippet
+
+snippet task "task"
+task $1 is
+	entry $0
+end $1;
+endsnippet
+
+snippet taskb "task body"
+task body $1 is
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet acc "accept"
+accept $1($2) do
+	$0
+end $1;
+endsnippet
+
+snippet prot "protected type"
+protected type $1($2) is
+	$0
+end $1;
+endsnippet
+
+snippet prob "protected body"
+protected body $1 is
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet gen "generic type"
+generic
+	type $1 is $2;$0
+endsnippet
+
+snippet ty "type"
+type $1 is $2;$0
+endsnippet
+
+snippet tyd "type with default value"
+type $1 is $2
+	with Default_Value => $3;$0
+endsnippet
+
+snippet subty "subtype"
+subtype $1 is $2;$0
+endsnippet
+
+snippet dec "declare block"
+declare
+	$1
+begin
+	$0
+end;
+endsnippet
+
+snippet decn "declare named block"
+$1:
+declare
+	$2
+begin
+	$0
+end $1;
+endsnippet
+
+snippet ifex "if expression"
+if $1 then $2 else $0
+endsnippet
+
+snippet casex "case expression"
+case $1 is
+	when $2 => $3,$0
+endsnippet
+
+snippet fora "for all"
+for all $1 ${2:in} $3 => $0
+endsnippet
+
+snippet fors "for some"
+for some $1 ${2:in} $3 => $0
+endsnippet
+
+snippet if "if"
+if $1 then
+	$0
+end if;
+endsnippet
+
+snippet ife "if ... else"
+if $1 then
+	$2
+else
+	$0
+end if;
+endsnippet
+
+snippet el "else"
+else
+	$0
+endsnippet
+
+snippet eif "elsif"
+elsif $1 then
+	$0
+endsnippet
+
+snippet wh "while"
+while $1 loop
+	$0
+end loop;
+endsnippet
+
+snippet nwh "named while"
+$1:
+while $2 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet for "for"
+for ${1:I} in $2 loop
+	$0
+end loop;
+endsnippet
+
+snippet fore "for each"
+for $1 of $2 loop
+	$0
+end loop;
+endsnippet
+
+snippet nfor "named for"
+$1:
+for ${2:I} in $3 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet nfore "named for each"
+$1:
+for $2 of $3 loop
+	$0
+end loop $1;
+endsnippet
+
+snippet proc "procedure"
+procedure $1($2) is
+	$3
+begin
+	$0
+end $1;
+endsnippet
+
+snippet procd "procedure declaration"
+procedure $1;$0
+endsnippet
+
+snippet fun "function"
+function $1($2) return $3 is
+	$4
+begin
+	$0
+end $1;
+endsnippet
+
+snippet fune "expression function"
+function $1 return $2 is
+	($3);$0
+endsnippet
+
+snippet fund "function declaration"
+function $1 return $2;$0
+endsnippet
+
+snippet ret "extended return"
+return $1 do
+	$0
+end return;
+endsnippet
+
+snippet rec "record"
+record
+	$0
+end record;
+endsnippet
+
+snippet case "case"
+case $1 is
+	when $2 => $3;$0
+end case;
+endsnippet
+
+snippet whe "when"
+when $1 => $2;$0
+endsnippet
+
+snippet wheo "when others"
+when others => $1;$0
+endsnippet
+
+snippet lo "loop"
+loop
+	$0
+end loop;
+endsnippet
+
+snippet nlo "named loop"
+$1:
+loop
+	$0
+end loop $1;
+endsnippet
+
+snippet ex "exit when"
+exit when $1;$0
+endsnippet
+
+snippet put "Ada.Text_IO.Put"
+Ada.Text_IO.Put($1);$0
+endsnippet
+
+snippet putl "Ada.Text_IO.Put_Line"
+Ada.Text_IO.Put_Line($1);$0
+endsnippet
+
+snippet get "Ada.Text_IO.Get"
+Ada.Text_IO.Get($1);$0
+endsnippet
+
+snippet getl "Ada.Text_IO.Get_Line"
+Ada.Text_IO.Get_Line($1);$0
+endsnippet
+
+snippet newline "Ada.Text_IO.New_Line"
+Ada.Text_IO.New_Line(${1:1});$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/all.snippets b/vim/snippets/vim-snippets/UltiSnips/all.snippets
new file mode 100644
index 0000000..6d77cc5
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/all.snippets
@@ -0,0 +1,103 @@
+# This file contains snippets that are always defined. I personally
+# have snippets for signatures and often needed texts
+
+# sligthly lower priority than everything else since specialized versions
+# should overwrite. The user needs to adjust her priority in her snippets to
+# ~-55 so that other filetypes will still overwrite.
+priority -60
+
+##############
+# NICE BOXES #
+##############
+global !p
+from vimsnippets import foldmarker, make_box, get_comment_format
+endglobal
+
+snippet box "A nice box with the current comment symbol" b
+`!p
+box = make_box(len(t[1]))
+snip.rv = box[0]
+snip += box[1]
+`${1:${VISUAL:content}}`!p
+box = make_box(len(t[1]))
+snip.rv = box[2]
+snip += box[3]`
+$0
+endsnippet
+
+snippet bbox "A nice box over the full width" b
+`!p
+if not snip.c:
+	width = int(vim.eval("&textwidth - (virtcol('.') == 1 ? 0 : virtcol('.'))")) or 71
+box = make_box(len(t[1]), width)
+snip.rv = box[0]
+snip += box[1]
+`${1:${VISUAL:content}}`!p
+box = make_box(len(t[1]), width)
+snip.rv = box[2]
+snip += box[3]`
+$0
+endsnippet
+
+snippet fold "Insert a vim fold marker" b
+`!p snip.rv = get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]`${2:1} `!p snip.rv = get_comment_format()[2]`
+endsnippet
+
+snippet foldc "Insert a vim fold close marker" b
+`!p snip.rv = get_comment_format()[0]` ${2:1}`!p snip.rv = foldmarker()[1]` `!p snip.rv = get_comment_format()[2]`
+endsnippet
+
+snippet foldp "Insert a vim fold marker pair" b
+`!p snip.rv = get_comment_format()[0]` ${1:Fold description} `!p snip.rv = foldmarker()[0]` `!p snip.rv = get_comment_format()[2]`
+${2:${VISUAL:Content}}
+`!p snip.rv = get_comment_format()[0]` `!p snip.rv = foldmarker()[1]` $1 `!p snip.rv = get_comment_format()[2]`
+endsnippet
+
+##########################
+# LOREM IPSUM GENERATORS #
+##########################
+snippet lorem "Lorem Ipsum - 50 Words" b
+Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod
+tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At
+vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren,
+no sea takimata sanctus est Lorem ipsum dolor sit amet.
+endsnippet
+
+##########################
+# VIM MODELINE GENERATOR #
+##########################
+# See advice on `:help 'tabstop'` for why these values are set. Uses second
+# modeline form ('set') to work in languages with comment terminators
+# (/* like C */).
+snippet modeline "Vim modeline"
+vim`!v ':set '. (&expandtab ? printf('et sw=%i ts=%i', &sw, &ts) : printf('noet sts=%i sw=%i ts=%i', &sts, &sw, &ts)) . (&tw ? ' tw='. &tw : '') . ':'`
+endsnippet
+
+#########
+# DATES #
+#########
+snippet date "YYYY-MM-DD" w
+`!v strftime("%F")`
+endsnippet
+
+snippet ddate "Month DD, YYYY" w
+`!v strftime("%b %d, %Y")`
+endsnippet
+
+snippet diso "ISO format datetime" w
+`!v strftime("%F %H:%M:%S%z")`
+endsnippet
+
+snippet time "hh:mm" w
+`!v strftime("%H:%M")`
+endsnippet
+
+snippet datetime "YYYY-MM-DD hh:mm" w
+`!v strftime("%Y-%m-%d %H:%M")`
+endsnippet
+
+snippet todo "TODO comment" bw
+`!p snip.rv=get_comment_format()[0]` ${2:TODO}: $0${3: <${4:`!v strftime('%d-%m-%y')`}${5:, `!v g:snips_author`}>} `!p snip.rv=get_comment_format()[2]`
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/bib.snippets b/vim/snippets/vim-snippets/UltiSnips/bib.snippets
new file mode 100644
index 0000000..c9b8df5
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/bib.snippets
@@ -0,0 +1,52 @@
+priority -50
+
+snippet online "Online resource" b
+@online{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	date={${4:date}},
+	url={${5:url}}
+}
+$0
+endsnippet
+
+snippet article "Article reference" b
+@article{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	journaltitle={${4:journal}},
+	volume={${5:NN}},
+	number={${6:NN}},
+	year={${7:YYYY}},
+	pages={${8:NN}--${9:NN}}
+}
+$0
+endsnippet
+
+snippet book "Book reference" b
+@book{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	subtitle={${4:subtitle}},
+	year={${5:YYYY}},
+	location={${6:somewhere}},
+	publisher={${7:publisher}},
+	pages={${8:NN}--${9:NN}}
+}
+$0
+endsnippet
+
+snippet inb "In Book reference" b
+@inbook{${1:name},
+	author={${2:author}},
+	title={${3:title}},
+	subtitle={${4:subtitle}},
+	booktitle={${5:book}},
+	editor={${6:editor}},
+	year={${7:YYYY}},
+	location={${8:somewhere}},
+	publisher={${9:publisher}},
+	pages={${10:NN}--${11:NN}}
+}
+$0
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/bindzone.snippets b/vim/snippets/vim-snippets/UltiSnips/bindzone.snippets
new file mode 100644
index 0000000..b8ab0df
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/bindzone.snippets
@@ -0,0 +1,29 @@
+priority -50
+
+global !p
+def newsoa():
+	import datetime
+	now = datetime.datetime.now()
+	# return standard SOA formatted serial for today
+	return now.strftime("%Y%m%d00")
+endglobal
+
+snippet zone "Bootstrap a new Bind zonefile" b
+$TTL 86400
+@	  IN SOA   ${1:example.net}.	 ${2:hostmaster.$1}.(
+						`!p snip.rv = newsoa()`;	 serial
+						21600;			refresh every 6 hours
+						3600;			retry after one hour
+						604800;			expire after a week
+						86400 );		minimum TTL of 1 day
+
+				IN		NS				ns01.$1.
+				IN		MX		10		mail.$1.
+
+ns01.$1			IN		A
+mail.$1			IN		A
+endsnippet
+
+snippet A "Insert A Record" b
+${1:hostname}	IN		A	${2:ip}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/blade.snippets b/vim/snippets/vim-snippets/UltiSnips/blade.snippets
new file mode 100644
index 0000000..6a9c45f
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/blade.snippets
@@ -0,0 +1,135 @@
+priority -50
+
+extends html
+
+# We want to overwrite everything in parent ft.
+priority -49
+
+snippet break "@break"
+@break
+endsnippet
+
+snippet component "@component directive"
+@component('$1')
+	${2:${VISUAL}}
+@endcomponent
+endsnippet
+
+snippet each "@each directive"
+@each('$1', $$2, '$3')
+endsnippet
+
+snippet else "@else directive"
+@else
+endsnippet
+
+snippet eif "@else if directive"
+@else if ($1)
+	${2:${VISUAL}}
+endsnippet
+
+snippet for "@for directive"
+@for ($1)
+	${2:${VISUAL}}
+@endfor
+endsnippet
+
+snippet foreach "@foreach directive"
+@foreach ($$1 as $$2)
+	${3:${VISUAL}}
+@endforeach
+endsnippet
+
+snippet extends "@extends directive"
+@extends('$1')
+endsnippet
+
+snippet if "@if directive"
+@if ($1)
+	${2:${VISUAL}}
+@endif
+endsnippet
+
+snippet ife "@if @else structure"
+@if ($1)
+	${2:${VISUAL}}
+@else
+	${3:${VISUAL}}
+@endif
+endsnippet
+
+snippet include "@include directive"
+@include('$1')
+endsnippet
+
+snippet includeIf "@includeIf directive"
+@includeIf('$1')
+endsnippet
+
+snippet isset "@isset directive"
+@isset
+	${1:${VISUAL}}
+@endisset
+endsnippet
+
+snippet inject "@inject directive"
+@inject('$1', '$2')
+endsnippet
+
+snippet php "@php directive"
+@php
+	${1:${VISUAL}}
+@endphp
+endsnippet
+
+snippet push "@push directive"
+@push('$1')
+	${2:${VISUAL}}
+@endpush
+endsnippet
+
+snippet section "@section directive"
+@section('$1')
+endsnippet
+
+snippet show "@show directive"
+@show
+endsnippet
+
+snippet slot "@slot directive"
+@slot('$1')
+	${2:${VISUAL}}
+@endslot
+endsnippet
+
+snippet unless "@unless directive"
+@unless
+	${1:${VISUAL}}
+@endunless
+endsnippet
+
+snippet verbatim "@verbatim directive"
+@verbatim
+	${0:$VISUAL}
+@endverbatim
+endsnippet
+
+snippet wh "@while directive"
+@while ($1)
+	${2:${VISUAL}}
+@endwhile
+endsnippet
+
+snippet yield "@yield directive"
+@yield('$1')
+endsnippet
+
+snippet { "{{ }} statement." i
+{{ $1 }}
+endsnippet
+
+snippet {! "{!! !!} statement" i
+{!! $1 !!}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/c.snippets b/vim/snippets/vim-snippets/UltiSnips/c.snippets
new file mode 100644
index 0000000..6851a27
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/c.snippets
@@ -0,0 +1,99 @@
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+priority -50
+
+snippet def "#define ..."
+#define $1
+endsnippet
+
+snippet #ifndef "#ifndef ... #define ... #endif"
+#ifndef ${1/([A-Za-z0-9_]+).*/$1/}
+#define ${1:SYMBOL} ${2:value}
+#endif /* ifndef $1 */
+endsnippet
+
+snippet #if "#if #endif" b
+#if ${1:0}
+${VISUAL}$0
+#endif
+endsnippet
+
+snippet mark "#pragma mark (mark)"
+#if 0
+${1:#pragma mark -
+}#pragma mark $2
+#endif
+
+$0
+endsnippet
+
+snippet main "main() (main)"
+int main(int argc, char *argv[])
+{
+	${VISUAL}$0
+	return 0;
+}
+endsnippet
+
+snippet for "for loop (for)"
+for (${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet fori "for int loop (fori)"
+for (${4:int} ${2:i} = 0; $2 < ${1:count}; ${3:++$2}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet once "Include header once only guard"
+#ifndef ${1:`!p
+if not snip.c:
+	import random, string
+	name = re.sub(r'[^A-Za-z0-9]+','_', snip.fn).upper()
+	rand = ''.join(random.sample(string.ascii_letters+string.digits, 8))
+	snip.rv = ('%s_%s' % (name,rand)).upper()
+else:
+	snip.rv = snip.c`}
+#define $1
+
+${VISUAL}$0
+
+#endif /* end of include guard: $1 */
+endsnippet
+
+snippet fprintf "fprintf ..."
+fprintf(${1:stderr}, "${2:%s}\n"${2/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$3${2/([^%]|%%)*(%.)?.*/(?2:\);)/}
+endsnippet
+
+snippet eli "else if .. (eli)"
+else if (${1:/* condition */}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet printf "printf .. (printf)"
+printf("${1:%s}\n"${1/([^%]|%%)*(%.)?.*/(?2:, :\);)/}$2${1/([^%]|%%)*(%.)?.*/(?2:\);)/}
+endsnippet
+
+snippet st "struct"
+struct ${1:`!p snip.rv = (snip.basename or "name") + "_t"`} {
+	${0:/* data */}
+};
+endsnippet
+
+snippet fun "function" b
+${1:void} ${2:function_name}($3)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet fund "function declaration" b
+${1:void} ${2:function_name}($3);
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/coffee-jasmine.snippets b/vim/snippets/vim-snippets/UltiSnips/coffee-jasmine.snippets
new file mode 100644
index 0000000..0dd35cd
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/coffee-jasmine.snippets
@@ -0,0 +1,166 @@
+#
+# CoffeeScript versions -- adapted from the JS TextMate bundle + additions
+# for some jasmine-jquery matchers
+#
+priority -50
+
+extends coffee
+
+priority -49
+
+snippet des "Describe (coffee)" b
+describe '${1:description}', ->
+	$0
+endsnippet
+
+snippet it "it (coffee)" b
+it '${1:description}', ->
+	$0
+endsnippet
+
+snippet bef "before each (coffee)" b
+beforeEach ->
+	$0
+endsnippet
+
+snippet aft "after each (coffee)" b
+afterEach ->
+	$0
+endsnippet
+
+snippet any "any (coffee)" b
+jasmine.any($1)
+endsnippet
+
+snippet ru "runs (coffee)" b
+runs ->
+	$0
+endsnippet
+
+snippet wa "waits (coffee)" b
+waits($1)
+endsnippet
+
+snippet ex "expect (coffee)" b
+expect(${1:target})$0
+endsnippet
+
+snippet ee "expect to equal (coffee)" b
+expect(${1:target}).toEqual(${2:value})
+endsnippet
+
+snippet em "expect to match (coffee)" b
+expect(${1:target}).toMatch(${2:pattern})
+endsnippet
+
+snippet eha "expect to have attribute (coffee)" b
+expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'})
+endsnippet
+
+snippet et "expect to be truthy (coffee)" b
+expect(${1:target}).toBeTruthy()
+endsnippet
+
+snippet ef "expect to be falsy (coffee)" b
+expect(${1:target}).toBeFalsy()
+endsnippet
+
+snippet ed "expect to be defined (coffee)" b
+expect(${1:target}).toBeDefined()
+endsnippet
+
+snippet en "expect to be null (coffee)" b
+expect(${1:target}).toBeNull()
+endsnippet
+
+snippet ec "expect to contain (coffee)" b
+expect(${1:target}).toContain(${2:value})
+endsnippet
+
+snippet ev "expect to be visible (coffee)" b
+expect(${1:target}).toBeVisible()
+endsnippet
+
+snippet eh "expect to be hidden (coffee)" b
+expect(${1:target}).toBeHidden()
+endsnippet
+
+snippet notx "expect not (coffee)" b
+expect(${1:target}).not$0
+endsnippet
+
+snippet note "expect not to equal (coffee)" b
+expect(${1:target}).not.toEqual(${2:value})
+endsnippet
+
+snippet notm "expect not to match (coffee)" b
+expect(${1:target}).not.toMatch(${2:pattern})
+endsnippet
+
+snippet notha "expect to not have attribute (coffee)" b
+expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'})
+endsnippet
+
+snippet nott "expect not to be truthy (coffee)" b
+expect(${1:target}).not.toBeTruthy()
+endsnippet
+
+snippet notf "expect not to be falsy (coffee)" b
+expect(${1:target}).not.toBeFalsy()
+endsnippet
+
+snippet notd "expect not to be defined (coffee)" b
+expect(${1:target}).not.toBeDefined()
+endsnippet
+
+snippet notn "expect not to be null (coffee)" b
+expect(${1:target}).not.toBeNull()
+endsnippet
+
+snippet notc "expect not to contain (coffee)" b
+expect(${1:target}).not.toContain(${2:value})
+endsnippet
+
+snippet notv "expect not to be visible (coffee)" b
+expect(${1:target}).not.toBeVisible()
+endsnippet
+
+snippet noth "expect not to be hidden (coffee)" b
+expect(${1:target}).not.toBeHidden()
+endsnippet
+
+snippet s "spy on (coffee)" b
+spyOn(${1:object}, "${2:method}")$0
+endsnippet
+
+snippet sr "spy on and return (coffee)" b
+spyOn(${1:object}, "${2:method}").andReturn(${3:arguments})
+endsnippet
+
+snippet st "spy on and throw (coffee)" b
+spyOn(${1:object}, "${2:method}").andThrow(${3:exception})
+endsnippet
+
+snippet sct "spy on and call through (coffee)" b
+spyOn(${1:object}, "${2:method}").andCallThrough()
+endsnippet
+
+snippet scf "spy on and call fake (coffee)" b
+spyOn(${1:object}, "${2:method}").andCallFake(${3:function})
+endsnippet
+
+snippet esc "expect was called (coffee)" b
+expect(${1:target}).wasCalled()
+endsnippet
+
+snippet escw "expect was called with (coffee)" b
+expect(${1:target}).wasCalledWith(${2:arguments})
+endsnippet
+
+snippet notsc "expect was not called (coffee)" b
+expect(${1:target}).wasNotCalled()
+endsnippet
+
+snippet noscw "expect was not called with (coffee)" b
+expect(${1:target}).wasNotCalledWith(${2:arguments})
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/coffee-react.snippets b/vim/snippets/vim-snippets/UltiSnips/coffee-react.snippets
new file mode 100644
index 0000000..3090c57
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/coffee-react.snippets
@@ -0,0 +1,80 @@
+#
+# CoffeeScript versions -- adapted from coffee-jasmine
+# for some ReactJS matchers.
+#
+priority -50
+
+extends coffee
+
+priority -49
+
+snippet createClass "React define Class" b
+${1:classname}Class = React.createClass
+	displayName: "$1"
+	render: ->
+		$2
+$1 = React.createFactory($1)
+endsnippet
+
+snippet PropTypes "React define propTypes" b
+propTypes: ->
+	${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+endsnippet
+
+snippet propType "React propType (key/value)" b
+${1:myVar}: React.PropTypes.${2:type}${3:.isRequired}
+$4
+endsnippet
+
+snippet setState "React setState" b
+@setState
+	${1:myvar}: ${2:myvalue}
+	$3
+endsnippet
+
+snippet getInitialState "React define getInitialState" b
+getInitialState: ->
+	${1:myvar}: ${2:myvalue}
+	$3
+endsnippet
+
+snippet getDefaultProps "React define getDefaultProps" b
+getDefaultProps: ->
+	${1:myvar}: ${2:myvalue}
+	$3
+endsnippet
+
+snippet componentWillMount "React define componentWillMount" b
+componentWillMount: ->
+	$1
+endsnippet
+
+snippet componentDidMount "React define componentDidMount" b
+componentDidMount: ->
+	$1
+endsnippet
+
+snippet componentWillReceiveProps "React define componentWillReceiveProps" b
+componentWillReceiveProps: (nextProps) ->
+	$1
+endsnippet
+
+snippet shouldComponentUpdate "React define shouldComponentUpdate" b
+shouldComponentUpdate: (nextProps, nextState) ->
+	$1
+endsnippet
+
+snippet componentWillUpdate "React define componentWillUpdate" b
+componentWillUpdate: (nextProps, nextState) ->
+	$1
+endsnippet
+
+snippet componentDidUpdate "React define componentDidUpdate" b
+componentDidUpdate: (prevProps, prevState) ->
+	$1
+endsnippet
+
+snippet componentWillUnmount "React define componentWillUnmount" b
+componentWillUnmount: ->
+	$1
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/coffee.snippets b/vim/snippets/vim-snippets/UltiSnips/coffee.snippets
new file mode 100644
index 0000000..75e7d06
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/coffee.snippets
@@ -0,0 +1,100 @@
+priority -50
+
+snippet fun "Function" b
+${1:name} = `!p snip.rv = "(" if t[2] else ""`${2:args}`!p snip.rv = ") " if t[2] else ""`->
+	${0:# body...}
+endsnippet
+
+snippet bfun "Function (bound)" i
+`!p snip.rv = "(" if t[1] else ""`${1:args}`!p snip.rv = ") " if t[1] else ""`=>`!p snip.rv = " " if t[2] and not t[2].startswith("\n") else ""`${2:expr}
+endsnippet
+
+snippet if "If" b
+if ${1:condition}
+	${0:# body...}
+endsnippet
+
+snippet ife "If .. Else" b
+if ${1:condition}
+	${2:# body...}
+else
+	${3:# body...}
+endsnippet
+
+snippet elif "Else if" b
+else if ${1:condition}
+	${0:# body...}
+endsnippet
+
+snippet ifte "Ternary if" b
+if ${1:condition} then ${2:value} else ${3:other}
+endsnippet
+
+snippet unl "Unless" b
+${1:action} unless ${2:condition}
+endsnippet
+
+snippet fora "Array Comprehension" b
+for ${1:name} in ${2:array}
+	${0:# body...}
+endsnippet
+
+snippet foro "Object Comprehension" b
+for ${1:key}, ${2:value} of ${3:Object}
+	${0:# body...}
+endsnippet
+
+snippet forr "Range Comprehension (inclusive)" b
+for ${1:name} in [${2:start}..${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
+	${0:# body...}
+endsnippet
+
+snippet forrex "Range Comprehension (exclusive)" b
+for ${1:name} in [${2:start}...${3:finish}]`!p snip.rv = " by " if t[4] else ""`${4:step}
+	${0:# body...}
+endsnippet
+
+snippet swi "Switch" b
+switch ${1:object}
+	when ${2:value}
+		${3:# body...}
+	else
+		$0
+endsnippet
+
+snippet swit "Switch when .. then" b
+switch ${1:object}
+	when ${2:condition}`!p snip.rv = " then " if t[3] else ""`${3:value}
+	else`!p snip.rv = " " if t[4] and not t[4].startswith("\n") else ""`${4:value}
+endsnippet
+
+snippet cla "Class" b
+class ${1:ClassName}`!p snip.rv = " extends " if t[2] else ""`${2:Ancestor}
+
+	${3:constructor:`!p snip.rv = " (" if t[4] else ""`${4:args}`!p snip.rv = ")" if t[4] else ""` ->
+		${5:# body...}}
+	$0
+endsnippet
+
+snippet try "Try .. Catch" b
+try
+	$1
+catch ${2:error}
+	$3
+endsnippet
+
+snippet req "Require" b
+${1/^'?(\w+)'?$/\L$1\E/} = require(${1:'${2:sys}'})
+endsnippet
+
+snippet # "Interpolated Code" i
+#{$1}$0
+endsnippet
+
+snippet log "Log" b
+console.log ${1:"${2:msg}"}
+endsnippet
+
+snippet kv "Key:value for object" b
+${1:key}:${2:value}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/cpp.snippets b/vim/snippets/vim-snippets/UltiSnips/cpp.snippets
new file mode 100644
index 0000000..bb79a0e
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/cpp.snippets
@@ -0,0 +1,110 @@
+priority -50
+
+extends c
+
+# We want to overwrite everything in parent ft.
+priority -49
+###########################################################################
+#			    Global functions 						  #
+###########################################################################
+
+global !p
+
+def write_docstring_args(arglist, snip):
+	args = str(arglist).split(',')
+
+	if len(args) > 1:
+		c = 0
+		for arg in args:
+			if c == 0:
+				snip.rv += arg
+				c = 1
+			else:
+				snip += '*       : %s' % arg.strip()
+	else:
+		snip.rv = args[0]
+
+
+endglobal
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet beginend "$1.begin(), $1.end() (beginend)"
+${1:v}${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}begin(), $1${1/^.*?(-)?(>)?$/(?2::(?1:>:.))/}end()
+endsnippet
+
+snippet cl "class .. (class)"
+class ${1:`!p snip.rv = snip.basename or "name"`}
+{
+public:
+	${1/(\w+).*/$1/} (${2:arguments});
+	virtual ~${1/(\w+).*/$1/} ();
+
+private:
+	${0:/* data */}
+};
+endsnippet
+
+snippet ns "namespace .. (namespace)"
+namespace${1/.+/ /m}${1:`!p snip.rv = snip.basename or "name"`}
+{
+	${VISUAL}$0
+}${1/.+/ \/* /m}$1${1/.+/ *\/ /m}
+endsnippet
+
+snippet readfile "read file (readF)"
+std::vector<char> v;
+if (FILE *fp = fopen(${1:"filename"}, "r"))
+{
+	char buf[1024];
+	while(size_t len = fread(buf, 1, sizeof(buf), fp))
+		v.insert(v.end(), buf, buf + len);
+	fclose(fp);
+}
+endsnippet
+
+snippet map "std::map (map)"
+std::map<${1:key}, ${2:value}> map$0;
+endsnippet
+
+snippet vector "std::vector (v)"
+std::vector<${1:char}> v$0;
+endsnippet
+
+snippet tp "template <typename ..> (template)"
+template <typename ${1:_InputIter}>
+endsnippet
+
+snippet cla "An entire .h generator" b
+#ifndef ${2:`!v substitute(vim_snippets#Filename('$1_H','ClassName'),'.*','\U&\E','')`}
+#define $2
+
+class ${1:`!v substitute(substitute(vim_snippets#Filename('$1','ClassName'),'^.','\u&',''), '_\(\w\)', '\u\1', 'g')`}
+{
+private:
+	$3
+
+public:
+	$1();
+	virtual ~$1();
+};
+
+#endif /* $2 */
+endsnippet
+
+
+snippet fnc "Basic c++ doxygen function template" b
+/**
+* @brief: ${4:brief}
+*
+* @param: `!p write_docstring_args(t[3],snip)`
+*
+* @return: `!p snip.rv = t[1]`
+*/
+${1:ReturnType} ${2:FunctionName}(${3:param})
+{
+  ${0:FunctionBody}
+}
+endsnippet
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/crystal.snippets b/vim/snippets/vim-snippets/UltiSnips/crystal.snippets
new file mode 100644
index 0000000..cab946f
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/crystal.snippets
@@ -0,0 +1,13 @@
+priority -50
+
+snippet "\b(de)?f" "def <name>..." r
+def ${1:method_name}${2:(${3:*args})}
+	$0
+end
+endsnippet
+
+snippet "\b(pde)?f" "private def <name>..." r
+private def ${1:method_name}${2:(${3:*args})}
+	$0
+end
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/cs.snippets b/vim/snippets/vim-snippets/UltiSnips/cs.snippets
new file mode 100644
index 0000000..af247c5
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/cs.snippets
@@ -0,0 +1,372 @@
+#######################################################################
+#                      C# Snippets for UltiSnips                      #
+#######################################################################
+
+priority -50
+
+#########################
+#  classes and structs  #
+#########################
+
+snippet namespace "namespace" b
+namespace ${1:MyNamespace}
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet class "class" w
+${1:public} class ${2:MyClass}
+{
+	$0
+}
+endsnippet
+
+snippet struct "struct" w
+struct ${1:MyStruct}
+{
+	$0
+}
+endsnippet
+
+snippet interface "interface" w
+interface I${1:Interface}
+{
+	$0
+}
+endsnippet
+
+snippet enum "enumeration" b
+enum ${1:MyEnum} { ${2:Item} };
+endsnippet
+
+
+############
+#  Main()  #
+############
+
+snippet sim "static int main" b
+static int Main(string[] args)
+{
+	$0
+}
+endsnippet
+
+snippet svm "static void main" b
+static void Main(string[] args)
+{
+	$0
+}
+endsnippet
+
+
+################
+#  properties  #
+################
+
+snippet prop "Simple property declaration" b
+public ${1:int} ${2:MyProperty} { get; set; }
+endsnippet
+
+snippet propfull "Full property declaration" b
+private ${1:int} ${2:_myProperty};
+
+public $1 ${3:MyProperty}
+{
+	get { return $2; }
+	set { $2 = value; }
+}
+endsnippet
+
+snippet propg "Property with a private setter" b
+public ${1:int} ${2:MyProperty} { get; private set; }
+endsnippet
+
+
+############
+#  blocks  #
+############
+
+snippet #if "#if #endif" b
+#if ${1:DEBUG}
+${VISUAL}$0
+#endif
+endsnippet
+
+snippet #region "#region #endregion" b
+#region ${1:Region}
+${VISUAL}$0
+#endregion
+endsnippet
+
+
+###########
+#  loops  #
+###########
+
+snippet for "for loop" b
+for (int ${1:i} = 0; $1 < ${2:10}; $1++)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet forr "for loop (reverse)" b
+for (int ${1:i} = ${2:10}; $1 >= 0; $1--)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet foreach "foreach loop" b
+foreach (${3:var} ${2:item} in ${1:items})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet while "while loop" b
+while (${1:true})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet do "do loop" b
+do
+{
+	${VISUAL}$0
+} while (${1:true});
+endsnippet
+
+
+###############
+#  branching  #
+###############
+
+snippet if "if statement" b
+if ($1)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet ife "if else statement" b
+if ($1)
+{
+	${VISUAL}$0
+}
+else
+{
+}
+endsnippet
+
+snippet elif "else if" b
+else if ($1)
+{
+	$0
+}
+endsnippet
+
+snippet elseif "else if" b
+else if ($1)
+{
+	$0
+}
+endsnippet
+
+snippet ifnn "if not null" b
+if ($1 != null)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet switch "switch statement" b
+switch (${1:statement})
+{
+	case ${2:value}:
+		break;
+
+	default:
+		$0break;
+}
+endsnippet
+
+snippet case "case" b
+case ${1:value}:
+	$2
+	break;
+endsnippet
+
+
+##############
+#  wrappers  #
+##############
+
+snippet using "using statement" b
+using (${1:resource})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet unchecked "unchecked block" b
+unchecked
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet checked "checked block" b
+checked
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet unsafe "unsafe" b
+unsafe
+{
+	${VISUAL}$0
+}
+endsnippet
+
+
+########################
+#  exception handling  #
+########################
+
+snippet try "try catch block" b
+try
+{
+	${VISUAL}$0
+}
+catch (${1:Exception} ${2:e})
+{
+	throw;
+}
+endsnippet
+
+snippet tryf "try finally block" b
+try
+{
+	${VISUAL}$0
+}
+finally
+{
+}
+endsnippet
+
+snippet throw "throw"
+throw new $1Exception("$2");
+endsnippet
+
+
+##########
+#  LINQ  #
+##########
+
+snippet from "LINQ syntax" b
+var ${1:seq} =
+	from ${2:item1} in ${3:items1}
+	join ${4:item2} in ${5:items2} on $2.${6:prop1} equals $4.${7:prop2}
+	select ${8:$2.prop3}
+	where ${9:clause}
+endsnippet
+
+
+############################
+#  feedback and debugging  #
+############################
+
+snippet da "Debug.Assert" b
+Debug.Assert(${1:true});
+endsnippet
+
+snippet cw "Console.WriteLine" b
+Console.WriteLine("$1");
+endsnippet
+
+snippet cr "Console.ReadLine" b
+Console.ReadLine();
+endsnippet
+
+# as you first type comma-separated parameters on the right, {n} values appear in the format string
+snippet cwp "Console.WriteLine with parameters" b
+Console.WriteLine("${2:`!p
+snip.rv = ' '.join(['{' + str(i) + '}' for i in range(t[1].count(','))])
+`}"${1:, something});
+endsnippet
+
+snippet mbox "Message box" b
+MessageBox.Show("${1:message}");
+endsnippet
+
+
+#############
+#  methods  #
+#############
+
+snippet equals "Equals method" b
+public override bool Equals(object obj)
+{
+	if (obj == null || GetType() != obj.GetType())
+	{
+		return false;
+	}
+	$0
+	return base.Equals(obj);
+}
+endsnippet
+
+snippet mth "Method" b
+${1:public} ${2:void} ${3:MyMethod}(${4})
+{
+	$0
+}
+endsnippet
+
+snippet mths "Static method" b
+${1:public} static ${2:void} ${3:MyMethod}(${4})
+{
+	$0
+}
+endsnippet
+
+###############
+# constructor #
+###############
+
+snippet ctor "Constructor" b
+${1:public} ${2:`!p snip.rv = snip.basename or "untitled"`}(${3})
+{
+	$0
+}
+endsnippet
+
+##############
+#  comments  #
+##############
+
+snippet /// "XML summary comment" b
+/// <summary>
+/// $0
+/// </summary>
+endsnippet
+
+snippet <p "XML pramameter comment" w
+<param name="${1}">${2}</param>
+endsnippet
+
+snippet <ex "XML exception comment" w
+<exception cref="${1:System.Exception}">${2}</exception>
+endsnippet
+
+snippet <r "XML returns comment" w
+<returns>$0</returns>
+endsnippet
+
+snippet <c "XML code comment" w
+<code>$0</code>
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/css.snippets b/vim/snippets/vim-snippets/UltiSnips/css.snippets
new file mode 100644
index 0000000..f5ccd2f
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/css.snippets
@@ -0,0 +1,493 @@
+priority -50
+
+snippet p "padding"
+padding: ${1:0};$0
+endsnippet
+
+snippet m "margin"
+margin: ${1:0};$0
+endsnippet
+
+snippet bd "border"
+border: ${1:0};$0
+endsnippet
+
+snippet d "display"
+display: ${1:none};$0
+endsnippet
+
+snippet bg "background"
+background: ${1:none};$0
+endsnippet
+
+snippet ff "font-family"
+font-family: ${1:"Helvetica Neue", Helvetica, Arial, sans-serif};$0
+endsnippet
+
+snippet h "height"
+height: ${1:auto};$0
+endsnippet
+
+snippet w "width"
+width: ${1:auto};$0
+endsnippet
+
+snippet pos "position"
+position: ${1:relative};$0
+endsnippet
+
+snippet tt "text-transform"
+text-transform: ${1:none};$0
+endsnippet
+
+snippet ! "!important CSS (!)"
+!important
+endsnippet
+
+snippet tsh "text-shadow: color-hex x y blur (text)"
+text-shadow: ${1:${2:color} ${3:offset-x} ${4:offset-y} ${5:blur}};$0
+endsnippet
+
+snippet bxsh "box-shadow: color-hex x y blur (text)"
+box-shadow: ${1:${2:offset-x} ${3:offset-y} ${4:blur} ${5:spread} ${6:color}};$0
+endsnippet
+
+#
+# Colors
+#
+
+snippet rgb "color rgb"
+rgb(${1:255}, ${2:255}, ${3:255})$0
+endsnippet
+
+snippet rgba "color rgba"
+rgba(${1:255}, ${2:255}, ${3:255}, ${4:0.5})$0
+endsnippet
+
+snippet hsl "color hsl"
+hsl(${1:360}, ${2:100}%, ${3:100}%)$0
+endsnippet
+
+snippet hsla "color hsla"
+hsla(${1:360}, ${2:100}%, ${3:100}%, ${4:0.5})$0
+endsnippet
+
+#
+# Selectors
+#
+
+snippet :fc
+:first-child
+endsnippet
+
+snippet :lc
+:last-child
+endsnippet
+
+snippet :nc
+:nth-child($0)
+endsnippet
+
+snippet :nlc
+:nth-last-child($0)
+endsnippet
+
+snippet :oc
+:only-child
+endsnippet
+
+#
+# Pseudo-elements
+#
+
+snippet :a
+:after
+endsnippet
+
+snippet :b
+:before
+endsnippet
+
+snippet ::a
+::after
+endsnippet
+
+snippet ::b
+::before
+endsnippet
+
+###########################################################################
+#                    Most of these came from TextMate                     #
+###########################################################################
+
+snippet background "background-attachment: scroll:fixed (background)"
+background-attachment: ${1:scroll/fixed};$0
+endsnippet
+
+snippet background "background-color:  color-hex (background)"
+background-color: #${1:DDD};$0
+endsnippet
+
+snippet background "background-color:  color-name (background)"
+background-color: ${1:red};$0
+endsnippet
+
+snippet background "background-color:  color-rgb (background)"
+background-color: rgb(${1:255},${2:255},${3:255});$0
+endsnippet
+
+snippet background "background-color:  transparent (background)"
+background-color: transparent;$0
+endsnippet
+
+snippet background "background-image:  none (background)"
+background-image: none;$0
+endsnippet
+
+snippet background "background-image:  url (background)"
+background-image: url($1);$0
+endsnippet
+
+snippet background "background-position:  position (background)"
+background-position: ${1:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
+endsnippet
+
+snippet background "background-repeat:  r:r-x:r-y:n-r (background)"
+background-repeat: ${1:repeat/repeat-x/repeat-y/no-repeat};$0
+endsnippet
+
+snippet background "background:  color image repeat attachment position (background)"
+background:${6: #${1:DDD}} url($2) ${3:repeat/repeat-x/repeat-y/no-repeat} ${4:scroll/fixed} ${5:top left/top center/top right/center left/center center/center right/bottom left/bottom center/bottom right/x-% y-%/x-pos y-pos};$0
+endsnippet
+
+snippet border "border-bottom-color: size style color (border)"
+border-bottom-color: #${1:999};$0
+endsnippet
+
+snippet border "border-bottom-style: size style color (border)"
+border-bottom-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-bottom-width: size style color (border)"
+border-bottom-width: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-bottom: size style color (border)"
+border-bottom: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-color: color (border)"
+border-color: ${1:999};$0
+endsnippet
+
+snippet border "border-left-color: color (border)"
+border-right-color: #${1:999};$0
+endsnippet
+
+snippet border "border-left-style: style (border)"
+border-left-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-left-width: size (border)"
+border-left-width: ${1:1}px
+endsnippet
+
+snippet border "border-left: size style color (border)"
+border-left: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-right-color: color (border)"
+border-right-color: #${1:999};$0
+endsnippet
+
+snippet border "border-right-style: style (border)"
+border-right-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-right-width: size (border)"
+border-right-width: ${1:1}px
+endsnippet
+
+snippet border "border-right: size style color (border)"
+border-right: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-style: style (border)"
+border-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-top-color: color (border)"
+border-top-color: #${1:999};$0
+endsnippet
+
+snippet border "border-top-style: style (border)"
+border-top-style: ${1:none/hidden/dotted/dashed/solid/double/groove/ridge/inset/outset};$0
+endsnippet
+
+snippet border "border-top-width: size (border)"
+border-top-width: ${1:1}px
+endsnippet
+
+snippet border "border-top: size style color (border)"
+border-top: ${1:1}px ${2:solid} #${3:999};$0
+endsnippet
+
+snippet border "border-width: width (border)"
+border-width: ${1:1px};$0
+endsnippet
+
+snippet border "border:   size style color (border)"
+border: ${1:1px} ${2:solid} #${3:999};$0
+endsnippet
+
+snippet clear "clear: value (clear)"
+clear: ${1:left/right/both/none};$0
+endsnippet
+
+snippet color "color:  color-hex (color)"
+color: #${1:DDD};$0
+endsnippet
+
+snippet color "color:  color-name (color)"
+color: ${1:red};$0
+endsnippet
+
+snippet color "color:  color-rgb (color)"
+color: rgb(${1:255},${2:255},${3:255});$0
+endsnippet
+
+snippet cursor "cursor: type (cursor)"
+cursor: ${1:default/auto/crosshair/pointer/move/*-resize/text/wait/help};$0
+endsnippet
+
+snippet cursor "cursor: url (cursor)"
+cursor: url($1);$0
+endsnippet
+
+snippet direction "direction: ltr|rtl (direction)"
+direction: ${1:ltr|rtl};$0
+endsnippet
+
+snippet display "display: block (display)"
+display: block;$0
+endsnippet
+
+snippet display "display: common-types (display)"
+display: ${1:none/inline/block/list-item/run-in/compact/marker};$0
+endsnippet
+
+snippet display "display: inline (display)"
+display: inline;$0
+endsnippet
+
+snippet display "display: table-types (display)"
+display: ${1:table/inline-table/table-row-group/table-header-group/table-footer-group/table-row/table-column-group/table-column/table-cell/table-caption};$0
+endsnippet
+
+snippet float "float: left:right:none (float)"
+float: ${1:left/right/none};$0
+endsnippet
+
+snippet font "font-family:   family (font)"
+font-family: ${1:Arial, "MS Trebuchet"}, ${2:sans-}serif;$0
+endsnippet
+
+snippet font "font-size: size (font)"
+font-size: ${1:100%};$0
+endsnippet
+
+snippet font "font-style:   normal:italic:oblique (font)"
+font-style: ${1:normal/italic/oblique};$0
+endsnippet
+
+snippet font "font-variant:   normal:small-caps (font)"
+font-variant: ${1:normal/small-caps};$0
+endsnippet
+
+snippet font "font-weight: weight (font)"
+font-weight: ${1:normal/bold};$0
+endsnippet
+
+snippet font "font:   style variant weight size:line-height font -family (font)"
+font: ${1:normal/italic/oblique} ${2:normal/small-caps} ${3:normal/bold} ${4:1em/1.5em} ${5:Arial}, ${6:sans-}serif;$0
+endsnippet
+
+snippet font "font: size font (font)"
+font: ${1:75%} ${2:"Lucida Grande", "Trebuchet MS", Verdana,} ${3:sans-}serif;$0
+endsnippet
+
+snippet letter "letter-spacing:   length-em (letter)"
+letter-spacing: $1em;$0
+endsnippet
+
+snippet letter "letter-spacing:   length-px (letter)"
+letter-spacing: $1px;$0
+endsnippet
+
+snippet list "list-style-image: url (list)"
+list-style-image: url($1);$0
+endsnippet
+
+snippet list "list-style-position: pos (list)"
+list-style-position: ${1:inside/outside};$0
+endsnippet
+
+snippet list "list-style-type: asian (list)"
+list-style-type: ${1:cjk-ideographic/hiragana/katakana/hiragana-iroha/katakana-iroha};$0
+endsnippet
+
+snippet list "list-style-type: marker(list)"
+list-style-type: ${1:none/disc/circle/square};$0
+endsnippet
+
+snippet list "list-style-type: numeric (list)"
+list-style-type: ${1:decimal/decimal-leading-zero/zero};$0
+endsnippet
+
+snippet list "list-style-type: other (list)"
+list-style-type: ${1:hebrew/armenian/georgian};$0
+endsnippet
+
+snippet list "list-style-type: roman-alpha-greek (list)"
+list-style-type: ${1:lower-roman/upper-roman/lower-alpha/upper-alpha/lower-greek/lower-latin/upper-latin};$0
+endsnippet
+
+snippet list "list-style: type position image (list)"
+list-style: ${1:none/disc/circle/square/decimal/zero} ${2:inside/outside} url($3);$0
+endsnippet
+
+snippet margin "margin-bottom: length (margin)"
+margin-bottom: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-left: length (margin)"
+margin-left: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-right: length (margin)"
+margin-right: ${1:20px};$0
+endsnippet
+
+snippet margin "margin-top: length (margin)"
+margin-top: ${1:20px};$0
+endsnippet
+
+snippet margin "margin:   all (margin)"
+margin: ${1:20px};$0
+endsnippet
+
+snippet margin "margin: T R B L (margin)"
+margin: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
+endsnippet
+
+snippet margin "margin: V H (margin)"
+margin: ${1:20px} ${2:0px};$0
+endsnippet
+
+snippet marker "marker-offset: auto (marker)"
+marker-offset: auto;$0
+endsnippet
+
+snippet marker "marker-offset: length (marker)"
+marker-offset: ${1:10px};$0
+endsnippet
+
+snippet overflow "overflow: type (overflow)"
+overflow: ${1:visible/hidden/scroll/auto};$0
+endsnippet
+
+snippet padding "padding-bottom: length (margin)"
+padding-bottom: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-left: length (margin)"
+padding-left: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-right: length (margin)"
+padding-right: ${1:20px};$0
+endsnippet
+
+snippet padding "padding-top: length (margin)"
+padding-top: ${1:20px};$0
+endsnippet
+
+snippet padding "padding:   T R B L (padding)"
+padding: ${1:20px} ${2:0px} ${3:40px} ${4:0px};$0
+endsnippet
+
+snippet padding "padding:   V H (padding)"
+padding: ${1:20px} ${2:0px};$0
+endsnippet
+
+snippet padding "padding:   all (padding)"
+padding: ${1:20px};$0
+endsnippet
+
+snippet position "position: type (position)"
+position: ${1:static/relative/absolute/fixed};$0
+endsnippet
+
+snippet { "properties { } ( } )"
+{
+	/* $1 */
+	$0
+
+endsnippet
+
+snippet scrollbar "scrollbar"
+scrollbar-base-color:       ${1:#CCCCCC};${2:
+scrollbar-arrow-color:      ${3:#000000};
+scrollbar-track-color:      ${4:#999999};
+scrollbar-3dlight-color:    ${5:#EEEEEE};
+scrollbar-highlight-color:  ${6:#FFFFFF};
+scrollbar-face-color:       ${7:#CCCCCC};
+scrollbar-shadow-color:     ${9:#999999};
+scrollbar-darkshadow-color: ${8:#666666};}
+endsnippet
+
+snippet selection "selection"
+$1::-moz-selection,
+$1::selection {
+	color: ${2:inherit};
+	background: ${3:inherit};
+}
+endsnippet
+
+snippet text "text-align: left:center:right (txt)"
+text-align: ${1:left/right/center/justify};$0
+endsnippet
+
+snippet text "text-decoration: none:underline:overline:line-through:blink (text)"
+text-decoration: ${1:none/underline/overline/line-through/blink};$0
+endsnippet
+
+snippet text "text-indent: length (text)"
+text-indent: ${1:10}px;$0
+endsnippet
+
+snippet text "text-transform: capitalize:upper:lower (text)"
+text-transform: ${1:capitalize/uppercase/lowercase};$0
+endsnippet
+
+snippet vertical "vertical-align: type (vertical)"
+vertical-align: ${1:baseline/sub/super/top/text-top/middle/bottom/text-bottom/length/%};$0
+endsnippet
+
+snippet visibility "visibility: type (visibility)"
+visibility: ${1:visible/hidden/collapse};$0
+endsnippet
+
+snippet white "white-space:  normal:pre:nowrap (white)"
+white-space: ${1:normal/pre/nowrap};$0
+endsnippet
+
+snippet word "word-spacing:  length (word)"
+word-spacing: ${1:10px};$0
+endsnippet
+
+snippet z "z-index: index (z)"
+z-index: $1;$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/cuda.snippets b/vim/snippets/vim-snippets/UltiSnips/cuda.snippets
new file mode 100644
index 0000000..2a9a7e5
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/cuda.snippets
@@ -0,0 +1,5 @@
+priority -50
+
+extends cpp
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/d.snippets b/vim/snippets/vim-snippets/UltiSnips/d.snippets
new file mode 100644
index 0000000..a9d89b8
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/d.snippets
@@ -0,0 +1,584 @@
+# Simple shortcuts
+
+priority -50
+
+snippet imp "import (imp)" b
+import ${1:std.stdio};
+endsnippet
+
+snippet pimp "public import (pimp)" b
+public import ${1:/*module*/};
+endsnippet
+
+snippet over "override (over)" b
+override ${1:/*function*/}
+endsnippet
+
+snippet al "alias (al)"
+alias ${1:/*orig*/} ${2:/*alias*/};
+endsnippet
+
+snippet mixin "mixin (mixin)" b
+mixin ${1:/*mixed_in*/} ${2:/*name*/};
+endsnippet
+
+snippet new "new (new)"
+new $1($2);
+endsnippet
+
+snippet scpn "@safe const pure nothrow (scpn)"
+@safe const pure nothrow
+endsnippet
+
+snippet spn "@safe pure nothrow (spn)"
+@safe pure nothrow
+endsnippet
+
+snippet cont "continue (cont)"
+continue;
+endsnippet
+
+snippet dis "@disable (dis)" b
+@disable ${1:/*method*/};
+endsnippet
+
+snippet pub "public (pub)" b
+public:
+	${1:/*members*/}
+endsnippet
+
+snippet priv "private (priv)" b
+private:
+	${1:/*members*/}
+endsnippet
+
+snippet prot "protected (prot)" b
+protected:
+	${1:/*members*/}
+endsnippet
+
+snippet pack "package (pack)" b
+package:
+	${1:/*members*/}
+endsnippet
+
+snippet ret "return (ret)"
+return ${1:/*value to return*/};
+endsnippet
+
+snippet auto "auto (auto)" b
+auto ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet con "const (con)" b
+const ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet siz "size_t (siz)" b
+size_t ${1:/*variable*/} = ${2:/*value*/};
+endsnippet
+
+snippet sup "super (sup)" b
+super(${1:/*args*/});
+endsnippet
+
+# Phobos
+
+snippet tup "tuple (tup)"
+tuple(${1:/*args*/})
+endsnippet
+
+snippet wr "writeln (wr)"
+writeln(${1:/*args*/});
+endsnippet
+
+snippet to "to (to)"
+to!(${1:/*type*/})(${2:/*arg*/})
+endsnippet
+
+snippet enf "enforce (enf)" b
+enforce(${1:/*condition*/},
+	new $2Exception(${3:/*args*/}));
+endsnippet
+
+# Branches
+
+snippet if "if .. (if)"
+if(${1:/*condition*/})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet ife "if .. else (ife)" b
+if(${1:/*condition*/})
+{
+	$2
+}
+else
+{
+	${3:/*else*/}
+}
+endsnippet
+
+snippet el "else (el)" b
+else
+{
+	${VISUAL}$1
+}
+endsnippet
+
+snippet elif "else if (elif)" b
+else if(${1:/*condition*/})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet sw "switch (sw)"
+switch(${1:/*var*/})
+{
+	case ${2:/*value*/}:
+		$3
+		break;
+	case ${4:/*value*/}:
+		$5
+		break;
+	${7:/*more cases*/}
+	default:
+		${6:assert(false);}
+}
+endsnippet
+
+snippet fsw "final switch (fsw)"
+final switch(${1:/*var*/})
+{
+	case ${2:/*value*/}:
+		$3
+		break;
+	case ${4:/*value*/}:
+		$5
+		break;
+	${7:/*more cases*/}
+}
+endsnippet
+
+snippet case "case (case)" b
+case ${1:/*value*/}:
+	$2
+	break;
+endsnippet
+
+snippet ?: "ternary operator (?:)"
+${1:/*condition*/} ? ${2:/*then*/} : ${3:/*else*/}$4
+endsnippet
+
+# Loops
+
+snippet do "do while (do)" b
+do
+{
+	${VISUAL}$2
+} while(${1:/*condition*/});
+endsnippet
+
+snippet wh "while (wh)" b
+while(${1:/*condition*/})
+{
+	${VISUAL}$2
+}
+endsnippet
+
+snippet for "for (for)" b
+for (${4:size_t} ${2:i} = 0; $2 < ${1:count}; ${3:++$2})
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet forever "forever (forever)" b
+for(;;)
+{
+	${VISUAL}$0
+}
+endsnippet
+
+snippet fore "foreach (fore)"
+foreach(${1:/*elem*/}; ${2:/*range*/})
+{
+	${VISUAL}$3
+}
+endsnippet
+
+snippet forif "foreach if (forif)" b
+foreach(${1:/*elem*/}; ${2:/*range*/}) if(${3:/*condition*/})
+{
+	${VISUAL}$4
+}
+endsnippet
+
+# Contracts
+snippet in "in contract (in)" b
+in
+{
+	assert(${1:/*condition*/}, "${2:error message}");
+	$3
+}
+body
+endsnippet
+
+snippet out "out contract (out)" b
+out${1:(result)}
+{
+	assert(${2:/*condition*/}, "${3:error message}");
+	$4
+}
+body
+endsnippet
+
+snippet inv "invariant (inv)" b
+invariant()
+{
+	assert(${1:/*condition*/}, "${2:error message}");
+	$3
+}
+endsnippet
+
+# Functions (generic)
+
+snippet fun "function definition (fun)"
+${1:void} ${2:/*function name*/}(${3:/*args*/}) ${4:@safe pure nothrow}
+{
+	${VISUAL}$5
+}
+endsnippet
+
+snippet void "void function definition (void)"
+void ${1:/*function name*/}(${2:/*args*/}) ${3:@safe pure nothrow}
+{
+	${VISUAL}$4
+}
+endsnippet
+
+snippet this "ctor (this)" w
+this(${1:/*args*/})
+{
+	${VISUAL}$2
+}
+endsnippet
+
+snippet get "getter property (get)"
+@property ${1:/*type*/} ${2:/*member_name*/}() const pure nothrow {return ${3:$2_};}
+endsnippet
+
+snippet set "setter property (set)"
+@property void ${1:/*member_name*/}(${2:/*type*/} rhs) pure nothrow {${3:$1_} = rhs;}
+endsnippet
+
+# Functions (concrete)
+
+snippet main "Main" b
+void main(string[] args)
+{
+	${VISUAL}${0: /*code*/}
+}
+endsnippet
+
+# Mixins
+
+snippet signal "signal (signal)" b
+mixin Signal!(${1:/*args*/}) ${2:/*name*/};
+endsnippet
+
+# Scope
+
+snippet scope "scope (scope)" b
+scope(${1:exit})
+{
+	${VISUAL}$2
+}
+endsnippet
+
+# With
+
+snippet with "with (with)"
+with($1)
+{
+	${VISUAL}$2
+}
+endsnippet
+
+# Exception handling
+
+snippet try "try/catch (try)" b
+try
+{
+	${VISUAL}${1:/*code to try*/}
+}
+catch($2Exception e)
+{
+	${3:/*handle exception*/}
+}
+endsnippet
+
+snippet tryf "try/catch/finally (tryf)" b
+try
+{
+	${VISUAL}${1:/*code to try*/}
+}
+catch($2Exception e)
+{
+	${3:/*handle exception*/}
+}
+finally
+{
+	${4:/*cleanup*/}
+}
+endsnippet
+
+snippet catch "catch (catch)" b
+catch($1Exception e)
+{
+	${2:/*handle exception*/}
+}
+endsnippet
+
+snippet thr "throw (thr)"
+throw new $1Exception("$2");
+endsnippet
+
+
+# Type declarations
+
+snippet struct "struct (struct)"
+struct ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+	$2
+}
+endsnippet
+
+snippet union "union (union)"
+union ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+	$2
+}
+endsnippet
+
+snippet class "class (class)"
+class ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+	$2
+}
+endsnippet
+
+snippet inter "interface (inter)"
+interface ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+	$2
+}
+endsnippet
+
+snippet enum "enum (enum)"
+enum ${1:`!p snip.rv = (snip.basename or "name")`}
+{
+	$2
+}
+endsnippet
+
+
+# Exception declarations
+
+snippet exc "exception declaration (exc)" b
+/// ${3:/*documentation*/}
+class $1Exception : $2Exception
+{
+	public this(string msg, string file = __FILE__, int line = __LINE__)
+	{
+		super(msg, file, line);
+	}
+}
+endsnippet
+
+
+# Conditional compilation
+
+snippet version "version (version)" b
+version(${1:/*version name*/})
+{
+	${VISUAL}$2
+}
+endsnippet
+
+snippet debug "debug" b
+debug
+{
+	${VISUAL}$1
+}
+endsnippet
+
+
+# Templates
+
+snippet temp "template (temp)" b
+template ${2:/*name*/}(${1:/*args*/})
+{
+	$3
+}
+endsnippet
+
+
+# Asserts
+
+snippet ass "assert (ass)" b
+assert(${1:false}, "${2:TODO}");
+
+endsnippet
+
+
+# Unittests
+
+snippet unittest "unittest (unittest)" b
+unittest
+{
+	$1
+}
+endsnippet
+
+
+# Common member functions
+
+snippet opDis "opDispatch (opDis)" b
+${1:/*return type*/} opDispatch(string s)()
+{
+	$2;
+}
+endsnippet
+
+snippet op= "opAssign (op=)" b
+void opAssign($1 rhs) ${2:@safe pure nothrow}
+{
+	$2
+}
+endsnippet
+
+snippet opCmp "opCmp (opCmp)" b
+int opCmp($1 rhs) @safe const pure nothrow
+{
+	$2
+}
+endsnippet
+
+snippet opApply "opApply (opApply)" b
+int opApply(int delegate(ref ${1:/*iterated type/s*/}) dg)
+{
+	int result = 0;
+	${2:/*loop*/}
+	{
+		result = dg(${3:/*arg/s*/});
+		if(result){break;}
+	}
+	return result;
+}
+endsnippet
+
+snippet toString "toString (toString)" b
+string toString() @safe const pure nothrow
+{
+	$1
+}
+endsnippet
+
+
+# Comments
+
+
+snippet todo "TODO (todo)"
+// TODO: $1
+endsnippet
+
+
+# DDoc
+
+snippet doc "generic ddoc block (doc)" b
+/// ${1:description}
+///
+/// ${2:details}
+endsnippet
+
+snippet fdoc "function ddoc block (fdoc)" b
+/// ${1:description}
+///
+/// ${2:Params:  ${3:param} = ${4:param description}
+///			 $5}
+///
+/// ${6:Returns: ${7:return value}}
+///
+/// ${8:Throws:  $9Exception $10}
+endsnippet
+
+snippet Par "Params (Par)"
+Params:  ${1:param} = ${2:param description}
+///			$3
+endsnippet
+
+snippet Ret "Returns (Ret)"
+Returns:  ${1:return value/s}
+endsnippet
+
+snippet Thr "Throws (Thr)"
+Throws:  $1Exception $2
+endsnippet
+
+snippet Example "Examples (Example)"
+Examples:
+/// --------------------
+/// ${1:example code}
+/// --------------------
+endsnippet
+
+
+# License blocks
+
+snippet gpl "GPL (gpl)" b
+// 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// Copyright (C) ${1:Author}, `!v strftime("%Y")`
+
+$2
+endsnippet
+
+snippet boost "Boost (boost)" b
+//          Copyright ${1:Author} `!v strftime("%Y")`.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+$2
+endsnippet
+
+
+# New module
+
+snippet module "New module (module)" b
+//          Copyright ${1:Author} `!v strftime("%Y")`.
+// Distributed under the Boost Software License, Version 1.0.
+//    (See accompanying file LICENSE_1_0.txt or copy at
+//          http://www.boost.org/LICENSE_1_0.txt)
+
+module $2.`!v vim_snippets#Filename('$1', 'name')`;
+
+
+$3
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/django.snippets b/vim/snippets/vim-snippets/UltiSnips/django.snippets
new file mode 100644
index 0000000..8f83628
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/django.snippets
@@ -0,0 +1,361 @@
+priority -50
+
+# This files will define django snippets from sublime text djaneiro
+# FORMS SNIPPETS
+
+snippet form "Form" b
+class ${1:FORMNAME}(forms.Form):
+
+	${2:# TODO: Define form fields here}
+endsnippet
+
+snippet modelform "ModelForm" b
+class ${1:MODELNAME}Form(forms.ModelForm):
+
+	class Meta:
+		model = $1
+endsnippet
+
+snippet fbool "BooleanField" b
+${1:FIELDNAME} = forms.BooleanField($2)
+endsnippet
+
+snippet fchar "CharField" b
+${1:FIELDNAME} = forms.CharField($2)
+endsnippet
+
+snippet fchoice "ChoiceField" b
+${1:FIELDNAME} = forms.ChoiceField($2)
+endsnippet
+
+snippet fcombo "ComboField" b
+${1:FIELDNAME} = forms.ComboField($2)
+endsnippet
+
+snippet fdate "DateField" b
+${1:FIELDNAME} = forms.DateField($2)
+endsnippet
+
+snippet fdatetime "DateTimeField" b
+${1:FIELDNAME} = forms.DateTimeField($2)
+endsnippet
+
+snippet fdecimal "DecimalField" b
+${1:FIELDNAME} = forms.DecimalField($2)
+endsnippet
+
+snippet fmail "EmailField" b
+${1:FIELDNAME} = forms.EmailField($2)
+endsnippet
+
+snippet ffile "FileField" b
+${1:FIELDNAME} = forms.FileField($2)
+endsnippet
+
+snippet ffilepath "FilePathField" b
+${1:FIELDNAME} = forms.FilePathField($2)
+endsnippet
+
+snippet ffloat "FloatField" b
+${1:FIELDNAME} = forms.FloatField($2)
+endsnippet
+
+snippet fip "IPAddressField" b
+${1:FIELDNAME} = forms.IPAddressField($2)
+endsnippet
+
+snippet fimg "ImageField" b
+${1:FIELDNAME} = forms.ImageField($2)
+endsnippet
+
+snippet fint "IntegerField" b
+${1:FIELDNAME} = forms.IntegerField($2)
+endsnippet
+
+snippet fmochoice "ModelChoiceField" b
+${1:FIELDNAME} = forms.ModelChoiceField($2)
+endsnippet
+
+snippet fmomuchoice "ModelMultipleChoiceField" b
+${1:FIELDNAME} = forms.ModelMultipleChoiceField($2)
+endsnippet
+
+snippet fmuval "MultiValueField" b
+${1:FIELDNAME} = forms.MultiValueField($2)
+endsnippet
+
+snippet fmuchoice "MultipleChoiceField" b
+${1:FIELDNAME} = forms.MultipleChoiceField($2)
+endsnippet
+
+snippet fnullbool "NullBooleanField" b
+${1:FIELDNAME} = forms.NullBooleanField($2)
+endsnippet
+
+snippet freg "RegexField" b
+${1:FIELDNAME} = forms.RegexField($2)
+endsnippet
+
+snippet fslug "SlugField" b
+${1:FIELDNAME} = forms.SlugField($2)
+endsnippet
+
+snippet fsdatetime "SplitDateTimeField" b
+${1:FIELDNAME} = forms.SplitDateTimeField($2)
+endsnippet
+
+snippet ftime "TimeField" b
+${1:FIELDNAME} = forms.TimeField($2)
+endsnippet
+
+snippet ftchoice "TypedChoiceField" b
+${1:FIELDNAME} = forms.TypedChoiceField($2)
+endsnippet
+
+snippet ftmuchoice "TypedMultipleChoiceField" b
+${1:FIELDNAME} = forms.TypedMultipleChoiceField($2)
+endsnippet
+
+snippet furl "URLField" b
+${1:FIELDNAME} = forms.URLField($2)
+endsnippet
+
+# MODELS SNIPPETS
+
+snippet model "Model" b
+class ${1:MODELNAME}(models.Model):
+	$0
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
+
+	def __str__(self):
+		return super($1, self).__str__()
+
+endsnippet
+
+snippet modelfull "Model" b
+class ${1:MODELNAME}(models.Model):
+	${2:# TODO: Define fields here}
+
+	class Meta:
+		verbose_name = "$1"
+		verbose_name_plural = "$1s"
+
+	def __str__(self):
+		return super($1, self).__str__()
+
+	def save(self):
+		return super($1, self).save()
+
+	@models.permalink
+	def get_absolute_url(self):
+		return ('')
+
+	${3:# TODO: Define custom methods here}
+
+endsnippet
+
+snippet mauto "AutoField" b
+${1:FIELDNAME} = models.AutoField($2)
+endsnippet
+
+snippet mbigint "BigIntegerField" b
+${1:FIELDNAME} = models.BigIntegerField($2)
+endsnippet
+
+snippet mbool "BooleanField" b
+${1:FIELDNAME} = models.BooleanField($2)
+endsnippet
+
+snippet mchar "CharField" b
+${1:FIELDNAME} = models.CharField($2, max_length=${3:50})
+endsnippet
+
+snippet mcoseint "CommaSeparatedIntegerField" b
+${1:FIELDNAME} = models.CommaSeparatedIntegerField($2)
+endsnippet
+
+snippet mdate "DateField" b
+${1:FIELDNAME} = models.DateField($2)
+endsnippet
+
+snippet mdatetime "DateTimeField" b
+${1:FIELDNAME} = models.DateTimeField($2)
+endsnippet
+
+snippet mdecimal "DecimalField" b
+${1:FIELDNAME} = models.DecimalField(max_digits=${2:10}, decimal_places=${3:2})
+endsnippet
+
+snippet memail "EmailField" b
+${1:FIELDNAME} = models.EmailField($2)
+endsnippet
+
+snippet mfile "FileField" b
+${1:FIELDNAME} = models.FileField($2)
+endsnippet
+
+snippet mfilepath "FilePathField" b
+${1:FIELDNAME} = models.FilePathField($2)
+endsnippet
+
+snippet mfloat "FloatField" b
+${1:FIELDNAME} = models.FloatField($2)
+endsnippet
+
+snippet fk "ForeignKey" b
+${1:FIELDNAME} = models.ForeignKey($2)
+endsnippet
+
+snippet mip "IPAddressField" b
+${1:FIELDNAME} = models.IPAddressField($2)
+endsnippet
+
+snippet mimg "ImageField" b
+${1:FIELDNAME} = models.ImageField($2)
+endsnippet
+
+snippet mint "IntegerField" b
+${1:FIELDNAME} = models.IntegerField($2)
+endsnippet
+
+snippet m2m "ManyToManyField" b
+${1:FIELDNAME} = models.ManyToManyField($2)
+endsnippet
+
+snippet mnullbool "NullBooleanField" b
+${1:FIELDNAME} = models.NullBooleanField($2)
+endsnippet
+
+snippet o2o "OneToOneField" b
+${1:FIELDNAME} = models.OneToOneField($2)
+endsnippet
+
+snippet mphone "PhoneNumberField" b
+${1:FIELDNAME} = models.PhoneNumberField($2)
+endsnippet
+
+snippet mposint "PositiveIntegerField" b
+${1:FIELDNAME} = models.PositiveIntegerField($2)
+endsnippet
+
+snippet mpossmallint "PositiveSmallIntegerField" b
+${1:FIELDNAME} = models.PositiveSmallIntegerField($2)
+endsnippet
+
+snippet mslug "SlugField" b
+${1:FIELDNAME} = models.SlugField($2)
+endsnippet
+
+snippet msmallint "SmallIntegerField" b
+${1:FIELDNAME} = models.SmallIntegerField($2)
+endsnippet
+
+snippet mtext "TextField" b
+${1:FIELDNAME} = models.TextField($2)
+endsnippet
+
+snippet mtime "TimeField" b
+${1:FIELDNAME} = models.TimeField($2)
+endsnippet
+
+snippet murl "URLField" b
+${1:FIELDNAME} = models.URLField($2)
+endsnippet
+
+snippet musstate "USStateField" b
+${1:FIELDNAME} = models.USStateField($2)
+endsnippet
+
+snippet mxml "XMLField" b
+${1:FIELDNAME} = models.XMLField($2)
+endsnippet
+
+# VIEWS SNIPPETS
+
+snippet adminview "Model Admin View" b
+class $1Admin(admin.ModelAdmin):
+	'''
+		Admin View for $1
+	'''
+	list_display = ('$2',)
+	list_filter = ('$3',)
+	inlines = [
+		$4Inline,
+	]
+	raw_id_fields = ('$5',)
+	readonly_fields = ('$6',)
+	search_fields = ['$7']
+admin.site.register($1, $1Admin)
+endsnippet
+
+snippet createview "Generic Create View" b
+class ${1:MODEL_NAME}CreateView(CreateView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet deleteview "Generic Delete View" b
+class ${1:MODEL_NAME}DeleteView(DeleteView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet detailview "Generic Detail View" b
+class ${1:MODEL_NAME}DetailView(DetailView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet listview "Generic List View" b
+class ${1:MODEL_NAME}ListView(ListView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet stackedinline "Stacked Inline" b
+class $1Inline(admin.StackedInline):
+	'''
+	Stacked Inline View for $1
+	'''
+	model = ${2:$1}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = ($6,)
+endsnippet
+
+snippet tabularinline "Tabular Inline" b
+class $1Inline(admin.TabularInline):
+	'''
+	Tabular Inline View for $1
+	'''
+	model = ${2:$1}
+	min_num = ${3:3}
+	max_num = ${4:20}
+	extra = ${5:1}
+	raw_id_fields = ($6,)
+endsnippet
+
+snippet templateview "Generic Template View" b
+class ${1:CLASS_NAME}(TemplateView):
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet updateview "Generic Update View" b
+class ${1:MODEL_NAME}UpdateView(UpdateView):
+	model = ${1:MODEL_NAME}
+	template_name = "${2:TEMPLATE_NAME}"
+endsnippet
+
+snippet dispatch "Dispatch View method" b
+def dispatch(self, request, *args, **kwargs):
+	return super(${1:CLASS_NAME}, self).dispatch(request, *args, **kwargs)
+endsnippet
+
+snippet context "get_context_data view method" b
+def get_context_data(self, **kwargs):
+	kwargs['extra_context'] = ${1:'New Value'}
+	return super(${2:CLASS_NAME}, self).get_context_data(**kwargs)
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/eelixir.snippets b/vim/snippets/vim-snippets/UltiSnips/eelixir.snippets
new file mode 100644
index 0000000..72fb7ce
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/eelixir.snippets
@@ -0,0 +1,39 @@
+priority -50
+
+extends html
+
+snippet % "<% %>" w
+<% $0 %>
+endsnippet
+
+snippet = "<%= %>" w
+<%= $0 %>
+endsnippet
+
+snippet end "<% end %>" w
+<% end %>
+endsnippet
+
+snippet for
+<%= for ${1:item} <- ${2:$1s} ${3:@conn} do %>
+	$0
+<% end %>
+endsnippet
+
+snippet ft "form_tag" w
+<%= form_tag(${1:"${2:/users}"}, method: ${3::post}) %>
+	$0
+</form>
+endsnippet
+
+snippet lin "link" w
+<%= link ${1:"${2:Submit}"}, to: ${3:"${4:/users}"}, method: ${5::delete} %>
+endsnippet
+
+snippet ff "form_for" w
+<%= form_for @changeset, ${1:"${2:/users}"}, fn f -> %>
+		$0
+
+	<%= submit "Submit" %>
+<% end %>
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/erlang.snippets b/vim/snippets/vim-snippets/UltiSnips/erlang.snippets
new file mode 100644
index 0000000..f317685
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/erlang.snippets
@@ -0,0 +1,108 @@
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+priority -50
+
+snippet pat "Case:Receive:Try Clause"
+${1:pattern}${2: when ${3:guard}} ->
+	${4:body}
+endsnippet
+
+snippet beh "Behaviour Directive" b
+-behaviour(${1:behaviour}).
+endsnippet
+
+snippet case "Case Expression"
+case ${1:expression} of
+	${2:pattern}${3: when ${4:guard}} ->
+		${5:body}
+end
+endsnippet
+
+snippet def "Define Directive" b
+-define(${1:macro}${2: (${3:param})}, ${4:body}).
+endsnippet
+
+snippet exp "Export Directive" b
+-export([${1:function}/${2:arity}]).
+endsnippet
+
+snippet fun "Fun Expression"
+fun
+	(${1:pattern})${2: when ${3:guard}} ->
+		${4:body}
+end
+endsnippet
+
+snippet fu "Function"
+${1:function}(${2:param})${3: when ${4:guard}} ->
+	${5:body}
+endsnippet
+
+snippet if "If Expression"
+if
+	${1:guard} ->
+		${2:body}
+end
+endsnippet
+
+snippet ifdef "Ifdef Directive" b
+-ifdef(${1:macro}).
+endsnippet
+
+snippet ifndef "Ifndef Directive" b
+-ifndef(${1:macro}).
+endsnippet
+
+snippet imp "Import Directive" b
+-import(${1:module}, [${2:function}/${3:arity}]).
+endsnippet
+
+snippet inc "Include Directive" b
+-include("${1:file}").
+endsnippet
+
+snippet mod "Module Directive" b
+-module(${1:`!p snip.rv = snip.basename or "module"`}).
+endsnippet
+
+snippet rcv "Receive Expression"
+receive
+${1:	${2:pattern}${3: when ${4:guard}} ->
+		${5:body}}
+${6:after
+	${7:expression} ->
+		${8:body}}
+end
+endsnippet
+
+snippet rec "Record Directive" b
+-record(${1:record}, {${2:field}${3: = ${4:value}}}).
+endsnippet
+
+snippet try "Try Expression"
+try${1: ${2:expression}${3: of
+	${4:pattern}${5: when ${6:guard}} ->
+		${7:body}}}
+${8:catch
+	${9:pattern}${10: when ${11:guard}} ->
+		${12:body}}
+${13:after
+	${14:body}}
+end
+endsnippet
+
+snippet undef "Undef Directive" b
+-undef(${1:macro}).
+endsnippet
+
+snippet || "List Comprehension"
+[${1:X} || ${2:X} <- ${3:List}${4:, gen}]
+endsnippet
+
+snippet gen "Generator Expression"
+${1:X} <- ${2:List}${3:, gen}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/eruby.snippets b/vim/snippets/vim-snippets/UltiSnips/eruby.snippets
new file mode 100644
index 0000000..ef93be4
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/eruby.snippets
@@ -0,0 +1,237 @@
+extends html
+
+priority -50
+
+# TextMate added these variables to cope with changes in ERB handling
+# in different versions of Rails -- for instance, Rails 3 automatically
+# strips whitespace so that it's no longer necessary to use a form like
+# <% end -%>, but if you're still maintaining Rails 2 projects, you
+# can't omit the minus sign and get the same behavior.
+#
+# The following regex replace substitutes the function below for the
+# TextMate variable references after the snippets are converted:
+#
+#   /\v\$\{(TM_RAILS_TEMPLATE_([^_]+)_RUBY_([^_\s]+))\}/`!p textmate_var('\1', snip)`/g
+#
+global !p
+def textmate_var(var, snip):
+	lookup = dict(
+		TM_RAILS_TEMPLATE_START_RUBY_EXPR = snip.opt('g:tm_rails_template_start_ruby_expr', '<%= '),
+		TM_RAILS_TEMPLATE_END_RUBY_EXPR = snip.opt('g:tm_rails_template_end_ruby_expr', ' %>'),
+		TM_RAILS_TEMPLATE_START_RUBY_INLINE = snip.opt('g:tm_rails_template_start_ruby_inline', '<% '),
+		TM_RAILS_TEMPLATE_END_RUBY_INLINE = snip.opt('g:tm_rails_template_end_ruby_inline', ' %>'),
+		TM_RAILS_TEMPLATE_END_RUBY_BLOCK = '<% end %>'
+	)
+	snip.rv = lookup[var]
+	return
+endglobal
+
+
+snippet % "<% $0 %>" i
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`$0`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+endsnippet
+
+snippet = "<%= $0 %>" i
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`$0`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+###########################################################################
+#            GENERATED FROM get_tm_snippets.py + REGEX REPLACE            #
+###########################################################################
+
+snippet fi "<%= Fixtures.identify(:symbol) %>"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`Fixtures.identify(:${1:name})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`$0
+endsnippet
+
+snippet ft "form_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`form_tag(${1::action => '${2:update}'}${3:, ${4:${5:class} => '${6:form}'\}}}) do`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+	$0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet ffs "form_for submit 2" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`${1:f}.submit '${2:Submit}'${3:, :disable_with => '${4:$2ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f_fields_for (nff)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_INLINE', snip)`f.fields_for :${1:attribute} do |${2:f}|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_INLINE', snip)`
+	$0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet f. "f.checkbox" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.check_box :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.file_field" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.file_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.hidden_field" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.hidden_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.label" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.label :${1:attribute}${2:, "${3:${1/[[:alpha:]]+|(_)/(?1: :\u$0)/g}}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.password_field" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.password_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.radio_button" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.radio_button :${1:attribute}, :${2:tag_value}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.submit" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.submit "${1:Submit}"${2:, :disable_with => '${3:$1ing...}'}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.text_area" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_area :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet f. "f.text_field" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`f.text_field :${1:attribute}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet ffe "form_for with errors" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`error_messages_for :${1:model}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${2:$1} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+	$0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet ff "form_for" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`form_for @${1:model} do |f|`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+	$0
+`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_BLOCK', snip)`
+endsnippet
+
+snippet ist "image_submit_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_submit_tag("${1:agree.png}"${2:${3:, :id => "${4:${1/^(\w+)(\.\w*)?$/$1/}}"}${5:, :name => "${6:${1/^(\w+)(\.\w*)?$/$1/}}"}${7:, :class => "${8:${1/^(\w+)(\.\w*)?$/$1/}-button}"}${9:, :disabled => ${10:false}}})`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet it "image_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`image_tag "$1${2:.png}"${3:${4:, :title => "${5:title}"}${6:, :class => "${7:class}"}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet layout "layout"
+layout "${1:template_name}"${2:${3:, :only => ${4:[:${5:action}, :${6:action}]}}${7:, :except => ${8:[:${9:action}, :${10:action}]}}}
+endsnippet
+
+snippet jit "javascript_include_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`javascript_include_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lt "link_to (name, dest)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", ${2:dest}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lia "link_to (action)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet liai "link_to (action, id)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :action => "${2:edit}", :id => ${3:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lic "link_to (controller)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lica "link_to (controller, action)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:index}"`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet licai "link_to (controller, action, id)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to "${1:link text...}", :controller => "${2:items}", :action => "${3:edit}", :id => ${4:@item}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet linpp "link_to (nested path plural)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${10:parent}_${11:child}_path(${12:@}${13:$10})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet linp "link_to (nested path)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lipp "link_to (path plural)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${4:model}s_path}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lip "link_to (path)" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:"${2:link text...}"}, ${3:${12:model}_path(${13:@}${14:$12})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet lim "link_to model" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to ${1:model}.${2:name}, ${3:${4:$1}_path(${14:$1})}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet hide "page.hide (*ids)"
+page.hide ${1:"${2:id(s)}"}
+endsnippet
+
+snippet ins "page.insert_html (position, id, partial)"
+page.insert_html :${1:top}, ${2:"${3:id}"}, :${4:partial => "${5:template}"}
+endsnippet
+
+snippet rep "page.replace (id, partial)"
+page.replace ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+endsnippet
+
+snippet reph "page.replace_html (id, partial)"
+page.replace_html ${1:"${2:id}"}, :${3:partial => "${4:template}"}
+endsnippet
+
+snippet show "page.show (*ids)"
+page.show ${1:"${2:id(s)}"}
+endsnippet
+
+snippet tog "page.toggle (*ids)"
+page.toggle ${1:"${2:id(s)}"}
+endsnippet
+
+snippet vis "page.visual_effect (effect, id)"
+page.visual_effect :${1:toggle_slide}, ${2:"${3:DOM ID}"}
+endsnippet
+
+snippet rp "render (partial) (rp)"
+render :partial => "${1:item}"
+endsnippet
+
+snippet rpc "render (partial,collection) (rpc)"
+render :partial => "${1:item}", :collection => ${2:@$1s}
+endsnippet
+
+snippet rpl "render (partial,locals) (rpl)"
+render :partial => "${1:item}", :locals => { :${2:$1} => ${3:@$1}$0 }
+endsnippet
+
+snippet rpo "render (partial,object) (rpo)"
+render :partial => "${1:item}", :object => ${2:@$1}
+endsnippet
+
+snippet rps "render (partial,status) (rps)"
+render :partial => "${1:item}", :status => ${2:500}
+endsnippet
+
+snippet slt "stylesheet_link_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`stylesheet_link_tag ${1::all}${2:, :cache => ${3:true}}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet st "submit_tag" w
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`submit_tag "${1:Save changes}"${2:, :id => "${3:submit}"}${4:, :name => "${5:$3}"}${6:, :class => "${7:form_$3}"}${8:, :disabled => ${9:false}}${10:, :disable_with => "${11:Please wait...}"}`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+snippet else "else (ERB)"
+<% else %>
+	$0
+endsnippet
+
+snippet lf "link_to_function"
+`!p textmate_var('TM_RAILS_TEMPLATE_START_RUBY_EXPR', snip)`link_to_function ${1:"${2:Greeting}"}, "${3:alert('Hello world!')}"$4`!p textmate_var('TM_RAILS_TEMPLATE_END_RUBY_EXPR', snip)`
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/go.snippets b/vim/snippets/vim-snippets/UltiSnips/go.snippets
new file mode 100644
index 0000000..35cf909
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/go.snippets
@@ -0,0 +1,115 @@
+# Snippets for Go
+
+priority -50
+
+# when to abbriviate and when not?
+# b doesn't work here, because it ignores whitespace
+# optional local name?
+snippet /^import/ "Import declaration" r
+import (
+	"${1:package}"
+)
+endsnippet
+
+snippet /^package/ "Package declaration" r
+// Package $1 provides ...
+package ${1:main}
+endsnippet
+
+# Mostly converted from: https://github.com/AlanQuatermain/go-tmbundle
+snippet /^cons/ "Constants declaration" r
+const (
+	${1:constant}${2/(.+)/ /}${2:type} = ${0:value}
+)
+endsnippet
+
+snippet /^con/ "Constant declaration" r
+const ${1:name}${2/(.+)/ /}${2:type} = ${0:value}
+endsnippet
+
+snippet iota "Iota constant generator" b
+const (
+	${1:constant}${2/(.+)/ /}${2:type} = iota
+)
+endsnippet
+
+snippet struct "Struct declaration" b
+type ${1:Struct} struct {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet interface "Interface declaration" b
+type ${1:Interface} interface {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet if "If statement" b
+if ${1:condition}${1/(.+)/ /}{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet switch "Switch statement" b
+switch ${1:expression}${1/(.+)/ /}{
+case$0
+}
+endsnippet
+
+# functions
+snippet /^main/ "Main function" r
+func main() {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet /^meth/ "Method" r
+func (${1:receiver} ${2:type}) ${3:name}(${4:params})${5/(.+)/ /}${5:type} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet func "Function" b
+func ${1:name}(${2:params})${3/(.+)/ /}${3:type} {
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet funch "HTTP handler" b
+func ${1:handler}(${2:w} http.ResponseWriter, ${3:r} *http.Request) {
+	${0:${VISUAL}}
+}
+endsnippet
+
+# types and variables
+snippet map "Map type" b
+map[${1:keytype}]${2:valtype}
+endsnippet
+
+snippet : "Variable declaration :=" b
+${1:name} := ${0:value}
+endsnippet
+
+snippet var "Variable declaration" b
+var ${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value}}
+endsnippet
+
+snippet vars "Variables declaration" b
+var (
+	${1:name}${2/(.+)/ /}${2:type}${3: = ${0:value} }
+)
+endsnippet
+
+snippet json "JSON field"
+\`json:"${1:displayName}"\`
+endsnippet
+
+# vim:ft=snippets:
+
+# error handling
+snippet err "Basic error handling" b
+if err != nil {
+	log.${1:Fatal}(err)
+}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/help.snippets b/vim/snippets/vim-snippets/UltiSnips/help.snippets
new file mode 100644
index 0000000..b07a7de
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/help.snippets
@@ -0,0 +1,37 @@
+# Snippets for VIM Help Files
+
+priority -50
+
+global !p
+def sec_title(snip, t):
+	file_start = snip.fn.split('.')[0]
+	sec_name = t[1].strip("1234567890. ").lower().replace(' ', '-')
+	return ("*%s-%s*" % (file_start, sec_name)).rjust(78-len(t[1]))
+endglobal
+
+snippet sec "Section marker" b
+==============================================================================
+${1:SECTION}`!p snip.rv = sec_title(snip, t)`
+
+$0
+endsnippet
+
+snippet ssec "Sub section marker" b
+${1:Subsection}`!p snip.rv = sec_title(snip, t)
+snip += "-"*len(t[1])`
+
+$0
+endsnippet
+
+snippet sssec "Subsub Section marker" b
+${1:SubSubsection}:`!p snip.rv = sec_title(snip, t)`
+
+$0
+endsnippet
+
+# For vim help, follow the same settings as the official docs.
+snippet modeline "Vim help modeline"
+ `!v 'vim'`:tw=78:ts=8:ft=help:norl:
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/html.snippets b/vim/snippets/vim-snippets/UltiSnips/html.snippets
new file mode 100644
index 0000000..0480277
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/html.snippets
@@ -0,0 +1,530 @@
+priority -50
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+global !p
+def x(snip):
+	if snip.ft.startswith("x"):
+		snip.rv = '/'
+	else:
+		snip.rv = ""
+endglobal
+
+snippet doctype "HTML - 5.0 (doctype)" b
+<!DOCTYPE html>
+
+endsnippet
+
+#############
+# Shortcuts #
+#############
+snippet down "Down (down)"
+&#x2193;
+endsnippet
+
+snippet enter "Enter (enter)"
+&#x2305;
+endsnippet
+
+snippet escape "Escape (escape)"
+&#x238B;
+endsnippet
+
+snippet left "Left (left)"
+&#x2190;
+endsnippet
+
+snippet return "Return (return)"
+&#x21A9;
+endsnippet
+
+snippet right "Right (right)"
+&#x2192;
+endsnippet
+
+snippet shift "Shift (shift)"
+&#x21E7;
+endsnippet
+
+snippet tab "Tab (tab)"
+&#x21E5;
+endsnippet
+
+snippet up "Up (up)"
+&#x2191;
+endsnippet
+
+#############
+# HTML TAGS #
+#############
+snippet a "Link" w
+<a href="${1:http://www.${2:url.com}}"${3: target="_blank"}>${4:Anchor Text}</a>
+endsnippet
+
+snippet abbr "<abbr>" w
+<abbr title="$2">$1</abbr>
+endsnippet
+
+snippet access "accesskey global attribute"
+accesskey="$1"
+endsnippet
+
+snippet address "<address>" w
+<address>$1</address>
+endsnippet
+
+snippet article "<article>"
+<article>
+	${1:article content}
+</article>
+endsnippet
+
+snippet aside "<aside>"
+<aside>
+	${1:aside content}
+</aside>
+endsnippet
+
+snippet b "<b>" w
+<b>$1</b>
+endsnippet
+
+snippet base "HTML <base>" w
+<base href="$1"${2: target="$3"}`!p x(snip)`>
+endsnippet
+
+snippet blockquote "<blockquote>"
+<blockquote>$1</blockquote>
+endsnippet
+
+snippet body "<body>"
+<body>
+	${0:${VISUAL}}
+</body>
+endsnippet
+
+snippet br "<br>" w
+<br>$1</br>
+endsnippet
+
+snippet button "<button>"
+<button>$1</button>
+endsnippet
+
+snippet caption "<caption>"
+<caption>$1</caption>
+endsnippet
+
+snippet cite "<cite>" w
+<cite>$1</cite>
+endsnippet
+
+snippet class "class global attribute"
+class="$1"
+endsnippet
+
+snippet code "<code>" w
+<code>$1</code>
+endsnippet
+
+snippet data "<data>"
+<data value="$2">$1</data>
+endsnippet
+
+snippet datalist "<datalist>"
+<datalist id="$1" name="$2">
+	opt$3
+</datalist>
+endsnippet
+
+snippet dd "<dd>"
+<dd>$1</dd>
+endsnippet
+
+snippet del "<del>" w
+<del cite="$2" datetime="${3:`date '+%Y-%m-%dT%H:%M:%S%:z'`}">$1</del>
+endsnippet
+
+snippet dfn "<dfn>" w
+<dfn>$1</dfn>
+endsnippet
+
+snippet div "<div>" w
+<div>
+	${0:${VISUAL}}
+</div>
+endsnippet
+
+snippet div# "<div> with ID & class" w
+<div`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`>
+	${0:${VISUAL}}
+</div>
+endsnippet
+
+snippet div. "<div> with class" w
+<div`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`>
+	${0:${VISUAL}}
+</div>
+endsnippet
+
+snippet dl "<dl>"
+<dl>
+	${1:Definition list}
+</dl>
+endsnippet
+
+snippet dt "<dt>"
+<dt>$1</dt>
+endsnippet
+
+snippet em "<em>" w
+<em>$1</em>
+endsnippet
+
+snippet fieldset "Fieldset" w
+<fieldset id="${1/[\w\d]+|( )/(?1:_:\L$0\E)/g}" ${2:class="${3:}"}>
+	<legend>$1</legend>
+	${0:${VISUAL}}
+</fieldset>
+endsnippet
+
+snippet fig "<figure>"
+<figure>
+$1
+<figcaption>$2</figcaption>
+</figure>
+endsnippet
+
+snippet figcaption "<figcaption>"
+<figcaption>$1</figcaption>
+endsnippet
+
+snippet footer "<footer>"
+<footer>
+	${1:footer content}
+</footer>
+endsnippet
+
+snippet form "HTML <form>" w
+<form action="${1:`!p
+snip.rv = (snip.basename or 'unnamed') + '_submit'
+`}" method="${2:get}" accept-charset="utf-8">
+	${0:${VISUAL}}
+</form>
+endsnippet
+
+snippet h1 "HTML <h1>" w
+<h1>${0:${VISUAL}}</h1>
+endsnippet
+
+snippet h2 "HTML <h2>" w
+<h2>${0:${VISUAL}}</h2>
+endsnippet
+
+snippet h3 "HTML <h3>" w
+<h3>${0:${VISUAL}}</h3>
+endsnippet
+
+snippet h4 "HTML <h4>" w
+<h4>${0:${VISUAL}}</h4>
+endsnippet
+
+snippet h5 "HTML <h5>" w
+<h5>${0:${VISUAL}}</h5>
+endsnippet
+
+snippet h6 "HTML <h6>" w
+<h6>${0:${VISUAL}}</h6>
+endsnippet
+
+snippet head "HTML <head>"
+<head>
+	<meta charset="utf-8">
+	<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
+	${0:${VISUAL}}
+</head>
+endsnippet
+
+snippet header "<header>"
+<header>
+	${1:header content}
+</header>
+endsnippet
+
+snippet hr "<hr>"
+<hr>
+endsnippet
+
+snippet html "HTML basic structure" b
+	<!DOCTYPE html>
+	<html>
+		<head>
+			<meta charset="UTF-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${1:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+endsnippet
+
+snippet htmll "HTML basic structure with the lang attribute" b
+	<!DOCTYPE html>
+	<html lang="${1:es}">
+		<head>
+			<meta charset="UTF-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${2:`!p snip.rv = snip.basename.replace('-', ' ').capitalize()`}</title>
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+endsnippet
+
+snippet i "<i>" w
+<i>$1</i>
+endsnippet
+
+snippet id "id global attribute"
+id="$1"
+endsnippet
+
+snippet img "<img>"
+<img src="$1" alt="$2">
+endsnippet
+
+snippet input "Input with Label" w
+<label for="${2:${1/[[:alpha:]]+|( )/(?1:_:\L$0)/g}}">$1</label><input type="${3:text/submit/hidden/button}" name="${4:$2}" value="$5"${6: id="${7:$2}"}`!p x(snip)`>
+endsnippet
+
+snippet input "HTML <input>" w
+<input type="${1:text/submit/hidden/button}" name="${2:some_name}" value="$3"${4: id="${5:$2}"}`!p x(snip)`>
+endsnippet
+
+snippet ins "<ins>" w
+<ins cite="$2" datetime="${3:`date '+%Y-%m-%dT%H:%M:%S%:z'`}">$1</ins>
+endsnippet
+
+snippet kbd "<kbd>" w
+<kbd>$1</kbd>
+endsnippet
+
+snippet label "<label>"
+<label>$1</label>
+endsnippet
+
+snippet legend "<legend>"
+<legend>$1</leyend>
+endsnippet
+
+snippet li "list item" w
+<li>${0:${VISUAL}}</li>
+endsnippet
+
+snippet link "HTML <link>" w
+<link rel="${1:stylesheet}" href="${2:/css/master.css}" type="text/css" media="${3:screen}" title="${4:no title}" charset="${5:utf-8}"`!p x(snip)`>
+endsnippet
+
+snippet mailto "HTML <a mailto: >" w
+<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${3:email me}</a>
+endsnippet
+
+snippet main "<main>"
+<main>
+	${1:main content}
+</main>
+endsnippet
+
+snippet mark "<mark>"
+<mark>$1</mark>
+endsnippet
+
+snippet meta "HTML <meta>" w
+<meta name="${1:name}" content="${2:content}"`!p x(snip)`>
+endsnippet
+
+snippet meter "<meter>"
+<meter>$1</meter>
+endsnippet
+
+snippet nav "<nav>"
+<nav>
+	${1:navigation links}
+</nav>
+endsnippet
+
+snippet noscript "<noscript>"
+<noscript>$1</noscript>
+endsnippet
+
+snippet ol "<ol>"
+<ol>
+	<li>$1</li>
+</ol>
+endsnippet
+
+snippet optgroup "<optgroup>"
+<optgroup label="$1">
+	opt$2
+</optgroup>
+endsnippet
+
+snippet output "<output>"
+<output for="$1" name="$2">$3</output>
+endsnippet
+
+snippet option "Option" w
+<option${1: value="${2:option}"}>${3:$2}</option>
+endsnippet
+
+snippet p "paragraph" w
+<p>${0:${VISUAL}}</p>
+endsnippet
+
+snippet picture "<picture>"
+<picture>
+	${1:image sources}
+</picture>
+endsnippet
+
+snippet pre "<pre>"
+<pre>$1</pre>
+endsnippet
+
+snippet progress "<progress>"
+<progress>$1</progress>
+endsnippet
+
+snippet q "<q>" w
+<q>$1</q>
+endsnippet
+
+snippet s "<s>" w
+<s>$1</s>
+endsnippet
+
+snippet samp "<samp>" w
+<samp>$1</samp>
+endsnippet
+
+snippet script "HTML <script>" w
+<script charset="utf-8">
+	${0:${VISUAL}}
+</script>
+endsnippet
+
+snippet scriptsrc "HTML <script src...>" w
+<script src="$1" charset="${3:utf-8}"></script>
+endsnippet
+
+snippet select "Select Box" w
+<select name="${1:some_name}" id="${2:$1}"${3:${4: multiple}${5: size="${6:1}"}}>
+	${0:${VISUAL}}
+</select>
+endsnippet
+
+snippet small "<small>" w
+<small>$1</small>
+endsnippet
+
+snippet span "<span>" w
+<span> ${0:${VISUAL}} </span>
+endsnippet
+
+snippet span# "<span> with ID & class" w
+<span`!p snip.rv=' id="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""``!p snip.rv=' class="' if t[2] else ""`${2:name}`!p snip.rv = '"' if t[2] else ""`> ${0:${VISUAL}} </span>
+endsnippet
+
+snippet span. "<span> with class" w
+<span`!p snip.rv=' class="' if t[1] else ""`${1:name}`!p snip.rv = '"' if t[1] else ""`> ${0:${VISUAL}} </span>
+endsnippet
+
+snippet strong "<strong>" w
+<strong>$1</strong>
+endsnippet
+
+snippet style "HTML <style>" w
+<style type="text/css" media="screen">
+	${0:${VISUAL}}
+</style>
+endsnippet
+
+snippet sub "<sub>" w
+<sub>$1</sub>
+endsnippet
+
+snippet sup "<sup>" w
+<sup>$1</sup>
+endsnippet
+
+snippet table "HTML <table>" w
+<table>
+	${0:${VISUAL}}
+</table>
+endsnippet
+
+snippet tbody "<tbody>"
+<tbody>$1</tbody>
+endsnippet
+
+snippet td "table cell" w
+<td>${0:${VISUAL}}</td>
+endsnippet
+
+snippet template "<template>"
+<template id="$1">
+$2
+</template>
+endsnippet
+
+snippet textarea "HTML <textarea>" w
+<textarea name="${1:Name}" rows="${2:8}" cols="${3:40}">$0</textarea>
+endsnippet
+
+snippet tfoot "<tfoot>"
+<tfoot>$1</tfoot>
+endsnippet
+
+snippet th "table header" w
+<th>${0:${VISUAL}}</th>
+endsnippet
+
+snippet thead "<thead>"
+<thead>$1</thead>
+endsnippet
+
+snippet time "<time>" w
+<time datetime="$2">$1</time>
+endsnippet
+
+snippet title "HTML <title>" w
+<title>${1:`!p snip.rv = snip.basename or "Page Title"`}</title>
+endsnippet
+
+snippet tr "table row" w
+<tr>${0:${VISUAL}}</tr>
+endsnippet
+
+snippet ul "unordered list" w
+<ul>
+	${0:${VISUAL}}
+</ul>
+endsnippet
+
+snippet var "<var>" w
+<var>$1</var>
+endsnippet
+
+snippet viewport "Responsive viewport meta" w
+<meta name="viewport" content="width=device-width, initial-scale=1">
+endsnippet
+
+snippet wbr "<wbr>" w
+<wbr>$1</wbr>
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/html_minimal.snippets b/vim/snippets/vim-snippets/UltiSnips/html_minimal.snippets
new file mode 100644
index 0000000..5fb7522
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/html_minimal.snippets
@@ -0,0 +1,33 @@
+# more can be found in snippets/html_minimal.snippets
+# these UltiSnips override snippets because nested placeholders are being used
+
+priority -50
+
+snippet id
+id="$1"$2
+endsnippet
+
+snippet idn
+id="$1" name="${2:$1}"
+endsnippet
+
+snippet label_and_input
+<label for="${2:$1}">$1</label>
+<input type="${3:text}" name="${4:$2}"${5: id="${6:$2}"} value="$7" />$8
+endsnippet
+
+snippet input
+<input type="${1:text}" value="$2" name="$3"${4: id="${5:$3}"}/>$7
+endsnippet
+
+snippet submit
+<input type="submit" value="$2" $3/>$7
+endsnippet
+
+snippet textarea
+<textarea name="$2"${3: id="$4"}>$5</textarea>
+endsnippet
+
+snippet img
+<img src="$1"${2: alt="$3"}/>
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/htmldjango.snippets b/vim/snippets/vim-snippets/UltiSnips/htmldjango.snippets
new file mode 100644
index 0000000..2ef004e
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/htmldjango.snippets
@@ -0,0 +1,299 @@
+priority -50
+
+extends html
+
+# Generic Tags
+snippet % "" bi
+{% $1 %}$2
+endsnippet
+
+snippet %% "" bi
+{% ${1:tag_name} %}
+	$2
+{% end$1 %}
+endsnippet
+
+snippet { "" bi
+{{ $1 }}$2
+endsnippet
+
+# Template Tags
+
+snippet autoescape "" bi
+{% autoescape ${1:off} %}
+	$2
+{% endautoescape %}
+endsnippet
+
+snippet block "" bi
+{% block $1 %}
+	$2
+{% endblock $1 %}
+endsnippet
+
+snippet # "" bi
+{# ${1:comment} #}
+endsnippet
+
+snippet comment "" bi
+{% comment %}
+	$1
+{% endcomment %}
+endsnippet
+
+snippet cycle "" bi
+{% cycle ${1:val1} ${2:val2} ${3:as $4} %}
+endsnippet
+
+snippet debug "" bi
+{% debug %}
+endsnippet
+
+snippet extends "" bi
+{% extends "${1:base.html}" %}
+endsnippet
+
+snippet filter "" bi
+{% filter $1 %}
+	$2
+{% endfilter %}
+endsnippet
+
+snippet firstof "" bi
+{% firstof $1 %}
+endsnippet
+
+snippet for "" bi
+{% for $1 in $2 %}
+	$3
+{% endfor %}
+endsnippet
+
+snippet empty "" bi
+{% empty %}
+	$1
+endsnippet
+
+snippet if "" bi
+{% if $1 %}
+	$2
+{% endif %}
+endsnippet
+
+snippet iif "" bi
+{% if $1 %}$2{% endif %}
+endsnippet
+
+snippet ielse "" bi
+{% else %}$1
+endsnippet
+
+snippet else "" bi
+{% else %}
+	$1
+endsnippet
+
+snippet ielif "" bi
+{% elif %}$1
+endsnippet
+
+snippet elif "" bi
+{% elif %}
+	$1
+endsnippet
+
+snippet ifchanged "" bi
+{% ifchanged %}$1{% endifchanged %}
+endsnippet
+
+snippet ifequal "" bi
+{% ifequal $1 $2 %}
+	$3
+{% endifequal %}
+endsnippet
+
+snippet ifnotequal "" bi
+{% ifnotequal $1 $2 %}
+	$3
+{% endifnotequal %}
+endsnippet
+
+snippet include "" bi
+{% include "$1" %}
+endsnippet
+
+snippet load "" bi
+{% load $1 %}
+endsnippet
+
+snippet now "" bi
+{% now "${1:jS F Y H:i}" %}
+endsnippet
+
+snippet regroup "" bi
+{% regroup $1 by $2 as $3 %}
+endsnippet
+
+snippet spaceless "" bi
+{% spaceless %}$1{% endspaceless %}
+endsnippet
+
+snippet ssi "" bi
+{% ssi $1 %}
+endsnippet
+
+snippet trans "" bi
+{% trans "${1:string}" %}
+endsnippet
+
+snippet url "" bi
+{% url $1 as $2 %}
+endsnippet
+
+snippet widthratio "" bi
+{% widthratio ${1:this_value} ${2:max_value} ${3:100} %}
+endsnippet
+
+snippet with "" bi
+{% with $1 as $2 %}
+	${VISUAL}
+{% endwith %}
+endsnippet
+
+snippet verbatim "" bi
+{% verbatim %}
+	${VISUAL}
+{% endverbatim %}
+endsnippet
+
+snippet super "" bi
+{{ block.super }}
+endsnippet
+
+snippet staticu "" bi
+{{ STATIC_URL }}
+endsnippet
+
+snippet static "" bi
+{% static "${VISUAL}" %}
+endsnippet
+
+snippet mediau "" bi
+{{ MEDIA_URL }}
+endsnippet
+
+snippet iblock "" bi
+{% block ${1:blockname} %}${VISUAL}{% endblock $1 %}
+endsnippet
+
+snippet csrf "" bi
+{% csrf_token %}
+endsnippet
+
+snippet blocktrans "" bi
+{% blocktrans %}
+    ${VISUAL}
+{% endblocktrans %}
+endsnippet
+
+snippet lorem "" bi
+{% lorem $1 %}
+endsnippet
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add "" bi
+add:"$1"
+endsnippet
+
+snippet center "" bi
+center:"$1"
+endsnippet
+
+snippet cut "" bi
+cut:"$1"
+endsnippet
+
+snippet date "" bi
+date:"$1"
+endsnippet
+
+snippet default "" bi
+default:"$1"
+endsnippet
+
+snippet defaultifnone "" bi
+default_if_none:"$1"
+endsnippet
+
+snippet dictsort "" bi
+dictsort:"$1"
+endsnippet
+
+snippet dictsortrev "" bi
+dictsortreversed:"$1"
+endsnippet
+
+snippet divisibleby "" bi
+divisibleby:"$1"
+endsnippet
+
+snippet floatformat "" bi
+floatformat:"$1"
+endsnippet
+
+snippet getdigit "" bi
+get_digit:"$1"
+endsnippet
+
+snippet join "" bi
+join:"$1"
+endsnippet
+
+snippet lengthis "" bi
+length_is:"$1"
+endsnippet
+
+snippet pluralize "" bi
+pluralize:"$1"
+endsnippet
+
+snippet removetags "" bi
+removetags:"$1"
+endsnippet
+
+snippet slice "" bi
+slice:"$1"
+endsnippet
+
+snippet stringformat "" bi
+stringformat:"$1"
+endsnippet
+
+snippet time "" bi
+time:"$1"
+endsnippet
+
+snippet truncatewords "" bi
+truncatewords:$1
+endsnippet
+
+snippet truncatewordshtml "" bi
+truncatewords_html:$1
+endsnippet
+
+snippet urlizetrunc "" bi
+urlizetrunc:$1
+endsnippet
+
+snippet wordwrap "" bi
+wordwrap:$1
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/htmljinja.snippets b/vim/snippets/vim-snippets/UltiSnips/htmljinja.snippets
new file mode 100644
index 0000000..fa3b3c2
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/htmljinja.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html, jinja2
diff --git a/vim/snippets/vim-snippets/UltiSnips/java.snippets b/vim/snippets/vim-snippets/UltiSnips/java.snippets
new file mode 100644
index 0000000..55883a3
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/java.snippets
@@ -0,0 +1,435 @@
+priority -50
+
+# Many of the snippets here use a global option called
+# "g:ultisnips_java_brace_style" which, if set to "nl" will put a newline
+# before '{' braces.
+# Setting "g:ultisnips_java_junit" will change how the test method snippet
+# looks, it is defaulted to junit4, setting this option to 3 will remove the
+# @Test annotation from the method
+
+global !p
+def junit(snip):
+	if snip.opt("g:ultisnips_java_junit", "") == "3":
+		snip += ""
+	else:
+		snip.rv += "@Test\n\t"
+
+def nl(snip):
+	if snip.opt("g:ultisnips_java_brace_style", "") == "nl":
+		snip += ""
+	else:
+		snip.rv += " "
+def getArgs(group):
+	import re
+	word = re.compile('[a-zA-Z0-9><.]+ \w+')
+	return [i.split(" ") for i in word.findall(group) ]
+
+def camel(word):
+	if not word: return ''
+	return word[0].upper() + word[1:]
+
+def mixedCase(word):
+	if not word: return ''
+	return word[0].lower() + word[1:]
+
+endglobal
+
+snippet sleep "try sleep catch" b
+try {
+	Thread.sleep(${1:1000});
+} catch (InterruptedException e){
+	e.printStackTrace();
+}
+endsnippet
+
+snippet /i|n/ "new primitive or int" br
+${1:int} ${2:i} = ${3:1};
+$0
+endsnippet
+
+snippet /o|v/ "new Object or variable" br
+${1:Object} ${2:var} = new $1($3);
+endsnippet
+
+snippet f "field" b
+${1:private} ${2:String} ${3:`!p snip.rv = t[2].lower()`};
+endsnippet
+
+snippet ab "abstract" b
+abstract $0
+endsnippet
+
+snippet as "assert" b
+assert ${1:test}${2/(.+)/(?1: \: ")/}${2:Failure message}${2/(.+)/(?1:")/};
+endsnippet
+
+snippet at "assert true" b
+assertTrue(${1:actual});
+endsnippet
+
+snippet af "assert false" b
+assertFalse(${1:actual});
+endsnippet
+
+snippet ae "assert equals" b
+assertEquals(${1:expected}, ${2:actual});
+endsnippet
+
+snippet br "break"
+break;
+
+endsnippet
+
+snippet cs "case" b
+case $1:
+	$2
+$0
+endsnippet
+
+snippet ca "catch" b
+catch (${1:Exception} ${2:e})`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet cle "class extends" b
+public class ${1:`!p
+snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }${4:implements ${5:Interface} }{
+	$0
+}
+endsnippet
+
+snippet clc "class with constructor, fields, setter and getters" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+`!p
+args = getArgs(t[1])
+if len(args) == 0: snip.rv = ""
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+	public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis." + i[1] + " = " + i[1] + ";"
+if len(args) == 0:
+	snip.rv += "\n"`
+	}$0
+`!p
+args = getArgs(t[1])
+if len(args) == 0: snip.rv = ""
+for i in args:
+	snip.rv += "\n\tpublic void set" + camel(i[1]) + "(" + i[0] + " " + i[1] + ") {\n" + "\
+	\tthis." + i[1] + " = " + i[1] + ";\n\t}\n"
+
+	snip.rv += "\n\tpublic " + i[0] + " get" + camel(i[1]) + "() {\n\
+	\treturn " + i[1] + ";\n\t}\n"
+`
+}
+endsnippet
+
+snippet clc "class with constructor, with field names" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+	public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
+if len(args) == 0:
+	snip.rv += "\n"`
+	}
+}
+endsnippet
+
+snippet clc "class and constructor" b
+public class `!p
+snip.rv = snip.basename or "untitled"` {
+
+	public `!p snip.rv = snip.basename or "untitled"`($2) {
+		$0
+	}
+}
+endsnippet
+
+snippet cl "class" b
+public class ${1:`!p
+snip.rv = snip.basename or "untitled"`} {
+	$0
+}
+endsnippet
+
+snippet cos "constant string" b
+public static final String ${1:var} = "$2";$0
+endsnippet
+
+snippet co "constant" b
+public static final ${1:String} ${2:var} = $3;$0
+endsnippet
+
+snippet de "default" b
+default:
+	$0
+endsnippet
+
+snippet elif "else if"
+else if ($1)`!p nl(snip)`{
+	$0${VISUAL}
+}
+endsnippet
+
+snippet el "else" w
+else`!p nl(snip)`{
+	$0${VISUAL}
+}
+endsnippet
+
+snippet fi "final" b
+final $0
+endsnippet
+
+snippet fore "for (each)" b
+for ($1 : $2)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet fori "for" b
+for (int ${1:i} = 0; $1 < ${2:10}; $1++)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet for "for" b
+for ($1; $2; $3)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet if "if" b
+if ($1)`!p nl(snip)`{
+	$0${VISUAL}
+}
+endsnippet
+
+snippet imt "import junit_framework_TestCase;"  b
+import junit.framework.TestCase;
+$0
+endsnippet
+
+snippet im "import"  b
+import ${1:java}.${2:util}.$0;
+endsnippet
+
+snippet in "interface" b
+interface ${1:`!p snip.rv = snip.basename or "untitled"`} ${2:extends ${3:Parent} }{
+	$0
+}
+endsnippet
+
+snippet cc "constructor call or setter body"
+this.${1:var} = $1;
+endsnippet
+
+snippet list "Collections List" b
+List<${1:String}> ${2:list} = new ${3:Array}List<$1>();
+endsnippet
+
+snippet map "Collections Map" b
+Map<${1:String}, ${2:String}> ${3:map} = new ${4:Hash}Map<$1, $2>();
+endsnippet
+
+snippet set "Collections Set" b
+Set<${1:String}> ${2:set} = new ${3:Hash}Set<$1>();
+endsnippet
+
+snippet /Str?|str/ "String" br
+String $0
+endsnippet
+
+snippet cn "Constructor" b
+public `!p snip.rv = snip.basename or "untitled"`(${1:}) {
+	$0
+}
+endsnippet
+
+snippet cn "constructor, \w fields + assigments" b
+	`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\tprivate " + i[0] + " " + i[1]+ ";"
+if len(args) > 0:
+	snip.rv += "\n"`
+public `!p snip.rv = snip.basename or "unknown"`($1) {`!p
+args = getArgs(t[1])
+for i in args:
+	snip.rv += "\n\t\tthis.%s = %s;" % (i[1], i[1])
+if len(args) == 0:
+	snip.rv += "\n"`
+}
+endsnippet
+
+snippet j.b "java_beans_" i
+java.beans.
+endsnippet
+
+snippet j.i "java_io" i
+java.io.
+endsnippet
+
+snippet j.m "java_math" i
+java.math.
+endsnippet
+
+snippet j.n "java_net_" i
+java.net.
+endsnippet
+
+snippet j.u "java_util_"  i
+java.util.
+endsnippet
+
+snippet main "method (main)" b
+public static void main(String[] args)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet try "try/catch" b
+try {
+	$1${VISUAL}
+} catch(${2:Exception} ${3:e}){
+	${4:e.printStackTrace();}
+}
+endsnippet
+
+snippet mt "method throws" b
+${1:private} ${2:void} ${3:method}($4) ${5:throws $6 }{
+	$0
+}
+endsnippet
+
+snippet m  "method" b
+${1:private} ${2:void} ${3:method}($4) {
+	$0
+}
+endsnippet
+
+snippet md "Method With javadoc" b
+/**
+ * ${7:Short Description}`!p
+for i in getArgs(t[4]):
+	snip.rv += "\n\t * @param " + i[1] + " usage..."`
+ *`!p
+if "throws" in t[5]:
+	snip.rv = "\n\t * @throws " + t[6]
+else:
+	snip.rv = ""``!p
+if not "void" in t[2]:
+	snip.rv = "\n\t * @return object"
+else:
+	snip.rv = ""`
+ **/
+${1:public} ${2:void} ${3:method}($4) ${5:throws $6 }{
+	$0
+}
+endsnippet
+
+snippet /get(ter)?/ "getter" br
+public ${1:String} get${2:Name}() {
+	return `!p snip.rv = mixedCase(t[2])`;
+}
+endsnippet
+
+snippet /set(ter)?/ "setter" br
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
+}
+endsnippet
+
+snippet /se?tge?t|ge?tse?t|gs/ "setter and getter" br
+public void set${1:Name}(${2:String} `!p snip.rv = mixedCase(t[1])`) {
+	this.`!p snip.rv = mixedCase(t[1])` = `!p snip.rv = mixedCase(t[1])`;
+}`!p snip.rv += "\n"`
+public $2 get$1() {
+	return `!p snip.rv = mixedCase(t[1])`;
+}
+endsnippet
+
+snippet pa "package" b
+package $0
+endsnippet
+
+snippet p "print" b
+System.out.print($1);$0
+endsnippet
+
+snippet pl "println"  b
+System.out.println($1);$0
+endsnippet
+
+snippet pr "private" b
+private $0
+endsnippet
+
+snippet po "protected" b
+protected $0
+endsnippet
+
+snippet pu "public" b
+public $0
+endsnippet
+
+snippet re "return" b
+return $0
+endsnippet
+
+snippet st "static"
+static $0
+endsnippet
+
+snippet sw "switch" b
+switch ($1)`!p nl(snip)`{
+	case $2: $0
+}
+endsnippet
+
+snippet sy "synchronized"
+synchronized $0
+endsnippet
+
+snippet tc "test case"
+public class ${1:`!p snip.rv = snip.basename or "untitled"`} extends ${2:TestCase}`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+snippet t "test" b
+`!p junit(snip)`public void test${1:Name}() {
+	$0
+}
+endsnippet
+
+snippet tt "test throws" b
+`!p junit(snip)`public void test${1:Name}() ${2:throws Exception }{
+	$0
+}
+endsnippet
+
+snippet th "throw" b
+throw new $0
+endsnippet
+
+snippet wh "while" b
+while ($1)`!p nl(snip)`{
+	$0
+}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-angular.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-angular.snippets
new file mode 100644
index 0000000..c231ece
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-angular.snippets
@@ -0,0 +1,77 @@
+priority -50
+
+snippet iti "it (js, inject)" b
+it('${1:description}', inject(function($2) {
+	$0
+}));
+endsnippet
+
+snippet befi "before each (js, inject)" b
+beforeEach(inject(function($1) {
+	$0
+}));
+endsnippet
+
+snippet aconf "angular config" i
+config(function($1) {
+	$0
+});
+endsnippet
+
+snippet acont "angular controller" i
+controller('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
+
+snippet aconts "angular controller with scope" i
+controller('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
+
+snippet adir "angular directive" i
+directive('$1', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			$0
+		}
+	};
+}]);
+endsnippet
+
+snippet adirs "angular directive with scope" i
+directive('$1', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	return {
+		restrict: '${3:EA}',
+		link: function(scope, element, attrs) {
+			$0
+		}
+	};
+}]);
+endsnippet
+
+snippet afact "angular factory" i
+factory('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
+
+snippet afacts "angular factory with scope" i
+factory('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
+
+snippet aserv "angular service" i
+service('${1:name}', [$2function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
+
+snippet aservs "angular service" i
+service('${1:name}', [${2:'$scope', }function(${2/('|")([A-Z_$]+)?\1?((, ?)$)?/$2(?3::$4)/ig}) {
+	$0
+}]);
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-ember.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-ember.snippets
new file mode 100644
index 0000000..1b7e7b8
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-ember.snippets
@@ -0,0 +1,90 @@
+###################################################################
+#                        Ember snippets                           #
+###################################################################
+
+priority -50
+
+# Application
+snippet eapp "App.Name = Ember.Application.create({});"
+${1:App.Name} = Ember.Application.create({});
+endsnippet
+
+# Models
+snippet emod "App.ModelName = Ember.Model.extend({...});"
+${1:model_name} = Ember.Model.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# View
+snippet eview "App.ViewName = Ember.Model.extend({...});"
+${1:view_name} = Ember.View.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Controller
+snippet econtroller "App.ControllerName = Ember.Model.extend({...});"
+${1:controller_name} = Ember.ObjectController.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+# Route
+snippet eroute "App.RouteName = Ember.Route.extend({...});"
+${1:route_name} = Ember.Route.extend({
+	${0://Properties here...}
+});
+endsnippet
+
+snippet eview "App.ViewName = Ember.Model.create({...});"
+${1:view_name} = Ember.View.create({
+	${0://Properties here...}
+});
+endsnippet
+
+# Object
+snippet eobj "App.ObjectName = Ember.Object.extend({...});"
+${1:object_name} = Ember.Object.create({
+	${0://Properties here...}
+});
+endsnippet
+
+# Mixin
+snippet emix "App.MixinName = Ember.Model.extend({...});"
+${1:view_name} = Ember.Mixin.create({
+	${0://Properties here...}
+});
+endsnippet
+
+# Ember getter and setter
+snippet eget "this.get('property');"
+${1:this}.get('${2:property}');
+endsnippet
+
+snippet eset "this.set('property', value);"
+${1:this}.set('${2:property}', ${3:value});
+endsnippet
+
+# Computer properties
+snippet cpro "property_name: function() {...}.property(),"
+${1:property_name}: function() {
+	${0://body...}
+}.property('${3:argumenet}'),
+endsnippet
+
+snippet cpro ": function() {...}.property('property'),"
+${1:property_name}: function() {
+	${0://body...}
+}.property(),
+endsnippet
+
+
+# Observes
+snippet proo "property_name: function() {...}.property()"
+${1:property_name}: function() {
+	${0://body...}
+}.observes('${3:property}'),
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-jasmine-arrow.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-jasmine-arrow.snippets
new file mode 100644
index 0000000..e8c2a9b
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-jasmine-arrow.snippets
@@ -0,0 +1,48 @@
+priority -50
+
+# JavaScript versions -- from the TextMate bundle + some additions
+# for jasmine-jquery matchers
+#
+
+snippet des "Describe (js)" b
+describe('${1:description}', () => {
+	$0
+});
+endsnippet
+
+snippet it "it (js)" b
+it('${1:description}', () => {
+	$0
+});
+endsnippet
+
+snippet bef "before each (js)" b
+beforeEach(() => {
+	$0
+});
+endsnippet
+
+snippet aft "after each (js)" b
+afterEach(() => {
+	$0
+});
+endsnippet
+
+snippet befa "before all (js)" b
+beforeAll(() => {
+	$0
+});
+endsnippet
+
+snippet afta "after all (js)" b
+afterAll(() => {
+	$0
+});
+endsnippet
+
+snippet ru "runs (js)" b
+runs(() => {
+	$0
+});
+endsnippet
+
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-jsdoc.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-jsdoc.snippets
new file mode 100644
index 0000000..959f805
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-jsdoc.snippets
@@ -0,0 +1,51 @@
+priority -50
+
+# JSDoc snippets
+
+snippet /* "A JSDoc comment" b
+/**
+ * ${1:${VISUAL}}$0
+ */
+endsnippet
+
+snippet @au "@author email (First Last)"
+@author ${1:`!v g:snips_author`} [${2:`!v g:snips_author_email`}]
+endsnippet
+
+snippet @li "@license Description"
+@license ${1:MIT}$0
+endsnippet
+
+snippet @ver "@version Semantic version"
+@version ${1:0.1.0}$0
+endsnippet
+
+snippet @fileo "@fileoverview Description" b
+/**
+ * @fileoverview ${1:${VISUAL:A description of the file}}$0
+ */
+endsnippet
+
+snippet @constr "@constructor"
+@constructor
+endsnippet
+
+snippet @p "@param {Type} varname Description"
+@param {${1:Type}} ${2:varname} ${3:Description}
+endsnippet
+
+snippet @ret "@return {Type} Description"
+@return {${1:Type}} ${2:Description}
+endsnippet
+
+snippet @pri "@private"
+@private
+endsnippet
+
+snippet @over "@override"
+@override
+endsnippet
+
+snippet @pro "@protected"
+@protected
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-node.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-node.snippets
new file mode 100644
index 0000000..e4a64e9
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-node.snippets
@@ -0,0 +1,65 @@
+priority -50
+
+snippet #! "shebang"
+#!/usr/bin/env node
+endsnippet
+
+snippet vreq "assign a CommonJS-style module to a var"
+var ${0:${1/(.+\/)*(\w+)(-|\b|$)(\..+$)?/\u$2/g}} = require('$1');
+endsnippet
+
+snippet ex "module.exports"
+module.exports = $1;
+endsnippet
+
+snippet hcs "http.createServer"
+http.createServer($1).listen($2);
+endsnippet
+
+snippet ncs "net.createServer"
+net.createServer(function(${1:socket}){
+	$1.on('data', function(${3:data}){
+		$4
+	});
+	$1.on('end', function(){
+		$5
+	});
+}).listen(${6:8124});
+endsnippet
+
+snippet pipe "pipe"
+pipe(${1:stream})$2
+endsnippet
+
+# Express snippets
+
+snippet eget "express GET"
+${1:app}.get('$2', $3);
+endsnippet
+
+snippet epost "express POST"
+${1:app}.post('$2', $3);
+endsnippet
+
+snippet eput "express PUT"
+${1:app}.put('$2', $3);
+endsnippet
+
+snippet edelete "express DELETE"
+${1:app}.delete('$2', $3);
+endsnippet
+
+# process snippets
+
+snippet stdout "stdout"
+process.stdout
+endsnippet
+
+snippet stdin "stdin"
+process.stdin
+endsnippet
+
+snippet stderr "stderr"
+process.stderr
+endsnippet
+
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript-openui5.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript-openui5.snippets
new file mode 100644
index 0000000..db4481c
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript-openui5.snippets
@@ -0,0 +1,205 @@
+snippet sapmlabel
+	var $1 = new sap.m.Label({ 
+				design : $2, 
+				text : $3, 
+				visible : $4, 
+				textAlign : $5, 
+				textDirection : $6, 
+				width : $7, 
+				required : $7
+			});
+
+snippet sapmtext
+	var $1 = new sap.m.Text({
+				text :$2,
+				textDirection :$3,
+				visible :$4,
+				wrapping : $5,
+				textAlign : $6,
+				width :$7,
+				maxLines :$8
+			});
+
+snippet sapmbutton
+	var $1 = new sap.m.Button({
+				text : $2,
+				type : $3,
+				width : $4,
+				enabled :$5,
+				visible :$6,
+				icon : $7,
+				iconFirst : $8,
+				activeIcon :$9,
+				iconDensityAware : $10,
+			});
+snippet sapmflexbox
+	var $1 = new sap.m.FlexBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
+				items:[]
+			});
+snippet sapmhbox
+	var $1 = new sap.m.HBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
+				items:[]
+			});
+
+snippet sapmvbox
+	var $1 = new sap.m.VBox({
+				visible : $2,
+				height : $3,
+				width : $4,
+				displayInline :$5,
+				direction :$6,
+				fitContainer : $7,
+				renderType : $8,
+				justifyContent :$9,
+				alignItems : $10,
+				items:[]
+			});
+
+snippet sapcomponent
+	sap.ui.controller("$1", {
+	   onInit: function(){
+	   }, 
+	   onAfterRendering: function() {
+	   },
+	   onAfterRendering: function() {
+	   },
+	   onExit: function() {
+	   },
+	});
+
+snippet sapminput
+	var $1 = new sap.m.Input({
+		value :$2,
+		width : $3,
+		enabled :$4,
+		visible :$5,
+		valueState :$6,
+		name : $7,
+		placeholder : $8,
+		editable : $9,
+		type : $10,
+		maxLength :$11, 
+		valueStateText :$12, 
+		showValueStateMessage :$13, 
+		dateFormat :$14,
+		showValueHelp :$15,
+		showSuggestion :$16,
+		valueHelpOnly :$17,
+		filterSuggests :$18,
+		maxSuggestionWidth :$19,
+		startSuggestion : $20,
+		showTableSuggestionValueHelp : $21,
+		description : $22,
+		fieldWidth : $23,
+		valueLiveUpdate :$24,
+		suggestionItems  :[$25],
+		suggestionColumns : [$26],
+		suggestionRows : [$27],
+		liveChange : $28,
+		valueHelpRequest :$29, 
+		suggest : $30,
+		suggestionItemSelected : $31
+	});
+snippet _sthis
+	var _self = this;
+
+snippet sapmresponsivepopup
+	var $1 = new sap.m.ResponsivePopover({
+				placement :$2 ,//sap.m.PlacementType (default: sap.m.PlacementType.Right)
+				showHeader :$3 ,//boolean (default: true)
+				title : $4,//string
+				icon :$5 ,//sap.ui.core.URI
+				modal :$6 ,// boolean
+				offsetX :$7, //int
+				offsetY :$8, //int
+				contentWidth : $9,//sap.ui.core.CSSSize
+				contentHeight :$10, //sap.ui.core.CSSSize
+				horizontalScrolling :$11, //boolean
+				verticalScrolling :$12, //boolean
+				showCloseButton :$13, //boolean (default: true)
+				//Aggregations
+				content :$14,  //sap.ui.core.Control[]
+				customHeader :$15,  //sap.m.IBar
+				subHeader : $16, //sap.m.IBar
+				beginButton :$17,  //sap.m.Button
+				endButton : $18, //sap.m.Button
+				//Associations
+				initialFocus : $19, //string | sap.ui.core.Control
+				//Events
+				beforeOpen :$20,  //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterOpen : $21, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				beforeClose : $22, //fnListenerFunction or [fnListenerFunction, oListenerObject] or [oData, fnListenerFunction, oListenerObject]
+				afterClose : $23 //fnList
+			});
+
+snippet sapicon
+	var $1 = new sap.ui.core.Icon({
+					src :$2 , //sap.ui.core.URI
+					size :$3 , //sap.ui.core.CSSSize
+					color :$4 , //sap.ui.core.CSSColor
+					hoverColor : $5 ,  // sap.ui.core.CSSColor
+					activeColor :$6 , //sap.ui.core.CSSColor
+					width :$7 , //sap.ui.core.CSSSize
+					height : $8 ,//sap.ui.core.CSSSize
+					backgroundColor :$8 , //sap.ui.core.CSSColor
+					hoverBackgroundColor :$9 , //sap.ui.core.CSSColor
+					activeBackgroundColor :$10 , //sap.ui.core.CSSColor
+					visible :$11 , //boolean (default: true)
+					decorative : $12 ,//boolean (default: true)
+				});
+snippet extendVerticalL 
+	sap.ui.layout.VerticalLayout.extend("$1", {
+	    metadata: {
+		properties: {
+		  	$2 
+		},
+		aggregations: {
+			$3	
+		},
+		events: {
+			$4
+		}
+	    },
+	   init: function(){
+		$5	
+	    },
+	    
+	    renderer: "$6"
+	});	
+snippet extendHorizontalL 
+	sap.ui.layout.HorizontalLayout.extend("$1", {
+	    metadata: {
+		properties: {
+		  	$2 
+		},
+		aggregations: {
+			$3	
+		},
+		events: {
+			$4
+		}
+	    },
+	   init: function(){
+		$5	
+	    },
+	    
+	    renderer: "$6"
+	});	
diff --git a/vim/snippets/vim-snippets/UltiSnips/javascript.snippets b/vim/snippets/vim-snippets/UltiSnips/javascript.snippets
new file mode 100644
index 0000000..652dd70
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/javascript.snippets
@@ -0,0 +1,140 @@
+priority -50
+
+############
+#  COMMON  #
+############
+
+# The smart snippets use a global options called
+# "g:ultisnips_javascript.{option}" which can control the format
+# of trailing semicolon, space before function paren, etc.
+
+global !p
+from javascript_snippets import (
+	semi, space_before_function_paren, keyword_spacing
+)
+endglobal
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet get "Get Elements"
+getElement${1/(T)|.*/(?1:s)/}By${1:T}${1/(T)|(I)|.*/(?1:agName)(?2:d)/}('$2')
+endsnippet
+
+snippet '':f "object method string"
+'${1:${2:#thing}:${3:click}}': function`!p snip.rv = space_before_function_paren(snip)`(element) {
+	${VISUAL}$0
+}${10:,}
+endsnippet
+
+snippet :f "Object Method"
+${1:method_name}: function`!p snip.rv = space_before_function_paren(snip)`(${3:attribute}) {
+	${VISUAL}$0
+}${10:,}
+endsnippet
+
+snippet :, "Object Value JS"
+${1:value_name}: ${0:value},
+endsnippet
+
+snippet : "Object key key: 'value'"
+${1:key}: ${2:"${3:value}"}${4:, }
+endsnippet
+
+snippet proto "Prototype (proto)"
+${1:class_name}.prototype.${2:method_name} = function`!p snip.rv = space_before_function_paren(snip)`(${3:first_argument}) {
+	${VISUAL}$0
+}`!p snip.rv = semi(snip)`
+
+endsnippet
+
+snippet fun "function (fun)" w
+function ${1:function_name}`!p snip.rv = space_before_function_paren(snip)`(${2:argument}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet vf "Function assigned to var"
+${1:var }${2:function_name} = function $2`!p snip.rv = space_before_function_paren(snip)`($3) {
+	${VISUAL}$0
+}`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet af "Anonymous Function" i
+function`!p snip.rv = space_before_function_paren(snip)`($1) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet iife "Immediately-Invoked Function Expression (iife)"
+(function`!p snip.rv = space_before_function_paren(snip)`(${1:window}) {
+	${VISUAL}$0
+}(${2:$1}))`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet ;fe "Minify safe iife"
+;(function`!p snip.rv = space_before_function_paren(snip)`(${1}) {
+	${VISUAL}$0
+}(${2}))
+endsnippet
+
+snippet timeout "setTimeout function"
+setTimeout(function`!p snip.rv = space_before_function_paren(snip)`() {
+	${VISUAL}$0
+}${2:.bind(${3:this})}, ${1:10})`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet fi "for prop in obj using hasOwnProperty" b
+for`!p snip.rv = keyword_spacing(snip)`(${1:prop} in ${2:obj}){
+	if`!p snip.rv = keyword_spacing(snip)`($2.hasOwnProperty($1)) {
+		${VISUAL}$0
+	}
+}
+endsnippet
+
+snippet if "if (condition) { ... }"
+if`!p snip.rv = keyword_spacing(snip)`(${1:true}) {
+	${VISUAL}$0
+}
+endsnippet
+
+snippet ife "if (condition) { ... } else { ... }"
+if`!p snip.rv = keyword_spacing(snip)`(${1:true}) {
+	${VISUAL}$0
+}`!p snip.rv = keyword_spacing(snip)`else`!p snip.rv = keyword_spacing(snip)`{
+	${2}
+}
+endsnippet
+
+snippet switch
+switch`!p snip.rv = keyword_spacing(snip)`(${VISUAL}${1:expression}) {
+	case '${VISUAL}${3:case}':
+		${4}
+		break`!p snip.rv = semi(snip)`
+	${0}
+	default:
+		${2}
+}
+endsnippet
+
+snippet case "case 'xyz': ... break"
+case`!p snip.rv = keyword_spacing(snip)`'${VISUAL}${1:case}':
+	${VISUAL}$0
+	break`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet do "do { ... } while (condition)"
+do`!p snip.rv = keyword_spacing(snip)`{
+	${VISUAL}$0
+}`!p snip.rv = keyword_spacing(snip)`while`!p snip.rv = keyword_spacing(snip)`(${1:/* condition */})`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet ret "Return statement"
+return ${VISUAL}$0`!p snip.rv = semi(snip)`
+endsnippet
+
+snippet us
+'use strict'`!p snip.rv = semi(snip)`
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/jinja2.snippets b/vim/snippets/vim-snippets/UltiSnips/jinja2.snippets
new file mode 100644
index 0000000..ded01dc
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/jinja2.snippets
@@ -0,0 +1,209 @@
+priority -50
+
+# http://jinja.pocoo.org/
+
+# jinja2 is a full featured template engine for Python. It has full
+# unicode support, an optional integrated sandboxed execution
+# environment, widely used and BSD licensed.
+
+# possible extends:
+#extends html
+
+
+snippet block "block" b
+{% block ${1:name} %}
+		$2
+{% endblock $1 %}
+endsnippet
+
+
+snippet {{ "variable" b
+{{ $1 }}
+endsnippet
+
+
+snippet {# "comment" b
+{# $1 #}
+endsnippet
+
+
+snippet # "comment" b
+{# $1 #}
+endsnippet
+
+
+snippet raw "escaped block" b
+{% raw %}
+		$1
+{% endraw %}
+endsnippet
+
+
+snippet extends "extends" b
+{% extends "${1:template}" %}
+endsnippet
+
+
+snippet include "include" b
+{% include "${1:template}" %}
+endsnippet
+
+
+snippet import "import" b
+{% import "${1:template}" %}
+endsnippet
+
+
+snippet from "from/import/as" b
+{% from "${1:template}" import ${2:name}${3: as ${4:$2}} %}
+endsnippet
+
+
+snippet filter "filter" b
+{% filter ${1:filter} %}
+	$2
+{% endfilter %}
+endsnippet
+
+
+# Being able to quickly remove the whole 'else' block seems faster to me than
+# choosing between 'for' and 'for/else' snippets from the menu.
+# snippet for "for" b
+# {% for ${1:item} in ${2:sequence} %}
+#     $3${4:
+# {% else %}
+#     $5}
+# {% endfor %}
+# endsnippet
+
+
+snippet for "for" b
+{% for ${1:item} in ${2:sequence} %}
+	$3
+{% endfor %}
+endsnippet
+
+
+snippet for "for/else" b
+{% for ${1:item} in ${2:sequence} %}
+	$3
+{% else %}
+	$4
+{% endfor %}
+endsnippet
+
+
+snippet if "if" b
+{% if ${1:expr} %}
+	$2
+{% endif %}
+endsnippet
+
+
+snippet if "if/else" b
+{% if ${1:expr} %}
+	$2
+{% else %}
+	$3
+{% endif %}
+endsnippet
+
+
+snippet if "if/elif/else" b
+{% if ${1:expr} %}
+	$2
+{% elif %}
+	$3
+{% else %}
+	$4
+{% endif %}
+endsnippet
+
+
+snippet macro "macro" b
+{% macro ${1:name}(${2:args}) %}
+	$3
+{% endmacro %}
+endsnippet
+
+
+snippet call "call" b
+{% call ${1:name}(${2:args}) %}
+	$3
+{% endcall %}
+endsnippet
+
+
+snippet set "set" b
+{% set ${1:name} = ${2:'value'} %}
+endsnippet
+
+
+snippet trans "translation" b
+{% trans %}
+	$1
+{% endtrans %}
+endsnippet
+
+
+snippet with "with" b
+{% with %}
+	$1
+{% endwith %}
+endsnippet
+
+snippet autoescape "autoescape" b
+{% autoescape ${1:true} %}
+	$2
+{% endautoescape %}
+endsnippet
+
+# Filters
+# @todo: expand only when snippet is preceeded by a |
+
+snippet batch "batch items" w
+batch(linecount=$1, fill_with=${2:None})
+endsnippet
+
+
+snippet dictsort "sort and yield (key, value) pairs" w
+dictsort(case_sensitive=${1:False}, by=${2:'key'})
+endsnippet
+
+
+snippet round "round number" w
+round(precision=${1:0}, method=${2:'common|ceil|floor'})
+endsnippet
+
+
+snippet urlize "convert plain-text url to <a/>" w
+urlize(trim_url_limit=${1:None}, nofollow=${2:False})
+endsnippet
+
+
+snippet wordwrap "wordwrap" w
+wordwrap(width=${1:79}, break_long_words=${2:True})
+endsnippet
+
+
+snippet truncate "truncate" w
+truncate(lenght=${1:79}, killwords=${2:False}, end=${3:'...''})
+endsnippet
+
+
+snippet sum "sum of sequence of numbers + start" w
+sum(attribute=${1:None}, start=${2:0})
+endsnippet
+
+
+snippet sort "sort an iterable" w
+sort(reverse=${1:False}, case_sensitive=${2:False}, attribute=${3:None})
+endsnippet
+
+
+snippet indent "indent" w
+indent(width=${1:4}, indentfirst=${2:False})
+endsnippet
+
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/json.snippets b/vim/snippets/vim-snippets/UltiSnips/json.snippets
new file mode 100644
index 0000000..75edef9
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/json.snippets
@@ -0,0 +1,51 @@
+priority -50
+
+snippet s "String" b
+"${1:key}": "${0:value}",
+endsnippet
+
+snippet n "Number" b
+"${1:key}": ${0:value},
+endsnippet
+
+snippet a "Array" b
+[
+	${VISUAL}$0
+],
+endsnippet
+
+snippet na "Named array" b
+"${1:key}": [
+	${VISUAL}$0
+],
+endsnippet
+
+snippet o "Object" b
+{
+	${VISUAL}$0
+},
+endsnippet
+
+snippet no "Named object" b
+"${1:key}": {
+	${VISUAL}$0
+},
+endsnippet
+
+snippet null "Null" b
+"${0:key}": null,
+endsnippet
+
+
+global !p
+def compB(t, opts):
+	if t:
+		opts = [m[len(t):] for m in opts if m.startswith(t)]
+	if len(opts) == 1:
+		return opts[0]
+	return "(" + '|'.join(opts) + ')'
+endglobal
+
+snippet b "Bool" b
+"${1:key}": $2`!p snip.rv=compB(t[2], ['true', 'false'])`,
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/julia.snippets b/vim/snippets/vim-snippets/UltiSnips/julia.snippets
new file mode 100644
index 0000000..259c5f4
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/julia.snippets
@@ -0,0 +1,34 @@
+# Documentation
+snippet docf "function documentation" b
+#' @description
+#'
+#' ${1:function description}
+#'
+#' ${2:@param ${3:name}::${4:Type} ${5:Description}}
+#'
+#' ${6:@returns ${7:name}::${8:Type} ${9:Description}}
+#'
+#' @examples
+#'
+#' ${10: function call examples}
+endsnippet
+
+snippet doct "type definition" b
+#' @description
+#'
+#' ${1:type description}
+#'
+#' ${2:@field ${3:name}::${4:Type} ${5:Description}}
+#'
+#' @examples
+#'
+#' ${10: constructor examples}
+endsnippet
+
+snippet par "function parameter documentation" b
+#' @param ${1:name}::${2:Type} ${0:Description}
+endsnippet
+
+snippet fld "type field documentation" b
+#' @field ${1:name}::${2:Type} ${0:Description}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/ledger.snippets b/vim/snippets/vim-snippets/UltiSnips/ledger.snippets
new file mode 100644
index 0000000..7d7a84d
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/ledger.snippets
@@ -0,0 +1,7 @@
+priority -50
+
+snippet t "Transaction" b
+${1:`!v strftime("%Y")`}-${2:`!v strftime("%m")`}-${3:`!v strftime("%d")`} ${4:*} ${5:Payee}
+	${6:Expenses}  		\$${7:0.00}
+	${8:Assets:Checking}$0
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/lhaskell.snippets b/vim/snippets/vim-snippets/UltiSnips/lhaskell.snippets
new file mode 100644
index 0000000..29169a5
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/lhaskell.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends haskell
diff --git a/vim/snippets/vim-snippets/UltiSnips/lua.snippets b/vim/snippets/vim-snippets/UltiSnips/lua.snippets
new file mode 100644
index 0000000..b6d0c1a
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/lua.snippets
@@ -0,0 +1,98 @@
+priority -50
+
+#################################
+# Snippets for the Lua language #
+#################################
+snippet #! "Shebang header" b
+#!/usr/bin/env lua
+$0
+endsnippet
+
+snippet !fun(ction)?! "New function" br
+function ${1:new_function}(${2:args})
+	$0
+end
+endsnippet
+
+snippet forp "pair for loop" b
+for ${1:name},${2:val} in pairs(${3:table_name}) do
+	$0
+end
+endsnippet
+
+snippet fori "ipair for foop" b
+for ${1:idx},${2:val} in ipairs(${3:table_name}) do
+	$0
+end
+endsnippet
+
+snippet for "numeric for loop" b
+for ${1:i}=${2:first},${3:last}${4/^..*/(?0:,:)/}${4:step} do
+	$0
+end
+endsnippet
+
+snippet do "do block"
+do
+	$0
+end
+endsnippet
+
+snippet repeat "repeat loop" b
+repeat
+	$1
+until $0
+endsnippet
+
+snippet while "while loop" b
+while $1 do
+	$0
+end
+endsnippet
+
+snippet if "if statement" b
+if $1 then
+	$0
+end
+endsnippet
+
+snippet ife "if/else statement" b
+if $1 then
+	$2
+else
+	$0
+end
+endsnippet
+
+snippet eif "if/elseif statement" b
+if $1 then
+	$2
+elseif $3 then
+	$0
+end
+endsnippet
+
+snippet eife "if/elseif/else statement" b
+if $1 then
+	$2
+elseif $3 then
+	$4
+else
+	$0
+end
+endsnippet
+
+snippet pcall "pcall statement" b
+local ok, err = pcall(${1:your_function})
+if not ok then
+	handler(${2:ok, err})
+${3:else
+	success(${4:ok, err})
+}end
+endsnippet
+
+snippet local "local x = 1"
+local ${1:x} = ${0:1}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/mako.snippets b/vim/snippets/vim-snippets/UltiSnips/mako.snippets
new file mode 100644
index 0000000..fb31ec8
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/mako.snippets
@@ -0,0 +1,92 @@
+priority -50
+
+#################
+# From snipmate #
+#################
+snippet def "definition" b
+<%def name="${1:name}">
+	${2:}
+</%def>
+endsnippet
+
+snippet call "call" b
+<%call expr="${1:name}">
+	${2:}
+</%call>
+endsnippet
+
+snippet doc "doc" b
+<%doc>
+	${1:}
+</%doc>
+endsnippet
+
+snippet text "text" b
+<%text>
+	${1:}
+</%text>
+endsnippet
+
+snippet for "for" b
+% for ${1:i} in ${2:iter}:
+	${3:}
+% endfor
+endsnippet
+
+snippet if "if " b
+% if ${1:condition}:
+	${2:}
+% endif
+endsnippet
+
+snippet if "if/else" b
+% if ${1:condition}:
+	${2:}
+% else:
+	${3:}
+% endif
+endsnippet
+
+snippet try "try" b
+% try:
+	${1:}
+% except${2:}:
+	${3:pass}
+% endtry
+endsnippet
+
+snippet wh "wh" b
+% while ${1:}:
+	${2:}
+% endwhile
+endsnippet
+
+snippet $ "$" i
+${${1:}}
+endsnippet
+
+snippet <% "<%" b
+<% ${1:} %>
+endsnippet
+
+snippet <!% "<!%" b
+<!% ${1:} %>
+endsnippet
+
+snippet inherit "inherit" b
+<%inherit file="${1:filename}" />
+endsnippet
+
+snippet include "include" b
+<%include file="${1:filename}" />
+endsnippet
+
+snippet namespace "namespace" b
+<%namespace file="${1:name}" />
+endsnippet
+
+snippet page "page" b
+<%page args="${1:}" />
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/markdown.snippets b/vim/snippets/vim-snippets/UltiSnips/markdown.snippets
new file mode 100644
index 0000000..add9f7f
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/markdown.snippets
@@ -0,0 +1,92 @@
+priority -50
+
+global !p
+def create_table(snip):
+    # retrieving single line from current string and treat it like tabstops count
+    placeholders_string = snip.buffer[snip.line].strip().split("x",1)
+    rows_amount = int(placeholders_string[0])
+    columns_amount = int(placeholders_string[1])
+
+    # erase current line
+    snip.buffer[snip.line] = ''
+
+    # create anonymous snippet with expected content and number of tabstops
+    anon_snippet_title = ' | '.join(['$' + str(col) for col in range(1,columns_amount+1)]) + "\n"
+    anon_snippet_delimiter = ':-|' * (columns_amount-1) + ":-\n"
+    anon_snippet_body = ""
+    for row in range(1,rows_amount+1):
+        anon_snippet_body += ' | '.join(['$' + str(row*columns_amount+col) for col in range(1,columns_amount+1)]) + "\n"
+    anon_snippet_table = anon_snippet_title + anon_snippet_delimiter + anon_snippet_body
+
+    # expand anonymous snippet
+    snip.expand_anon(anon_snippet_table)
+endglobal
+
+###########################
+# Sections and Paragraphs #
+###########################
+snippet sec "Section" b
+# ${1:Section Name} #
+$0
+endsnippet
+
+snippet ssec "Sub Section" b
+## ${1:Section Name} ##
+$0
+endsnippet
+
+snippet sssec "SubSub Section" b
+### ${1:Section Name} ###
+$0
+endsnippet
+
+snippet par "Paragraph" b
+#### ${1:Paragraph Name} ####
+$0
+endsnippet
+
+snippet spar "Paragraph" b
+##### ${1:Paragraph Name} #####
+$0
+endsnippet
+
+################
+# Common stuff #
+################
+snippet link "Link to something"
+[${1:${VISUAL:Text}}](${3:http://${2:www.url.com}})$0
+endsnippet
+
+snippet img "Image"
+![${1:pic alt}](${2:path}${3/.+/ "/}${3:opt title}${3/.+/"/})$0
+endsnippet
+
+snippet ilc "Inline Code" i
+\`$1\`$0
+endsnippet
+
+snippet cbl "Codeblock" b
+\`\`\`
+$1
+\`\`\`
+$0
+endsnippet
+
+snippet refl "Reference Link"
+[${1:${VISUAL:Text}}][${2:id}]$0
+
+[$2]:${4:http://${3:www.url.com}} "${5:$4}"
+endsnippet
+
+snippet fnt "Footnote"
+[^${1:${VISUAL:Footnote}}]$0
+
+[^$1]:${2:Text}
+endsnippet
+
+post_jump "create_table(snip)"
+snippet "tb(\d+x\d+)" "Customizable table" br
+`!p snip.rv = match.group(1)`
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/matlab.snippets b/vim/snippets/vim-snippets/UltiSnips/matlab.snippets
new file mode 100644
index 0000000..4dc332b
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/matlab.snippets
@@ -0,0 +1,24 @@
+priority -50
+
+snippet switch "switch ... otherwise"
+switch ${1:n}
+	case ${2:0}
+		${3}${4:
+	otherwise
+		${5}}
+end
+endsnippet
+
+snippet clc "class with constructor" b
+classdef ${1:`!p
+snip.rv = snip.basename or "class_name"`} 
+	properties
+		${2}
+	end
+	methods
+		function obj = $1(${3})
+			${4}
+		end${0}
+	end
+end
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/objc.snippets b/vim/snippets/vim-snippets/UltiSnips/objc.snippets
new file mode 100644
index 0000000..45e41fc
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/objc.snippets
@@ -0,0 +1,272 @@
+priority -50
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+
+snippet imp "#import (imp)" b
+#import "${1:`!p snip.rv = re.sub(r'\..*$', '.h', fn)`}"
+endsnippet
+
+snippet Imp "#import <> (Imp)"
+#import <${1:Cocoa/Cocoa.h}>
+endsnippet
+
+snippet cl "020 Class (objc)"
+@interface ${1:`!p
+if len(fn):
+		snip.rv = re.sub(r'\..*$', '', fn)
+else:
+		snip.rv = "object"
+`} : ${2:NSObject}
+{
+}
+@end
+
+@implementation $1
+- (id)init
+{
+	if((self = [super init]))
+	{$0
+	}
+	return self;
+}
+@end
+endsnippet
+
+snippet array "NSArray (array)"
+NSMutableArray *${1:array} = [NSMutableArray array];
+endsnippet
+
+snippet dict "NSDictionary (dict)"
+NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];
+endsnippet
+
+snippet forarray "for NSArray loop (forarray)"
+unsigned int	${1:object}Count = [${2:array} count];
+
+for(unsigned int index = 0; index < $1Count; index += 1)
+{
+	${3:id}	$1 = [$2 objectAtIndex:index];
+	$0
+}
+endsnippet
+
+snippet objacc "Object Accessors (objacc)"
+- (${1:id})${2:thing}
+{
+	return $2;
+}
+
+- (void)set${2/./\u$0/}:($1)aValue
+{
+	$0${1/( \*)?$/(?1:$1: )/}old${2/./\u$0/} = $2;
+	$2 = [aValue retain];
+	[old${2/./\u$0/} release];
+}
+endsnippet
+
+snippet sel "@selector"
+@selector(${1:method}:)
+endsnippet
+
+snippet cdacc "CoreData Accessors Implementation"
+- (${1:id})${2:attribute}
+{
+	[self willAccessValueForKey:@"$2"];
+	$1 value = [self primitiveValueForKey:@"$2"];
+	[self didAccessValueForKey:@"$2"];
+	return value;
+}
+
+- (void)set${2/./\u$0/}:($1)aValue
+{
+	[self willChangeValueForKey:@"$2"];
+	[self setPrimitiveValue:aValue forKey:@"$2"];
+	[self didChangeValueForKey:@"$2"];
+}
+endsnippet
+
+snippet delegate "Delegate Responds to Selector"
+if([${1:[self delegate]} respondsToSelector:@selector(${2:selfDidSomething:})])
+	[$1 ${3:${2/((^\s*([A-Za-z0-9_]*:)\s*)|(:\s*$)|(:\s*))/(?2:$2self :\:<>)(?4::)(?5: :)/g}}];
+
+endsnippet
+
+snippet thread "Detach New NSThread"
+[NSThread detachNewThreadSelector:@selector(${1:method}:) toTarget:${2:aTarget} withObject:${3:anArgument}]
+endsnippet
+
+snippet ibo "IBOutlet (ibo)"
+IBOutlet ${1:NSSomeClass} *${2:${1/^[A-Z](?:[A-Z]+|[a-z]+)([A-Z]\w*)/\l$1/}};
+endsnippet
+
+snippet I "Initialize Implementation (I)"
++ (void)initialize
+{
+	[[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+		$0@"value", @"key",
+		nil]];
+}
+endsnippet
+
+snippet bind "Key:value binding (bind)"
+bind:@"${1:binding}" toObject:${2:observableController} withKeyPath:@"${3:keyPath}" options:${4:nil}
+endsnippet
+
+snippet arracc "LoD array (arracc)"
+- (void)addObjectTo${1:Things}:(${2:id})anObject
+{
+	[${3:${1/./\l$0/}} addObject:anObject];
+}
+
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i
+{
+	[$3 insertObject:anObject atIndex:i];
+}
+
+- ($2)objectIn$1AtIndex:(unsigned int)i
+{
+	return [$3 objectAtIndex:i];
+}
+
+- (unsigned int)indexOfObjectIn$1:($2)anObject
+{
+	return [$3 indexOfObject:anObject];
+}
+
+- (void)removeObjectFrom$1AtIndex:(unsigned int)i
+{
+	[$3 removeObjectAtIndex:i];
+}
+
+- (unsigned int)countOf$1
+{
+	return [$3 count];
+}
+
+- (NSArray *${1/./\l$0/}
+{
+	return $3;
+}
+
+- (void)set$1:(NSArray *)new$1
+{
+	[$3 setArray:new$1];
+}
+endsnippet
+
+snippet arracc "LoD array interface (arracc)"
+- (void)addObjectTo${1:Things}:(${2:id})anObject;
+- (void)insertObject:($2)anObject in$1AtIndex:(unsigned int)i;
+- ($2)objectIn$1AtIndex:(unsigned int)i;
+- (unsigned int)indexOfObjectIn$1:($2)anObject;
+- (void)removeObjectFrom$1AtIndex:(unsigned int)i;
+- (unsigned int)countOf$1;
+- (NSArray *)${1/./\l$0/};
+- (void)set$1:(NSArray *)new$1;
+endsnippet
+
+snippet focus "Lock Focus"
+[self lockFocus];
+$0
+[self unlockFocus];
+endsnippet
+
+snippet pool "NSAutoreleasePool (pool)"
+NSAutoreleasePool *pool = [NSAutoreleasePool new];
+$0
+[pool drain];
+endsnippet
+
+snippet log "NSLog (log) 2"
+NSLog(@"$1"${1/[^%]*(%)?.*/(?1:, :\);)/}$2${1/[^%]*(%)?.*/(?1:\);)/}
+endsnippet
+
+snippet alert "NSRunAlertPanel (alert)"
+int choice = NSRunAlertPanel(@"${1:Something important!}", @"${2:Something important just happend, and now I need to ask you, do you want to continue?}", @"${3:Continue}", @"${4:Cancel}", nil);
+if(choice == NSAlertDefaultReturn) // "$3"
+{
+	$0;
+}
+else if(choice == NSAlertAlternateReturn) // "$4"
+{
+		$0
+}
+endsnippet
+
+snippet format "NSString stringWithFormat (format)"
+[NSString stringWithFormat:@"$1", $2]$0
+endsnippet
+
+snippet objacc "Object Accessors Interface (objacc)"
+- (${1:id})${2:thing};
+- (void)set${2/./\u$0/}:($1)aValue;
+endsnippet
+
+snippet prop "Property"
+@property (${1/^(e)$|.*/(?1:r)/}${1:r}${1/^(?:(r)|(e)|(c)|(a))$|.*/(?1:etain)(?2:adonly)(?3:opy)(?4:ssign)/}) ${2:NSSomeClass}$ *${3:${2/^[A-Z](?:[A-Z]+|[a-z]+)([A-Z]\w*)/\l$1/}};
+endsnippet
+
+snippet getprefs "Read from defaults (getprefs)"
+[[NSUserDefaults standardUserDefaults] objectForKey:${1:key}];
+endsnippet
+
+snippet obs "Register for Notification"
+[[NSNotificationCenter defaultCenter] addObserver:${1:self} selector:@selector(${3:${2/^([A-Z]{2})?(.+?)(Notification)?$/\l$2/}}:) name:${2:NSWindowDidBecomeMainNotification} object:${4:nil}];
+endsnippet
+
+snippet responds "Responds to Selector"
+if ([${1:self} respondsToSelector:@selector(${2:someSelector:})])
+{
+		[$1 ${3:${2/((:\s*$)|(:\s*))/:<>(?3: )/g}}];
+}
+endsnippet
+
+snippet gsave "Save and Restore Graphics Context (gsave)"
+[NSGraphicsContext saveGraphicsState];
+$0
+[NSGraphicsContext restoreGraphicsState];
+
+endsnippet
+
+snippet acc "Scalar Accessors (acc)"
+- (${1:unsigned int})${2:thing}
+{
+	return ${3:$2};
+}
+
+- (void)set${2/./\u$0/}:(${1:unsigned int})new${2/./\u$0/}
+{
+	$3 = new${2/./\u$0/};
+}
+endsnippet
+
+snippet acc "Scalar Accessors Interface (acc)"
+- (${1:unsigned int})${2:thing};
+- (void)set${2/./\u$0/}:($1)new${2/./\u$0/};
+endsnippet
+
+snippet stracc "String Accessors (stracc)"
+- (NSString *)${1:thing}
+{
+	return ${2:$1};
+}
+
+- (void)set${1/.*/\u$0/}:(NSString *)/})${3:a${1/.*/\u$0/}}
+{
+	$3 = [$3 copy];
+	[$2 release];
+	$2 = $3;
+}
+endsnippet
+
+snippet syn "Synthesize"
+@synthesize ${1:property};
+endsnippet
+
+snippet setprefs "Write to defaults (setprefs)"
+[[NSUserDefaults standardUserDefaults] setObject:${1:object} forKey:${2:key}];
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/ocaml.snippets b/vim/snippets/vim-snippets/UltiSnips/ocaml.snippets
new file mode 100644
index 0000000..1ebc347
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/ocaml.snippets
@@ -0,0 +1,174 @@
+priority -50
+
+snippet rs "raise" b
+raise (${1:Not_found})
+endsnippet
+
+snippet open "open"
+let open ${1:module} in
+${2:e}
+endsnippet
+
+snippet try "try"
+try ${1:e}
+with ${2:Not_found} -> ${3:()}
+endsnippet
+
+snippet ref "ref"
+let ${1:name} = ref ${2:val} in
+${3:e}
+endsnippet
+
+snippet matchl "pattern match on a list"
+match ${1:list} with
+| [] -> ${2:()}
+| x::xs -> ${3:()}
+endsnippet
+
+snippet matcho "pattern match on an option type"
+match ${1:x} with
+| Some(${2:y}) -> ${3:()}
+| None -> ${4:()}
+endsnippet
+
+snippet fun "anonymous function"
+(fun ${1:x} -> ${2:x})
+endsnippet
+
+snippet cc "commment"
+(* ${1:comment} *)
+endsnippet
+
+snippet let "let .. in binding"
+let ${1:x} = ${2:v} in
+${3:e}
+endsnippet
+
+snippet lr "let rec"
+let rec ${1:f} =
+	${2:expr}
+endsnippet
+
+snippet if "if"
+if ${1:(* condition *)} then
+	${2:(* A *)}
+else
+	${3:(* B *)}
+endsnippet
+
+snippet If "If"
+if ${1:(* condition *)} then
+	${2:(* A *)}
+endsnippet
+
+snippet while "while"
+while ${1:(* condition *)} do
+	${2:(* A *)}
+done
+endsnippet
+
+snippet for "for"
+for ${1:i} = ${2:1} to ${3:10} do
+	${4:(* BODY *)}
+done
+endsnippet
+
+snippet match "match"
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
+endsnippet
+
+snippet Match "match"
+match ${1:(* e1 *)} with
+| ${2:p} -> ${3:e2}
+endsnippet
+
+snippet class "class"
+class ${1:name} = object
+	${2:methods}
+end
+endsnippet
+
+snippet obj "obj"
+object
+	${2:methods}
+end
+endsnippet
+
+snippet Obj "object"
+object (self)
+	${2:methods}
+end
+endsnippet
+
+snippet {{ "object functional update"
+{< ${1:x} = ${2:y} >}
+endsnippet
+
+snippet beg "beg"
+begin
+	${1:block}
+end
+endsnippet
+
+snippet ml "module instantiantion with functor"
+module ${1:Mod} = ${2:Functor}(${3:Arg})
+endsnippet
+
+snippet mod "module - no signature"
+module ${1:(* Name *)} = struct
+	${2:(* BODY *)}
+end
+endsnippet
+
+snippet Mod "module with signature"
+module ${1:(* Name *)} : ${2:(* SIG *)} = struct
+	${3:(* BODY *)}
+end
+endsnippet
+
+snippet sig "anonymous signature"
+sig
+	${2:(* BODY *)}
+end
+endsnippet
+
+snippet sigf "functor signature or anonymous functor"
+functor (${1:Arg} : ${2:ARG}) -> ${3:(* BODY *)}
+endsnippet
+
+snippet func "define functor - no signature"
+module ${1:M} (${2:Arg} : ${3:ARG}) = struct
+	${4:(* BODY *)}
+end
+endsnippet
+
+snippet Func "define functor - with signature"
+module ${1:M} (${2:Arg} : ${3:ARG}) : ${4:SIG} = struct
+	${5:(* BODY *)}
+end
+endsnippet
+
+snippet mot "Declare module signature"
+module type ${1:(* Name *)} = sig
+	${2:(* BODY *)}
+end
+endsnippet
+
+snippet module "Module with anonymous signature"
+module ${1:(* Name *)} : sig
+	${2:(* SIGNATURE *)}
+end = struct
+	${3:(* BODY *)}
+end
+endsnippet
+
+snippet oo "odoc"
+(** ${1:odoc} *)
+endsnippet
+
+snippet qt "inline qtest"
+(*$T ${1:name}
+	${2:test}
+*)
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/pandoc.snippets b/vim/snippets/vim-snippets/UltiSnips/pandoc.snippets
new file mode 100644
index 0000000..ce858f0
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/pandoc.snippets
@@ -0,0 +1,12 @@
+extends markdown
+
+# overwrite if necessary
+priority -49
+
+snippet title "Title Header" b
+% ${1:`!v vim_snippets#Filename('$1', 'title')`}
+% ${2:`!v g:snips_author`}
+% ${3:`!v strftime("%d %B %Y")`}
+
+$0
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/perl.snippets b/vim/snippets/vim-snippets/UltiSnips/perl.snippets
new file mode 100644
index 0000000..67c7f27
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/perl.snippets
@@ -0,0 +1,139 @@
+priority -50
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet ife "Conditional if..else (ife)"
+if ($1) {
+	${2:# body...}
+}
+else {
+	${3:# else...}
+}
+
+endsnippet
+
+snippet ifee "Conditional if..elsif..else (ifee)"
+if ($1) {
+	${2:# body...}
+}
+elsif ($3) {
+	${4:# elsif...}
+}
+else {
+	${5:# else...}
+}
+
+endsnippet
+
+snippet xunless "Conditional one-line (unless)"
+${1:expression} unless ${2:condition};
+
+endsnippet
+
+snippet xif "Conditional one-line (xif)"
+${1:expression} if ${2:condition};
+
+endsnippet
+
+snippet sub "Function (sub)"
+sub ${1:function_name} {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet xfore "Loop one-line (xforeach)"
+${1:expression} foreach @${2:array};
+
+endsnippet
+
+snippet xwhile "Loop one-line (xwhile)"
+${1:expression} while ${2:condition};
+
+endsnippet
+
+snippet test "Test"
+#!/usr/bin/env perl -w
+
+use strict;
+use Test::More tests => ${1:1};
+use ${2:ModuleName};
+
+ok(${3:assertion});
+
+endsnippet
+
+snippet class "class"
+package ${1:ClassName};
+
+${2:use parent qw(${3:ParentClass});}${2/.+/\n\n/}sub new {
+	my $class = shift;
+	$class = ref $class if ref $class;
+	my $self = bless {}, $class;
+	$self;
+}
+
+1;
+
+endsnippet
+
+snippet eval "eval"
+local $@;
+eval {
+	${1:# do something risky...}
+};
+if (my $${2:exception} = $@) {
+	${3:# handle failure...}
+}
+
+endsnippet
+
+snippet for "for"
+for (my $${1:var} = 0; $$1 < ${2:expression}; $$1++) {
+	${3:# body...}
+}
+
+endsnippet
+
+snippet fore "foreach"
+foreach ${1:my $${2:x}} (@${3:array}) {
+	${4:# body...}
+}
+
+endsnippet
+
+snippet if "if"
+if ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet slurp "slurp"
+my $${1:var} = do { local $/ = undef; open my $fh, '<', ${2:$file}; <$fh> };
+
+endsnippet
+
+snippet unless "unless"
+unless ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet while "while"
+while ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+snippet until "until"
+until ($1) {
+	${2:# body...}
+}
+
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/php-laravel.snippets b/vim/snippets/vim-snippets/UltiSnips/php-laravel.snippets
new file mode 100644
index 0000000..903d858
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/php-laravel.snippets
@@ -0,0 +1,270 @@
+#resource controller
+snippet l_rsc "Laravel resource controller" b
+/*!
+ * \class       $1
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
+    function __construct() {
+    }
+    
+    public function index() {
+    }
+    
+    public function create() {
+    }
+    
+    public function store() {
+    }
+    
+    public function show($id) {
+    }
+    
+    public function edit($id) {
+    }
+    
+    public function update($id) {
+    }
+    
+    public function destroy($id) {
+    }
+}
+endsnippet
+
+#service service provider
+snippet l_ssp "Laravel service provider for service" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Services};
+
+use Illuminate\Support\ServiceProvider;
+
+class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
+    
+    public function register() {
+        $this->app->bind('$4Service', function ($app) {
+            return new $5(
+                $app->make('Repositories\\$6Interface')
+            );
+        });
+    }
+}
+endsnippet
+
+#repository service provider
+snippet l_rsp "Laravel service provider for repository" b
+<?php
+
+/*!
+ * \namespace   $2
+ * \class       $3
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${2:Repositories\\${1:}};
+
+use Entities\\$1;
+use $2\\$1Repository;
+use Illuminate\Support\ServiceProvider;
+
+class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
+    /*!
+     * \var     defer
+     * \brief   Defer service
+     */
+    protected $defer = ${5:true};
+
+    public function register() {
+        $this->app->bind('$2\\$1Interface', function($app) {
+            return new $1Repository(new $1());
+        });
+    }
+
+    /*!
+     * \brief   If $defer == true need this fn
+     */ 
+    public function provides() {
+        return ['$2\\$1Interface'];
+    }
+}
+endsnippet
+
+#model
+snippet l_md "Laravel simple model" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${3:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Entities};
+
+class ${2:`!v expand('%:t:r')`} extends \Eloquent {
+    protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+    public $timestamps = ${5:false};
+
+    protected $hidden  = [$6];
+
+    protected $guarded = [${7:'id'}];
+}
+endsnippet
+
+#abstract repository
+snippet l_ar "Laravel abstract Repository" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $2
+ * \implements  $3
+ *
+ * \author      ${4:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Repositories};
+
+use Illuminate\Database\Eloquent\Model;
+
+abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
+    protected $model;
+
+    /*!
+     * \fn      __construct
+     *
+     * \brief   Take the model
+     */
+
+    public function __construct(Model $model) {
+        $this->model = $model;
+    }
+
+    /*!
+     * \fn      all
+     *
+     * \return  Illuminate\Database\Eloquent\Collection
+     */
+    public function all($columns = ['*']) {
+        return $this->model->all()->toArray();
+    }
+
+    /*!
+     * \fn      create
+     *
+     * \return  Illuminate\Database\Eloquent\Model
+     */
+    public function create(array $attributes) {
+        return $this->model->create($attributes);
+    }
+
+    /*!
+     * \fn      destroy
+     *
+     * \return  int
+     */
+    public function destroy($ids) {
+        return $this->model->destroy($ids);
+    }
+
+    /*!
+     * \fn      find
+     *
+     * \return  mixed
+     */
+    public function find($id, $columns = ['*']) {
+        return $this->model->find($id, $columns);
+    }
+}
+endsnippet
+
+#repository
+snippet l_r "Laravel Repository" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $3
+ * \implements  $4
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Repositories\\$2};
+
+class ${3:`!v expand('%:t:r')`} extends \\$6 implements ${4:$3RepositoryInterface} {
+    $7
+}
+endsnippet
+
+#service
+snippet l_s "Laravel Service" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${6:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace Services\\$1;
+
+use ${3:Repositories\\${4:Interface}};
+
+class ${2:`!v expand('%:t:r')`} {
+    protected $${5:repo};
+    
+    /*!
+     * \fn      __construct
+     */
+    public function __construct($4 $repo) {
+        $this->$5 = $repo;
+    }
+}
+endsnippet
+
+#facade
+snippet l_f "Laravel Facade" b
+<?php
+
+/*!
+ * \namespace   $1
+ * \class       $2
+ *
+ * \author      ${5:`!v g:snips_author`}
+ * \date        `!v strftime('%d-%m-%y')`
+ */
+
+namespace ${1:Services};
+
+use \Illuminate\Support\Facades\Facade;
+
+class ${2:`!v expand('%:t:r')`} extends Facade {
+    /*!
+     * \fn          getFacadeAccessor
+     *
+     * \return      string
+     */
+    protected static function getFacadeAccessor() { return '${4:$3Service}'; }
+}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/php-phpspec.snippets b/vim/snippets/vim-snippets/UltiSnips/php-phpspec.snippets
new file mode 100644
index 0000000..a0acfc3
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/php-phpspec.snippets
@@ -0,0 +1,222 @@
+# Snippets for phpspec, to use add the following to your .vimrc
+# `autocmd BufRead,BufNewFile,BufEnter *Spec.php UltiSnipsAddFiletypes php-phpspec`
+
+priority -50
+
+snippet spec "class XYZSpec extends ObjectBehaviour"
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use PhpSpec\ObjectBehavior;
+use Prophecy\Argument;
+
+/**
+ * @author `!v g:snips_author`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends ObjectBehavior
+{
+	function it_$1()
+	{
+		${0:${VISUAL}}
+	}
+}
+endsnippet
+
+snippet it "function it_does_something() { ... }"
+function it_$1()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet let "function let() { ... }"
+function let()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+snippet letgo "function letgo() { ... }"
+function letgo()
+{
+	${0:${VISUAL}}
+}
+endsnippet
+
+# Object construction
+snippet cw "$this->beConstructedWith($arg)"
+$this->beConstructedWith($1);
+endsnippet
+
+snippet ct "$this->beConstructedThrough($methodName, [$arg])"
+$this->beConstructedThrough(${1:'methodName'}, [${2:'$arg'}]);
+endsnippet
+
+# Identity and comparison matchers
+snippet sreturn "$this->XYZ()->shouldReturn('value')"
+$this->${1:method}()->shouldReturn(${2:'value'});
+endsnippet
+
+snippet snreturn "$this->XYZ()->shouldNotReturn('value')"
+$this->${1:method}()->shouldNotReturn(${2:'value'});
+endsnippet
+
+snippet sbe "$this->XYZ()->shouldBe('value')"
+$this->${1:method}()->shouldBe(${2:'value'});
+endsnippet
+
+snippet snbe "$this->XYZ()->shouldNotBe('value')"
+$this->${1:method}()->shouldNotBe(${2:'value'});
+endsnippet
+
+snippet sequal "$this->XYZ()->shouldEqual('value')"
+$this->${1:method}()->shouldEqual(${2:'value'});
+endsnippet
+
+snippet snequal "$this->XYZ()->shouldNotEqual('value')"
+$this->${1:method}()->shouldNotEqual(${2:'value'});
+endsnippet
+
+snippet sbequalto "$this->XYZ()->shouldBeEqualTo('value')"
+$this->${1:method}()->shouldBeEqualTo(${2:'value'});
+endsnippet
+
+snippet snbequalto "$this->XYZ()->shouldNotBeEqualTo('value')"
+$this->${1:method}()->shouldNotBeEqualTo(${2:'value'});
+endsnippet
+
+snippet sblike "$this->XYZ()->shouldBeLike('value')"
+$this->${1:method}()->shouldBeLike(${2:'value'});
+endsnippet
+
+snippet snblike "$this->XYZ()->shouldNotBeLike('value')"
+$this->${1:method}()->shouldNotBeLike(${2:'value'});
+endsnippet
+
+# Throw matcher
+snippet sthrowm "$this->shouldThrow('\Exception')->duringXYZ($arg)"
+$this->shouldThrow(${1:'\Exception'})->during${2:Method}(${3:'$arg'});
+endsnippet
+
+snippet sthrowi "$this->shouldThrow('\Exception')->duringInstantiation()"
+$this->shouldThrow(${1:'\Exception'})->duringInstantiation();
+endsnippet
+
+# Type matchers
+snippet stype "$this->shouldHaveType('Type')"
+$this->shouldHaveType($1);
+endsnippet
+
+snippet sntype "$this->shouldNotHaveType('Type')"
+$this->shouldNotHaveType($1);
+endsnippet
+
+snippet srinstance "$this->shouldReturnAnInstanceOf('Type')"
+$this->shouldReturnAnInstanceOf($1);
+endsnippet
+
+snippet snrinstance "$this->shouldNotReturnAnInstanceOf('Type')"
+$this->shouldNotReturnAnInstanceOf($1);
+endsnippet
+
+snippet sbinstance "$this->shouldBeAnInstanceOf('Type')"
+$this->shouldBeAnInstanceOf($1);
+endsnippet
+
+snippet snbinstance "$this->shouldNotBeAnInstanceOf('Type')"
+$this->shouldNotBeAnInstanceOf($1);
+endsnippet
+
+snippet simplement "$this->shouldImplement('Type')"
+$this->shouldImplement($1);
+endsnippet
+
+snippet snimplement "$this->shouldNotImplement('Type')"
+$this->shouldNotImplement($1);
+endsnippet
+
+# Object state matchers
+snippet sbstate "$this->shouldBeXYZ()"
+$this->shouldBe$1();
+endsnippet
+
+snippet snbstate "$this->shouldNotBeXYZ()"
+$this->shouldNotBe$1();
+endsnippet
+
+# Count matchers
+snippet scount "$this->XYZ()->shouldHaveCount(7)"
+$this->${1:method}()->shouldHaveCount(${2:7});
+endsnippet
+
+snippet sncount "$this->XYZ()->shouldNotHaveCount(7)"
+$this->${1:method}()->shouldNotHaveCount(${2:7});
+endsnippet
+
+# Scalar type matchers
+snippet sbscalar "$this->XYZ()->shouldBeString|Array|Bool()"
+$this->${1:method}()->shouldBe${2:String|Array|Bool}();
+endsnippet
+
+snippet snbscalar "$this->XYZ()->shouldNotBeString|Array|Bool()"
+$this->${1:method}()->shouldNotBe${2:String|Array|Bool}();
+endsnippet
+
+# Contain matcher
+snippet scontain "$this->XYZ()->shouldContain('value')"
+$this->${1:method}()->shouldContain(${2:'value'});
+endsnippet
+
+snippet sncontain "$this->XYZ()->shouldNotContain('value')"
+$this->${1:method}()->shouldNotContain(${2:'value'});
+endsnippet
+
+# Array matchers
+snippet skey "$this->XYZ()->shouldHaveKey('key')"
+$this->${1:method}()->shouldHaveKey(${2:'key'});
+endsnippet
+
+snippet snkey "$this->XYZ()->shouldNotHaveKey('key')"
+$this->${1:method}()->shouldNotHaveKey(${2:'key'});
+endsnippet
+
+snippet skeyvalue "$this->XYZ()->shouldHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+snippet snkeyvalue "$this->XYZ()->shouldNotHaveKeyWithValue('key', 'value')"
+$this->${1:method}()->shouldNotHaveKeyWithValue(${2:'key'}, ${3:'value'});
+endsnippet
+
+# String matchers
+snippet sstart "$this->XYZ()->shouldStartWith('string')"
+$this->${1:method}()->shouldStartWith(${2:'string'});
+endsnippet
+
+snippet snstart "$this->XYZ()->shouldNotStartWith('string')"
+$this->${1:method}()->shouldNotStartWith(${2:'string'});
+endsnippet
+
+snippet send "$this->XYZ()->shouldEndWith('string')"
+$this->${1:method}()->shouldEndWith(${2:'string'});
+endsnippet
+
+snippet snend "$this->XYZ()->shouldNotEndWith('string')"
+$this->${1:method}()->shouldNotEndWith(${2:'string'});
+endsnippet
+
+snippet smatch "$this->XYZ()->shouldMatch('/wizard/i')"
+$this->${1:method}()->shouldMatch(${2:'/wizard/i'});
+endsnippet
+
+snippet snmatch "$this->XYZ()->shouldNotMatch('/wizard/i')"
+$this->${1:method}()->shouldNotMatch(${2:'/wizard/i'});
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/php-symfony2.snippets b/vim/snippets/vim-snippets/UltiSnips/php-symfony2.snippets
new file mode 100644
index 0000000..7e3d580
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/php-symfony2.snippets
@@ -0,0 +1,360 @@
+# sugguestion? report bugs?
+# go to https://github.com/chrisyue/vim-snippets/issues
+
+priority -50
+
+snippet classn "Basic class with namespace snippet" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * ${1:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`$2
+{
+    public function __construct(${3:$options})
+    {
+        ${4:// code}
+    }$0
+}
+endsnippet
+
+snippet contr "Symfony2 controller" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+
+/**
+ * ${1:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Controller
+{
+}
+endsnippet
+
+snippet sfa "Symfony 2 Controller action"
+/**
+* @Route("/${1:route_name}", name="$1")
+* @Template()
+*/
+public function $1Action($2)
+{
+	$3
+	return ${4:[];}$0
+}
+endsnippet
+
+snippet act "Symfony2 action" b
+/**
+ * @Route("$3", name="$4")
+ * @Method({${5:"POST"}})
+ * @Template()
+ */
+public function $1Action($2)
+{
+	$6
+}
+endsnippet
+
+snippet actt "Symfony2 action and template" b
+/**
+ * @Route("$3", name="$4")
+ * @Method({${5:"GET"}})
+ * @Template()
+ */
+public function $1Action($2)
+{
+	$6
+	return [];
+}`!p
+relpath = os.path.relpath(path)`
+endsnippet
+
+snippet comm "Symfony2 command" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+/**
+ * ${3:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends ContainerAwareCommand
+{
+	protected function configure()
+	{
+		$this->setName('$1')
+			->setDescription('$2')
+			->setDefinition([
+				new InputArgument('', InputArgument::REQUIRED, ''),
+				new InputOption('', null, InputOption::VALUE_NONE, ''),
+			]);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output)
+	{
+	}
+}
+endsnippet
+
+snippet subs "Symfony2 subscriber" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+/**
+ * ${1:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` implements EventSubscriberInterface
+{
+	public function __construct()
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public static function getSubscribedEvents()
+	{
+		return [];
+	}
+}
+endsnippet
+
+snippet transf "Symfony2 form data transformer" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\DataTransformerInterface;
+use Symfony\Component\Form\Exception\TransformationFailedException;
+
+/**
+ * ${3:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` implements DataTransformerInterface
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function transform($1)
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function reverseTransform($2)
+	{
+	}
+}
+endsnippet
+
+snippet ent "Symfony2 doctrine entity" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * ${3:@author `!v g:snips_author`}
+ *
+ * @ORM\Entity()
+ * @ORM\Table(name="`!p
+tmp = re.match(r'.*(?=\.)', fn).group()
+tmp = re.sub(r'\B([A-Z])', r'_\1', tmp)
+snip.rv = tmp.lower()
+`")
+ */
+`!p
+m = re.search(r'Abstract', path)
+if m:
+	snip.rv = 'abstract '
+`class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+`
+{
+	/**
+	 * @ORM\Column(type="integer")
+	 * @ORM\GeneratedValue
+	 * @ORM\Id
+	 */
+	private $id;
+}
+endsnippet
+
+snippet form "Symfony2 form type" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+/**
+ * ${2:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends AbstractType
+{
+	/**
+	 * {@inheritDoc}
+	 */
+	public function buildForm(FormBuilderInterface $builder, array $options)
+	{
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function setDefaultOptions(OptionsResolverInterface $resolver)
+	{
+		$resolver->setDefaults();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getName()
+	{
+		return '$1';
+	}
+}
+endsnippet
+
+snippet ev "Symfony2 event" b
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+use Symfony\Component\EventDispatcher\Event;
+
+/**
+ * ${2:@author `!v g:snips_author`}
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends Event
+{
+}
+endsnippet
+
+snippet redir "Symfony2 redirect" b
+$this->redirect($this->generateUrl('$1', $2));
+endsnippet
+
+snippet usecontroller "Symfony2 use Symfony\..\Controller" b
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;$1
+endsnippet
+
+snippet usereauest "Symfony2 use Symfony\..\Request" b
+use Symfony\Component\HttpFoundation\Request;$1
+endsnippet
+
+snippet useroute "Symfony2 use Sensio\..\Route" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;$1
+endsnippet
+
+snippet useresponse "Symfony2 use Symfony\..\Response" b
+use Symfony\Component\HttpFoundation\Response;$1
+endsnippet
+
+snippet usefile "Symfony2 use Symfony\..\File" b
+use Symfony\Component\HttpFoundation\File\UploadedFile;$1
+endsnippet
+
+snippet useassert "Symfony2 use Symfony\..\Constraints as Assert" b
+use Symfony\Component\Validator\Constraints as Assert;$1
+endsnippet
+
+snippet usetemplate "Symfony2 use Sensio\..\Template" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;$1
+endsnippet
+
+snippet usecache "Symfony2 use Sensio\..\Cache" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Cache;$1
+endsnippet
+
+snippet usemethod "Symfony2 use Sensio\..\Method" b
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;$1
+endsnippet
+
+snippet usearray "Symfony2 use Doctrine\..\ArrayCollection" b
+use Doctrine\Common\Collections\ArrayCollection;$1
+endsnippet
+
+snippet useorm "Symfony2 use Doctrine\..\Mapping as ORM" b
+use Doctrine\ORM\Mapping as ORM;$1
+endsnippet
+
+snippet usesecure "Symfony2 use JMS\..\Secure" b
+use JMS\SecurityExtraBundle\Annotation\Secure;$1
+endsnippet
+
diff --git a/vim/snippets/vim-snippets/UltiSnips/php.snippets b/vim/snippets/vim-snippets/UltiSnips/php.snippets
new file mode 100644
index 0000000..dde0def
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/php.snippets
@@ -0,0 +1,260 @@
+priority -50
+
+global !p
+import vim
+
+# Set g:ultisnips_php_scalar_types to 1 if you'd like to enable PHP 7's scalar types for return values
+def isPHPScalarTypesEnabled():
+	isEnabled = vim.eval("get(g:, 'ultisnips_php_scalar_types', 0)") == "1"
+	return isEnabled or re.match('<\?php\s+declare\(strict_types=[01]\);', '\n'.join(vim.current.window.buffer))
+endglobal
+
+## Snippets from SnipMate, taken from
+## https://github.com/scrooloose/snipmate-snippets.git
+
+snippet gm "PHP Class Getter" b
+/**
+ * Getter for $1
+ *
+ * @return ${2:string}
+ */
+public function get${1/\w+\s*/\u$0/}()`!p snip.rv = ': '+t[2] if isPHPScalarTypesEnabled() else ''`
+{
+    return $this->$1;
+}
+endsnippet
+
+snippet sm "PHP Class Setter" b
+/**
+ * Setter for $1
+ *
+ * @param ${2:string} $$1
+ * @return ${3:`!p snip.rv=snip.basename`}
+ */
+public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
+{
+    $this->$1 = $$1;
+
+    ${5:return $this;}
+}
+endsnippet
+
+snippet gs "PHP Class Getter Setter" b
+/**
+ * Getter for $1
+ *
+ * @return ${2:string}
+ */
+public function get${1/\w+\s*/\u$0/}()`!p snip.rv = ': '+t[2] if isPHPScalarTypesEnabled() else ''`
+{
+    return $this->$1;
+}
+
+/**
+ * Setter for $1
+ *
+ * @param $2 $$1
+ * @return ${3:`!p snip.rv=snip.basename`}
+ */
+public function set${1/\w+\s*/\u$0/}(${4:${2/(void|string|int|integer|double|float|object|boolear|null|mixed|number|resource)|(.*)/(?1::$2 )/}}$$1)
+{
+    $this->$1 = $$1;
+
+    ${5:return $this;}
+}
+endsnippet
+
+snippet pub "Public function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+public function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet pro "Protected function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+protected function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet pri "Private function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+private function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet pubs "Public static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+public static function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet pros "Protected static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+protected static function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet pris "Private static function" b
+/**
+ * ${3:undocumented function}
+ *
+ * @return ${4:void}
+ */
+private static function ${1:name}(${2:$param})
+{
+	${VISUAL}${5:return null;}
+}
+$0
+endsnippet
+
+snippet fu "Function snip" b
+function ${1:name}(${2:$param})
+{
+	${VISUAL}${3:return null;}
+}
+$0
+endsnippet
+
+snippet new "New class instance" b
+$${1:variableName} = new ${2:${1/\w+\s*/\u$0/}}($3);
+$0
+endsnippet
+
+snippet ns "namespace declaration" b
+namespace ${1:`!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+endsnippet
+
+snippet class "Class declaration template" b
+<?php
+
+namespace ${1:`!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
+/**
+ * Class ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
+ */
+class $1
+{
+}
+endsnippet
+
+snippet interface "Interface declaration template" b
+<?php
+
+namespace ${1:`!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
+/**
+ * Interface ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
+ */
+interface $1
+{
+	public function ${3:someFunction}();$4
+}
+endsnippet
+
+snippet trait "Trait declaration template" b
+<?php
+
+namespace ${1:`!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`};
+
+/**
+ * Trait ${1:`!p snip.rv=snip.basename`}
+ * @author ${2:`!v g:snips_author`}
+ */
+trait $1
+{
+}
+endsnippet
+
+snippet construct "__construct()" b
+/**
+ * @param $2mixed ${1/, /\n     * \@param mixed /g}
+ */
+public function __construct(${1:$dependencies})
+{${1/\$(\w+)(, )*/\n        $this->$1 = $$1;/g}
+}
+$0
+endsnippet
+
+# PHPUnit snippets
+snippet testcase "class XYZTest extends \PHPUnit_Framework_TestCase { ... }"
+<?php
+
+namespace `!p
+relpath = os.path.relpath(path)
+m = re.search(r'[A-Z].+(?=/)', relpath)
+if m:
+	snip.rv = m.group().replace('/', '\\')
+`;
+
+/**
+ * @author `!v g:snips_author`
+ */
+class `!p
+snip.rv = re.match(r'.*(?=\.)', fn).group()
+` extends \PHPUnit_Framework_TestCase
+{
+	public function test$1()
+	{
+		${0:${VISUAL}}
+	}
+}
+endsnippet
+
+# :vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/proto.snippets b/vim/snippets/vim-snippets/UltiSnips/proto.snippets
new file mode 100644
index 0000000..11e9010
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/proto.snippets
@@ -0,0 +1,52 @@
+priority -50
+
+global !p
+from vimsnippets import complete
+
+FIELD_TYPES = [
+	'double',
+	'float',
+	'int32',
+	'int64',
+	'uint32',
+	'uint64',
+	'sint32',
+	'sint64',
+	'fixed32',
+	'fixed64',
+	'sfixed32',
+	'sfixed64',
+	'bool',
+	'string',
+	'bytes']
+endglobal
+
+snippet mess "Proto message" b
+// ${2:TODO(`whoami`): Describe this message.}
+message ${1:Name} {
+	$0
+
+	// Next available id: 1
+}
+endsnippet
+
+snippet reqf "Required field" b
+// ${4:TODO(`whoami`): Describe this field.}
+optional $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};  // Required
+endsnippet
+
+snippet optf "Optional field" b
+// ${4:TODO(`whoami`): Describe this field.}
+optional $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+endsnippet
+
+snippet repf "Repeated field" b
+// ${4:TODO(`whoami`): Describe this field.}
+repeated $1`!p snip.rv = complete(t[1], FIELD_TYPES)` ${2:name} = ${3:1};
+endsnippet
+
+snippet enum "Enumeration" b
+// ${2:TODO(`whoami`): Describe this enum.}
+enum ${1:Name} {
+}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/puppet.snippets b/vim/snippets/vim-snippets/UltiSnips/puppet.snippets
new file mode 100644
index 0000000..7b39094
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/puppet.snippets
@@ -0,0 +1,235 @@
+priority -50
+
+#########################################################################
+#  Python helper code                                                   #
+#########################################################################
+
+global !p
+import vim
+import os.path
+def get_module_namespace_and_basename():
+	"""This function will try to guess the current class or define name you are
+	trying to create. Note that for this to work you should be using the module
+	structure as per the style guide. Examples inputs and it's output
+	* /home/nikolavp/puppet/modules/collectd/manifests/init.pp -> collectd
+	* /home/nikolavp/puppet/modules/collectd/manfistes/mysql.pp -> collectd::mysql
+	"""
+	first_time = True
+	current_file_path_without_ext = vim.eval('expand("%:p:r")') or ""
+	if not current_file_path_without_ext:
+		return "name"
+	parts = os.path.split(current_file_path_without_ext)
+	namespace = ''
+	while parts[0] and parts[0] != '/':
+		if parts[1] == 'init' and first_time and not namespace:
+			first_time = False
+			parts = os.path.split(parts[0])
+			continue
+		if parts[1] == 'manifests':
+			return os.path.split(parts[0])[1] + ('::' + namespace).rstrip(':')
+		else:
+			namespace = parts[1] + '::' + namespace
+		parts = os.path.split(parts[0])
+	# couldn't guess the namespace. The user is editing a raw file in no module like the site.pp file
+	return "name"
+endglobal
+
+###############################################################################
+#  Puppet Language Constructs                                                 #
+#    See http://docs.puppetlabs.com/puppet/latest/reference/lang_summary.html #
+###############################################################################
+
+snippet class "Class declaration" b
+class ${1:`!p snip.rv = get_module_namespace_and_basename()`} {
+	${0:# body}
+}
+endsnippet
+
+snippet define "Definition" b
+define ${1:`!p snip.rv = get_module_namespace_and_basename()`} {
+	${0:# body}
+}
+endsnippet
+
+#################################################################
+#  Puppet Types                                                 #
+#    See http://docs.puppetlabs.com/references/latest/type.html #
+#################################################################
+
+snippet cron "Cron resource type" b
+cron { '${1:name}':
+	user    => ${2:user},
+	command => '${3:command}',
+	minute  => ${3:minute},
+	hour    => ${4:hour},
+}
+endsnippet
+
+snippet exec "Exec resource type" b
+exec { '${1:command}':
+	refreshonly => true,
+}
+endsnippet
+
+snippet file "File resource type" b
+file { '${1:name}':
+	source => "puppet://${2:path}",
+	mode   => ${3:mode},
+}
+endsnippet
+
+snippet File "Defaults for file" b
+File {
+	owner => ${1:username},
+	group => ${2:groupname},
+}
+endsnippet
+
+snippet group "Group resource type" b
+group { '${1:groupname}':
+	ensure => ${3:present},
+	gid    => ${2:gid},
+}
+endsnippet
+
+snippet mount "Mount resource type" b
+mount { '${1:path}':
+	device  => '${2:/dev}',
+	fstype  => '${3:filesystem}',
+	ensure  => mounted,
+	options => 'rw,errors=remount-ro',
+}
+endsnippet
+
+snippet package "Package resource type" b
+package { '${1:name}':
+	ensure => ${2:installed},
+}
+endsnippet
+
+snippet user "user resource type" b
+user { '${1:username}':
+	ensure     => ${2:present},
+	uid        => ${3:uid},
+	gid        => ${4:gid},
+	comment    => ${5:gecos},
+	home       => ${6:homedirectory},
+	managehome => false,
+	require    => Group['${7:group'}],
+}
+endsnippet
+
+snippet service "Service resource type" b
+service { '${1:name}':
+	hasstatus => true,
+	enable    => true,
+	ensure    => running,
+}
+endsnippet
+
+########################################################################
+#  Puppet Functions                                                    #
+#    See http://docs.puppetlabs.com/references/latest/function.html    #
+########################################################################
+
+snippet alert "Alert Function" b
+alert("${1:message}")$0
+endsnippet
+
+snippet crit "Crit Function" b
+crit("${1:message}")$0
+endsnippet
+
+snippet debug "Debug Function" b
+debug("${1:message}")$0
+endsnippet
+
+snippet defined "Defined Function" b
+defined(${1:Resource}["${2:name}"])$0
+endsnippet
+
+snippet emerg "Emerg Function" b
+emerg("${1:message}")$0
+endsnippet
+
+snippet extlookup "Simple Extlookup" b
+$${1:Variable} = extlookup("${2:Lookup}")$0
+endsnippet
+
+snippet extlookup "Extlookup with defaults" b
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default})$0
+endsnippet
+
+snippet extlookup "Extlookup with defaults and custom data file" b
+$${1:Variable} = extlookup("${2:Lookup}", ${3:Default}, ${4:Data Source})$0
+endsnippet
+
+snippet fail "Fail Function" b
+fail("${1:message}")$0
+endsnippet
+
+snippet hiera "Hiera Function" b
+$${1:Variable} = hiera("${2:Lookup}")$0
+endsnippet
+
+snippet hiera "Hiera with defaults" b
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default})$0
+endsnippet
+
+snippet hiera "Hiera with defaults and override" b
+$${1:Variable} = hiera("${2:Lookup}", ${3:Default}, ${4:Override})$0
+endsnippet
+
+snippet hiera_hash "Hiera Hash Function" b
+$${1:Variable} = hiera_hash("${2:Lookup}")$0
+endsnippet
+
+snippet hiera_hash "Hiera Hash with defaults" b
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default})$0
+endsnippet
+
+snippet hiera_hash "Hiera Hash with defaults and override" b
+$${1:Variable} = hiera_hash("${2:Lookup}", ${3:Default}, ${4:Override})$0
+endsnippet
+
+snippet hiera_include "Hiera Include Function" b
+hiera_include("${1:Lookup}")$0
+endsnippet
+
+snippet include "Include Function" b
+include ${1:classname}$0
+endsnippet
+
+snippet info "Info Function" b
+info("${1:message}")$0
+endsnippet
+
+snippet inline_template "Inline Template Function" b
+inline_template("<%= ${1:template} %>")$0
+endsnippet
+
+snippet notice "Notice Function" b
+notice("${1:message}")$0
+endsnippet
+
+snippet realize "Realize Function" b
+realize(${1:Resource}["${2:name}"])$0
+endsnippet
+
+snippet regsubst "Regsubst Function" b
+regsubst($${1:Target}, '${2:regexp}', '${3:replacement}')$0
+endsnippet
+
+snippet split "Split Function" b
+$${1:Variable} = split($${1:Target}, '${2:regexp}')$0
+endsnippet
+
+snippet versioncmp "Version Compare Function" b
+$${1:Variable} = versioncmp('${1:version}', '${2:version}')$0
+endsnippet
+
+snippet warning "Warning Function" b
+warning("${1:message}")$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/python.snippets b/vim/snippets/vim-snippets/UltiSnips/python.snippets
new file mode 100644
index 0000000..686226e
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/python.snippets
@@ -0,0 +1,712 @@
+priority -50
+
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+
+#! header
+snippet #! "Shebang header for python scripts" b
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+$0
+endsnippet
+
+snippet ifmain "ifmain" b
+if __name__ == `!p snip.rv = get_quoting_style(snip)`__main__`!p snip.rv = get_quoting_style(snip)`:
+	${1:${VISUAL:main()}}
+endsnippet
+
+snippet with "with" b
+with ${1:expr}`!p snip.rv = " as " if t[2] else ""`${2:var}:
+	${3:${VISUAL:pass}}
+$0
+endsnippet
+
+snippet for "for loop" b
+for ${1:item} in ${2:iterable}:
+	${3:${VISUAL:pass}}
+endsnippet
+
+##########
+# COMMON #
+##########
+
+# The smart def and smart class snippets use a global option called
+# "g:ultisnips_python_style" which, if set to "doxygen" will use doxygen
+# style comments in docstrings.
+
+global !p
+
+NORMAL  = 0x1
+DOXYGEN = 0x2
+SPHINX  = 0x3
+GOOGLE  = 0x4
+NUMPY   = 0x5
+JEDI    = 0x6
+
+SINGLE_QUOTES = "'"
+DOUBLE_QUOTES = '"'
+
+
+class Arg(object):
+	def __init__(self, arg):
+		self.arg = arg
+		self.name = arg.split('=')[0].strip()
+
+	def __str__(self):
+		return self.name
+
+	def __unicode__(self):
+		return self.name
+
+	def is_kwarg(self):
+		return '=' in self.arg
+
+
+def get_args(arglist):
+	args = [Arg(arg) for arg in arglist.split(',') if arg]
+	args = [arg for arg in args if arg.name != 'self']
+
+	return args
+
+
+def get_quoting_style(snip):
+	style = snip.opt("g:ultisnips_python_quoting_style", "double")
+	if style == 'single':
+		return SINGLE_QUOTES
+	return DOUBLE_QUOTES
+
+def triple_quotes(snip):
+	style = snip.opt("g:ultisnips_python_triple_quoting_style")
+	if not style:
+		return get_quoting_style(snip) * 3
+	return (SINGLE_QUOTES if style == 'single' else DOUBLE_QUOTES) * 3
+
+def triple_quotes_handle_trailing(snip, quoting_style):
+	"""
+	Generate triple quoted strings and handle any trailing quote char,
+	which might be there from some autoclose/autopair plugin,
+	i.e. when expanding ``"|"``.
+	"""
+	if not snip.c:
+		# Do this only once, otherwise the following error would happen:
+		# RuntimeError: The snippets content did not converge: …
+		_, col = vim.current.window.cursor
+		line = vim.current.line
+
+		# Handle already existing quote chars after the trigger.
+		_ret = quoting_style * 3
+		while True:
+			try:
+				nextc = line[col]
+			except IndexError:
+				break
+			if nextc == quoting_style and len(_ret):
+				_ret = _ret[1:]
+				col = col+1
+			else:
+				break
+		snip.rv = _ret
+	else:
+		snip.rv = snip.c
+
+def get_style(snip):
+	style = snip.opt("g:ultisnips_python_style", "normal")
+
+	if    style == "doxygen": return DOXYGEN
+	elif  style == "sphinx": return SPHINX
+	elif  style == "google": return GOOGLE
+	elif  style == "numpy": return NUMPY
+	elif  style == "jedi": return JEDI
+	else: return NORMAL
+
+
+def format_arg(arg, style):
+	if style == DOXYGEN:
+		return "@param %s TODO" % arg
+	elif style == SPHINX:
+		return ":param %s: TODO" % arg
+	elif style == NORMAL:
+		return ":%s: TODO" % arg
+	elif style == GOOGLE:
+		return "%s (TODO): TODO" % arg
+	elif style == JEDI:
+		return ":type %s: TODO" % arg
+	elif style == NUMPY:
+		return "%s : TODO" % arg
+
+
+def format_return(style):
+	if style == DOXYGEN:
+		return "@return: TODO"
+	elif style in (NORMAL, SPHINX, JEDI):
+		return ":returns: TODO"
+	elif style == GOOGLE:
+		return "Returns: TODO"
+
+
+def write_docstring_args(args, snip):
+	if not args:
+		snip.rv += ' {0}'.format(triple_quotes(snip))
+		return
+
+	snip.rv += '\n' + snip.mkline('', indent='')
+
+	style = get_style(snip)
+
+	if style == GOOGLE:
+		write_google_docstring_args(args, snip)
+	elif style == NUMPY:
+		write_numpy_docstring_args(args, snip)
+	else:
+		for arg in args:
+			snip += format_arg(arg, style)
+
+
+def write_google_docstring_args(args, snip):
+	kwargs = [arg for arg in args if arg.is_kwarg()]
+	args = [arg for arg in args if not arg.is_kwarg()]
+
+	if args:
+		snip += "Args:"
+		snip.shift()
+		for arg in args:
+			snip += format_arg(arg, GOOGLE)
+		snip.unshift()
+		snip.rv += '\n' + snip.mkline('', indent='')
+
+	if kwargs:
+		snip += "Kwargs:"
+		snip.shift()
+		for kwarg in kwargs:
+			snip += format_arg(kwarg, GOOGLE)
+		snip.unshift()
+		snip.rv += '\n' + snip.mkline('', indent='')
+
+
+def write_numpy_docstring_args(args, snip):
+	if args:
+		snip += "Parameters"
+		snip += "----------"
+
+	kwargs = [arg for arg in args if arg.is_kwarg()]
+	args = [arg for arg in args if not arg.is_kwarg()]
+
+	if args:
+		for arg in args:
+			snip += format_arg(arg, NUMPY)
+	if kwargs:
+		for kwarg in kwargs:
+			snip += format_arg(kwarg, NUMPY) + ', optional'
+	snip.rv += '\n' + snip.mkline('', indent='')
+
+
+def write_init_body(args, parents, snip):
+	parents = [p.strip() for p in parents.split(",")]
+	parents = [p for p in parents if p != 'object']
+
+	for p in parents:
+		snip += p + ".__init__(self)"
+
+	if parents:
+		snip.rv += '\n' + snip.mkline('', indent='')
+
+	for arg in args:
+		snip += "self._%s = %s" % (arg, arg)
+
+
+def write_slots_args(args, snip):
+	args = ['"_%s"' % arg for arg in args]
+	snip += '__slots__ = (%s,)' % ', '.join(args)
+
+
+def write_function_docstring(t, snip):
+	"""
+	Writes a function docstring with the current style.
+
+	:param t: The values of the placeholders
+	:param snip: UltiSnips.TextObjects.SnippetUtil object instance
+	"""
+	snip.rv = ""
+	snip >> 1
+
+	args = get_args(t[2])
+	if args:
+		write_docstring_args(args, snip)
+
+	style = get_style(snip)
+
+	if style == NUMPY:
+		snip += 'Returns'
+		snip += '-------'
+		snip += 'TODO'
+	else:
+		snip += format_return(style)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += triple_quotes(snip)
+
+def get_dir_and_file_name(snip):
+	return os.getcwd().split(os.sep)[-1] + '.' + snip.basename
+
+endglobal
+
+########################################
+# Class & Special Method Name Snippets #
+########################################
+
+snippet class "class with docstrings" b
+class ${1:MyClass}(${2:object}):
+
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
+
+	def __init__(self$4):
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined1.}`!p
+snip.rv = ""
+snip >> 2
+
+args = get_args(t[4])
+
+write_docstring_args(args, snip)
+if args:
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += '{0}'.format(triple_quotes(snip))
+
+write_init_body(args, t[2], snip)
+`
+		$0
+endsnippet
+
+
+snippet slotclass "class with slots and docstrings" b
+class ${1:MyClass}(${2:object}):
+
+	`!p snip.rv = triple_quotes(snip)`${3:Docstring for $1. }`!p snip.rv = triple_quotes(snip)`
+`!p
+snip >> 1
+args = get_args(t[4])
+write_slots_args(args, snip)
+`
+
+	def __init__(self$4):
+		`!p snip.rv = triple_quotes(snip)`${5:TODO: to be defined.}`!p
+snip.rv = ""
+snip >> 2
+
+args = get_args(t[4])
+
+write_docstring_args(args, snip)
+if args:
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += triple_quotes(snip)
+
+write_init_body(args, t[2], snip)
+`
+		$0
+endsnippet
+
+
+snippet contain "methods for emulating a container type" b
+def __len__(self):
+	${1:pass}
+
+def __getitem__(self, key):
+	${2:pass}
+
+def __setitem__(self, key, value):
+	${3:pass}
+
+def __delitem__(self, key):
+	${4:pass}
+
+def __iter__(self):
+	${5:pass}
+
+def __reversed__(self):
+	${6:pass}
+
+def __contains__(self, item):
+	${7:pass}
+endsnippet
+
+
+snippet context "context manager methods" b
+def __enter__(self):
+	${1:pass}
+
+def __exit__(self, exc_type, exc_value, traceback):
+	${2:pass}
+endsnippet
+
+
+snippet attr "methods for customizing attribute access" b
+def __getattr__(self, name):
+	${1:pass}
+
+def __setattr__(self, name, value):
+	${2:pass}
+
+def __delattr__(self, name):
+	${3:pass}
+endsnippet
+
+
+snippet desc "methods implementing descriptors" b
+def __get__(self, instance, owner):
+	${1:pass}
+
+def __set__(self, instance, value):
+	${2:pass}
+
+def __delete__(self, instance):
+	${3:pass}
+endsnippet
+
+
+snippet cmp "methods implementing rich comparison"
+def __eq__(self, other):
+	${1:pass}
+
+def __ne__(self, other):
+	${2:pass}
+
+def __lt__(self, other):
+	${3:pass}
+
+def __le__(self, other):
+	${4:pass}
+
+def __gt__(self, other):
+	${5:pass}
+
+def __ge__(self, other):
+	${6:pass}
+
+def __cmp__(self, other):
+	${7:pass}
+endsnippet
+
+
+snippet repr "methods implementing string representation"
+def __repr__(self):
+	${1:pass}
+
+def __str__(self):
+	${2:pass}
+
+def __unicode__(self):
+	${3:pass}
+endsnippet
+
+
+# note: reflected operands and augmented arithmeitc assignements have been
+# intentionally ommited to reduce verbosity.
+snippet numeric "methods for emulating a numeric type" b
+def __add__(self, other):
+	${1:pass}
+
+def __sub__(self, other):
+	${2:pass}
+
+def __mul__(self, other):
+	${3:pass}
+
+def __div__(self, other):
+	${4:pass}
+
+def __truediv__(self, other):
+	${5:pass}
+
+def __floordiv__(self, other):
+	${6:pass}
+
+
+def __mod__(self, other):
+	${7:pass}
+
+def __divmod__(self, other):
+	${8:pass}
+
+def __pow__(self, other):
+	${9:pass}
+
+
+def __lshift__(self, other):
+	${10:pass}
+
+def __rshift__(self, other):
+	${11:pass}
+
+def __and__(self, other):
+	${12:pass}
+
+def __xor__(self, other):
+	${13:pass}
+
+def __or__(self, other):
+	${14:pass}
+
+
+def __neg__(self):
+	${15:pass}
+
+def __pos__(self):
+	${16:pass}
+
+def __abs__(self):
+	${17:pass}
+
+def __invert__(self):
+	${18:pass}
+
+
+def __complex__(self):
+	${19:pass}
+
+def __int__(self):
+	${20:pass}
+
+def __long__(self):
+	${21:pass}
+
+def __float__(self):
+	${22:pass}
+
+
+def __oct__(self):
+	${22:pass}
+
+def __hex__(self):
+	${23:pass}
+
+
+def __index__(self):
+	${24:pass}
+
+def __coerce__(self, other):
+	${25:pass}
+endsnippet
+
+snippet deff
+def ${1:fname}(`!p snip.rv = vim.eval('indent(".") ? "self" : ""')`$2):
+	$0
+endsnippet
+
+snippet def "function with docstrings" b
+def ${1:function}(`!p
+if snip.indent:
+	snip.rv = 'self' + (", " if len(t[2]) else "")`${2:arg1}):
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
+write_function_docstring(t, snip) `
+	${5:${VISUAL:pass}}
+endsnippet
+
+
+snippet defc "class method with docstrings" b
+@classmethod
+def ${1:function}(`!p
+if snip.indent:
+	snip.rv = 'cls' + (", " if len(t[2]) else "")`${2:arg1}):
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
+write_function_docstring(t, snip) `
+	${5:${VISUAL:pass}}
+endsnippet
+
+
+snippet defs "static method with docstrings" b
+@staticmethod
+def ${1:function}(${2:arg1}):
+	`!p snip.rv = triple_quotes(snip)`${4:TODO: Docstring for $1.}`!p
+write_function_docstring(t, snip) `
+	${5:${VISUAL:pass}}
+endsnippet
+
+
+# doesn't expand when there is a word in front
+snippet /(^|(?<=\W))\./ "self." r
+self.
+endsnippet
+
+snippet from "from module import name" b
+from ${1:module} import ${2:Stuff}
+endsnippet
+
+
+##############
+# PROPERTIES #
+##############
+snippet roprop "Read Only Property" b
+@property
+def ${1:name}(self):
+	${2:return self._$1}$0
+endsnippet
+
+snippet rwprop "Read write property" b
+def ${1:name}():
+	`!p snip.rv = triple_quotes(snip) if t[2] else ''
+`${2:TODO: Docstring for $1.}`!p
+if t[2]:
+	snip >> 1
+
+	style = get_style(snip)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += format_return(style)
+	snip.rv += '\n' + snip.mkline('', indent='')
+	snip += triple_quotes(snip)
+else:
+	snip.rv = ""`
+	def fget(self):
+		return self._$1$0
+
+	def fset(self, value):
+		self._$1 = value
+	return locals()
+
+$1 = property(**$1(), doc=$1.__doc__)
+endsnippet
+
+
+####################
+# If / Else / Elif #
+####################
+snippet if "If" b
+if ${1:condition}:
+	${2:${VISUAL:pass}}
+endsnippet
+
+snippet ife "If / Else" b
+if ${1:condition}:
+	${2:${VISUAL:pass}}
+else:
+	${3:pass}
+endsnippet
+
+snippet ifee "If / Elif / Else" b
+if ${1:condition}:
+	${2:${VISUAL:pass}}
+elif ${3:condition}:
+	${4:pass}
+else:
+	${5:pass}
+endsnippet
+
+
+##########################
+# Try / Except / Finally #
+##########################
+snippet try "Try / Except" b
+try:
+	${1:${VISUAL:pass}}
+except ${2:Exception} as ${3:e}:
+	${4:raise $3}
+endsnippet
+
+snippet trye "Try / Except / Else" b
+try:
+	${1:${VISUAL:pass}}
+except ${2:Exception} as ${3:e}:
+	${4:raise $3}
+else:
+	${5:pass}
+endsnippet
+
+snippet tryf "Try / Except / Finally" b
+try:
+	${1:${VISUAL:pass}}
+except ${2:Exception} as ${3:e}:
+	${4:raise $3}
+finally:
+	${5:pass}
+endsnippet
+
+snippet tryef "Try / Except / Else / Finally" b
+try:
+	${1:${VISUAL:pass}}
+except${2: ${3:Exception} as ${4:e}}:
+	${5:raise}
+else:
+	${6:pass}
+finally:
+	${7:pass}
+endsnippet
+
+
+######################
+# Assertions & Tests #
+######################
+
+snippet ae "Assert equal" b
+self.assertEqual(${1:${VISUAL:first}},${2:second})
+endsnippet
+
+snippet at "Assert True" b
+self.assertTrue(${1:${VISUAL:expression}})
+endsnippet
+
+snippet af "Assert False" b
+self.assertFalse(${1:${VISUAL:expression}})
+endsnippet
+
+snippet aae "Assert almost equal" b
+self.assertAlmostEqual(${1:${VISUAL:first}},${2:second})
+endsnippet
+
+snippet ar "Assert raises" b
+self.assertRaises(${1:exception}, ${2:${VISUAL:func}}${3/.+/, /}${3:arguments})
+endsnippet
+
+snippet an "Assert is None" b
+self.assertIsNone(${1:${VISUAL:expression}})
+endsnippet
+
+snippet ann "Assert is not None" b
+self.assertIsNotNone(${1:${VISUAL:expression}})
+endsnippet
+
+snippet testcase "pyunit testcase" b
+class Test${1:Class}(${2:unittest.TestCase}):
+
+	`!p snip.rv = triple_quotes(snip)`${3:Test case docstring.}`!p snip.rv = triple_quotes(snip)`
+
+	def setUp(self):
+		${4:pass}
+
+	def tearDown(self):
+		${5:pass}
+
+	def test_${6:name}(self):
+		${7:${VISUAL:pass}}
+endsnippet
+
+snippet " "triple quoted string (double quotes)" b
+"""
+${1:${VISUAL:doc}}
+`!p triple_quotes_handle_trailing(snip, '"')`
+endsnippet
+
+snippet ' "triple quoted string (single quotes)" b
+'''
+${1:${VISUAL:doc}}
+`!p triple_quotes_handle_trailing(snip, "'")`
+endsnippet
+
+snippet doc "doc block (triple quotes)"
+`!p snip.rv = triple_quotes(snip)`
+${1:${VISUAL:doc}}
+`!p snip.rv = triple_quotes(snip)`
+endsnippet
+
+snippet pmdoc "pocoo style module doc string" b
+# -*- coding: utf-8 -*-
+"""
+	`!p snip.rv = get_dir_and_file_name(snip)`
+	`!p snip.rv = '~' * len(get_dir_and_file_name(snip))`
+
+	${1:DESCRIPTION}
+
+	:copyright: (c) `date +%Y` by ${2:YOUR_NAME}.
+	:license: ${3:LICENSE_NAME}, see LICENSE for more details.
+"""
+$0
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/r.snippets b/vim/snippets/vim-snippets/UltiSnips/r.snippets
new file mode 100644
index 0000000..44624b3
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/r.snippets
@@ -0,0 +1,178 @@
+priority -50
+
+global !p
+import os
+from vimsnippets import complete
+
+FIELD_TYPES = [
+'character',
+'data.frame',
+'integer',
+'list',
+'logical',
+'matrix',
+'numeric',
+'vector']
+endglobal
+
+snippet #! "Hashbang for Rscript (#!)" b
+#!/usr/bin/env Rscript
+endsnippet
+
+snippet setwd "Set workingdir" b
+setwd("${1:`!p snip.rv = os.getcwd()`}")
+endsnippet
+
+snippet as "Apply type on variable" w
+as.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`($2${VISUAL})
+endsnippet
+
+snippet is "Test type on variable" w
+is.$1`!p snip.rv = complete(t[1], FIELD_TYPES)`($2${VISUAL})
+endsnippet
+
+snippet dl "Download and install a package" b
+download.file("${1:${VISUAL:url to package}}", destfile = "${2:${1/.*\/(\S*)$/(?1:$1)/ga}}")
+install.packages("$2", type = "source", repos = NULL)
+library("${3:${2/^(\w+)_.*$/(?1:$1)/ga}}")
+endsnippet
+
+snippet lib "Import a library"
+library(${0:package})
+endsnippet
+
+snippet req "Require a file"
+require(${0:package})
+endsnippet
+
+snippet source "Source a file"
+source('${0:file}')
+endsnippet
+
+snippet if "If statement"
+if ($1) {
+	$0
+}
+endsnippet
+
+snippet eif "Else-If statement"
+else if ($1) {
+	$0
+}
+endsnippet
+
+snippet el "Else statement"
+else {
+	$0
+}
+endsnippet
+
+snippet ife "if .. else"
+if ($1) {
+	$2
+} else {
+	$3
+}
+endsnippet
+
+snippet wh "while loop"
+while($1) {
+	$2
+}
+endsnippet
+
+snippet for "for loop"
+for (${1:item} in ${2:list}) {
+	$3
+}
+endsnippet
+
+snippet fun "Function definition"
+${1:name} <- function ($2) {
+	$0
+}
+endsnippet
+
+snippet ret "Return call"
+return($0)
+endsnippet
+
+snippet df "Data frame"
+${1:name}[${2:rows}, ${0:cols}]
+endsnippet
+
+snippet c "c function"
+c(${0:items})
+endsnippet
+
+snippet li "list function"
+list(${0:items})
+endsnippet
+
+snippet mat "matrix function"
+matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
+endsnippet
+
+snippet apply "apply function"
+apply(${1:array}, ${2:margin}, ${0:function})
+endsnippet
+
+snippet lapply "lapply function"
+lapply(${1:list}, ${0:function})
+endsnippet
+
+snippet sapply "sapply function"
+sapply(${1:list}, ${0:function})
+endsnippet
+
+snippet vapply "vapply function"
+vapply(${1:list}, ${2:function}, ${0:type})
+endsnippet
+
+snippet mapply "mapply function"
+mapply(${1:function}, ${0:...})
+endsnippet
+
+snippet tapply "tapply function"
+tapply(${1:vector}, ${2:index}, ${0:function})
+endsnippet
+
+snippet rapply "rapply function"
+rapply(${1:list}, ${0:function})
+endsnippet
+
+snippet pl "Plot function"
+plot(${1:x}, ${0:y})
+endsnippet
+
+snippet ggp "ggplot2 plot"
+ggplot(${1:data}, aes(${0:aesthetics}))
+endsnippet
+
+snippet fis "Fisher test"
+fisher.test(${1:x}, ${0:y})
+endsnippet
+
+snippet chi "Chi Squared test"
+chisq.test(${1:x}, ${0:y})
+endsnippet
+
+snippet tt "t-test"
+t.test(${1:x}, ${0:y})
+endsnippet
+
+snippet wil "Wilcox test"
+wilcox.test(${1:x}, ${0:y})
+endsnippet
+
+snippet cor "Correlation test"
+cor.test(${1:x}, ${0:y})
+endsnippet
+
+snippet fte "FTE test"
+var.test(${1:x}, ${0:y})
+endsnippet
+
+snippet kvt "KV test"
+kv.test(${1:x}, ${0:y})
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/rails.snippets b/vim/snippets/vim-snippets/UltiSnips/rails.snippets
new file mode 100644
index 0000000..9aefe66
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/rails.snippets
@@ -0,0 +1,894 @@
+priority -50
+
+snippet anaf "accepts_nested_attributes_for"
+accepts_nested_attributes_for :${1:association_name}${2:${3:, :allow_destroy => true}${4:, :reject_if => proc \{ |obj| ${5:obj.blank?} \}}}
+
+endsnippet
+
+snippet tcbi "Create binary column"
+t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+$0
+endsnippet
+
+snippet tcb "Create boolean column"
+t.boolean :${1:title}
+$0
+endsnippet
+
+snippet clac "Create controller class"
+class ${1:Model}Controller < ApplicationController
+	before_filter :find_${2:model}
+
+	$0
+
+	private
+	def find_$2
+		@$2 = ${3:$1}.find(params[:id]) if params[:id]
+	end
+end
+endsnippet
+
+snippet tcda "Create date column"
+t.date :${1:title}
+$0
+endsnippet
+
+snippet tcdt "Create datetime column"
+t.datetime :${1:title}
+$0
+endsnippet
+
+snippet tcd "Create decimal column"
+t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+$0
+endsnippet
+
+snippet tcf "Create float column"
+t.float :${1:title}
+$0
+endsnippet
+
+snippet clact "Create functional test class"
+require 'test_helper'
+
+class ${1:Model}ControllerTest < ActionController::TestCase
+	test$0
+end
+
+endsnippet
+
+snippet tci "Create integer column"
+t.integer :${1:title}
+$0
+endsnippet
+
+snippet tcl "Create lock_version column"
+t.integer :lock_version, :null => false, :default => 0
+$0
+endsnippet
+
+# FIXME: handling literal bracket pair inside of nested tab groups?
+snippet tcr "Create references column"
+t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+$0
+endsnippet
+
+snippet resources "Create resources controller class"
+class ${1:Model}sController < ApplicationController
+	before_filter :find_${1/./\l$0/}, :only => [:show, :edit, :update, :destroy]
+
+	# GET /${1/./\l$0/}s
+	# GET /${1/./\l$0/}s.xml
+	def index
+		@${1/./\l$0/}s = ${1:Model}.all
+
+		respond_to do |wants|
+			wants.html # index.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/}s }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/1
+	# GET /${1/./\l$0/}s/1.xml
+	def show
+		respond_to do |wants|
+			wants.html # show.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/} }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/new
+	# GET /${1/./\l$0/}s/new.xml
+	def new
+		@${1/./\l$0/} = ${1:Model}.new
+
+		respond_to do |wants|
+			wants.html # new.html.erb
+			wants.xml  { render :xml => @${1/./\l$0/} }
+		end
+	end
+
+	# GET /${1/./\l$0/}s/1/edit
+	def edit
+	end
+
+	# POST /${1/./\l$0/}s
+	# POST /${1/./\l$0/}s.xml
+	def create
+		@${1/./\l$0/} = ${1:Model}.new(params[:${1/./\l$0/}])
+
+		respond_to do |wants|
+			if @${1/./\l$0/}.save
+				flash[:notice] = '${1:Model} was successfully created.'
+				wants.html { redirect_to(@${1/./\l$0/}) }
+				wants.xml  { render :xml => @${1/./\l$0/}, :status => :created, :location => @${1/./\l$0/} }
+			else
+				wants.html { render :action => "new" }
+				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+
+	# PUT /${1/./\l$0/}s/1
+	# PUT /${1/./\l$0/}s/1.xml
+	def update
+		respond_to do |wants|
+			if @${1/./\l$0/}.update(params[:${1/./\l$0/}])
+				flash[:notice] = '${1:Model} was successfully updated.'
+				wants.html { redirect_to(@${1/./\l$0/}) }
+				wants.xml  { head :ok }
+			else
+				wants.html { render :action => "edit" }
+				wants.xml  { render :xml => @${1/./\l$0/}.errors, :status => :unprocessable_entity }
+			end
+		end
+	end
+
+	# DELETE /${1/./\l$0/}s/1
+	# DELETE /${1/./\l$0/}s/1.xml
+	def destroy
+		@${1/./\l$0/}.destroy
+
+		respond_to do |wants|
+			wants.html { redirect_to(${1/./\l$0/}s_url) }
+			wants.xml  { head :ok }
+		end
+	end
+
+	private
+		def find_${1/./\l$0/}
+			@${1/./\l$0/} = ${1:Model}.find(params[:id])
+		end
+
+end
+
+endsnippet
+
+snippet tcs "Create string column"
+t.string :${1:title}
+$0
+endsnippet
+
+snippet tct "Create text column"
+t.text :${1:title}
+$0
+endsnippet
+
+snippet tcti "Create time column"
+t.time :${1:title}
+$0
+endsnippet
+
+snippet tcts "Create timestamp column"
+t.timestamp :${1:title}
+$0
+endsnippet
+
+snippet tctss "Create timestamps columns"
+t.timestamps
+$0
+endsnippet
+
+snippet mcol "Migration Create Column (mcc)"
+t.column ${1:title}, :${2:string}
+$0
+endsnippet
+
+snippet mccc "Migration Create Column Continue (mccc)"
+t.column ${1:title}, :${2:string}
+mccc$0
+endsnippet
+
+snippet mtab "Migration Drop Create Table (mdct)"
+drop_table :${1:table}${2: [press tab twice to generate create_table]}
+endsnippet
+
+snippet mcol "Migration Remove and Add Column (mrac)"
+remove_column :${1:table}, :${2:column}${3: [press tab twice to generate add_column]}
+endsnippet
+
+snippet rdb "RAILS_DEFAULT_LOGGER.debug (rdb)"
+RAILS_DEFAULT_LOGGER.debug "${1:message}"$0
+endsnippet
+
+snippet tre "Table column(s) rename"
+t.rename(:${1:old_column_name}, :${2:new_column_name})
+$0
+endsnippet
+
+snippet art "Test Assert Redirected To (art)"
+assert_redirected_to ${2::action => "${1:index}"}
+endsnippet
+
+snippet asre "Test Assert Response (are)"
+assert_response :${1:success}, @response.body$0
+endsnippet
+
+snippet aftc "after_create"
+after_create $0
+endsnippet
+
+snippet aftd "after_destroy"
+after_destroy $0
+endsnippet
+
+snippet afts "after_save"
+after_save $0
+endsnippet
+
+snippet aftu "after_update"
+after_update $0
+endsnippet
+
+snippet aftv "after_validation"
+after_validation $0
+endsnippet
+
+snippet aftvoc "after_validation_on_create"
+after_validation_on_create $0
+endsnippet
+
+snippet aftvou "after_validation_on_update"
+after_validation_on_update $0
+endsnippet
+
+snippet asg "assert(var = assigns(:var))"
+assert(${1:var} = assigns(:$1), "Cannot find @$1")
+$0
+endsnippet
+
+snippet asd "assert_difference"
+assert_difference "${1:Model}.${2:count}", ${3:1} do
+	$0
+end
+endsnippet
+
+snippet asnd "assert_no_difference"
+assert_no_difference "${1:Model}.${2:count}" do
+	$0
+end
+endsnippet
+
+snippet artnpp "assert_redirected_to (nested path plural)"
+assert_redirected_to ${10:${2:parent}_${3:child}_path(${4:@}${5:$2})}
+endsnippet
+
+snippet artnp "assert_redirected_to (nested path)"
+assert_redirected_to ${2:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})}
+endsnippet
+
+snippet artpp "assert_redirected_to (path plural)"
+assert_redirected_to ${10:${2:model}s_path}
+endsnippet
+
+snippet artp "assert_redirected_to (path)"
+assert_redirected_to ${2:${12:model}_path(${13:@}${14:$12})}
+endsnippet
+
+snippet asrj "assert_rjs"
+assert_rjs :${1:replace}, ${2:"${3:dom id}"}
+endsnippet
+
+snippet ass "assert_select"
+assert_select '${1:path}'${2:, :${3:text} => ${4:'${5:inner_html}'}}${6: do
+	$0
+end}
+endsnippet
+
+snippet befc "before_create"
+before_create $0
+endsnippet
+
+snippet befd "before_destroy"
+before_destroy $0
+endsnippet
+
+snippet befs "before_save"
+before_save $0
+endsnippet
+
+snippet befu "before_update"
+before_update $0
+endsnippet
+
+snippet befv "before_validation"
+before_validation $0
+endsnippet
+
+snippet befvoc "before_validation_on_create"
+before_validation_on_create $0
+endsnippet
+
+snippet befvou "before_validation_on_update"
+before_validation_on_update
+endsnippet
+
+snippet bt "belongs_to (bt)"
+belongs_to :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
+endsnippet
+
+snippet crw "cattr_accessor"
+cattr_accessor :${0:attr_names}
+endsnippet
+
+snippet defcreate "def create - resource"
+def create
+	@${1:model} = ${2:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}.new(params[:$1])
+	$0
+	respond_to do |wants|
+		if @$1.save
+			flash[:notice] = '$2 was successfully created.'
+			wants.html { redirect_to(@$1) }
+			wants.xml { render :xml => @$1, :status => :created, :location => @$1 }
+		else
+			wants.html { render :action => "new" }
+			wants.xml { render :xml => @$1.errors, :status => :unprocessable_entity }
+		end
+	end
+end
+
+endsnippet
+
+snippet test "test do..end"
+test "${1:something interesting}" do
+	$0
+end
+endsnippet
+
+snippet deftg "def get request"
+def test_should_get_${1:action}
+	${2:@${3:model} = ${4:$3s}(:${5:fixture_name})
+	}get :$1${6:, :id => @$3.to_param}
+	assert_response :success
+	$0
+end
+endsnippet
+
+snippet deftp "def post request"
+def test_should_post_${1:action}
+	${3:@$2 = ${4:$2s}(:${5:fixture_name})
+	}post :$1${6:, :id => @$2.to_param}, :${2:model} => { $0 }
+	assert_response :redirect
+
+end
+endsnippet
+
+snippet fina "find(:all)"
+find(:all${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+endsnippet
+
+snippet finf "find(:first)"
+find(:first${1:, :conditions => ['${2:${3:field} = ?}', ${5:true}]})
+endsnippet
+
+snippet fini "find(id)"
+find(${1:id})
+endsnippet
+
+snippet fine "find_each"
+find_each(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}|
+	$0
+end
+endsnippet
+
+snippet finb "find_in_batches"
+find_in_batches(${1::conditions => {:${2:field} => ${3:true}\}}) do |${4:${TM_CURRENT_WORD/(\w+)\./\L$1/g}}s|
+	$4s.each do |$4|
+		$0
+	end
+end
+endsnippet
+
+snippet habtm "has_and_belongs_to_many (habtm)"
+has_and_belongs_to_many :${1:object}${2:, :join_table => "${3:table_name}", :foreign_key => "${4:$1_id}"}
+endsnippet
+
+snippet hm "has_many (hm)"
+has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}
+endsnippet
+
+snippet hmt "has_many (through)"
+has_many :${1:objects}, :through => :${2:join_association}${3:, :source => :${4:$2_table_foreign_key_to_$1_table}}
+endsnippet
+
+snippet hmd "has_many :dependent => :destroy"
+has_many :${1:object}s${2:, :class_name => "$1", :foreign_key => "${4:reference}_id"}, :dependent => :destroy$0
+endsnippet
+
+snippet ho "has_one (ho)"
+has_one :${1:object}${2:, :class_name => "${3:${1/[[:alpha:]]+|(_)/(?1::\u$0)/g}}", :foreign_key => "${4:$1_id}"}
+endsnippet
+
+snippet logd "logger.debug"
+${1:Rails.}logger.debug { "${1:message}" }$0
+endsnippet
+
+snippet loge "logger.error"
+logger.error { "${1:message}" }$0
+endsnippet
+
+snippet logf "logger.fatal"
+logger.fatal { "${1:message}" }$0
+endsnippet
+
+snippet logi "logger.info"
+logger.info { "${1:message}" }$0
+endsnippet
+
+snippet logw "logger.warn"
+logger.warn { "${1:message}" }$0
+endsnippet
+
+snippet mp "map(&:sym_proc)"
+map(&:${1:id})
+endsnippet
+
+snippet mapca "map.catch_all"
+${1:map}.catch_all "*${2:anything}", :controller => "${3:default}", :action => "${4:error}"
+
+endsnippet
+
+snippet map "map.named_route"
+${1:map}.${2:connect} '${3::controller/:action/:id}'
+endsnippet
+
+snippet mapr "map.resource"
+${1:map}.resource :${2:resource}${10: do |${11:$2}|
+	$0
+end}
+endsnippet
+
+snippet maprs "map.resources"
+${1:map}.resources :${2:resource}${10: do |${11:$2}|
+	$0
+end}
+endsnippet
+
+snippet mapwo "map.with_options"
+${1:map}.with_options :${2:controller} => '${3:thing}' do |${4:$3}|
+	$0
+end
+
+endsnippet
+
+snippet mrw "mattr_accessor"
+mattr_accessor :${0:attr_names}
+endsnippet
+
+snippet ncl "named_scope lambda"
+named_scope :name, lambda { |${1:param}| { :conditions => ${3:['${4:${5:field} = ?}', ${6:$1}]} } }
+
+endsnippet
+
+snippet nc "named_scope"
+named_scope :name${1:, :joins => :${2:table}}, :conditions => ${3:['${4:${5:field} = ?}', ${6:true}]}
+
+endsnippet
+
+snippet dscope "default_scope"
+default_scope ${1:order(${2:'${3:created_at DESC}'})}
+endsnippet
+
+snippet flash "flash[...]"
+flash[:${1:notice}] = "${2:Successfully created...}"$0
+endsnippet
+
+snippet rea "redirect_to (action)"
+redirect_to :action => "${1:index}"
+endsnippet
+
+snippet reai "redirect_to (action, id)"
+redirect_to :action => "${1:show}", :id => ${0:@item}
+endsnippet
+
+snippet rec "redirect_to (controller)"
+redirect_to :controller => "${1:items}"
+endsnippet
+
+snippet reca "redirect_to (controller, action)"
+redirect_to :controller => "${1:items}", :action => "${2:list}"
+endsnippet
+
+snippet recai "redirect_to (controller, action, id)"
+redirect_to :controller => "${1:items}", :action => "${2:show}", :id => ${0:@item}
+endsnippet
+
+snippet renpp "redirect_to (nested path plural)"
+redirect_to(${2:${10:parent}_${11:child}_path(${12:@}${13:$10})})
+endsnippet
+
+snippet renp "redirect_to (nested path)"
+redirect_to(${2:${12:parent}_${13:child}_path(${14:@}${15:$12}, ${16:@}${17:$13})})
+endsnippet
+
+snippet repp "redirect_to (path plural)"
+redirect_to(${2:${10:model}s_path})
+endsnippet
+
+snippet rep "redirect_to (path)"
+redirect_to(${2:${12:model}_path(${13:@}${14:$12})})
+endsnippet
+
+snippet reb "redirect_to :back"
+redirect_to :back
+endsnippet
+
+snippet ra "render (action)... (ra)"
+render :action => "${1:action}"
+endsnippet
+
+snippet ral "render (action,layout) (ral)"
+render :action => "${1:action}", :layout => "${2:layoutname}"
+endsnippet
+
+snippet rf "render (file) (rf)"
+render :file => "${1:filepath}"
+endsnippet
+
+snippet rfu "render (file,use_full_path) (rfu)"
+render :file => "${1:filepath}", :use_full_path => ${2:false}
+endsnippet
+
+snippet ri "render (inline) (ri)"
+render :inline => "${1:<%= 'hello' %>}"
+endsnippet
+
+snippet ril "render (inline,locals) (ril)"
+render :inline => "${1:<%= 'hello' %>}", :locals => { ${2::name} => "${3:value}"$4 }
+endsnippet
+
+snippet rit "render (inline,type) (rit)"
+render :inline => "${1:<%= 'hello' %>}", :type => ${2::rxml}
+endsnippet
+
+snippet rl "render (layout) (rl)"
+render :layout => "${1:layoutname}"
+endsnippet
+
+snippet rn "render (nothing) (rn)"
+render :nothing => ${1:true}
+endsnippet
+
+snippet rns "render (nothing,status) (rns)"
+render :nothing => ${1:true}, :status => ${2:401}
+endsnippet
+
+snippet rt "render (text) (rt)"
+render :text => "${1:text to render...}"
+endsnippet
+
+snippet rtl "render (text,layout) (rtl)"
+render :text => "${1:text to render...}", :layout => "${2:layoutname}"
+endsnippet
+
+snippet rtlt "render (text,layout => true) (rtlt)"
+render :text => "${1:text to render...}", :layout => ${2:true}
+endsnippet
+
+snippet rts "render (text,status) (rts)"
+render :text => "${1:text to render...}", :status => ${2:401}
+endsnippet
+
+snippet ru "render (update)"
+render :update do |${2:page}|
+	$2.$0
+end
+endsnippet
+
+snippet rest "respond_to"
+respond_to do |wants|
+	wants.${1:html}${2: { $0 \}}
+end
+endsnippet
+
+# FIXME
+snippet returning "returning do |variable| ... end"
+returning ${1:variable} do${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1: |)/}${2:v}${2/(^(?<var>\s*[a-z_][a-zA-Z0-9_]*\s*)(,\g<var>)*,?\s*$)|.*/(?1:|)/}
+	$0
+end
+endsnippet
+
+snippet t. "t.binary (tcbi)"
+t.binary :${1:title}${2:, :limit => ${3:2}.megabytes}
+t.$0
+endsnippet
+
+snippet t. "t.boolean (tcb)"
+t.boolean :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.date (tcda)"
+t.date :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.datetime (tcdt)"
+t.datetime :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.decimal (tcd)"
+t.decimal :${1:title}${2:${3:, :precision => ${4:10}}${5:, :scale => ${6:2}}}
+t.$0
+endsnippet
+
+snippet t. "t.float (tcf)"
+t.float :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.integer (tci)"
+t.integer :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.lock_version (tcl)"
+t.integer :lock_version, :null => false, :default => 0
+t.$0
+endsnippet
+
+snippet t. "t.references (tcr)"
+t.references :${1:taggable}${2:, :polymorphic => ${3:{ :default => '${4:Photo}' \}}}
+t.$0
+endsnippet
+
+snippet t. "t.rename (tre)"
+t.rename(:${1:old_column_name}, :${2:new_column_name})
+t.$0
+endsnippet
+
+snippet t. "t.string (tcs)"
+t.string :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.text (tct)"
+t.text :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.time (tcti)"
+t.time :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.timestamp (tcts)"
+t.timestamp :${1:title}
+t.$0
+endsnippet
+
+snippet t. "t.timestamps (tctss)"
+t.timestamps
+t.$0
+endsnippet
+
+snippet vaoif "validates_acceptance_of if"
+validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vao "validates_acceptance_of"
+validates_acceptance_of :${1:terms}${2:${3:, :accept => "${4:1}"}${5:, :message => "${6:You must accept the terms of service}"}}
+endsnippet
+
+snippet va "validates_associated (va)"
+validates_associated :${1:attribute}${2:, :on => :${3:create}}
+endsnippet
+
+snippet vaif "validates_associated if (vaif)"
+validates_associated :${1:attribute}${2:, :on => :${3:create}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vc "validates_confirmation_of (vc)"
+validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}"}
+endsnippet
+
+snippet vcif "validates_confirmation_of if (vcif)"
+validates_confirmation_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:should match confirmation}", :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet ve "validates_exclusion_of (ve)"
+validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}
+endsnippet
+
+snippet veif "validates_exclusion_of if (veif)"
+validates_exclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not allowed}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vfif "validates_format_of if"
+validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vf "validates_format_of"
+validates_format_of :${1:attribute}, :with => /${2:^[${3:\w\d}]+\$}/${4:, :on => :${5:create}, :message => "${6:is invalid}"}
+endsnippet
+
+snippet viif "validates_inclusion_of if"
+validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}, :if => proc { |obj| ${7:obj.condition?} }}
+endsnippet
+
+snippet vi "validates_inclusion_of"
+validates_inclusion_of :${1:attribute}${2:, :in => ${3:%w( ${4:mov avi} )}, :on => :${5:create}, :message => "${6:extension %s is not included in the list}"}
+endsnippet
+
+snippet vl "validates_length_of (vl)"
+validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}
+endsnippet
+
+snippet vlif "validates_length_of if"
+validates_length_of :${1:attribute}, :within => ${2:3..20}${3:, :on => :${4:create}, :message => "${5:must be present}"}, :if => proc { |obj| ${6:obj.condition?} }}
+endsnippet
+
+snippet vnif "validates_numericality_of if"
+validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vn "validates_numericality_of"
+validates_numericality_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:is not a number}"}
+endsnippet
+
+snippet vp "validates_presence_of (vp)"
+validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}
+endsnippet
+
+snippet vpif "validates_presence_of if (vpif) 2"
+validates_presence_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:can't be blank}"}, :if => proc { |obj| ${5:obj.condition?} }}
+endsnippet
+
+snippet vu "validates_uniqueness_of (vu)"
+validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}"}
+endsnippet
+
+snippet vuif "validates_uniqueness_of if (vuif)"
+validates_uniqueness_of :${1:attribute}${2:, :on => :${3:create}, :message => "${4:must be unique}", :if => proc { |obj| ${6:obj.condition?} }}
+endsnippet
+
+snippet verify "verify -- render"
+verify :only => [:$1], :method => :post, :render => {:status => 500, :text => "use HTTP-POST"}
+
+endsnippet
+
+snippet verify "verify -- redirect"
+verify :only => [:$1], :session => :user, :params => :id, :redirect_to => {:action => '${2:index}'}
+
+endsnippet
+
+snippet wants "wants_format"
+wants.${1:js|xml|html}${2: { $0 \}}
+endsnippet
+
+snippet xdelete "xhr delete"
+xhr :delete, :${1:destroy}, :id => ${2:1}$0
+endsnippet
+
+snippet xget "xhr get"
+xhr :get, :${1:show}${2:, :id => ${3:1}}$0
+endsnippet
+
+snippet xpost "xhr post"
+xhr :post, :${1:create}, :${2:object} => { $3 }
+endsnippet
+
+snippet xput "xhr put"
+xhr :put, :${1:update}, :id => ${2:1}, :${3:object} => { $4 }$0
+endsnippet
+
+snippet sweeper "Create sweeper class"
+class ${1:Model}Sweeper < ActionController::Caching::Sweeper
+	observe ${1:Model}
+
+	def after_save(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
+
+	def after_destroy(${1/./\l$0/})
+		expire_cache(${1/./\l$0/})
+	end
+
+	private
+
+		def expire_cache(${1/./\l$0/})
+			${0:expire_page ${1/./\l$0/}s_path
+			expire_page ${1/./\l$0/}_path(${1/./\l$0/})}
+		end
+
+end
+endsnippet
+
+snippet col "collection routes"
+collection do
+	${1:get :${2:action}}
+	${3:put :${4:action}}
+	${5:post :${6:action}}
+	${7:delete :${8:action}}
+end
+endsnippet
+
+snippet format "format (respond_with)"
+format.${1:html|xml|json|js|any} { $0 }
+endsnippet
+
+snippet gem "gem"
+gem '${1:name}'${2:${3:, "${4:1.0}"}${5:${6:, :require => ${7:"${8:$1}"}}${9:, :group => :${10:test}}}}
+endsnippet
+
+snippet gemg "gem :git"
+gem '${1:paperclip}', :git => "${2:git://github.com/thoughtbot/paperclip.git}"${3:, :branch => "${4:rails3}"}
+endsnippet
+
+snippet match "match"
+match '${1:${2::controller}${3:/${4::action}${5:/${6::id}${7:(.:format)}}}}'${8: => '${9:$2}#${10:$4}'${11:, :as => :${12:$10}}}
+endsnippet
+
+snippet member "member routes"
+member do
+	${1:get :${2:action}}
+	${3:put :${4:action}}
+	${5:post :${6:action}}
+	${7:delete :${8:action}}
+end
+endsnippet
+
+snippet res "resources"
+resources :${1:posts}${2: do
+	$3
+end}
+endsnippet
+
+snippet scope "scope"
+scope :${1:name}, ${2:joins(:${3:table}).}where(${4:'${5:$3.${6:field}} = ?', ${7:'${8:value}'}})
+endsnippet
+
+snippet scopel "scope lambda"
+scope :${1:name}, lambda { |${2:param}| ${3:where(${4::${5:field} => ${6:"${7:value}"}})} }
+endsnippet
+
+snippet scopee "scope with extension"
+scope :${1:name}, ${2:where(${3::${4:field} => ${5:'${6:value}'}})} do
+	def ${7:method_name}
+		$0
+	end
+end
+endsnippet
+
+snippet sb "scoped_by"
+scoped_by_${1:attribute}(${2:id})
+endsnippet
+
+snippet setup "setup do..end"
+setup do
+	$0
+end
+endsnippet
+
+snippet trans "Translation snippet"
+I18n.t('`!v substitute(substitute(substitute(@%, substitute(getcwd() . "/", "\/", "\\\\/", "g"), "", ""), "\\(\\.\\(html\\|js\\)\\.\\(haml\\|erb\\)\\|\\(_controller\\)\\?\\.rb\\)$", "", ""), "/", ".", "g")`.${2:${1/[^\w]/_/g}}$3', :default => "${1:some_text}"$4)${5:$0}
+endsnippet
+
+snippet route_spec
+it 'routes to #${1:action}' do
+	${2:get}('/${3:url}').should route_to('`!v substitute(expand('%:t:r'), '_routing_spec$', '', '')`#$1'${4:, ${5:params}})$6
+end
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/rnoweb.snippets b/vim/snippets/vim-snippets/UltiSnips/rnoweb.snippets
new file mode 100644
index 0000000..773b9aa
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/rnoweb.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends tex, r
diff --git a/vim/snippets/vim-snippets/UltiSnips/rst.snippets b/vim/snippets/vim-snippets/UltiSnips/rst.snippets
new file mode 100644
index 0000000..9a2b4c0
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/rst.snippets
@@ -0,0 +1,311 @@
+# -*- coding: utf-8 -*-
+
+priority -50
+
+###########################################################################
+#							   General Stuff							  #
+###########################################################################
+global !p
+import vim
+from os import path as ospath
+from string import Template
+import re
+from collections import Counter
+
+from vimsnippets import complete
+
+#http://docutils.sourceforge.net/docs/ref/rst/roles.html
+TEXT_ROLES = ['emphasis','literal','code','math',
+			  'pep-reference','rfc-reference',
+			  'strong','subscript','superscript',
+			  'title-reference','raw']
+TEXT_ROLES_REGEX = r'\.\.\srole::?\s(w+)'
+
+#http://docutils.sourceforge.net/docs/ref/rst/directives.html#specific-admonitions
+SPECIFIC_ADMONITIONS = ["attention", "caution", "danger",
+						"error", "hint", "important", "note",
+						"tip", "warning"]
+#http://docutils.sourceforge.net/docs/ref/rst/directives.html
+DIRECTIVES = ['topic','sidebar','math','epigraph',
+			  'parsed-literal','code','highlights',
+			  'pull-quote','compound','container','table','csv-table',
+			  'list-table','class','sectnum',
+			  'role','default-role','unicode',
+			  'raw']
+
+NONE_CONTENT_DIRECTIVES = ['rubric', 'contents', 'header',
+						   'footer', 'date', 'include', 'title']
+
+INCLUDABLE_DIRECTIVES = ['image', 'figure', 'include']
+# CJK chars
+# http://stackoverflow.com/questions/2718196/find-all-chinese-text-in-a-string-using-python-and-regex
+CJK_RE = re.compile(u'[⺀-⺙⺛-⻳⼀-⿕々〇〡-〩〸-〺〻㐀-䶵一-鿃豈-鶴侮-頻並-龎]', re.UNICODE)
+
+
+def has_cjk(s):
+	"""Detect if s contains CJK characters."""
+	return CJK_RE.search(s) is not None
+
+def real_filename(filename):
+	"""pealeextension name off if possible
+	# i.e. "foo.bar.png will return "foo.bar"
+	"""
+	return ospath.splitext(filename)[0]
+
+def check_file_exist(rst_path, relative_path):
+	"""
+	For RST file, it can just include files as relative path.
+
+	:param rst_path: absolute path to rst file
+	:param relative_path: path related to rst file
+	:return: relative file's absolute path if file exist
+	"""
+	abs_path = ospath.join(ospath.dirname(rst_path), relative_path)
+	if ospath.isfile(abs_path):
+		return abs_path
+
+
+try:
+	rst_char_len = vim.strwidth  # Requires Vim 7.3+
+except AttributeError:
+	from unicodedata import east_asian_width
+	def rst_char_len(s):
+		"""Return the required over-/underline length for s."""
+		result = 0
+		for c in s:
+			result += 2 if east_asian_width(c) in ('W', 'F') else 1
+		return result
+
+
+def	make_items(times, leading='+'):
+	"""
+	make lines with leading char multitimes
+
+	:param: times, how many times you need
+	:param: leading, leading character
+	"""
+	times = int(times)
+	if leading == 1:
+		msg = ""
+		for x in range(1, times+1):
+			msg += "%s. Item\n" % x
+		return msg
+	else:
+		return ("%s Item\n" % leading) * times
+
+
+def look_up_directives(regex, fpath):
+	"""
+	find all directive args in given file
+	:param: regex, the regex that needs to match
+	:param: path, to path to rst file
+
+	:return: list, empty list if nothing match
+	"""
+	try:
+		with open(fpath) as source:
+			match = re.findall(regex, source.read())
+	except IOError:
+		match = []
+	return match
+
+
+def get_popular_code_type():
+	"""
+	find most popular code type in the given rst
+
+	:param path: file to detect
+
+	:return: string, most popular code type in file
+	"""
+	buf = "".join(vim.current.buffer)
+	types = re.findall(r'[:|\.\.\s]code::?\s(\w+)', buf)
+	try:
+		popular_type = Counter(types).most_common()[0][0]
+	except IndexError:
+		popular_type = "lua" # Don't break default
+	return popular_type
+endglobal
+
+snippet part "Part" b
+`!p snip.rv = rst_char_len(t[1])*'#'`
+${1:${VISUAL:Part name}}
+`!p snip.rv = rst_char_len(t[1])*'#'`
+
+$0
+endsnippet
+
+snippet chap "Chapter" b
+`!p snip.rv = rst_char_len(t[1])*'*'`
+${1:${VISUAL:Chapter name}}
+`!p snip.rv = rst_char_len(t[1])*'*'`
+
+$0
+endsnippet
+
+snippet sec "Section" b
+${1:${VISUAL:Section name}}
+`!p snip.rv = rst_char_len(t[1])*'='`
+
+$0
+endsnippet
+
+snippet ssec "Subsection" b
+${1:${VISUAL:Subsection name}}
+`!p snip.rv = rst_char_len(t[1])*'-'`
+
+$0
+endsnippet
+
+snippet sssec "Subsubsection" b
+${1:${VISUAL:Subsubsection name}}
+`!p snip.rv = rst_char_len(t[1])*'^'`
+
+$0
+endsnippet
+
+snippet para "Paragraph" b
+${1:${VISUAL:Paragraph name}}
+`!p snip.rv = rst_char_len(t[1])*'"'`
+
+$0
+endsnippet
+
+snippet em "Emphasize string" i
+`!p
+# dirty but works with CJK character detection
+if has_cjk(vim.current.line):
+	snip.rv ="\ "`*${1:${VISUAL:Em}}*`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
+else:
+	snip.rv = " "
+`$0
+endsnippet
+
+snippet st "Strong string" i
+`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "`**${1:${VISUAL:Strong}}**`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
+else:
+	snip.rv = " "
+`$0
+endsnippet
+
+snippet "li(st)? (?P<num>\d+)" "List" br
+$0
+`!p
+# usage: li 4<tab>
+# which will extand into a unordered list contains 4 items
+snip.rv = make_items(match.groupdict()['num'])
+`
+endsnippet
+
+snippet "ol(st)? (?P<num>\d+)" "Order List" br
+$0
+`!p
+# usage: ol 4<tab>
+# which will extand into a ordered list contains 4 items
+snip.rv = make_items(match.groupdict()['num'], 1)
+`
+endsnippet
+###########################################################################
+#						  More Specialized Stuff.						  #
+###########################################################################
+snippet cb "Code Block" b
+.. code-block:: ${1:`!p snip.rv = get_popular_code_type()`}
+
+	${2:${VISUAL:code}}
+
+$0
+endsnippet
+
+# match snippets :
+# img, inc, fig
+snippet id "Includable Directives" b
+`!p
+real_name=real_filename(ospath.basename(t[2]))
+di=t[1][:2]
+
+link=""
+content=""
+
+if di == 'im':
+	link = "|{0}|".format(real_name)
+
+if di == 'fi':
+	content="""
+	:alt: {0}
+
+	{0}""".format(real_name)
+`
+..`!p snip.rv = " %s" % link if link else ""` $1`!p
+snip.rv=complete(t[1], INCLUDABLE_DIRECTIVES)
+`:: ${2:${VISUAL:file}}`!p
+if content:
+	snip.rv +="    "+content`
+`!p
+# Tip of whether file is exist in comment type
+if not check_file_exist(path, t[2]):
+	snip.rv='.. FILE {0} does not exist'.format(t[2])
+else:
+	snip.rv=""
+`$0
+endsnippet
+
+snippet di "Directives" b
+.. $1`!p snip.rv=complete(t[1], DIRECTIVES)`:: $2
+
+	${3:${VISUAL:Content}}
+$0
+endsnippet
+
+snippet nd "None Content Directives" b
+.. $1`!p snip.rv=complete(t[1], NONE_CONTENT_DIRECTIVES)`:: $2
+$0
+endsnippet
+
+snippet sa "Specific Admonitions" b
+.. $1`!p snip.rv =complete(t[1], SPECIFIC_ADMONITIONS)`::
+
+	${2:${VISUAL:Content}}
+
+$0
+endsnippet
+
+#it will be trigger at start of line or after a word
+snippet ro "Text Roles" w
+\ :$1`!p snip.rv=complete(t[1],
+						  TEXT_ROLES+look_up_directives(TEXT_ROLES_REGEX,
+														path))`:\`$2\`\
+endsnippet
+
+snippet eu "Embedded URI" i
+`!p
+if has_cjk(vim.current.line):
+	snip.rv = "\ "`\`${1:${VISUAL:Text}} <${2:URI}>\`_`!p
+if has_cjk(vim.current.line):
+	snip.rv ="\ "
+else:
+	snip.rv = ""
+`$0
+endsnippet
+
+snippet fnt "Footnote or Citation" i
+[${1:Label}]_ $0
+
+.. [$1] ${2:Reference}
+endsnippet
+
+############
+#  Sphinx  #
+############
+
+snippet sid "SideBar" b
+.. sidebar:: ${1:SideBar Title}
+
+	${2:${VISUAL:SideBar Content}}
+endsnippet
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/ruby.snippets b/vim/snippets/vim-snippets/UltiSnips/ruby.snippets
new file mode 100644
index 0000000..c61b276
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/ruby.snippets
@@ -0,0 +1,329 @@
+priority -50
+
+#
+# Global functions
+#
+
+global !p
+
+def write_instance_vars(arglist, snip):
+	args = str(arglist).split(',')
+	for arg in args:
+		name = arg.strip().replace(':', ' ').split(' ', 1)[0]
+		if name:
+			snip += '  @{} = {}'.format(name, name)
+		else:
+			snip += ''
+
+endglobal
+
+#
+# Snippets
+#
+
+snippet "^#!" "#!/usr/bin/env ruby" r
+#!/usr/bin/env ruby
+$0
+endsnippet
+
+snippet "^# ?[uU][tT][fF]-?8" "# encoding: UTF-8" r
+# encoding: UTF-8
+$0
+endsnippet
+
+snippet "\b(de)?f" "def <name>..." r
+def ${1:function_name}${2:(${3:*args})}
+	$0
+end
+endsnippet
+
+snippet defi "def initialize ..."
+def initialize($1)`!p write_instance_vars(t[1],snip)`$0
+end
+endsnippet
+
+snippet defr "def <name> ... rescue ..."
+def ${1:function_name}${2:(${3:*args})}
+	$4
+rescue
+	$0
+end
+endsnippet
+
+snippet For "(<from>..<to>).each { |<i>| <block> }"
+(${1:from}..${2:to}).each { |${3:i}| $0 }
+endsnippet
+
+snippet "(\S+)\.Merge!" ".merge!(<other_hash>) { |<key>,<oldval>,<newval>| <block> }" r
+`!p snip.rv=match.group(1)`.merge!(${1:other_hash}) { |${2:key},${3:oldval},${4:newval}| ${5:block} }
+endsnippet
+
+snippet "(\S+)\.merge!" ".merge!(<other_hash>) do |<key>,<oldval>,<newval>| <block> end" r
+`!p snip.rv=match.group(1)`.merge!(${1:other_hash}) do |${2:key},${3:oldval},${4:newval}|
+	${0:block}
+end
+endsnippet
+
+snippet "(\S+)\.Del(ete)?_?if" ".delete_if { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.delete_if { |${1:key},${2:value}| $0 }
+endsnippet
+
+snippet "(\S+)\.del(ete)?_?if" ".delete_if do |<key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.delete_if do |${1:key},${2:value}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Keep_?if" ".keep_if { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.keep_if { |${1:key},${2:value}| $0 }
+endsnippet
+
+snippet "(\S+)\.keep_?if" ".keep_if do <key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.keep_if do |${1:key},${2:value}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Reject" ".reject { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.reject { |${1:key},${2:value}| $0 }
+endsnippet
+
+snippet "(\S+)\.reject" ".reject do <key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.reject do |${1:key},${2:value}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Select" ".select { |<item>| <block>}" r
+`!p snip.rv=match.group(1)`.select { |${1:item}| ${2:block} }
+endsnippet
+
+snippet "(\S+)\.select" ".select do |<item>| <block> end" r
+`!p snip.rv=match.group(1)`.select do |${1:item}|
+	${0:block}
+end
+endsnippet
+
+snippet "(\S+)\.Sort" ".sort { |<a>,<b>| <block> }" r
+`!p snip.rv=match.group(1)`.sort { |${1:a},${2:b}| $0 }
+endsnippet
+
+snippet "(\S+)\.sort" ".sort do |<a>,<b>| <block> end" r
+`!p snip.rv=match.group(1)`.sort do |${1:a},${2:b}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Each_?k(ey)?" ".each_key { |<key>| <block> }" r
+`!p snip.rv=match.group(1)`.each_key { |${1:key}| $0 }
+endsnippet
+
+snippet "(\S+)\.each_?k(ey)?" ".each_key do |key| <block> end" r
+`!p snip.rv=match.group(1)`.each_key do |${1:key}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Each_?val(ue)?" ".each_value { |<value>| <block> }" r
+`!p snip.rv=match.group(1)`.each_value { |${1:value}| $0 }
+endsnippet
+
+snippet "(\S+)\.each_?val(ue)?" ".each_value do |<value>| <block> end" r
+`!p snip.rv=match.group(1)`.each_value do |${1:value}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.ea" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each { |${1:e}| $0 }
+endsnippet
+
+snippet "(\S+)\.ead" "<elements>.each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each do |${1:e}|
+	$0
+end
+endsnippet
+
+snippet "each_?s(lice)?" "<array>.each_slice(n) do |slice| <block> end" r
+${1:elements}.each_slice(${2:2}) do |${3:slice}|
+	$0
+end
+endsnippet
+
+snippet "Each_?s(lice)?" "<array>.each_slice(n) { |slice| <block> }" r
+${1:elements}.each_slice(${2:2}) { |${3:slice}| $0 }
+endsnippet
+
+snippet "(\S+)\.Map" ".map { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.map { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| $0 }
+endsnippet
+
+snippet "(\S+)\.map" ".map do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.map do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Rev(erse)?_?each" ".reverse_each { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.reverse_each { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| $0 }
+endsnippet
+
+snippet "(\S+)\.rev(erse)?_?each" ".reverse_each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.reverse_each do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Each" ".each { |<element>| <block> }" r
+`!p snip.rv=match.group(1)`.each { |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}| $0 }
+endsnippet
+
+snippet "(\S+)\.each" ".each do |<element>| <block> end" r
+`!p snip.rv=match.group(1)`.each do |${1:`!p
+element_name = match.group(1).lstrip('$@')
+ematch = re.search("([A-Za-z][A-Za-z0-9_]+?)s?[^A-Za-z0-9_]*?$", element_name)
+try:
+	wmatch = re.search("([A-Za-z][A-Za-z0-9_]+)$", ematch.group(1))
+	snip.rv = wmatch.group(1).lower()
+except:
+	snip.rv = 'element'
+`}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.Each_?p(air)?"  ".each_pair { |<key>,<value>| <block> }" r
+`!p snip.rv=match.group(1)`.each_pair { |${1:key},${2:value}| $0 }
+endsnippet
+
+snippet "(\S+)\.each_?p(air)?" ".each_pair do |<key>,<value>| <block> end" r
+`!p snip.rv=match.group(1)`.each_pair do |${1:key},${2:value}|
+	$0
+end
+endsnippet
+
+snippet "(\S+)\.sub" ".sub(<expression>) { <block> }" r
+`!p snip.rv=match.group(1)`.sub(${1:expression}) { ${2:"replace_with"} }
+endsnippet
+
+snippet "(\S+)\.gsub" ".gsub(<expression>) { <block> }" r
+`!p snip.rv=match.group(1)`.gsub(${1:expression}) { ${2:"replace_with"} }
+endsnippet
+
+snippet "(\S+)\.index" ".index { |item| <block> }" r
+`!p snip.rv=match.group(1)`.index { |${1:item}| ${2:block} }
+endsnippet
+
+snippet "(\S+)\.Index" ".index do |item| ... end" r
+`!p snip.rv=match.group(1)`.index do |${1:item}|
+	${0:block}
+end
+endsnippet
+
+snippet until "until <expression> ... end"
+until ${1:expression}
+	$0
+end
+endsnippet
+
+snippet Until "begin ... end until <expression>"
+begin
+	$0
+end until ${1:expression}
+endsnippet
+
+snippet while "while <expression> ... end"
+while ${1:expression}
+	$0
+end
+endsnippet
+
+snippet While "begin ... end while <expression>"
+begin
+	$0
+end while ${1:expression}
+endsnippet
+
+snippet begin "begin ... rescue ... end"
+begin
+	$1
+rescue
+	$0
+end
+endsnippet
+
+snippet rescue
+rescue Exception => e
+	puts e.message
+	puts e.backtrace.inspect
+	${0:# Rescue}
+endsnippet
+
+snippet "\b(case|sw(itch)?)" "case <variable> when <expression> ... end" r
+case ${1:variable}
+when ${2:expression}
+$0
+end
+endsnippet
+
+snippet class "class <class_name> def initialize ... end end"
+class ${1:class_name}
+	def initialize(${2:*args})
+		$0
+	end
+end
+endsnippet
+
+snippet module "module"
+module ${1:module_name}
+	$0
+end
+endsnippet
+
+snippet ###
+=begin
+	$0
+=end
+endsnippet
+
+# vim: set ts=2 sw=2 expandtab:
diff --git a/vim/snippets/vim-snippets/UltiSnips/rust.snippets b/vim/snippets/vim-snippets/UltiSnips/rust.snippets
new file mode 100644
index 0000000..24af1b3
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/rust.snippets
@@ -0,0 +1,34 @@
+#######################################################################
+#                            Rust Snippets                            #
+#######################################################################
+
+priority -50
+
+
+snippet arg "Function Arguments" i
+${1:a}: ${2:T}${3:, arg}
+endsnippet
+
+snippet || "Closure, anonymous function (inline)" i
+${1:move }|$2| { $3 }
+endsnippet
+
+snippet |} "Closure, anonymous function (block)" i
+${1:move }|$2| {
+	$3
+}
+endsnippet
+
+snippet macro "macro_rules!" b
+macro_rules! ${1:name} {
+	(${2:matcher}) => (
+		$3
+	)
+}
+endsnippet
+
+snippet fd "Struct field definition" w
+${1:name}: ${2:Type},
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/sh.snippets b/vim/snippets/vim-snippets/UltiSnips/sh.snippets
new file mode 100644
index 0000000..7018184
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/sh.snippets
@@ -0,0 +1,99 @@
+priority -50
+
+global !p
+import vim
+
+# Tests for the existence of a variable declared by Vim's filetype detection
+# suggesting the type of shell script of the current file
+def testShell(scope, shell):
+	return vim.eval("exists('" + scope + ":is_" + shell + "')")
+
+# Loops over the possible variables, checking for global variables
+# first since they indicate an override by the user.
+def getShell():
+	for scope in ["g", "b"]:
+		for shell in ["bash", "posix", "sh", "kornshell"]:
+			if testShell(scope, shell) == "1":
+				if shell == "kornshell":
+					return "ksh"
+				if shell == "posix":
+					return "sh"
+				return shell
+	return "sh"
+endglobal
+
+###########################################################################
+#                            TextMate Snippets                            #
+###########################################################################
+snippet #!
+`!p snip.rv = '#!/bin/' + getShell() + "\n\n" `
+endsnippet
+
+snippet !env "#!/usr/bin/env (!env)"
+`!p snip.rv = '#!/usr/bin/env ' + getShell() + "\n\n" `
+endsnippet
+
+snippet sbash "safe bash options"
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+`!p snip.rv ='\n\n' `
+endsnippet
+
+snippet temp "Tempfile"
+${1:TMPFILE}="$(mktemp -t ${2:`!p
+snip.rv = re.sub(r'[^a-zA-Z]', '_', snip.fn) or "untitled"
+`})"
+${3:${4/(.+)/trap "/}${4:rm -f '$${1/.*\s//}'}${4/(.+)/" 0               # EXIT\n/}${5/(.+)/trap "/}${5:rm -f '$${1/.*\s//}'; exit 1}${5/(.+)/" 2       # INT\n/}${6/(.+)/trap "/}${6:rm -f '$${1/.*\s//}'; exit 1}${6/(.+)/" 1 15    # HUP TERM\n/}}
+
+endsnippet
+
+snippet case "case .. esac (case)"
+case ${1:word} in
+	${2:pattern} )
+		$0;;
+esac
+endsnippet
+
+snippet elif "elif .. (elif)"
+elif ${2:[[ ${1:condition} ]]}; then
+	${0:#statements}
+endsnippet
+
+snippet for "for ... done (for)"
+for (( i = 0; i < ${1:10}; i++ )); do
+	${0:#statements}
+done
+endsnippet
+
+snippet forin "for ... in ... done (forin)"
+for ${1:i}${2/.+/ in /}${2:words}; do
+	${0:#statements}
+done
+endsnippet
+
+snippet here "here document (here)"
+<<-${2:'${1:TOKEN}'}
+	$0
+${1/['"`](.+)['"`]/$1/}
+endsnippet
+
+snippet if "if ... then (if)"
+if ${2:[[ ${1:condition} ]]}; then
+	${0:#statements}
+fi
+endsnippet
+
+snippet until "until ... (done)"
+until ${2:[[ ${1:condition} ]]}; do
+	${0:#statements}
+done
+endsnippet
+
+snippet while "while ... (done)"
+while ${2:[[ ${1:condition} ]]}; do
+	${0:#statements}
+done
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/snippets.snippets b/vim/snippets/vim-snippets/UltiSnips/snippets.snippets
new file mode 100644
index 0000000..6fc2668
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/snippets.snippets
@@ -0,0 +1,21 @@
+priority -50
+
+# We use a little hack so that the snippet is expanded
+# and parsed correctly
+snippet usnip "Ultisnips snippet definition" b
+`!p snip.rv = "snippet"` ${1:Tab_trigger} "${2:Description}" ${3:b}
+${0:${VISUAL}}
+`!p snip.rv = "endsnippet"`
+endsnippet
+
+snippet global "Global snippet" b
+`!p snip.rv = "global"` !p
+${0:${VISUAL}}
+`!p snip.rv = "endglobal"`
+endsnippet
+
+snippet vis "${VISUAL}" i
+\$\{VISUAL${1:${2:default}${3:/transform/}}\}
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/soy.snippets b/vim/snippets/vim-snippets/UltiSnips/soy.snippets
new file mode 100644
index 0000000..9a22a57
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/soy.snippets
@@ -0,0 +1,63 @@
+priority -50
+
+extends html
+
+snippet ns "Namespace" b
+{namespace ${1:name}}
+endsnippet
+
+snippet tmpl "Template" b
+/**
+ * ${2:TODO(`whoami`): Describe this template.}
+ */
+{template .${1:name}}
+	$0
+{/template}
+endsnippet
+
+snippet msg "Message" b
+{msg desc="${1:description}"}
+	$0
+{/msg}
+endsnippet
+
+snippet let "let command" b
+{let $${1:identifier}: ${2:expression} /}
+endsnippet
+
+snippet if "if .. (if)" b
+{if ${1:expression}}
+	$0
+{/if}
+endsnippet
+
+snippet ife "if .. else (ife)" b
+{if ${1:expression}}
+	$2
+{else}
+	$0
+{/if}
+endsnippet
+
+snippet eli "else if .. (eli)" b
+{elif ${1:expression}}
+	$0
+endsnippet
+
+snippet fore "foreach command" b
+{foreach $${1:var} in ${2:ref}}
+	$0
+{/foreach}
+endsnippet
+
+snippet for "for command" b
+{for $${1:var} in range(${2:rangeexpr})}
+	$0
+{/for}
+endsnippet
+
+snippet call "template call" b
+{call ${1:tmpl}}
+	$0
+{/call}
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/supercollider.snippets b/vim/snippets/vim-snippets/UltiSnips/supercollider.snippets
new file mode 100644
index 0000000..3fe8e53
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/supercollider.snippets
@@ -0,0 +1,10 @@
+snippet for
+for (${1:1}, ${2:10}) {${3: |i}|}
+	$0
+}
+endsnippet
+snippet sdef
+SynthDef(\\${1:synthName}, {${2: |${3:x}|}
+	$0
+}).add;
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/tcl.snippets b/vim/snippets/vim-snippets/UltiSnips/tcl.snippets
new file mode 100644
index 0000000..739098b
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/tcl.snippets
@@ -0,0 +1,52 @@
+priority -50
+
+###########################################################################
+#                            TEXTMATE SNIPPETS                            #
+###########################################################################
+snippet for "for... (for)" b
+for {${1:set i 0}} {${2:\$i < \$n}} {${3:incr i}} {
+	$4
+}
+
+endsnippet
+
+snippet foreach "foreach... (foreach)"
+foreach ${1:var} ${2:\$list} {
+	$3
+}
+
+endsnippet
+
+snippet if "if... (if)" b
+if {${1:condition}} {
+	$2
+}
+
+endsnippet
+
+snippet proc "proc... (proc)" b
+proc ${1:name} {${2:args}} \
+{
+	$3
+}
+
+endsnippet
+
+snippet switch "switch... (switch)" b
+switch ${1:-exact} -- ${2:\$var} {
+	${3:match} {
+		$4
+	}
+	default {$5}
+}
+
+endsnippet
+
+snippet while "while... (while)" b
+while {${1:condition}} {
+	$2
+}
+
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/tex.snippets b/vim/snippets/vim-snippets/UltiSnips/tex.snippets
new file mode 100644
index 0000000..b72ed3e
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/tex.snippets
@@ -0,0 +1,149 @@
+priority -50
+
+extends texmath
+
+snippet "b(egin)?" "begin{} / end{}" br
+\begin{${1:something}}
+	${0:${VISUAL}}
+\end{$1}
+endsnippet
+
+snippet abs "abstract environment" b
+\begin{abstract}
+	$0
+\end{abstract}
+endsnippet
+
+snippet tab "tabular / array environment" b
+\begin{${1:t}${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${2:c}}
+$0${2/(?<=.)(c|l|r)|./(?1: & )/g}
+\end{$1${1/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+endsnippet
+
+snippet table "Table environment" b
+\begin{table}[${1:htpb}]
+	\centering
+	\caption{${2:caption}}
+	\label{tab:${3:label}}
+	\begin{${4:t}${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}{${5:c}}
+	$0${5/(?<=.)(c|l|r)|./(?1: & )/g}
+	\end{$4${4/(t)$|(a)$|(.*)/(?1:abular)(?2:rray)/}}
+\end{table}
+endsnippet
+
+snippet fig "Figure environment" b
+\begin{figure}[${2:htpb}]
+	\centering
+	\includegraphics[width=${3:0.8}\linewidth]{${4:name.ext}}
+	\caption{${4/(\w+)\.\w+/\u$1/}$0}
+	\label{fig:${4/(\w+)\.\w+/$1/}}
+\end{figure}
+endsnippet
+
+snippet enum "Enumerate" b
+\begin{enumerate}
+	\item $0
+\end{enumerate}
+endsnippet
+
+snippet item "Itemize" b
+\begin{itemize}
+	\item $0
+\end{itemize}
+endsnippet
+
+snippet desc "Description" b
+\begin{description}
+	\item[$1] $0
+\end{description}
+endsnippet
+
+snippet it "Individual item" b
+\item $1
+$0
+endsnippet
+
+snippet part "Part" b
+\part{${1:part name}}
+\label{prt:${2:${1/(\w+)|\W+/(?1:\L$0\E:_)/ga}}}
+
+$0
+endsnippet
+
+snippet cha "Chapter" b
+\chapter{${1:chapter name}}
+\label{cha:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet sec "Section" b
+\section{${1:section name}}
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet sec* "Section" b
+\section*{${1:section name}}
+\label{sec:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
+
+snippet sub "Subsection" b
+\subsection{${1:subsection name}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet sub* "Subsection" b
+\subsection*{${1:subsection name}}
+\label{sub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
+snippet ssub "Subsubsection" b
+\subsubsection{${1:subsubsection name}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet ssub* "Subsubsection" b
+\subsubsection*{${1:subsubsection name}}
+\label{ssub:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+${0}
+endsnippet
+
+snippet par "Paragraph" b
+\paragraph{${1:paragraph name}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet subp "Subparagraph" b
+\subparagraph{${1:subparagraph name}}
+\label{par:${2:${1/\\\w+\{(.*?)\}|\\(.)|(\w+)|([^\w\\]+)/(?4:_:\L$1$2$3\E)/ga}}}
+
+$0
+endsnippet
+
+snippet ni "Non-indented paragraph" b
+\noindent
+$0
+endsnippet
+
+snippet pac "Package" b
+\usepackage`!p snip.rv='[' if t[1] else ""`${1:options}`!p snip.rv = ']' if t[1] else ""`{${2:package}}$0
+endsnippet
+
+snippet lp "Long parenthesis"
+\left(${1:${VISUAL:contents}}\right)$0
+endsnippet
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/texmath.snippets b/vim/snippets/vim-snippets/UltiSnips/texmath.snippets
new file mode 100644
index 0000000..d0a25e9
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/texmath.snippets
@@ -0,0 +1,56 @@
+priority -50
+
+##############
+# MATH STUFF #
+##############
+snippet eq "Equation" b
+\begin{equation}
+	$0
+\end{equation}
+endsnippet
+
+snippet eqnn "Equation without number" b
+\begin{equation*}
+	$0
+\end{equation*}
+endsnippet
+
+snippet eqa "Equation array" b
+\begin{eqnarray}
+	$1 & $2 & $0
+\end{eqnarray}
+endsnippet
+
+snippet eqann "Equation array without numbers" b
+\begin{eqnarray*}
+	$1 & $2 & $0
+\end{eqnarray*}
+
+endsnippet
+snippet frac "Fraction" w
+\frac{${1:${VISUAL:nom}}}{${2:denom}}
+endsnippet
+
+snippet mat "Smart Matrix"
+\begin{${1:p/b/v/V/B/small}matrix}
+	$0
+\end{$1matrix}
+endsnippet
+
+snippet lr( "left( right)" w
+\left( ${1:${VISUAL}} \right)
+endsnippet
+
+snippet lr| "left| right|" w
+\left| ${1:${VISUAL}} \right|
+endsnippet
+
+snippet lr{ "left\{ right\}" w
+\left\\{ ${1:${VISUAL}} \right\\}
+endsnippet
+
+snippet lr[ "left[ right]" w
+\left[ ${1:${VISUAL}} \right]
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/typescript.snippets b/vim/snippets/vim-snippets/UltiSnips/typescript.snippets
new file mode 100644
index 0000000..11072dd
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/typescript.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends javascript
diff --git a/vim/snippets/vim-snippets/UltiSnips/vim.snippets b/vim/snippets/vim-snippets/UltiSnips/vim.snippets
new file mode 100644
index 0000000..65a1897
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/vim.snippets
@@ -0,0 +1,24 @@
+priority -50
+
+###########################################################################
+#                            SnipMate Snippets                            #
+###########################################################################
+snippet gvar "Global / configuration variable" b
+if !exists("g:${1:MyUltraImportantVar}")
+	let g:$1 = ${2:"${3:<tab>}"}
+endif
+endsnippet
+
+snippet guard "script reload guard" b
+if exists('${1:did_`!p snip.rv = snip.fn.replace('.','_')`}') || &cp${2: || version < 700}
+	finish
+endif
+let $1 = 1$3
+endsnippet
+
+snippet f "function" b
+fun ${1:function_name}($2)
+	${3:" code}
+endf
+endsnippet
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/UltiSnips/vue.snippets b/vim/snippets/vim-snippets/UltiSnips/vue.snippets
new file mode 100644
index 0000000..4e09d0c
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/vue.snippets
@@ -0,0 +1 @@
+extends html, javascript, css
diff --git a/vim/snippets/vim-snippets/UltiSnips/xhtml.snippets b/vim/snippets/vim-snippets/UltiSnips/xhtml.snippets
new file mode 100644
index 0000000..a9c5a29
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/xhtml.snippets
@@ -0,0 +1,3 @@
+priority -50
+
+extends html
diff --git a/vim/snippets/vim-snippets/UltiSnips/xml.snippets b/vim/snippets/vim-snippets/UltiSnips/xml.snippets
new file mode 100644
index 0000000..92dfb6e
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/xml.snippets
@@ -0,0 +1,16 @@
+priority -50
+
+snippet xml "XML declaration" b
+<?xml version="1.0"?>
+
+endsnippet
+
+snippet t "Simple tag" b
+<${1:tag}>
+	${2:content}
+</${1/([\w:._-]+).*/$1/}>
+endsnippet
+
+snippet ti "Inline tag" b
+<${1:tag}>${2:content}</${1/([\w:._-]+).*/$1/}>
+endsnippet
diff --git a/vim/snippets/vim-snippets/UltiSnips/zsh.snippets b/vim/snippets/vim-snippets/UltiSnips/zsh.snippets
new file mode 100644
index 0000000..f7986ea
--- /dev/null
+++ b/vim/snippets/vim-snippets/UltiSnips/zsh.snippets
@@ -0,0 +1,17 @@
+priority -50
+
+extends sh
+
+priority -49
+
+snippet #! "shebang" b
+#!/bin/zsh
+
+endsnippet
+
+snippet !env "#!/usr/bin/env (!env)" b
+#!/usr/bin/env zsh
+
+endsnippet
+
+# vim:ft=snippets:
diff --git a/vim/snippets/vim-snippets/addon-info.json b/vim/snippets/vim-snippets/addon-info.json
new file mode 100644
index 0000000..303bf28
--- /dev/null
+++ b/vim/snippets/vim-snippets/addon-info.json
@@ -0,0 +1,9 @@
+{
+  "name" : "snipmate-snippets",
+  "author" : "community",
+  "maintainer" : "honza @ github & others",
+  "repository" : {"type": "git", "url": "git://github.com/honza/snipmate-snippets.git"},
+  "dependencies" : {
+  },
+  "description" : "community driven set of snippets for snipmate"
+}
diff --git a/vim/snippets/vim-snippets/autoload/vim_snippets.vim b/vim/snippets/vim-snippets/autoload/vim_snippets.vim
new file mode 100644
index 0000000..061f171
--- /dev/null
+++ b/vim/snippets/vim-snippets/autoload/vim_snippets.vim
@@ -0,0 +1,27 @@
+" this is well known Filename found in snipmate (and the other engines), but
+" rewritten and documented :)
+"
+" optional arg1: string in which to replace '$1' by filename with extension
+"   and path dropped. Defaults to $1
+" optional arg2: return this value if buffer has no filename
+"  But why not use the template in this case, too?
+"  Doesn't make sense to me
+fun! vim_snippets#Filename(...)
+  let template = get(a:000, 0, "$1")
+  let arg2 = get(a:000, 1, "")
+
+  let basename = expand('%:t:r')
+
+  if basename == ''
+    return arg2
+  else
+    return substitute(template, '$1', basename, 'g')
+  endif
+endf
+
+" original code:
+" fun! Filename(...)
+"     let filename = expand('%:t:r')
+"     if filename == '' | return a:0 == 2 ? a:2 : '' | endif
+"     return !a:0 || a:1 == '' ? filename : substitute(a:1, '$1', filename, 'g')
+" endf
diff --git a/vim/snippets/vim-snippets/plugin/vimsnippets.vim b/vim/snippets/vim-snippets/plugin/vimsnippets.vim
new file mode 100644
index 0000000..f58374c
--- /dev/null
+++ b/vim/snippets/vim-snippets/plugin/vimsnippets.vim
@@ -0,0 +1,50 @@
+if exists("b:done_vimsnippets")
+   finish
+endif
+let b:done_vimsnippets = 1
+
+" Some variables need default value
+if !exists("g:snips_author")
+    let g:snips_author = "yourname"
+endif
+
+if !exists("g:snips_email")
+    let g:snips_email = "yourname@email.com"
+endif
+
+if !exists("g:snips_github")
+    let g:snips_github = "https://github.com/yourname"
+endif
+
+" Expanding the path is not needed on Vim 7.4
+if &cp || version >= 704
+    finish
+endif
+
+" Add pythonx to the python search path if needed (i.e. <= Vim 7.3).
+if !has("python") && !has("python3")
+   finish
+end
+
+" This will fail if UltiSnips is not installed.
+try
+   call UltiSnips#bootstrap#Bootstrap()
+catch /E117/
+   finish
+endtry
+
+
+" This should have been set by UltiSnips, otherwise something is wrong.
+if !exists("g:_uspy")
+   finish
+end
+
+
+" Expand our path
+let s:SourcedFile=expand("<sfile>")
+exec g:_uspy "import vim, os, sys"
+exec g:_uspy "sourced_file = vim.eval('s:SourcedFile')"
+exec g:_uspy "while not os.path.exists(os.path.join(sourced_file, 'pythonx')):
+   \ sourced_file = os.path.dirname(sourced_file)"
+exec g:_uspy "module_path = os.path.join(sourced_file, 'pythonx')"
+exec g:_uspy "sys.path.append(module_path)"
diff --git a/vim/snippets/vim-snippets/pythonx/javascript_snippets.py b/vim/snippets/vim-snippets/pythonx/javascript_snippets.py
new file mode 100644
index 0000000..8757d49
--- /dev/null
+++ b/vim/snippets/vim-snippets/pythonx/javascript_snippets.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+Helper utilities to format javascript snippets.
+"""
+
+ALWAYS = 'always'
+NEVER = 'never'
+
+
+def get_option(snip, option, default=None):
+    return snip.opt('g:ultisnips_javascript["{}"]'.format(option), default)
+
+
+def semi(snip):
+    option = get_option(snip, 'semi', ALWAYS)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ';'
+    else:
+        ret = ';'
+    return ret
+
+
+def space_before_function_paren(snip):
+    option = get_option(snip, 'space-before-function-paren', NEVER)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ' '
+    else:
+        ret = ''
+    return ret
+
+
+def keyword_spacing(snip):
+    option = get_option(snip, 'keyword-spacing', ALWAYS)
+
+    if option == NEVER:
+        ret = ''
+    elif option == ALWAYS:
+        ret = ' '
+    else:
+        ret = ''
+    return ret
diff --git a/vim/snippets/vim-snippets/pythonx/vimsnippets.py b/vim/snippets/vim-snippets/pythonx/vimsnippets.py
new file mode 100644
index 0000000..d1cee17
--- /dev/null
+++ b/vim/snippets/vim-snippets/pythonx/vimsnippets.py
@@ -0,0 +1,92 @@
+"""Helper methods used in UltiSnips snippets."""
+
+import string, vim
+
+def complete(tab, opts):
+    """
+    get options that start with tab
+
+    :param tab: query string
+    :param opts: list that needs to be completed
+
+    :return: a string that start with tab
+    """
+    msg = "({0})"
+    if tab:
+        opts = [m[len(tab):] for m in opts if m.startswith(tab)]
+    if len(opts) == 1:
+        return opts[0]
+
+    if not len(opts):
+        msg = "{0}"
+    return msg.format("|".join(opts))
+
+def _parse_comments(s):
+    """ Parses vim's comments option to extract comment format """
+    i = iter(s.split(","))
+
+    rv = []
+    try:
+        while True:
+            # get the flags and text of a comment part
+            flags, text = next(i).split(':', 1)
+
+            if len(flags) == 0:
+                rv.append(('OTHER', text, text, text, ""))
+            # parse 3-part comment, but ignore those with O flag
+            elif 's' in flags and 'O' not in flags:
+                ctriple = ["TRIPLE"]
+                indent = ""
+
+                if flags[-1] in string.digits:
+                    indent = " " * int(flags[-1])
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'm'
+                ctriple.append(text)
+
+                flags, text = next(i).split(':', 1)
+                assert flags[0] == 'e'
+                ctriple.append(text)
+                ctriple.append(indent)
+
+                rv.append(ctriple)
+            elif 'b' in flags:
+                if len(text) == 1:
+                    rv.insert(0, ("SINGLE_CHAR", text, text, text, ""))
+    except StopIteration:
+        return rv
+
+def get_comment_format():
+    """ Returns a 4-element tuple (first_line, middle_lines, end_line, indent)
+    representing the comment format for the current file.
+
+    It first looks at the 'commentstring', if that ends with %s, it uses that.
+    Otherwise it parses '&comments' and prefers single character comment
+    markers if there are any.
+    """
+    commentstring = vim.eval("&commentstring")
+    if commentstring.endswith("%s"):
+        c = commentstring[:-2]
+        return (c, c, c, "")
+    comments = _parse_comments(vim.eval("&comments"))
+    for c in comments:
+        if c[0] == "SINGLE_CHAR":
+            return c[1:]
+    return comments[0][1:]
+
+
+def make_box(twidth, bwidth=None):
+    b, m, e, i = (s.strip() for s in get_comment_format())
+    bwidth_inner = bwidth - 3 - max(len(b), len(i + e)) if bwidth else twidth + 2
+    sline = b + m + bwidth_inner * m[0] + 2 * m[0]
+    nspaces = (bwidth_inner - twidth) // 2
+    mlines = i + m + " " + " " * nspaces
+    mlinee = " " + " "*(bwidth_inner - twidth - nspaces) + m
+    eline = i + m + bwidth_inner * m[0] + 2 * m[0] + e
+    return sline, mlines, mlinee, eline
+
+def foldmarker():
+    "Return a tuple of (open fold marker, close fold marker)"
+    return vim.eval("&foldmarker").split(",")
diff --git a/vim/snippets/vim-snippets/snippets/_.snippets b/vim/snippets/vim-snippets/snippets/_.snippets
new file mode 100644
index 0000000..d93eb87
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/_.snippets
@@ -0,0 +1,288 @@
+# Global snippets
+
+# (c) holds no legal value ;)
+snippet c)
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${1:`g:snips_author`}. All Rights Reserved.
+snippet date
+	`strftime("%Y-%m-%d")`
+snippet ddate
+	`strftime("%B %d, %Y")`
+snippet diso
+	`strftime("%Y-%m-%dT%H:%M:%S")`
+snippet time
+	`strftime("%H:%M")`
+snippet datetime
+	`strftime("%Y-%m-%d %H:%M")`
+snippet lorem
+	Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+snippet GPL2
+	${1:One line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	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, see <http://www.gnu.org/licenses/>.
+	${0}
+snippet LGPL2
+	${1:One line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	This library 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.
+
+	This library 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 this library; if not, see <http://www.gnu.org/licenses/>.
+	${0}
+snippet GPL3
+	${1:one line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	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 3 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, see <http://www.gnu.org/licenses/>.
+	${0}
+snippet LGPL3
+	${1:One line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	This library 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 3 of the License, or
+	(at your option) any later version.
+
+	This library 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 this library; if not, see <http://www.gnu.org/licenses/>.
+	${0}
+snippet AGPL3
+	${1:one line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+	${0}
+snippet GMGPL linking exception
+	As a special exception, if other files instantiate generics from
+	this unit, or you link this unit with other files to produce an
+	executable, this unit does not by itself cause the resulting
+	executable to be covered by the GNU General Public License.
+	This exception does not however invalidate any other reasons why the
+	executable file might be covered by the GNU Public License.
+
+	${0}
+snippet BSD2
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	1. Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+	2. 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.
+
+	THIS SOFTWARE IS PROVIDED BY $2 ''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 $2 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.
+
+	The views and conclusions contained in the software and documentation
+	are those of the authors and should not be interpreted as representing
+	official policies, either expressed or implied, of $2.
+	${0}
+snippet BSD3
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	1. Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+	2. 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.
+	3. Neither the name of the ${3:organization} nor the
+	names of its contributors may be used to endorse or promote products
+	derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY $2 ''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 $2 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.
+	${0}
+snippet BSD4
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+	1. Redistributions of source code must retain the above copyright
+	notice, this list of conditions and the following disclaimer.
+	2. 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.
+	3. All advertising materials mentioning features or use of this software
+	must display the following acknowledgement:
+	This product includes software developed by the ${3:organization}.
+	4. Neither the name of the $3 nor the
+	names of its contributors may be used to endorse or promote products
+	derived from this software without specific prior written permission.
+
+	THIS SOFTWARE IS PROVIDED BY $2 ''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 $2 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.
+	${0}
+snippet MIT
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	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.
+	${0}
+snippet APACHE
+	${1:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
+
+	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.
+	${0}
+snippet BEERWARE
+	${1:one line to give the program's name and a brief description}
+	Copyright `strftime("%Y")` ${2:`g:snips_author`}
+
+	Licensed under the "THE BEER-WARE LICENSE" (Revision 42):
+	$2 wrote this file. As long as you retain this notice you
+	can do whatever you want with this stuff. If we meet some day, and you think
+	this stuff is worth it, you can buy me a beer or coffee in return
+	${0}
+snippet WTFPL
+			DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+					Version 2, December 2004
+
+	Copyright `strftime("%Y")` ${0:`g:snips_author`}
+
+	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.
+
+	${0}
+snippet MPL2
+	This Source Code Form is subject to the terms of the Mozilla Public
+	License, v. 2.0. If a copy of the MPL was not distributed with this
+	file, You can obtain one at http://mozilla.org/MPL/2.0/.
+	${0}
+snippet AGPL
+	${1:One line to give the program's name and a brief description.}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")` ${2:`g:snips_author`}
+
+	This program  is free software: you can redistribute it and/or modify
+	it under the terms of the GNU Affero General Public License as
+	published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+	You should have received a copy of the GNU Affero General Public License
+	along with this program. If not, see <http://www.gnu.org/licenses/>.
+snippet ISC
+	${1:one line to give the program's name and a brief description}
+	Copyright `&enc[:2] == "utf" ? "©" : "(c)"` `strftime("%Y")`, ${2:`g:snips_author`}
+
+	Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.
+
+	THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+	${0}
diff --git a/vim/snippets/vim-snippets/snippets/actionscript.snippets b/vim/snippets/vim-snippets/snippets/actionscript.snippets
new file mode 100644
index 0000000..5d74439
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/actionscript.snippets
@@ -0,0 +1,153 @@
+snippet main
+	package {
+		import flash.display.*;
+		import flash.Events.*;
+
+		public class Main extends Sprite {
+			public function Main (	) {
+				trace("start");
+				stage.scaleMode = StageScaleMode.NO_SCALE;
+				stage.addEventListener(Event.RESIZE, resizeListener);
+			}
+
+			private function resizeListener (e:Event):void {
+				trace("The application window changed size!");
+				trace("New width:  " + stage.stageWidth);
+				trace("New height: " + stage.stageHeight);
+			}
+
+		}
+
+	}
+snippet class
+	${1:public|internal} class ${2:name} ${0:extends } {
+		public function $2 (	) {
+			("start");
+		}
+	}
+snippet all
+	package name {
+
+		${1:public|internal|final} class ${2:name} ${0:extends } {
+			private|public| static const FOO = "abc";
+			private|public| static var BAR = "abc";
+
+			// class initializer - no JIT !! one time setup
+			if Cababilities.os == "Linux|MacOS" {
+				FOO = "other";
+			}
+
+			// constructor:
+			public function $2 (	){
+				super2();
+				trace("start");
+			}
+			public function name (a, b...){
+				super.name(..);
+				lable:break
+			}
+		}
+	}
+
+	function A(){
+		// A can only be accessed within this file
+	}
+snippet switch
+	switch(${1}){
+		case ${2}:
+			${0}
+		break;
+		default:
+	}
+snippet case
+		case ${1}:
+			${0}
+		break;
+snippet package
+	package ${1:package}{
+		${0}
+	}
+snippet wh
+	while ${1:cond}{
+		${0}
+	}
+snippet do
+	do {
+		${0}
+	} while (${1:cond})
+snippet for enumerate names
+	for (${1:var} in ${2:object}){
+		${0}
+	}
+snippet for enumerate values
+	for each (${1:var} in ${2:object}){
+		${0}
+	}
+snippet get_set
+	function get ${1:name} {
+		return ${2}
+	}
+	function set $1 (newValue) {
+		${0}
+	}
+snippet interface
+	interface name {
+		function method(${1}):${0:returntype};
+	}
+snippet try
+	try {
+		${1:${VISUAL}}
+	} catch (error:ErrorType) {
+		${2}
+	} finally {
+		${0}
+	}
+# For Loop (same as c.snippet)
+snippet for for (..) {..}
+	for (${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+		${0}
+	}
+# Custom For Loop
+snippet forr
+	for (${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+		${0}
+	}
+# If Condition
+snippet if
+	if (${1:/* condition */}) {
+		${0:${VISUAL}}
+	}
+snippet el
+	else {
+		${0:${VISUAL}}
+	}
+# Ternary conditional
+snippet t
+	${1:/* condition */} ? ${2:a} : ${0:b}
+snippet fun
+	function ${1:function_name}(${2})${3}
+	{
+		${0}
+	}
+# FlxSprite (usefull when using the flixel library)
+snippet FlxSprite
+	package
+	{
+		import org.flixel.*
+
+		public class ${1:ClassName} extends ${2:FlxSprite}
+		{
+			public function $1(${3: X:Number, Y:Number}):void
+			{
+				super(X,Y);
+				${4}
+			}
+
+			override public function update():void
+			{
+				super.update();
+				${0}
+			}
+		}
+	}
+
diff --git a/vim/snippets/vim-snippets/snippets/ada.snippets b/vim/snippets/vim-snippets/snippets/ada.snippets
new file mode 100644
index 0000000..c0ed280
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/ada.snippets
@@ -0,0 +1,217 @@
+snippet wi with
+	with ${1};${0}
+
+snippet pac package
+	package ${1} is
+		${0}
+	end $1;
+
+snippet pacb package body
+	package body ${1} is
+		${0}
+	end $1;
+
+snippet ent entry ... when
+	entry ${1}(${2}) when ${3} is
+	begin
+		${0}
+	end $1;
+
+snippet task task
+	task ${1} is
+		entry ${0}
+	end $1;
+
+snippet taskb task body
+	task body ${1} is
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet acc accept
+	accept ${1}(${2}) do
+		${0}
+	end $1;
+
+snippet prot protected type
+	protected type ${1}(${2}) is
+		${0}
+	end $1;
+
+snippet prob protected body
+	protected body ${1} is
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet gen generic type
+	generic
+		type ${1} is ${2};${0}
+
+snippet ty type
+	type ${1} is ${2};${0}
+
+snippet tyd type with default value
+	type ${1} is ${2}
+		with Default_Value => ${3};${0}
+
+snippet subty subtype
+	subtype ${1} is ${2};${0}
+
+snippet dec declare block
+	declare
+		${1}
+	begin
+		${0}
+	end;
+
+snippet decn declare named block
+	${1}:
+	declare
+		${2}
+	begin
+		${0}
+	end $1;
+
+snippet ifex if expression
+	if ${1} then ${2} else ${0}
+
+snippet casex case expression
+	case ${1} is
+		when ${2} => ${3},${0}
+
+snippet fora for all
+	for all ${1} ${2:in} ${3} => ${0}
+
+snippet fors for some
+	for some ${1} ${2:in} ${3} => ${0}
+
+snippet if if
+	if ${1} then
+		${0:${VISUAL}}
+	end if;
+
+snippet ife if ... else
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}
+	end if;
+
+snippet el else
+	else
+		${0:${VISUAL}}
+
+snippet eif elsif
+	elsif ${1} then
+		${0}
+
+snippet wh while
+	while ${1} loop
+		${0:${VISUAL}}
+	end loop;
+
+snippet nwh named while
+	${1}:
+	while ${2} loop
+		${0:${VISUAL}}
+	end loop $1;
+
+snippet for for
+	for ${1:I} in ${2} loop
+		${0}
+	end loop;
+
+snippet fore for each
+	for ${1} of ${2} loop
+		${0}
+	end loop;
+
+snippet nfor named for
+	${1}:
+	for ${2:I} in ${3} loop
+		${0}
+	end loop $1;
+
+snippet nfore named for each
+	${1}:
+	for ${2} of ${3} loop
+		${0}
+	end loop $1;
+
+snippet proc procedure
+	procedure ${1}(${2}) is
+		${3}
+	begin
+		${0}
+	end $1;
+
+snippet procd procedure declaration
+	procedure ${1};${0}
+
+snippet fun function
+	function ${1}(${2}) return ${3} is
+		${4}
+	begin
+		${0}
+	end $1;
+
+snippet fune expression function
+	function ${1} return ${2} is
+		(${3});${0}
+
+snippet fund function declaration
+	function ${1} return ${2};${0}
+
+snippet ret extended return
+	return ${1} do
+		${0}
+	end return;
+
+snippet rec record
+	record
+		${0}
+	end record;
+
+snippet case case
+	case ${1} is
+		when ${2} => ${3};${0}
+	end case;
+
+snippet whe when
+	when ${1} => ${2};${0}
+
+snippet wheo when others
+	when others => ${1};${0}
+
+snippet lo loop
+	loop
+		${0}
+	end loop;
+
+snippet nlo named loop
+	${1}:
+	loop
+		${0}
+	end loop $1;
+
+snippet ex exit when
+	exit when ${1};${0}
+
+snippet put Ada.Text_IO.Put
+	Ada.Text_IO.Put(${1});${0}
+
+snippet putl Ada.Text_IO.Put_Line
+	Ada.Text_IO.Put_Line(${1});${0}
+
+snippet get Ada.Text_IO.Get
+	Ada.Text_IO.Get(${1});${0}
+
+snippet getl Ada.Text_IO.Get_Line
+	Ada.Text_IO.Get_Line(${1});${0}
+
+snippet newline Ada.Text_IO.New_Line
+	Ada.Text_IO.New_Line(${1:1});${0}
+
diff --git a/vim/snippets/vim-snippets/snippets/apache.snippets b/vim/snippets/vim-snippets/snippets/apache.snippets
new file mode 100644
index 0000000..de5672c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/apache.snippets
@@ -0,0 +1,35 @@
+# Snippets for code blocks used oftenly in Apache files.
+# <Directory>
+snippet dir
+	<Directory ${1:/}>
+		DirectoryIndex ${0:index.html}
+		Order Deny,Allow
+		Deny from All
+	</Directory>
+# <FilesMatch>
+snippet filesmatch
+	<FilesMatch "${1:regex}">
+		${0:${VISUAL}}
+	</FilesMatch>
+# <IfModule>
+snippet ifmodule
+	<IfModule ${1:mod_example.c}>
+		${0:${VISUAL}}
+	</IfModule>
+# <LimitExcept>
+snippet limitexcept
+	<LimitExcept ${1:POST GET}>
+		${0:${VISUAL}}
+	</LimitExcept>
+# <Proxy>
+snippet proxy
+	<Proxy ${1:*}>
+		${0:${VISUAL}}
+	</Proxy>
+# <VirtualHost>
+snippet virtualhost
+	<VirtualHost ${1:*}:${2:80}>
+		ServerAdmin ${3:webmaster@example.com}
+		DocumentRoot ${4:/www/example.com}
+		ServerName ${0:www.example.com}
+	</VirtualHost>
diff --git a/vim/snippets/vim-snippets/snippets/arduino.snippets b/vim/snippets/vim-snippets/snippets/arduino.snippets
new file mode 100644
index 0000000..a2732a5
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/arduino.snippets
@@ -0,0 +1,124 @@
+snippet setup
+	void setup()
+	{
+		Serial.begin(${1:9600});
+		${2}
+	}
+
+snippet loop
+	void loop()
+	{
+		${0}
+	}
+
+snippet inc
+	#include <${1}.h>
+
+snippet def
+	#define ${1}
+
+# if
+snippet if
+	if (${1:/* condition */}) {
+		${0:${VISUAL}}
+	}
+# else
+snippet el
+	else {
+		${1}
+	}
+# else if
+snippet elif
+	else if (${1:/* condition */}) {
+		${2}
+	}
+# ifi
+snippet ifi
+	if (${1:/* condition */}) ${2};
+
+# switch
+snippet switch
+	switch (${1:/* variable */}) {
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+		default:
+			${6}
+	}
+
+snippet case
+	case ${1:/* variable case */}:
+		${2}
+		${3:break;}
+
+# for
+snippet for
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+		${4}
+	}
+# for (custom)
+snippet forr
+	for (int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+		${5}
+	}
+# while
+snippet wh
+	while (${1:/* condition */}) {
+		${2}
+	}
+# do... while
+snippet do
+	do {
+		${2}
+	} while (${1:/* condition */});
+##
+## Functions
+# function definition
+snippet fun
+	${1:void} ${2:function_name}(${3})
+	{
+		${4}
+	}
+
+## IO
+# pinMode OUTPUT
+snippet pinout
+	pinMode(${1}, OUTPUT);
+# pinMode INPUT
+snippet pinin
+	pinMode(${1}, INPUT);
+# digitalWrite HIGH
+snippet dwHigh
+	digitalWrite(${1}, HIGH);
+# digitalWrite LOW
+snippet dwLow
+	digitalWrite(${1}, LOW);
+# digitalRead
+snippet dr
+	digitalRead(${1});
+# analogRead
+snippet ar
+	analogRead(${1});
+# analogWrite
+snippet aw
+	analogWrite(${1});
+# serialRead
+snippet sr
+	Serial.read();
+# serialWrite
+snippet sw
+	Serial.write();
+# serial.print
+snippet sp
+	Serial.print(${1});
+# serial.println
+snippet sl
+	Serial.println(${1});
+
+
+# delay
+snippet dl
+	delay(${1});
+# millis
+snippet ml
+	millis();
diff --git a/vim/snippets/vim-snippets/snippets/autoit.snippets b/vim/snippets/vim-snippets/snippets/autoit.snippets
new file mode 100644
index 0000000..f973fbc
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/autoit.snippets
@@ -0,0 +1,66 @@
+snippet if
+	If ${1:condition} Then
+		${0:; True code}
+	EndIf
+snippet el
+	Else
+		${0}
+snippet eif
+	ElseIf ${1:condition} Then
+		${0:; True code}
+# If/Else block
+snippet ife
+	If ${1:condition} Then
+		${2:; True code}
+	Else
+		${0:; Else code}
+	EndIf
+# If/ElseIf/Else block - because there is eif this is not really neccessary
+snippet ifelif
+	If ${1:condition 1} Then
+		${2:; True code}
+	ElseIf ${3:condition 2} Then
+		${4:; True code}
+	Else
+		${0:; Else code}
+	EndIf
+# Switch block
+snippet switch
+	Switch (${1:condition})
+	Case ${2:case1}:
+		${3:; Case 1 code}
+	Case Else:
+		${0:; Else code}
+	EndSwitch
+# Select block
+snippet select
+	Select (${1:condition})
+	Case ${2:case1}:
+		${3:; Case 1 code}
+	Case Else:
+		${0:; Else code}
+	EndSelect
+# While loop
+snippet wh
+	While (${1:condition})
+		${0:; code...}
+	WEnd
+# For loop
+snippet for
+	For ${1:n} = ${3:1} to ${2:count}
+		${0:; code...}
+	Next
+# New Function
+snippet func
+	Func ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
+		${0:Return}
+	EndFunc
+# Message box
+snippet msg
+	MsgBox(${0:MsgType}, ${1:"Title"}, ${2:"Message Text"})
+# Debug Message
+snippet debug
+	MsgBox(0, "Debug", ${0:"Debug Message"})
+# Show Variable Debug Message
+snippet showvar
+	MsgBox(0, "${0:VarName}", $1)
diff --git a/vim/snippets/vim-snippets/snippets/awk.snippets b/vim/snippets/vim-snippets/snippets/awk.snippets
new file mode 100644
index 0000000..5c94734
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/awk.snippets
@@ -0,0 +1,102 @@
+# cannot use /usr/bin/env because it does not support parameters (as -f)
+snippet #! #!/usr/bin/awk -f
+	#!/usr/bin/awk -f
+
+# @include is a gawk extension
+snippet inc @include
+	@include "${1}"${0}
+
+# @load is a gawk extension
+snippet loa @load
+	@load "${1}"${0}
+
+snippet beg BEGIN { ... }
+	BEGIN {
+		${0}
+	}
+
+# BEGINFILE is a gawk extension
+snippet begf BEGINFILE { ... }
+	BEGINFILE {
+		${0}
+	}
+
+snippet end END { ... }
+	END {
+		${0}
+	}
+
+# ENDFILE is a gawk extension
+snippet endf ENDFILE { ... }
+	ENDFILE {
+		${0}
+	}
+
+snippet pri print
+	print ${1:"${2}"}${0}
+
+snippet printf printf
+	printf("${1:%s}\n", ${2})${0}
+
+snippet ign IGNORECASE
+	IGNORECASE = ${1:1}
+
+snippet if if {...}
+	if (${1}) {
+		${0:${VISUAL}}
+	}
+
+snippet ife if ... else ...
+	if (${1}) {
+		${2:${VISUAL}}
+	} else {
+		${0}
+	}
+
+snippet eif else if ...
+	else if (${1}) {
+		${0}
+	}
+
+snippet el else {...}
+	else {
+		${0}
+	}
+
+snippet wh while
+	while (${1}) {
+		${2}
+	}
+
+snippet do do ... while
+	do {
+		${0}
+	} while (${1})
+
+snippet for for
+	for (${2:i} = 0; i < ${1:n}; ${3:++i}) {
+		${0}
+	}
+
+snippet fore for each
+	for (${1:i} in ${2:array}) {
+		${0}
+	}
+
+# the switch is a gawk extension
+snippet sw switch
+	switch (${1}) {
+	case ${2}:
+		${3}
+		break
+	default:
+		${0}
+		break
+	}
+
+# the switch is a gawk extension
+snippet case case
+	case ${1}:
+		${0}
+		break
+
diff --git a/vim/snippets/vim-snippets/snippets/c.snippets b/vim/snippets/vim-snippets/snippets/c.snippets
new file mode 100644
index 0000000..0336a14
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/c.snippets
@@ -0,0 +1,335 @@
+## Main
+# main
+snippet main
+	int main(int argc, const char *argv[])
+	{
+		${0}
+		return 0;
+	}
+# main(void)
+snippet mainn
+	int main(void)
+	{
+		${0}
+		return 0;
+	}
+##
+## Preprocessor
+# #include <...>
+snippet inc
+	#include <${1:stdio}.h>
+# #include "..."
+snippet Inc
+	#include "${1:`vim_snippets#Filename("$1.h")`}"
+# ifndef...define...endif
+snippet ndef
+	#ifndef $1
+	#define ${1:SYMBOL} ${2:value}
+	#endif /* ifndef $1 */
+# define
+snippet def
+	#define
+# ifdef...endif
+snippet ifdef
+	#ifdef ${1:FOO}
+		${2:#define }
+	#endif
+# if
+snippet #if
+	#if ${1:FOO}
+		${0:${VISUAL}}
+	#endif
+# header include guard
+snippet once
+	#ifndef ${1:`toupper(vim_snippets#Filename('$1_H', 'UNTITLED_H'))`}
+
+	#define $1
+
+	${0}
+
+	#endif /* end of include guard: $1 */
+##
+## Control Statements
+# if
+snippet if
+	if (${1:true}) {
+		${0:${VISUAL}}
+	}
+snippet ife
+	if (${1:true}) {
+		${2:${VISUAL}}
+	} else {
+		${0}
+	}
+# else
+snippet el
+	else {
+		${0:${VISUAL}}
+	}
+# else if
+snippet elif
+	else if (${1:true}) {
+		${0:${VISUAL}}
+	}
+# ifi
+snippet ifi
+	if (${1:true}) ${0};
+# ternary
+snippet t
+	${1:/* condition */} ? ${2:a} : ${3:b}
+# switch
+snippet switch
+	switch (${1:/* variable */}) {
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+		default:
+			${6}
+	}
+# switch without default
+snippet switchndef
+	switch (${1:/* variable */}) {
+		case ${2:/* variable case */}:
+			${3}
+			${4:break;}${5}
+	}
+# case
+snippet case
+	case ${1:/* variable case */}:
+		${2}
+		${3:break;}
+snippet ret
+	return ${0};
+##
+## Loops
+# for
+snippet for
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+		${4}
+	}
+# for (custom)
+snippet forr
+	for (int ${1:i} = ${2:0}; ${3:$1 < 10}; $1${4:++}) {
+		${5}
+	}
+# while
+snippet wh
+	while (${1:/* condition */}) {
+		${0:${VISUAL}}
+	}
+# do... while
+snippet do
+	do {
+		${0:${VISUAL}}
+	} while (${1:/* condition */});
+##
+## Functions
+# function definition
+snippet fun
+	${1:void} ${2:function_name}(${3})
+	{
+		${4}
+	}
+# function definition with zero parameters
+snippet fun0
+	${1:void} ${2:function_name}()
+	{
+		${3}
+	}
+# function definition with Doxygen documentation
+snippet dfun0
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 *
+	 * \return ${3:Return parameter description}
+	 */
+	${4:void} ${5:function_name}()
+	{
+		${6}
+	}
+# function definition with one parameter
+snippet fun1
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter})
+	{
+		${5}
+	}
+# function definition with one parameter with  Doxygen documentation
+snippet dfun1
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 *
+	 * \param $3 ${4:Parameter description}
+	 * \return ${5:Return parameter description}
+	 */
+	${6:void} ${7:function_name}(${8:Type} ${3:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters
+snippet fun2
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter})
+	{
+		${7}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun2
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 *
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \return ${7:Return parameter description}
+	 */
+	${8:void} ${9:function_name}(${10:Type} ${3:Parameter}, ${11:Type} ${5:Parameter})
+	{
+		${12}
+	}
+# function definition with two parameters
+snippet fun3
+	${1:void} ${2:function_name}(${3:Type} ${4:Parameter}, ${5:Type} ${6:Parameter}, ${7:Type} ${8:Parameter})
+	{
+		${9}
+	}
+# function definition with two parameters with  Doxygen documentation
+snippet dfun3
+	/*! \brief ${1:Brief function description here}
+	 *
+	 *  ${2:Detailed description of the function}
+	 *
+	 * \param $3 ${4:Parameter description}
+	 * \param $5 ${6:Parameter description}
+	 * \param $7 ${8:Parameter description}
+	 * \return ${9:Return parameter description}
+	 */
+	${10:void} ${11:function_name}(${12:Type} ${3:Parameter}, ${13:Type} ${5:Parameter}, ${14:Type} ${7:Parameter})
+	{
+		${15}
+	}
+# function declaration
+snippet fund
+	${1:void} ${2:function_name}(${3});
+##
+## Types
+# typedef
+snippet td
+	typedef ${1:int} ${2:MyCustomType};
+# struct
+snippet st
+	/*! \struct $1
+	 *  \brief ${3:Brief struct description}
+	 *
+	 *  ${4:Detailed description}
+	 */
+	struct ${1:`vim_snippets#Filename('$1_t', 'name')`} {
+		${2:Data} /*!< ${4:Description} */
+	}${5: /* optional variable list */};
+# typedef struct
+snippet tds
+	/*! \struct $2
+	 *  \brief ${5:Brief struct description}
+	 *
+	 *  ${6:Detailed description}
+	 */
+	typedef struct ${2:_$1 }{
+		m_${3:Data} /*!< ${4:Description} */
+	} ${1:`vim_snippets#Filename('$1_t', 'name')`};
+
+snippet enum
+	/*! \enum $1
+	 *
+	 *  ${2:Detailed description}
+	 */
+	enum ${1:name} { ${0} };
+# typedef enum
+snippet tde
+	/*! \enum $2
+	 *
+	 *  ${4:Detailed description}
+	 */
+	typedef enum {
+		${1:Data} /*!< ${3:Description} */
+	} ${2:foo};
+##
+## Input/Output
+# printf
+snippet pr
+	printf("${1:%s}\n"${2});
+# fprintf (again, this isn't as nice as TextMate's version, but it works)
+snippet fpr
+	fprintf(${1:stderr}, "${2:%s}\n"${3});
+snippet prd
+	printf("${1:} = %d\n", $1);
+snippet prf
+	printf("${1:} = %f\n", $1);
+snippet prx
+	printf("${1:} = %${2}\n", $1);
+# getopt
+snippet getopt
+	int choice;
+	while (1)
+	{
+		static struct option long_options[] =
+		{
+			/* Use flags like so:
+			{"verbose",	no_argument,	&verbose_flag, 'V'}*/
+			/* Argument styles: no_argument, required_argument, optional_argument */
+			{"version", no_argument,	0,	'v'},
+			{"help",	no_argument,	0,	'h'},
+			${1}
+			{0,0,0,0}
+		};
+
+		int option_index = 0;
+
+		/* Argument parameters:
+			no_argument: " "
+			required_argument: ":"
+			optional_argument: "::" */
+
+		choice = getopt_long( argc, argv, "vh",
+					long_options, &option_index);
+
+		if (choice == -1)
+			break;
+
+		switch( choice )
+		{
+			case 'v':
+				${2}
+				break;
+
+			case 'h':
+				${3}
+				break;
+
+			case '?':
+				/* getopt_long will have already printed an error */
+				break;
+
+			default:
+				/* Not sure how to get here... */
+				return EXIT_FAILURE;
+		}
+	}
+
+	/* Deal with non-option arguments here */
+	if ( optind < argc )
+	{
+		while ( optind < argc )
+		{
+			${0}
+		}
+	}
+##
+# TODO section
+snippet todo
+	/*! TODO: ${1:Todo description here}
+	 *  \todo $1
+	 */
+## Miscellaneous
+# This is kind of convenient
+snippet .
+	[${1}]
diff --git a/vim/snippets/vim-snippets/snippets/chef.snippets b/vim/snippets/vim-snippets/snippets/chef.snippets
new file mode 100644
index 0000000..429146a
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/chef.snippets
@@ -0,0 +1,204 @@
+# Opscode Chef Cookbook Recipe Resources
+# Snippet by: Mike Smullin <mike@smullindesign.com>
+# Based on: http://wiki.opscode.com/display/chef/Resources
+
+# @TODO: Include Meta attributes and actions in all snippets
+# @TODO: Finish writing snippets for remaining Resources
+
+snippet cookbook_file
+	# Cookbook File resource
+	cookbook_file ${1:"/path/to/file"} do # The remote path where the file will reside
+		${2:#}backup ${3} # How many backups of this file to keep. Set to false  if you want no backups
+		${4:#}group ${5} # The group owner of the file (string or id)
+		${6:#}mode ${7} # The octal mode of the file - e.g. 0755
+		${8:#}owner ${9} # The owner for the file
+		${10:#}source ${11} # The basename of the source file
+		${12:#}cookbook ${13} # The cookbook this file is stored in
+
+		${14:#}${15: action :create} # Create this file (Default)
+		${16:#}${17: action :create_if_missing} # Create only if it doesn't exist yet
+		${18:#}${0: action :delete} # Delete this file
+	end
+
+snippet execute
+	# Execute resource
+	execute ${1:"command to execute"} do # The command to execute
+		${2:#}creates ${3:nil} # A file this command creates - if the file exists, the command will not be run.
+		${4:#}cwd ${5:nil} # Current working directory to run the command from.
+		${6:#}environment ${7:nil} # A hash of environment variables to set before running this command.
+		${8:#}group ${9:nil} # A group name or group ID that we should change to before running this command.
+		${10:#}path ${11:nil} # An array of paths to use when searching for the command. Nil uses system path.
+		${12:#}returns ${13:0} # The return value of the command - this resource raises an exception if the return value does not match.
+		${14:#}timeout ${15:nil} # How many seconds to let the command run before timing it out.
+		${16:#}user ${17:nil} # A user name or user ID that we should change to before running this command.
+		${18:#}umask ${19:nil} # Umask for files created by the command
+
+		${20:#}${21:action :run} # Run this command (Default)
+		${22:#}${0:action :nothing} # Do not run this command
+	end
+
+snippet link
+	# Link resource
+	link ${1:"/target/file"} do # The file name of the link
+		${2:#}to ${3} # The real file you want to link to
+		${4:#}link_type ${5:symbolic} # Either :symbolic or :hard
+		${6:#}owner ${7} # The owner of the symlink
+		${8:#}group ${9} # The group of the symlink
+
+		${10:#}${11:action :create} # Create a link (Default)
+		${12:#}${0:action :delete} # Delete a link
+	end
+
+snippet package
+	# Package resource
+	package ${1:"package_name"} do # Name of the package to install
+		${2:#}version ${3:nil} # The version of the package to install/upgrade
+		${4:#}response_file ${5:nil} # An optional response file - used to pre-seed packages (note: the file is fetched by Remote File)
+		${6:#}source ${7} # Used to provide an optional package source for providers that use a local file (rubygems, dpkg and rpm)
+		${8:#}options ${9:nil} # Add additional options to the underlying package command
+		${10:#}gem_binary ${11:gem} # A gem_package attribut to specify a gem binary. Useful for installing ruby 1.9 gems while running chef in ruby 1.8
+
+		${12:#}${13:action :install} # Install a package - if version is provided, install that specific version (Default)
+		${14:#}${15:action :upgrade} # Upgrade a package - if version is provided, upgrade to that specific version
+		${16:#}${17:action :remove} # Remove a package
+		${18:#}${0:action :purge} # Purge a package (this usually entails removing configuration files as well as the package itself)
+	end
+
+snippet service
+	# Service resource
+	service ${1:"service_name"} do # Name of the service
+		${2:#}enabled ${3:nil} # Whether the service is enabled at boot time
+		${4:#}running ${5:nil} # Make sure the service is running. Start if stopped
+		${6:#}pattern ${7} # Pattern to look for in the process table
+		${8:#}start_command ${9:nil} # Command used to start this service
+		${10:#}stop_command ${11:nil} # Command used to stop this service
+		${12:#}status_command ${13:nil} # Command used to check the service run status
+		${14:#}restart_command ${15:nil} # Command used to restart this service
+		${16:#}reload_command ${17:nil} # Command used to tell this service to reload its configuration
+		${18:#}supports ${19:false} # Features this service supports, ie :restart, :reload, :status
+
+		${20:#}${21:action :enable} # Enable this service
+		${22:#}${23:action :disable} # Disable this service
+		${24:#}${25:action :nothing} # Don't do anything with this service (Default)
+		${26:#}${27:action :start} # Start this service
+		${28:#}${29:action :stop} # Stop this service
+		${30:#}${31:action :restart} # Restart this service
+		${32:#}${0:action :reload} # Reload the configuration for this service
+	end
+
+snippet file
+	# File resource
+	file ${1:"/path/to/file"} do # Path to the file
+		${2:#}backup ${3:5} # How many backups of this file to keep. Set to false if you want no backups.
+		${4:#}owner ${5} # The owner for the file
+		${6:#}group ${7} # The group owner of the file (string or id)
+		${8:#}mode ${9} # The octal mode of the file (4-digit format)
+		${10:#}content ${11:nil} # A string to write to the file. This will replace any previous content if set
+
+		${12:#}${13:action :create} # Create this file (Default)
+		${14:#}${15:action :delete} # Delete this file
+		${16:#}${0:action :touch} # Touch this file (update the mtime/atime)
+	end
+
+snippet directory
+	# Directory resource
+	directory ${1:"/path/to/dir"} do # The path to the directory
+		${2:#}group ${3} # The group owner of the directory (string or id)
+		${4:#}mode ${5} # The octal mode of the directory, eg 0755
+		${6:#}owner ${7} # The owner for the directory
+		${10:#}recursive ${11:false} # When deleting the directory, delete it recursively. When creating the directory, create recursively (ie, mkdir -p)
+
+		${12:#}${13:action :create} # Create this directory (Default)
+		${14:#}${0:action :delete} # Delete this directory
+	end
+
+snippet template
+	# Template resource
+	template ${1:"/path/to/file"} do # Path to the file
+		${2:#}cookbook ${3:nil} # Specify the cookbook where the template is located, default is current cookbook
+		${4:#}source ${5:nil} # Template source file. Found in templates/default for the cookbook
+		${6:#}variables ${7} # Variables to use in the template
+		${8:#}local ${9:false} # Is the template already present on the node?
+		${10:#}backup ${11:5} # How many backups of this file to keep. Set to false if you want no backups.
+		${12:#}owner ${13} # The owner for the file
+		${14:#}group ${15} # The group owner of the file (string or id)
+		${16:#}mode ${17} # The octal mode of the file (4-digit format)
+		${18:#}content ${19:nil} # A string to write to the file. This will replace any previous content if set
+
+		${20:#}${21:action :create} # Create the file (Default)
+		${22:#}${23:action :delete} # Delete this file
+		${24:#}${0:action :touch} # Touch this file (update the mtime/atime)
+	end
+
+snippet svn
+	# SCM Resource, Chef::Provider::Subversion
+	svn ${1:"/destination/path"} do # Path to clone/checkout/export the source to
+		${2:#}repository ${3} # URI of the repository
+		${4:#}revision ${5:"HEAD"} # revision to checkout. can be symbolic, like "HEAD" or an SCM specific revision id
+		${6:#}reference ${7} # (Git only) alias for revision
+		${8:#}user ${9:nil} # System user to own the checked out code
+		${10:#}group ${11:nil} # System group to own the checked out code
+		${12:#}svn_username ${13} # (Subversion only) Username for Subversion operations
+		${14:#}svn_password ${15} # (Subversion only) Password for Subversion operations
+		${16:#}svn_arguments ${17} # (Subversion only) Extra arguments passed to the subversion command
+
+		${18:#}${19:action :sync} # Update the source to the specified revision, or get a new checkout (Default)
+		${20:#}${21:action :checkout} # Checkout the source. Does nothing if a checkout is available
+		${22:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
+	end
+
+snippet git
+	# SCM Resource, Chef::Provider::Git
+	git ${1:"/destination/path"} do # Path to clone/checkout/export the source to
+		${2:#}repository ${3} # URI of the repository
+		${4:#}revision ${5:"HEAD"} # revision to checkout. can be symbolic, like "HEAD" or an SCM specific revision id
+		${6:#}reference ${7} # (Git only) alias for revision
+		${8:#}user ${9:nil} # System user to own the checked out code
+		${10:#}group ${11:nil} # System group to own the checked out code
+		${12:#}depth ${13:nil} # (Git only) Number of past revisions to include in Git shallow clone
+		${14:#}enable_submodules ${15:"false"} # (Git only) performs a submodule init and submodule update
+		${16:#}remote ${17:"origin"} # (Git only) remote repository to use for syncing an existing clone
+		${18:#}ssh_wrapper ${19} # (Git only) path to a wrapper script for running SSH with git. GIT_SSH environment variable is set to this.
+
+		${20:#}${21:action :sync} # Update the source to the specified revision, or get a new clone (Default)
+		${22:#}${23:action :checkout} # Clone the source. Does nothing if a checkout is available
+		${24:#}${0:action :export} # Export the source, excluding or removing any version control artifacts
+	end
+
+snippet deploy
+	# Deploy resource
+	deploy ${1:"/deploy/dir/"} do # Path to deploy to
+		${2:#}deploy_to ${3} # The "meta root" for your application.
+		${4:#}repository ${5} # URI of the repository
+		${6:#}repo ${7} # alias for repository
+		${8:#}revision ${9:"HEAD"} # revision to checkout. can be symbolic, like "HEAD" or an SCM specific revision id
+		${10:#}branch ${11} # alias for revision
+		${12:#}user ${13:nil} # System user to run the deploy as
+		${14:#}group ${15:nil} # System group to run the deploy as
+		${16:#}svn_username ${17} # (Subversion only) Username for Subversion operations}
+		${18:#}svn_password ${19} # (Subversion only) Password for Subversion operations}
+		${20:#}svn_arguments ${21} # (Subversion only) Extra arguments passed to the subversion command}
+		${22:#}shallow_clone ${23:nil} # (Git only) boolean, true sets clone depth to 5
+		${24:#}enable_submodules ${25:false} # (Git only) performs a submodule init and submodule update
+		${26:#}remote ${27:"origin"} # (Git only) remote repository to use for syncing an existing clone
+		${28:#}ssh_wrapper ${29} # (Git only) path to a wrapper script for running SSH with git. GIT_SSH environment variable is set to this.
+		${30:#}git_ssh_wrapper ${31} # alias for ssh_wrapper
+		${32:#}scm_provider ${33:Chef::Provider::Git} # SCM Provider to use.
+		${34:#}repository_cache ${35: "cached-copy"} # Name of the subdirectory where the pristine copy of your app's source is kept
+		${36:#}environment ${37} # A hash of the form {"ENV_VARIABLE"=>"VALUE"}}
+		${38:#}purge_before_symlink ${39:%w(log tmp/pids public/system)} # An array of paths, relative to app root, to be removed from a checkout before symlinking
+		${40:#}create_dirs_before_symlink ${41:%w(tmp public config)} # Directories to create before symlinking. Runs after purge_before_symlink
+		${42:#}symlinks ${43:"system" => "public/system", "pids" => "tmp/pids", "log" => "log"} # A hash that maps files in the shared directory to their paths in the current release
+		${44:#}symlink_before_migrate ${45:"config/database.yml" => "config/database.yml"} # A hash that maps files in the shared directory into the current release. Runs before migration
+		${46:#}migrate ${47:false} # Should the migration command be executed? (true or false)
+		${48:#}migration_command ${49} # A string containing a shell command to execute to run the migration
+		${50:#}restart_command ${51:nil} # A code block to evaluate or a string containing a shell command
+		${52:#}before_migrate ${53:"deploy/before_migrate.rb"} # A block or path to a file containing chef code to run before migrating
+		${54:#}before_symlink ${55:"deploy/before_symlink.rb"} # A block or path to a file containing chef code to run before symlinking
+		${56:#}before_restart ${57:"deploy/before_restart.rb"} # A block or path to a file containing chef code to run before restarting
+		${58:#}after_restart ${59:"deploy/after_restart.rb"} # A block or path to a file containing chef code to run after restarting
+
+		${60:#}${61::deploy} # Deploy the application (Default)
+		${62:#}${63::force_deploy} # For the revision deploy strategy, this removes any existing release of the same code version and re-deploys in its place
+		${64:#}${0::rollback} # Rollback the application to the previous release
+	end
diff --git a/vim/snippets/vim-snippets/snippets/clojure.snippets b/vim/snippets/vim-snippets/snippets/clojure.snippets
new file mode 100644
index 0000000..152f896
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/clojure.snippets
@@ -0,0 +1,87 @@
+snippet comm
+	(comment
+		${0})
+snippet condp
+	(condp ${1:pred} ${2:expr}
+		${0})
+snippet def
+	(def ${0})
+snippet defm
+	(defmethod ${1:multifn} "${2:doc-string}" ${3:dispatch-val} [${4:args}]
+		${0})
+snippet defmm
+	(defmulti ${1:name} "${2:doc-string}" ${0:dispatch-fn})
+snippet defma
+	(defmacro ${1:name} "${2:doc-string}" ${0:dispatch-fn})
+snippet defn
+	(defn ${1:name} "${2:doc-string}" [${3:arg-list}]
+		${0})
+snippet defp
+	(defprotocol ${1:name}
+		${0})
+snippet defr
+	(defrecord ${1:name} [${2:fields}]
+		${3:protocol}
+		${0})
+snippet deft
+	(deftest ${1:name}
+		(is (= ${0:assertion})))
+snippet is
+	(is (= ${1} ${0}))
+snippet defty
+	(deftype ${1:Name} [${2:fields}]
+		${3:Protocol}
+		${0})
+snippet doseq
+	(doseq [${1:elem} ${2:coll}]
+		${0})
+snippet fn
+	(fn [${1:arg-list}] ${0})
+snippet if
+	(if ${1:test-expr}
+		${2:then-expr}
+		${0:else-expr})
+snippet if-let
+	(if-let [${1:result} ${2:test-expr}]
+		(${3:then-expr} $1)
+		(${0:else-expr}))
+snippet imp
+	(:import [${1:package}])
+		& {:keys [${1:keys}] :or {${0:defaults}}}
+snippet let
+	(let [${1:name} ${2:expr}]
+		${0})
+snippet letfn
+	(letfn [(${1:name}) [${2:args}]
+		${0})])
+snippet map
+	(map ${1:func} ${0:coll})
+snippet mapl
+	(map #(${1:lambda}) ${0:coll})
+snippet met
+	(${1:name} [${2:this} ${3:args}]
+		${0})
+snippet ns
+	(ns ${0:name})
+snippet dotimes
+	(dotimes [_ 10]
+		(time
+			(dotimes [_ ${1:times}]
+				${0})))
+snippet pmethod
+	(${1:name} [${2:this} ${0:args}])
+snippet refer
+	(:refer-clojure :exclude [${0}])
+snippet require
+	(:require [${1:namespace} :as [${0}]])
+snippet use
+	(:use [${1:namespace} :only [${0}]])
+snippet print
+	(println ${0})
+snippet reduce
+	(reduce ${1:(fn [p n] ${3})} ${2})
+snippet when
+	(when ${1:test} ${0:body})
+snippet when-let
+	(when-let [${1:result} ${2:test}]
+		${0:body})
diff --git a/vim/snippets/vim-snippets/snippets/cmake.snippets b/vim/snippets/vim-snippets/snippets/cmake.snippets
new file mode 100644
index 0000000..3a0b920
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/cmake.snippets
@@ -0,0 +1,83 @@
+snippet init
+	cmake_minimum_required(version ${1:2.8.2})
+	project(${2:ProjectName})
+
+	find_package(${3:library})
+
+	include_directories(${$3_INCLUDE_DIRS})
+
+	add_subdirectory(${0:src})
+
+	add_executable($2)
+
+	target_link_libraries($2 ${$3_LIBRARIES})
+
+snippet proj
+	project(${0:Name})
+
+snippet min
+	cmake_minimum_required(version ${0:2.8.2})
+
+snippet include
+	include_directories(${${0:include_dir}})
+
+snippet find
+	find_package(${1:library} ${0:REQUIRED})
+
+snippet glob
+	file(glob ${1:srcs} *.${0:cpp})
+
+snippet subdir
+	add_subdirectory(${0:src})
+
+snippet lib
+	add_library(${1:lib} ${${0:srcs}})
+
+snippet link
+	target_link_libraries(${1:bin} ${0:somelib})
+
+snippet bin
+	add_executable(${1:bin})
+
+snippet set
+	set(${1:var} ${0:val})
+
+snippet dep
+	add_dependencies(${1:target}
+		${0:dep}
+	)
+
+snippet Ext_url
+	include(ExternalProject)
+	ExternalProject_Add(${1:googletest}
+	  URL ${2:http://googletest.googlecode.com/files/gtest-1.7.0.zip}
+	  URL_HASH SHA1=${3:f85f6d2481e2c6c4a18539e391aa4ea8ab0394af}
+	  SOURCE_DIR "${4:${CMAKE_BINARY_DIR}/gtest-src}"
+	  BINARY_DIR "${0:${CMAKE_BINARY_DIR}/gtest-build}"
+	  CONFIGURE_COMMAND ""
+	  BUILD_COMMAND     ""
+	  INSTALL_COMMAND   ""
+	  TEST_COMMAND      ""
+	)
+
+snippet Ext_git
+	include(ExternalProject)
+	ExternalProject_Add(${1:googletest}
+	  GIT_REPOSITORY    ${2:https://github.com/google/googletest.git}
+	  GIT_TAG           ${3:master}
+	  SOURCE_DIR        "${4:${CMAKE_BINARY_DIR}/googletest-src}"
+	  BINARY_DIR        "${0:${CMAKE_BINARY_DIR}/googletest-build}"
+	  CONFIGURE_COMMAND ""
+	  BUILD_COMMAND     ""
+	  INSTALL_COMMAND   ""
+	  TEST_COMMAND      ""
+	)
+
+snippet props
+	set_target_properties(${1:target}
+		${2:properties} ${3:compile_flags}
+		${0:"-O3 -Wall -pedantic"}
+	)
+
+snippet test
+	add_test(${1:ATestName} ${0:testCommand --options})
diff --git a/vim/snippets/vim-snippets/snippets/codeigniter.snippets b/vim/snippets/vim-snippets/snippets/codeigniter.snippets
new file mode 100644
index 0000000..c38aa4d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/codeigniter.snippets
@@ -0,0 +1,171 @@
+# Based on nebjak/snipmate.vim/snippets/php.snippets
+
+# Controller
+snippet ci_controller
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName} extends CI_Controller
+	{
+		function __construct()
+		{
+			parent::__construct();
+			${2:// code...}
+		}
+
+		function ${3:index}()
+		{
+			${4:// code...}
+		}
+	}
+# Model
+snippet ci_model
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		function __construct()
+		{
+			parent::__construct();
+			${2:// code...}
+		}
+	} 
+snippet ci_model_crudl
+	<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+	class ${1:ClassName_model} extends CI_Model
+	{
+		private $table = '${2:table_name}';
+
+		function __construct()
+		{
+			parent::__construct();
+			${3:// code...}
+		}
+
+		public function create($data)
+		{
+			if($this->db->insert($this->table, $data))
+				return true;
+			else
+				return false;
+		}
+
+		public function read($id)
+		{
+			return $this->db->get_where($this->table, array('id', $id))->result();
+		}
+
+		public function update($id, $data)
+		{
+			if($this->db->update($this->table, $data, array('id' => $id)))
+				return true;
+			else
+				return false;
+		}
+
+		public function delete($id)
+		{
+			if(is_array($id))
+			{
+				$this->db->trans_start();
+				foreach($id as $elem)
+					$this->db->delete($this->table, array('id' => $elem));
+				$this->db->trans_complete();
+			}
+			else
+			{
+				if($this->db->delete($this->table, array('id' => $id)))
+					return true;
+				else
+					return false;
+			}
+		}
+
+		public function listRows($limit = null, $offset = 0)
+		{
+			if(!is_null($limit))
+				$this->db->limit($limit, $offset);
+			return $this->db->get($this->table)->result();
+		}
+	}
+# Load view
+snippet ci_load-view
+	$this->load->view("${1:view_name}", $${2:data});${3}
+# DB Class snippets
+snippet ci_db-insert
+	$this->db->insert("${1:table}", $${2:data});${3}
+snippet ci_db-select
+	$this->db->select("${1:id, ...}");${2}
+snippet ci_db-from
+	$this->db->from("${1:table}");${2}
+snippet ci_db-join
+	$this->db->join("${1:table}", "${2:condition}", "${3:type}");${4}
+snippet ci_db-where
+	$this->db->where("${1:key}", "${2:value}");${3}
+snippet ci_db-or_where
+	$this->db->or_where("${1:key}", "${2:value}");${3}
+snippet ci_db-get
+	$this->db->get("${1:table}", ${2:limit}, ${3:offset});${4}
+snippet ci_db-delete
+	$this->db->delete("${1:table}", "${2:where}");${3}
+snippet ci_db-update
+	$this->db->update("${1:table}", $${2:set}, $${3:where});${4}
+# Input Class snippets
+snippet ci_input-post
+	$this->input->post("${1:index}");${2}
+snippet ci_input-get
+	$this->input->get("${1:index}");${2}
+snippet ci_input-cookie
+	$this->input->cookie("${1:index}");${2}
+snippet ci_input-server
+	$this->input->server("${1:index}");${2}
+snippet ci_input-user_agent
+	$this->input->user_agent();${1}
+snippet ci_input-is_ajax_request
+	$this->input->is_ajax_request();${1}
+snippet ci_input-is_cli_request
+	$this->input->is_cli_request();${1}
+# Form Validation Class and Form Helper snippets
+snippet ci_form_validation-set_rules
+	$this->form_validation->set_rules("${1:field}", "${2:label}", "${3:trim|required}");${4}
+snippet ci_form_open
+	form_open("${1:action}");${2}
+snippet ci_form_open_multipart
+	form_open_multipart("${1:action}");${2}
+snippet ci_form_hidden
+	form_hidden("${1:name}", "${2:value}");${3}
+snippet ci_form_input
+	form_input("${1:name}", "${2:value}");${3}
+snippet ci_form_password
+	form_password("${1:name}", "${2:value}");${3}
+snippet ci_form_upload
+	form_upload("${1:name}", "${2:value}");${3}
+snippet ci_form_textarea
+	form_textarea("${1:name}", "${2:value}");${3}
+snippet ci_form_dropdown
+	form_dropdown("${1:name}", $${2:options}, $${3:selected);${4}
+snippet ci_form_checkbox
+	form_checkbox("${1:name}", "${2:value}");${3}
+snippet ci_form_radio
+	form_radio("${1:name}", "${2:value}");${3}
+snippet ci_form_submit
+	form_submit("${1:name}", "${2:value}");${3}
+snippet ci_form_reset
+	form_reset("${1:name}", "${2:value}");${3}
+snippet ci_form_button
+	form_button("${1:name}", "${2:value}");${3}
+snippet ci_form_label
+	form_label("${1:label text}", "${2:id}");${3}
+snippet ci_form_close
+	form_close();${1}
+snippet ci_validation_errors
+	validation_errors();${1}
+# Session Class snippets
+snippet ci_session_userdata
+	$this->session->userdata("${1:item}");${2}
+snippet ci_session_set_userdata
+	$this->session->set_userdata($${1:array});${2}
+snippet ci_session_flashdata
+	$this->session->flashdata("${1:item}");${2}
+snippet ci_session_set_flashdata
+	$this->session->set_flashdata("${1:item}", "${2:value}");${3}
diff --git a/vim/snippets/vim-snippets/snippets/coffee/angular_coffee.snippets b/vim/snippets/vim-snippets/snippets/coffee/angular_coffee.snippets
new file mode 100644
index 0000000..f98cae3
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/coffee/angular_coffee.snippets
@@ -0,0 +1,116 @@
+## Global Snippets
+# Define a new Angular Controller;
+# You can change the controller name and parameters
+snippet ngc
+	${1:controllerName} = (${2:scope}, ${3:injectables}) ->
+		${4}
+# angular.foreach loop
+snippet ngfor
+	angular.forEach ${1:iterateOver}, (value, key) ->
+		${2}
+## Module Based Snippets
+# A new angular module without a config function
+snippet ngm
+	angular.module '${1:moduleName}', [${2:moduleDependencies}]
+	${3}
+# A new angular module without a config function and a variable assignment
+snippet ngma
+	${1:moduleName} = angular.module '$1', [${2:moduleDeps}]
+	${3}
+# A new angular module with a config function
+snippet ngmc
+	${1:moduleName} = angular.module('$1', [${2:moduleDeps}], (${3:configDeps}) ->
+		${4}
+	)
+# A factory in a module
+snippet ngmfa
+	factory '${1:factoryName}', (${2:dependencies}) ->
+		${3}
+# Define an Angular Module Service to be attached to a previously defined module
+# You can change the service name and service injectables
+snippet ngms
+	service '${1:serviceName}', (${2:injectables}) ->
+		${3}
+# Define an Angular Module Filter to be attached to a previously defined module
+# You can change the filter name
+snippet ngmfi
+	filter '${1:filterName}', (${2:injectables}) ->
+		(input, ${3:args}) ->
+			${4}
+## Route Based Snippets
+# Defines a when condition of an AngularJS route
+snippet ngrw
+	$routeProvider.when '${1:url}',
+		templateUrl: '${2:templateUrl}'
+		controller: '${3:controller}'
+	${4}
+# Defines a when condition of an AngularJS route with the resolve block
+snippet ngrwr
+	$routeProvider.when '${1:url}',
+		templateUrl: '${2:templateUrl}'
+		controller: '${3:controller}'
+		resolve:
+			${4}
+	${5}
+# Defines an otherwise condition of an AngularJS route
+snippet ngro
+	$routeProvider.otherwise redirectTo: '${1:url}'
+	${2}
+## Scope Related Snippets
+# Define a new $scope'd function (usually inside an AngularJS Controller)
+# You can change the function name and arguments
+snippet $f
+	$scope.${1:functionName} = (${2:args}) ->
+		${3}
+# Defines a new $scope'd variable inside an AngularJS controller
+snippet $v
+	$scope.${1:variable} = ${2:value}
+	${3}
+# Defines a new $scope'd variable inside an AngularJS controller and assigns a value from a constructor arguments
+snippet $va
+	$scope.${1:variable} = ${2:variable}
+	${3}
+# Define a $watch for an expression
+# You can change the expression to be watched
+snippet $w
+	$scope.$watch '${1:watchExpr}', (newValue, oldValue) ->
+		${2}
+# Define a $on for a $broadcast/$emit on the $scope inside an Angular Controller
+# You can change the event name to listen on
+snippet $on
+	$scope.$on '${1:eventName}', (event, ${2:args}) ->
+		${3}
+# Define a $broadcast for a $scope inside an Angular Controller / Angular Controller Function
+# You can change the event name and optional event arguments
+snippet $b
+	$scope.$broadcast '${1:eventName}', ${2:eventArgs}
+	${3}
+# Define an $emit for a $scope inside an Angular Controller / Angular Controller Function
+# You can change the event name and optional event arguments
+snippet $e
+	$scope.$emit '${1:eventName}', ${2:eventArgs}
+	${3}
+## Directive related snippets
+# A compile function
+snippet ngdcf
+	compile = (tElement, tAttrs, transclude) ->
+		(scope, element, attrs) ->
+			${1}
+# A linking function in a directive
+snippet ngdlf
+	(scope, element, attrs${1:ctrl}) ->
+		${2}
+# A directive with a compile function
+snippet ngdc
+	directive '${1:directiveName}', factory = (${2:injectables}) ->
+		directiveDefinitionObject =
+			${3:directiveAttrs}
+			compile: compile = (tElement, tAttrs, transclude) ->
+				(scope, element, attrs) ->
+		directiveDefinitionObject
+# A directive with a linking function only
+snippet ngdl
+	.directive('${1:directiveName}', (${2:directiveDeps}) ->
+		(scope, element, attrs${3:ctrl}) ->
+			${4}
+	)
\ No newline at end of file
diff --git a/vim/snippets/vim-snippets/snippets/coffee/coffee.snippets b/vim/snippets/vim-snippets/snippets/coffee/coffee.snippets
new file mode 100644
index 0000000..f23156c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/coffee/coffee.snippets
@@ -0,0 +1,101 @@
+# Closure loop
+snippet forindo
+	for ${1:name} in ${2:array}
+		do ($1) ->
+			${0:// body}
+# Array comprehension
+snippet fora
+	for ${1:name} in ${2:array}
+		${0:# body...}
+# Object comprehension
+snippet foro
+	for ${1:key}, ${2:value} of ${3:object}
+		${0:# body...}
+# Range comprehension (inclusive)
+snippet forr
+	for ${1:name} in [${2:start}..${3:finish}]
+		${0:# body...}
+snippet forrb
+	for ${1:name} in [${2:start}..${3:finish}] by ${4:step}
+		${0:# body...}
+# Range comprehension (exclusive)
+snippet forrex
+	for ${1:name} in [${2:start}...${3:finish}]
+		${0:# body...}
+snippet forrexb
+	for ${1:name} in [${2:start}...${3:finish}] by ${4:step}
+		${0:# body...}
+# Function
+snippet fun
+	(${1:args}) ->
+		${0:# body...}
+# Function (bound)
+snippet bfun
+	(${1:args}) =>
+		${0:# body...}
+# Class
+snippet cla class ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${0}
+snippet cla class .. constructor: ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		constructor: (${2:args}) ->
+			${3}
+
+		${0}
+snippet cla class .. extends ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		${0}
+snippet cla class .. extends .. constructor: ..
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		constructor: (${3:args}) ->
+			${4}
+
+		${0}
+# If
+snippet if
+	if ${1:condition}
+		${0:${VISUAL}}
+# If __ Else
+snippet ife
+	if ${1:condition}
+		${2:${VISUAL}}
+	else
+		${0:# body...}
+# Else if
+snippet eif
+	else if ${1:condition}
+		${0:${VISUAL}}
+# Ternary If
+snippet ifte
+	if ${1:condition} then ${2:value} else ${0:other}
+# Unless
+snippet unl
+	${1:action} unless ${0:condition}
+# Switch
+snippet swi
+	switch ${1:object}
+		when ${2:value}
+			${0:# body...}
+
+# Log
+snippet log
+	console.log ${0}
+# Try __ Catch
+snippet try
+	try
+		${1:${VISUAL}}
+	catch ${2:error}
+		${0}
+# Require
+snippet req
+	${2:$1} = require '${1:sys}'
+# Export
+snippet exp
+	${0:root} = exports ? this
+
+snippet jsonp
+	JSON.parse ${0:jstr}
+# JSON.stringify
+snippet jsons
+	JSON.stringify ${0:object}
diff --git a/vim/snippets/vim-snippets/snippets/coffee/jquery_coffee.snippets b/vim/snippets/vim-snippets/snippets/coffee/jquery_coffee.snippets
new file mode 100644
index 0000000..10bcd77
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/coffee/jquery_coffee.snippets
@@ -0,0 +1,524 @@
+snippet add
+	${1:obj}.add('${2:selector expression}')
+snippet addClass
+	${1:obj}.addClass('${2:class name}')
+snippet after
+	${1:obj}.after('${2:Some text <b>and bold!</b>}')
+snippet ajax
+	$.ajax
+	  url: "${1:mydomain.com/url}"
+	  type: "${2:POST}"
+	  dataType: "${3:xml/html/script/json}"
+	  data: ${4:data}
+	  complete: (jqXHR, textStatus) ->
+		${5:// callback}
+	  success: (data, textStatus, jqXHR) ->
+		${6:// success callback}
+	  error: (jqXHR, textStatus, errorThrown) ->
+		${0:// error callback}
+snippet ajaxcomplete
+	${1:obj}.ajaxComplete (${1:e}, xhr, settings) ->
+		${0:// callback}
+snippet ajaxerror
+	${1:obj}.ajaxError (${1:e}, xhr, settings, thrownError) ->
+		${2:// error callback}
+	${0}
+snippet ajaxget
+	$.get '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet ajaxpost
+	$.post '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet ajaxprefilter
+	$.ajaxPrefilter (${1:options}, ${2:originalOptions}, jqXHR) ->
+		${0: // Modify options, control originalOptions, store jqXHR, etc}
+snippet ajaxsend
+	${1:obj}.ajaxSend (${1:request, settings}) ->
+		${2:// error callback}
+	${0}
+snippet ajaxsetup
+	$.ajaxSetup({
+		url: "${1:mydomain.com/url}",
+		type: "${2:POST}",
+		dataType: "${3:xml/html/script/json}",
+		data: $.param( $("${4:Element or Expression}") ),
+		complete: (jqXHR, textStatus) ->
+			${5:// callback}
+		,
+		success: (data, textStatus, jqXHR) ->
+			${6:// success callback}
+		,
+		error: (jqXHR, textStatus, errorThrown) ->
+			${0:// error callback}
+	})
+snippet ajaxstart
+	$.ajaxStart ->
+		${1:// handler for when an AJAX call is started and no other AJAX calls are in progress}
+	${0}
+snippet ajaxstop
+	$.ajaxStop ->
+		${1:// handler for when all AJAX calls have been completed}
+	${0}
+snippet ajaxsuccess
+	$.ajaxSuccess (${1:e}, xhr, settings) ->
+		${2:// handler for when any AJAX call is successfully completed}
+	${0}
+snippet andself
+	${1:obj}.andSelf()
+snippet animate
+	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})
+snippet append
+	${1:obj}.append('${2:Some text <b>and bold!</b>}')
+snippet appendTo
+	${1:obj}.appendTo('${2:selector expression}')
+snippet attr
+	${1:obj}.attr('${2:attribute}', '${3:value}')
+snippet attrm
+	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})
+snippet before
+	${1:obj}.before('${2:Some text <b>and bold!</b>}')
+snippet bind
+	${1:obj}.bind('${2:event name}', (${3:e}) ->
+		${0:// event handler}
+snippet blur
+	${1:obj}.blur (${2:e}) ->
+		${0:// event handler}
+snippet C
+	$.Callbacks()
+snippet Cadd
+	${1:callbacks}.add(${2:callbacks})
+snippet Cdis
+	${1:callbacks}.disable()
+snippet Cempty
+	${1:callbacks}.empty()
+snippet Cfire
+	${1:callbacks}.fire(${2:args})
+snippet Cfired
+	${1:callbacks}.fired()
+snippet Cfirew
+	${1:callbacks}.fireWith(${2:this}, ${3:args})
+snippet Chas
+	${1:callbacks}.has(${2:callback})
+snippet Clock
+	${1:callbacks}.lock()
+snippet Clocked
+	${1:callbacks}.locked()
+snippet Crem
+	${1:callbacks}.remove(${2:callbacks})
+snippet change
+	${1:obj}.change (${2:e}) ->
+		${0:// event handler}
+snippet children
+	${1:obj}.children('${2:selector expression}')
+snippet clearq
+	${1:obj}.clearQueue(${2:'queue name'})
+snippet click
+	${1:obj}.click (${2:e}) ->
+		${0:// event handler}
+snippet clone
+	${1:obj}.clone()
+snippet contains
+	$.contains(${1:container}, ${0:contents})
+snippet css
+	${1:obj}.css('${2:attribute}', '${3:value}')
+snippet csshooks
+	$.cssHooks['${1:CSS prop}'] = {
+		get: (elem, computed, extra) ->
+			${2: // handle getting the CSS property}
+		set: (elem, value) ->
+			${0: // handle setting the CSS value}
+	}
+snippet cssm
+	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})
+snippet D
+	$.Deferred()
+snippet Dalways
+	${1:deferred}.always(${2:callbacks})
+snippet Ddone
+	${1:deferred}.done(${2:callbacks})
+snippet Dfail
+	${1:deferred}.fail(${2:callbacks})
+snippet Disrej
+	${1:deferred}.isRejected()
+snippet Disres
+	${1:deferred}.isResolved()
+snippet Dnotify
+	${1:deferred}.notify(${2:args})
+snippet Dnotifyw
+	${1:deferred}.notifyWith(${2:this}, ${3:args})
+snippet Dpipe
+	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})
+snippet Dprog
+	${1:deferred}.progress(${2:callbacks})
+snippet Dprom
+	${1:deferred}.promise(${2:target})
+snippet Drej
+	${1:deferred}.reject(${2:args})
+snippet Drejw
+	${1:deferred}.rejectWith(${2:this}, ${3:args})
+snippet Dres
+	${1:deferred}.resolve(${2:args})
+snippet Dresw
+	${1:deferred}.resolveWith(${2:this}, ${3:args})
+snippet Dstate
+	${1:deferred}.state()
+snippet Dthen
+	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})
+snippet Dwhen
+	$.when(${1:deferreds})
+snippet data
+	${1:obj}.data(${2:obj})
+snippet dataa
+	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})
+snippet dblclick
+	${1:obj}.dblclick (${2:e}) ->
+		${0:// event handler}
+snippet delay
+	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})
+snippet dele
+	${1:obj}.delegate '${2:selector expression}', '${3:event name}', (${4:e}) ->
+		${0:// event handler}
+snippet deq
+	${1:obj}.dequeue(${2:'queue name'})
+snippet deqq
+	$.dequeue('${1:selector expression}'${2:, 'queue name'})
+snippet detach
+	${1:obj}.detach('${2:selector expression}')
+snippet die
+	${1:obj}.die(${2:event}, ${3:handler})
+snippet each
+	${1:obj}.each (index) ->
+		${0:this.innerHTML = this + " is the element, " + index + " is the position"}
+snippet el
+	$('<${1}/>'${2:, {}})
+snippet eltrim
+	$.trim('${1:string}')
+snippet empty
+	${1:obj}.empty()
+snippet end
+	${1:obj}.end()
+snippet eq
+	${1:obj}.eq(${2:element index})
+snippet error
+	${1:obj}.error (${2:e}) ->
+		${0:// event handler}
+snippet eventsmap
+	{
+		:f${0}
+	}
+snippet extend
+	$.extend(${1:true, }${2:target}, ${3:obj})
+snippet fadein
+	${1:obj}.fadeIn('${2:slow/400/fast}')
+snippet fadeinc
+	${1:obj}.fadeIn 'slow/400/fast', ->
+		${0:// callback}
+snippet fadeout
+	${1:obj}.fadeOut('${2:slow/400/fast}')
+snippet fadeoutc
+	${1:obj}.fadeOut 'slow/400/fast', ->
+		${0:// callback}
+snippet fadeto
+	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})
+snippet fadetoc
+	${1:obj}.fadeTo 'slow/400/fast', ${2:0.5}, ->
+		${0:// callback}
+snippet filter
+	${1:obj}.filter('${2:selector expression}')
+snippet filtert
+	${1:obj}.filter (${2:index}) ->
+		${3}
+snippet find
+	${1:obj}.find('${2:selector expression}')
+snippet focus
+	${1:obj}.focus (${2:e}) ->
+		${0:// event handler}
+snippet focusin
+	${1:obj}.focusIn (${2:e}) ->
+		${0:// event handler}
+snippet focusout
+	${1:obj}.focusOut (${2:e}) ->
+		${0:// event handler}
+snippet get
+	${1:obj}.get(${2:element index})
+snippet getjson
+	$.getJSON '${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(data, textStatus, jqXHR) ->
+			${0:// success callback}
+snippet getscript
+	$.getScript '${1:mydomain.com/url}', (script, textStatus, jqXHR) ->
+		${0:// callback}
+snippet grep
+	$.grep(${1:array}, (item, index) >
+		${2}
+	${0:, true})
+snippet hasc
+	${1:obj}.hasClass('${2:className}')
+snippet hasd
+	$.hasData('${0:selector expression}')
+snippet height
+	${1:obj}.height(${2:integer})
+snippet hide
+	${1:obj}.hide('${2:slow/400/fast}')
+snippet hidec
+	${1:obj}.hide '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet hover
+	${1:obj}.hover (${2:e}) ->
+		${3:// event handler}
+	, ($2) ->
+		${4:// event handler}
+snippet html
+	${1:obj}.html('${2:Some text <b>and bold!</b>}')
+snippet inarr
+	$.inArray(${1:value}, ${0:array})
+snippet insa
+	${1:obj}.insertAfter('${2:selector expression}')
+snippet insb
+	${1:obj}.insertBefore('${2:selector expression}')
+snippet is
+	${1:obj}.is('${2:selector expression}')
+snippet isarr
+	$.isArray(${1:obj})
+snippet isempty
+	$.isEmptyObject(${1:obj})
+snippet isfunc
+	$.isFunction(${1:obj})
+snippet isnum
+	$.isNumeric(${1:value})
+snippet isobj
+	$.isPlainObject(${1:obj})
+snippet iswin
+	$.isWindow(${1:obj})
+snippet isxml
+	$.isXMLDoc(${1:node})
+snippet jj
+	$('${1:selector}')
+snippet kdown
+	${1:obj}.keydown (${2:e}) ->
+		${0:// event handler}
+snippet kpress
+	${1:obj}.keypress (${2:e}) ->
+		${0:// event handler}
+snippet kup
+	${1:obj}.keyup (${2:e}) ->
+		${0:// event handler}
+snippet last
+	${1:obj}.last('${1:selector expression}')
+snippet live
+	${1:obj}.live '${2:events}', (${3:e}) ->
+		${0:// event handler}
+snippet load
+	${1:obj}.load (${2:e}) ->
+		${0:// event handler}
+snippet loadf
+	${1:obj}.load('${2:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		(responseText, textStatus, xhr) ->
+			${0:// success callback}
+	})
+snippet makearray
+	$.makeArray(${0:obj})
+snippet map
+	${1:obj}.map (${2:index}, ${3:element}) ->
+		${0:// callback}
+snippet mapp
+	$.map ${1:arrayOrObject}, (${2:value}, ${3:indexOrKey}) ->
+		${0:// callback}
+snippet merge
+	$.merge(${1:target}, ${0:original})
+snippet mdown
+	${1:obj}.mousedown (${2:e}) ->
+		${0:// event handler}
+snippet menter
+	${1:obj}.mouseenter (${2:e}) ->
+		${0:// event handler}
+snippet mleave
+	${1:obj}.mouseleave (${2:e}) ->
+		${0:// event handler}
+snippet mmove
+	${1:obj}.mousemove (${2:e}) ->
+		${0:// event handler}
+snippet mout
+	${1:obj}.mouseout (${2:e}) ->
+		${0:// event handler}
+snippet mover
+	${1:obj}.mouseover (${2:e}) ->
+		${0:// event handler}
+snippet mup
+	${1:obj}.mouseup (${2:e}) ->
+		${0:// event handler}
+snippet next
+	${1:obj}.next('${2:selector expression}')
+snippet nexta
+	${1:obj}.nextAll('${2:selector expression}')
+snippet nextu
+	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet not
+	${1:obj}.not('${2:selector expression}')
+snippet off
+	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})
+snippet offset
+	${1:obj}.offset()
+snippet offsetp
+	${1:obj}.offsetParent()
+snippet on
+	${1:obj}.on '${2:events}', '${3:selector expression}', (${4:e}) ->
+		${0:// event handler}
+snippet one
+	${1:obj}.one '${2:event name}', (${3:e}) ->
+		${0:// event handler}
+snippet outerh
+	${1:obj}.outerHeight()
+snippet outerw
+	${1:obj}.outerWidth()
+snippet param
+	$.param(${1:obj})
+snippet parent
+	${1:obj}.parent('${2:selector expression}')
+snippet parents
+	${1:obj}.parents('${2:selector expression}')
+snippet parentsu
+	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet parsejson
+	$.parseJSON(${1:data})
+snippet parsexml
+	$.parseXML(${1:data})
+snippet pos
+	${1:obj}.position()
+snippet prepend
+	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')
+snippet prependto
+	${1:obj}.prependTo('${2:selector expression}')
+snippet prev
+	${1:obj}.prev('${2:selector expression}')
+snippet preva
+	${1:obj}.prevAll('${2:selector expression}')
+snippet prevu
+	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet promise
+	${1:obj}.promise(${2:'fx'}, ${3:target})
+snippet prop
+	${1:obj}.prop('${2:property name}')
+snippet proxy
+	$.proxy(${1:function}, ${2:this})
+snippet pushstack
+	${1:obj}.pushStack(${2:elements})
+snippet queue
+	${1:obj}.queue(${2:name}${3:, newQueue})
+snippet queuee
+	$.queue(${1:element}${2:, name}${3:, newQueue})
+snippet ready
+	$(() ->
+		${0}
+	)
+snippet rem
+	${1:obj}.remove()
+snippet rema
+	${1:obj}.removeAttr('${2:attribute name}')
+snippet remc
+	${1:obj}.removeClass('${2:class name}')
+snippet remd
+	${1:obj}.removeData('${2:key name}')
+snippet remdd
+	$.removeData(${1:element}${2:, 'key name}')
+snippet remp
+	${1:obj}.removeProp('${2:property name}')
+snippet repa
+	${1:obj}.replaceAll(${2:target})
+snippet repw
+	${1:obj}.replaceWith(${2:content})
+snippet reset
+	${1:obj}.reset (${2:e}) ->
+		${0:// event handler}
+snippet resize
+	${1:obj}.resize (${2:e}) ->
+		${0:// event handler}
+snippet scroll
+	${1:obj}.scroll (${2:e}) ->
+		${0:// event handler}
+snippet scrolll
+	${1:obj}.scrollLeft(${2:value})
+snippet scrollt
+	${1:obj}.scrollTop(${2:value})
+snippet sdown
+	${1:obj}.slideDown('${2:slow/400/fast}')
+snippet sdownc
+	${1:obj}.slideDown('${2:slow/400/fast}', ->
+		${0:// callback}
+snippet select
+	${1:obj}.select (${2:e}) ->
+		${0:// event handler}
+snippet serialize
+	${1:obj}.serialize()
+snippet serializea
+	${1:obj}.serializeArray()
+snippet show
+	${1:obj}.show('${2:slow/400/fast}')
+snippet showc
+	${1:obj}.show '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet sib
+	${1:obj}.siblings('${2:selector expression}')
+snippet size
+	${1:obj}.size()
+snippet slice
+	${1:obj}.slice(${2:start}${3:, end})
+snippet stoggle
+	${1:obj}.slideToggle('${2:slow/400/fast}')
+snippet stop
+	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})
+snippet submit
+	${1:obj}.submit (${2:e}) ->
+		${0:// event handler}
+snippet sup
+	${1:obj}.slideUp('${2:slow/400/fast}')
+snippet supc
+	${1:obj}.slideUp '${2:slow/400/fast}', ->
+		${0:// callback}
+snippet text
+	${1:obj}.text(${2:'some text'})
+snippet this
+	$(this)
+snippet toarr
+	${0:obj}.toArray()
+snippet tog
+	${1:obj}.toggle  (${2:e}) ->
+		${3:// event handler}
+	, ($2) ->
+		${4:// event handler}
+	${0}
+snippet togclass
+	${1:obj}.toggleClass('${2:class name}')
+snippet togsh
+	${1:obj}.toggle('${2:slow/400/fast}')
+snippet trig
+	${1:obj}.trigger('${2:event name}')
+snippet trigh
+	${1:obj}.triggerHandler('${2:event name}')
+snippet $trim
+	$.trim(${1:str})
+snippet $type
+	$.type(${1:obj})
+snippet unbind
+	${1:obj}.unbind('${2:event name}')
+snippet undele
+	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})
+snippet uniq
+	$.unique(${1:array})
+snippet unload
+	${1:obj}.unload (${2:e}) ->
+		${0:// event handler}
+snippet unwrap
+	${1:obj}.unwrap()
+snippet val
+	${1:obj}.val('${2:text}')
+snippet width
+	${1:obj}.width(${2:integer})
+snippet wrap
+	${1:obj}.wrap('${2:&ltdiv class="extra-wrapper"&gt&lt/div&gt}')
diff --git a/vim/snippets/vim-snippets/snippets/coffee/requirejs_coffee.snippets b/vim/snippets/vim-snippets/snippets/coffee/requirejs_coffee.snippets
new file mode 100644
index 0000000..6dfe179
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/coffee/requirejs_coffee.snippets
@@ -0,0 +1,11 @@
+snippet def
+	define ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+		${0:TARGET}
+
+snippet defn
+	define "${1:#name}", ["${2:#dependencies1}"], (${3:#dependencies2}) ->
+		${0:TARGET}
+
+snippet reqjs
+	require ["${1:#dependencies1}"], (${2:#dependencies2}) ->
+		${0:TARGET}
diff --git a/vim/snippets/vim-snippets/snippets/cpp.snippets b/vim/snippets/vim-snippets/snippets/cpp.snippets
new file mode 100644
index 0000000..4c02a47
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/cpp.snippets
@@ -0,0 +1,205 @@
+extends c
+
+##
+## Preprocessor
+# #include <...>
+snippet incc
+	#include <${1:iostream}>
+snippet binc
+	#include <boost/${1:shared_ptr}.hpp>
+##
+## STL Collections
+# std::array
+snippet array
+	std::array<${1:T}, ${2:N}> ${3};
+# std::vector
+snippet vector
+	std::vector<${1:T}> ${2};
+# std::deque
+snippet deque
+	std::deque<${1:T}> ${2};
+# std::forward_list
+snippet flist
+	std::forward_list<${1:T}> ${2};
+# std::list
+snippet list
+	std::list<${1:T}> ${2};
+# std::set
+snippet set
+	std::set<${1:T}> ${2};
+# std::map
+snippet map
+	std::map<${1:Key}, ${2:T}> ${3};
+# std::multiset
+snippet mset
+	std::multiset<${1:T}> ${2};
+# std::multimap
+snippet mmap
+	std::multimap<${1:Key}, ${2:T}> ${3};
+# std::unordered_set
+snippet uset
+	std::unordered_set<${1:T}> ${2};
+# std::unordered_map
+snippet umap
+	std::unordered_map<${1:Key}, ${2:T}> ${3};
+# std::unordered_multiset
+snippet umset
+	std::unordered_multiset<${1:T}> ${2};
+# std::unordered_multimap
+snippet ummap
+	std::unordered_multimap<${1:Key}, ${2:T}> ${3};
+# std::stack
+snippet stack
+	std::stack<${1:T}> ${2};
+# std::queue
+snippet queue
+	std::queue<${1:T}> ${2};
+# std::priority_queue
+snippet pqueue
+	std::priority_queue<${1:T}> ${2};
+##
+## Access Modifiers
+# private
+snippet pri
+	private
+# protected
+snippet pro
+	protected
+# public
+snippet pub
+	public
+# friend
+snippet fr
+	friend
+# mutable
+snippet mu
+	mutable
+##
+## Class
+# class
+snippet cl
+	/*! \class $1
+	 *  \brief ${3:Brief class description}
+	 *
+	 *  ${4:Detailed description}
+	 */
+	class ${1:`vim_snippets#Filename('$1', 'name')`}
+	{
+	public:
+		$1(${2});
+		virtual ~$1();
+
+	protected:
+		m_${5}; /*!< ${6:Member description} */
+	};
+# member function implementation
+snippet mfun
+	${4:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3}) {
+		${0}
+	}
+# member function implementation without parameters
+snippet dmfun0
+	/*! \brief ${4:Brief function description here}
+	 *
+	 *  ${5:Detailed description}
+	 *
+	 * \return ${6:Return parameter description}
+	 */
+	${3:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}() {
+		${0}
+	}
+# member function implementation with one parameter
+snippet dmfun1
+	/*! \brief ${6:Brief function description here}
+	 *
+	 *  ${7:Detailed description}
+	 *
+	 * \param $4 ${8:Parameter description}
+	 * \return ${9:Return parameter description}
+	 */
+	${5:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3:Type} ${4:Parameter}) {
+		${0}
+	}
+# member function implementation with two parameter
+snippet dmfun2
+	/*! \brief ${8:Brief function description here}
+	 *
+	 *  ${9:Detailed description}
+	 *
+	 * \param $4 ${10:Parameter description}
+	 * \param $6 ${11:Parameter description}
+	 * \return ${12:Return parameter description}
+	 */
+	${7:void} ${1:`vim_snippets#Filename('$1', 'ClassName')`}::${2:memberFunction}(${3:Type} ${4:Parameter},${5:Type} ${6:Parameter}) {
+		${0}
+	}
+# namespace
+snippet ns
+	namespace ${1:`vim_snippets#Filename('', 'my')`} {
+		${0}
+	} /* namespace $1 */
+##
+## Input/Output
+# std::cout
+snippet cout
+	std::cout << ${1} << std::endl;
+# std::cin
+snippet cin
+	std::cin >> ${1};
+##
+## Casts
+# static
+snippet sca
+	static_cast<${1:unsigned}>(${2:expr})${3}
+# dynamic
+snippet dca
+	dynamic_cast<${1:unsigned}>(${2:expr})${3}
+# reinterpret
+snippet rca
+	reinterpret_cast<${1:unsigned}>(${2:expr})${3}
+# const
+snippet cca
+	const_cast<${1:unsigned}>(${2:expr})${3}
+## Iteration
+# for i
+snippet fori
+	for (int ${2:i} = 0; $2 < ${1:count}; $2${3:++}) {
+		${4}
+	}
+
+# foreach
+snippet fore
+	for (${1:auto} ${2:i} : ${3:container}) {
+		${4}
+	}
+# iterator
+snippet iter
+	for (${1:std::vector}<${2:type}>::${3:const_iterator} ${4:i} = ${5:container}.begin(); $4 != $5.end(); ++$4) {
+		${6}
+	}
+
+# auto iterator
+snippet itera
+	for (auto ${1:i} = ${2:container}.begin(); $1 != $2.end(); ++$1) {
+		${3:std::cout << *$1 << std::endl;}
+	}
+##
+## Lambdas
+# lamda (one line)
+snippet ld
+	[${1}](${2}){${3}};
+# lambda (multi-line)
+snippet lld
+	[${1}](${2}){
+		${3}
+	};
+# snippets exception
+snippet try
+	try {
+		
+	}catch(${1}) {
+		
+	}
+
+
+
diff --git a/vim/snippets/vim-snippets/snippets/crystal.snippets b/vim/snippets/vim-snippets/snippets/crystal.snippets
new file mode 100644
index 0000000..34d2540
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/crystal.snippets
@@ -0,0 +1,82 @@
+snippet req require
+	require "${1}"
+snippet case
+	case ${1:object}
+	when ${2:condition}
+		${0}
+	end
+snippet when
+	when ${1:condition}
+		${0}
+snippet def
+	def ${1:method_name}
+		${0}
+	end
+snippet pdef
+	private def ${1:method_name}
+		${0}
+	end
+snippet if
+	if ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet ife
+	if ${1:condition}
+		${2:${VISUAL}}
+	else
+		${0}
+	end
+snippet wh
+	while ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet cla class .. end
+	class ${1:`substitute(vim_snippets#Filename(), "\(_\|^\)\(.\)", "\u\2", "g")`}
+		${0}
+	end
+snippet mod class .. end
+	module ${1:`substitute(vim_snippets#Filename(), "\(_\|^\)\(.\)", "\u\2", "g")`}
+		${0}
+	end
+snippet r
+	getter ${0:name}
+snippet r!
+	getter! ${0:name}
+snippet r?
+	getter? ${0:name}
+snippet w
+	setter ${0:name}
+snippet w!
+	setter! ${0:name}
+snippet w?
+	setter? ${0:name}
+snippet rw
+	property ${0:name}
+snippet rw!
+	property! ${0:name}
+snippet rw?
+	property? ${0:name}
+snippet defs
+	def self.${1:class_method_name}
+		${0}
+	end
+snippet defi
+	def initialize(${1})
+		${0}
+	end
+snippet do
+	do
+		${0:${VISUAL}}
+	end
+snippet dov
+	do |${1:v}|
+		${2}
+	end
+snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), "_spec$", "", ""), "\(_\|^\)\(.\)", "\u\2", "g")`} do
+		${0}
+	end
+snippet it
+	it "${1}" do
+		${0}
+	end
diff --git a/vim/snippets/vim-snippets/snippets/cs.snippets b/vim/snippets/vim-snippets/snippets/cs.snippets
new file mode 100644
index 0000000..110c85f
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/cs.snippets
@@ -0,0 +1,531 @@
+# cs.snippets
+# ===========
+#
+# Standard C-Sharp snippets for snipmate.
+#
+# Largely ported over from Visual Studio 2010 snippets plus
+# a few snippets from Resharper plus a few widely known snippets.
+#
+# Most snippets on elements (i.e. classes, properties)
+# follow suffix conventions. The order of suffixes to a snippet
+# is fixed.
+#
+# Snippet Suffix Order
+# --------------------
+# 1. Access Modifiers
+# 2. Class Modifiers
+#
+# Access Modifier Suffix Table
+# ----------------------------
+# + = public
+# & = internal
+# | = protected
+# - = private
+#
+# Example: `cls&` expands to `internal class $1`.
+# Access modifiers might be doubled to indicate
+# different modifiers for get/set on properties.
+# Example: `pb+-` expands to `public bool $1 { get; private set; }`
+#
+# Class Modifier Table
+# --------------------
+# ^ = static
+# % = abstract
+#
+# Example: `cls|%` expands to `protected abstract class $1`
+#
+# On method and property snippets, you can directly set
+# one of the common types int, string and bool, if desired,
+# just by appending the type modifier.
+#
+# Type Modifier Table
+# -------------------
+# i = integer
+# s = string
+# b = bool
+#
+# Example: `pi+&` expands to `public int $1 { get; internal set; }`
+#
+# I'll most propably add more stuff in here like
+# * List/Array constructio
+# * Mostly used generics
+# * Linq
+# * Funcs, Actions, Predicates
+# * Lambda
+# * Events
+#
+# Feedback is welcome!
+#
+# Main
+snippet sim
+	${1:public} static int Main(string[] args)
+	{
+		${0}
+		return 0;
+	}
+snippet simc
+	public class Application
+	{
+		${1:public} static int Main(string[] args)
+		{
+			${0}
+			return 0;
+		}
+	}
+snippet svm
+	${1:public} static void Main(string[] args)
+	{
+		${0}
+	}
+# if condition
+snippet if
+	if (${1:true})
+	{
+		${0:${VISUAL}}
+	}
+snippet el
+	else
+	{
+		${0:${VISUAL}}
+	}
+snippet ifs
+	if (${1})
+		${0:${VISUAL}}
+# ternary conditional
+snippet t
+	${1} ? ${2} : ${0}
+snippet ?
+	${1} ? ${2} : ${0}
+# do while loop
+snippet do
+	do
+	{
+		${0:${VISUAL}}
+	} while (${1:true});
+# while loop
+snippet wh
+	while (${1:true})
+	{
+		${0:${VISUAL}}
+	}
+# for loop
+snippet for
+	for (int ${1:i} = 0; $1 < ${2:count}; $1${3:++})
+	{
+		${0}
+	}
+snippet forr
+	for (int ${1:i} = ${2:length}; $1 >= 0; $1--)
+	{
+		${0}
+	}
+# foreach
+snippet fore
+	foreach (${1:var} ${2:entry} in ${3})
+	{
+		${0}
+	}
+snippet foreach
+	foreach (${1:var} ${2:entry} in ${3})
+	{
+		${0}
+	}
+snippet each
+	foreach (${1:var} ${2:entry} in ${3})
+	{
+		${0}
+	}
+# interfaces
+snippet interface
+	public interface ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet if+
+	public interface ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+# class bodies
+snippet class
+	public class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls
+	${2:public} class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls+
+	public class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls+^
+	public static class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls&
+	internal class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls&^
+	internal static class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls|
+	protected class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+snippet cls|%
+	protected abstract class ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+# constructor
+snippet ctor
+	public ${1:`vim_snippets#Filename()`}()
+	{
+		${0}
+	}
+# properties - auto properties by default.
+# default type is int with layout get / set.
+snippet prop
+	${1:public} ${2:int} ${3} { get; set; }
+snippet p
+	${1:public} ${2:int} ${3} { get; set; }
+snippet p+
+	public ${1:int} ${2} { get; set; }
+snippet p+&
+	public ${1:int} ${2} { get; internal set; }
+snippet p+|
+	public ${1:int} ${2} { get; protected set; }
+snippet p+-
+	public ${1:int} ${2} { get; private set; }
+snippet p&
+	internal ${1:int} ${2} { get; set; }
+snippet p&|
+	internal ${1:int} ${2} { get; protected set; }
+snippet p&-
+	internal ${1:int} ${2} { get; private set; }
+snippet p|
+	protected ${1:int} ${2} { get; set; }
+snippet p|-
+	protected ${1:int} ${2} { get; private set; }
+snippet p-
+	private ${1:int} ${2} { get; set; }
+# property - bool
+snippet pi
+	${1:public} int ${2} { get; set; }
+snippet pi+
+	public int ${1} { get; set; }
+snippet pi+&
+	public int ${1} { get; internal set; }
+snippet pi+|
+	public int ${1} { get; protected set; }
+snippet pi+-
+	public int ${1} { get; private set; }
+snippet pi&
+	internal int ${1} { get; set; }
+snippet pi&|
+	internal int ${1} { get; protected set; }
+snippet pi&-
+	internal int ${1} { get; private set; }
+snippet pi|
+	protected int ${1} { get; set; }
+snippet pi|-
+	protected int ${1} { get; private set; }
+snippet pi-
+	private int ${1} { get; set; }
+# property - bool
+snippet pb
+	${1:public} bool ${2} { get; set; }
+snippet pb+
+	public bool ${1} { get; set; }
+snippet pb+&
+	public bool ${1} { get; internal set; }
+snippet pb+|
+	public bool ${1} { get; protected set; }
+snippet pb+-
+	public bool ${1} { get; private set; }
+snippet pb&
+	internal bool ${1} { get; set; }
+snippet pb&|
+	internal bool ${1} { get; protected set; }
+snippet pb&-
+	internal bool ${1} { get; private set; }
+snippet pb|
+	protected bool ${1} { get; set; }
+snippet pb|-
+	protected bool ${1} { get; private set; }
+snippet pb-
+	private bool ${1} { get; set; }
+# property - string
+snippet ps
+	${1:public} string ${2} { get; set; }
+snippet ps+
+	public string ${1} { get; set; }
+snippet ps+&
+	public string ${1} { get; internal set; }
+snippet ps+|
+	public string ${1} { get; protected set; }
+snippet ps+-
+	public string ${1} { get; private set; }
+snippet ps&
+	internal string ${1} { get; set; }
+snippet ps&|
+	internal string ${1} { get; protected set; }
+snippet ps&-
+	internal string ${1} { get; private set; }
+snippet ps|
+	protected string ${1} { get; set; }
+snippet ps|-
+	protected string ${1} { get; private set; }
+snippet ps-
+	private string ${1} { get; set; }
+# members - void
+snippet m
+	${1:public} ${2:void} ${3}(${4})
+	{
+		${0}
+	}
+snippet m+
+	public ${1:void} ${2}(${3})
+	{
+		${0}
+	}
+snippet m&
+	internal ${1:void} ${2}(${3})
+	{
+		${0}
+	}
+snippet m|
+	protected ${1:void} ${2}(${3})
+	{
+		${0}
+	}
+snippet m-
+	private ${1:void} ${2}(${3})
+	{
+		${0}
+	}
+# members - int
+snippet mi
+	${1:public} int ${2}(${3})
+	{
+		${0:return 0;}
+	}
+snippet mi+
+	public int ${1}(${2})
+	{
+		${0:return 0;}
+	}
+snippet mi&
+	internal int ${1}(${2})
+	{
+		${0:return 0;}
+	}
+snippet mi|
+	protected int ${1}(${2})
+	{
+		${0:return 0;}
+	}
+snippet mi-
+	private int ${1}(${2})
+	{
+		${0:return 0;}
+	}
+# members - bool
+snippet mb
+	${1:public} bool ${2}(${3})
+	{
+		${0:return false;}
+	}
+snippet mb+
+	public bool ${1}(${2})
+	{
+		${0:return false;}
+	}
+snippet mb&
+	internal bool ${1}(${2})
+	{
+		${0:return false;}
+	}
+snippet mb|
+	protected bool ${1}(${2})
+	{
+		${0:return false;}
+	}
+snippet mb-
+	private bool ${1}(${2})
+	{
+		${0:return false;}
+	}
+# members - string
+snippet ms
+	${1:public} string ${2}(${3})
+	{
+		${0:return "";}
+	}
+snippet ms+
+	public string ${1}(${2})
+	{
+		${0:return "";}
+	}
+snippet ms&
+	internal string ${1}(${2})
+	{
+		${0:return "";}
+	}
+snippet ms|
+	protected string ${1:}(${2:})
+	{
+		${0:return "";}
+	}
+snippet ms-
+	private string ${1}(${2})
+	{
+		${0:return "";}
+	}
+# structure
+snippet struct
+	public struct ${1:`vim_snippets#Filename()`}
+	{
+		${0}
+	}
+# enumeration
+snippet enum
+	enum ${1}
+	{
+		${0}
+	}
+
+snippet enum+
+	public enum ${1}
+	{
+		${0}
+	}
+# preprocessor directives
+snippet #if
+	#if
+		${0}
+	#endif
+# inline xml documentation
+snippet ///
+	/// <summary>
+	/// ${0}
+	/// </summary>
+snippet <p
+	<param name="${1}">${2:$1}</param>
+snippet <ex
+	<exception cref="${1:System.Exception}">${2}</exception>
+snippet <r
+	<returns>${1}</returns>
+snippet <s
+	<see cref="${1}"/>
+snippet <rem
+	<remarks>${1}</remarks>
+snippet <c
+	<code>${1}</code>
+
+snippet cw
+	Console.WriteLine(${1});
+
+# equals override
+snippet eq
+	public override bool Equals(object obj)
+	{
+		if (obj == null || GetType() != obj.GetType())
+		{
+			return false;
+		}
+		${0:throw new NotImplementedException();}
+		return base.Equals(obj);
+	}
+# exception
+snippet exc
+	public class ${1:MyException} : ${2:Exception}
+	{
+		public $1() { }
+		public $1(string message) : base(message) { }
+		public $1(string message, Exception inner) : base(message, inner) { }
+		protected $1(
+			System.Runtime.Serialization.SerializationInfo info,
+			System.Runtime.Serialization.StreamingContext context)
+				: base(info, context) { }
+	}
+# indexer
+snippet index
+	public ${1:object} this[${2:int} index]
+	{
+		get { ${0} }
+		set { ${0} }
+	}
+# eventhandler
+snippet inv
+	EventHandler temp = ${1:MyEvent};
+	if (${2:temp} != null)
+	{
+		$2();
+	}
+# lock
+snippet lock
+	lock (${1:this})
+	{
+		${0}
+	}
+# namespace
+snippet namespace
+	namespace ${1:MyNamespace}
+	{
+		${0}
+	}
+# property
+snippet prop
+	public ${1:int} ${2:MyProperty} { get; set; }
+snippet propf
+	private ${1:int} ${2:myVar};
+	public $1 ${3:MyProperty}
+	{
+		get { return $2; }
+		set { $2 = value; }
+	}
+snippet propg
+	public ${1:int} ${2:MyProperty} { get; private set; }
+# switch
+snippet switch
+	switch (${1:switch_on})
+	{
+		${0}
+		default:
+	}
+# try
+snippet try
+	try
+	{
+		${0:${VISUAL}}
+	}
+	catch (${1:System.Exception})
+	{
+		throw;
+	}
+snippet tryf
+	try
+	{
+		${0:${VISUAL}}
+	}
+	finally
+	{
+		${1}
+	}
+# using
+snippet usi
+	using (${1:resource})
+	{
+		${0}
+	}
diff --git a/vim/snippets/vim-snippets/snippets/css.snippets b/vim/snippets/vim-snippets/snippets/css.snippets
new file mode 100644
index 0000000..08b6cdf
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/css.snippets
@@ -0,0 +1,987 @@
+snippet . "selector { }"
+	${1} {
+		${0:${VISUAL}}
+	}
+snippet ! "!important"
+	 !important
+snippet bdi:m+
+	-moz-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+snippet bdi:m
+	-moz-border-image: ${0};
+snippet bdrz:m
+	-moz-border-radius: ${0};
+snippet bxsh:m+
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+snippet bxsh:m
+	-moz-box-shadow: ${0};
+snippet bdi:w+
+	-webkit-border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+snippet bdi:w
+	-webkit-border-image: ${0};
+snippet bdrz:w
+	-webkit-border-radius: ${0};
+snippet bxsh:w+
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+snippet bxsh:w
+	-webkit-box-shadow: ${0};
+snippet @f
+	@font-face {
+		font-family: ${1};
+		src: url(${0});
+	}
+snippet @i
+	@import url(${0});
+snippet @m "@media mediatype { }"
+	@media ${1:print} {
+		${0:${VISUAL}}
+	}
+snippet bg+
+	background: #${1:FFF} url(${2}) ${3:0} ${4:0} ${0:no-repeat};
+snippet bga
+	background-attachment: ${0};
+snippet bga:f
+	background-attachment: fixed;
+snippet bga:s
+	background-attachment: scroll;
+snippet bgbk
+	background-break: ${0};
+snippet bgbk:bb
+	background-break: bounding-box;
+snippet bgbk:c
+	background-break: continuous;
+snippet bgbk:eb
+	background-break: each-box;
+snippet bgcp
+	background-clip: ${0};
+snippet bgcp:bb
+	background-clip: border-box;
+snippet bgcp:cb
+	background-clip: content-box;
+snippet bgcp:nc
+	background-clip: no-clip;
+snippet bgcp:pb
+	background-clip: padding-box;
+snippet bgc
+	background-color: #${0:FFF};
+snippet bgc:t
+	background-color: transparent;
+snippet bgi
+	background-image: url(${0});
+snippet bgi:n
+	background-image: none;
+snippet bgo
+	background-origin: ${0};
+snippet bgo:bb
+	background-origin: border-box;
+snippet bgo:cb
+	background-origin: content-box;
+snippet bgo:pb
+	background-origin: padding-box;
+snippet bgpx
+	background-position-x: ${0};
+snippet bgpy
+	background-position-y: ${0};
+snippet bgp
+	background-position: ${1:0} ${0:0};
+snippet bgr
+	background-repeat: ${0};
+snippet bgr:n
+	background-repeat: no-repeat;
+snippet bgr:x
+	background-repeat: repeat-x;
+snippet bgr:y
+	background-repeat: repeat-y;
+snippet bgr:r
+	background-repeat: repeat;
+snippet bgz
+	background-size: ${0};
+snippet bgz:a
+	background-size: auto;
+snippet bgz:ct
+	background-size: contain;
+snippet bgz:cv
+	background-size: cover;
+snippet bg
+	background: ${0};
+snippet bg:ie
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}');
+snippet bg:n
+	background: none;
+snippet bd+
+	border: ${1:1px} ${2:solid} #${0:000};
+snippet bdb+
+	border-bottom: ${1:1px} ${2:solid} #${0:000};
+snippet bdbc
+	border-bottom-color: #${0:000};
+snippet bdbi
+	border-bottom-image: url(${0});
+snippet bdbi:n
+	border-bottom-image: none;
+snippet bdbli
+	border-bottom-left-image: url(${0});
+snippet bdbli:c
+	border-bottom-left-image: continue;
+snippet bdbli:n
+	border-bottom-left-image: none;
+snippet bdblrz
+	border-bottom-left-radius: ${0};
+snippet bdbri
+	border-bottom-right-image: url(${0});
+snippet bdbri:c
+	border-bottom-right-image: continue;
+snippet bdbri:n
+	border-bottom-right-image: none;
+snippet bdbrrz
+	border-bottom-right-radius: ${0};
+snippet bdbs
+	border-bottom-style: ${0};
+snippet bdbs:n
+	border-bottom-style: none;
+snippet bdbw
+	border-bottom-width: ${0};
+snippet bdb
+	border-bottom: ${0};
+snippet bdb:n
+	border-bottom: none;
+snippet bdbk
+	border-break: ${0};
+snippet bdbk:c
+	border-break: close;
+snippet bdcl
+	border-collapse: ${0};
+snippet bdcl:c
+	border-collapse: collapse;
+snippet bdcl:s
+	border-collapse: separate;
+snippet bdc
+	border-color: #${0:000};
+snippet bdci
+	border-corner-image: url(${0});
+snippet bdci:c
+	border-corner-image: continue;
+snippet bdci:n
+	border-corner-image: none;
+snippet bdf
+	border-fit: ${0};
+snippet bdf:c
+	border-fit: clip;
+snippet bdf:of
+	border-fit: overwrite;
+snippet bdf:ow
+	border-fit: overwrite;
+snippet bdf:r
+	border-fit: repeat;
+snippet bdf:sc
+	border-fit: scale;
+snippet bdf:sp
+	border-fit: space;
+snippet bdf:st
+	border-fit: stretch;
+snippet bdi
+	border-image: url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch};
+snippet bdi:n
+	border-image: none;
+snippet bdl+
+	border-left: ${1:1px} ${2:solid} #${0:000};
+snippet bdlc
+	border-left-color: #${0:000};
+snippet bdli
+	border-left-image: url(${0});
+snippet bdli:n
+	border-left-image: none;
+snippet bdls
+	border-left-style: ${0};
+snippet bdls:n
+	border-left-style: none;
+snippet bdlw
+	border-left-width: ${0};
+snippet bdl
+	border-left: ${0};
+snippet bdl:n
+	border-left: none;
+snippet bdlt
+	border-length: ${0};
+snippet bdlt:a
+	border-length: auto;
+snippet bdrz
+	border-radius: ${0};
+snippet bdr+
+	border-right: ${1:1px} ${2:solid} #${0:000};
+snippet bdrc
+	border-right-color: #${0:000};
+snippet bdri
+	border-right-image: url(${0});
+snippet bdri:n
+	border-right-image: none;
+snippet bdrs
+	border-right-style: ${0};
+snippet bdrs:n
+	border-right-style: none;
+snippet bdrw
+	border-right-width: ${0};
+snippet bdr
+	border-right: ${0};
+snippet bdr:n
+	border-right: none;
+snippet bdsp
+	border-spacing: ${0};
+snippet bds
+	border-style: ${0};
+snippet bds:ds
+	border-style: dashed;
+snippet bds:dtds
+	border-style: dot-dash;
+snippet bds:dtdtds
+	border-style: dot-dot-dash;
+snippet bds:dt
+	border-style: dotted;
+snippet bds:db
+	border-style: double;
+snippet bds:g
+	border-style: groove;
+snippet bds:h
+	border-style: hidden;
+snippet bds:i
+	border-style: inset;
+snippet bds:n
+	border-style: none;
+snippet bds:o
+	border-style: outset;
+snippet bds:r
+	border-style: ridge;
+snippet bds:s
+	border-style: solid;
+snippet bds:w
+	border-style: wave;
+snippet bdt+
+	border-top: ${1:1px} ${2:solid} #${0:000};
+snippet bdtc
+	border-top-color: #${0:000};
+snippet bdti
+	border-top-image: url(${0});
+snippet bdti:n
+	border-top-image: none;
+snippet bdtli
+	border-top-left-image: url(${0});
+snippet bdtli:c
+	border-corner-image: continue;
+snippet bdtli:n
+	border-corner-image: none;
+snippet bdtlrz
+	border-top-left-radius: ${0};
+snippet bdtri
+	border-top-right-image: url(${0});
+snippet bdtri:c
+	border-top-right-image: continue;
+snippet bdtri:n
+	border-top-right-image: none;
+snippet bdtrrz
+	border-top-right-radius: ${0};
+snippet bdts
+	border-top-style: ${0};
+snippet bdts:n
+	border-top-style: none;
+snippet bdtw
+	border-top-width: ${0};
+snippet bdt
+	border-top: ${0};
+snippet bdt:n
+	border-top: none;
+snippet bdw
+	border-width: ${0};
+snippet bd
+	border: ${0};
+snippet bd:n
+	border: none;
+snippet b
+	bottom: ${0};
+snippet b:a
+	bottom: auto;
+snippet bxsh+
+	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+snippet bxsh
+	box-shadow: ${0};
+snippet bxsh:n
+	box-shadow: none;
+snippet bxz
+	box-sizing: ${0};
+snippet bxz:bb
+	box-sizing: border-box;
+snippet bxz:cb
+	box-sizing: content-box;
+snippet cps
+	caption-side: ${0};
+snippet cps:b
+	caption-side: bottom;
+snippet cps:t
+	caption-side: top;
+snippet cl
+	clear: ${0};
+snippet cl:b
+	clear: both;
+snippet cl:l
+	clear: left;
+snippet cl:n
+	clear: none;
+snippet cl:r
+	clear: right;
+snippet cp
+	clip: ${0};
+snippet cp:a
+	clip: auto;
+snippet cp:r
+	clip: rect(${1:0} ${2:0} ${3:0} ${0:0});
+snippet c
+	color: #${0:000};
+snippet ct
+	content: ${0};
+snippet ct:a
+	content: attr(${0});
+snippet ct:cq
+	content: close-quote;
+snippet ct:c
+	content: counter(${0});
+snippet ct:cs
+	content: counters(${0});
+snippet ct:ncq
+	content: no-close-quote;
+snippet ct:noq
+	content: no-open-quote;
+snippet ct:n
+	content: normal;
+snippet ct:oq
+	content: open-quote;
+snippet coi
+	counter-increment: ${0};
+snippet cor
+	counter-reset: ${0};
+snippet cur
+	cursor: ${0};
+snippet cur:a
+	cursor: auto;
+snippet cur:c
+	cursor: crosshair;
+snippet cur:d
+	cursor: default;
+snippet cur:ha
+	cursor: hand;
+snippet cur:he
+	cursor: help;
+snippet cur:m
+	cursor: move;
+snippet cur:p
+	cursor: pointer;
+snippet cur:t
+	cursor: text;
+snippet d
+	display: ${0};
+snippet d:mib
+	display: -moz-inline-box;
+snippet d:mis
+	display: -moz-inline-stack;
+snippet d:b
+	display: block;
+snippet d:cp
+	display: compact;
+snippet d:ib
+	display: inline-block;
+snippet d:itb
+	display: inline-table;
+snippet d:i
+	display: inline;
+snippet d:li
+	display: list-item;
+snippet d:n
+	display: none;
+snippet d:ri
+	display: run-in;
+snippet d:tbcp
+	display: table-caption;
+snippet d:tbc
+	display: table-cell;
+snippet d:tbclg
+	display: table-column-group;
+snippet d:tbcl
+	display: table-column;
+snippet d:tbfg
+	display: table-footer-group;
+snippet d:tbhg
+	display: table-header-group;
+snippet d:tbrg
+	display: table-row-group;
+snippet d:tbr
+	display: table-row;
+snippet d:tb
+	display: table;
+snippet ec
+	empty-cells: ${0};
+snippet ec:h
+	empty-cells: hide;
+snippet ec:s
+	empty-cells: show;
+snippet exp
+	expression()
+snippet fl
+	float: ${0};
+snippet fl:l
+	float: left;
+snippet fl:n
+	float: none;
+snippet fl:r
+	float: right;
+snippet f+
+	font: ${1:1em} ${2:Arial},${0:sans-serif};
+snippet fef
+	font-effect: ${0};
+snippet fef:eb
+	font-effect: emboss;
+snippet fef:eg
+	font-effect: engrave;
+snippet fef:n
+	font-effect: none;
+snippet fef:o
+	font-effect: outline;
+snippet femp
+	font-emphasize-position: ${0};
+snippet femp:a
+	font-emphasize-position: after;
+snippet femp:b
+	font-emphasize-position: before;
+snippet fems
+	font-emphasize-style: ${0};
+snippet fems:ac
+	font-emphasize-style: accent;
+snippet fems:c
+	font-emphasize-style: circle;
+snippet fems:ds
+	font-emphasize-style: disc;
+snippet fems:dt
+	font-emphasize-style: dot;
+snippet fems:n
+	font-emphasize-style: none;
+snippet fem
+	font-emphasize: ${0};
+snippet ff
+	font-family: ${0};
+snippet ff:c
+	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive;
+snippet ff:f
+	font-family: ${0:Capitals,Impact},fantasy;
+snippet ff:m
+	font-family: ${0:Monaco,'Courier New'},monospace;
+snippet ff:ss
+	font-family: ${0:Helvetica,Arial},sans-serif;
+snippet ff:s
+	font-family: ${0:Georgia,'Times New Roman'},serif;
+snippet fza
+	font-size-adjust: ${0};
+snippet fza:n
+	font-size-adjust: none;
+snippet fz
+	font-size: ${0};
+snippet fsm
+	font-smooth: ${0};
+snippet fsm:aw
+	font-smooth: always;
+snippet fsm:a
+	font-smooth: auto;
+snippet fsm:n
+	font-smooth: never;
+snippet fst
+	font-stretch: ${0};
+snippet fst:c
+	font-stretch: condensed;
+snippet fst:e
+	font-stretch: expanded;
+snippet fst:ec
+	font-stretch: extra-condensed;
+snippet fst:ee
+	font-stretch: extra-expanded;
+snippet fst:n
+	font-stretch: normal;
+snippet fst:sc
+	font-stretch: semi-condensed;
+snippet fst:se
+	font-stretch: semi-expanded;
+snippet fst:uc
+	font-stretch: ultra-condensed;
+snippet fst:ue
+	font-stretch: ultra-expanded;
+snippet fs
+	font-style: ${0};
+snippet fs:i
+	font-style: italic;
+snippet fs:n
+	font-style: normal;
+snippet fs:o
+	font-style: oblique;
+snippet fv
+	font-variant: ${0};
+snippet fv:n
+	font-variant: normal;
+snippet fv:sc
+	font-variant: small-caps;
+snippet fw
+	font-weight: ${0};
+snippet fw:b
+	font-weight: bold;
+snippet fw:br
+	font-weight: bolder;
+snippet fw:lr
+	font-weight: lighter;
+snippet fw:n
+	font-weight: normal;
+snippet f
+	font: ${0};
+snippet h
+	height: ${0};
+snippet h:a
+	height: auto;
+snippet l
+	left: ${0};
+snippet l:a
+	left: auto;
+snippet lts
+	letter-spacing: ${0};
+snippet lh
+	line-height: ${0};
+snippet lisi
+	list-style-image: url(${0});
+snippet lisi:n
+	list-style-image: none;
+snippet lisp
+	list-style-position: ${0};
+snippet lisp:i
+	list-style-position: inside;
+snippet lisp:o
+	list-style-position: outside;
+snippet list
+	list-style-type: ${0};
+snippet list:c
+	list-style-type: circle;
+snippet list:dclz
+	list-style-type: decimal-leading-zero;
+snippet list:dc
+	list-style-type: decimal;
+snippet list:d
+	list-style-type: disc;
+snippet list:lr
+	list-style-type: lower-roman;
+snippet list:n
+	list-style-type: none;
+snippet list:s
+	list-style-type: square;
+snippet list:ur
+	list-style-type: upper-roman;
+snippet lis
+	list-style: ${0};
+snippet lis:n
+	list-style: none;
+snippet mb
+	margin-bottom: ${0};
+snippet mb:a
+	margin-bottom: auto;
+snippet ml
+	margin-left: ${0};
+snippet ml:a
+	margin-left: auto;
+snippet mr
+	margin-right: ${0};
+snippet mr:a
+	margin-right: auto;
+snippet mt
+	margin-top: ${0};
+snippet mt:a
+	margin-top: auto;
+snippet m
+	margin: ${0};
+snippet m:4
+	margin: ${1:0} ${2:0} ${3:0} ${0:0};
+snippet m:3
+	margin: ${1:0} ${2:0} ${0:0};
+snippet m:2
+	margin: ${1:0} ${0:0};
+snippet m:0
+	margin: 0;
+snippet m:a
+	margin: auto;
+snippet mah
+	max-height: ${0};
+snippet mah:n
+	max-height: none;
+snippet maw
+	max-width: ${0};
+snippet maw:n
+	max-width: none;
+snippet mih
+	min-height: ${0};
+snippet miw
+	min-width: ${0};
+snippet op
+	opacity: ${0};
+snippet op:ie
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100});
+snippet op:ms
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})';
+snippet orp
+	orphans: ${0};
+snippet o+
+	outline: ${1:1px} ${2:solid} #${0:000};
+snippet oc
+	outline-color: ${0:#000};
+snippet oc:i
+	outline-color: invert;
+snippet oo
+	outline-offset: ${0};
+snippet os
+	outline-style: ${0};
+snippet ow
+	outline-width: ${0};
+snippet o
+	outline: ${0};
+snippet o:n
+	outline: none;
+snippet ovs
+	overflow-style: ${0};
+snippet ovs:a
+	overflow-style: auto;
+snippet ovs:mq
+	overflow-style: marquee;
+snippet ovs:mv
+	overflow-style: move;
+snippet ovs:p
+	overflow-style: panner;
+snippet ovs:s
+	overflow-style: scrollbar;
+snippet ovx
+	overflow-x: ${0};
+snippet ovx:a
+	overflow-x: auto;
+snippet ovx:h
+	overflow-x: hidden;
+snippet ovx:s
+	overflow-x: scroll;
+snippet ovx:v
+	overflow-x: visible;
+snippet ovy
+	overflow-y: ${0};
+snippet ovy:a
+	overflow-y: auto;
+snippet ovy:h
+	overflow-y: hidden;
+snippet ovy:s
+	overflow-y: scroll;
+snippet ovy:v
+	overflow-y: visible;
+snippet ov
+	overflow: ${0};
+snippet ov:a
+	overflow: auto;
+snippet ov:h
+	overflow: hidden;
+snippet ov:s
+	overflow: scroll;
+snippet ov:v
+	overflow: visible;
+snippet pb
+	padding-bottom: ${0};
+snippet pl
+	padding-left: ${0};
+snippet pr
+	padding-right: ${0};
+snippet pt
+	padding-top: ${0};
+snippet p
+	padding: ${0};
+snippet p:4
+	padding: ${1:0} ${2:0} ${3:0} ${0:0};
+snippet p:3
+	padding: ${1:0} ${2:0} ${0:0};
+snippet p:2
+	padding: ${1:0} ${0:0};
+snippet p:0
+	padding: 0;
+snippet pgba
+	page-break-after: ${0};
+snippet pgba:aw
+	page-break-after: always;
+snippet pgba:a
+	page-break-after: auto;
+snippet pgba:l
+	page-break-after: left;
+snippet pgba:r
+	page-break-after: right;
+snippet pgbb
+	page-break-before: ${0};
+snippet pgbb:aw
+	page-break-before: always;
+snippet pgbb:a
+	page-break-before: auto;
+snippet pgbb:l
+	page-break-before: left;
+snippet pgbb:r
+	page-break-before: right;
+snippet pgbi
+	page-break-inside: ${0};
+snippet pgbi:a
+	page-break-inside: auto;
+snippet pgbi:av
+	page-break-inside: avoid;
+snippet pos
+	position: ${0};
+snippet pos:a
+	position: absolute;
+snippet pos:f
+	position: fixed;
+snippet pos:r
+	position: relative;
+snippet pos:s
+	position: static;
+snippet q
+	quotes: ${0};
+snippet q:en
+	quotes: '\201C' '\201D' '\2018' '\2019';
+snippet q:n
+	quotes: none;
+snippet q:ru
+	quotes: '\00AB' '\00BB' '\201E' '\201C';
+snippet rz
+	resize: ${0};
+snippet rz:b
+	resize: both;
+snippet rz:h
+	resize: horizontal;
+snippet rz:n
+	resize: none;
+snippet rz:v
+	resize: vertical;
+snippet r
+	right: ${0};
+snippet r:a
+	right: auto;
+snippet tbl
+	table-layout: ${0};
+snippet tbl:a
+	table-layout: auto;
+snippet tbl:f
+	table-layout: fixed;
+snippet tal
+	text-align-last: ${0};
+snippet tal:a
+	text-align-last: auto;
+snippet tal:c
+	text-align-last: center;
+snippet tal:l
+	text-align-last: left;
+snippet tal:r
+	text-align-last: right;
+snippet ta
+	text-align: ${0};
+snippet ta:c
+	text-align: center;
+snippet ta:l
+	text-align: left;
+snippet ta:r
+	text-align: right;
+snippet td
+	text-decoration: ${0};
+snippet td:l
+	text-decoration: line-through;
+snippet td:n
+	text-decoration: none;
+snippet td:o
+	text-decoration: overline;
+snippet td:u
+	text-decoration: underline;
+snippet te
+	text-emphasis: ${0};
+snippet te:ac
+	text-emphasis: accent;
+snippet te:a
+	text-emphasis: after;
+snippet te:b
+	text-emphasis: before;
+snippet te:c
+	text-emphasis: circle;
+snippet te:ds
+	text-emphasis: disc;
+snippet te:dt
+	text-emphasis: dot;
+snippet te:n
+	text-emphasis: none;
+snippet th
+	text-height: ${0};
+snippet th:a
+	text-height: auto;
+snippet th:f
+	text-height: font-size;
+snippet th:m
+	text-height: max-size;
+snippet th:t
+	text-height: text-size;
+snippet ti
+	text-indent: ${0};
+snippet ti:-
+	text-indent: -9999px;
+snippet tj
+	text-justify: ${0};
+snippet tj:a
+	text-justify: auto;
+snippet tj:d
+	text-justify: distribute;
+snippet tj:ic
+	text-justify: inter-cluster;
+snippet tj:ii
+	text-justify: inter-ideograph;
+snippet tj:iw
+	text-justify: inter-word;
+snippet tj:k
+	text-justify: kashida;
+snippet tj:t
+	text-justify: tibetan;
+snippet to+
+	text-outline: ${1:0} ${2:0} #${0:000};
+snippet to
+	text-outline: ${0};
+snippet to:n
+	text-outline: none;
+snippet tr
+	text-replace: ${0};
+snippet tr:n
+	text-replace: none;
+snippet tsh+
+	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000};
+snippet tsh
+	text-shadow: ${0};
+snippet tsh:n
+	text-shadow: none;
+snippet tt
+	text-transform: ${0};
+snippet tt:c
+	text-transform: capitalize;
+snippet tt:l
+	text-transform: lowercase;
+snippet tt:n
+	text-transform: none;
+snippet tt:u
+	text-transform: uppercase;
+snippet tw
+	text-wrap: ${0};
+snippet tw:no
+	text-wrap: none;
+snippet tw:n
+	text-wrap: normal;
+snippet tw:s
+	text-wrap: suppress;
+snippet tw:u
+	text-wrap: unrestricted;
+snippet t
+	top: ${0};
+snippet t:a
+	top: auto;
+snippet va
+	vertical-align: ${0};
+snippet va:bl
+	vertical-align: baseline;
+snippet va:b
+	vertical-align: bottom;
+snippet va:m
+	vertical-align: middle;
+snippet va:sub
+	vertical-align: sub;
+snippet va:sup
+	vertical-align: super;
+snippet va:tb
+	vertical-align: text-bottom;
+snippet va:tt
+	vertical-align: text-top;
+snippet va:t
+	vertical-align: top;
+snippet v
+	visibility: ${0};
+snippet v:c
+	visibility: collapse;
+snippet v:h
+	visibility: hidden;
+snippet v:v
+	visibility: visible;
+snippet whsc
+	white-space-collapse: ${0};
+snippet whsc:ba
+	white-space-collapse: break-all;
+snippet whsc:bs
+	white-space-collapse: break-strict;
+snippet whsc:k
+	white-space-collapse: keep-all;
+snippet whsc:l
+	white-space-collapse: loose;
+snippet whsc:n
+	white-space-collapse: normal;
+snippet whs
+	white-space: ${0};
+snippet whs:n
+	white-space: normal;
+snippet whs:nw
+	white-space: nowrap;
+snippet whs:pl
+	white-space: pre-line;
+snippet whs:pw
+	white-space: pre-wrap;
+snippet whs:p
+	white-space: pre;
+snippet wid
+	widows: ${0};
+snippet w
+	width: ${0};
+snippet w:a
+	width: auto;
+snippet wob
+	word-break: ${0};
+snippet wob:ba
+	word-break: break-all;
+snippet wob:bs
+	word-break: break-strict;
+snippet wob:k
+	word-break: keep-all;
+snippet wob:l
+	word-break: loose;
+snippet wob:n
+	word-break: normal;
+snippet wos
+	word-spacing: ${0};
+snippet wow
+	word-wrap: ${0};
+snippet wow:no
+	word-wrap: none;
+snippet wow:n
+	word-wrap: normal;
+snippet wow:s
+	word-wrap: suppress;
+snippet wow:u
+	word-wrap: unrestricted;
+snippet z
+	z-index: ${0};
+snippet z:a
+	z-index: auto;
+snippet zoo
+	zoom: 1;
+snippet :h
+	:hover
+snippet :fc
+	:first-child
+snippet :lc
+	:last-child
+snippet :nc
+	:nth-child(${0})
+snippet :nlc
+	:nth-last-child(${0})
+snippet :oc
+	:only-child
+snippet :a
+	:after
+snippet :b
+	:before
+snippet ::a
+	::after
+snippet ::b
+	::before
diff --git a/vim/snippets/vim-snippets/snippets/cuda.snippets b/vim/snippets/vim-snippets/snippets/cuda.snippets
new file mode 100644
index 0000000..425ca67
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/cuda.snippets
@@ -0,0 +1 @@
+extends cpp
diff --git a/vim/snippets/vim-snippets/snippets/d.snippets b/vim/snippets/vim-snippets/snippets/d.snippets
new file mode 100644
index 0000000..e32a299
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/d.snippets
@@ -0,0 +1,338 @@
+### Import
+snippet imp
+	import 
+snippet pimp
+	public import
+### My favorite modules
+snippet io
+	std.stdio
+snippet traits
+	std.traits
+snippet conv
+	std.conv
+snippet arr
+	std.array
+snippet algo
+	std.algorithm
+snippet theusual
+	import std.stdio, std.string, std.array;
+	import std.traits, std.conv, std.algorithm;
+	import std.math, std.regex;
+### Control Structures
+snippet for
+	for(int ${1:i} = 0; $1 < ${2:count}; $1++) {
+		${0}
+	}
+snippet fe
+	foreach(${1:elem}; ${2:range}) {
+		${0}
+	}
+snippet fei
+	foreach(${1:i}, ${2:elem}; ${3:range}) {
+		${0}	
+	} 
+snippet fer
+	foreach_reverse(${1:elem}; ${2:range}) {
+		${0}	
+	} 
+snippet feri
+	foreach_reverse(${1:i}, ${2:elem}; ${3:range}) {
+		${0}  
+	}
+snippet sce
+	scope(exit) ${1:f.close();}
+snippet scs
+	scope(success) ${1}
+snippet scf
+	scope(failure) ${1}
+snippet el
+	else {
+		${1}	
+	}
+snippet eif
+	else if(${1}) {
+		${0}
+	}
+snippet if
+	if(${1}) {
+		${0}
+	}
+snippet ife
+	if(${1}) {
+		${2}	
+	} else {
+		${3}	
+	}
+snippet ifee
+	if(${1}) {
+		${2}	
+	} else if(${3}) {
+		${4}
+	} else {
+		${5}
+	}
+snippet sw
+	switch(${1}) {
+		${0}
+	}
+snippet cs
+	case ${1:0}:
+		${2}
+		break;
+snippet def
+	default:
+		${0}
+snippet fsw
+	final switch(${1}) {
+		${0}
+	}
+snippet try
+	try {
+		${1:${VISUAL}}
+	} catch(${2:Exception} ${3:e}) {
+		${4}
+	}
+snippet tcf
+	try {
+		${0:${VISUAL}}
+	} catch(${1:Exception} ${2:e}) {
+		${3}
+	} finally {
+		${4}
+	}
+snippet wh
+	while(${1:cond}) {
+		${0:${VISUAL}}
+	}
+snippet dowh
+	do {
+		${1}
+	} while(${2});
+snippet sif
+	static if(${1:cond}) {
+		${2}
+	}
+snippet sife
+	static if(${1}) {
+		${2}
+	} else {
+		${3}
+	}
+snippet sifee
+	static if(${1}) {
+		${2}
+	} else static if(${3}) {
+		${4}
+	} else {
+		${5}
+	}
+snippet seif
+	else static if(${1}) {
+		${2}
+	} 
+snippet ?
+	(${1: a > b}) ? ${2:a} : ${3:b}; 
+snippet with
+	with(${1:exp}) {
+		${2}
+	} ${0}	
+### Functions
+snippet fun
+	${1:auto} ${2:func}(${3:params}) {
+		${0}
+	}
+snippet contr
+	in {
+		${1}
+	} out {
+		${2}
+	} body {
+		${0}
+	}
+snippet l
+	(${1:x}) => ${2:x}${0:;}
+snippet funl
+	function (${1:int x}) => ${2}${3:;}
+snippet del
+	delegate (${1:int x}) => ${2}${3:;} 
+### Templates
+snippet temp 
+	template ${1:`vim_snippets#Filename("$2", "untitled")`}(${2:T}) {
+		${0}
+	}
+snippet tempif
+	template ${1:`vim_snippets#Filename("$2", "untitled")`}(${2:T}) if(${3:isSomeString!}$2) {
+		${0}	
+	}
+snippet opApply
+	int opApply(Dg)(Dg dg) if(ParameterTypeTuble!Dg.length == 2) {
+		${0}
+	}
+snippet psn
+	pure @safe nothrow
+snippet safe
+	@safe
+snippet trusted
+	@trusted
+snippet	system
+	@system
+### OOPs
+snippet cl
+	class${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet str
+	struct${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet uni
+	union${1:(T)} ${2:`vim_snippets#Filename("$3", "untitled")`} {
+		${0}	
+	}
+snippet inter
+	interface I${1:`vim_snippets#Filename("$2", "untitled")`} {
+		${0}
+	}
+snippet enum
+	enum ${1} {
+		${0}
+	}
+snippet pu
+	public
+snippet pr
+	private
+snippet po
+	protected
+snippet ctor
+	this(${1}) {
+		${0}
+	} 
+snippet dtor
+	~this(${1}) {
+		${0}
+	}
+### Type Witchery
+snippet al
+	alias ${1:b} = ${2:a};
+	${0}
+snippet alth
+	alias ${1:value} this;
+	${0}
+### The Commonplace
+snippet main
+	void main() {
+		${0}
+	}
+snippet maina
+	void main(string[] args) {
+		${0}
+	}
+snippet mod
+	module ${1:main};${0}
+snippet var
+	${1:auto} ${2:var} = ${0:1};
+snippet new
+	${1:auto} ${2:var} = new ${3:Object}(${4});
+	${0}
+snippet file
+	auto ${1:f} = File(${2:"useful_info.xml"}, ${3:"rw"});
+	${0}
+snippet map
+	map!(${1:f})(${2:xs});
+	${0}
+snippet filter
+	filter!(${1:p})(${2:xs});
+	${0}
+snippet reduce
+	reduce!(${1:f})(${2:xs});
+	${0}
+snippet find
+	find!(${1:p})($2:xs);
+	${0}
+snippet aa
+	${1:int}[${2:string}] ${3:dict} = ${0};
+### Misc
+snippet #!
+	#!/usr/bin/env rdmd
+snippet bang
+	#!/usr/bin/env rdmd
+snippet rdmd
+	#!/usr/bin/env rdmd
+snippet isstr
+	isSomeString!${1:S}
+snippet isnum
+	isNumeric!${1:N}
+snippet tos
+	to!string(${1:x});
+	${0}
+snippet toi
+	to!int(${1:str});
+	${0}
+snippet tod
+	to!double(${1:str});
+	${0}
+snippet un
+	unittest {
+		${0}
+	}
+snippet ver
+	version(${1:Posix}) {
+		${0}
+	}
+snippet de
+	debug {
+		${0}
+	}
+snippet sst
+	shared static this(${1}) {
+		${0}
+	}
+snippet td
+	// Typedef is deprecated. Use alias instead.
+	typedef
+snippet ino
+	inout
+snippet imm
+	immutable
+snippet fin
+	final
+snippet con
+	const
+snippet psi
+	private static immutable ${1:int} ${2:Constant} = ${3:1};
+	${0}
+snippet prag
+	pragma(${1})
+snippet pms
+	pragma(msg, ${1:Warning});
+snippet asm
+	asm {
+		${1}
+	}
+snippet mixin
+	mixin(${1:`writeln("Hello, World!");`});
+snippet over
+	override
+snippet ret
+	return ${1};
+snippet FILE
+	__FILE__
+snippet MOD
+	__MODULE__
+snippet LINE
+	__LINE__
+snippet FUN
+	__FUNCTION__
+snippet PF
+	__PRETTY_FUNCTION__
+snippet cast
+	cast(${1:T})(${2:val});
+snippet /*
+	/*
+	 * ${1}
+	*/
+### Fun stuff
+snippet idk
+	// I don't know how this works. Don't touch it.
+snippet idfk
+	// Don't FUCKING touch this.
diff --git a/vim/snippets/vim-snippets/snippets/dart.snippets b/vim/snippets/vim-snippets/snippets/dart.snippets
new file mode 100644
index 0000000..78625c6
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/dart.snippets
@@ -0,0 +1,82 @@
+snippet lib
+	#library('${1}');
+	${0}
+snippet im
+	#import('${1}');
+	${0}
+snippet so
+	#source('${1}');
+	${0}
+snippet main
+	static void main() {
+	  ${0}
+	}
+snippet st
+	static ${0}
+snippet fi
+	final ${0}
+snippet re
+	return ${0}
+snippet br
+	break;
+snippet th
+	throw ${0}
+snippet cl
+	class ${1:`vim_snippets#Filename("", "untitled")`} ${0}
+snippet in
+	interface ${1:`vim_snippets#Filename("", "untitled")`} ${0}
+snippet imp
+	implements ${0}
+snippet ext
+	extends ${0}
+snippet if
+	if (${1:true}) {
+	  ${0}
+	}
+snippet ife
+	if (${1:true}) {
+	  ${2}
+	} else {
+	  ${0}
+	}
+snippet el
+	else
+snippet sw
+	switch (${1}) {
+	  ${0}
+	}
+snippet cs
+	case ${1}:
+	  ${0}
+snippet de
+	default:
+	  ${0}
+snippet for
+	for (var ${2:i} = 0, len = ${1:things}.length; $2 < len; ${3:++}$2) {
+	  ${0:$1[$2]}
+	}
+snippet fore
+	for (final ${2:item} in ${1:itemList}) {
+	  ${0}
+	}
+snippet wh
+	while (${1:/* condition */}) {
+	  ${0}
+	}
+snippet dowh
+	do {
+	  ${0}
+	} while (${0:/* condition */});
+snippet as
+	assert(${0:/* condition */});
+snippet try
+	try {
+	  ${0:${VISUAL}}
+	} catch (${1:Exception e}) {
+	}
+snippet tryf
+	try {
+	  ${0:${VISUAL}}
+	} catch (${1:Exception e}) {
+	} finally {
+	}
diff --git a/vim/snippets/vim-snippets/snippets/diff.snippets b/vim/snippets/vim-snippets/snippets/diff.snippets
new file mode 100644
index 0000000..89bc31d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/diff.snippets
@@ -0,0 +1,11 @@
+# DEP-3 (http://dep.debian.net/deps/dep3/) style patch header
+snippet header DEP-3 style header
+	Description: ${1}
+	Origin: ${2:vendor|upstream|other}, ${3:url of the original patch}
+	Bug: ${4:url in upstream bugtracker}
+	Forwarded: ${5:no|not-needed|url}
+	Author: ${6:`g:snips_author`}
+	Reviewed-by: ${7:name and email}
+	Last-Update: ${8:`strftime("%Y-%m-%d")`}
+	Applied-Upstream: ${0:upstream version|url|commit}
+
diff --git a/vim/snippets/vim-snippets/snippets/django.snippets b/vim/snippets/vim-snippets/snippets/django.snippets
new file mode 100644
index 0000000..e2a8d6d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/django.snippets
@@ -0,0 +1,112 @@
+# Model Fields
+
+# Note: Optional arguments are using defaults that match what Django will use
+# as a default, e.g. with max_length fields.  Doing this as a form of self
+# documentation and to make it easy to know whether you should override the
+# default or not.
+
+# Note: Optional arguments that are booleans will use the opposite since you
+# can either not specify them, or override them, e.g. auto_now_add=False.
+
+snippet auto
+	${1:FIELDNAME} = models.AutoField(${0})
+snippet bigint
+	${1:FIELDNAME} = models.BigIntegerField(${0})
+snippet binary
+	${1:FIELDNAME} = models.BinaryField(${0})
+snippet bool
+	${1:FIELDNAME} = models.BooleanField(${0:default=True})
+snippet char
+	${1:FIELDNAME} = models.CharField(max_length=${2}${0:, blank=True})
+snippet comma
+	${1:FIELDNAME} = models.CommaSeparatedIntegerField(max_length=${2}${0:, blank=True})
+snippet date
+	${1:FIELDNAME} = models.DateField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
+snippet datetime
+	${1:FIELDNAME} = models.DateTimeField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
+snippet decimal
+	${1:FIELDNAME} = models.DecimalField(max_digits=${2}, decimal_places=${0})
+snippet email
+	${1:FIELDNAME} = models.EmailField(max_length=${2:75}${0:, blank=True})
+snippet file
+	${1:FIELDNAME} = models.FileField(upload_to=${2:path/for/upload}${0:, max_length=100})
+snippet filepath
+	${1:FIELDNAME} = models.FilePathField(path=${2:"/abs/path/to/dir"}${3:, max_length=100}${4:, match="*.ext"}${5:, recursive=True}${0:, blank=True, })
+snippet float
+	${1:FIELDNAME} = models.FloatField(${0})
+snippet image
+	${1:FIELDNAME} = models.ImageField(upload_to=${2:path/for/upload}${3:, height_field=height, width_field=width}${0:, max_length=100})
+snippet int
+	${1:FIELDNAME} = models.IntegerField(${0})
+snippet ip
+	${1:FIELDNAME} = models.IPAddressField(${0})
+snippet nullbool
+	${1:FIELDNAME} = models.NullBooleanField(${0})
+snippet posint
+	${1:FIELDNAME} = models.PositiveIntegerField(${0})
+snippet possmallint
+	${1:FIELDNAME} = models.PositiveSmallIntegerField(${0})
+snippet slug
+	${1:FIELDNAME} = models.SlugField(max_length=${2:50}${0:, blank=True})
+snippet smallint
+	${1:FIELDNAME} = models.SmallIntegerField(${0})
+snippet text
+	${1:FIELDNAME} = models.TextField(${0:blank=True})
+snippet time
+	${1:FIELDNAME} = models.TimeField(${2:auto_now_add=True, auto_now=True}${0:, blank=True, null=True})
+snippet url
+	${1:FIELDNAME} = models.URLField(${2:verify_exists=False}${3:, max_length=200}${0:, blank=True})
+snippet xml
+	${1:FIELDNAME} = models.XMLField(schema_path=${2:None}${0:, blank=True})
+# Relational Fields
+snippet fk
+	${1:FIELDNAME} = models.ForeignKey(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${0:, to_field=''})
+snippet m2m
+	${1:FIELDNAME} = models.ManyToManyField(${2:OtherModel}${3:, related_name=''}${4:, limit_choices_to=}${5:, symmetrical=False}${6:, through=''}${0:, db_table=''})
+snippet o2o
+	${1:FIELDNAME} = models.OneToOneField(${2:OtherModel}${3:, parent_link=True}${4:, related_name=''}${5:, limit_choices_to=}${0:, to_field=''})
+
+# Code Skeletons
+
+snippet form
+	class ${1:FormName}(forms.Form):
+		"""${2:docstring}"""
+		${0}
+
+snippet model
+	class ${1:ModelName}(models.Model):
+		"""${2:docstring}"""
+		${3}
+
+		class Meta:
+			${4}
+
+		def __unicode__(self):
+			${5}
+
+		def save(self, *args, **kwargs):
+			${6}
+
+		@models.permalink
+		def get_absolute_url(self):
+			return ('${7:view_or_url_name}' ${0})
+
+snippet modeladmin
+	class ${1:ModelName}Admin(admin.ModelAdmin):
+		${0}
+
+	admin.site.register($1, $1Admin)
+
+snippet tabularinline
+	class ${0:ModelName}Inline(admin.TabularInline):
+		model = $1
+
+snippet stackedinline
+	class ${0:ModelName}Inline(admin.StackedInline):
+		model = $1
+
+snippet r2r
+	return render_to_response('${1:template.html}', {
+			${2}
+		}${0:, context_instance=RequestContext(request)}
+	)
diff --git a/vim/snippets/vim-snippets/snippets/dosini.snippets b/vim/snippets/vim-snippets/snippets/dosini.snippets
new file mode 100644
index 0000000..95c759c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/dosini.snippets
@@ -0,0 +1,12 @@
+snippet ec
+	; http://editorconfig.org
+
+	root = true
+
+	[*]
+	indent_style = ${1:space_or_tab}
+	indent_size = ${2:indent_size}
+	end_of_line = lf
+	charset = utf-8
+	trim_trailing_whitespace = true
+	insert_final_newline = true
diff --git a/vim/snippets/vim-snippets/snippets/eelixir.snippets b/vim/snippets/vim-snippets/snippets/eelixir.snippets
new file mode 100644
index 0000000..6286cee
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/eelixir.snippets
@@ -0,0 +1,34 @@
+extends html
+
+snippet %
+	<% ${0} %>
+snippet =
+	<%= ${0} %>
+snippet end
+	<% end %>
+snippet for
+	<%= for ${1:item} <- ${2:items} ${3:@conn} do %>
+		${0}
+	<% end %>
+snippet if
+	<%= if ${1} do %>
+		${0:${VISUAL}}
+	<% end %>
+snippet ife
+	<%= if ${1} do %>
+		${2:${VISUAL}}
+	<%= else %>
+		${0}
+	<% end %>
+snippet ft
+	<%= form_tag(${1:"/users"}, method: ${2::post}) %>
+		${0}
+	</form>
+snippet lin
+	<%= link "${1:Submit}", to: ${2:"/users"}, method: ${3::delete} %>
+snippet ff
+	<%= form_for @changeset, ${1:"/users"}, fn f -> %>
+			${0}
+
+		<%= submit "Submit" %>
+	<% end %>
diff --git a/vim/snippets/vim-snippets/snippets/elixir.snippets b/vim/snippets/vim-snippets/snippets/elixir.snippets
new file mode 100644
index 0000000..4b4ef39
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/elixir.snippets
@@ -0,0 +1,199 @@
+snippet do
+	do
+		${0:${VISUAL}}
+	end
+snippet put IO.puts
+	IO.puts "${0}"
+snippet ins IO.inspect
+	IO.inspect ${0}
+snippet insl IO.inspect with label
+	IO.inspect(${0}label: "${1:label}")
+snippet if if .. do .. end
+	if ${1} do
+		${0:${VISUAL}}
+	end
+snippet if: if .. do: ..
+	if ${1:condition}, do: ${0}
+snippet ife if .. do .. else .. end
+	if ${1:condition} do
+		${2:${VISUAL}}
+	else
+		${0}
+	end
+snippet ife: if .. do: .. else:
+	if ${1:condition}, do: ${2}, else: ${0}
+snippet unless unless .. do .. end
+	unless ${1} do
+		${0:${VISUAL}}
+	end
+snippet unless: unless .. do: ..
+	unless ${1:condition}, do: ${0}
+snippet unlesse unless .. do .. else .. end
+	unless ${1:condition} do
+		${2:${VISUAL}}
+	else
+		${0}
+	end
+snippet unlesse: unless .. do: .. else:
+	unless ${1:condition}, do: ${2}, else: ${0}
+snippet cond
+	cond do
+		${1} ->
+		${0:${VISUAL}}
+	end
+snippet case
+	case ${1} do
+		${2} ->
+			${0}
+	end
+snippet for
+	for ${1:item} <- ${2:items} do
+		${0}
+	end
+snippet for:
+	for ${1:item} <- ${2:items}, do: ${0}
+snippet fori
+	for ${1:item} <- ${2:items}, into: ${3} do
+		${0}
+	end
+snippet wi
+	with ${1:item} <- ${2:items} do
+		${0}
+	end
+snippet wie
+	with(
+		${1:item} <- ${2:items}
+	) do
+		${3}
+	else
+		${4} ->
+			${0}
+	end
+snippet sp
+	@spec ${1:name}(${2:args}) :: ${3:returns}
+snippet op
+	@opaque ${1:type_name} :: ${2:type}
+snippet ty
+	@type ${1:type_name} :: ${2:type}
+snippet typ
+	@typep ${1:type_name} :: ${2:type}
+snippet cb
+	@callback ${1:name}(${2:args}) :: ${3:returns}
+snippet df
+	def ${1:name}, do: ${2}
+snippet def
+	def ${1:name} do
+		${0}
+	end
+snippet defd
+	@doc """
+	${1:doc string}
+
+	"""
+	def ${2:name} do
+		${0}
+	end
+snippet defsd
+	@doc """
+	${1:doc string}
+
+	"""
+	@spec ${2:name} :: ${3:no_return}
+	def ${2} do
+		${0}
+	end
+snippet defim
+	defimpl ${1:protocol_name}, for: ${2:data_type} do
+		${0}
+	end
+snippet defma
+	defmacro ${1:name} do
+		${0}
+	end
+snippet defmo
+	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
+	end
+snippet dfp
+	defp ${1:name}, do: ${2}
+snippet defp
+	defp ${1:name} do
+		${0}
+	end
+snippet defpr
+	defprotocol ${1:name}, [${0:function}]
+snippet defr
+	defrecord ${1:record_name}, ${0:fields}
+snippet doc
+	@doc """
+	${0}
+
+	"""
+snippet docf
+	@doc false
+snippet fn
+	fn ${1:args} -> ${0} end
+snippet mdoc
+	@moduledoc """
+	${0}
+
+	"""
+snippet mdocf
+	@moduledoc false
+snippet rec
+	receive do
+		${1} ->
+			${0}
+	end
+snippet req
+	require ${0:module_name}
+snippet imp
+	import ${0:module_name}
+snippet ali
+	alias ${0:module_name}
+snippet test
+	test "${1:test name}" do
+		${0}
+	end
+snippet testa
+	test "${1:test_name}", %{${2:arg: arg}} do
+		${0}
+	end
+snippet des
+	describe "${1:test group subject}" do
+		${0}
+	end
+snippet exunit
+	defmodule ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		use ExUnit.Case, async: true
+
+		${0}
+	end
+snippet try try .. rescue .. end
+	try do
+		${1:${VISUAL}}
+	rescue
+		${2} -> ${0}
+	end
+snippet pry
+	require IEx; IEx.pry
+	${0}
+snippet qu
+	quote do
+		${1}
+	end
+snippet beh
+	@behaviour ${1:Mix.Task}
+	${0}
+snippet >e pipe to each
+	|> Enum.each(fn ${1} -> ${0} end)
+snippet >m pipe to map
+	|> Enum.map(fn ${1} -> ${0} end)
+snippet >f pipe to filter
+	|> Enum.filter(fn ${1} -> ${0} end)
+snippet >r pipe to reduce
+	|> Enum.reduce(${1:acc}, fn ${2}, ${3:acc} -> ${0} end)
+snippet >i pipe to inspect
+	|> IO.inspect
+snippet >il pipe to inspect with label
+	|> IO.inspect(label: "${1:label}")
diff --git a/vim/snippets/vim-snippets/snippets/elm.snippets b/vim/snippets/vim-snippets/snippets/elm.snippets
new file mode 100644
index 0000000..7a4e3ef
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/elm.snippets
@@ -0,0 +1,51 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` exposing (${1})
+	${0}
+snippet imp
+	import ${0:List}
+snippet impe
+	import ${1:List} exposing (${0:map})
+snippet fn
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn1
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn2
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} =
+		${0}
+snippet fn3
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} =
+		${0}
+snippet fn0
+	${1:fn} : ${2:a}
+	$1 =
+		${0}
+snippet case
+	case ${1} of
+		${2} ->
+			${0}
+snippet -
+	${1} ->
+		${0}
+snippet let
+	let
+		${1} =
+			${2}
+	in
+		${0}
+snippet if
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}
+snippet ty
+	type ${1:Msg}
+		= ${0}
+snippet tya
+	type alias ${1:Model} =
+		${0}
diff --git a/vim/snippets/vim-snippets/snippets/erlang.snippets b/vim/snippets/vim-snippets/snippets/erlang.snippets
new file mode 100644
index 0000000..960c8e7
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/erlang.snippets
@@ -0,0 +1,708 @@
+# module
+snippet mod
+	-module(${1:`vim_snippets#Filename()`}).
+# module and export all
+snippet modall
+	-module(${1:`vim_snippets#Filename()`}).
+	-compile([export_all]).
+	 
+	start() ->
+		${0}
+	 
+	stop() ->
+		ok.
+# define directive
+snippet def
+	-define(${1:macro}, ${2:body}).
+# export directive
+snippet exp
+	-export([${1:function}/${0:arity}]).
+# include directive
+snippet inc
+	-include("${1:file}").
+# include_lib directive
+snippet incl
+	-include_lib("${1:lib}/include/${1}.hrl").${2}
+# behavior directive
+snippet beh
+	-behaviour(${1:behaviour}).
+snippet ifd
+	-ifdef(${1:TEST}).
+	${0}
+	-endif.
+# if expression
+snippet if
+	if
+	    ${1:guard} ->
+	        ${0:body}
+	end
+# case expression
+snippet case
+	case ${1:expression} of
+	    ${2:pattern} ->
+	        ${0:body};
+	end
+# anonymous function
+snippet fun
+	fun (${1:Parameters}) -> ${2:body} end
+# try...catch
+snippet try
+	try
+	    ${1:${VISUAL}}
+	catch
+	    ${2:_:_} -> ${0:got_some_exception}
+	end
+# record directive
+snippet rec
+	-record(${1:record}, {
+	    ${2:field}=${3:value}}).
+# todo comment
+snippet todo
+	%% TODO: ${0}
+## Snippets below (starting with '%') are in EDoc format.
+## See http://www.erlang.org/doc/apps/edoc/chapter.html#id56887 for more details
+# doc comment
+snippet %d
+	%% @doc ${0}
+# end of doc comment
+snippet %e
+	%% @end
+# specification comment
+snippet %s
+	%% @spec ${0}
+# private function marker
+snippet %p
+	%% @private
+# OTP application
+snippet application
+	-module(${1:`vim_snippets#Filename()`}).
+
+	-behaviour(application).
+
+	-export([start/2, stop/1]).
+
+	start(_Type, _StartArgs) ->
+	    case ${0:root_supervisor}:start_link() of
+	        {ok, Pid} ->
+	            {ok, Pid};
+	        Other ->
+		          {error, Other}
+	    end.
+
+	stop(_State) ->
+	    ok.
+# OTP supervisor
+snippet supervisor
+	-module(${1:`vim_snippets#Filename()`}).
+
+	-behaviour(supervisor).
+
+	%% API
+	-export([start_link/0]).
+
+	%% Supervisor callbacks
+	-export([init/1]).
+
+	-define(SERVER, ?MODULE).
+
+	start_link() ->
+	    supervisor:start_link({local, ?SERVER}, ?MODULE, []).
+
+	init([]) ->
+	    Server = {${0:my_server}, {${2}, start_link, []},
+	      permanent, 2000, worker, [${2}]},
+	    Children = [Server],
+	    RestartStrategy = {one_for_one, 0, 1},
+	    {ok, {RestartStrategy, Children}}.
+# OTP gen_server
+snippet gen_server
+	-module(${0:`vim_snippets#Filename()`}).
+
+	-behaviour(gen_server).
+
+	%% API
+	-export([
+	         start_link/0
+	        ]).
+
+	%% gen_server callbacks
+	-export([init/1,
+	         handle_call/3,
+	         handle_cast/2,
+	         handle_info/2,
+	         terminate/2,
+	         code_change/3]).
+
+	-define(SERVER, ?MODULE).
+
+	-record(state, {}).
+
+	%%%===================================================================
+	%%% API
+	%%%===================================================================
+
+	start_link() ->
+	    gen_server:start_link({local, ?SERVER}, ?MODULE, [], []).
+
+	%%%===================================================================
+	%%% gen_server callbacks
+	%%%===================================================================
+
+	init([]) ->
+	    {ok, #state{}}.
+
+	handle_call(_Request, _From, State) ->
+	    Reply = ok,
+	    {reply, Reply, State}.
+
+	handle_cast(_Msg, State) ->
+	    {noreply, State}.
+
+	handle_info(_Info, State) ->
+	    {noreply, State}.
+
+	terminate(_Reason, _State) ->
+	    ok.
+
+	code_change(_OldVsn, State, _Extra) ->
+	    {ok, State}.
+
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# OTP gen_fsm
+snippet gen_fsm
+	-module(${0:`vim_snippets#Filename()`}).
+
+	-behaviour(gen_fsm).
+
+	%% API
+	-export([start_link/0]).
+
+	%% gen_fsm callbacks
+	-export([init/1,
+			 state_name/2,
+			 state_name/3,
+			 handle_event/3,
+			 handle_sync_event/4,
+			 handle_info/3,
+			 terminate/3,
+			 code_change/4]).
+
+	-record(state, {}).
+
+	%%%===================================================================
+	%%% API
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Creates a gen_fsm process which calls Module:init/1 to
+	%% initialize. To ensure a synchronized start-up procedure, this
+	%% function does not return until Module:init/1 has returned.
+	%%
+	%% @spec start_link() -> {ok, Pid} | ignore | {error, Error}
+	%% @end
+	%%--------------------------------------------------------------------
+	start_link() ->
+		gen_fsm:start_link({local, ?MODULE}, ?MODULE, [], []).
+
+	%%%===================================================================
+	%%% gen_fsm callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm is started using gen_fsm:start/[3,4] or
+	%% gen_fsm:start_link/[3,4], this function is called by the new
+	%% process to initialize.
+	%%
+	%% @spec init(Args) -> {ok, StateName, State} |
+	%%                     {ok, StateName, State, Timeout} |
+	%%                     ignore |
+	%%                     {stop, StopReason}
+	%% @end
+	%%--------------------------------------------------------------------
+	init([]) ->
+		{ok, state_name, #state{}}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% There should be one instance of this function for each possible
+	%% state name. Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:send_event/2, the instance of this function with the same
+	%% name as the current state name StateName is called to handle
+	%% the event. It is also called if a timeout occurs.
+	%%
+	%% @spec state_name(Event, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	state_name(_Event, State) ->
+		{next_state, state_name, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% There should be one instance of this function for each possible
+	%% state name. Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:sync_send_event/[2,3], the instance of this function with
+	%% the same name as the current state name StateName is called to
+	%% handle the event.
+	%%
+	%% @spec state_name(Event, From, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {reply, Reply, NextStateName, NextState} |
+	%%                   {reply, Reply, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState} |
+	%%                   {stop, Reason, Reply, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	state_name(_Event, _From, State) ->
+		Reply = ok,
+		{reply, Reply, state_name, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:send_all_state_event/2, this function is called to handle
+	%% the event.
+	%%
+	%% @spec handle_event(Event, StateName, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_event(_Event, StateName, State) ->
+		{next_state, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a gen_fsm receives an event sent using
+	%% gen_fsm:sync_send_all_state_event/[2,3], this function is called
+	%% to handle the event.
+	%%
+	%% @spec handle_sync_event(Event, From, StateName, State) ->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {reply, Reply, NextStateName, NextState} |
+	%%                   {reply, Reply, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState} |
+	%%                   {stop, Reason, Reply, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_sync_event(_Event, _From, StateName, State) ->
+		Reply = ok,
+		{reply, Reply, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called by a gen_fsm when it receives any
+	%% message other than a synchronous or asynchronous event
+	%% (or a system message).
+	%%
+	%% @spec handle_info(Info,StateName,State)->
+	%%                   {next_state, NextStateName, NextState} |
+	%%                   {next_state, NextStateName, NextState, Timeout} |
+	%%                   {stop, Reason, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_info(_Info, StateName, State) ->
+		{next_state, StateName, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called by a gen_fsm when it is about to
+	%% terminate. It should be the opposite of Module:init/1 and do any
+	%% necessary cleaning up. When it returns, the gen_fsm terminates with
+	%% Reason. The return value is ignored.
+	%%
+	%% @spec terminate(Reason, StateName, State) -> void()
+	%% @end
+	%%--------------------------------------------------------------------
+	terminate(_Reason, _StateName, _State) ->
+		ok.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Convert process state when code is changed
+	%%
+	%% @spec code_change(OldVsn, StateName, State, Extra) ->
+	%%                   {ok, StateName, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	code_change(_OldVsn, StateName, State, _Extra) ->
+		{ok, StateName, State}.
+
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# OTP gen_event
+snippet gen_event
+	-module(${0:`vim_snippets#Filename()`}).
+
+	-behaviour(gen_event).
+
+	%% API
+	-export([start_link/0,
+			 add_handler/2]).
+
+	%% gen_event callbacks
+	-export([init/1,
+			 handle_event/2,
+			 handle_call/2,
+			 handle_info/2,
+			 terminate/2,
+			 code_change/3]).
+
+	-record(state, {}).
+
+	%%%===================================================================
+	%%% gen_event callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Creates an event manager
+	%%
+	%% @spec start_link() -> {ok, Pid} | {error, Error}
+	%% @end
+	%%--------------------------------------------------------------------
+	start_link() ->
+		gen_event:start_link({local, ?MODULE}).
+
+	%%--------------------------------------------------------------------
+	%% @doc
+	%% Adds an event handler
+	%%
+	%% @spec add_handler(Handler, Args) -> ok | {'EXIT', Reason} | term()
+	%% @end
+	%%--------------------------------------------------------------------
+	add_handler(Handler, Args) ->
+		gen_event:add_handler(?MODULE, Handler, Args).
+
+	%%%===================================================================
+	%%% gen_event callbacks
+	%%%===================================================================
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever a new event handler is added to an event manager,
+	%% this function is called to initialize the event handler.
+	%%
+	%% @spec init(Args) -> {ok, State}
+	%% @end
+	%%--------------------------------------------------------------------
+	init([]) ->
+		{ok, #state{}}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event manager receives an event sent using
+	%% gen_event:notify/2 or gen_event:sync_notify/2, this function is
+	%% called for each installed event handler to handle the event.
+	%%
+	%% @spec handle_event(Event, State) ->
+	%%                          {ok, State} |
+	%%                          {swap_handler, Args1, State1, Mod2, Args2} |
+	%%                          remove_handler
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_event(_Event, State) ->
+		{ok, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event manager receives a request sent using
+	%% gen_event:call/3,4, this function is called for the specified
+	%% event handler to handle the request.
+	%%
+	%% @spec handle_call(Request, State) ->
+	%%                   {ok, Reply, State} |
+	%%                   {swap_handler, Reply, Args1, State1, Mod2, Args2} |
+	%%                   {remove_handler, Reply}
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_call(_Request, State) ->
+		Reply = ok,
+		{ok, Reply, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% This function is called for each installed event handler when
+	%% an event manager receives any other message than an event or a
+	%% synchronous request (or a system message).
+	%%
+	%% @spec handle_info(Info, State) ->
+	%%                         {ok, State} |
+	%%                         {swap_handler, Args1, State1, Mod2, Args2} |
+	%%                         remove_handler
+	%% @end
+	%%--------------------------------------------------------------------
+	handle_info(_Info, State) ->
+		{ok, State}.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Whenever an event handler is deleted from an event manager, this
+	%% function is called. It should be the opposite of Module:init/1 and
+	%% do any necessary cleaning up.
+	%%
+	%% @spec terminate(Reason, State) -> void()
+	%% @end
+	%%--------------------------------------------------------------------
+	terminate(_Reason, _State) ->
+		ok.
+
+	%%--------------------------------------------------------------------
+	%% @private
+	%% @doc
+	%% Convert process state when code is changed
+	%%
+	%% @spec code_change(OldVsn, State, Extra) -> {ok, NewState}
+	%% @end
+	%%--------------------------------------------------------------------
+	code_change(_OldVsn, State, _Extra) ->
+		{ok, State}.
+
+	%%%===================================================================
+	%%% Internal functions
+	%%%===================================================================
+# EUnit snippets
+snippet eunit
+	-module(${1:`vim_snippets#Filename()`}).
+	-include_lib("eunit/include/eunit.hrl").
+
+	${0}
+snippet ieunit
+	-ifdef(TEST).
+	-include_lib("eunit/include/eunit.hrl").
+
+	${0}
+
+	-endif.
+snippet as
+	?assert(${0})
+snippet asn
+	?assertNot(${0})
+snippet aseq
+	?assertEqual(${1}, ${0})
+snippet asneq
+	?assertNotEqual(${1}, ${0})
+snippet asmat
+	?assertMatch(${1:Pattern}, ${0:Expression})
+snippet asnmat
+	?assertNotMatch(${1:Pattern}, ${0:Expression})
+snippet aserr
+	?assertError(${1:Pattern}, ${0:Expression})
+snippet asex
+	?assertExit(${1:Pattern}, ${0:Expression})
+snippet asexc
+	?assertException(${1:Class}, ${2:Pattern}, ${0:Expression})
+# common_test test_SUITE
+snippet testsuite
+	-module(${0:`vim_snippets#Filename()`}).
+
+	-include_lib("common_test/include/ct.hrl").
+
+	%% Test server callbacks
+	-export([suite/0, all/0, groups/0,
+		 init_per_suite/1, end_per_suite/1,
+		 init_per_group/2, end_per_group/2,
+		 init_per_testcase/2, end_per_testcase/2]).
+
+	%% Test cases
+	-export([
+		]).
+
+	%%--------------------------------------------------------------------
+	%% COMMON TEST CALLBACK FUNCTIONS
+	%%--------------------------------------------------------------------
+
+	%%--------------------------------------------------------------------
+	%% Function: suite() -> Info
+	%%
+	%% Info = [tuple()]
+	%%   List of key/value pairs.
+	%%
+	%% Description: Returns list of tuples to set default properties
+	%%              for the suite.
+	%%
+	%% Note: The suite/0 function is only meant to be used to return
+	%% default data values, not perform any other operations.
+	%%--------------------------------------------------------------------
+	suite() ->
+	    [{timetrap,{minutes,10}}].
+
+	%%--------------------------------------------------------------------
+	%% Function: init_per_suite(Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the suite.
+	%%
+	%% Description: Initialization before the suite.
+	%%
+	%% Note: This function is free to add any key/value pairs to the Config
+	%% variable, but should NOT alter/remove any existing entries.
+	%%--------------------------------------------------------------------
+	init_per_suite(Config) ->
+	    Config.
+
+	%%--------------------------------------------------------------------
+	%% Function: end_per_suite(Config0) -> void() | {save_config,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%%
+	%% Description: Cleanup after the suite.
+	%%--------------------------------------------------------------------
+	end_per_suite(_Config) ->
+	    ok.
+
+	%%--------------------------------------------------------------------
+	%% Function: init_per_group(GroupName, Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% GroupName = atom()
+	%%   Name of the test case group that is about to run.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding configuration data for the group.
+	%% Reason = term()
+	%%   The reason for skipping all test cases and subgroups in the group.
+	%%
+	%% Description: Initialization before each test case group.
+	%%--------------------------------------------------------------------
+	init_per_group(_GroupName, Config) ->
+	    Config.
+
+	%%--------------------------------------------------------------------
+	%% Function: end_per_group(GroupName, Config0) ->
+	%%               void() | {save_config,Config1}
+	%%
+	%% GroupName = atom()
+	%%   Name of the test case group that is finished.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding configuration data for the group.
+	%%
+	%% Description: Cleanup after each test case group.
+	%%--------------------------------------------------------------------
+	end_per_group(_GroupName, _Config) ->
+	    ok.
+
+	%%--------------------------------------------------------------------
+	%% Function: init_per_testcase(TestCase, Config0) ->
+	%%               Config1 | {skip,Reason} | {skip_and_save,Reason,Config1}
+	%%
+	%% TestCase = atom()
+	%%   Name of the test case that is about to run.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the test case.
+	%%
+	%% Description: Initialization before each test case.
+	%%
+	%% Note: This function is free to add any key/value pairs to the Config
+	%% variable, but should NOT alter/remove any existing entries.
+	%%--------------------------------------------------------------------
+	init_per_testcase(_TestCase, Config) ->
+	    Config.
+
+	%%--------------------------------------------------------------------
+	%% Function: end_per_testcase(TestCase, Config0) ->
+	%%               void() | {save_config,Config1} | {fail,Reason}
+	%%
+	%% TestCase = atom()
+	%%   Name of the test case that is finished.
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for failing the test case.
+	%%
+	%% Description: Cleanup after each test case.
+	%%--------------------------------------------------------------------
+	end_per_testcase(_TestCase, _Config) ->
+	    ok.
+
+	%%--------------------------------------------------------------------
+	%% Function: groups() -> [Group]
+	%%
+	%% Group = {GroupName,Properties,GroupsAndTestCases}
+	%% GroupName = atom()
+	%%   The name of the group.
+	%% Properties = [parallel | sequence | Shuffle | {RepeatType,N}]
+	%%   Group properties that may be combined.
+	%% GroupsAndTestCases = [Group | {group,GroupName} | TestCase]
+	%% TestCase = atom()
+	%%   The name of a test case.
+	%% Shuffle = shuffle | {shuffle,Seed}
+	%%   To get cases executed in random order.
+	%% Seed = {integer(),integer(),integer()}
+	%% RepeatType = repeat | repeat_until_all_ok | repeat_until_all_fail |
+	%%              repeat_until_any_ok | repeat_until_any_fail
+	%%   To get execution of cases repeated.
+	%% N = integer() | forever
+	%%
+	%% Description: Returns a list of test case group definitions.
+	%%--------------------------------------------------------------------
+	groups() ->
+	    [].
+
+	%%--------------------------------------------------------------------
+	%% Function: all() -> GroupsAndTestCases | {skip,Reason}
+	%%
+	%% GroupsAndTestCases = [{group,GroupName} | TestCase]
+	%% GroupName = atom()
+	%%   Name of a test case group.
+	%% TestCase = atom()
+	%%   Name of a test case.
+	%% Reason = term()
+	%%   The reason for skipping all groups and test cases.
+	%%
+	%% Description: Returns the list of groups and test cases that
+	%%              are to be executed.
+	%%--------------------------------------------------------------------
+	all() ->
+	    [].
+
+
+	%%--------------------------------------------------------------------
+	%% TEST CASES
+	%%--------------------------------------------------------------------
+
+	%%--------------------------------------------------------------------
+	%% Function: TestCase(Config0) ->
+	%%               ok | exit() | {skip,Reason} | {comment,Comment} |
+	%%               {save_config,Config1} | {skip_and_save,Reason,Config1}
+	%%
+	%% Config0 = Config1 = [tuple()]
+	%%   A list of key/value pairs, holding the test case configuration.
+	%% Reason = term()
+	%%   The reason for skipping the test case.
+	%% Comment = term()
+	%%   A comment about the test case that will be printed in the html log.
+	%%
+	%% Description: Test case function. (The name of it must be specified in
+	%%              the all/0 list or in a test case group for the test case
+	%%              to be executed).
+	%%--------------------------------------------------------------------
+
diff --git a/vim/snippets/vim-snippets/snippets/eruby.snippets b/vim/snippets/vim-snippets/snippets/eruby.snippets
new file mode 100644
index 0000000..b8879c5
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/eruby.snippets
@@ -0,0 +1,132 @@
+# .erb and .rhmtl files
+
+# Includes html.snippets
+extends html
+
+# Rails *****************************
+snippet rc
+	<% ${0} %>
+snippet rce
+	<%= ${1} %>
+snippet %
+	<% ${0} %>
+snippet =
+	<%= ${1} %>
+snippet end
+	<% end %>
+snippet ead
+	<% ${1}.each do |${2}| %>
+		${0}
+	<% end %>
+snippet for
+	<% for ${2:item} in ${1} %>
+		${0}
+	<% end %>
+snippet rp
+	<%= render partial: '${0:item}' %>
+snippet rpl
+	<%= render partial: '${1:item}', locals: { :${2:name} => '${3:value}'${0} } %>
+snippet rps
+	<%= render partial: '${1:item}', status: ${0:500} %>
+snippet rpc
+	<%= render partial: '${1:item}', collection: ${0:items} %>
+snippet lia
+	<%= link_to '${1:link text...}', action: '${0:index}' %>
+snippet liai
+	<%= link_to '${1:link text...}', action: '${2:edit}', id: ${0:@item} %>
+snippet lic
+	<%= link_to '${1:link text...}', controller: '${0:items}' %>
+snippet lica
+	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${0:index}' %>
+snippet licai
+	<%= link_to '${1:link text...}', controller: '${2:items}', action: '${3:edit}', id: ${0:@item} %>
+snippet yield
+	<%= yield ${1::content_symbol} %>
+snippet conf
+	<% content_for :${1:head} do %>
+		${0}
+	<% end %>
+snippet cs
+	<%= collection_select <+object+>, <+method+>, <+collection+>, <+value_method+>, <+text_method+><+, <+[options]+>, <+[html_options]+>+> %>
+snippet ct
+	<%= content_tag '${1:DIV}', ${2:content}${0:,options} %>
+snippet ff
+	<%= form_for @${1:model} do |f| %>
+		${0}
+	<% end %>
+snippet ffi
+	<%= ${1:f}.input :${0:attribute} %>
+snippet ffcb
+	<%= ${1:f}.check_box :${0:attribute} %>
+snippet ffe
+	<% error_messages_for :${1:model} %>
+
+	<%= form_for @${2:model} do |f| %>
+		${0}
+	<% end %>
+snippet ffff
+	<%= ${1:f}.file_field :${0:attribute} %>
+snippet ffhf
+	<%= ${1:f}.hidden_field :${0:attribute} %>
+snippet ffl
+	<%= ${1:f}.label :${2:attribute}, '${0:$2}' %>
+snippet ffpf
+	<%= ${1:f}.password_field :${0:attribute} %>
+snippet ffrb
+	<%= ${1:f}.radio_button :${2:attribute}, :${0:tag_value} %>
+snippet ffs
+	<%= ${1:f}.submit "${0:submit}" %>
+snippet ffta
+	<%= ${1:f}.text_area :${0:attribute} %>
+snippet fftf
+	<%= ${1:f}.text_field :${0:attribute} %>
+snippet fields
+	<%= fields_for :${1:model}, @$1 do |${2:f}| %>
+		${0}
+	<% end %>
+snippet i18
+	I18n.t('${1:type.key}')
+snippet it
+	<%= image_tag "${1}"${0} %>
+snippet jit
+	<%= javascript_include_tag ${0::all} %>
+snippet jsit
+	<%= javascript_include_tag "${0}" %>
+snippet lim
+	<%= link_to ${1:model}.${2:name}, ${3:$1}_path(${0:$1}) %>
+snippet linp
+	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${4:@$2}, ${0:@$3}) %>
+snippet linpp
+	<%= link_to "${1:Link text...}", ${2:parent}_${3:child}_path(${0:@$2}) %>
+snippet lip
+	<%= link_to "${1:Link text...}", ${2:model}_path(${0:@$2}) %>
+snippet lipp
+	<%= link_to "${1:Link text...}", ${0:model}s_path %>
+snippet lt
+	<%= link_to "${1:name}", ${0:dest} %>
+snippet ntc
+	<%= number_to_currency(${1}) %>
+snippet ofcfs
+	<%= options_from_collection_for_select ${1:collection}, ${2:value_method}, ${3:text_method}, ${0:selected_value} %>
+snippet ofs
+	<%= options_for_select ${1:collection}, ${2:value_method} %>
+snippet rf
+	<%= render file: "${1:file}"${0} %>
+snippet rt
+	<%= render template: "${1:file}"${0} %>
+snippet slt
+	<%= stylesheet_link_tag ${1::all}, cache: ${0:true} %>
+snippet sslt
+	<%= stylesheet_link_tag "${0}" %>
+snippet if
+	<% if ${1} %>
+		${0:${VISUAL}}
+	<% end %>
+snippet ife
+	<% if ${1} %>
+		${2}
+	<% else %>
+		${0}
+	<% end %>
+snippet pry
+	<% require 'pry'; binding.pry %>
diff --git a/vim/snippets/vim-snippets/snippets/falcon.snippets b/vim/snippets/vim-snippets/snippets/falcon.snippets
new file mode 100644
index 0000000..c523980
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/falcon.snippets
@@ -0,0 +1,71 @@
+snippet #!
+	#!/usr/bin/env falcon
+
+# Import
+snippet imp
+	import ${0:module}
+
+# Function
+snippet fun
+	function ${2:function_name}(${3})
+		${0}
+	end
+
+# Class
+snippet class
+	class ${1:class_name}(${2:class_params})
+		${0:/* members/methods */}
+	end
+
+# If
+snippet if
+	if ${1:condition}
+		${0}
+	end
+
+# If else
+snippet ife
+	if ${1:condition}
+		${0}
+	else
+	    ${1}
+	end
+
+# If else if
+snippet eif
+	elif ${1:condition}
+		${0}
+
+# Switch case
+snippet switch
+	switch ${1:expression}
+		case ${2:item}
+		case ${0:item}
+		default
+	end
+
+# Select
+snippet select
+	select ${1:variable}
+		case ${2:TypeSpec}
+		case ${0:TypeSpec}
+		default
+	end
+
+# For/in Loop
+snippet forin
+	for ${1:element} in ${2:container}
+		${0}
+	end
+
+# For/to Loop
+snippet forto
+	for ${1:lowerbound} to ${2:upperbound}
+		${0}
+	end
+
+# While Loop
+snippet wh
+	while ${1:conidition}
+		${0}
+	end
diff --git a/vim/snippets/vim-snippets/snippets/fortran.snippets b/vim/snippets/vim-snippets/snippets/fortran.snippets
new file mode 100644
index 0000000..e04d4fd
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/fortran.snippets
@@ -0,0 +1,103 @@
+snippet impl
+	implicit none
+		$0
+snippet prog
+	program ${1:main}
+		$0
+	end program $1
+snippet mod
+	module ${1:modulename}
+		$0
+	end module $1
+snippet proc
+	procedure ${1:name}
+		${0}
+	end procedure $1
+snippet iface
+	interface ${1:name}
+		${0}
+	end interface $1
+snippet doc
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	! File: ${2:`vim_snippets#Filename('$1')`}
+	! Author: `g:snips_author`
+	! Email: `g:snips_email`
+	! Github: `g:snips_github`
+	! Description: $1
+	! """"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+	$0
+snippet dox
+	!> @brief ${1}
+	!!
+	!> ${2}
+	!> @author `g:snips_author`
+	${0}
+snippet doxp
+	!> @param[${1}]${0}
+# Variables definitions
+# Boolean
+snippet bool
+	logical :: $0
+# Integer
+snippet int
+	integer :: $0
+snippet real
+	real :: $0
+# Double Precision
+snippet double
+	double precision :: $0
+# Char
+snippet str
+	character(len=${1:*}) :: ${0:}
+# Types
+snippet type
+	type(${1:name})
+		$0
+	end type
+snippet const
+	${1:type}, parameter :: $2 = $0
+snippet arr
+	${1:type}, ${2:allocatable, }dimension(${3::}) :: $0
+snippet intent
+	${1:type}, intent(inout) :: $0
+# Array
+snippet /
+	(/ $1 /) ${2:,&} $0
+snippet if
+	if (${1:condition}) then
+		$0
+	end if
+snippet case
+	select case (${1:expr})
+		case ($2)
+		case default
+			$3
+	end select $0
+snippet do
+	do ${1:i} = ${2:start}, ${3:end}, ${4:incr}
+		$0
+	end do
+snippet dow
+	do while (${1:condition})
+		$2
+	end do
+snippet sub
+	subroutine ${1:name}($2)
+		$0
+	end subroutine $1
+snippet func
+	function ${1:name}($2) result($3)
+		$0
+	end function $1
+snippet pr
+	write(*,*) $0
+snippet dpr
+	write(*,*) '$1 = ', $1
+snippet read
+	read(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
+snippet write
+	write(unit = ${1:fp}, file = ${2:filename}, iostat = ${3:ierr}) $0
+snippet open
+	open(unit = ${1:fp}, file = ${2:filename}, status = ${3:unknown}, iostat = ${4:ierr}) $0
+snippet close
+	close(unit = ${1:fp}) $0
diff --git a/vim/snippets/vim-snippets/snippets/go.snippets b/vim/snippets/vim-snippets/snippets/go.snippets
new file mode 100644
index 0000000..6bc4602
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/go.snippets
@@ -0,0 +1,246 @@
+# shorthand variable declaration
+snippet v
+	${1} := ${2}
+# variable initialization
+snippet vr
+	var ${1:t} ${0:string}
+# variable declaration
+snippet var
+	var ${1} ${2} = ${3}
+# variables declaration
+snippet vars
+	var (
+		${1} ${2} = ${3}
+	)
+# append
+snippet ap
+	append(${1:slice}, ${0:value})
+# bool
+snippet bl
+	bool
+# byte
+snippet bt
+	byte
+# break
+snippet br
+	break
+# channel
+snippet ch
+	chan ${0:int}
+# case
+snippet cs
+	case ${1:value}:
+		${0:${VISUAL}}
+# const
+snippet c
+	const ${1:NAME} = ${0:0}
+# constants with iota
+snippet co
+	const (
+		${1:NAME1} = iota
+		${0:NAME2}
+	)
+# continue
+snippet cn
+	continue
+# defer
+snippet df
+	defer ${0:func}()
+# defer recover
+snippet dfr
+	defer func() {
+		if err := recover(); err != nil {
+			${0:${VISUAL}}
+		}
+	}()
+# int
+snippet i
+	int
+# import
+snippet im
+	import (
+		"${1:package}"
+	)
+# interface
+snippet in
+	interface{}
+# full interface snippet
+snippet inf
+	interface ${1:name} {
+		${2:/* methods */}
+	}
+# if condition
+snippet if
+	if ${1:/* condition */} {
+		${2:${VISUAL}}
+	}
+snippet ife
+	if ${1:/* condition */} {
+		${2:${VISUAL}}
+	} else {
+		${0}
+	}
+# else snippet
+snippet el
+	else {
+		${0:${VISUAL}}
+	}
+# error snippet
+snippet ir
+	if err != nil {
+		return err
+	}
+	${0}
+# false
+snippet f
+	false
+# fallthrough
+snippet ft
+	fallthrough
+# float
+snippet fl
+	float32
+# float32
+snippet f3
+	float32
+# float64
+snippet f6
+	float64
+# for int loop
+snippet for
+	for ${1}{
+		${0:${VISUAL}}
+	}
+# for int loop
+snippet fori
+	for ${2:i} := 0; $2 < ${1:count}; $2${3:++} {
+		${0:${VISUAL}}
+	}
+# for range loop
+snippet forr
+	for ${1:e} := range ${2:collection} {
+		${0:${VISUAL}}
+	}
+# function simple
+snippet fun
+	func ${1:funcName}(${2}) ${3:error} {
+		${4}
+	}
+	${0}
+# function on receiver
+snippet fum
+	func (${1:receiver} ${2:type}) ${3:funcName}(${4}) ${5:error} {
+		${6}
+	}
+	${0}
+# log printf
+snippet lf
+	log.Printf("%${1:s}", ${2:var})
+# log printf
+snippet lp
+	log.Println("${1}")
+# make
+snippet mk
+	make(${1:[]string}, ${0:0})
+# map
+snippet mp
+	map[${1:string}]${0:int}
+# main()
+snippet main
+	func main() {
+		${1}
+	}
+	${0}
+# new
+snippet nw
+	new(${0:type})
+# package
+snippet pa
+	package ${1:main}
+# panic
+snippet pn
+	panic("${0:msg}")
+# print
+snippet pr
+	fmt.Printf("%${1:s}\n", ${2:var})
+# println
+snippet pl
+	fmt.Println("${1:s}")
+# range
+snippet rn
+	range ${0}
+# return
+snippet rt
+	return ${0}
+# result
+snippet rs
+	result
+# select
+snippet sl
+	select {
+	case ${1:v1} := <-${2:chan1}
+		${3}
+	default:
+		${0}
+	}
+# string
+snippet sr
+	string
+# struct
+snippet st
+	struct ${1:name} {
+		${2:/* data */}
+	}
+	${0}
+# switch
+snippet sw
+	switch ${1:var} {
+	case ${2:value1}:
+		${3}
+	case ${4:value2}:
+		${5}
+	default:
+		${0}
+	}
+snippet sp
+	fmt.Sprintf("%${1:s}", ${2:var})
+# true
+snippet t
+	true
+# goroutine named function
+snippet g
+	go ${1:funcName}(${0})
+# goroutine anonymous function
+snippet ga
+	go func(${1} ${2:type}) {
+		${3:/* code */}
+	}(${0})
+snippet test test function
+	func Test${1:name}(t *testing.T) {
+		${0:${VISUAL}}
+	}
+snippet bench benchmark function
+	func Benchmark${1:name}(b *testing.B) {
+		for i := 0; i < b.N; i++ {
+			${2}
+		}
+	}
+	${0}
+# composite literals
+snippet cl
+	type ${1:name} struct {
+		${2:attrName} ${3:attrType}
+	}
+# if key in a map
+snippet om
+	if ${1:value}, ok := ${2:map}[${3:key}]; ok == true {
+		${4:/* code */}
+	}
+
+# Grouped globals with anonymous struct
+snippet gg
+	var ${1:var} = struct{
+		${2:name} ${3:type}
+	}{
+		${2:name}: ${4:value},
+	}
diff --git a/vim/snippets/vim-snippets/snippets/haml.snippets b/vim/snippets/vim-snippets/snippets/haml.snippets
new file mode 100644
index 0000000..b8a74e2
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/haml.snippets
@@ -0,0 +1,37 @@
+snippet t
+	%table
+		%tr
+			%th
+				${1:headers}
+		%tr
+			%td
+				${0:headers}
+snippet ul
+	%ul
+		%li
+			${0:item}
+		%li
+snippet rp
+	= render :partial => "${0:item}"
+snippet rpc
+	= render :partial => "${1:item}", :collection => ${0:@$1s}
+snippet rpl
+	= render :partial => "${1:item}", :locals => { :${2:$1} => ${0:@$1}
+snippet rpo
+	= render :partial => "${1:item}", :object => ${0:@$1}
+snippet lt
+	= link_to ${1:name}, ${2:dest}
+snippet mt
+	= mail_to ${1:email_address}, ${2:name}
+snippet mts
+	= mail_to ${1:email_address}, ${2:name}, :subject => ${3}, :body => ${4}
+snippet ife
+	- if ${1:condition}
+		${2:${VISUAL}}
+	- else
+		${0}
+snippet ifp
+	- if ${1:condition}.presence?
+		${0:${VISUAL}}
+snippet ntc
+	= number_to_currency(${1})
diff --git a/vim/snippets/vim-snippets/snippets/handlebars.snippets b/vim/snippets/vim-snippets/snippets/handlebars.snippets
new file mode 100644
index 0000000..401dfbd
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/handlebars.snippets
@@ -0,0 +1,14 @@
+snippet if # {{#if value}} ... {{/if}}
+	{{#if ${1:value}}}
+	${0:${VISUAL}}
+	{{/if}}
+snippet ifn # {{#unless value}} ... {{/unless}}
+	{{#unless ${1:value}}}
+	${0:${VISUAL}}
+	{{/unless}}
+snippet ife # {{#if value}} ... {{else}} .. {{/if}}
+	{{#if ${1:value}}}
+	${2:${VISUAL}}
+	{{else}}
+	${3}
+	{{/if}}
diff --git a/vim/snippets/vim-snippets/snippets/haskell.snippets b/vim/snippets/vim-snippets/snippets/haskell.snippets
new file mode 100644
index 0000000..e4957e4
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/haskell.snippets
@@ -0,0 +1,115 @@
+snippet lang
+	{-# LANGUAGE ${0:OverloadedStrings} #-}
+snippet haddock
+	{-# OPTIONS_HADDOCK ${0:hide} #-}
+snippet ghc
+	{-# OPTIONS_GHC ${0:-fno-warn-unused-imports} #-}
+snippet inline
+	{-# INLINE ${0:name} #-}
+snippet info
+	-- |
+	-- Module      :  ${1:`substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`}
+	-- Copyright   :  ${2:Author} ${3:2011-2012}
+	-- License     :  ${4:BSD3}
+	--
+	-- Maintainer  :  ${5:email@something.com}
+	-- Stability   :  ${6:experimental}
+	-- Portability :  ${7:unknown}
+	--
+	-- ${0:Description}
+	--
+snippet imp
+	import ${0:Data.Text}
+snippet import
+	import           ${0:Data.Text}
+snippet import2
+	import           ${1:Data.Text} (${0:head})
+snippet impq
+	import qualified ${1:Data.Text} as ${0:T}
+snippet importq
+	import qualified ${1:Data.Text} as ${0:T}
+snippet inst
+	instance ${1:Monoid} ${2:Type} where
+		${0}
+snippet type
+	type ${1:Type} = ${0:Type}
+snippet data
+	data ${1:Type} = ${2:$1} ${0:Int}
+snippet newtype
+	newtype ${1:Type} = ${2:$1} ${0:Int}
+snippet class
+	class ${1:Class} a where
+		${0}
+snippet module
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (
+	) where
+	`expand('%') =~ 'Main' ? "\nmain :: IO ()\nmain = undefined" : ""`
+
+snippet main
+	main :: IO ()
+	main = ${0:undefined}
+snippet const
+	${1:name} :: ${2:a}
+	$1 = ${0:undefined}
+snippet fn
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4} = ${0:undefined}
+snippet fn2
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} = ${0:undefined}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} = ${0:undefined}
+snippet => "Type constraint"
+	(${1:Class} ${2:a}) => $2
+snippet ap
+	${1:map} ${2:fn} ${0:list}
+snippet \
+	\\${1:x} -> ${0:expression}
+snippet (\
+	(\\${1:x} -> ${0:expression})
+snippet <-
+	${1:a} <- ${0:m a}
+snippet ->
+	${1:m a} -> ${0:a}
+snippet tup
+	(${1:a}, ${0:b})
+snippet tup2
+	(${1:a}, ${2:b}, ${0:c})
+snippet tup3
+	(${1:a}, ${2:b}, ${3:c}, ${0:d})
+snippet rec
+	${1:Record} { ${2:recFieldA} = ${3:undefined}
+				, ${4:recFieldB} = ${0:undefined}
+				}
+snippet case
+	case ${1:something} of
+		${2} -> ${0}
+snippet let
+	let ${1} = ${2}
+	in ${3}
+snippet where
+	where
+		${1:fn} = ${0:undefined}
+snippet spec
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')` (main, spec) where
+
+	import Test.Hspec
+	import Test.QuickCheck
+
+	main :: IO ()
+	main = hspec spec
+
+	spec :: Spec
+	spec =
+		describe "${1}" $ do
+			$0
+snippet desc
+	describe "${1}" $ do
+		$0
+snippet it
+	it "${1}" $
+		$0
+snippet itp
+	it "${1}" $ property $
+		$0
diff --git a/vim/snippets/vim-snippets/snippets/html.snippets b/vim/snippets/vim-snippets/snippets/html.snippets
new file mode 100644
index 0000000..e91b071
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/html.snippets
@@ -0,0 +1,879 @@
+# Some useful Unicode entities
+# Non-Breaking Space
+snippet nbs
+	&nbsp;
+# ←
+snippet left
+	&#x2190;
+# →
+snippet right
+	&#x2192;
+# ↑
+snippet up
+	&#x2191;
+# ↓
+snippet down
+	&#x2193;
+# ↩
+snippet return
+	&#x21A9;
+# ⇤
+snippet backtab
+	&#x21E4;
+# ⇥
+snippet tab
+	&#x21E5;
+# ⇧
+snippet shift
+	&#x21E7;
+# ⌃
+snippet ctrl
+	&#x2303;
+# ⌅
+snippet enter
+	&#x2305;
+# ⌘
+snippet cmd
+	&#x2318;
+# ⌥
+snippet option
+	&#x2325;
+# ⌦
+snippet delete
+	&#x2326;
+# ⌫
+snippet backspace
+	&#x232B;
+# ⎋
+snippet esc
+	&#x238B;
+# comment
+snippet //
+	<!-- ${1} -->${0}
+# Generic Doctype
+snippet doctype HTML 4.01 Strict
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+snippet doctype HTML 4.01 Transitional
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+snippet doctype HTML 5
+	<!DOCTYPE HTML>
+snippet doctype XHTML 1.0 Frameset
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+snippet doctype XHTML 1.0 Strict
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+snippet doctype XHTML 1.0 Transitional
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+snippet doctype XHTML 1.1
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+# HTML Doctype 4.01 Strict
+snippet docts
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+	"http://www.w3.org/TR/html4/strict.dtd">
+# HTML Doctype 4.01 Transitional
+snippet doct
+	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+	"http://www.w3.org/TR/html4/loose.dtd">
+# HTML Doctype 5
+snippet doct5
+	<!DOCTYPE HTML>
+# XHTML Doctype 1.0 Frameset
+snippet docxf
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
+# XHTML Doctype 1.0 Strict
+snippet docxs
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+# XHTML Doctype 1.0 Transitional
+snippet docxt
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+# XHTML Doctype 1.1
+snippet docx
+	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+	"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+# Attributes
+snippet attr
+	${1:attribute}="${0:property}"
+snippet attr+
+	${1:attribute}="${2:property}" attr+
+snippet .
+	class="${1}"
+snippet #
+	id="${1}"
+snippet alt
+	alt="${1}"
+snippet charset
+	charset="${1:utf-8}"
+snippet data
+	data-${1}="${2:$1}"
+snippet for
+	for="${1}"
+snippet height
+	height="${1}"
+snippet href
+	href="${1:#}"
+snippet lang
+	lang="${1:en}"
+snippet media
+	media="${1}"
+snippet name
+	name="${1}"
+snippet rel
+	rel="${1}"
+snippet scope
+	scope="${1:row}"
+snippet src
+	src="${1}"
+snippet title=
+	title="${1}"
+snippet type
+	type="${1}"
+snippet value
+	value="${1}"
+snippet width
+	width="${1}"
+# Elements
+snippet a
+	<a href="${1:#}">${0:$1}</a>
+snippet a.
+	<a class="${1}" href="${2:#}">${0:$1}</a>
+snippet a#
+	<a id="${1}" href="${2:#}">${0:$1}</a>
+snippet a:ext
+	<a href="http://${1:example.com}">${0:$1}</a>
+snippet a:mail
+	<a href="mailto:${1:joe@example.com}?subject=${2:feedback}">${0:email me}</a>
+snippet ac
+	<a href="`@+`">${0:`@+`}</a>
+snippet abbr
+	<abbr title="${1}">${0}</abbr>
+snippet address
+	<address>
+		${0}
+	</address>
+snippet area
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${0}" />
+snippet area+
+	<area shape="${1:rect}" coords="${2}" href="${3}" alt="${4}" />
+	area+
+snippet area:c
+	<area shape="circle" coords="${1}" href="${2}" alt="${0}" />
+snippet area:d
+	<area shape="default" coords="${1}" href="${2}" alt="${0}" />
+snippet area:p
+	<area shape="poly" coords="${1}" href="${2}" alt="${0}" />
+snippet area:r
+	<area shape="rect" coords="${1}" href="${2}" alt="${0}" />
+snippet article
+	<article>
+		${0}
+	</article>
+snippet article.
+	<article class="${1}">
+		${0}
+	</article>
+snippet article#
+	<article id="${1}">
+		${0}
+	</article>
+snippet aside
+	<aside>
+		${0}
+	</aside>
+snippet aside.
+	<aside class="${1}">
+		${0}
+	</aside>
+snippet aside#
+	<aside id="${1}">
+		${0}
+	</aside>
+snippet audio
+	<audio src="${1}>${0}</audio>
+snippet b
+	<b>${0}</b>
+snippet base
+	<base href="${1}" target="${0}" />
+snippet bdi
+	<bdi>${0}</bdo>
+snippet bdo
+	<bdo dir="${1}">${0}</bdo>
+snippet bdo:l
+	<bdo dir="ltr">${0}</bdo>
+snippet bdo:r
+	<bdo dir="rtl">${0}</bdo>
+snippet blockquote
+	<blockquote>
+		${0}
+	</blockquote>
+snippet body
+	<body>
+		${0}
+	</body>
+snippet br
+	<br />
+snippet button
+	<button type="${1:submit}">${0}</button>
+snippet button.
+	<button class="${1:button}" type="${2:submit}">${0}</button>
+snippet button#
+	<button id="${1}" type="${2:submit}">${0}</button>
+snippet button:s
+	<button type="submit">${0}</button>
+snippet button:r
+	<button type="reset">${0}</button>
+snippet canvas
+	<canvas>
+		${0}
+	</canvas>
+snippet caption
+	<caption>${0}</caption>
+snippet cite
+	<cite>${0}</cite>
+snippet code
+	<code>${0}</code>
+snippet col
+	<col />
+snippet col+
+	<col />
+	col+
+snippet colgroup
+	<colgroup>
+		${0}
+	</colgroup>
+snippet colgroup+
+	<colgroup>
+		<col />
+		col+${0}
+	</colgroup>
+snippet command
+	<command type="command" label="${1}" icon="${0}">
+snippet command:c
+	<command type="checkbox" label="${1}" icon="${0}">
+snippet command:r
+	<command type="radio" radiogroup="${1}" label="${2}" icon="${0}">
+snippet datagrid
+	<datagrid>
+		${0}
+	</datagrid>
+snippet datalist
+	<datalist>
+		${0}
+	</datalist>
+snippet datatemplate
+	<datatemplate>
+		${0}
+	</datatemplate>
+snippet dd
+	<dd>${0}</dd>
+snippet dd.
+	<dd class="${1}">${0}</dd>
+snippet dd#
+	<dd id="${1}">${0}</dd>
+snippet del
+	<del>${0}</del>
+snippet details
+	<details>${0}</details>
+snippet dfn
+	<dfn>${0}</dfn>
+snippet dialog
+	<dialog>
+		${0}
+	</dialog>
+snippet div
+	<div>
+		${0}
+	</div>
+snippet div.
+	<div class="${1}">
+		${0}
+	</div>
+snippet div#
+	<div id="${1}">
+		${0}
+	</div>
+snippet dl
+	<dl>
+		${0}
+	</dl>
+snippet dl.
+	<dl class="${1}">
+		${0}
+	</dl>
+snippet dl#
+	<dl id="${1}">
+		${0}
+	</dl>
+snippet dl+
+	<dl>
+		<dt>${1}</dt>
+		<dd>${2}</dd>
+		dt+${0}
+	</dl>
+snippet dt
+	<dt>${0}</dt>
+snippet dt.
+	<dt class="${1}">${0}</dt>
+snippet dt#
+	<dt id="${1}">${0}</dt>
+snippet dt+
+	<dt>${1}</dt>
+	<dd>${2}</dd>
+	dt+${0}
+snippet em
+	<em>${0}</em>
+snippet embed
+	<embed src="${1}" type="${0}" />
+snippet fieldset
+	<fieldset>
+		${0}
+	</fieldset>
+snippet fieldset.
+	<fieldset class="${1}">
+		${0}
+	</fieldset>
+snippet fieldset#
+	<fieldset id="${1}">
+		${0}
+	</fieldset>
+snippet fieldset+
+	<fieldset>
+		<legend><span>${1}</span></legend>
+		${2}
+	</fieldset>
+	fieldset+${0}
+snippet figcaption
+	<figcaption>${0}</figcaption>
+snippet figure
+	<figure>${0}</figure>
+snippet figure#
+	<figure id="${1}">
+		${0}
+	</figure>
+snippet figure.
+	<figure class="${1}">
+		${0}
+	</figure>
+snippet footer
+	<footer>
+		${0}
+	</footer>
+snippet footer.
+	<footer class="${1}">
+		${0}
+	</footer>
+snippet footer#
+	<footer id="${1}">
+		${0}
+	</footer>
+snippet form
+	<form action="${1}" method="${2:post}">
+		${0}
+	</form>
+snippet form.
+	<form class="${1}" action="${2}" method="${3:post}">
+		${0}
+	</form>
+snippet form#
+	<form id="${1}" action="${2}" method="${3:post}">
+		${0}
+	</form>
+snippet h1
+	<h1>${0}</h1>
+snippet h1.
+	<h1 class="${1}">${0}</h1>
+snippet h1#
+	<h1 id="${1}">${0}</h1>
+snippet h2
+	<h2>${0}</h2>
+snippet h2.
+	<h2 class="${1}">${0}</h2>
+snippet h2#
+	<h2 id="${1}">${0}</h2>
+snippet h3
+	<h3>${0}</h3>
+snippet h3.
+	<h3 class="${1}">${0}</h3>
+snippet h3#
+	<h3 id="${1}">${0}</h3>
+snippet h4
+	<h4>${0}</h4>
+snippet h4.
+	<h4 class="${1}">${0}</h4>
+snippet h4#
+	<h4 id="${1}">${0}</h4>
+snippet h5
+	<h5>${0}</h5>
+snippet h5.
+	<h5 class="${1}">${0}</h5>
+snippet h5#
+	<h5 id="${1}">${0}</h5>
+snippet h6
+	<h6>${0}</h6>
+snippet h6.
+	<h6 class="${1}">${0}</h6>
+snippet h6#
+	<h6 id="${1}">${0}</h6>
+snippet head
+	<head>
+		<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+
+		<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+		${0}
+	</head>
+snippet header
+	<header>
+		${0}
+	</header>
+snippet header.
+	<header class="${1}">
+		${0}
+	</header>
+snippet header#
+	<header id="${1}">
+		${0}
+	</header>
+snippet hgroup
+	<hgroup>
+		${0}
+	</hgroup>
+snippet hgroup.
+	<hgroup class="${1}>
+		${0}
+	</hgroup>
+snippet hr
+	<hr />
+snippet html
+	<html>
+	${0}
+	</html>
+snippet xhtml
+	<html xmlns="http://www.w3.org/1999/xhtml">
+	${0}
+	</html>
+snippet html5
+	<!DOCTYPE html>
+	<html>
+		<head>
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${1:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+			${2:link}
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+snippet html5l
+	<!DOCTYPE html>
+	<html lang="${1:es}">
+		<head>
+			<meta charset="utf-8" />
+			<meta name="viewport" content="width=device-width" />
+			<title>${2:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+			${3:link}
+		</head>
+		<body>
+			${0:body}
+		</body>
+	</html>
+snippet i
+	<i>${0}</i>
+snippet iframe
+	<iframe src="${1}" frameborder="0"></iframe>
+snippet iframe.
+	<iframe class="${1}" src="${2}" frameborder="0"></iframe>
+snippet iframe#
+	<iframe id="${1}" src="${2}" frameborder="0"></iframe>
+snippet img
+	<img src="${1}" alt="${2}" />
+snippet img.
+	<img class="${1}" src="${2}" alt="${3}" />
+snippet img#
+	<img id="${1}" src="${2}" alt="${3}" />
+snippet input
+	<input type="${1:text/submit/hidden/button/image}" name="${2}" id="${3:$2}" value="${4}" />
+snippet input.
+	<input class="${1}" type="${2:text/submit/hidden/button/image}" name="${3}" id="${4:$3}" value="${5}" />
+snippet input:text
+	<input type="text" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:submit
+	<input type="submit" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:hidden
+	<input type="hidden" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:button
+	<input type="button" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:image
+	<input type="image" name="${1}" id="${2:$1}" src="${3}" alt="${4}" />
+snippet input:checkbox
+	<input type="checkbox" name="${1}" id="${2:$1}" />
+snippet input:radio
+	<input type="radio" name="${1}" id="${2:$1}" />
+snippet input:color
+	<input type="color" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:date
+	<input type="date" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:datetime
+	<input type="datetime" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:datetime-local
+	<input type="datetime-local" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:email
+	<input type="email" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:file
+	<input type="file" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:month
+	<input type="month" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:number
+	<input type="number" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:password
+	<input type="password" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:range
+	<input type="range" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:reset
+	<input type="reset" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:search
+	<input type="search" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:time
+	<input type="time" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:url
+	<input type="url" name="${1}" id="${2:$1}" value="${3}" />
+snippet input:week
+	<input type="week" name="${1}" id="${2:$1}" value="${3}" />
+snippet ins
+	<ins>${0}</ins>
+snippet kbd
+	<kbd>${0}</kbd>
+snippet label
+	<label for="${0:$1}">${1}</label>
+snippet label:i
+	<label for="${2:$1}">${1}</label>
+	<input type="${3:text/submit/hidden/button}" name="${4:$2}" id="${5:$2}" value="${6}" />
+snippet label:s
+	<label for="${2:$1}">${1}</label>
+	<select name="${3:$2}" id="${4:$2}">
+		<option value="${5}">${0:$5}</option>
+	</select>
+snippet legend
+	<legend>${0}</legend>
+snippet legend+
+	<legend><span>${0}</span></legend>
+snippet li
+	<li>${0}</li>
+snippet li.
+	<li class="${1}">${0}</li>
+snippet li+
+	<li>${1}</li>
+	li+
+snippet lia
+	<li><a href="${0:#}">${1}</a></li>
+snippet lia+
+	<li><a href="${2:#}">${1}</a></li>
+	lia+
+snippet link
+	<link rel="${1}" href="${2}" title="${3}" type="${4}" />
+snippet link:atom
+	<link rel="alternate" href="${1:atom.xml}" title="Atom" type="application/atom+xml" />
+snippet link:s
+	<link rel="stylesheet" href="${1:style.css}" />
+snippet link:css
+	<link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}" />
+snippet link:favicon
+	<link rel="shortcut icon" href="${1:favicon.ico}" type="image/x-icon" />
+snippet link:rss
+	<link rel="alternate" href="${1:rss.xml}" title="RSS" type="application/atom+xml" />
+snippet link:touch
+	<link rel="apple-touch-icon" href="${1:favicon.png}" />
+snippet main
+	<main role="main">
+		${0}
+	</main>
+snippet map
+	<map name="${1}">
+		${0}
+	</map>
+snippet map.
+	<map class="${1}" name="${2}">
+		${0}
+	</map>
+snippet map#
+	<map name="${1}" id="${2:$1}>
+		${0}
+	</map>
+snippet map+
+	<map name="${1}">
+		<area shape="${2}" coords="${3}" href="${4}" alt="${5}" />${6}
+	</map>
+snippet mark
+	<mark>${0}</mark>
+snippet menu
+	<menu>
+		${0}
+	</menu>
+snippet menu:c
+	<menu type="context">
+		${0}
+	</menu>
+snippet menu:t
+	<menu type="toolbar">
+		${0}
+	</menu>
+snippet meta
+	<meta http-equiv="${1}" content="${2}" />
+snippet meta:s
+	<meta ${0} />
+snippet meta:d
+	<meta name="description" content="${0}" />
+snippet meta:compat
+	<meta http-equiv="X-UA-Compatible" content="IE=${1:7,8,edge}" />
+snippet meta:refresh
+	<meta http-equiv="refresh" content="text/html;charset=UTF-8" />
+snippet meta:utf
+	<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+snippet meter
+	<meter>${0}</meter>
+snippet nav
+	<nav>
+		${0}
+	</nav>
+snippet nav.
+	<nav class="${1}">
+		${0}
+	</nav>
+snippet nav#
+	<nav id="${1}">
+		${0}
+	</nav>
+snippet noscript
+	<noscript>
+		${0}
+	</noscript>
+snippet object
+	<object data="${1}" type="${2}">
+		${3}
+	</object>
+# Embed QT Movie
+snippet movie
+	<object width="$2" height="$3" classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"
+	codebase="http://www.apple.com/qtactivex/qtplugin.cab">
+		<param name="src" value="$1" />
+		<param name="controller" value="$4" />
+		<param name="autoplay" value="$5" />
+		<embed src="${1:movie.mov}"
+			width="${2:320}" height="${3:240}"
+			controller="${4:true}" autoplay="${5:true}"
+			scale="tofit" cache="true"
+			pluginspage="http://www.apple.com/quicktime/download/" />
+	</object>
+snippet ol
+	<ol>
+		${0}
+	</ol>
+snippet ol.
+	<ol class="${1}">
+		${0}
+	</ol>
+snippet ol#
+	<ol id="${1}">
+		${0}
+	</ol>
+snippet ol+
+	<ol>
+		<li>${1}</li>
+		li+${0}
+	</ol>
+snippet opt
+	<option value="${1}">${0:$1}</option>
+snippet opt+
+	<option value="${1}">${2:$1}</option>
+	opt+${0}
+snippet optt
+	<option>${0}</option>
+snippet optgroup
+	<optgroup>
+		<option value="${1}">${2:$1}</option>
+		opt+${0}
+	</optgroup>
+snippet output
+	<output>${0}</output>
+snippet p
+	<p>${0}</p>
+snippet p.
+	<p class="${1}">${0}</p>
+snippet p#
+	<p id="${1}">${0}</p>
+snippet param
+	<param name="${1}" value="${2}" />
+snippet pre
+	<pre>
+		${0}
+	</pre>
+snippet progress
+	<progress>${0}</progress>
+snippet q
+	<q>${0}</q>
+snippet rp
+	<rp>${0}</rp>
+snippet rt
+	<rt>${0}</rt>
+snippet ruby
+	<ruby>
+		<rp><rt>${0}</rt></rp>
+	</ruby>
+snippet s
+	<s>${0}</s>
+snippet samp
+	<samp>
+		${0}
+	</samp>
+snippet script
+	<script charset="utf-8">
+		${0}
+	</script>
+snippet scripts
+	<script src="${0}.js"></script>
+snippet scriptt
+	<script type="${1}" id="${2}">
+		${0}
+	</script>
+snippet scriptsrc
+	<script src="${0}.js" charset="utf-8"></script>
+snippet section
+	<section>
+		${0}
+	</section>
+snippet section.
+	<section class="${1}">
+		${0}
+	</section>
+snippet section#
+	<section id="${1}">
+		${0}
+	</section>
+snippet select
+	<select name="${1}" id="${2:$1}">
+		${0}
+	</select>
+snippet select.
+	<select name="${1}" id="${2:$1}" class="${3}>
+		${0}
+	</select>
+snippet select+
+	<select name="${1}" id="${2:$1}">
+		<option value="${3}">${4:$3}</option>
+		opt+${0}
+	</select>
+snippet small
+	<small>${0}</small>
+snippet source
+	<source src="${1}" type="${2}" media="${0}" />
+snippet span
+	<span>${0}</span>
+snippet span.
+	<span class="${1}">${0}</span>
+snippet span#
+	<span id="${1}">${0}</span>
+snippet strong
+	<strong>${0}</strong>
+snippet style
+	<style type="text/css" media="${1:all}">
+		${0}
+	</style>
+snippet sub
+	<sub>${0}</sub>
+snippet summary
+	<summary>
+		${0}
+	</summary>
+snippet sup
+	<sup>${0}</sup>
+snippet table
+	<table>
+		${0}
+	</table>
+snippet table.
+	<table class="${1}">
+		${0}
+	</table>
+snippet table#
+	<table id="${1}">
+		${0}
+	</table>
+snippet tbody
+	<tbody>
+		${0}
+	</tbody>
+snippet td
+	<td>${0}</td>
+snippet td.
+	<td class="${1}">${0}</td>
+snippet td#
+	<td id="${1}">${0}</td>
+snippet td+
+	<td>${1}</td>
+	td+${0}
+snippet textarea
+	<textarea name="${1}" id="${2:$1}" rows="${3:8}" cols="${4:40}">${5}</textarea>
+snippet tfoot
+	<tfoot>
+		${0}
+	</tfoot>
+snippet th
+	<th>${0}</th>
+snippet th.
+	<th class="${1}">${0}</th>
+snippet th#
+	<th id="${1}">${0}</th>
+snippet th+
+	<th>${1}</th>
+	th+${0}
+snippet thead
+	<thead>
+		${0}
+	</thead>
+snippet time
+	<time datetime="${1}" pubdate="${2:$1}">${0:$1}</time>
+snippet title
+	<title>${0:`substitute(vim_snippets#Filename('', 'Page Title'), '^.', '\u&', '')`}</title>
+snippet tr
+	<tr>
+		${0}
+	</tr>
+snippet tr+
+	<tr>
+		<td>${1}</td>
+		td+${0}
+	</tr>
+snippet track
+	<track src="${1}" srclang="${2}" label="${3}" default="${4:default} />${5}
+snippet ul
+	<ul>
+		${0}
+	</ul>
+snippet ul.
+	<ul class="${1}">
+		${0}
+	</ul>
+snippet ul#
+	<ul id="${1}">
+		${0}
+	</ul>
+snippet ul+
+	<ul>
+		<li>${1}</li>
+		li+${0}
+	</ul>
+snippet var
+	<var>${0}</var>
+snippet video
+	<video src="${1} height="${2}" width="${3}" preload="${5:none}" autoplay="${6:autoplay}>${7}</video>
+snippet wbr
+	<wbr />
+snippet viewport
+	<meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/vim/snippets/vim-snippets/snippets/htmldjango.snippets b/vim/snippets/vim-snippets/snippets/htmldjango.snippets
new file mode 100644
index 0000000..7d14ca8
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/htmldjango.snippets
@@ -0,0 +1,142 @@
+# Generic tags
+
+extends html
+
+snippet %
+	{% ${1} %}
+snippet %%
+	{% ${1:tag_name} %}
+	${0}
+	{% end$1 %}
+snippet {
+	{{ ${1} }}
+# Template Tags
+
+snippet autoescape
+	{% autoescape ${1:off} %}
+		${0}
+	{% endautoescape %}
+snippet block
+	{% block ${1} %}
+		${0}
+	{% endblock %}
+snippet #
+	{# ${0:comment} #}
+snippet comment
+	{% comment %}
+		${0}
+	{% endcomment %}
+snippet cycle
+	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet debug
+	{% debug %}
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet filter
+	{% filter ${1} %}
+		${0}
+	{% endfilter %}
+snippet firstof
+	{% firstof ${1} %}
+snippet for
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet empty
+	{% empty %}
+	${0}
+snippet if
+	{% if ${1} %}
+		${0}
+	{% endif %}
+snippet el
+	{% else %}
+		${1}
+snippet eif
+	{% elif ${1} %}
+		${0}
+snippet ifchanged
+	{% ifchanged %}${1}{% endifchanged %}
+snippet ifequal
+	{% ifequal ${1} ${2} %}
+		${0}
+	{% endifequal %}
+snippet ifnotequal
+	{% ifnotequal ${1} ${2} %}
+		${0}
+	{% endifnotequal %}
+snippet include
+	{% include "${0}" %}
+snippet load
+	{% load ${0} %}
+snippet now
+	{% now "${0:jS F Y H:i}" %}
+snippet regroup
+	{% regroup ${1} by ${2} as ${0} %}
+snippet spaceless
+	{% spaceless %}${0}{% endspaceless %}
+snippet ssi
+	{% ssi ${0} %}
+snippet trans
+	{% trans "${0:string}" %}
+snippet url
+	{% url ${1} as ${0} %}
+snippet widthratio
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
+snippet with
+	{% with ${1} as ${2} %}
+		${0}
+	{% endwith %}
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+	add:"${0}"
+snippet center
+	center:"${0}"
+snippet cut
+	cut:"${0}"
+snippet date
+	date:"${0}"
+snippet default
+	default:"${0}"
+snippet defaultifnone
+	default_if_none:"${0}"
+snippet dictsort
+	dictsort:"${0}"
+snippet dictsortrev
+	dictsortreversed:"${0}"
+snippet divisibleby
+	divisibleby:"${0}"
+snippet floatformat
+	floatformat:"${0}"
+snippet getdigit
+	get_digit:"${0}"
+snippet join
+	join:"${0}"
+snippet lengthis
+	length_is:"${0}"
+snippet pluralize
+	pluralize:"${0}"
+snippet removetags
+	removetags:"${0}"
+snippet slice
+	slice:"${0}"
+snippet stringformat
+	stringformat:"${0}"
+snippet time
+	time:"${0}"
+snippet truncatewords
+	truncatewords:${0}
+snippet truncatewordshtml
+	truncatewords_html:${0}
+snippet urlizetrunc
+	urlizetrunc:${0}
+snippet wordwrap
+	wordwrap:${0}
diff --git a/vim/snippets/vim-snippets/snippets/htmltornado.snippets b/vim/snippets/vim-snippets/snippets/htmltornado.snippets
new file mode 100644
index 0000000..1620e11
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/htmltornado.snippets
@@ -0,0 +1,55 @@
+# Generic tags
+
+snippet {
+	{{ ${0} }}
+
+# Template tags
+
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet autoescape
+	{% autoescape ${0:xhtml_escape | None} %}
+snippet apply
+	{% apply ${1:function} %}
+	  ${0}
+	{% end %}
+snippet block
+	{% block ${1} %}
+	  ${0}
+	{% end %}
+snippet for
+	{% for ${1:item} in ${2} %}
+	  ${0}
+	{% end %}
+snippet from
+	{% from ${1:x} import ${0:y} %}
+snippet if
+	{% if ${1:condition} %}
+	  ${0}
+	{% end %}
+snippet eif
+	{% elif ${0:condition} %}
+snippet el
+	{% else %}
+snippet import
+	{% import ${0:module} %}
+snippet include
+	{% include "${0:filename}" %}
+snippet module
+	{% module ${0:expression} %}
+snippet raw
+	{% raw ${0:expression} %}
+snippet set
+	{% set ${1:x} = ${0:y} %}
+snippet try
+	{% try %}
+	  ${1:${VISUAL}}
+	{% except %}
+	  ${2}
+	{% finallly %}
+	  ${0}
+	{% end %}
+snippet wh
+	{% while ${1:condition} %}
+	  ${0}
+	{% end %}
diff --git a/vim/snippets/vim-snippets/snippets/idris.snippets b/vim/snippets/vim-snippets/snippets/idris.snippets
new file mode 100644
index 0000000..abbedb6
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/idris.snippets
@@ -0,0 +1,46 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`
+	${0}
+snippet imp
+	import ${0:List}
+snippet fn
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn1
+	${1:fn} : ${2:a} -> ${3:a}
+	$1 ${4} =
+		${0}
+snippet fn2
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5} =
+		${0}
+snippet fn3
+	${1:fn} : ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6} =
+		${0}
+snippet fn0
+	${1:fn} : ${2:a}
+	$1 =
+		${0}
+snippet case
+	case ${1} of
+		${2} =>
+			${0}
+snippet let
+	let
+		${1} =
+			${2}
+	in
+		${0}
+snippet wh
+	where
+		${0}
+snippet if
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}
+	${0}
+snippet \ "Lambda function (\x => ...)"
+	(\\${1:_} => ${0})
diff --git a/vim/snippets/vim-snippets/snippets/jade.snippets b/vim/snippets/vim-snippets/snippets/jade.snippets
new file mode 100644
index 0000000..55f0af7
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/jade.snippets
@@ -0,0 +1,18 @@
+# Angular HTML
+snippet rep
+	div(ng-repeat='${1} in ${2}')
+
+snippet repf
+	div(ng-repeat='${1} in ${2}' | ${3})
+
+snippet repi
+	div(ng-repeat='${1} in ${2}' track by $index)
+
+snippet hide
+	div(ng-hide='${1}')
+
+snippet show
+	div(ng-show='${1}')
+
+snippet if
+	div(ng-if='${1}')
diff --git a/vim/snippets/vim-snippets/snippets/java.snippets b/vim/snippets/vim-snippets/snippets/java.snippets
new file mode 100644
index 0000000..66821c1
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/java.snippets
@@ -0,0 +1,295 @@
+## Access Modifiers
+snippet po
+	protected ${0}
+snippet pu
+	public ${0}
+snippet pr
+	private ${0}
+##
+## Annotations
+snippet before
+	@Before
+	static void ${1:intercept}(${2:args}) { ${0} }
+snippet mm
+	@ManyToMany
+	${0}
+snippet mo
+	@ManyToOne
+	${0}
+snippet om
+	@OneToMany${1:(cascade=CascadeType.ALL)}
+	${0}
+snippet oo
+	@OneToOne
+	${1}
+##
+## Basic Java packages and import
+snippet im
+	import ${0}
+snippet j.b
+	java.beans.
+snippet j.i
+	java.io.
+snippet j.m
+	java.math.
+snippet j.n
+	java.net.
+snippet j.u
+	java.util.
+##
+## Class
+snippet cl
+	class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
+snippet pcl
+	public class ${1:`vim_snippets#Filename("$1", "untitled")`} ${0}
+snippet in
+	interface ${1:`vim_snippets#Filename("$1", "untitled")`} ${2:extends Parent}
+snippet tc
+	public class ${1:`vim_snippets#Filename("$1")`} extends ${0:TestCase}
+##
+## Class Enhancements
+snippet ext
+	extends ${0}
+snippet imp
+	implements ${0}
+##
+## Comments
+snippet /*
+	/*
+	 * ${0}
+	 */
+##
+## Constants
+snippet co
+	static public final ${1:String} ${2:var} = ${3};
+snippet cos
+	static public final String ${1:var} = "${2}";
+##
+## Control Statements
+snippet case
+	case ${1}:
+		${0}
+snippet def
+	default:
+		${0}
+snippet el
+	else
+snippet eif
+	else if (${1}) ${0}
+snippet if
+	if (${1}) ${0}
+snippet sw
+	switch (${1}) {
+		${0}
+	}
+##
+## Create a Method
+snippet m
+	${1:void} ${2:method}(${3}) ${4:throws }
+##
+## Create a Variable
+snippet v
+	${1:String} ${2:var}${3: = null}${4};
+##
+## Declaration for ArrayList
+snippet d.al
+	List<${1:Object}> ${2:list} = new ArrayList<$1>();${0}
+## Declaration for HashMap
+snippet d.hm
+	Map<${1:Object}, ${2:Object}> ${3:map} = new HashMap<$1, $2>();${0}
+## Declaration for HashSet
+snippet d.hs
+	Set<${1:Object}> ${2:set} = new HashSet<$1>();${0}
+## Declaration for Stack
+snippet d.st
+	Stack<${1:Object}> ${2:stack} = new Stack<$1>();${0}
+##
+## Singleton Pattern
+snippet singlet
+	private static class Holder {
+		private static final ${1:`vim_snippets#Filename("$1")`} INSTANCE = new $1();
+	}
+
+	private $1() { }
+
+	public static $1 getInstance() {
+		return Holder.INSTANCE;
+	}
+##
+## Enhancements to Methods, variables, classes, etc.
+snippet ab
+	abstract ${0}
+snippet fi
+	final ${0}
+snippet st
+	static ${0}
+snippet sy
+	synchronized ${0}
+##
+## Error Methods
+snippet err
+	System.err.print("${0:Message}");
+snippet errf
+	System.err.printf("${1:Message}", ${0:exception});
+snippet errln
+	System.err.println("${0:Message}");
+##
+## Exception Handling
+snippet as
+	assert ${1:test} : "${2:Failure message}";
+snippet ae
+	assertEquals("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet aae
+	assertArrayEquals("${1:Failure message}", ${2:expecteds}, ${3:actuals});
+snippet af
+	assertFalse("${1:Failure message}", ${2:condition});
+snippet at
+	assertTrue("${1:Failure message}", ${2:condition});
+snippet an
+	assertNull("${1:Failure message}", ${2:object});
+snippet ann
+	assertNotNull("${1:Failure message}", ${2:object});
+snippet ass
+	assertSame("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet asns
+	assertNotSame("${1:Failure message}", ${2:expected}, ${3:actual});
+snippet fa
+	fail("${1:Failure message}");
+snippet ca
+	catch(${1:Exception} ${2:e}) ${0}
+snippet thr
+	throw ${0}
+snippet ths
+	throws ${0}
+snippet try
+	try {
+		${0:${VISUAL}}
+	} catch(${1:Exception} ${2:e}) {
+	}
+snippet tryf
+	try {
+		${0:${VISUAL}}
+	} catch(${1:Exception} ${2:e}) {
+	} finally {
+	}
+##
+## Find Methods
+snippet findall
+	List<${1:listName}> ${2:items} = ${1}.findAll();
+snippet findbyid
+	${1:var} ${2:item} = ${1}.findById(${3});
+##
+## Javadocs
+snippet /**
+	/**
+	 * ${0}
+	 */
+snippet @au
+	@author `system("grep \`id -un\` /etc/passwd | cut -d \":\" -f5 | cut -d \",\" -f1")`
+snippet @br
+	@brief ${0:Description}
+snippet @fi
+	@file ${0:`vim_snippets#Filename("$1")`}.java
+snippet @pa
+	@param ${0:param}
+snippet @re
+	@return ${0:param}
+##
+## Logger Methods
+snippet debug
+	Logger.debug(${1:param});
+snippet error
+	Logger.error(${1:param});
+snippet info
+	Logger.info(${1:param});
+snippet warn
+	Logger.warn(${1:param});
+##
+## Loops
+snippet enfor
+	for (${1} : ${2}) ${0}
+snippet for
+	for (${1}; ${2}; ${3}) ${0}
+snippet wh
+	while (${1}) ${0}
+##
+## Main method
+snippet psvm
+	public static void main (String[] args) {
+		${0}
+	}
+snippet main
+	public static void main (String[] args) {
+		${0}
+	}
+##
+## Print Methods
+snippet sout
+	System.out.println(${0});
+snippet serr
+	System.err.println(${0});
+snippet print
+	System.out.print("${0:Message}");
+snippet printf
+	System.out.printf("${1:Message}", ${0:args});
+snippet println
+	System.out.println(${0});
+snippet printlna
+	System.out.println(Arrays.toString(${0}));
+##
+## Render Methods
+snippet ren
+	render(${1:param});
+snippet rena
+	renderArgs.put("${1}", ${2});
+snippet renb
+	renderBinary(${1:param});
+snippet renj
+	renderJSON(${1:param});
+snippet renx
+	renderXml(${1:param});
+##
+## Setter and Getter Methods
+snippet set
+	${1:public} void set${3:}(${2:String} ${0:}){
+		this.$4 = $4;
+	}
+snippet get
+	${1:public} ${2:String} get${3:}(){
+		return this.${0:};
+	}
+##
+## Terminate Methods or Loops
+snippet re
+	return ${0}
+snippet br
+	break;
+##
+## Test Methods
+snippet t
+	public void test${1:Name}() throws Exception {
+		${0}
+	}
+snippet test
+	@Test
+	public void test${1:Name}() throws Exception {
+		${0}
+	}
+##
+## Utils
+snippet Sc
+	Scanner
+##
+## Miscellaneous
+snippet action
+	public static void ${1:index}(${2:args}) { ${0} }
+snippet rnf
+	notFound(${1:param});
+snippet rnfin
+	notFoundIfNull(${1:param});
+snippet rr
+	redirect(${1:param});
+snippet ru
+	unauthorized(${1:param});
+snippet unless
+	(unless=${1:param});
diff --git a/vim/snippets/vim-snippets/snippets/javascript-bemjson.snippets b/vim/snippets/vim-snippets/snippets/javascript-bemjson.snippets
new file mode 100644
index 0000000..7899c22
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript-bemjson.snippets
@@ -0,0 +1,52 @@
+# Snippet for bemjson. https://en.bem.info/platform/bemjson/
+
+# Blocks
+snippet b
+	{
+		block : '${1:name}',
+		content : [
+			'${2:content}'
+		]
+	}
+
+# btc - BEM block with text content
+snippet btc
+	{
+		 block : '${1:name}',
+		 content: '${2:content}'
+	}
+
+# bwm - BEM block with modifier.
+snippet bwm
+	{
+		block : '${1:name}',
+		mods: { ${2:modName}: '${3:modVal}' },
+		content : [
+			'${4:content}'
+		]
+	}
+
+# Elems
+
+# e - BEM elem
+snippet e
+	{
+		elem : '${1:name}',
+		content : [
+			'${2:content}'
+		]
+	}
+
+
+# mo - Mods
+snippet mo
+	mods : { ${1:modName} : '${2:modVal}' },
+
+# mi - BEM mix mod
+snippet mi
+	mix : [ { ${1:block} : '${2:block}' } ],
+
+# a - BEM attrs mod
+snippet a
+	attrs : { ${1:attr} : '${2:val}' },
+
diff --git a/vim/snippets/vim-snippets/snippets/javascript-d3.snippets b/vim/snippets/vim-snippets/snippets/javascript-d3.snippets
new file mode 100644
index 0000000..f5be918
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript-d3.snippets
@@ -0,0 +1,30 @@
+snippet .attr
+	.attr("${1}", ${2})
+snippet .style
+	.style("${1}", ${2})
+snippet axis
+	d3.svg.axis()
+	  .orient(${1})
+	  .scale(${2})
+snippet fd
+	function(d) { ${1} }
+snippet fdi
+	function(d, i) { ${1} }
+snippet marginconvention
+	var ${1:margin} = { top: ${2:10}, right: ${3:10}, bottom: ${4:10}, left: ${5:10} };
+	var ${6:width} = ${7:970} - $1.left - $1.right;
+	var ${8:height} = ${9:500} - $1.top - $1.bottom;
+	
+	var ${10:svg} = d3.select("${11}").append("svg")
+	  .attr("width", $6 + $1.left + $1.right)
+	  .attr("height", $8 + $1.top + $1.bottom)
+	    .append("g")
+	  .attr("transform", "translate(" + $1.left + "," + $1.top + ")")
+snippet nest
+	d3.nest()
+	  .key(${1})
+	  .entries(${2})
+snippet scale
+	d3.scale.linear()
+	  .domain(${1})
+	  .range(${2})
diff --git a/vim/snippets/vim-snippets/snippets/javascript-mocha.snippets b/vim/snippets/vim-snippets/snippets/javascript-mocha.snippets
new file mode 100644
index 0000000..eb5c381
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript-mocha.snippets
@@ -0,0 +1,34 @@
+snippet des "describe('thing', () => { ... })" b
+	describe('${1:}', () => {
+		${0:${VISUAL}}
+	});
+snippet it "it('should do', () => { ... })" b
+	it('${1:}', () => {
+		${0:${VISUAL}}
+	});
+snippet xit "xit('should do', () => { ... })" b
+	xit('${1:}', () => {
+		${0:${VISUAL}}
+	});
+snippet bef "before(() => { ... })" b
+	before(() => {
+		${0:${VISUAL}}
+	});
+snippet befe "beforeEach(() => { ... })" b
+	beforeEach(() => {
+		${0:${VISUAL}}
+	});
+snippet aft "after(() => { ... })" b
+	after(() => {
+		${0:${VISUAL}}
+	});
+snippet afte "afterEach(() => { ... })" b
+	afterEach(() => {
+		${0:${VISUAL}}
+	});
+snippet exp "expect(...)" b
+	expect(${1:})${0};
+snippet expe "expect(...).to.equal(...)" b
+	expect(${1:}).to.equal(${0});
+snippet expd "expect(...).to.deep.equal(...)" b
+	expect(${1:}).to.deep.equal(${0});
diff --git a/vim/snippets/vim-snippets/snippets/javascript.es6.react.snippets b/vim/snippets/vim-snippets/snippets/javascript.es6.react.snippets
new file mode 100644
index 0000000..a584bb1
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript.es6.react.snippets
@@ -0,0 +1,81 @@
+# Import only React
+snippet ri1
+	import React from 'react'
+
+# Import both React and Component
+snippet ri2
+	import React, { Component, PropTypes } from 'react'
+
+# React class
+snippet rcla
+	class ${1:MyComponent} extends Component {
+		render() {
+			return (
+				${0:<div></div>}
+			)
+		}
+	}
+
+# React constructor
+snippet rcon
+	constructor(props) {
+		super(props)
+
+		this.state = {
+			${1}: ${0},
+		}
+	}
+
+# Proptypes for React Class
+snippet rcpt
+	static propTypes = {
+		${1}: PropTypes.${0},
+	}
+
+# Default props for React Class
+snippet rcdp
+	static defaultProps = {
+		${1}: ${0},
+	}
+
+# Presentational component
+snippet rcom
+	props => {
+		return (
+			${0:<div></div>}
+		)
+	}
+
+# Proptypes for Presentational component
+snippet rpt
+	${1}.propTypes = {
+		${2}: PropTypes.${0},
+	}
+
+# Default props for Presentational component
+snippet rdp
+	${1}.defaultProps = {
+		${2}: ${0},
+	}
+
+# Lifecycle Methods
+snippet rcdm
+	componentDidMount() {
+		${0:${VISUAL}}
+	}
+
+# State
+snippet rsst
+	this.setState({
+		${1}: ${0},
+	})
+
+snippet rtst
+	this.state.${0}
+
+# Props
+snippet rp
+	props.${0}
+
+snippet rtp
+	this.props.${0}
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript-jasmine.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript-jasmine.snippets
new file mode 100644
index 0000000..855a189
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript-jasmine.snippets
@@ -0,0 +1,177 @@
+version 1
+
+snippet des "Describe (js)"
+	describe('${1:description}', function() {
+		$0
+	});
+
+snippet it "it (js)"
+	it('${1:description}', function() {
+		$0
+	});
+
+snippet bef "before each (js)"
+	beforeEach(function() {
+		$0
+	});
+
+snippet aft "after each (js)"
+	afterEach(function() {
+		$0
+	});
+
+snippet befa "before all (js)"
+	beforeAll(function() {
+		$0
+	});
+
+snippet afta "after all (js)"
+	afterAll(function() {
+		$0
+	});
+
+snippet any "any (js)"
+	jasmine.any($1)
+
+snippet anyt "anything (js)"
+	jasmine.anything()
+
+snippet objc "object containing (js)"
+	jasmine.objectContaining({
+		${VISUAL}$0
+	});
+
+snippet arrc "array containing (js)"
+	jasmine.arrayContaining([${1:value1}]);
+
+snippet strm "string matching (js)"
+	jasmine.stringMatching("${1:matcher}")
+
+snippet ru "runs (js)"
+	runs(function() {
+		$0
+	});
+
+snippet wa "waits (js)"
+	waits($1);
+
+snippet ex "expect (js)"
+	expect(${1:target})$0;
+
+snippet ee "expect to equal (js)"
+	expect(${1:target}).toEqual(${2:value});
+
+snippet el "expect to be less than (js)"
+	expect(${1:target}).toBeLessThan(${2:value});
+
+snippet eg "expect to be greater than (js)"
+	expect(${1:target}).toBeGreaterThan(${2:value});
+
+snippet eb "expect to be (js)"
+	expect(${1:target}).toBe(${2:value});
+
+snippet em "expect to match (js)"
+	expect(${1:target}).toMatch(${2:pattern});
+
+snippet eha "expect to have attribute (js)"
+	expect(${1:target}).toHaveAttr('${2:attr}'${3:, '${4:value}'});
+
+snippet et "expect to be truthy (js)"
+	expect(${1:target}).toBeTruthy();
+
+snippet ef "expect to be falsy (js)"
+	expect(${1:target}).toBeFalsy();
+
+snippet ed "expect to be defined (js)"
+	expect(${1:target}).toBeDefined();
+
+snippet eud "expect to be defined (js)"
+	expect(${1:target}).toBeUndefined();
+
+snippet en "expect to be null (js)"
+	expect(${1:target}).toBeNull();
+
+snippet ec "expect to contain (js)"
+	expect(${1:target}).toContain(${2:value});
+
+snippet ev "expect to be visible (js)"
+	expect(${1:target}).toBeVisible();
+
+snippet eh "expect to be hidden (js)"
+	expect(${1:target}).toBeHidden();
+
+snippet eth "expect to throw (js)"
+	expect(${1:target}).toThrow(${2:value});
+
+snippet ethe "expect to throw error (js)"
+	expect(${1:target}).toThrowError(${2:value});
+
+snippet notx "expect not (js)"
+	expect(${1:target}).not$0;
+
+snippet note "expect not to equal (js)"
+	expect(${1:target}).not.toEqual(${2:value});
+
+snippet notl "expect to not be less than (js)"
+	expect(${1:target}).not.toBeLessThan(${2:value});
+
+snippet notg "expect to not be greater than (js)"
+	expect(${1:target}).not.toBeGreaterThan(${2:value});
+
+snippet notm "expect not to match (js)"
+	expect(${1:target}).not.toMatch(${2:pattern});
+
+snippet notha "expect to not have attribute (js)"
+	expect(${1:target}).not.toHaveAttr('${2:attr}'${3:, '${4:value}'});
+
+snippet nott "expect not to be truthy (js)"
+	expect(${1:target}).not.toBeTruthy();
+
+snippet notf "expect not to be falsy (js)"
+	expect(${1:target}).not.toBeFalsy();
+
+snippet notd "expect not to be defined (js)"
+	expect(${1:target}).not.toBeDefined();
+
+snippet notn "expect not to be null (js)"
+	expect(${1:target}).not.toBeNull();
+
+snippet notc "expect not to contain (js)"
+	expect(${1:target}).not.toContain(${2:value});
+
+snippet notv "expect not to be visible (js)"
+	expect(${1:target}).not.toBeVisible();
+
+snippet noth "expect not to be hidden (js)"
+	expect(${1:target}).not.toBeHidden();
+
+snippet notth "expect not to throw (js)"
+	expect(${1:target}).not.toThrow(${2:value});
+
+snippet notthe "expect not to throw error (js)"
+	expect(${1:target}).not.toThrowError(${2:value});
+
+snippet s "spy on (js)"
+	spyOn(${1:object}, '${2:method}')$0;
+
+snippet sr "spy on and return (js)"
+	spyOn(${1:object}, '${2:method}').and.returnValue(${3:arguments});
+
+snippet st "spy on and throw (js)"
+	spyOn(${1:object}, '${2:method}').and.throwError(${3:exception});
+
+snippet sct "spy on and call through (js)"
+	spyOn(${1:object}, '${2:method}').and.callThrough();
+
+snippet scf "spy on and call fake (js)"
+	spyOn(${1:object}, '${2:method}').and.callFake(${3:function});
+
+snippet ethbc "expect to have been called (js)"
+	expect(${1:target}).toHaveBeenCalled();
+
+snippet nthbc "expect not to have been called (js)"
+	expect(${1:target}).not.toHaveBeenCalled();
+
+snippet ethbcw "expect to have been called with (js)"
+	expect(${1:target}).toHaveBeenCalledWith(${2:arguments});
+
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript-jquery.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript-jquery.snippets
new file mode 100644
index 0000000..ef6f66c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript-jquery.snippets
@@ -0,0 +1,589 @@
+snippet add
+	${1:obj}.add('${2:selector expression}')
+snippet addClass
+	${1:obj}.addClass('${2:class name}')
+snippet after
+	${1:obj}.after('${2:Some text <b>and bold!</b>}')
+snippet ajax
+	$.ajax({
+		url: '${1:mydomain.com/url}',
+		type: '${2:POST}',
+		dataType: '${3:xml/html/script/json}',
+		data: $.param( $('${4:Element or Expression}') ),
+		complete: function (jqXHR, textStatus) {
+			${5:// callback}
+		},
+		success: function (data, textStatus, jqXHR) {
+			${6:// success callback}
+		},
+		error: function (jqXHR, textStatus, errorThrown) {
+			${0:// error callback}
+		}
+	});
+snippet ajaxcomplete
+	${1:obj}.ajaxComplete(function (${1:e}, xhr, settings) {
+		${0:// callback}
+	});
+snippet ajaxerror
+	${1:obj}.ajaxError(function (${1:e}, xhr, settings, thrownError) {
+		${2:// error callback}
+	});
+	${0}
+snippet ajaxget
+	$.get('${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		function (data, textStatus, jqXHR) {
+			${0:// success callback}
+		}
+	);
+snippet ajaxpost
+	$.post('${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		function (data, textStatus, jqXHR) {
+			${0:// success callback}
+		}
+	);
+snippet ajaxprefilter
+	$.ajaxPrefilter(function (${1:options}, ${2:originalOptions}, jqXHR) {
+		${0: // Modify options, control originalOptions, store jqXHR, etc}
+	});
+snippet ajaxsend
+	${1:obj}.ajaxSend(function (${1:request, settings}) {
+		${2:// error callback}
+	});
+	${0}
+snippet ajaxsetup
+	$.ajaxSetup({
+		url: "${1:mydomain.com/url}",
+		type: "${2:POST}",
+		dataType: "${3:xml/html/script/json}",
+		data: $.param( $("${4:Element or Expression}") ),
+		complete: function (jqXHR, textStatus) {
+			${5:// callback}
+		},
+		success: function (data, textStatus, jqXHR) {
+			${6:// success callback}
+		},
+		error: function (jqXHR, textStatus, errorThrown) {
+			${0:// error callback}
+		}
+	});
+snippet ajaxstart
+	$.ajaxStart(function () {
+		${1:// handler for when an AJAX call is started and no other AJAX calls are in progress};
+	});
+	${0}
+snippet ajaxstop
+	$.ajaxStop(function () {
+		${1:// handler for when all AJAX calls have been completed};
+	});
+	${0}
+snippet ajaxsuccess
+	$.ajaxSuccess(function (${1:e}, xhr, settings) {
+		${2:// handler for when any AJAX call is successfully completed};
+	});
+	${0}
+snippet andself
+	${1:obj}.andSelf()
+snippet animate
+	${1:obj}.animate({${2:param1: value1, param2: value2}}, ${3:speed})
+snippet append
+	${1:obj}.append('${2:Some text <b>and bold!</b>}')
+snippet appendTo
+	${1:obj}.appendTo('${2:selector expression}')
+snippet attr
+	${1:obj}.attr('${2:attribute}', '${3:value}')
+snippet attrm
+	${1:obj}.attr({'${2:attr1}': '${3:value1}', '${4:attr2}': '${5:value2}'})
+snippet before
+	${1:obj}.before('${2:Some text <b>and bold!</b>}')
+snippet bind
+	${1:obj}.bind('${2:event name}', function (${3:e}) {
+		${0:// event handler}
+	});
+snippet blur
+	${1:obj}.blur(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet C
+	$.Callbacks()
+snippet Cadd
+	${1:callbacks}.add(${2:callbacks})
+snippet Cdis
+	${1:callbacks}.disable()
+snippet Cempty
+	${1:callbacks}.empty()
+snippet Cfire
+	${1:callbacks}.fire(${2:args})
+snippet Cfired
+	${1:callbacks}.fired()
+snippet Cfirew
+	${1:callbacks}.fireWith(${2:this}, ${3:args})
+snippet Chas
+	${1:callbacks}.has(${2:callback})
+snippet Clock
+	${1:callbacks}.lock()
+snippet Clocked
+	${1:callbacks}.locked()
+snippet Crem
+	${1:callbacks}.remove(${2:callbacks})
+snippet change
+	${1:obj}.change(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet children
+	${1:obj}.children('${2:selector expression}')
+snippet clearq
+	${1:obj}.clearQueue(${2:'queue name'})
+snippet click
+	${1:obj}.click(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet clone
+	${1:obj}.clone()
+snippet contains
+	$.contains(${1:container}, ${0:contents});
+snippet css
+	${1:obj}.css('${2:attribute}', '${3:value}')
+snippet csshooks
+	$.cssHooks['${1:CSS prop}'] = {
+		get: function (elem, computed, extra) {
+			${2: // handle getting the CSS property}
+		},
+		set: function (elem, value) {
+			${0: // handle setting the CSS value}
+		}
+	};
+snippet cssm
+	${1:obj}.css({${2:attribute1}: '${3:value1}', ${4:attribute2}: '${5:value2}'})
+snippet D
+	$.Deferred()
+snippet Dalways
+	${1:deferred}.always(${2:callbacks})
+snippet Ddone
+	${1:deferred}.done(${2:callbacks})
+snippet Dfail
+	${1:deferred}.fail(${2:callbacks})
+snippet Disrej
+	${1:deferred}.isRejected()
+snippet Disres
+	${1:deferred}.isResolved()
+snippet Dnotify
+	${1:deferred}.notify(${2:args})
+snippet Dnotifyw
+	${1:deferred}.notifyWith(${2:this}, ${3:args})
+snippet Dpipe
+	${1:deferred}.then(${2:doneFilter}, ${3:failFilter}, ${4:progressFilter})
+snippet Dprog
+	${1:deferred}.progress(${2:callbacks})
+snippet Dprom
+	${1:deferred}.promise(${2:target})
+snippet Drej
+	${1:deferred}.reject(${2:args})
+snippet Drejw
+	${1:deferred}.rejectWith(${2:this}, ${3:args})
+snippet Dres
+	${1:deferred}.resolve(${2:args})
+snippet Dresw
+	${1:deferred}.resolveWith(${2:this}, ${3:args})
+snippet Dstate
+	${1:deferred}.state()
+snippet Dthen
+	${1:deferred}.then(${2:doneCallbacks}, ${3:failCallbacks}, ${4:progressCallbacks})
+snippet Dwhen
+	$.when(${1:deferreds})
+snippet data
+	${1:obj}.data(${2:obj})
+snippet dataa
+	$.data('${1:selector expression}', '${2:key}'${3:, 'value'})
+snippet dblclick
+	${1:obj}.dblclick(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet delay
+	${1:obj}.delay('${2:slow/400/fast}'${3:, 'queue name'})
+snippet dele
+	${1:obj}.delegate('${2:selector expression}', '${3:event name}', function (${4:e}) {
+		${0:// event handler}
+	});
+snippet deq
+	${1:obj}.dequeue(${2:'queue name'})
+snippet deqq
+	$.dequeue('${1:selector expression}'${2:, 'queue name'})
+snippet detach
+	${1:obj}.detach('${2:selector expression}')
+snippet die
+	${1:obj}.die(${2:event}, ${3:handler})
+snippet each
+	${1:obj}.each(function (index) {
+		${0:this.innerHTML = this + " is the element, " + index + " is the position";}
+	});
+snippet el
+	$('<${1}/>'${2:, {}})
+snippet eltrim
+	$.trim('${1:string}')
+snippet empty
+	${1:obj}.empty()
+snippet end
+	${1:obj}.end()
+snippet eq
+	${1:obj}.eq(${2:element index})
+snippet error
+	${1:obj}.error(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet eventsmap
+	{
+		:f${0}
+	}
+snippet extend
+	$.extend(${1:true, }${2:target}, ${3:obj})
+snippet fadein
+	${1:obj}.fadeIn('${2:slow/400/fast}')
+snippet fadeinc
+	${1:obj}.fadeIn('slow/400/fast', function () {
+		${0:// callback};
+	});
+snippet fadeout
+	${1:obj}.fadeOut('${2:slow/400/fast}')
+snippet fadeoutc
+	${1:obj}.fadeOut('slow/400/fast', function () {
+		${0:// callback};
+	});
+snippet fadeto
+	${1:obj}.fadeTo('${2:slow/400/fast}', ${3:0.5})
+snippet fadetoc
+	${1:obj}.fadeTo('slow/400/fast', ${2:0.5}, function () {
+		${0:// callback};
+	});
+snippet filter
+	${1:obj}.filter('${2:selector expression}')
+snippet filtert
+	${1:obj}.filter(function (${2:index}) {
+		${3}
+	})
+snippet find
+	${1:obj}.find('${2:selector expression}')
+snippet focus
+	${1:obj}.focus(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet focusin
+	${1:obj}.focusIn(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet focusout
+	${1:obj}.focusOut(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet get
+	${1:obj}.get(${2:element index})
+snippet getjson
+	$.getJSON('${1:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		function (data, textStatus, jqXHR) {
+			${0:// success callback}
+		}
+	);
+snippet getscript
+	$.getScript('${1:mydomain.com/url}', function (script, textStatus, jqXHR) {
+		${0:// callback}
+	});
+snippet grep
+	$.grep(${1:array}, function (item, index) {
+		${2}
+	}${0:, true});
+snippet hasc
+	${1:obj}.hasClass('${2:className}')
+snippet hasd
+	$.hasData('${0:selector expression}');
+snippet height
+	${1:obj}.height(${2:integer})
+snippet hide
+	${1:obj}.hide('${2:slow/400/fast}')
+snippet hidec
+	${1:obj}.hide('${2:slow/400/fast}', function () {
+		${0:// callback}
+	});
+snippet hover
+	${1:obj}.hover(function (${2:e}) {
+		${3:// event handler}
+	}, function ($2) {
+		${4:// event handler}
+	});
+snippet html
+	${1:obj}.html('${2:Some text <b>and bold!</b>}')
+snippet inarr
+	$.inArray(${1:value}, ${0:array});
+snippet insa
+	${1:obj}.insertAfter('${2:selector expression}')
+snippet insb
+	${1:obj}.insertBefore('${2:selector expression}')
+snippet is
+	${1:obj}.is('${2:selector expression}')
+snippet isarr
+	$.isArray(${1:obj})
+snippet isempty
+	$.isEmptyObject(${1:obj})
+snippet isfunc
+	$.isFunction(${1:obj})
+snippet isnum
+	$.isNumeric(${1:value})
+snippet isobj
+	$.isPlainObject(${1:obj})
+snippet iswin
+	$.isWindow(${1:obj})
+snippet isxml
+	$.isXMLDoc(${1:node})
+snippet jj
+	$('${1:selector}')
+snippet kdown
+	${1:obj}.keydown(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet kpress
+	${1:obj}.keypress(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet kup
+	${1:obj}.keyup(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet last
+	${1:obj}.last('${1:selector expression}')
+snippet live
+	${1:obj}.live('${2:events}', function (${3:e}) {
+		${0:// event handler}
+	});
+snippet load
+	${1:obj}.load(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet loadf
+	${1:obj}.load('${2:mydomain.com/url}',
+		${2:{ param1: value1 },}
+		function (responseText, textStatus, xhr) {
+			${0:// success callback}
+		}
+	});
+snippet makearray
+	$.makeArray(${0:obj});
+snippet map
+	${1:obj}.map(function (${2:index}, ${3:element}) {
+		${0:// callback}
+	});
+snippet mapp
+	$.map(${1:arrayOrObject}, function (${2:value}, ${3:indexOrKey}) {
+		${0:// callback}
+	});
+snippet merge
+	$.merge(${1:target}, ${0:original});
+snippet mdown
+	${1:obj}.mousedown(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet menter
+	${1:obj}.mouseenter(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet mleave
+	${1:obj}.mouseleave(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet mmove
+	${1:obj}.mousemove(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet mout
+	${1:obj}.mouseout(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet mover
+	${1:obj}.mouseover(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet mup
+	${1:obj}.mouseup(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet next
+	${1:obj}.next('${2:selector expression}')
+snippet nexta
+	${1:obj}.nextAll('${2:selector expression}')
+snippet nextu
+	${1:obj}.nextUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet not
+	${1:obj}.not('${2:selector expression}')
+snippet off
+	${1:obj}.off('${2:events}', '${3:selector expression}'${4:, handler})
+snippet offset
+	${1:obj}.offset()
+snippet offsetp
+	${1:obj}.offsetParent()
+snippet on
+	${1:obj}.on('${2:events}', '${3:selector expression}', function (${4:e}) {
+		${0:// event handler}
+	});
+snippet one
+	${1:obj}.one('${2:event name}', function (${3:e}) {
+		${0:// event handler}
+	});
+snippet outerh
+	${1:obj}.outerHeight()
+snippet outerw
+	${1:obj}.outerWidth()
+snippet param
+	$.param(${1:obj})
+snippet parent
+	${1:obj}.parent('${2:selector expression}')
+snippet parents
+	${1:obj}.parents('${2:selector expression}')
+snippet parentsu
+	${1:obj}.parentsUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet parsejson
+	$.parseJSON(${1:data})
+snippet parsexml
+	$.parseXML(${1:data})
+snippet pos
+	${1:obj}.position()
+snippet prepend
+	${1:obj}.prepend('${2:Some text <b>and bold!</b>}')
+snippet prependto
+	${1:obj}.prependTo('${2:selector expression}')
+snippet prev
+	${1:obj}.prev('${2:selector expression}')
+snippet preva
+	${1:obj}.prevAll('${2:selector expression}')
+snippet prevu
+	${1:obj}.prevUntil('${2:selector expression}'${3:, 'filter expression'})
+snippet promise
+	${1:obj}.promise(${2:'fx'}, ${3:target})
+snippet prop
+	${1:obj}.prop('${2:property name}')
+snippet proxy
+	$.proxy(${1:function}, ${2:this})
+snippet pushstack
+	${1:obj}.pushStack(${2:elements})
+snippet queue
+	${1:obj}.queue(${2:name}${3:, newQueue})
+snippet queuee
+	$.queue(${1:element}${2:, name}${3:, newQueue})
+snippet ready
+	$(function () {
+		${0}
+	});
+snippet rem
+	${1:obj}.remove()
+snippet rema
+	${1:obj}.removeAttr('${2:attribute name}')
+snippet remc
+	${1:obj}.removeClass('${2:class name}')
+snippet remd
+	${1:obj}.removeData('${2:key name}')
+snippet remdd
+	$.removeData(${1:element}${2:, 'key name}')
+snippet remp
+	${1:obj}.removeProp('${2:property name}')
+snippet repa
+	${1:obj}.replaceAll(${2:target})
+snippet repw
+	${1:obj}.replaceWith(${2:content})
+snippet reset
+	${1:obj}.reset(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet resize
+	${1:obj}.resize(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet scroll
+	${1:obj}.scroll(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet scrolll
+	${1:obj}.scrollLeft(${2:value})
+snippet scrollt
+	${1:obj}.scrollTop(${2:value})
+snippet sdown
+	${1:obj}.slideDown('${2:slow/400/fast}')
+snippet sdownc
+	${1:obj}.slideDown('${2:slow/400/fast}', function () {
+		${0:// callback};
+	});
+snippet select
+	${1:obj}.select(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet serialize
+	${1:obj}.serialize()
+snippet serializea
+	${1:obj}.serializeArray()
+snippet show
+	${1:obj}.show('${2:slow/400/fast}')
+snippet showc
+	${1:obj}.show('${2:slow/400/fast}', function () {
+		${0:// callback}
+	});
+snippet sib
+	${1:obj}.siblings('${2:selector expression}')
+snippet size
+	${1:obj}.size()
+snippet slice
+	${1:obj}.slice(${2:start}${3:, end})
+snippet stoggle
+	${1:obj}.slideToggle('${2:slow/400/fast}')
+snippet stop
+	${1:obj}.stop('${2:queue}', ${3:false}, ${4:false})
+snippet submit
+	${1:obj}.submit(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet sup
+	${1:obj}.slideUp('${2:slow/400/fast}')
+snippet supc
+	${1:obj}.slideUp('${2:slow/400/fast}', function () {
+		${0:// callback};
+	});
+snippet text
+	${1:obj}.text(${2:'some text'})
+snippet this
+	$(this)
+snippet toarr
+	${0:obj}.toArray()
+snippet tog
+	${1:obj}.toggle(function (${2:e}) {
+		${3:// event handler}
+	}, function ($2) {
+		${4:// event handler}
+	});
+	${0}
+snippet togclass
+	${1:obj}.toggleClass('${2:class name}')
+snippet togsh
+	${1:obj}.toggle('${2:slow/400/fast}')
+snippet trig
+	${1:obj}.trigger('${2:event name}')
+snippet trigh
+	${1:obj}.triggerHandler('${2:event name}')
+snippet $trim
+	$.trim(${1:str})
+snippet $type
+	$.type(${1:obj})
+snippet unbind
+	${1:obj}.unbind('${2:event name}')
+snippet undele
+	${1:obj}.undelegate(${2:selector expression}, ${3:event}, ${4:handler})
+snippet uniq
+	$.unique(${1:array})
+snippet unload
+	${1:obj}.unload(function (${2:e}) {
+		${0:// event handler}
+	});
+snippet unwrap
+	${1:obj}.unwrap()
+snippet val
+	${1:obj}.val('${2:text}')
+snippet width
+	${1:obj}.width(${2:integer})
+snippet wrap
+	${1:obj}.wrap('${2:&lt;div class="extra-wrapper"&gt;&lt;/div&gt;}')
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript-react.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript-react.snippets
new file mode 100644
index 0000000..9deae79
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript-react.snippets
@@ -0,0 +1,83 @@
+snippet ir
+	import React from 'react';
+snippet ird
+	import ReactDOM from 'react-dom';
+snippet cdm
+	componentDidMount() {
+		${1}
+	}
+snippet cdup
+	componentDidUpdate(prevProps, prevState) {
+		${1}
+	}
+snippet cwm
+	componentWillMount() {
+		${1}
+	}
+snippet cwr
+	componentWillReceiveProps(nextProps) {
+		${1}
+	}
+snippet cwun
+	componentWillUnmount() {
+		${1}
+	}
+snippet cwu
+	componentWillUpdate(nextProps, nextState) {
+		${1}
+	}
+snippet fup
+	forceUpdate(${1:callback});
+snippet dp
+	static defaultProps = {
+		${1}: ${2},
+	}
+snippet st
+	state = {
+		${1}: ${2},
+	}
+snippet pt
+	static propTypes = {
+		${1}: React.PropTypes.${2:type},
+	}
+snippet rcc
+	class ${1:ClassName} extends React.Component {
+		render() {
+			return (
+				${0:<div />}
+			);
+		}
+	}
+snippet rdr
+	ReactDOM.render(${1}, ${2})
+snippet ercc
+	export default class ${1:ClassName} extends React.Component {
+		render() {
+			return (
+				${0:<div />}
+			);
+		}
+	}
+snippet ctor
+	constructor() {
+		super();
+		${1}
+	}
+snippet ren
+	render() {
+		return (
+			${1:<div />}
+		);
+	}
+snippet sst
+	this.setState({
+		${1}: ${2}
+	});
+snippet scu
+	shouldComponentUpdate(nextProps, nextState) {
+		${1}
+	}
+snippet prp i
+	this.props.${1}
+snippet ste i
+	this.state.${1}
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript-requirejs.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript-requirejs.snippets
new file mode 100644
index 0000000..8e72ada
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript-requirejs.snippets
@@ -0,0 +1,14 @@
+snippet def
+	define(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});
+
+snippet defn
+	define("${1:#name}", ["${2:#dependencies1}"], function (${3:#dependencies2}) {
+		return ${0:TARGET};
+	});
+
+snippet reqjs
+	require(["${1:#dependencies1}"], function (${2:#dependencies2}) {
+		return ${0:TARGET};
+	});
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript.es6.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript.es6.snippets
new file mode 100644
index 0000000..7e885e6
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript.es6.snippets
@@ -0,0 +1,55 @@
+snippet const
+	const ${1} = ${0};
+snippet let
+	let ${1} = ${0};
+snippet im "import xyz from 'xyz'"
+	import ${1} from '${2:$1}';
+snippet imas "import * as xyz from 'xyz'"
+	import * as ${1} from '${2:$1}';
+snippet imm "import { member } from 'xyz'"
+	import { ${1} } from '${2}';
+snippet cla
+	class ${1} {
+		${0:${VISUAL}}
+	}
+snippet clax
+	class ${1} extends ${2} {
+		${0:${VISUAL}}
+	}
+snippet clac
+	class ${1} {
+		constructor(${2}) {
+			${0:${VISUAL}}
+		}
+	}
+snippet foro "for (const prop of object}) { ... }"
+	for (const ${1:prop} of ${2:object}) {
+		${0:$1}
+	}
+# Generator
+snippet fun*
+	function* ${1:function_name}(${2}) {
+		${0:${VISUAL}}
+	}
+snippet c=>
+	const ${1:function_name} = (${2}) => {
+		${0:${VISUAL}}
+	}
+snippet caf
+	const ${1:function_name} = (${2}) => {
+		${0:${VISUAL}}
+	}
+snippet =>
+	(${1}) => {
+		${0:${VISUAL}}
+	}
+snippet af
+	(${1}) => {
+		${0:${VISUAL}}
+	}
+snippet sym
+	const ${1} = Symbol('${0}');
+snippet ed
+	export default ${0}
+snippet ${
+	${${1}}${0}
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript.node.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript.node.snippets
new file mode 100644
index 0000000..489e0ab
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript.node.snippets
@@ -0,0 +1,51 @@
+snippet #!
+	#!/usr/bin/env node
+# module exports
+snippet ex
+	module.exports = ${1};
+# require
+snippet re
+	${1:const} ${2} = require('${3:module_name}');
+# EventEmitter
+snippet on
+	on('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+snippet emit
+	emit('${1:event_name}', ${2:args});
+snippet once
+	once('${1:event_name}', function(${2:stream}) {
+	  ${3}
+	});
+# http. User js function snippet as handler
+snippet http
+	http.createServer(${1:handler}).listen(${2:port_number});
+# net 
+snippet net
+	net.createServer(function(${1:socket}){
+		${1}.on('data', function('data'){
+		  ${2}
+		]});
+		${1}.on('end', function(){
+		  ${3}
+		});
+	}).listen(${4:8124});
+# Stream snippets
+snippet pipe
+	pipe(${1:stream})${2}
+# Express snippets
+snippet eget
+	${1:app}.get('${2:route}', ${3:handler});
+snippet epost
+	${1:app}.post('${2:route}', ${3:handler});
+snippet eput
+	${1:app}.put('${2:route}', ${3:handler});
+snippet edel
+	${1:app}.delete('${2:route}', ${3:handler});
+# process snippets
+snippet stdin
+	process.stdin
+snippet stdout
+	process.stdout
+snippet stderr
+	process.stderr
diff --git a/vim/snippets/vim-snippets/snippets/javascript/javascript.snippets b/vim/snippets/vim-snippets/snippets/javascript/javascript.snippets
new file mode 100644
index 0000000..df0669b
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/javascript/javascript.snippets
@@ -0,0 +1,281 @@
+# Functions
+# prototype
+snippet proto
+	${1:class_name}.prototype.${2:method_name} = function(${3}) {
+		${0:${VISUAL}}
+	};
+# Function
+snippet fun
+	function ${1:function_name}(${2}) {
+		${0:${VISUAL}}
+	}
+# Anonymous Function
+snippet f "" w
+	function(${1}) {
+		${0:${VISUAL}}
+	}
+# Anonymous Function assigned to variable
+snippet vaf
+	var ${1:function_name} = function(${2}) {
+		${0:${VISUAL}}
+	};
+# Function assigned to variable
+snippet vf
+	var ${1:function_name} = function $1(${2}) {
+		${0:${VISUAL}}
+	};
+# Immediate function
+snippet (f
+	(function(${1}) {
+		${0:${VISUAL}}
+	}(${2}));
+# Minify safe iife
+snippet ;fe
+	;(function(${1}) {
+		${0:${VISUAL}}
+	}(${2}))
+# self-defining function
+snippet sdf
+	var ${1:function_name} = function (${2:argument}) {
+		${3}
+
+		$1 = function ($2) {
+			${0:${VISUAL}}
+		};
+	};
+# Flow control
+# if
+snippet if "if (condition) { ... }"
+	if (${1:true}) {
+		${0:${VISUAL}}
+	}
+# if ... else
+snippet ife "if (condition) { ... } else { ... }"
+	if (${1:true}) {
+		${0:${VISUAL}}
+	} else {
+		${2}
+	}
+# tertiary conditional
+snippet ter
+	${1:/* condition */} ? ${2:/* if true */} : ${0:/* if false */}
+# switch
+snippet switch
+	switch (${1:expression}) {
+		case '${3:case}':
+			${4}
+			break;
+		${0}
+		default:
+			${2}
+	}
+snippet case "case 'xyz': ... break"
+	case '${1:case}':
+		${0:${VISUAL}}
+		break;
+snippet try "try { ... } catch(e) { ... }"
+	try {
+		${0:${VISUAL}}
+	} catch (${1:e}) {
+		${2:/* handle error */}
+	}
+snippet tryf "try { ... } catch(e) { ... } finally { ... }"
+	try {
+		${0:${VISUAL}}
+	} catch (${1:e}) {
+		${2:/* handle error */}
+	} finally {
+		${3:/* be executed regardless of the try / catch result*/}
+	}
+# throw Error
+snippet terr
+	throw new Error('${1:error message}')
+# return
+snippet ret
+	return ${0:result};
+snippet for "for (...) {...}"
+	for (var ${1:i} = 0, ${2:len} = ${3:Things.length}; $1 < $2; $1++) {
+		${0:${VISUAL}}
+	}
+snippet forr "reversed for (...) {...}"
+	for (var ${2:i} = ${1:Things.length} - 1; $2 >= 0; $2--) {
+		${0:${VISUAL}}
+	}
+snippet wh "(condition) { ... }"
+	while (${1:/* condition */}) {
+		${0:${VISUAL}}
+	}
+snippet do "do { ... } while (condition)"
+	do {
+		${0:${VISUAL}}
+	} while (${1:/* condition */});
+# For in loop
+snippet fori
+	for (var ${1:prop} in ${2:object}) {
+		${0:$2[$1]}
+	}
+# Objects
+# Object Method
+snippet :f
+	${1:method_name}: function (${2:attribute}) {
+		${0:${VISUAL}}
+	},
+# hasOwnProperty
+snippet has
+	hasOwnProperty(${0})
+# singleton
+snippet sing
+	function ${1:Singleton} (${2:argument}) {
+		// the cached instance
+		var instance;
+
+		// rewrite the constructor
+		$1 = function $1($2) {
+			return instance;
+		};
+
+		// carry over the prototype properties
+		$1.prototype = this;
+
+		// the instance
+		instance = new $1();
+
+		// reset the constructor pointer
+		instance.constructor = $1;
+
+		${0}
+
+		return instance;
+	}
+# Crockford's object function
+snippet obj
+	function object(o) {
+		function F() {}
+		F.prototype = o;
+		return new F();
+	}
+# Define multiple properties
+snippet props
+	var ${1:my_object} = Object.defineProperties(
+		${2:new Object()},
+		{
+			${3:property} : {
+				get : function $1_$3_getter() {
+					// getter code
+				},
+				set : function $1_$3_setter(value) {
+					// setter code
+				},
+				value        : ${4:value},
+				writeable    : ${5:boolean},
+				enumerable   : ${6:boolean},
+				configurable : ${0:boolean}
+			}
+		}
+	);
+# Define single property
+snippet prop
+	Object.defineProperty(
+		${1:object},
+		'${2:property}',
+		{
+			get : function $1_$2_getter() {
+				// getter code
+			},
+			set : function $1_$2_setter(value) {
+				// setter code
+			},
+			value        : ${3:value},
+			writeable    : ${4:boolean},
+			enumerable   : ${5:boolean},
+			configurable : ${0:boolean}
+		}
+	);
+# Documentation
+# docstring
+snippet /**
+	/**
+	 * ${0:description}
+	 *
+	 */
+snippet @par
+	@param {${1:type}} ${2:name} ${0:description}
+snippet @ret
+	@return {${1:type}} ${0:description}
+# JSON
+
+# JSON.parse
+snippet jsonp
+	JSON.parse(${0:jstr});
+# JSON.stringify
+snippet jsons
+	JSON.stringify(${0:object});
+# DOM selectors
+# Get elements
+snippet get
+	getElementsBy${1:TagName}('${0}')
+# Get element
+snippet gett
+	getElementBy${1:Id}('${0}')
+# Elements by class
+snippet by.
+	${1:document}.getElementsByClassName('${0:class}')
+# Element by ID
+snippet by#
+	${1:document}.getElementById('${0:element ID}')
+# Query selector
+snippet qs
+	${1:document}.querySelector('${0:CSS selector}')
+# Query selector all
+snippet qsa
+	${1:document}.querySelectorAll('${0:CSS selector}')
+# Debugging
+snippet de
+	debugger;
+snippet cl "console.log"
+	console.log(${0});
+snippet cd "console.debug"
+	console.debug(${0});
+snippet ce "console.error"
+	console.error(${0});
+snippet cw "console.warn"
+	console.warn(${0});
+snippet ci "console.info"
+	console.info(${0});
+snippet ct "console.trace"
+	console.trace(${0:label});
+snippet ctime "console.time ... console.timeEnd"
+	console.time("${1:label}");
+	${0:${VISUAL}}
+	console.timeEnd("$1");
+snippet ctimestamp "console.timeStamp"
+	console.timeStamp("${1:label}");
+snippet ca "console.assert"
+	console.assert(${1:expression}, ${0:obj});
+snippet cclear "console.clear"
+	console.clear();
+snippet cdir "console.dir"
+	console.dir(${0:obj});
+snippet cdirx "console.dirxml"
+	console.dirxml(${1:object});
+snippet cgroup "console.group"
+	console.group("${1:label}");
+	${0:${VISUAL}}
+	console.groupEnd();
+snippet cgroupc "console.groupCollapsed"
+	console.groupCollapsed("${1:label}");
+	${0:${VISUAL}}
+	console.groupEnd();
+snippet cprof "console.profile"
+	console.profile("${1:label}");
+	${0:${VISUAL}}
+	console.profileEnd();
+snippet ctable "console.table"
+	console.table(${1:"${2:value}"});
+# Misc
+# 'use strict';
+snippet us
+	'use strict';
+# setTimeout function
+snippet timeout
+	setTimeout(function () {${0}}${2}, ${1:10});
diff --git a/vim/snippets/vim-snippets/snippets/jinja.snippets b/vim/snippets/vim-snippets/snippets/jinja.snippets
new file mode 100644
index 0000000..a6f274a
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/jinja.snippets
@@ -0,0 +1,142 @@
+# Generic tags
+
+extends html
+
+snippet %
+	{% ${1} %}
+snippet %%
+	{% ${1:tag_name} %}
+	${0}
+	{% end$1 %}
+snippet {
+	{{ ${1} }}
+# Template Tags
+
+snippet autoescape
+	{% autoescape ${1:off} %}
+		${0}
+	{% endautoescape %}
+snippet block
+	{% block ${1} %}
+		${0}
+	{% endblock %}
+snippet #
+	{# ${0:comment} #}
+snippet comment
+	{% comment %}
+		${0}
+	{% endcomment %}
+snippet cycle
+	{% cycle ${1:val1} ${2:val2} ${3:as ${4}} %}
+snippet debug
+	{% debug %}
+snippet extends
+	{% extends "${0:base.html}" %}
+snippet filter
+	{% filter ${1} %}
+		${0}
+	{% endfilter %}
+snippet firstof
+	{% firstof ${1} %}
+snippet for
+	{% for ${1} in ${2} %}
+		${0}
+	{% endfor %}
+snippet empty
+	{% empty %}
+	${0}
+snippet if
+	{% if ${1} %}
+		${0}
+	{% endif %}
+snippet el
+	{% else %}
+		${1}
+snippet eif
+	{% elif ${1} %}
+		${0}
+snippet ifchanged
+	{% ifchanged %}${1}{% endifchanged %}
+snippet ifequal
+	{% ifequal ${1} ${2} %}
+		${0}
+	{% endifequal %}
+snippet ifnotequal
+	{% ifnotequal ${1} ${2} %}
+		${0}
+	{% endifnotequal %}
+snippet include
+	{% include "${0}" %}
+snippet load
+	{% load ${0} %}
+snippet now
+	{% now "${0:jS F Y H:i}" %}
+snippet regroup
+	{% regroup ${1} by ${2} as ${0} %}
+snippet spaceless
+	{% spaceless %}${0}{% endspaceless %}
+snippet ssi
+	{% ssi ${0} %}
+snippet trans
+	{% trans %}${0}{% endtrans %}
+snippet url
+	{% url ${1} as ${0} %}
+snippet widthratio
+	{% widthratio ${1:this_value} ${2:max_value} ${0:100} %}
+snippet with
+	{% with ${1} as ${2} %}
+		${0}
+	{% endwith %}
+
+# Template Filters
+
+# Note: Since SnipMate can't determine which template filter you are
+# expanding without the "|" character, these do not add the "|"
+# character.  These save a few keystrokes still.
+
+# Note: Template tags that take no arguments are not implemented.
+
+snippet add
+	add:"${0}"
+snippet center
+	center:"${0}"
+snippet cut
+	cut:"${0}"
+snippet date
+	date:"${0}"
+snippet default
+	default:"${0}"
+snippet defaultifnone
+	default_if_none:"${0}"
+snippet dictsort
+	dictsort:"${0}"
+snippet dictsortrev
+	dictsortreversed:"${0}"
+snippet divisibleby
+	divisibleby:"${0}"
+snippet floatformat
+	floatformat:"${0}"
+snippet getdigit
+	get_digit:"${0}"
+snippet join
+	join:"${0}"
+snippet lengthis
+	length_is:"${0}"
+snippet pluralize
+	pluralize:"${0}"
+snippet removetags
+	removetags:"${0}"
+snippet slice
+	slice:"${0}"
+snippet stringformat
+	stringformat:"${0}"
+snippet time
+	time:"${0}"
+snippet truncatewords
+	truncatewords:${0}
+snippet truncatewordshtml
+	truncatewords_html:${0}
+snippet urlizetrunc
+	urlizetrunc:${0}
+snippet wordwrap
+	wordwrap:${0}
diff --git a/vim/snippets/vim-snippets/snippets/jsp.snippets b/vim/snippets/vim-snippets/snippets/jsp.snippets
new file mode 100644
index 0000000..db185b2
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/jsp.snippets
@@ -0,0 +1,99 @@
+snippet @page
+	<%@page contentType="text/html" pageEncoding="UTF-8"%>
+snippet jstl
+	<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+	<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+snippet jstl:c
+	<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+snippet jstl:fn
+	<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+snippet cpath
+	${pageContext.request.contextPath}
+snippet cout
+	<c:out value="${1}" default="${0}" />
+snippet cset
+	<c:set var="${1}" value="${0}" />
+snippet cremove
+	<c:remove var="${1}" scope="${0:page}" />
+snippet ccatch
+	<c:catch var="${0}" />
+snippet cif
+	<c:if test="${${1}}">
+		${0}
+	</c:if>
+snippet cchoose
+	<c:choose>
+		${0}
+	</c:choose>
+snippet cwhen
+	<c:when test="${${1}}">
+		${0}
+	</c:when>
+snippet cother
+	<c:otherwise>
+		${0}
+	</c:otherwise>
+snippet cfore
+	<c:forEach items="${${1}}" var="${2}" varStatus="${3}">
+		${0:<c:out value="$2" />}
+	</c:forEach>
+snippet cfort
+	<c:set var="${1}">${2:item1,item2,item3}</c:set>
+	<c:forTokens var="${3}" items="${$1}" delims="${4:,}">
+		${0:<c:out value="$3" />}
+	</c:forTokens>
+snippet cparam
+	<c:param name="${1}" value="${0}" />
+snippet cparam+
+	<c:param name="${1}" value="${2}" />
+	cparam+${0}
+snippet cimport
+	<c:import url="${1}" />
+snippet cimport+
+	<c:import url="${1}">
+		<c:param name="${2}" value="${3}" />
+		cparam+${0}
+	</c:import>
+snippet curl
+	<c:url value="${1}" var="${2}" />
+	<a href="${$2}">${0}</a>
+snippet curl+
+	<c:url value="${1}" var="${2}">
+		<c:param name="${4}" value="${5}" />
+		cparam+${0}
+	</c:url>
+	<a href="${$2}">${3}</a>
+snippet credirect
+	<c:redirect url="${0}" />
+snippet contains
+	${fn:contains(${1:string}, ${0:substr})}
+snippet contains:i
+	${fn:containsIgnoreCase(${1:string}, ${0:substr})}
+snippet endswith
+	${fn:endsWith(${1:string}, ${0:suffix})}
+snippet escape
+	${fn:escapeXml(${0:string})}
+snippet indexof
+	${fn:indexOf(${1:string}, ${0:substr})}
+snippet join
+	${fn:join(${1:collection}, ${0:delims})}
+snippet length
+	${fn:length(${0:collection_or_string})}
+snippet replace
+	${fn:replace(${1:string}, ${2:substr}, ${0:replace})}
+snippet split
+	${fn:split(${1:string}, ${0:delims})}
+snippet startswith
+	${fn:startsWith(${1:string}, ${0:prefix})}
+snippet substr
+	${fn:substring(${1:string}, ${2:begin}, ${0:end})}
+snippet substr:a
+	${fn:substringAfter(${1:string}, ${0:substr})}
+snippet substr:b
+	${fn:substringBefore(${1:string}, ${0:substr})}
+snippet lc
+	${fn:toLowerCase(${0:string})}
+snippet uc
+	${fn:toUpperCase(${0:string})}
+snippet trim
+	${fn:trim(${0:string})}
diff --git a/vim/snippets/vim-snippets/snippets/julia.snippets b/vim/snippets/vim-snippets/snippets/julia.snippets
new file mode 100644
index 0000000..490d050
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/julia.snippets
@@ -0,0 +1,102 @@
+snippet #!
+	#!/usr/bin/env julia
+
+# Functions
+snippet fun function definition
+	function ${1}(${2})
+		${0}
+	end
+
+snippet ret return
+	return(${0})
+
+# Printing to console
+snippet pr print
+	print("${1}")
+	${0}
+
+snippet prl print line
+	println("${1}")
+	${0}
+
+# Includes
+snippet use load a package
+	using ${0}
+
+snippet incl include source code
+	include("${1}")
+	${0}
+
+# Loops
+snippet forc for loop iterating over iterable container
+	for ${1} in ${2}
+		${0}
+	end
+
+snippet for standard for loop
+	for ${1} = ${2}
+		${0}
+	end
+
+snippet fornest nested for loop
+	for ${1} = ${2}, ${3} = ${4}
+		${0}
+	end
+
+snippet wh while loop
+	while ${1} ${2:<=} ${3}
+		${0}
+	end
+
+# Conditionals
+snippet if if statement
+	if ${1}
+		${0}
+	end
+
+snippet el else part of statement
+	else
+		${0}
+
+snippet eif else if part of if statement
+	else if ${1}
+		${0}
+
+snippet ife full if-else statement
+	if ${1}
+		${2}
+	else
+		${0}
+	end
+
+snippet tern ternary operator
+	${1} ? ${2} : ${3:nothing}
+
+# Exceptions
+snippet try try catch
+	try
+		${1:${VISUAL}}
+	catch ${2}
+		${0}
+	end
+
+snippet fin finally statement
+	finally
+		${0}
+
+snippet thr throw
+	throw(${1})
+	${0}
+
+# Messages
+snippet in
+	info("${1}")
+	${0}
+
+snippet wa
+	warn("${1}")
+	${0}
+
+snippet err
+	error("${1}")
+	${0}
diff --git a/vim/snippets/vim-snippets/snippets/laravel.snippets b/vim/snippets/vim-snippets/snippets/laravel.snippets
new file mode 100644
index 0000000..e7435e3
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/laravel.snippets
@@ -0,0 +1,242 @@
+#resource controller
+snippet l_rsc
+	/*!
+	* \class       $1
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	class ${1:`!v expand('%:t:r')`} extends ${2:BaseController} {
+		function __construct() {
+		}
+		
+		public function index() {
+		}
+		
+		public function create() {
+		}
+		
+		public function store() {
+		}
+		
+		public function show($id) {
+		}
+		
+		public function edit($id) {
+		}
+		
+		public function update($id) {
+		}
+		
+		public function destroy($id) {
+		}
+	}
+#service service provider
+snippet l_ssp
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Services};
+
+	use Illuminate\Support\ServiceProvider;
+
+	class ${2:`!v expand('%:t:r')`} extends ServiceProvider {
+		
+		public function register() {
+			$this->app->bind('${4}Service', function ($app) {
+				return new ${5}(
+					$app->make('Repositories\\${6}Interface')
+				);
+			});
+		}
+	}
+#repository service provider
+snippet l_rsp
+	/*!
+	* \namespace   $2
+	* \class       $3
+	*
+	* \author      ${4:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${2:Repositories\\${1:}};
+
+	use Entities\\$1;
+	use $2\\$1Repository;
+	use Illuminate\Support\ServiceProvider;
+
+	class ${3:`!v expand('%:t:r')`} extends ServiceProvider {
+		/*!
+		* \var     defer
+		* \brief   Defer service
+		*/
+		protected $defer = ${5:true};
+
+		public function register() {
+				$this->app->bind('$2\\$1Interface', function($app) {
+						return new $1Repository(new $1());
+				});
+		}
+
+		/*!
+		* \brief   If $defer == true need this fn
+		*/ 
+		public function provides() {
+				return ['$2\\$1Interface'];
+		}
+	}
+#model
+snippet l_md
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${3:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Entities};
+
+	class ${2:`!v expand('%:t:r')`} extends \Eloquent {
+		protected $table   = '${4:`!p snip.rv = t[2].lower()`}';
+
+		public $timestamps = ${5:false};
+
+		protected $hidden  = array(${6});
+
+		protected $guarded = array(${7:'id'});
+	}
+#abstract repository
+snippet l_ar
+	/*!
+	* \namespace   $1
+	* \class       $2
+	* \implements  $3
+	*
+	* \author      ${4:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Repositories};
+
+	use Illuminate\Database\Eloquent\Model;
+
+	abstract class ${2:`!v expand('%:t:r')`} implements ${3:BaseRepositoryInterface} {
+		protected $model;
+
+		/*!
+		* \fn      __construct
+		*
+		* \brief   Take the model
+		*/
+
+		public function __construct(Model $model) {
+				$this->model = $model;
+		}
+
+		/*!
+		* \fn      all
+		*
+		* \return  Illuminate\Database\Eloquent\Collection
+		*/
+		public function all($columns = array('*')) {
+				return $this->model->all()->toArray();
+		}
+
+		/*!
+		* \fn      create
+		*
+		* \return  Illuminate\Database\Eloquent\Model
+		*/
+		public function create(array $attributes) {
+				return $this->model->create($attributes);
+		}
+
+		/*!
+		* \fn      destroy
+		*
+		* \return  int
+		*/
+		public function destroy($ids) {
+				return $this->model->destroy($ids);
+		}
+
+		/*!
+		* \fn      find
+		*
+		* \return  mixed
+		*/
+		public function find($id, $columns = array('*')) {
+			return $this->model->find($id, $columns);
+		}
+	}
+
+#repository
+snippet l_r
+	/*!
+	* \namespace   $1
+	* \class       $3
+	* \implements  $4
+	*
+	* \author      ${5:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Repositories\\${2}};
+
+	class ${3:`!v expand('%:t:r')`} extends \\${6} implements ${4:$3RepositoryInterface} {
+		${7}
+	}
+#service
+snippet l_s
+	/*!
+	* \namespace $1
+	* \class     $2
+	*
+	* \author    ${6:`!v g:snips_author`}
+	* \date      `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace Services\\${1};
+
+	use ${3:Repositories\\${4:Interface}};
+
+	class ${2:`!v expand('%:t:r')`} {
+		protected $${5:repo};
+
+		/*!
+		* \fn      __construct
+		*/
+		public function __construct($4 $repo) {
+			$this->$5 = $repo;
+		}
+	}
+#facade
+snippet l_f
+	/*!
+	* \namespace   $1
+	* \class       $2
+	*
+	* \author      ${5:`!v g:snips_author`}
+	* \date        `!v strftime('%d-%m-%y')`
+	*/
+
+	namespace ${1:Services};
+
+	use \Illuminate\Support\Facades\Facade;
+
+	class ${2:`!v expand('%:t:r')`} extends Facade {
+		/*!
+		* \fn          getFacadeAccessor
+		*
+		* \return      string
+		*/
+		protected static function getFacadeAccessor() { return '${4:${3}Service}'; }
+	}
diff --git a/vim/snippets/vim-snippets/snippets/ledger.snippets b/vim/snippets/vim-snippets/snippets/ledger.snippets
new file mode 100644
index 0000000..b401f61
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/ledger.snippets
@@ -0,0 +1,5 @@
+# Ledger <http://ledger-cli.org/>
+snippet ent
+	`strftime("%Y/%m/%d")` ${1:transaction}
+	    ${2:account}    ${3:value}
+	    ${0:account}
diff --git a/vim/snippets/vim-snippets/snippets/lfe.snippets b/vim/snippets/vim-snippets/snippets/lfe.snippets
new file mode 100644
index 0000000..b716e6e
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/lfe.snippets
@@ -0,0 +1,18 @@
+snippet defmo
+	(defmodule ${1:`vim_snippets#Filename()`}
+		(export ${2:all}))
+	$0
+snippet def
+	(defun $1 ($2)
+		$0)
+snippet ltest
+	(defmodule ${1:`vim_snippets#Filename()`}
+		(behaviour ltest-unit)
+		(export all))
+
+	(include-lib "ltest/include/ltest-macros.lfe")
+
+	$0
+snippet test
+	(deftest $1
+		$0)
diff --git a/vim/snippets/vim-snippets/snippets/ls.snippets b/vim/snippets/vim-snippets/snippets/ls.snippets
new file mode 100644
index 0000000..7c924e6
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/ls.snippets
@@ -0,0 +1,108 @@
+# Closure loop
+snippet forinlet
+	for ${1:name} in ${2:array}
+		let $1
+			${3}
+# Array comprehension
+snippet fora
+	for ${1:name} in ${2:array}
+		${3}
+# Object comprehension
+snippet foro
+	for ${1:key}, ${2:value} of ${3:object}
+		${4}
+# Range comprehension (inclusive)
+snippet forr
+	for ${1:name} from ${2:start} to ${3:finish}
+		${4}
+snippet forrb
+	for ${1:name} from ${2:start} to ${3:finish} by ${4:step}
+		${5}
+# Range comprehension (exclusive)
+snippet forrex
+	for ${1:name} from ${2:start} til ${3:finish}
+		${4}
+snippet forrexb
+	for ${1:name} from ${2:start} til ${3:finish} by ${4:step}
+		${5}
+# Function
+snippet fun
+	(${1:args}) ->
+		${2}
+# Function (bound)
+snippet bfun
+	(${1:args}) ~>
+		${2}
+# Class
+snippet cla class ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${2}
+snippet cla class .. constructor: ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		(${2:args}) ->
+			${3}
+
+		${4}
+snippet cla class .. extends ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		${3}
+snippet cla class .. extends .. constructor: ..
+	class ${1:`substitute(Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} extends ${2:ParentClass}
+		(${3:args}) ->
+			${4}
+
+		${5}
+# If
+snippet if
+	if ${1:condition}
+		${2}
+# If __ Else
+snippet ife
+	if ${1:condition}
+		${2}
+	else
+		${3}
+# Else if
+snippet elif
+	else if ${1:condition}
+		${2}
+# Ternary If
+snippet ifte
+	if ${1:condition} then ${2:value} else ${3:other}
+# Unless
+snippet unl
+	${1:action} unless ${2:condition}
+# Switch
+snippet swi
+	switch ${1:object}
+	case ${2:value}
+		${3}
+	default void
+snippet mat
+	match ${1:object}
+	| ${2:value} => ${3}
+	| otherwise => void
+
+# Log
+snippet log
+	console.log ${1}
+# stringify
+snippet str
+	JSON.stringify ${1}, void, 2
+
+# Try __ Catch
+snippet try
+	try
+		${1:${VISUAL}}
+	catch ${2:error}
+		${3}
+# Require
+snippet req
+	${2:$1} = require '${1}'${3}
+# Require!
+snippet req!
+	require! ${1}
+
+# Export
+snippet exp
+	${1:root} = exports ? this
diff --git a/vim/snippets/vim-snippets/snippets/lua.snippets b/vim/snippets/vim-snippets/snippets/lua.snippets
new file mode 100644
index 0000000..b7de2de
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/lua.snippets
@@ -0,0 +1,21 @@
+snippet #!
+	#!/usr/bin/env lua
+	$1
+snippet local
+	local ${1:x} = ${0:1}
+snippet fun
+	function ${1:fname}(${2:...})
+		${0:-- body}
+	end
+snippet for
+	for ${1:i}=${2:1},${3:10} do
+		${0:print(i)}
+	end
+snippet forp
+	for ${1:i},${2:v} in pairs(${3:table_name}) do
+	   ${0:-- body}
+	end
+snippet fori
+	for ${1:i},${2:v} in ipairs(${3:table_name}) do
+	   ${0:-- body}
+	end
diff --git a/vim/snippets/vim-snippets/snippets/make.snippets b/vim/snippets/vim-snippets/snippets/make.snippets
new file mode 100644
index 0000000..9104804
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/make.snippets
@@ -0,0 +1,50 @@
+# base
+snippet base
+	.PHONY: clean, mrproper
+	CC = gcc
+	CFLAGS = -g -Wall
+
+	all: $1
+
+	%.o: %.c
+		$(CC) $(CFLAGS) -c -o $@ $<
+	
+	${1:out}: $1.o
+		$(CC) $(CFLAGS) -o $@ $+
+
+	clean:
+		rm -f *.o core.*
+
+	mrproper: clean
+		rm -f $1
+# add
+snippet add
+	${1:out}: $1.o
+		$(CC) $(CFLAGS) -o $@ $+
+# print
+snippet print
+	print-%: ; @echo $*=$($*)
+# ifeq
+snippet if
+	ifeq (${1:cond0}, ${2:cond1})
+		${0:${VISUAL}}
+	endif
+# ifeq ... else ... endif
+snippet ife
+	ifeq (${1:cond0}, ${2:cond1})
+		${3:${VISUAL}}
+	else
+		${0}
+	endif
+# else ...
+snippet el
+	else
+		${0:${VISUAL}}
+# .DEFAULT_GOAL := target
+snippet default
+	.DEFAULT_GOAL := ${1}
+# help target for self-documented Makefile
+snippet help
+	help: ## Prints help for targets with comments
+		@cat $(MAKEFILE_LIST) | grep -E '^[a-zA-Z_-]+:.*?## .*$$' | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $\$1, $\$2}'
+	${0}
diff --git a/vim/snippets/vim-snippets/snippets/mako.snippets b/vim/snippets/vim-snippets/snippets/mako.snippets
new file mode 100644
index 0000000..659caf7
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/mako.snippets
@@ -0,0 +1,54 @@
+snippet def
+	<%def name="${1:name}">
+		${0:}
+	</%def>
+snippet call
+	<%call expr="${1:name}">
+		${0:}
+	</%call>
+snippet doc
+	<%doc>
+		${0:}
+	</%doc>
+snippet text
+	<%text>
+		${0:}
+	</%text>
+snippet for
+	% for ${1:i} in ${2:iter}:
+		${0:}
+	% endfor
+snippet if if
+	% if ${1:condition}:
+		${0:}
+	% endif
+snippet ife if/else
+	% if ${1:condition}:
+		${2:}
+	% else:
+		${0:}
+	% endif
+snippet try
+	% try:
+		${1:${VISUAL}}
+	% except${2:}:
+		${0:pass}
+	% endtry
+snippet wh
+	% while ${1:}:
+		${0:}
+	% endwhile
+snippet $
+	${ ${0:} }
+snippet <%
+	<% ${0:} %>
+snippet <!%
+	<!% ${0:} %>
+snippet inherit
+	<%inherit file="${0:filename}" />
+snippet include
+	<%include file="${0:filename}" />
+snippet namespace
+	<%namespace file="${0:name}" />
+snippet page
+	<%page args="${0:}" />
diff --git a/vim/snippets/vim-snippets/snippets/markdown.snippets b/vim/snippets/vim-snippets/snippets/markdown.snippets
new file mode 100644
index 0000000..f8000b4
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/markdown.snippets
@@ -0,0 +1,138 @@
+# Markdown
+
+# Includes octopress (http://octopress.org/) snippets
+
+# The suffix `c` stands for "Clipboard".
+
+snippet [
+	[${1:text}](http://${2:address})
+snippet [*
+	[${1:link}](${2:`@*`})
+snippet [c
+	[${1:link}](${2:`@+`})
+snippet ["
+	[${1:text}](http://${2:address} "${3:title}")
+snippet ["*
+	[${1:link}](${2:`@*`} "${3:title}")
+snippet ["c
+	[${1:link}](${2:`@+`} "${3:title}")
+snippet [:
+	[${1:id}]: http://${2:url}
+
+snippet [:*
+	[${1:id}]: ${2:`@*`}
+
+snippet [:c
+	[${1:id}]: ${2:`@+`}
+
+snippet [:"
+	[${1:id}]: http://${2:url} "${3:title}"
+
+snippet [:"*
+	[${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet [:"c
+	[${1:id}]: ${2:`@+`} "${3:title}"
+
+snippet ![
+	![${1:alttext}](${2:/images/image.jpg})
+snippet ![*
+	![${1:alt}](${2:`@*`})
+snippet ![c
+	![${1:alt}](${2:`@+`})
+snippet !["
+	![${1:alttext}](${2:/images/image.jpg} "${3:title}")
+snippet !["*
+	![${1:alt}](${2:`@*`} "${3:title}")
+snippet !["c
+	![${1:alt}](${2:`@+`} "${3:title}")
+snippet ![:
+	![${1:id}]: ${2:url}
+
+snippet ![:*
+	![${1:id}]: ${2:`@*`}
+
+snippet ![:"
+	![${1:id}]: ${2:url} "${3:title}"
+
+snippet ![:"*
+	![${1:id}]: ${2:`@*`} "${3:title}"
+
+snippet ![:"c
+	![${1:id}]: ${2:`@+`} "${3:title}"
+
+snippet <
+	<http://${1:url}>
+snippet <*
+	<`@*`>
+snippet <c
+	<`@+`>
+snippet **
+	**${1:bold}**
+snippet __
+	__${1:bold}__
+snippet ===
+	`repeat('=', strlen(getline(line('.') - 3)))`
+
+	${0}
+snippet -
+	-   ${0}
+snippet ---
+	`repeat('-', strlen(getline(line('.') - 3)))`
+
+	${0}
+snippet blockquote
+	{% blockquote %}
+	${0:quote}
+	{% endblockquote %}
+
+snippet blockquote-author
+	{% blockquote ${1:author}, ${2:title} %}
+	${0:quote}
+	{% endblockquote %}
+
+snippet blockquote-link
+	{% blockquote ${1:author} ${2:URL} ${3:link_text} %}
+	${0:quote}
+	{% endblockquote %}
+
+snippet ```
+	\`\`\`
+	${1:code}
+	\`\`\`
+
+# Language.
+snippet ```l
+	\`\`\`${1:language}
+	${2:code}
+	\`\`\`
+
+snippet codeblock-short
+	{% codeblock %}
+	${0:code_snippet}
+	{% endcodeblock %}
+
+snippet codeblock-full
+	{% codeblock ${1:title} lang:${2:language} ${3:URL} ${4:link_text} %}
+	${0:code_snippet}
+	{% endcodeblock %}
+
+snippet gist-full
+	{% gist ${1:gist_id} ${0:filename} %}
+
+snippet gist-short
+	{% gist ${0:gist_id} %}
+
+snippet img
+	{% img ${1:class} ${2:URL} ${3:width} ${4:height} ${5:title_text} ${0:alt_text} %}
+
+snippet youtube
+	{% youtube ${0:video_id} %}
+
+# The quote should appear only once in the text. It is inherently part of it.
+# See http://octopress.org/docs/plugins/pullquote/ for more info.
+
+snippet pullquote
+	{% pullquote %}
+	${1:text} {" ${2:quote} "} ${0:text}
+	{% endpullquote %}
diff --git a/vim/snippets/vim-snippets/snippets/matlab.snippets b/vim/snippets/vim-snippets/snippets/matlab.snippets
new file mode 100755
index 0000000..19b6fe8
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/matlab.snippets
@@ -0,0 +1,64 @@
+snippet if if
+	if ${1}
+		${0}
+	end
+
+snippet ife if ... else
+	if ${1}
+		${2}
+	else
+		${0}
+	end
+
+snippet el else
+	else
+		${0}
+
+snippet eif elsif
+	elseif ${1}
+		${0}
+
+snippet wh while
+	while ${1}
+		${0}
+	end
+
+snippet for for
+	for ${1:i} = ${2:1:n}
+		${0}
+	end
+
+snippet parfor parfor
+	parfor ${1:i} = ${2:1:n}
+		${0}
+	end
+
+snippet fun function
+	function [${3:out}] = ${1:`vim_snippets#Filename("$1", "fun_name")`}(${2}) 
+	${0}
+
+snippet try try ... catch
+	try
+		${1}
+	catch ${2:err}
+		${0}
+	end
+
+snippet switch switch
+	switch ${1:n}
+		case ${2:0}
+			${0}
+	end
+
+snippet @ anonymous function
+	@(${1:x}) ${0:x*x}
+
+snippet cl class 
+	classdef ${1:`vim_snippets#Filename("$1", "class_name")`}
+	   properties
+		  ${2}
+	   end
+	   methods
+		  ${0}
+	   end
+	end
diff --git a/vim/snippets/vim-snippets/snippets/mustache.snippets b/vim/snippets/vim-snippets/snippets/mustache.snippets
new file mode 100644
index 0000000..cf58940
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/mustache.snippets
@@ -0,0 +1,15 @@
+snippet if # {{#value}} ... {{/value}}
+	{{#${1:value}}}
+	${0:${VISUAL}}
+	{{/$1}}
+snippet ifn # {{^value}} ... {{/value}}
+	{{^${1:value}}}
+	${0:${VISUAL}}
+	{{/$1}}
+snippet ife # {{#value}} ... {{/value}} {{^value}} ... {{/value}}
+	{{#${1:value}}}
+	${2:${VISUAL}}
+	{{/$1}}
+	{{^$1}}
+	${3}
+	{{/$1}}
diff --git a/vim/snippets/vim-snippets/snippets/objc.snippets b/vim/snippets/vim-snippets/snippets/objc.snippets
new file mode 100644
index 0000000..24cfb97
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/objc.snippets
@@ -0,0 +1,247 @@
+# #import <...>
+snippet Imp
+	#import <${1:Cocoa/Cocoa.h}>
+# #import "..."
+snippet imp
+	#import "${1:`vim_snippets#Filename()`.h}"
+# @selector(...)
+snippet sel
+	@selector(${1:method}:)
+# @"..." string
+snippet s
+	@"${1}"
+# Object
+snippet o
+	${1:NSObject} *${2:foo} = [${3:$1 alloc}]${4};
+# NSLog(...)
+snippet log
+	NSLog(@"${1:%@}"${2});
+# Class
+snippet objc
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
+	{
+	}
+	@end
+
+	@implementation $1
+	${0}
+	@end
+# Class Interface
+snippet int
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
+	{${3}
+	}
+	${0}
+	@end
+snippet @interface
+	@interface ${1:`vim_snippets#Filename('', 'someClass')`} : ${2:NSObject}
+	{${3}
+	}
+	${0}
+	@end
+# Class Implementation
+snippet impl
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
+	${0}
+	@end
+snippet @implementation
+	@implementation ${1:`vim_snippets#Filename('', 'someClass')`}
+	${0}
+	@end
+# Protocol
+snippet pro
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	${0}
+	@end
+snippet @protocol
+	@protocol ${1:`vim_snippets#Filename('$1Delegate', 'MyProtocol')`} ${2:<NSObject>}
+	${0}
+	@end
+# init Definition
+snippet init
+	- (id)init
+	{
+		if (self = [super init]) {
+			${0}
+		}
+		return self;
+	}
+# dealloc Definition
+snippet dealloc
+	- (void) dealloc
+	{
+		${0:deallocations}
+		[super dealloc];
+	}
+snippet su
+	[super ${1:init}]
+snippet ibo
+	IBOutlet ${1:NSSomeClass} *${2:$1};
+# Category
+snippet cat
+	@interface ${1:NSObject} (${2:MyCategory})
+	@end
+
+	@implementation $1 ($2)
+	${0}
+	@end
+# Category Interface
+snippet cath
+	@interface ${1:`vim_snippets#Filename('$1', 'NSObject')`} (${2:MyCategory})
+	${0}
+	@end
+# Method
+snippet m
+	- (${1:id})${2:method}
+	{
+		${0}
+	}
+# Method declaration
+snippet md
+	- (${1:id})${2:method};
+# IBAction declaration
+snippet ibad
+	- (IBAction)${1:method}:(${2:id})sender;
+# IBAction method
+snippet iba
+	- (IBAction)${1:method}:(${2:id})sender
+	{
+		${0}
+	}
+# awakeFromNib method
+snippet wake
+	- (void)awakeFromNib
+	{
+		${0}
+	}
+# Class Method
+snippet M
+	+ (${1:id})${2:method}
+	{
+		${0:return nil;}
+	}
+# Sub-method (Call super)
+snippet sm
+	- (${1:id})${2:method}
+	{
+		[super $2];${0}
+		return self;
+	}
+# Accessor Methods For:
+# Object
+snippet objacc
+	- (${1:id})${2:thing}
+	{
+		return $2;
+	}
+
+	- (void)set$2:($1)${3:new$2}
+	{
+		[$3 retain];
+		[$2 release];
+		$2 = $3;
+	}
+# for (object in array)
+snippet forin
+	for (${1:Class} *${2:some$1} in ${3:array}) {
+		${0}
+	}
+snippet fore
+	for (${1:object} in ${2:array}) {
+		${0:statements}
+	}
+snippet forarray
+	unsigned int ${1:object}Count = [${2:array} count];
+
+	for (unsigned int index = 0; index < $1Count; index++) {
+		${3:id} $1 = [$2 $1AtIndex:index];
+		${0}
+	}
+snippet fora
+	unsigned int ${1:object}Count = [${2:array} count];
+
+	for (unsigned int index = 0; index < $1Count; index++) {
+		${3:id} $1 = [$2 $1AtIndex:index];
+		${0}
+	}
+# Try / Catch Block
+snippet	@try
+	@try {
+		${1:statements}
+	}
+	@catch (NSException * e) {
+		${2:handler}
+	}
+	@finally {
+		${0:statements}
+	}
+snippet @catch
+	@catch (${1:exception}) {
+		${0:handler}
+	}
+snippet @finally
+	@finally {
+		${0:statements}
+	}
+# IBOutlet
+# @property (Objective-C 2.0)
+snippet prop
+	@property (${1:retain}) ${2:NSSomeClass} ${3:*$2};
+# @synthesize (Objective-C 2.0)
+snippet syn
+	@synthesize ${1:property};
+# [[ alloc] init]
+snippet alloc
+	[[${1:foo} alloc] init${2}];
+snippet a
+	[[${1:foo} alloc] init${2}];
+# retain
+snippet ret
+	[${1:foo} retain];
+# release
+snippet rel
+	[${0:foo} release];
+# autorelease
+snippet arel
+	[${0:foo} autorelease];
+# autorelease pool
+snippet pool
+	NSAutoreleasePool *${1:pool} = [[NSAutoreleasePool alloc] init];
+	${0}
+	[$1 drain];
+# Throw an exception
+snippet except
+	NSException *${1:badness};
+	$1 = [NSException exceptionWithName:@"${2:$1Name}"
+	                             reason:@"${0}"
+	                           userInfo:nil];
+	[$1 raise];
+snippet prag
+	#pragma mark ${0:-}
+snippet cl
+	@class ${1:Foo};
+snippet color
+	[[NSColor ${0:blackColor}] set];
+# NSArray
+snippet array
+	NSMutableArray *${1:array} = [NSMutable array];
+snippet nsa
+	NSArray ${0}
+snippet nsma
+	NSMutableArray ${0}
+snippet aa
+	NSArray * array;
+snippet ma
+	NSMutableArray * array;
+# NSDictionary
+snippet dict
+	NSMutableDictionary *${1:dict} = [NSMutableDictionary dictionary];
+snippet nsd
+	NSDictionary ${0}
+snippet nsmd
+	NSMutableDictionary ${0}
+# NSString
+snippet nss
+	NSString ${0}
+snippet nsms
+	NSMutableString ${0}
diff --git a/vim/snippets/vim-snippets/snippets/openfoam.snippets b/vim/snippets/vim-snippets/snippets/openfoam.snippets
new file mode 100644
index 0000000..950cbda
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/openfoam.snippets
@@ -0,0 +1,53 @@
+# 0/*
+snippet fv
+	type		fixedValue;
+	value		uniform ${0};
+snippet zg
+	type		zeroGradient;
+snippet sym
+	type		symmetryPlane;
+# system/controlDict
+snippet forces
+	forces
+	{
+		type				forces;
+		functionObjectLibs	("libforces.so");
+		enabled				true;
+		outputControl		${1:timeStep};
+		outputInterval		${2:1};
+		patches				(${3});
+		log					${4:true};
+		CofR				(${0:0 0 0});
+	}
+# system/fvSolution
+# solvers
+snippet gamg
+	${1:p}
+	{
+		solver          GAMG;
+		tolerance       1e-${2:6};
+		relTol          ${0:0.0};
+		smoother        GaussSeidel;
+		cacheAgglomeration true;
+		nCellsInCoarsestLevel 10;
+		agglomerator    faceAreaPair;
+		mergeLevels     1;
+	}
+snippet pbicg
+	${1:U}
+	{
+		solver          PBiCG;
+		preconditioner  DILU;
+		tolerance       1e-${2:6};
+		relTol          ${0:0.0};
+	}
+# PIMPLE
+snippet pimple
+	PIMPLE
+	{
+		nOuterCorrectors 	${1:outer};
+		nCorrectors     	${2:inner};
+		nNonOrthogonalCorrectors ${3:nonOrtho};
+		pRefCell        	${4:cell};
+		pRefValue       	${0:value for $4};
+	}
diff --git a/vim/snippets/vim-snippets/snippets/perl.snippets b/vim/snippets/vim-snippets/snippets/perl.snippets
new file mode 100644
index 0000000..2ed2932
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/perl.snippets
@@ -0,0 +1,363 @@
+# #!/usr/bin/perl
+snippet #!
+	#!/usr/bin/env perl
+
+# Hash Pointer
+snippet .
+	 =>
+# Function
+snippet sub
+	sub ${1:function_name} {
+		${0}
+	}
+# Conditional
+snippet if
+	if (${1}) {
+		${0}
+	}
+# Conditional if..else
+snippet ife
+	if (${1}) {
+		${2}
+	}
+	else {
+		${0}
+	}
+# Conditional if..elsif..else
+snippet ifee
+	if (${1}) {
+		${2}
+	}
+	elsif (${3}) {
+		${4:# elsif...}
+	}
+	else {
+		${0}
+	}
+snippet eif
+	elsif (${1}) {
+		${0}
+	}
+# Conditional One-line
+snippet xif
+	${1:expression} if ${2:condition};
+# Unless conditional
+snippet unless
+	unless (${1}) {
+		${0}
+	}
+# Unless conditional One-line
+snippet xunless
+	${1:expression} unless ${2:condition};
+# Try/Except
+snippet eval
+	local $@;
+	eval {
+		${1:# do something risky...}
+	};
+	if (my $e = $@) {
+		${0:# handle failure...}
+	}
+# While Loop
+snippet wh
+	while (${1}) {
+		${0}
+	}
+# While Loop One-line
+snippet xwh
+	${1:expression} while ${2:condition};
+# C-style For Loop
+snippet cfor
+	for (my $${2:var} = 0; $$2 < ${1:count}; $$2${3:++}) {
+		${0}
+	}
+# For loop one-line
+snippet xfor
+	${1:expression} for @${2:array};
+# Foreach Loop
+snippet for
+	foreach my $${1:x} (@${2:array}) {
+		${0}
+	}
+# Foreach Loop One-line
+snippet fore
+	${1:expression} foreach @${2:array};
+# Package
+snippet package
+	package ${1:`expand('%:p:s?.*lib/??:r:gs?/?::?')`};
+	use strict;
+	use warnings;
+
+	${0}
+
+	1;
+
+	__END__
+# Package syntax perl >= 5.14
+snippet packagev514
+	package ${1:`expand('%:p:s?.*lib/??:r:gs?/?::?')`} ${2:0.99};
+	use v5.14;
+	use warnings;
+
+	${0}
+
+	1;
+
+	__END__
+#moose
+snippet moose
+	use Moose;
+	use namespace::autoclean;
+	${1:#}BEGIN {extends '${2:ParentClass}'};
+
+	${0}
+# parent
+snippet parent
+	use parent qw(${0:Parent Class});
+# Read File
+snippet slurp
+	my $${1:var} = do { local $/; open my $file, '<', "${2:file}"; <$file> };
+	${0}
+# strict warnings
+snippet strwar
+	use strict;
+	use warnings;
+# older versioning with perlcritic bypass
+snippet vers
+	## no critic
+	our $VERSION = '${0:version}';
+	eval $VERSION;
+	## use critic
+# new 'switch' like feature
+snippet switch
+	use feature 'switch';
+
+# Anonymous subroutine
+snippet asub
+	sub {
+		${0}
+	}
+
+
+
+# Begin block
+snippet begin
+	BEGIN {
+		${0}
+	}
+
+# call package function with some parameter
+snippet pkgmv
+	__PACKAGE__->${1:package_method}(${0:var})
+
+# call package function without a parameter
+snippet pkgm
+	__PACKAGE__->${0:package_method}()
+
+# call package "get_" function without a parameter
+snippet pkget
+	__PACKAGE__->get_${0:package_method}()
+
+# call package function with a parameter
+snippet pkgetv
+	__PACKAGE__->get_${1:package_method}(${0:var})
+
+# complex regex
+snippet qrx
+	qr/
+	     ${0:regex}
+	/xms
+
+#simpler regex
+snippet qr/
+	qr/${0:regex}/x
+
+#given
+snippet given
+	given ($${1:var}) {
+		${2:# cases}
+		${0:# default}
+	}
+
+# switch-like case
+snippet when
+	when (${1:case}) {
+		${0}
+	}
+
+# hash slice
+snippet hslice
+	@{ ${1:hash}  }{ ${0:array} }
+
+
+# map
+snippet map
+	map {  ${0: body }    }  ${1: @array } ;
+
+
+
+# Pod stub
+snippet ppod
+	=head1 NAME
+
+	${1:ClassName} - ${2:ShortDesc}
+
+	=head1 SYNOPSIS
+
+	  use $1;
+
+	  ${3:# synopsis...}
+
+	=head1 DESCRIPTION
+
+	${0:# longer description...}
+
+
+	=head1 INTERFACE
+
+
+	=head1 DEPENDENCIES
+
+
+	=head1 SEE ALSO
+
+
+# Heading for a subroutine stub
+snippet psub
+	=head2 ${1:MethodName}
+
+	${0:Summary....}
+
+# Heading for inline subroutine pod
+snippet psubi
+	=head2 ${1:MethodName}
+
+	${0:Summary...}
+
+
+	=cut
+# inline documented subroutine
+snippet subpod
+	=head2 $1
+
+	Summary of $1
+
+	=cut
+
+	sub ${1:subroutine_name} {
+		${0}
+	}
+# Subroutine signature
+snippet parg
+	=over 2
+
+	=item
+	Arguments
+
+
+	=over 3
+
+	=item
+	C<${1:DataStructure}>
+
+	  ${2:Sample}
+
+
+	=back
+
+
+	=item
+	Return
+
+	=over 3
+
+
+	=item
+	C<${0:...return data}>
+
+
+	=back
+
+
+	=back
+
+
+
+# Moose has
+snippet has
+	has ${1:attribute} => (
+		is	    => '${2:ro|rw}',
+		isa 	=> '${3:Str|Int|HashRef|ArrayRef|etc}',
+		default => sub {
+			${4:defaultvalue}
+		},
+		${0:# other attributes}
+	);
+
+
+# override
+snippet override
+	override ${1:attribute} => sub {
+		${2:# my $self = shift;};
+		${0:# my ($self, $args) = @_;};
+	};
+
+
+# use test classes
+snippet tuse
+	use Test::More;
+	use Test::Deep; # (); # uncomment to stop prototype errors
+	use Test::Exception;
+
+# local test lib
+snippet tlib
+	use lib qw{ ./t/lib };
+
+#test methods
+snippet tmeths
+	$ENV{TEST_METHOD} = '${0:regex}';
+
+# runtestclass
+snippet trunner
+	use ${0:test_class};
+	$1->runtests();
+
+# Test::Class-style test
+snippet tsub
+	sub t${1:number}_${2:test_case} :Test(${3:num_of_tests}) {
+		my $self = shift;
+		${0}
+
+	}
+
+# Test::Routine-style test
+snippet trsub
+	test ${1:test_name} => { description => '${2:Description of test.}'} => sub {
+		my ($self) = @_;
+		${0}
+	};
+
+#prep test method
+snippet tprep
+	sub prep${1:number}_${2:test_case} :Test(startup) {
+		my $self = shift;
+		${0}
+	}
+
+# cause failures to print stack trace
+snippet debug_trace
+	use Carp; # 'verbose';
+	# cloak "die"
+	# warn "warning"
+	$SIG{'__DIE__'} = sub {
+		require Carp; Carp::confess
+	};
+
+snippet dump
+	use Data::Dump qw(dump);
+	warn dump ${1:variable}
+
+snippet subtest
+	subtest '${1: test_name}' => sub {
+		${2}
+	};
diff --git a/vim/snippets/vim-snippets/snippets/perl6.snippets b/vim/snippets/vim-snippets/snippets/perl6.snippets
new file mode 100644
index 0000000..21ddf5b
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/perl6.snippets
@@ -0,0 +1,116 @@
+# shebang
+snippet #!
+	#!/usr/bin/env perl6
+
+# Hash Pointer
+snippet .
+	 =>
+# Function
+snippet sub
+	sub ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+snippet mul
+	multi ${1:function_name}(${2:Str $var}) {
+		${3}
+	}
+# Conditional
+snippet if
+	if ${1} {
+		${2}
+	}
+# Conditional if..else
+snippet ife
+	if ${1} {
+		${2}
+	}
+	else {
+		${3}
+	}
+snippet eif
+	elsif ${1) {
+		${2}
+	}
+# Conditional One-line
+snippet xif
+	${1:expression} if ${2:condition};
+# Unless conditional
+snippet unless
+	unless ${1} {
+		${2}
+	}
+# Unless conditional One-line
+snippet xunless
+	${1:expression} unless ${2:condition};
+# Ternary conditional
+snippet tc
+	${1:condition} ?? ${2:value-if-true} !! ${3:value-if-false};
+# given - when (perl6 switch)
+snippet switch
+	given ${1:$var} {
+	  when ${2:condition} {
+		  ${3:# code block ...}
+	  }
+	  ${4}
+	  default {
+		  ${5}
+	  }
+	}
+# 'loop' - C's for.
+snippet loop
+	loop (my ${1:$i} = 0; $$1 < ${2:count}; $$1++) {
+		${3}
+	}
+# for loop
+snippet for
+	for ${1:@array} -> ${2:$variable} {
+		${3}
+	}
+# While Loop
+snippet wh
+	while ${1} {
+		${2}
+	}
+# Repeat while and repean until
+snippet rp
+	repeat {
+		${1}
+	} ${2:while|until} ${3};
+# classes ..
+snippet cl
+	${1:my} class ${2:ClassName} ${3:is|does Parent|Role}{
+		${4}
+	}
+snippet has
+	has ${1:Type} ${2:$!identifier};
+snippet mth
+	method ${1:method_name}(${2:$attr}) {
+		${3}
+	}
+snippet pmth
+	method ${1:!}${2:method_name}(${3:$attr}) {
+		${4}
+	}
+snippet smth
+	submethod ${1:submethod_name}(${2:$attr}) {
+		${3}
+	}
+# Tests
+snippet test
+	use v6;
+	use Test;
+	${1:use lib 'lib';}
+
+	plan ${2:$num-tests};
+
+# IO
+snippet slurp
+	my ${1:$var} = "${2:filename}".IO.slurp;
+snippet rfile
+	for "${1:filename}".IO.lines -> $line {
+		${2}
+	}
+snippet open
+	my $fh = open "${1:filename}", ${2::r|:w|:a};
+	${3:# actions};
+	$fh.close;
diff --git a/vim/snippets/vim-snippets/snippets/php.snippets b/vim/snippets/vim-snippets/snippets/php.snippets
new file mode 100644
index 0000000..fb313b8
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/php.snippets
@@ -0,0 +1,684 @@
+snippet <?
+	<?php
+
+	${0:${VISUAL}}
+snippet dst "declare(strict_types=1)"
+	declare(strict_types=${1:1});
+snippet ec
+	echo ${0};
+snippet <?e
+	<?php echo ${0} ?>
+# this one is for php5.4
+snippet <?=
+	<?=${0}?>
+snippet ?=
+	<?= ${0} ?>
+snippet ?
+	<?php ${0} ?>
+snippet ?f
+	<?php foreach ($${1:vars} as $${2:$var}): ?>
+		${0:${VISUAL}}
+	<?php endforeach ?>
+snippet ?i
+	<?php if ($${1:var}): ?>
+		${0:${VISUAL}}
+	<?php endif ?>
+snippet ns
+	namespace ${1:Foo\Bar\Baz};
+	
+	${0:${VISUAL}}
+snippet c
+	class ${1:`vim_snippets#Filename()`}
+	{
+		${0:${VISUAL}}
+	}
+snippet i
+	interface ${1:`vim_snippets#Filename()`}
+	{
+		${0:${VISUAL}}
+	}
+snippet t.
+	$this->
+snippet f
+	function ${1}(${3})
+	{
+		${0:${VISUAL}}
+	}
+# method
+snippet m
+	${1:protected} function ${2:foo}()
+	{
+		${0:${VISUAL}}
+	}
+snippet sm "PHP Class Setter"
+	/**
+	 * Sets the value of ${1:foo}
+	 *
+	 * @param ${2:string} $$1 ${3:description}
+	 *
+	 * @return ${4:`vim_snippets#Filename()`}
+	 */
+	${5:public} function set${6:$1}(${7:$2 }$$1)
+	{
+		$this->${8:$1} = $$1;
+
+		return $this;
+	}
+snippet gm "PHP Class Getter Setter"
+	/**
+	 * Gets the value of ${1:foo}
+	 *
+	 * @return ${2:string}
+	 */
+	${3:public} function get${4:$1}()
+	{
+		return $this->${5:$1};
+	}
+#setter
+snippet $s
+	${1:$foo}->set${2:Bar}(${0});
+#getter
+snippet $g
+	${1:$foo}->get${0:Bar}();
+# Tertiary conditional
+snippet =?:
+	$${1:foo} = ${2:true} ? ${3:a} : ${0};
+snippet ?:
+	${1:true} ? ${2:a} : ${0}
+snippet t "$retVal = (condition) ? a : b"
+	$${1:retVal} = (${2:condition}) ? ${3:a} : ${4:b};
+# Predefined variables
+snippet C
+	$_COOKIE['${1:variable}']
+snippet E
+	$_ENV['${1:variable}']
+snippet F
+	$_FILES['${1:variable}']
+snippet G "_GET array"
+	$_GET['${1:variable}']
+snippet P "_POST array"
+	$_POST['${1:variable}']
+snippet R
+	$_REQUEST['${1:variable}']
+snippet S
+	$_SERVER['${1:variable}']
+snippet SS
+	$_SESSION['${1:variable}']
+snippet get "get"
+	$_GET['${1}']
+snippet post "post"
+	$_POST['${1}']
+snippet session "session"
+	$_SESSION['${1}']
+# the following are old ones
+snippet inc
+	include '${1:file}';
+snippet inc1
+	include_once '${1:file}';
+snippet req
+	require '${1:file}';
+snippet req1
+	require_once '${1:file}';
+# Start Docblock
+snippet /*
+	/**
+	 * ${0}
+	 */
+# Class - post doc
+snippet doc_cp
+	/**
+	 * ${1:undocumented class}
+	 *
+	 * @package ${2:default}
+	 * @subpackage ${3:default}
+	 * @author ${4:`g:snips_author`}
+	 */
+# Class Variable - post doc
+snippet doc_vp
+	/**
+	 * ${1:undocumented class variable}
+	 *
+	 * @var ${2:string}
+	 */
+# Class Variable
+snippet doc_v
+	/**
+	 * ${3:undocumented class variable}
+	 *
+	 * @var ${4:string}
+	 */
+	${1:var} $${2};
+# Class
+snippet doc_c
+	/**
+	 * ${3:undocumented class}
+	 *
+	 * @package ${4:default}
+	 * @subpackage ${5:default}
+	 * @author ${6:`g:snips_author`}
+	 */
+	${1:}class ${2:}
+	{
+		${0:${VISUAL}}
+	} // END $1class $2
+# Constant Definition - post doc
+snippet doc_dp
+	/**
+	 * ${1:undocumented constant}
+	 */
+# Constant Definition
+snippet doc_d
+	/**
+	 * ${3:undocumented constant}
+	 */
+	define(${1}, ${2});
+# Function - post doc
+snippet doc_fp
+	/**
+	 * ${1:undocumented function}
+	 *
+	 * @return ${2:void}
+	 * @author ${3:`g:snips_author`}
+	 */
+# Function signature
+snippet doc_s
+	/**
+	 * ${4:undocumented function}
+	 *
+	 * @return ${5:void}
+	 * @author ${6:`g:snips_author`}
+	 */
+	${1}function ${2}(${3});
+# Function
+snippet doc_f
+	/**
+	 * ${4:undocumented function}
+	 *
+	 * @return ${5:void}
+	 * @author ${6:`g:snips_author`}
+	 */
+	${1}function ${2}(${3})
+	{${0}
+	}
+# Header
+snippet doc_h
+	/**
+	 * ${1}
+	 *
+	 * @author ${2:`g:snips_author`}
+	 * @version ${3:$Id$}
+	 * @copyright ${4:$2}, `strftime('%d %B, %Y')`
+	 * @package ${0:default}
+	 */
+snippet doc_i "interface someClass {}"
+	/**
+	 * $1
+	 * @package ${2:default}
+	 * @author ${3:`!v g:snips_author`}
+	 **/
+	interface ${1:someClass}
+	{${4}
+	}
+snippet inheritdoc "@inheritdoc docblock"
+	/**
+	 * {@inheritdoc}
+	 */
+# Interface
+snippet interface
+	/**
+	 * ${2:undocumented class}
+	 *
+	 * @package ${3:default}
+	 * @author ${4:`g:snips_author`}
+	 */
+	interface ${1:`vim_snippets#Filename()`}
+	{
+		${0:${VISUAL}}
+	}
+# Trait
+snippet trait
+	/**
+	 * ${2:undocumented class}
+	 *
+	 * @package ${3:default}
+	 * @author ${4:`g:snips_author`}
+	 */
+	trait ${1:`vim_snippets#Filename()`}
+	{
+		${0:${VISUAL}}
+	}
+# class ...
+snippet class
+	/**
+	 * ${1}
+	 */
+	class ${2:`vim_snippets#Filename()`}
+	{
+		${3}
+		/**
+		 * ${4}
+		 */
+		${5:public} function ${6:__construct}(${7:argument})
+		{
+			${0}
+		}
+	}
+snippet nc
+	namespace ${1:`substitute(substitute(expand("%:h"), '\v^\w+\/(\u)', '\1', ''), '\/', '\\\', 'g')`};
+
+	${2:abstract }class ${3:`vim_snippets#Filename()`}
+	{
+		${0:${VISUAL}}
+	}
+# define(...)
+snippet def "define('VARIABLE_NAME', 'definition')"
+	define('${1:VARIABLE_NAME}', ${2:'definition'});
+# defined(...)
+snippet def?
+	${1}defined('${2}')
+snippet wh "while (condition) { ... }"
+	while (${1:/* condition */}) {
+		${0:${VISUAL}}
+	}
+snippet do "do { ... } while (condition)"
+	do {
+		${0:${VISUAL}}
+	} while (${1});
+snippet if "if (condition) { ... }"
+	if (${1}) {
+		${0:${VISUAL}}
+	}
+snippet ifn "if (!condition) { ... }"
+	if (!${1}) {
+		${0:${VISUAL}}
+	}
+snippet ifil "<?php if (condition): ?> ... <?php endif; ?>"
+	<?php if (${1}): ?>
+		${0:${VISUAL}}
+	<?php endif; ?>
+snippet ife "if (cond) { ... } else { ... }"
+	if (${1}) {
+		${0:${VISUAL}}
+	} else {
+		${2}
+	}
+snippet ifeil "<?php if (condition): ?> ... <?php else: ?> ... <?php endif; ?>"
+	<?php if (${1}): ?>
+		${0:${VISUAL}}
+	<?php else: ?>
+		${2}
+	<?php endif; ?>
+snippet el "else { ... }"
+	else {
+		${0:${VISUAL}}
+	}
+snippet eif "elseif(condition) { ... }"
+	elseif (${1}) {
+		${0:${VISUAL}}
+	}
+snippet switch "switch($var) { case 'xyz': ... default: .... }"
+	switch ($${1:variable}) {
+		case '${2:value}':
+			${3}
+			break;
+		${0}
+		default:
+			${4}
+			break;
+	}
+snippet case "case 'value': ... break"
+	case '${1:value}':
+		${0:${VISUAL}}
+		break;
+snippet for "for ($i = 0; $i < $count; $i++) { ... }"
+	for ($${2:i} = 0; $$2 < ${1:count}; $$2${3:++}) {
+		${0:${VISUAL}}
+	}
+snippet foreach "foreach ($var as $value) { .. }"
+	foreach ($${1:variable} as $${2:value}) {
+		${0:${VISUAL}}
+	}
+snippet foreachil "<?php foreach ($var as $value): ?>  ... <?php endforeach; ?>"
+	<?php foreach ($${1:variable} as $${2:value}): ?>
+		${0:${VISUAL}}
+	<?php endforeach; ?>
+snippet foreachk "foreach ($var as $key => $value) { .. }"
+	foreach ($${1:variable} as $${2:key} => $${3:value}) {
+		${0:${VISUAL}}
+	}
+snippet foreachkil "<?php foreach ($var as $key => $value): ?>  ... <?php endforeach; ?>"
+	<?php foreach ($${1:variable} as $${2:key} => $${3:value}): ?>
+		${0:<!-- html... -->}
+	<?php endforeach; ?>
+snippet array "$... = ['' => ]"
+	$${1:arrayName} = ['${2}' => ${3}];
+snippet try "try { ... } catch (Exception $e) { ... }"
+	try {
+		${0:${VISUAL}}
+	} catch (${1:Exception} $e) {
+	}
+# lambda with closure
+snippet lambda
+	${1:static }function (${2:args}) use (${3:&$x, $y /*put vars in scope (closure) */}) {
+		${0}
+	};
+# pre_dump();
+snippet pd
+	echo '<pre>'; var_dump(${0}); echo '</pre>';
+# pre_dump(); die();
+snippet pdd
+	echo '<pre>'; var_dump(${1}); echo '</pre>'; die(${0:});
+snippet vd
+	var_dump(${0});
+snippet vdd
+	var_dump(${1}); die(${0:});
+snippet pr
+	print_r(${0});
+snippet prs
+	print_r(${0}, 1);
+snippet vdf
+	error_log(print_r($${1:foo}, true), 3, '${2:/tmp/debug.log}');
+snippet http_redirect
+	header ("HTTP/1.1 301 Moved Permanently");
+	header ("Location: ".URL);
+	exit();
+snippet log "error_log(var_export($var, true));"
+	error_log(var_export(${1}, true));
+snippet var "var_export($var)"
+	var_export(${1});
+snippet ve "Dumb debug helper in HTML"
+	echo '<pre>' . var_export(${1}, 1) . '</pre>';
+snippet pc "Dumb debug helper in cli"
+	var_export($1);$0
+# Getters & Setters
+snippet gs "PHP Class Getter Setter"
+	/**
+	 * Gets the value of ${1:foo}
+	 *
+	 * @return ${2:string}
+	 */
+	public function get${3:$1}()
+	{
+		return $this->${4:$1};
+	}
+
+	/**
+	 * Sets the value of $1
+	 *
+	 * @param $2 $$1 ${5:description}
+	 *
+	 * @return ${6:`vim_snippets#Filename()`}
+	 */
+	public function set$3(${7:$2 }$$1)
+	{
+		$this->$4 = $$1;
+		return $this;
+	}
+# anotation, get, and set, useful for doctrine
+snippet ags
+	/**
+	 * ${1:description}
+	 *
+	 * @${0}
+	 */
+	${2:protected} $${3:foo};
+
+	public function get${4:$3}()
+	{
+		return $this->$3;
+	}
+
+	public function set$4(${5:$4 }$${6:$3})
+	{
+		$this->$3 = $$6;
+		return $this;
+	}
+snippet rett
+	return true;
+snippet retf
+	return false;
+snippet am
+	$${1:foo} = array_map(function($${2:v}) {
+		${0}
+		return $$2;
+	}, $$1);
+snippet aw
+	array_walk($${1:foo}, function(&$${2:v}, $${3:k}) {
+		$$2 = ${0};
+	});
+# static var assign once
+snippet static_var
+	static $${1} = null;
+	if (is_null($$1)){
+		$$1 = ${2};
+	}
+snippet CSVWriter
+	<?php
+	
+	class CSVWriter {
+		public function __construct($file_or_handle, $sep = "\t", $quot = '"'){
+			$args = func_get_args();
+			$mode = isset($opts['mode']) ? $opts['mode'] : 'w';
+	
+			$this->f =
+				is_string($file_or_handle)
+				? fopen($file_or_handle, $mode)
+				: $file_or_handle;
+	
+			$this->fputcsv_args = [$this->f, null, $sep, $quot];
+	
+			if (!$this->f) throw new Exception('bad file descriptor');
+		}
+	
+		public function write($row){
+			$this->fputcsv_args[1] =& $row;
+			call_user_func_array('fputcsv', $this->fputcsv_args);
+		}
+	
+		public function close(){
+			if (!is_null($this->f))
+				fclose($this->f);
+			$this->f = null;
+		}
+	
+		public function __destruct(){
+			$this->close();
+		}
+	
+	}
+snippet CSVIterator
+	
+	// http://snipplr.com/view.php?codeview&id=1986 // modified
+	class CSVIterator implements Iterator
+	{	
+		private $f;
+		private $curr;
+		private $rowCounter;
+	
+		 /* opts keys:
+			* row_size
+			* escape
+			* enclosure
+			* delimiter
+			*/
+		public function __construct( $file_or_handle, $opts = [4096, ','] )
+		{
+			$d = function($n) use(&$opts){ return isset($opts[$n]) ? $opts[$n] : false; };
+	
+			$this->combine = $d('combine');
+			$this->headers = $d('headers');
+			$this->headerCheckFunction = $d('header_check_function');
+	
+			$this->f =
+				is_string($file_or_handle)
+				? fopen( $file_or_handle, 'r' )
+				: $file_or_handle;
+			if (!$this->f) throw new Exception('bad file descriptor');
+			$this->fgetcsv_args = [
+					$this->f,
+					isset($opts['row_size']) ? $opts['row_size'] : 4096,
+					isset($opts['delimiter']) ? $opts['delimiter'] : ',',
+					isset($opts['enclosure']) ? $opts['enclosure'] : '"',
+					isset($opts['escape']) ? $opts['escape'] : '\\',
+			];
+			$this->start();
+		}
+	
+		protected function readRow(){
+			$this->curr = call_user_func_array('fgetcsv', $this->fgetcsv_args );
+			$this->rowCounter++;
+			if ($this->rowCounter == 1){
+				$this->processHeader();
+			} elseif ($this->curr) {
+				$this->processRow();
+			}
+		}
+	
+		public function processHeader(){
+			if ($this->headers || $this->combine){
+				$this->header = $this->curr;
+				if ($this->headerCheckFunction){
+					$f = $this->headerCheckFunction;
+					$f($this->header);
+				}
+				$this->readRow();
+			}
+		}
+	
+		public function processRow(){
+			if ($this->combine)
+				$this->curr = array_combine($this->header, $this->curr);
+		}
+	
+		public function start(){
+			$this->rowCounter = 0;
+			rewind( $this->f );
+			$this->readRow();
+		}
+	
+		public function rewind()
+		{
+			$this->start();
+		}
+	
+		public function current()
+		{
+			$curr = $this->curr;
+			$this->readRow();
+			return $curr;
+		}
+	
+		public function key()
+		{
+			return $this->rowCounter;
+		}
+	
+		public function next()
+		{
+			return $this->curr;
+		}
+	
+		public function valid(){
+			if( !$this->next() )
+			{
+				fclose( $this->f );
+				return FALSE;
+			}
+			return TRUE;
+		}
+	
+	} // end class
+# phpunit
+snippet ase "$this->assertEquals($a, $b)"
+	$this->assertEquals(${1:$expected}, ${2:$actual});
+snippet asne "$this->assertNotEquals($a, $b)"
+	$this->assertNotEquals(${1:$expected}, ${2:$actual});
+snippet asf "$this->assertFalse($a)"
+	$this->assertFalse(${1});
+snippet ast "$this->assertTrue($a)"
+	$this->assertTrue(${1});
+snippet asfex "$this->assertFileExists('path/to/file')"
+	$this->assertFileExists(${1:'path/to/file'});
+snippet asfnex "$this->assertFileNotExists('path/to/file')"
+	$this->assertFileNotExists(${1:'path/to/file'});
+snippet ascon "$this->assertContains($needle, $haystack)"
+	$this->assertContains(${1:$needle}, ${2:$haystack});
+snippet asncon "$this->assertNotContains($needle, $haystack)"
+	$this->assertNotContains(${1:$needle}, ${2:$haystack});
+snippet ascono "$this->assertContainsOnly($needle, $haystack)"
+	$this->assertContainsOnly(${1:$needle}, ${2:$haystack});
+snippet asconoi "$this->assertContainsOnlyInstancesOf(Example::class, $haystack)"
+	$this->assertContainsOnlyInstancesOf(${1:Example}::class, ${2:$haystack});
+snippet ashk "$this->assertArrayHasKey($key, $array)"
+	$this->assertArrayHasKey(${1:$key}, ${2:$array});
+snippet asnhk "$this->assertArrayNotHasKey($key, $array)"
+	this->assertArrayNotHasKey(${1:$key}, ${2:$array});
+snippet ascha "$this->assertClassHasAttribute($name, Example::class)"
+	$this->assertClassHasAttribute(${1:$attributeName}, ${2:Example}::class);
+snippet asi "$this->assertInstanceOf(Example::class, $actual)"
+	$this->assertInstanceOf(${1:Example}::class, ${2:$actual});
+snippet ast "$this->assertInternalType('string', $actual)"
+	$this->assertInternalType(${1:'string'}, ${2:actual});
+snippet asco "$this->assertCount($count, $haystack)"
+	$this->assertCount(${1:$expectedCount}, ${2:$haystack});
+snippet asnco "$this->assertNotCount($count, $haystack)"
+	$this->assertNotCount(${1:$count}, ${2:$haystack});
+snippet assub "$this->assertArraySubset($subset, $array)"
+	$this->assertArraySubset(${1:$subset}, ${2:$array});
+snippet asnu "$this->assertNull($a)"
+	$this->assertNull(${1});
+snippet asnnu "$this->assertNotNull($a)"
+	$this->assertNotNull(${1});
+snippet test "public function testXYZ() { ... }"
+	public function test${1}()
+	{
+		${0:${VISUAL}}
+	}
+snippet setup "protected function setUp() { ... }"
+	protected function setUp()
+	{
+		${0:${VISUAL}}
+	}
+snippet teardown "protected function tearDown() { ... }"
+	protected function tearDown()
+	{
+		${0:${VISUAL}}
+	}
+snippet proph "$observer = $this->prophesize(SomeClass::class);"
+	$${1:observer} = $this->prophesize(${2:SomeClass}::class);
+snippet mock "$mock = $this->createMock(SomeClass::class);"
+	$${1:mock} = $this->createMock(${2:SomeClass}::class);
+snippet exp "phpunit expects"
+	expects($this->${1:once}())
+		->method('${2}')
+		->with(${3})
+		->willReturn(${4});
+snippet testcmt "phpunit comment with group"
+	/**
+	* @group ${1}
+	*/
+snippet fail "$this->fail()"
+	$this->fail(${1});
+snippet marki "$this->markTestIncomplete()"
+	$this->markTestIncomplete(${1});
+snippet marks "$this->markTestSkipped()"
+	$this->markTestSkipped(${1});
+# end of phpunit snippets
+snippet te "throw new Exception()"
+	throw new ${1:Exception}("${2:Error Processing Request}");
+snippet fpc "file_put_contents" b
+	file_put_contents(${1:file}, ${2:content}${3:, FILE_APPEND});$0
+snippet sr "str_replace"
+	str_replace(${1:search}, ${2:replace}, ${3:subject})$0
+snippet ia "in_array"
+	in_array(${1:needle}, ${2:haystack})$0
+snippet is "isset"
+	isset(${1:var})$0
+snippet isa "isset array"
+	isset($${1:array}[${2:key}])$0
+snippet in "is_null"
+	is_null($${1:var})$0
+snippet fe "file_exists"
+	file_exists(${1:file})$0
+snippet id "is_dir"
+	is_dir(${1:path})$0
diff --git a/vim/snippets/vim-snippets/snippets/plsql.snippets b/vim/snippets/vim-snippets/snippets/plsql.snippets
new file mode 100644
index 0000000..2920758
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/plsql.snippets
@@ -0,0 +1,109 @@
+# create package spec
+snippet ps
+	create or replace package ${1:name}
+	as
+		${0:-- spec}
+	end; -- end of package spec $1
+# create package body
+snippet pb
+	create or replace package body ${1:name}
+	as
+		${0:-- body}
+	end; -- end of package body $1;
+# package procedure spec
+snippet pps
+	procedure ${1:name}(${0:args});
+# package procedure body
+snippet ppb
+	procedure ${1:name}(${2:args})
+	as
+	begin
+		${0:-- body}
+	end $2;
+# package function spec
+snippet pfs
+	function ${1:name}(${2:args})
+	  return ${0:type};
+# package function body
+snippet pfb
+	function ${1:name}(${2:args})
+	  return ${3:type}
+	as
+		l_res	$3;
+	begin
+		${0:-- body};
+		return l_res;
+	end $1;
+# snow errors
+snippet err
+	show errors;
+# proc/func in parameter
+snippet p
+	${1:name} ${2:in} ${3:type} ${0: := null}
+# package type: record
+snippet tr
+	type tr_${1:name} is record (${0:/* columns */});
+# package type: nested table
+snippet tt
+	type tt_${1:name} is table of tr_${0:name};
+# package type: indexed table
+snippet tti
+	type tt_${1:name} is table of tr_${0:name} index by binary_integer;
+# proc/func comment
+snippet doc
+	/*
+	 *	${0: comment ...}
+	 */
+# plsql block
+snippet beg
+	begin
+		${0}
+	end;
+# plsql block with declare part
+snippet dec
+	declare
+		${1}
+	begin
+		${0}
+	end;
+# return pipe row
+snippet rpipe
+	for ${1:i} in 1 .. ${0:l_res}.count loop
+		pipe row( $2($1) );
+	end loop;
+	return;
+# bulk collect
+snippet bc
+	bulk collect into ${0}
+# local variable
+snippet l
+	l_${1}		${0:number};
+# output
+snippet log
+	dbms_output.put_line('${0}');
+# for loop
+snippet for
+	for ${1:i} in ${2:1}..${3:42} loop
+		${0}
+	end loop;
+# for loop with select
+snippet fors
+	for ${1:rec} in (${2: select}) loop
+		${0}
+	end loop;
+# for loop with collection
+snippet forc
+	for ${1:i} in ${2:l_var}.first .. $2.last loop
+		${0: -- dbms_output.put_line($2($1)); }
+	end loop;
+# if
+snippet if
+	if ${1} then
+		${0}
+	end if;
+snippet ife
+	if ${1} then
+		${2}
+	else
+		${0}
+	end if;
diff --git a/vim/snippets/vim-snippets/snippets/po.snippets b/vim/snippets/vim-snippets/snippets/po.snippets
new file mode 100644
index 0000000..84916fa
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/po.snippets
@@ -0,0 +1,5 @@
+snippet msg
+	msgid "${1}"
+	msgstr "${2}"
+
+	${0}
diff --git a/vim/snippets/vim-snippets/snippets/processing.snippets b/vim/snippets/vim-snippets/snippets/processing.snippets
new file mode 100755
index 0000000..798e545
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/processing.snippets
@@ -0,0 +1,705 @@
+#BASICS
+# doc
+snippet doc
+	/**
+	 *  ${1:Description}
+	 *
+	 *	@author ${2:name}
+	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
+	 */
+	${0}
+# doc comment
+snippet docc
+	/**
+	 *	${1:@private}$0
+	 */
+	${0}
+# class
+snippet class
+	${1:public }class ${2:`fnamemodify(bufname("%"),":t:r")`} ${3:extends}
+	{
+
+		//--------------------------------------
+		//  CONSTRUCTOR
+		//--------------------------------------
+
+		public $2 (${4:arguments}) {
+			${0:// expression}
+		}
+	}
+# package
+snippet package
+	/**
+	 *  ${1:Description}
+	 *
+	 *	@author ${2:$TM_FULLNAME}
+	 *	@since  ${3:`strftime("%d/%m/%y %H:%M:%S")`}
+	 */
+
+	package ${0:package};
+# function
+snippet fun
+	${1:void/private/protected/public}${2: static} ${3:name}(${4}) {
+		${5://if not void return null;}
+	}
+	${0}
+snippet fn
+	${1:void }${2:name}(${3}) {
+		${4://if not void return null;}
+	}
+	${0}
+#	constant
+snippet const
+	static final ${1:Object} ${2:VAR_NAM} = ${0};
+# var
+snippet var
+	${1:private/public }${2:static }${3:String} ${4:str}${5: =}${0:value};
+# var objects
+snippet obj
+	${1:private/public }${2:Object} ${3:o}${4: = new }$2(${0});
+#loop for
+snippet for
+	for (int ${2:i} = 0; $2 < ${1:Things}.length; $2${3:++}) {
+		${0:$1[$2]}
+	};
+#loop while
+snippet wh
+	while (${1:/* condition */}) {
+		${0}
+	}
+#break
+snippet break
+	break ${1:label};
+#case
+snippet case
+	case ${1:expression} :
+		${0}
+	break;
+#default
+snippet default
+	default :
+		${1}
+	break;
+#switch
+snippet switch
+	switch(${1:expression}) {
+		case '${3:case}':
+			${4}
+			break;
+		${0}
+		default:
+			${2}
+	}
+#try
+snippet try
+	try {
+		${0:${VISUAL}}
+	} catch(${1:Exception} ${2:e}) {
+	}
+#try catch finally
+snippet tryf
+	try {
+		${0:${VISUAL}}
+	} catch(${1:Exception} ${2:e}) {
+	} finally {
+	}
+#throw
+snippet throw
+	throw new ("${1:Exception()}");
+#ternary
+snippet ?
+	? ${1:trueExpression} : ${2:falseExpression}
+	${0}
+snippet if
+	if (${1:true}) {${0}}
+# if ... else
+snippet ife
+	if (${1:true}) {${2}}
+	else{${0}}
+#get
+snippet get
+	public ${1:String} get${2}() {
+		return ${0:fieldName};
+	}
+#set
+snippet set
+	public void set${1}(${0:String} new${1}) {
+		${1:fieldName} = new${1};
+	}
+#printIn
+snippet println
+	println("${1:`fnamemodify(bufname("%"),":t:r")`}::${2:method}() "${3: +} ${0});
+#println string
+snippet pr
+	println("${0}");
+#setup draw
+snippet setup
+	void setup(){
+		${1}
+	}
+
+	void draw(){
+		${0}
+	}
+#setup OPENGL
+snippet opengl
+	import processing.opengl.*;
+	import javax.media.opengl.*;
+
+	PGraphicsOpenGL pgl;
+	GL gl;
+
+	void setup(){
+		size( ${1:300}, ${2:300}, OPENGL );
+		colorMode( RGB, 1.0 );
+		hint( ENABLE_OPENGL_4X_SMOOTH );
+		pgl = (PGraphicsOpenGL) g;
+		gl = pgl.gl;
+		gl.setSwapInterval(1);
+		initGL();
+		${3}
+	}
+
+	void draw(){
+		pgl.beginGL();
+			${4}
+		pgl.endGL();
+		getOpenGLErrors();
+	}
+
+	void initGL(){
+		${0}
+	}
+
+	void getOpenGLErrors(){
+		int error = gl.glGetError();
+		switch (error){
+			case 1280 :
+				println("GL_INVALID_ENUM - An invalid enumerant was passed to an OpenGL command.");
+			break;
+			case 1282 :
+				println("GL_INVALID_OPERATION - An OpenGL command was issued that was invalid or inappropriate for the current state.");
+			break;
+			case 1281 :
+				println("GL_INVALID_VALUE - A value was passed to OpenGL that was outside the allowed range.");
+			break;
+			case 1285 :
+				println("GL_OUT_OF_MEMORY - OpenGL was unable to allocate enough memory to process a command.");
+			break;
+			case 1283 :
+				println("GL_STACK_OVERFLOW - A command caused an OpenGL stack to overflow.");
+			break;
+			case 1284 :
+				println("GL_STACK_UNDERFLOW - A command caused an OpenGL stack to underflow.");
+			break;
+			case 32817 :
+				println("GL_TABLE_TOO_LARGE");
+			break;
+		}
+	}
+
+#GL Functions
+snippet gl begin gl
+	pgl.beginGL();
+		${0}
+	pgl.endGL();
+snippet gl gl swap interval
+	// specify the minimum swap interval for buffer swaps.
+	gl.setSwapInterval(${0:interval});
+snippet gl gl call list
+	// execute a display list
+	gl.glCallList(${0:list});
+snippet gl gl gen buffers
+	// import java.nio.IntBuffer;
+	// import java.nio.FloatBuffer;
+	// import com.sun.opengl.util.BufferUtil;
+
+	// You might need to create four buffers to store vertext data, normal data, texture coordinate data, and indices in vertex arrays
+	IntBuffer bufferObjects = IntBuffer.allocate(${1:4});
+	gl.glGenBuffers($1, bufferObjects);
+
+	int vertexCount = ${2:3};
+	int numCoordinates = ${0:3};
+	// vertexCount * numCoordinates
+	FloatBuffer vertices = BufferUtil.newFloatBuffer(vertexCount * numCoordinates);
+	float[] v = {0.0f, 0.0f, 0.0f,
+							 1.0f, 0.0f, 0.0f,
+							 0.0f, 1.0f, 1.0f};
+	vertices.put(v);
+
+	// Bind the first buffer object ID for use with vertext array data
+	gl.glBindBuffer(GL.GL_ARRAY_BUFFER, bufferObjects.get(0));
+	gl.glBufferData(GL.GL_ARRAY_BUFFER, vertexCount * numCoordinates * BufferUtil.SIZEOF_FLOAT, vertices, GL.GL_STATIC_DRAW);
+snippet gl gl bind buffer
+	${0:// A buffer ID of zero unbinds a buffer object}
+	gl.glBindBuffer(GL.GL_ARRAY_BUFFER, ${1:0});
+snippet gl gl delete buffers
+	${0:// Parameters are the same for glGenBuffers}
+	gl.glDeleteBuffers(${1:4}, ${2:bufferObjects});
+snippet gl gl depth mask
+	// enable or disable writing into the depth buffer
+	gl.glDepthMask(${0:flag});
+snippet gl gl load identity
+	// replaces the top of the active matrix stack with the identity matrix
+	gl.glLoadIdentity();
+snippet gl gl tex coord 2f
+	// set the current texture coordinates - 2 floats
+	gl.glTexCoord2f(${1:0.0f}, ${0:0.0f});
+snippet gl gl vertex 2f
+	gl.glVertex2f(${1:0.0f}, ${0:0.0f});
+snippet gl gl vertex 3f
+	gl.glVertex3f(${1:0.0f}, ${2:0.0f}, ${0:0.0f});
+snippet gl gl translate f
+	// multiply the current matrix by a translation matrix
+	gl.glTranslatef(${1:x}, ${2:y}, ${0:z});
+snippet gl gl rotate f
+	// rotate, x-axis, y-axis, z-axiz
+	gl.glRotatef(${1:angle}, ${2:x}, ${3:y}, ${0:z});
+snippet gl gl scale f
+	// multiply the current matrix by a general scaling matrix
+	gl.glScalef(${1:x}, ${2:y}, ${0:z});
+snippet gl gl color 4f
+	gl.glColor4f(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
+snippet gl gl clear color
+	gl.glClearColor(${1:red}, ${2:green}, ${3:blue}, ${0:alpha});
+snippet gl gl color 3f
+	gl.glColor3f(${1:red}, ${2:green}, ${0:blue});
+snippet gl gl push matrix
+	// spush and pop the current matrix stack
+	gl.glPushMatrix();
+	${0}
+	gl.glPopMatrix();
+snippet gl gl gen lists
+	gl.glGenLists(${0:1})
+snippet gl gl flush
+	// Empties buffers. Call this when all previous issues commands completed
+	gl.glFlush();
+	${0}
+snippet gl gl get error
+	println(gl.glGetError());
+snippet gl gl clear
+	gl.glClear(${1:GL.GL_COLOR_BUFFER_BIT}${2: | }${0:GL.GL_DEPTH_BUFFER_BIT});
+
+#frame operations
+snippet frameRate
+	frameRate(${1:30});
+	${0}
+snippet saveFrame
+	saveFrame("${1:filename-####}${0:.ext}");
+
+#size
+snippet size normal
+	size(${1:200}, ${2:200}${0:, P3D});
+snippet size opengl
+	size(${1:200}, ${2:200}${0:, OPENGL});
+
+#PRIMITIVES
+#color
+snippet color
+	color ${1:c}${2: = color(}${3:value1, }${4:value2, }${0:value3)};
+#char
+snippet char
+	char ${1:m}${2: = "}${0:char"};
+#float
+snippet float
+	float ${1:f}${2: = }${0:0.0f};
+#int
+snippet int
+	int ${1:f}${2: = }${0:0};
+#boolean
+snippet boolean
+	boolean ${1:b}${2: = }${0:true};
+#byte
+snippet byte
+	byte ${1:b}${2: = }${0:127};
+#string
+snippet string
+	String ${1:str}${2: = "}${0:CCCP"};
+#array
+snippet array
+	${1:int}[] ${2:numbers}${3: = new $1}[${0:length}];
+#object
+snippet object
+	${1:Object} ${2:o}${3: = new $1}(${0});
+
+#curve
+snippet curve
+	curve(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
+snippet curve 3D
+	curve(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${6:z2}, ${7:x3}, ${8:y3}, ${9:z3}, ${10:x4}, ${11:y4}, ${0:z4});
+snippet curveDetail
+	curveDetail(${0:detail});
+snippet curvePoint
+	curvePoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
+snippet curveTightness
+	curveTightness(${0:squishy});
+
+#bezier
+snippet bezier
+	bezier(${1:x1}, ${2:y1}, ${3:cx1}, ${4:cy1}, ${5:cx2}, ${6:cy2}, ${7:x2}, ${0:y2});
+snippet bezier 3D
+	bezier(${1:x1}, ${2:y1}, ${3:z1}, ${4:cx1}, ${5:cy1}, ${6:cz1}, ${7:cx2}, ${8:cy2}, ${9:cz2}, ${10:x2}, ${11:y2}, ${0:z2});
+snippet bezierDetail
+	bezierDetail(${0:detail});
+snippet bezierTangent
+	bezierTangent(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
+snippet bezierPoint
+	bezierPoint(${1:a}, ${2:b}, ${3:c}, ${4:d}, ${0:t});
+
+#vertex
+snippet vertex
+	vertex(${1:x}, ${2:y}${3:, }${4:u}${5:, }${0:v});
+snippet vertex 3D
+	vertex(${1:x}, ${2:y}, ${3:z}${4:, }${5:u}${6:, }${0:v});
+snippet bezierVertex
+	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cx2}, ${4:cy2}, ${5:x}, ${0:y});
+snippet bezierVertex 3D
+	bezierVertex(${1:cx1}, ${2:cy1}, ${3:cz1}, ${4:cx2}, ${5:cy2}, ${6:cz2}, ${7:x}, ${8:y}, ${0:z});
+snippet curveVertex
+	curveVertex(${1:x}, ${0:y});
+snippet curveVertex 3D
+	curveVertex(${1:x}, ${2:y}, ${0:z});
+
+#stroke
+snippet stroke
+	stroke(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+snippet strokeWeight
+	strokeWeight(${0:1});
+
+#mouse
+snippet mouseDragged
+	void mouseDragged(){
+		${0}
+	}
+snippet mouseMoved
+	void mouseMoved(){
+		${0}
+	}
+snippet mouseReleased
+	void mouseReleased(){
+		${0}
+	}
+snippet mousePressed
+	void mousePressed(){
+		${0}
+	}
+
+#key
+snippet keyReleased
+	void keyReleased(){
+		${0}
+	}
+snippet keyTyped
+	void keyTyped(){
+		${0}
+	}
+snippet keyPressed
+	void keyPressed(){
+		${0}
+	}
+
+#file
+snippet loadStrings
+	loadStrings("${0:filename}");
+snippet saveStrings
+	saveStrings(${1:filename}, ${0:strings});
+snippet loadBytes
+	loadBytes("${0:filename}");
+snippet beginRecord
+	beginRecord(${1:renderer}, ${0:filename});
+snippet saveBytes
+	saveBytes(${1:filename}, ${0:bytes});
+snippet createWriter
+	createWriter(${0:filename});
+snippet createReader
+	createReader(${0:filename});
+
+#matrix
+snippet pushMatrix
+	pushMatrix();
+	${0:};
+	popMatrix();
+
+
+#text
+snippet text data
+	text(${1:data}, ${2:x}, ${3:y}${4:, }${0:z});
+snippet text stringdata
+	text(${1:stringdata}, ${2:x}, ${3:y}, ${4:width}, ${5:height}${6:, }${0:z});
+snippet textSize
+	textSize(${0:size});
+snippet textLeading
+	textLeading(${0:size});
+snippet textWidth
+	textWidth(${0:data});
+snippet font
+	PFont ${1:font};
+	$1 = loadFont("${0:FFScala-32.vlw}");
+#load font
+snippet loadFont
+	${1:font} = loadFont("${0:FFScala-32.vlw}");
+snippet textFont
+	textFont(${1:font}${2:, }${0:size});
+
+#math
+snippet tan
+	tan(${0:rad});
+snippet atan
+	atan(${0:rad});
+snippet atan2
+	atan2(${0:rad});
+snippet sin
+	sin(${0:rad});
+snippet asin
+	asin(${0:rad});
+snippet cos
+	cos(${0:rad});
+snippet acos
+	acos(${0:rad});
+snippet degrees
+	degrees(${0:rad});
+snippet radians
+	radians(${0:deg});
+snippet randomSseed
+	randomSeed(${0:value});
+snippet random
+	random(${1:value1}${2:, }${0:value2});
+snippet pow
+	pow(${1:num}, ${0:exponent});
+snippet floor
+	floor(${0:value});
+snippet sqrt
+	sqrt(${0:value});
+snippet abs
+	abs(${0:value});
+snippet sq
+	sq(${0:value});
+snippet ceil
+	ceil(${0:value});
+snippet exp
+	exp(${0:value});
+snippet round
+	round(${0:value}};
+snippet min
+	min(${1:value1}, ${2:value2}${3:, }${0:value3});
+snippet max
+	max(${1:value1}, ${2:value2}${3:, }${0:value3});
+snippet max array
+	max(${0:array});
+snippet min array
+	min(${0:array});
+snippet log
+	log(${0:value});
+snippet map
+	map(${1:value}, ${2:low1}, ${4:high1}, ${5:low2}, ${0:high2});
+snippet norm
+	norm(${1:value}, ${2:low}, ${0:high});
+snippet constrain
+	constrain(${1:value}, ${2:min}, ${0:max});
+snippet mag
+	mag(${1:a}, ${2:b}${3:, }${0:c});
+snippet dist
+	dist(${1:x1}, ${2:y1}, ${4:x2}, ${0:y2});
+snippet dist 3D
+	dist(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
+
+#noise math
+snippet noise
+	noise(${1:x}${2:, }${3:y}${4:, }${0:z});
+snippet noiseDetail
+	noiseDetail(${1:octaves}${2:, }${0:falloff});
+snippet noiseSeed
+	noiseSeed(${0:x});
+
+#material
+snippet shininess
+	shininess(${0:shine});
+snippet specular
+	specular(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+snippet ambient
+	ambient(${1:value1}, ${2:value2}, ${0:value3});
+snippet emissive
+	emissive(${1:value1}, ${2:value2}, ${0:value3});
+
+#light
+snippet diretionalLight
+	directionalLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
+snippet pointLight
+	pointLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:nx}, ${5:ny}, ${0:nz});
+snippet lightFalloff
+	lightFalloff(${1:constant}, ${2:linear}, ${0:quadratic});
+snippet normal
+	normal(${1:nx}, ${2:ny}, ${0:nz});
+snippet lightSpecular
+	lightSpecular(${1:v1}, ${2:v2}, ${0:v3});
+snippet ambientLight
+	ambientLight(${1:v1}, ${2:v2}, ${3:v3}${7:, ${4:x}, ${5:y}, ${0:z}});
+snippet spotLight
+	spotLight(${1:v1}, ${2:v2}, ${3:v3}, ${4:x}, ${5:y}, ${6:z}, ${7:nx}, ${8:ny}, ${9:nz}, ${10:angle}, ${0:concentration});
+
+#camera
+snippet camera
+	camera(${1:eyeX}, ${2:eyeY}, ${3:eyeZ}, ${4:centerX}, ${5:centerY}, ${6:centerZ}, ${7:upX}, ${8:upY}, ${0:upZ});
+snippet ortho
+	ortho(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
+snippet perspective
+	perspective(${1:fov}, ${2:aspect}, ${3:zNear}, ${0:zFar});
+snippet frustrum
+	frustrum(${1:left}, ${2:right}, ${3:bottom}, ${4:top}, ${5:near}, ${0:far});
+
+#transformations
+snippet rotate
+	rotate${1:X}(${0:angle});
+snippet translate
+	translate(${1:x}, ${2:y}${3:, }${0:z});
+snippet scale size
+	scale(${0:size});
+snippet scale
+	scale(${1:x}, ${2:y}${3:, }${0:z});
+
+#coordinates
+snippet coord
+	${1:model/screen}${2:X}(${3:x}, ${4:y}, ${0:z});
+
+#effects
+snippet brightness
+	brightness(${0:color});
+snippet lerpColor
+	lerpColor(${1:c1}, ${2:c2}, ${0:amt});
+snippet saturation
+	saturation(${0:color});
+snippet hue
+	hue(${0:color});
+snippet alpha
+	alpha(${0:color});
+snippet tint
+	tint(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+
+#pixel
+snippet set pixel
+	set(${1:x}, ${2:y}, ${0:color/image});
+snippet pixels
+	pixels[${0:index}]
+snippet get pixel
+	get(${1:x}, ${2:y}${3:, }${4:width}${5:, }${0:height});
+
+#geometric figures
+snippet triangle
+	triangle(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${0:y3});
+snippet line
+	line(${1:x1}, ${2:y1}, ${3:x2}, ${0:y2});
+snippet line 3D
+	line(${1:x1}, ${2:y1}, ${3:z1}, ${4:x2}, ${5:y2}, ${0:z2});
+snippet arc
+	arc(${1:x}, ${2:y}, ${3:width}, ${4:height}, ${5:start}, ${0:stop});
+snippet point
+	point(${1:x}, ${2:y}${3:, }${0:z});
+snippet quad
+	quad(${1:x1}, ${2:y1}, ${3:x2}, ${4:y2}, ${5:x3}, ${6:y3}, ${7:x4}, ${0:y4});
+snippet ellipse
+	ellipse(${1:x}, ${2:y}, ${3:width}, ${0:height});
+snippet rect
+	rect(${1:x}, ${2:y}, ${3:width}, ${0:height});
+snippet box
+	box(${1:width}, ${2:height}, ${0:depth});
+snippet sphere
+	sphere(${0:radius});
+snippet sphereDetails
+	sphereDetail(${0:n});
+
+#array operations
+snippet split
+	split("${1:str}"${2: , }${0:delimiter});
+snippet splitTokens
+	splitTokens(${1:str}${2:, }${0:tokens});
+snippet join
+	join(${1:strgArray}${2: , }${0:seperator});
+snippet shorten
+	shorten(${0:array});
+snippet concat
+	concat(${1:array1}, ${0:array2});
+snippet subset
+	subset(${1:array}, ${0:offset});
+snippet append
+	append(${1:array}, ${0:element});
+snippet reverse
+	reverse(${0:array});
+snippet splice
+	splice(${1:array}, ${2:value/array2}, ${0:index});
+snippet sort
+	sort(${1:dataArray}${2:, }${0:count});
+snippet expand
+	expand(${1:array}${2:, }${0:newSize});
+snippet arrayCopy
+	arrayCopy(${1:src}, ${2:dest}, ${3:, }${0:length});
+
+#string operations
+snippet str
+	str("${0:str}");
+snippet match
+	match(${1:str}, ${0:regexp});
+snippet trim
+	trim(${0:str});
+snippet nf
+	nf(${2:value}, ${3:left}${4:, }${0:right});
+snippet nfs
+	nfs(${2:value}, ${3:left}${4:, }${0:right});
+snippet nfp
+	nfp(${2:value}, ${3:left}${4:, }${0:right});
+snippet nfc
+	nfc(${1:value}${2:, }${0:right});
+
+#convert
+snippet unbinary
+	unbinary("${0:str}"});
+snippet hexadecimal
+	hex(${0:c});
+snippet unhex
+	unhex(${0:c});
+snippet binary
+	binary(${1:value}${2:, }${0:digits});
+
+#image operations
+snippet loadImage
+	loadImage(${0:filename});
+snippet image
+	image(${1:img}, ${2:x}, ${3:y}${4:, }${5:width}${6:, }${0:height});
+snippet copy
+	copy(${1:srcImg}${2:, }${3:x}, ${4:y}, ${5:width}, ${6:height}, ${7:dx}, ${8:dy}, ${9:dwidth}, ${0:dheight});
+
+
+
+#containers
+snippet bg
+	background(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+snippet pg
+	PGraphics pg;
+	pg = createGraphics(${1:width}, ${2:height}${3:, }${0:applet});
+snippet pimage
+	PImage(${1:width}, ${0:height});
+
+#UTILS
+#fill
+snippet fill
+	fill(${1:value1}, ${2:value2}, ${3:value3}${4:, }${0:alpha});
+#red
+snippet red
+	red(${0:color});
+#green
+snippet green
+	green(${0:color});
+#blue
+snippet blue
+	blue(${0:color});
+#status
+snippet status
+	status(${0:text});
+#param
+snippet param
+	param(${0:s});
+#link
+snippet link
+	link(${1:url}${2:, }${0:target});
+#@param
+snippet @
+	@${1:param/return/private/public}  ${1:parameter}  ${0:description}
diff --git a/vim/snippets/vim-snippets/snippets/progress.snippets b/vim/snippets/vim-snippets/snippets/progress.snippets
new file mode 100644
index 0000000..dee07a8
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/progress.snippets
@@ -0,0 +1,58 @@
+# Progress/OpenEdge ABL snippets
+# define
+snippet defbuf
+	DEFINE BUFFER b_${1:TableName} FOR $1 ${0}.
+snippet defvar
+	DEFINE VARIABLE ${1:VariableName} AS ${0}.
+snippet nl
+	NO-LOCK
+snippet ne
+	NO-ERROR
+snippet nle
+	NO-LOCK NO-ERROR
+snippet ini
+	INITIAL ${0:?}
+snippet nu
+	NO-UNDO
+snippet err
+	ERROR
+snippet ff
+	FIND FIRST ${1:BufferName}
+	${2:WHERE $1.${3}} ${0}
+snippet input
+	DEFINE INPUT PARAMETER ${1:ParamName} AS ${0}.
+snippet output
+	DEFINE OUTPUT PARAMETER ${1:ParamName} AS ${0:ParamType}.
+snippet proc
+
+	/******************************************************************************/
+
+	PROCEDURE ${1:ProcName}:
+
+		${0}
+
+	END PROCEDURE. /* $1 */
+
+	/******************************************************************************/
+
+snippet alert
+	MESSAGE "${1:MessageContent}" ${2:Data} VIEW-AS ALERT-BOX.
+snippet if
+	IF ${1:Condition}
+	THEN ${2:Action}
+	${3:ELSE ${4:OtherWise}}
+snippet do
+	DO${1: Clauses}:
+		${0}
+	END.
+# datatypes
+snippet int
+	INTEGER
+snippet char
+	CHARACTER
+snippet log
+	LOGICAL
+snippet dec
+	DECIMAL
+snippet sep
+	/* ------------------------------------------------------------------------- */
diff --git a/vim/snippets/vim-snippets/snippets/ps1.snippets b/vim/snippets/vim-snippets/snippets/ps1.snippets
new file mode 100644
index 0000000..acab10c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/ps1.snippets
@@ -0,0 +1,58 @@
+# Snippets for 
+# Authored by Trevor Sullivan <trevor@trevorsullivan.net>
+
+# PowerShell Class
+snippet class
+	class {
+		[string] ${0:FirstName}
+	}
+
+# PowerShell Advanced Function 
+snippet function
+	function {0:name} {
+		[CmdletBinding()]
+		param (
+			[Parameter(Mandatory = $true)]
+			[string] $Param1
+		)
+
+		begin {
+		}
+
+		process {
+		}
+
+		end {
+		}
+	}
+
+# PowerShell Splatting
+snippet splatting
+	$Params = @{
+		${0:Param1} = 'Value1'
+		${1:Param2} = 'Value2'
+	}
+	${3:CommandName}
+
+# PowerShell Enumeration
+snippet enum
+	enum ${0:name} {
+		${1:item1}
+		${2:item2}
+	}
+
+# PowerShell if..then
+snippet if
+	if (${0:condition}) {
+		${1:statement}
+	}
+
+# PowerShell While Loop
+snippet while
+	while (${0:condition}) {
+		${1:statement}
+	}
+
+# PowerShell Filter..Sort
+snippet filtersort
+	${0:command} | Where-Object -FilterScript { $PSItem.${1:property} -${2:operator} '${3:expression}' } | Sort-Object -Property ${4:sortproperty}
diff --git a/vim/snippets/vim-snippets/snippets/puppet.snippets b/vim/snippets/vim-snippets/snippets/puppet.snippets
new file mode 100644
index 0000000..9e9ceeb
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/puppet.snippets
@@ -0,0 +1,269 @@
+# Snippets for use with VIM and http://www.vim.org/scripts/script.php?script_id=2540
+#
+# Please contact R.I.Pienaar <rip@devco.net> for additions and feedback,
+# see it in action @ http://www.devco.net/archives/2009/09/22/vim_and_puppet.php
+
+# Header to match http://docs.puppetlabs.com/guides/style_guide.html#puppet-doc
+snippet classheader
+	# == Class: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:h:h'), 'name')`}
+	#
+	# ${2:Full description of class $1 here}
+	#
+	# === Parameters
+	#
+	# Document parameters here.
+	#
+	# [*parameter1*]
+	#   Explanation of what this parameter affects and what it defaults to.
+	#   e.g. "Specify one or more upstream ntp servers as an array."
+	#
+	# === Variables
+	#
+	# Here you should define a list of variables that this module would require.
+	#
+	# [*variable1*]
+	#   Explanation of how this variable affects the funtion of this class and
+	#   if it has a default. e.g. "The parameter enc_ntp_servers must be set by the
+	#   External Node Classifier as a comma separated list of hostnames."
+	#
+	# === Examples
+	#
+	#  class { '$1':
+	#    parameter1 => [ 'just', 'an', 'example', ]
+	#  }
+	#
+	# === Authors
+	#
+	# `g:snips_author` <`g:snips_email`>
+	#
+	# === Copyright
+	#
+	# Copyright `strftime("%Y")` `g:snips_author`
+	#
+	class $1 (${3}){
+		${4}
+	}
+
+snippet defheader
+	# == Define: ${1:`vim_snippets#Filename(expand('%:p:s?.*modules/??:r:s?/manifests/?::?'), 'name')`}
+	#
+	# ${2:Full description of defined resource type $1 here}
+	#
+	# === Parameters
+	#
+	# Document parameters here
+	#
+	# [*namevar*]
+	#   If there is a parameter that defaults to the value of the title string
+	#   when not explicitly set, you must always say so.  This parameter can be
+	#   referred to as a "namevar," since it's functionally equivalent to the
+	#   namevar of a core resource type.
+	#
+	# [*basedir*]
+	#   Description of this variable.  For example, "This parameter sets the
+	#   base directory for this resource type.  It should not contain a trailing
+	#   slash."
+	#
+	# === Examples
+	#
+	# Provide some examples on how to use this type:
+	#
+	#   $1 { 'namevar':
+	#     basedir => '/tmp/src',
+	#   }
+	#
+	# === Authors
+	#
+	# `g:snips_author` <`g:snips_email`>
+	#
+	# === Copyright
+	#
+	# Copyright `strftime("%Y")` `g:snips_author`
+	#
+	define $1(${3}) {
+		${4}
+	}
+
+# Language Constructs
+snippet class
+	class ${1:`vim_snippets#Filename('', 'name')`} {
+		${0}
+	}
+snippet node
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
+		${0}
+	}
+snippet case
+	case $${1:variable} {
+		default: { ${0} }
+	}
+snippet ife
+	if $${1:variable} {
+		${2}
+	} else {
+		${0}
+	}
+snippet if
+	if $${1:variable} {
+		${0}
+	}
+snippet ifd
+	if defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
+snippet ifnd
+	if !defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
+snippet el
+	else {
+		${0}
+	}
+snippet ?
+	? {
+		"${1}"	=> ${0}
+	  }
+#
+# blocks etc and general syntax sugar
+snippet [
+	[ ${1} ]
+snippet >
+	${1}	=> ${0}
+snippet p:
+	"puppet://puppet/${1:module name}/${0:file name}"
+#
+# Functions
+snippet alert
+	alert("${1:message}")
+snippet crit
+	crit("${1:message}")
+snippet debug
+	debug("${1:message}")
+snippet defined
+	defined(${1:Resource}["${2:name}"])
+snippet emerg
+	emerg("${1:message}")
+snippet extlookup Simple extlookup
+	extlookup("${1:variable}")
+snippet extlookup Extlookup with defaults
+	extlookup("${1:variable}", "${2:default}")
+snippet extlookup Extlookup with defaults and custom data file
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
+snippet fail
+	fail("${1:message}")
+snippet info
+	info("${1:message}")
+snippet inline_template
+	inline_template("<%= ${1} %>")
+snippet notice
+	notice("${1:message}")
+snippet realize
+	realize(${1:Resource}[${2:name}])
+snippet regsubst
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
+snippet inc
+	include ${1:classname}
+snippet split
+	split(${1:hay stack}, "${2:patten}")
+snippet versioncmp
+	versioncmp("${1:version}", "${2:version}")
+snippet warning
+	warning("${1:message}")
+#
+# Types
+snippet cron
+	cron { "${1:name}":
+		command => "${2}",
+		user    => "${3:root}",
+		${4}    => ${0},
+	}
+
+snippet exec
+	exec { "${1:name}":
+		command => "${2:$1}",
+		user    => "${3:root}",
+		${4}    => ${0},
+	}
+
+snippet user
+	user { "${1:user}":
+		ensure      => present,
+		comment     => "${2:$1}",
+		managehome  => true,
+		home        => "${0:/home/$1}",
+	}
+
+snippet group
+	group { "${1:group}":
+		ensure => ${0:present},
+	}
+
+snippet host
+	host { "${1:hostname}":
+		ip => ${0:127.0.0.1},
+	}
+
+snippet mailalias
+	mailalias { "${1:localpart}":
+		recipient => "${0:recipient}",
+	}
+
+snippet mount
+	mount { "${1:destination path}":
+		ensure	=> ${2:mounted},
+		device	=> "${0:device name or path}",
+	}
+
+snippet package
+	package { "${1:package name}":
+		ensure	=> ${0:present},
+	}
+
+snippet yumrepo
+	yumrepo { "${1:repo name}":
+		descr   => "${2:$1}",
+		enabled => ${0:1},
+	}
+
+snippet define
+	define ${1} (${2}) {
+		${0}
+	}
+
+snippet service
+	service { "${1:service}" :
+		ensure    => running,
+		enable    => true,
+		require   => [ Package["${2:package}"], File["${3:file}"], ],
+		subscribe => [ File["${4:configfile1}"], File["${5:configfile2}"], Package["${6:package}"], ],
+	}
+
+snippet file
+	file { "${1:filename}" :
+		ensure  => ${2:present},
+		owner   => "${3:root}",
+		group   => "${4:root}",
+		mode    => "${5:0644}",
+		source  => "puppet:///modules/${6:module}/${7:source}",
+		content => template("${8:module}/${9:template}"),
+		alias   => "${10:alias}",
+		require => [ Package["${11:package}"], File["${12:file}"], ],
+	}
+
+snippet archive
+	archive { "${1:filename}" :
+		ensure     => ${2:present},
+		url        => "http://${3:url}",
+		extension  => "${4:tgz}",
+		target     => "${5:target}",
+		checksum   => ${6:false},
+		src_target => "${7:/tmp}",
+	}
+
+snippet firewall
+	firewall { "${1:comment}" :
+		proto	=> ${2:tcp},
+		action	=> ${3:accept},
+		port	=> ${4},
+	}
+
diff --git a/vim/snippets/vim-snippets/snippets/purescript.snippets b/vim/snippets/vim-snippets/snippets/purescript.snippets
new file mode 100644
index 0000000..cdbcbd2
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/purescript.snippets
@@ -0,0 +1,57 @@
+snippet mod
+	module `substitute(substitute(expand('%:r'), '[/\\]','.','g'),'^\%(\l*\.\)\?','','')`
+		(
+		) where
+
+	import Prelude
+
+	${0}
+snippet imp
+	import ${0:Data.List}
+snippet impq
+	import ${1:Data.List} as ${0:List}
+snippet fn0
+	${1:name} :: ${2:a}
+	$1 = ${0:undefined}
+snippet fn
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4}= ${0}
+snippet fn1
+	${1:fn} :: ${2:a} -> ${3:a}
+	$1 ${4}= ${0}
+snippet fn2
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a}
+	$1 ${5}= ${0}
+snippet fn3
+	${1:fn} :: ${2:a} -> ${3:a} -> ${4:a} -> ${5:a}
+	$1 ${6}= ${0}
+snippet case
+	case ${1} of
+		${2} -> ${0}
+snippet let
+	let
+		${1} = ${2}
+	in
+		${3}
+snippet where
+	where
+		${1} = ${0}
+snippet testunit
+	module Test.Main where
+
+	import Prelude
+	import Test.Unit (suite, test)
+	import Test.Unit.Main (runTest)
+	import Test.Unit.Assert as Assert
+
+	main = runTest do
+		suite "${1}" do
+			test "${2:the tests run}" do
+				Assert.equal
+					"Hello, world!"
+					"Hello, sailor!"
+snippet if
+	if ${1} then
+		${2:${VISUAL}}
+	else
+		${0}
diff --git a/vim/snippets/vim-snippets/snippets/python.snippets b/vim/snippets/vim-snippets/snippets/python.snippets
new file mode 100644
index 0000000..9e35a2f
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/python.snippets
@@ -0,0 +1,242 @@
+snippet #!
+	#!/usr/bin/env python
+	# -*- coding: utf-8 -*-
+snippet #!3
+	#!/usr/bin/env python3
+	# -*- coding: utf-8 -*-
+snippet imp
+	import ${0:module}
+snippet uni
+	def __unicode__(self):
+		${0:representation}
+snippet from
+	from ${1:package} import ${0:module}
+# Module Docstring
+snippet docs
+	"""
+	File: ${1:`vim_snippets#Filename('$1.py', 'foo.py')`}
+	Author: `g:snips_author`
+	Email: `g:snips_email`
+	Github: `g:snips_github`
+	Description: ${0}
+	"""
+
+snippet wh
+	while ${1:condition}:
+		${0:${VISUAL}}
+# dowh - does the same as do...while in other languages
+snippet dowh
+	while True:
+		${1}
+		if ${0:condition}:
+			break
+snippet with
+	with ${1:expr} as ${2:var}:
+		${0:${VISUAL}}
+# New Class
+snippet cl
+	class ${1:ClassName}(${2:object}):
+		"""${3:docstring for $1}"""
+		def __init__(self, ${4:arg}):
+			${5:super($1, self).__init__()}
+			self.$4 = $4
+			${0}
+# New Function
+snippet def
+	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
+		"""${3:docstring for $1}"""
+		${0}
+snippet deff
+	def ${1:fname}(${2:`indent('.') ? 'self' : ''`}):
+		${0}
+# New Method
+snippet defm
+	def ${1:mname}(self, ${2:arg}):
+		${0}
+# New Property
+snippet property
+	def ${1:foo}():
+		doc = "${2:The $1 property.}"
+		def fget(self):
+			${3:return self._$1}
+		def fset(self, value):
+			${4:self._$1 = value}
+		def fdel(self):
+			${0:del self._$1}
+		return locals()
+	$1 = property(**$1())
+# Ifs
+snippet if
+	if ${1:condition}:
+		${0:${VISUAL}}
+snippet el
+	else:
+		${0:${VISUAL}}
+snippet ei
+	elif ${1:condition}:
+		${0:${VISUAL}}
+# For
+snippet for
+	for ${1:item} in ${2:items}:
+		${0}
+# Encodes
+snippet cutf8
+	# -*- coding: utf-8 -*-
+snippet clatin1
+	# -*- coding: latin-1 -*-
+snippet cascii
+	# -*- coding: ascii -*-
+# Lambda
+snippet ld
+	${1:var} = lambda ${2:vars} : ${0:action}
+snippet .
+	self.
+snippet try Try/Except
+	try:
+		${1:${VISUAL}}
+	except ${2:Exception} as ${3:e}:
+		${0:raise $3}
+snippet try Try/Except/Else
+	try:
+		${1:${VISUAL}}
+	except ${2:Exception} as ${3:e}:
+		${4:raise $3}
+	else:
+		${0}
+snippet try Try/Except/Finally
+	try:
+		${1:${VISUAL}}
+	except ${2:Exception} as ${3:e}:
+		${4:raise $3}
+	finally:
+		${0}
+snippet try Try/Except/Else/Finally
+	try:
+		${1:${VISUAL}}
+	except ${2:Exception} as ${3:e}:
+		${4:raise $3}
+	else:
+		${5}
+	finally:
+		${0}
+# if __name__ == '__main__':
+snippet ifmain
+	if __name__ == '__main__':
+		${0:main()}
+# __magic__
+snippet _
+	__${1:init}__
+# python debugger (pdb)
+snippet pdb
+	import pdb
+	pdb.set_trace()
+# bpython debugger (bpdb)
+snippet bpdb
+	import bpdb
+	bpdb.set_trace()
+# ipython debugger (ipdb)
+snippet ipdb
+	import ipdb
+	ipdb.set_trace()
+# embed ipython itself
+snippet iem
+	import IPython
+	IPython.embed()
+# remote python debugger (rpdb)
+snippet rpdb
+	import rpdb
+	rpdb.set_trace()
+# web python debugger (wdb)
+snippet wdb
+	import wdb
+	wdb.set_trace()
+# ptpython
+snippet ptpython
+	from ptpython.repl import embed
+	embed(globals(), locals(), vi_mode=${1:False}, history_filename=${2:None})
+# python console debugger (pudb)
+snippet pudb
+	import pudb
+	pudb.set_trace()
+# pdb in nosetests
+snippet nosetrace
+	from nose.tools import set_trace
+	set_trace()
+snippet pprint
+	import pprint
+	pprint.pprint(${1})
+snippet "
+	"""${0:doc}
+	"""
+# assertions
+snippet a=
+	self.assertEqual(${0}, ${1})
+# test function/method
+snippet test
+	def test_${1:description}(${2:`indent('.') ? 'self' : ''`}):
+		${0}
+# test case
+snippet testcase
+	class ${1:ExampleCase}(unittest.TestCase):
+
+		def test_${2:description}(self):
+			${0}
+snippet fut
+	from __future__ import ${0}
+#getopt
+snippet getopt
+	try:
+		# Short option syntax: "hv:"
+		# Long option syntax: "help" or "verbose="
+		opts, args = getopt.getopt(sys.argv[1:], "${1:short_options}", [${2:long_options}])
+
+	except getopt.GetoptError, err:
+		# Print debug info
+		print str(err)
+		${3:error_action}
+
+	for option, argument in opts:
+		if option in ("-h", "--help"):
+			${0}
+		elif option in ("-v", "--verbose"):
+			verbose = argument
+# logging
+# glog = get log
+snippet glog
+	import logging
+	logger = logging.getLogger(${0:__name__})
+snippet le
+	logger.error(${0:msg})
+# conflict with lambda=ld, therefor we change into Logger.debuG
+snippet lg
+	logger.debug(${0:msg})
+snippet lw
+	logger.warning(${0:msg})
+snippet lc
+	logger.critical(${0:msg})
+snippet li
+	logger.info(${0:msg})
+snippet epydoc
+	"""${1:Description}
+
+	@param ${2:param}: ${3: Description}
+	@type  $2: ${4: Type}
+
+	@return: ${5: Description}
+	@rtype : ${6: Type}
+
+	@raise e: ${0: Description}
+	"""
+snippet dol
+	def ${1:__init__}(self, *args, **kwargs):
+	    super(${0:ClassName}, self).$1(*args, **kwargs)
+snippet kwg
+	self.${1:var_name} = kwargs.get('$1', ${2:None})
+snippet lkwg
+	${1:var_name} = kwargs.get('$1', ${2:None})
+snippet args
+	*args${1:,}${0}
+snippet kwargs
+	**kwargs${1:,}${0}
+snippet akw
+	*args, **kwargs${1:,}${0}
diff --git a/vim/snippets/vim-snippets/snippets/r.snippets b/vim/snippets/vim-snippets/snippets/r.snippets
new file mode 100644
index 0000000..7bdeeec
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/r.snippets
@@ -0,0 +1,131 @@
+snippet #!
+	#!/usr/bin/env Rscript
+
+# includes
+snippet lib
+	library(${0:package})
+snippet req
+	require(${0:package})
+snippet source
+	source('${0:file}')
+
+# conditionals
+snippet if
+	if (${1:condition}) {
+		${0}
+	}
+snippet el
+	else {
+		${0}
+	}
+snippet ei
+	else if (${1:condition}) {
+		${0}
+	}
+
+# loops
+snippet wh
+	while(${1}) {
+		${2}
+	}
+snippet for
+	for (${1:item} in ${2:list}) {
+		${3}
+	}
+
+# functions
+snippet fun
+	${1:name} <- function (${2:variables}) {
+		${0}
+	}
+snippet ret
+	return(${0})
+
+# dataframes, lists, etc
+snippet df
+	${1:name}[${2:rows}, ${0:cols}]
+snippet c
+	c(${0:items})
+snippet li
+	list(${0:items})
+snippet mat
+	matrix(${1:data}, nrow = ${2:rows}, ncol = ${0:cols})
+
+# apply functions
+snippet apply
+	apply(${1:array}, ${2:margin}, ${0:function})
+snippet lapply
+	lapply(${1:list}, ${0:function})
+snippet sapply
+	lapply(${1:list}, ${0:function})
+snippet vapply
+	vapply(${1:list}, ${2:function}, ${0:type})
+snippet mapply
+	mapply(${1:function}, ${0:...})
+snippet tapply
+	tapply(${1:vector}, ${2:index}, ${0:function})
+snippet rapply
+	rapply(${1:list}, ${0:function})
+
+# plyr functions
+snippet dd
+	ddply(${1:frame}, ${2:variables}, ${0:function})
+snippet dl
+	dlply(${1:frame}, ${2:variables}, ${0:function})
+snippet da
+	daply(${1:frame}, ${2:variables}, ${0:function})
+snippet d_
+	d_ply(${1:frame}, ${2:variables}, ${0:function})
+
+snippet ad
+	adply(${1:array}, ${2:margin}, ${0:function})
+snippet al
+	alply(${1:array}, ${2:margin}, ${0:function})
+snippet aa
+	aaply(${1:array}, ${2:margin}, ${0:function})
+snippet a_
+	a_ply(${1:array}, ${2:margin}, ${0:function})
+
+snippet ld
+	ldply(${1:list}, ${0:function})
+snippet ll
+	llply(${1:list}, ${0:function})
+snippet la
+	laply(${1:list}, ${0:function})
+snippet l_
+	l_ply(${1:list}, ${0:function})
+
+snippet	md
+	mdply(${1:matrix}, ${0:function})
+snippet	ml
+	mlply(${1:matrix}, ${0:function})
+snippet	ma
+	maply(${1:matrix}, ${0:function})
+snippet	m_
+	m_ply(${1:matrix}, ${0:function})
+
+# plot functions
+snippet pl
+	plot(${1:x}, ${0:y})
+snippet ggp
+	ggplot(${1:data}, aes(${0:aesthetics}))
+snippet img
+	${1:(jpeg,bmp,png,tiff)}(filename = '${2:filename}', width = ${3}, height = ${4}, unit = '${5}')
+	${0:plot}
+	dev.off()
+
+# statistical test functions
+snippet fis
+	fisher.test(${1:x}, ${0:y})
+snippet chi
+	chisq.test(${1:x}, ${0:y})
+snippet tt
+	t.test(${1:x}, ${0:y})
+snippet wil
+	wilcox.test(${1:x}, ${0:y})
+snippet cor
+	cor.test(${1:x}, ${0:y})
+snippet fte
+	var.test(${1:x}, ${0:y})
+snippet kvt
+	kv.test(${1:x}, ${0:y})
diff --git a/vim/snippets/vim-snippets/snippets/rails.snippets b/vim/snippets/vim-snippets/snippets/rails.snippets
new file mode 100644
index 0000000..6a5c5ff
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/rails.snippets
@@ -0,0 +1,490 @@
+snippet art
+	assert_redirected_to ${1:action}: '${2:index}'
+snippet artnp
+	assert_redirected_to ${1:parent}_${2:child}_path(${3:@$1}, ${0:@$2})
+snippet artnpp
+	assert_redirected_to ${1:parent}_${2:child}_path(${0:@$1})
+snippet artp
+	assert_redirected_to ${1:model}_path(${0:@$1})
+snippet artpp
+	assert_redirected_to ${0:model}s_path
+snippet asd
+	assert_difference '${1:Model}.${2:count}', ${3:1} do
+		${0}
+	end
+snippet asnd
+	assert_no_difference '${1:Model}.${2:count}' do
+		${0}
+	end
+snippet asre
+	assert_response :${1:success}, @response.body
+snippet asrj
+	assert_rjs :${1:replace}, '${0:dom id}'
+snippet ass assert_select(..)
+	assert_select '${1:path}', ${2:text}: '${3:inner_html}' ${4:do}
+		${0}
+	end
+snippet ba
+	before_action :${0:method}
+snippet bf
+	before_filter :${0:method}
+snippet bt
+	belongs_to :${0:association}
+snippet btp
+	belongs_to :${1:association}, polymorphic: true
+snippet crw
+	cattr_accessor :${0:attr_names}
+snippet defcreate
+	def create
+		@${1:model_class_name} = ${2:ModelClassName}.new($1_params)
+
+		respond_to do |format|
+			if @$1.save
+				flash[:notice] = '$2 was successfully created.'
+				format.html { redirect_to(@$1) }
+				format.xml  { render xml: @$1, status: :created, location: @$1 }
+			else
+				format.html { render action: 'new' }
+				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+snippet defdestroy
+	def destroy
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+		@$1.destroy
+
+		respond_to do |format|
+			format.html { redirect_to($1s_url) }
+			format.xml  { head :ok }
+		end
+	end
+snippet defedit
+	def edit
+		@${1:model_class_name} = ${0:ModelClassName}.find(params[:id])
+	end
+snippet defindex
+	def index
+		@${1:model_class_name} = ${2:ModelClassName}.all
+
+		respond_to do |format|
+			format.html # index.html.erb
+			format.xml  { render xml: @$1s }
+		end
+	end
+snippet defnew
+	def new
+		@${1:model_class_name} = ${2:ModelClassName}.new
+
+		respond_to do |format|
+			format.html # new.html.erb
+			format.xml  { render xml: @$1 }
+		end
+	end
+snippet defshow
+	def show
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+
+		respond_to do |format|
+			format.html # show.html.erb
+			format.xml  { render xml: @$1 }
+		end
+	end
+snippet defupdate
+	def update
+		@${1:model_class_name} = ${2:ModelClassName}.find(params[:id])
+
+		respond_to do |format|
+			if @$1.update($1_params)
+				flash[:notice] = '$2 was successfully updated.'
+				format.html { redirect_to(@$1) }
+				format.xml  { head :ok }
+			else
+				format.html { render action: 'edit' }
+				format.xml  { render xml: @$1.errors, status: :unprocessable_entity }
+			end
+		end
+	end
+snippet defparams
+	def ${1:model_class_name}_params
+		params.require(:$1).permit()
+	end
+snippet dele delegate .. to
+	delegate :${1:methods}, to: :${0:object}
+snippet dele delegate .. to .. prefix .. allow_nil
+	delegate :${1:methods}, to: :${2:object}, prefix: :${3:prefix}, allow_nil: ${0:allow_nil}
+snippet amc
+	alias_method_chain :${1:method_name}, :${0:feature}
+snippet flash
+	flash[:${1:notice}] = '${0}'
+snippet habtm
+	has_and_belongs_to_many :${1:object}, join_table: '${2:table_name}', foreign_key: '${3}_id'
+snippet hm
+	has_many :${0:object}
+snippet hmd
+	has_many :${1:other}s, class_name: '${2:$1}', foreign_key: '${3:$1}_id', dependent: :destroy
+snippet hmt
+	has_many :${1:object}, through: :${0:object}
+snippet ho
+	has_one :${0:object}
+snippet hod
+	has_one :${1:object}, dependent: :${0:destroy}
+snippet i18
+	I18n.t('${1:type.key}')
+snippet ist
+	<%= image_submit_tag('${1:agree.png}', id: '${2:id}'${0}) %>
+snippet log
+	Rails.logger.${1:debug} ${0}
+snippet log2
+	RAILS_DEFAULT_LOGGER.${1:debug} ${0}
+snippet logd
+	logger.debug { '${1:message}' }
+snippet loge
+	logger.error { '${1:message}' }
+snippet logf
+	logger.fatal { '${1:message}' }
+snippet logi
+	logger.info { '${1:message}' }
+snippet logw
+	logger.warn { '${1:message}' }
+snippet mapc
+	${1:map}.${2:connect} '${0:controller/:action/:id}'
+snippet mapca
+	${1:map}.catch_all '*${2:anything}', controller: '${3:default}', action: '${4:error}'
+snippet mapr
+	${1:map}.resource :${0:resource}
+snippet maprs
+	${1:map}.resources :${0:resource}
+snippet mapwo
+	${1:map}.with_options ${2:controller}: '${3:thing}' do |$3|
+		${0}
+	end
+
+###############################
+#   model callback snippets   #
+###############################
+
+# before callback
+snippet mbv
+	before_validation :${0:method}
+snippet mbc
+	before_create :${0:method}
+snippet mbu
+	before_update :${0:method}
+snippet mbs
+	before_save :${0:method}
+snippet mbd
+	before_destroy :${0:method}
+
+# after callback
+snippet mav
+	after_validation :${0:method}
+snippet maf
+	after_find :${0:method}
+snippet mat
+	after_touch :${0:method}
+snippet macr
+	after_create :${0:method}
+snippet mau
+	after_update :${0:method}
+snippet mas
+	after_save :${0:method}
+snippet mad
+	after_destroy :${0:method}
+
+# around callback
+snippet marc
+	around_create :${0:method}
+snippet maru
+	around_update :${0:method}
+snippet mars
+	around_save :${0:method}
+snippet mard
+	around_destroy :${0:method}
+
+snippet mcht
+	change_table :${1:table_name} do |t|
+		${0}
+	end
+snippet mp
+	map(&:${0:id})
+snippet mrw
+	mattr_accessor :${0:attr_names}
+snippet oa
+	order('${0:field}')
+snippet od
+	order('${0:field} DESC')
+snippet pa
+	params[:${1:id}]
+snippet ra
+	render action: '${0:action}'
+snippet ral
+	render action: '${1:action}', layout: '${0:layoutname}'
+snippet rest
+	respond_to do |format|
+		format.${1:html} { ${0} }
+	end
+snippet rf
+	render file: '${0:filepath}'
+snippet rfu
+	render file: '${1:filepath}', use_full_path: ${0:false}
+snippet ri
+	render inline: "${0:<%= 'hello' %>}"
+snippet ril
+	render inline: "${1:<%= 'hello' %>}", locals: { ${2:name}: '${3:value}'${0} }
+snippet rit
+	render inline: "${1:<%= 'hello' %>}", type: ${0::rxml}
+snippet rjson
+	render json: '${0:text to render}'
+snippet rl
+	render layout: '${0:layoutname}'
+snippet rn
+	render nothing: ${0:true}
+snippet rns
+	render nothing: ${1:true}, status: ${0:401}
+snippet rp
+	render partial: '${0:item}'
+snippet rpc
+	render partial: '${1:item}', collection: ${0:@$1s}
+snippet rpl
+	render partial: '${1:item}', locals: { ${2:$1}: ${0:@$1} }
+snippet rpo
+	render partial: '${1:item}', object: ${0:@$1}
+snippet rps
+	render partial: '${1:item}', status: ${0:500}
+snippet rt
+	render text: '${0:text to render}'
+snippet rtl
+	render text: '${1:text to render}', layout: '${0:layoutname}'
+snippet rtlt
+	render text: '${1:text to render}', layout: ${0:true}
+snippet rts
+	render text: '${1:text to render}', status: ${0:401}
+snippet ru
+	render :update do |${1:page}|
+		$1.${0}
+	end
+snippet rxml
+	render xml: '${0:text to render}'
+snippet sc
+	scope :${1:name}, -> { where(${2:field}: ${0:value}) }
+snippet sl
+	scope :${1:name}, lambda do |${2:value}|
+		where('${3:field = ?}', ${0:value})
+	end
+snippet sha1
+	Digest::SHA1.hexdigest(${0:string})
+snippet sweeper
+	class ${1:ModelClassName}Sweeper < ActionController::Caching::Sweeper
+		observe $1
+
+		def after_save(${0:model_class_name})
+			expire_cache($2)
+		end
+
+		def after_destroy($2)
+			expire_cache($2)
+		end
+
+		def expire_cache($2)
+			expire_page
+		end
+	end
+snippet va validates_associated
+	validates_associated :${0:attribute}
+snippet va validates .., acceptance: true
+	validates :${0:terms}, acceptance: true
+snippet vc
+	validates :${0:attribute}, confirmation: true
+snippet ve
+	validates :${1:attribute}, exclusion: { in: ${0:%w( mov avi )} }
+snippet vf
+	validates :${1:attribute}, format: { with: /${0:regex}/ }
+snippet vi
+	validates :${1:attribute}, inclusion: { in: %w(${0: mov avi }) }
+snippet vl
+	validates :${1:attribute}, length: { in: ${2:3}..${0:20} }
+snippet vn
+	validates :${0:attribute}, numericality: true
+snippet vp
+	validates :${0:attribute}, presence: true
+snippet vu
+	validates :${0:attribute}, uniqueness: true
+snippet format
+	format.${1:js|xml|html} { ${0} }
+snippet wc
+	where(${1:'conditions'}${0:, bind_var})
+snippet wf
+	where(${1:field}: ${0:value})
+snippet xdelete
+	xhr :delete, :${1:destroy}, id: ${2:1}
+snippet xget
+	xhr :get, :${1:show}, id: ${2:1}
+snippet xpost
+	xhr :post, :${1:create}, ${2:object}: ${3:object}
+snippet xput
+	xhr :put, :${1:update}, id: ${2:1}, ${3:object}: ${4:object}
+snippet test
+	test '${1:should do something}' do
+		${0}
+	end
+###########################
+#   migrations snippets   #
+###########################
+snippet mac
+	add_column :${1:table_name}, :${2:column_name}, :${0:data_type}
+snippet mai
+	add_index :${1:table_name}, :${0:column_name}
+snippet mrc
+	remove_column :${1:table_name}, :${0:column_name}
+snippet mrnc
+	rename_column :${1:table_name}, :${2:old_column_name}, :${0:new_column_name}
+snippet mcc
+	change_column :${1:table}, :${2:column}, :${0:type}
+snippet mnc
+	t.${1:string} :${2:title}${3:, null: false}
+snippet mct
+	create_table :${1:table_name} do |t|
+		${0}
+	end
+snippet migration class .. < ActiveRecord::Migration .. def up .. def down .. end
+	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
+		def up
+			${0}
+		end
+
+		def down
+		end
+	end
+snippet migration class .. < ActiveRecord::Migration .. def change .. end
+	class `substitute( substitute(vim_snippets#Filename(), '^\d\+_', '',''), '\(_\|^\)\(.\)', '\u\2', 'g')` < ActiveRecord::Migration
+		def change
+			${0}
+		end
+	end
+snippet trc
+	t.remove :${0:column}
+snippet tre
+	t.rename :${1:old_column_name}, :${2:new_column_name}
+	${0}
+snippet tref
+	t.references :${0:model}
+snippet tcb
+	t.boolean :${1:title}
+	${0}
+snippet tcbi
+	t.binary :${1:title}, limit: ${2:2}.megabytes
+	${0}
+snippet tcd
+	t.decimal :${1:title}, precision: ${2:10}, scale: ${3:2}
+	${0}
+snippet tcda
+	t.date :${1:title}
+	${0}
+snippet tcdt
+	t.datetime :${1:title}
+	${0}
+snippet tcf
+	t.float :${1:title}
+	${0}
+snippet tch
+	t.change :${1:name}, :${2:string}, ${3:limit}: ${4:80}
+	${0}
+snippet tci
+	t.integer :${1:title}
+	${0}
+snippet tcl
+	t.integer :lock_version, null: false, default: 0
+	${0}
+snippet tcr
+	t.references :${1:taggable}, polymorphic: { default: '${2:Photo}' }
+	${0}
+snippet tcs
+	t.string :${1:title}
+	${0}
+snippet tct
+	t.text :${1:title}
+	${0}
+snippet tcti
+	t.time :${1:title}
+	${0}
+snippet tcts
+	t.timestamp :${1:title}
+	${0}
+snippet tctss
+	t.timestamps
+	${0}
+##########################
+#     Rspec snippets     #
+##########################
+#ShouldaMatchers#ActionController
+snippet isfp
+	it { should filter_param :${0:key} }
+snippet isrt
+	it { should redirect_to ${0:url} }
+snippet isrtp
+	it { should render_template ${0} }
+snippet isrwl
+	it { should render_with_layout ${0} }
+snippet isrf
+	it { should rescue_from ${0:exception} }
+snippet isrw
+	it { should respond_with ${0:status} }
+snippet isr
+	it { should route(:${1:method}, '${0:path}') }
+snippet isss
+	it { should set_session :${0:key} }
+snippet issf
+	it { should set_the_flash('${0}') }
+#ShouldaMatchers#ActiveModel
+snippet isama
+	it { should allow_mass_assignment_of :${0} }
+snippet isav
+	it { should allow_value(${1}).for :${0} }
+snippet isee
+	it { should ensure_exclusion_of :${0} }
+snippet isei
+	it { should ensure_inclusion_of :${0} }
+snippet isel
+	it { should ensure_length_of :${0} }
+snippet isva
+	it { should validate_acceptance_of :${0} }
+snippet isvc
+	it { should validate_confirmation_of :${0} }
+snippet isvn
+	it { should validate_numericality_of :${0} }
+snippet isvp
+	it { should validate_presence_of :${0} }
+snippet isvu
+	it { should validate_uniqueness_of :${0} }
+#ShouldaMatchers#ActiveRecord
+snippet isana
+	it { should accept_nested_attributes_for :${0} }
+snippet isbt
+	it { should belong_to :${0} }
+snippet isbtcc
+	it { should belong_to(:${1}).counter_cache ${0:true} }
+snippet ishbtm
+	it { should have_and_belong_to_many :${0} }
+snippet isbv
+	it { should be_valid }
+snippet ishc
+	it { should have_db_column :${0} }
+snippet ishi
+	it { should have_db_index :${0} }
+snippet ishm
+	it { should have_many :${0} }
+snippet ishmt
+	it { should have_many(:${1}).through :${0} }
+snippet isho
+	it { should have_one :${0} }
+snippet ishro
+	it { should have_readonly_attribute :${0} }
+snippet iss
+	it { should serialize :${0} }
+snippet isres
+	it { should respond_to :${0} }
+snippet isresw
+	it { should respond_to(:${1}).with(${0}).arguments }
+snippet super_call
+	${1:super_class}.instance_method(:${0:method}).bind(self).call
diff --git a/vim/snippets/vim-snippets/snippets/rst.snippets b/vim/snippets/vim-snippets/snippets/rst.snippets
new file mode 100644
index 0000000..dd47863
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/rst.snippets
@@ -0,0 +1,98 @@
+# rst
+
+snippet :
+	:${1:field name}: ${0:field body}
+snippet *
+	*${1:Emphasis}* ${0}
+snippet **
+	**${1:Strong emphasis}** ${0}
+snippet _
+	\`${1:hyperlink-name}\`_
+	.. _\`$1\`: ${0:link-block}
+snippet =
+	${1:Title}
+	=====${2:=}
+	${0}
+snippet -
+	${1:Title}
+	-----${2:-}
+	${0}
+#some directive
+snippet img:
+	.. |${0:alias}| image:: ${1:img}
+snippet fig:
+	.. figure:: ${1:img}
+		:alt: ${0:alter text}
+
+		$2
+snippet cont:
+	.. contents::
+		${0:content}
+snippet code:
+	.. code:: ${1:type}
+
+		${0:write some code}
+snippet tip:
+	.. tip::
+		${0:my tips}
+snippet not:
+	.. note::
+		${0:my notes}
+snippet	war:
+	.. warning::
+		${0:attention!}
+snippet imp:
+	.. important::
+		${0:this is importatnt}
+snippet att:
+	.. attention::
+		${0:hey!}
+snippet dan:
+	.. danger::
+		${0:ah!}
+snippet err:
+	.. error::
+		${0:Error occur}
+snippet cau:
+	.. caution::
+		${0:Watch out!}
+#Sphinx only
+snippet sid:
+	.. sidebar:: ${1:Title}
+
+		${0}
+snippet tod:
+	.. todo::
+		${0}
+snippet lis:
+	.. list-table:: ${0:Title}
+		:header-rows: 1
+		:stub-columns: 1
+
+		* - x1,y1
+		  - x2,y1
+		  - x3,y1
+		* - x1,y2
+		  - x2,y2
+		  - x3,y2
+		* - x1,y3
+		  - x2,y3
+		  - x3,y3
+
+snippet toc:
+	.. toctree::
+		:maxdepth: 2
+
+		${0}
+snippet dow:
+	:download:\`${0:text} <${1:path}>\`
+snippet ref:
+	:ref:\`${0:text} <${1:path}>\`
+snippet doc:
+	:doc:`${0:text} <${1:path}>`
+# CJK optimize, CJK has no space between charaters
+snippet *c
+	\ *${1:Emphasis}*\ ${0}
+snippet **c
+	\ **${1:Strong emphasis}**\ ${0}
+
diff --git a/vim/snippets/vim-snippets/snippets/ruby.snippets b/vim/snippets/vim-snippets/snippets/ruby.snippets
new file mode 100644
index 0000000..3f909a0
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/ruby.snippets
@@ -0,0 +1,716 @@
+snippet enc
+	# encoding: utf-8
+snippet frozen
+	# frozen_string_literal: true
+snippet #!
+	#!/usr/bin/env ruby
+# New Block
+snippet =b
+	=begin rdoc
+		${0}
+	=end
+snippet prot
+	protected
+
+	${0}
+snippet priv
+	private
+
+	${0}
+snippet y
+	:yields: ${0:arguments}
+snippet rb
+	#!/usr/bin/env ruby -wKU
+snippet beg
+	begin
+		${0}
+	rescue ${1:Exception} => ${2:e}
+	end
+snippet req require
+	require '${1}'
+snippet reqr
+	require_relative '${1}'
+snippet #
+	# =>
+snippet case
+	case ${1:object}
+	when ${2:condition}
+		${0}
+	end
+snippet when
+	when ${1:condition}
+		${0:${VISUAL}}
+snippet def
+	def ${1:method_name}
+		${0}
+	end
+snippet deft
+	def test_${1:case_name}
+		${0}
+	end
+snippet descendants
+	class Class
+		def descendants
+			ObjectSpace.each_object(::Class).select { |klass| klass < self }
+		end
+	end
+snippet if
+	if ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet ife
+	if ${1:condition}
+		${2:${VISUAL}}
+	else
+		${0}
+	end
+snippet eif
+	elsif ${1:condition}
+		${0:${VISUAL}}
+snippet ifee
+	if ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
+snippet unless
+	unless ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet unlesse
+	unless ${1:condition}
+		$2
+	else
+		$0
+	end
+snippet unlesee
+	unless ${1:condition}
+		$2
+	elsif ${3:condition}
+		$4
+	else
+		$0
+	end
+snippet wh
+	while ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet for
+	for ${1:e} in ${2:c}
+		${0}
+	end
+snippet until
+	until ${1:condition}
+		${0:${VISUAL}}
+	end
+snippet cla class .. end
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${0}
+	end
+snippet clai class .. initialize .. end
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		def initialize(${2:args})
+			${0}
+		end
+	end
+snippet cla< class .. < ParentClass .. initialize .. end
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < ${2:ParentClass}
+		def initialize(${3:args})
+			${0}
+		end
+	end
+snippet blankslate class BlankSlate .. initialize .. end
+	class ${0:BlankSlate}
+		instance_methods.each { |meth| undef_method(meth) unless meth =~ /\A__/ }
+	end
+snippet claself class << self .. end
+	class << ${1:self}
+		${0}
+	end
+# class .. < DelegateClass .. initialize .. end
+snippet cla-
+	class ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} < DelegateClass(${2:ParentClass})
+		def initialize(${3:args})
+			super(${4:del_obj})
+
+			${0}
+		end
+	end
+snippet mod module .. end
+	module ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`}
+		${0}
+	end
+# attr_reader
+snippet r
+	attr_reader :${0:attr_names}
+# attr_writer
+snippet w
+	attr_writer :${0:attr_names}
+# attr_accessor
+snippet rw
+	attr_accessor :${0:attr_names}
+snippet atp
+	attr_protected :${0:attr_names}
+snippet ata
+	attr_accessible :${0:attr_names}
+snippet ana
+	accepts_nested_attributes_for :${0:association}
+# ivc == instance variable cache
+snippet ivc
+	@${1:variable_name} ||= ${0:cached_value}
+# include Enumerable
+snippet Enum
+	include Enumerable
+
+	def each(&block)
+		${0}
+	end
+# include Comparable
+snippet Comp
+	include Comparable
+
+	def <=>(other)
+		${0}
+	end
+# extend Forwardable
+snippet Forw-
+	extend Forwardable
+# def self
+snippet defs
+	def self.${1:class_method_name}
+		${0}
+	end
+# def initialize
+snippet definit
+	def initialize(${1:args})
+		${0}
+	end
+# def method_missing
+snippet defmm
+	def method_missing(meth, *args, &blk)
+		${0}
+	end
+snippet defd
+	def_delegator :${1:@del_obj}, :${2:del_meth}, :${0:new_name}
+snippet defds
+	def_delegators :${1:@del_obj}, :${0:del_methods}
+snippet am
+	alias_method :${1:new_name}, :${0:old_name}
+snippet app
+	if __FILE__ == $PROGRAM_NAME
+		${0}
+	end
+# usage_if()
+snippet usai
+	if ARGV.${1}
+		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
+	end
+# usage_unless()
+snippet usau
+	unless ARGV.${1}
+		abort "Usage: #{$PROGRAM_NAME} ${2:ARGS_GO_HERE}"${0}
+	end
+snippet array
+	Array.new(${1:10}) { |${2:i}| ${0} }
+snippet hash
+	Hash.new { |${1:hash}, ${2:key}| $1[$2] = ${0} }
+snippet file File.foreach() { |line| .. }
+	File.foreach(${1:'path/to/file'}) { |${2:line}| ${0} }
+snippet file File.read()
+	File.read(${1:'path/to/file'})
+snippet Dir Dir.global() { |file| .. }
+	Dir.glob(${1:'dir/glob/*'}) { |${2:file}| ${0} }
+snippet Dir Dir[".."]
+	Dir[${1:'glob/**/*.rb'}]
+snippet dir
+	Filename.dirname(__FILE__)
+snippet deli
+	delete_if { |${1:e}| ${0} }
+snippet fil
+	fill(${1:range}) { |${2:i}| ${0} }
+# flatten_once()
+snippet flao
+	reduce(Array.new) { |${1:arr}, ${2:a}| $1.push(*$2) }
+snippet zip
+	zip(${1:enums}) { |${2:row}| ${0} }
+# downto(0) { |n| .. }
+snippet dow
+	downto(${1:0}) { |${2:n}| ${0} }
+snippet ste
+	step(${1:2}) { |${2:n}| ${0} }
+snippet tim
+	times { |${1:n}| ${0} }
+snippet upt
+	upto(${1:1.0/0.0}) { |${2:n}| ${0} }
+snippet loo
+	loop { ${0} }
+snippet ea
+	each { |${1:e}| ${0} }
+snippet ead
+	each do |${1:e}|
+		${0}
+	end
+snippet eab
+	each_byte { |${1:byte}| ${0} }
+snippet eac- each_char { |chr| .. }
+	each_char { |${1:chr}| ${0} }
+snippet eac- each_cons(..) { |group| .. }
+	each_cons(${1:2}) { |${2:group}| ${0} }
+snippet eai
+	each_index { |${1:i}| ${0} }
+snippet eaid
+	each_index do |${1:i}|
+		${0}
+	end
+snippet eak
+	each_key { |${1:key}| ${0} }
+snippet eakd
+	each_key do |${1:key}|
+		${0}
+	end
+snippet eal
+	each_line { |${1:line}| ${0} }
+snippet eald
+	each_line do |${1:line}|
+		${0}
+	end
+snippet eap
+	each_pair { |${1:name}, ${2:val}| ${0} }
+snippet eapd
+	each_pair do |${1:name}, ${2:val}|
+		${0}
+	end
+snippet eas-
+	each_slice(${1:2}) { |${2:group}| ${0} }
+snippet easd-
+	each_slice(${1:2}) do |${2:group}|
+		${0}
+	end
+snippet eav
+	each_value { |${1:val}| ${0} }
+snippet eavd
+	each_value do |${1:val}|
+		${0}
+	end
+snippet eawi
+	each_with_index { |${1:e}, ${2:i}| ${0} }
+snippet eawid
+	each_with_index do |${1:e}, ${2:i}|
+		${0}
+	end
+snippet eawo
+	each_with_object(${1:init}) { |${2:e}, ${3:var}| ${0} }
+snippet eawod
+	each_with_object(${1:init}) do |${2:e}, ${3:var}|
+		${0}
+	end
+snippet reve
+	reverse_each { |${1:e}| ${0} }
+snippet reved
+	reverse_each do |${1:e}|
+		${0}
+	end
+snippet inj
+	inject(${1:init}) { |${2:mem}, ${3:var}| ${0} }
+snippet injd
+	inject(${1:init}) do |${2:mem}, ${3:var}|
+		${0}
+	end
+snippet red
+	reduce(${1:init}) { |${2:mem}, ${3:var}| ${0} }
+snippet redd
+	reduce(${1:init}) do |${2:mem}, ${3:var}|
+		${0}
+	end
+snippet map
+	map { |${1:e}| ${0} }
+snippet mapd
+	map do |${1:e}|
+		${0}
+	end
+snippet mapwi-
+	enum_with_index.map { |${1:e}, ${2:i}| ${0} }
+snippet sor
+	sort { |a, b| ${0} }
+snippet sorb
+	sort_by { |${1:e}| ${0} }
+snippet ran
+	sort_by { rand }
+snippet all
+	all? { |${1:e}| ${0} }
+snippet any
+	any? { |${1:e}| ${0} }
+snippet cl
+	classify { |${1:e}| ${0} }
+snippet col
+	collect { |${1:e}| ${0} }
+snippet cold
+	collect do |${1:e}|
+		${0}
+	end
+snippet det
+	detect { |${1:e}| ${0} }
+snippet detd
+	detect do |${1:e}|
+		${0}
+	end
+snippet fet
+	fetch(${1:name}) { |${2:key}| ${0} }
+snippet fin
+	find { |${1:e}| ${0} }
+snippet find
+	find do |${1:e}|
+		${0}
+	end
+snippet fina
+	find_all { |${1:e}| ${0} }
+snippet finad
+	find_all do |${1:e}|
+		${0}
+	end
+snippet gre
+	grep(${1:/pattern/}) { |${2:match}| ${0} }
+snippet sub
+	${1:g}sub(${2:/pattern/}) { |${3:match}| ${0} }
+snippet sca
+	scan(${1:/pattern/}) { |${2:match}| ${0} }
+snippet scad
+	scan(${1:/pattern/}) do |${2:match}|
+		${0}
+	end
+snippet max
+	max { |a, b| ${0} }
+snippet min
+	min { |a, b| ${0} }
+snippet par
+	partition { |${1:e}| ${0} }
+snippet pard
+	partition do |${1:e}|
+		${0}
+	end
+snippet rej
+	reject { |${1:e}| ${0} }
+snippet rejd
+	reject do |${1:e}|
+		${0}
+	end
+snippet sel
+	select { |${1:e}| ${0} }
+snippet seld
+	select do |${1:e}|
+		${0}
+	end
+snippet lam
+	lambda { |${1:args}| ${0} }
+snippet ->
+	-> { ${0} }
+snippet ->a
+	->(${1:args}) { ${0} }
+# I'm pretty sure that ruby users expect do to expand to do .. end
+snippet do
+	do
+		${0}
+	end
+# this is for one or more variables. typing a ", " is that cheap that it may
+# not be worth adding another snippet. should 0/1 placeholders change order?
+# its a good idea to think about the var name, so use it first
+snippet dov
+	do |${1:v}|
+		${2}
+	end
+snippet :
+	${1:key}: ${2:'value'}
+snippet ope
+	open('${1:path/or/url/or/pipe}', '${2:w}') { |${3:io}| ${0} }
+# path_from_here()
+snippet fpath
+	File.join(File.dirname(__FILE__), *['${1:rel path here}'])
+# unix_filter {}
+snippet unif
+	ARGF.each_line${1} do |${2:line}|
+		${0}
+	end
+# option_parse {}
+snippet optp
+	require 'optparse'
+
+	options = { ${0:default: 'args'} }
+
+	ARGV.options do |opts|
+		opts.banner = "Usage: #{File.basename($PROGRAM_NAME)}"
+	end
+snippet opt
+	opts.on('-${1:o}', '--${2:long-option-name}', ${3:String}, '${4:Option description.}') do |${5:opt}|
+		${0}
+	end
+snippet tc
+	require 'test/unit'
+
+	require '${1:library_file_name}'
+
+	class Test${2:$1} < Test::Unit::TestCase
+		def test_${3:case_name}
+			${0}
+		end
+	end
+snippet ts
+	require 'test/unit'
+
+	require 'tc_${1:test_case_file}'
+	require 'tc_${2:test_case_file}'
+snippet as
+	assert ${1:test}, '${2:Failure message.}'
+snippet ase
+	assert_equal ${1:expected}, ${2:actual}
+snippet asne
+	assert_not_equal ${1:unexpected}, ${2:actual}
+snippet asid
+	assert_in_delta ${1:expected_float}, ${2:actual_float}, ${3:2**-20}
+snippet asi
+	assert_includes ${1:collection}, ${2:object}
+snippet asio
+	assert_instance_of ${1:ExpectedClass}, ${2:actual_instance}
+snippet asko
+	assert_kind_of ${1:ExpectedKind}, ${2:actual_instance}
+snippet asn
+	assert_nil ${1:instance}
+snippet asnn
+	assert_not_nil ${1:instance}
+snippet asm
+	assert_match(/${1:expected_pattern}/, ${2:actual_string})
+snippet asnm
+	assert_no_match(/${1:unexpected_pattern}/, ${2:actual_string})
+snippet aso
+	assert_operator ${1:left}, :${2:operator}, ${3:right}
+snippet asr
+	assert_raise ${1:Exception} { ${0} }
+snippet asrd
+	assert_raise ${1:Exception} do
+		${0}
+	end
+snippet asnr
+	assert_nothing_raised ${1:Exception} { ${0} }
+snippet asnrd
+	assert_nothing_raised ${1:Exception} do
+		${0}
+	end
+snippet asrt
+	assert_respond_to ${1:object}, :${2:method}
+snippet ass assert_same(..)
+	assert_same ${1:expected}, ${2:actual}
+snippet ass assert_send(..)
+	assert_send [${1:object}, :${2:message}, ${3:args}]
+snippet asns
+	assert_not_same ${1:unexpected}, ${2:actual}
+snippet ast
+	assert_throws :${1:expected}, -> { ${0} }
+snippet astd
+	assert_throws :${1:expected} do
+		${0}
+	end
+snippet asnt
+	assert_nothing_thrown { ${0} }
+snippet asntd
+	assert_nothing_thrown do
+		${0}
+	end
+snippet fl
+	flunk '${1:Failure message.}'
+# Benchmark.bmbm do .. end
+snippet bm-
+	TESTS = ${1:10_000}
+	Benchmark.bmbm do |results|
+		${0}
+	end
+snippet rep
+	results.report('${1:name}:') { TESTS.times { ${0} } }
+# Marshal.dump(.., file)
+snippet Md
+	File.open('${1:path/to/file.dump}', 'wb') { |${2:file}| Marshal.dump(${3:obj}, $2) }
+# Mashal.load(obj)
+snippet Ml
+	File.open('${1:path/to/file.dump}', 'rb') { |${2:file}| Marshal.load($2) }
+# deep_copy(..)
+snippet deec
+	Marshal.load(Marshal.dump(${1:obj_to_copy}))
+snippet Pn-
+	PStore.new('${1:file_name.pstore}')
+snippet tra
+	transaction(${1:true}) { ${0} }
+# xmlread(..)
+snippet xml-
+	REXML::Document.new(File.read('${1:path/to/file}'))
+# xpath(..) { .. }
+snippet xpa
+	elements.each('${1://Xpath}') do |${2:node}|
+		${0}
+	end
+# class_from_name()
+snippet clafn
+	split('::').inject(Object) { |par, const| par.const_get(const) }
+# singleton_class()
+snippet sinc
+	class << self; self end
+snippet nam
+	namespace :${1:`vim_snippets#Filename()`} do
+		${0}
+	end
+snippet tas
+	desc '${1:Task description}'
+	task ${2:task_name: [:dependent, :tasks]} do
+		${0}
+	end
+# block
+snippet b
+	{ |${1:var}| ${0} }
+snippet begin
+	begin
+		fail 'A test exception.'
+	rescue Exception => e
+		puts e.message
+		puts e.backtrace.inspect
+	else
+		# other exception
+	ensure
+		# always executed
+	end
+
+#debugging
+snippet debug
+	require 'byebug'; byebug
+snippet debug19
+	require 'debugger'; debugger
+snippet debug18
+	require 'ruby-debug'; debugger
+snippet pry
+	require 'pry'; binding.pry
+snippet strf
+	strftime('${1:%Y-%m-%d %H:%M:%S %z}')${0}
+#
+# Minitest snippets
+#
+snippet mb
+	must_be ${0}
+snippet wb
+	wont_be ${0}
+snippet mbe
+	must_be_empty
+snippet wbe
+	wont_be_empty
+snippet mbio
+	must_be_instance_of ${0:Class}
+snippet wbio
+	wont_be_instance_of ${0:Class}
+snippet mbko
+	must_be_kind_of ${0:Class}
+snippet wbko
+	wont_be_kind_of ${0:Class}
+snippet mbn
+	must_be_nil
+snippet wbn
+	wont_be_nil
+snippet mbsa
+	must_be_same_as ${0:other}
+snippet wbsa
+	wont_be_same_as ${0:other}
+snippet mbsi
+	-> { ${0} }.must_be_silent
+snippet mbwd
+	must_be_within_delta ${1:0.1}, ${2:0.1}
+snippet wbwd
+	wont_be_within_delta ${1:0.1}, ${2:0.1}
+snippet mbwe
+	must_be_within_epsilon ${1:0.1}, ${2:0.1}
+snippet wbwe
+	wont_be_within_epsilon ${1:0.1}, ${2:0.1}
+snippet me
+	must_equal ${0:other}
+snippet we
+	wont_equal ${0:other}
+snippet mi
+	must_include ${0:what}
+snippet wi
+	wont_include ${0:what}
+snippet mm
+	must_match /${0:regex}/
+snippet wm
+	wont_match /${0:regex}/
+snippet mout
+	-> { ${1} }.must_output '${0}'
+snippet mra
+	-> { ${1} }.must_raise ${0:Exception}
+snippet mrt
+	must_respond_to :${0:method}
+snippet wrt
+	wont_respond_to :${0:method}
+snippet msend
+	must_send [ ${1:what}, :${2:method}, ${3:args} ]
+snippet mthrow
+	-> { throw :${1:error} }.must_throw :${2:error}
+##########################
+#     Rspec snippets     #
+##########################
+snippet desc
+	describe ${1:`substitute(substitute(vim_snippets#Filename(), '_spec$', '', ''), '\(_\|^\)\(.\)', '\u\2', 'g')`} do
+		${0}
+	end
+snippet descm
+	describe '${1:#method}' do
+		${0:pending 'Not implemented'}
+	end
+snippet cont
+	context '${1:message}' do
+		${0}
+	end
+snippet bef
+	before :${1:each} do
+		${0}
+	end
+snippet aft
+	after :${1:each} do
+		${0}
+	end
+snippet let
+	let(:${1:object}) { ${0} }
+snippet let!
+	let!(:${1:object}) { ${0} }
+snippet subj
+	subject { ${0} }
+snippet s.
+	subject.${0:method}
+snippet spec
+	specify { subject.${0} }
+snippet exp
+	expect(${1:object}).to ${0}
+snippet expb
+	expect { ${1:object} }.to ${0}
+snippet experr
+	expect { ${1:object} }.to raise_error ${2:StandardError}, /${0:message_regex}/
+snippet shared
+	shared_examples ${0:'shared examples name'}
+snippet ibl
+	it_behaves_like ${0:'shared examples name'}
+snippet it
+	it '${1:spec_name}' do
+		${0}
+	end
+snippet its
+	its(:${1:method}) { should ${0} }
+snippet is
+	it { should ${0} }
+snippet isn
+	it { should_not ${0} }
+snippet iexp
+	it { expect(${1:object}).${2} ${0} }
+snippet iexpb
+	it { expect { ${1:object} }.${2} ${0} }
+snippet iiexp
+	it { is_expected.to ${0} }
+snippet iiexpn
+	it { is_expected.not_to ${0} }
+snippet agg
+	aggregate_failures '${1:message}' do
+		${0}
+	end
diff --git a/vim/snippets/vim-snippets/snippets/rust.snippets b/vim/snippets/vim-snippets/snippets/rust.snippets
new file mode 100644
index 0000000..adfd29c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/rust.snippets
@@ -0,0 +1,193 @@
+#################
+# Rust Snippets #
+#################
+
+# Functions
+snippet fn "Function definition"
+	fn ${1:function_name}(${2})${3} {
+		${0}
+	}
+snippet pfn "Function definition"
+	pub fn ${1:function_name}(${2})${3} {
+		${0}
+	}
+snippet test "Unit test function"
+	#[test]
+	fn ${1:test_function_name}() {
+		${0}
+	}
+snippet bench "Bench function" b
+	#[bench]
+	fn ${1:bench_function_name}(b: &mut test::Bencher) {
+		b.iter(|| {
+			${0}
+		})
+	}
+snippet new "Constructor function"
+	pub fn new(${2}) -> ${1:Name} {
+		$1 { ${3} }
+	}
+snippet main "Main function"
+	pub fn main() {
+		${0}
+	}
+snippet let "let variable declaration with type inference"
+	let ${1} = ${2};
+snippet lett "let variable declaration with explicit type annotation"
+	let ${1}: ${2} = ${3};
+snippet letm "let mut variable declaration with type inference"
+	let mut ${1} = ${2};
+snippet lettm "let mut variable declaration with explicit type annotation"
+	let mut ${1}: ${2} = ${3};
+snippet pri "print!"
+	print!("${1}");
+snippet pri, "print! with format param"
+	print!("${1}", ${2});
+snippet pln "println!"
+	println!("${1}");
+snippet pln, "println! with format param"
+	println!("${1}", ${2});
+snippet fmt "format!"
+	format!("${1}", ${2});
+
+# Modules
+snippet ec "extern crate"
+	extern crate ${1:sync};
+snippet ecl "extern crate log"
+	#[macro_use]
+	extern crate log;
+snippet mod
+	mod ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	} /* $1 */
+snippet testmod "Test module" b
+	#[cfg(test)]
+	mod tests {
+		use super::${1:*};
+
+		test${0}
+	}
+# Attributes
+snippet allow "allow lint attribute" b
+	#[allow(${1:unused_variable})]
+snippet cfg "cfg attribute" b
+	#[cfg(${1:target_os = "linux"})]
+snippet feat "feature attribute" b
+	#![feature(${1:plugin})]
+snippet der "#[derive(..)]" b
+	#[derive(${1:Debug})]
+snippet attr "#[..]" b
+	#[${1:inline}]
+snippet crate "Define create meta attributes"
+	// Crate name
+	#![crate_name = "${1:crate_name}"]
+	// Additional metadata attributes
+	#![desc = "${2:Descrption.}"]
+	#![license = "${3:BSD}"]
+	#![comment = "${4:Comment.}"]
+	// Specify the output type
+	#![crate_type = "${5:lib}"]
+# Common types
+snippet opt "Option<T>"
+	Option<${1:i32}>
+snippet res "Result<T, E>"
+	Result<${1:~str}, ${2:()}>
+# Control structures
+snippet if
+	if ${1} {
+		${0:${VISUAL}}
+	}
+snippet ife "if / else"
+	if ${1} {
+		${2:${VISUAL}}
+	} else {
+		${0}
+	}
+snippet el "else"
+	else {
+		${0:${VISUAL}}
+	}
+snippet eli "else if"
+	else if ${1} {
+		${0:${VISUAL}}
+	}
+snippet mat "match pattern"
+	match ${1} {
+		${2} => ${3}
+	}
+snippet case "Case clause of pattern match"
+	${1:_} => ${2:expression}
+snippet loop "loop {}" b
+	loop {
+		${0:${VISUAL}}
+	}
+snippet wh "while loop"
+	while ${1:condition} {
+		${0:${VISUAL}}
+	}
+snippet for "for ... in ... loop"
+	for ${1:i} in ${2} {
+		${0}
+	}
+# TODO commenting
+snippet todo "TODO comment"
+	// [TODO]: ${0:Description}
+snippet fixme "FIXME comment"
+	// FIXME: $0
+# Struct
+snippet st "Struct definition"
+	struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
+snippet impl "Struct/Trait implementation"
+	impl ${1:Type/Trait}${2: for ${3:Type}} {
+		${0}
+	}
+snippet stn "Struct with new constructor"
+	pub struct ${1:`substitute(vim_snippets#Filename(), '\(_\|^\)\(.\)', '\u\2', 'g')`} {
+		${0}
+	}
+
+	impl $1 {
+		pub fn new(${2}) -> Self {
+			$1 { ${3} }
+		}
+	}
+snippet type "Type alias"
+	type ${1:NewName} = $2;
+snippet enum "enum definition"
+	enum ${1:Name} {
+		${2},
+	}
+# Traits
+snippet trait "Trait definition"
+	trait ${1:Name} {
+		${0}
+	}
+snippet drop "Drop trait implementation (destructor)"
+	impl Drop for ${1:Name} {
+		fn drop(&mut self) {
+			${0}
+		}
+	}
+# Statics
+snippet ss "static string declaration"
+	static ${1}: &'static str = "${0}";
+snippet stat "static item declaration"
+	static ${1}: ${2:usize} = ${0};
+# Concurrency
+snippet scoped "spawn a scoped thread"
+	thread::scoped(${1:move }|| {
+		${0}
+	});
+snippet spawn "spawn a thread"
+	thread::spawn(${1:move }|| {
+		${0}
+	});
+snippet chan "Declare (Sender, Receiver) pair of asynchronous channel()"
+	let (${1:tx}, ${2:rx}): (Sender<${3:i32}>, Receiver<${4:i32}>) = channel();
+# Testing
+snippet as "assert!"
+	assert!(${1:predicate})
+snippet ase "assert_eq!"
+	assert_eq!(${1:expected}, ${2:actual})
diff --git a/vim/snippets/vim-snippets/snippets/sass.snippets b/vim/snippets/vim-snippets/snippets/sass.snippets
new file mode 100644
index 0000000..3e84c20
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/sass.snippets
@@ -0,0 +1,1015 @@
+snippet $
+	$${1:variable}: ${0:value}
+snippet imp
+	@import '${0}'
+snippet mix
+	=${1:name}(${2})
+		${0}
+snippet inc
+	+${1:mixin}(${2})
+snippet ext
+	@extend ${0}
+snippet fun
+	@function ${1:name}(${2:args})
+		${0}
+snippet if
+	@if ${1:condition}
+		${0:${VISUAL}}
+snippet ife
+	@if ${1:condition}
+		${2:${VISUAL}}
+	@else
+		${0}
+snippet eif
+	@else if ${1:condition}
+		${0:${VISUAL}}
+snippet for
+	@for ${1:$i} from ${2:1} through ${3:3}
+		${0}
+snippet each
+	@each ${1:$item} in ${2:items}
+		${0}
+snippet while
+	@while ${1:$i} ${2:>} ${3:0}
+		${0:${VISUAL}}
+snippet !
+	 !important
+snippet bdi:m+
+	-moz-border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:m
+	-moz-border-image: ${0}
+snippet bdrz:m
+	-moz-border-radius: ${0}
+snippet bxsh:m+
+	-moz-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh:m
+	-moz-box-shadow: ${0}
+snippet bdi:w+
+	-webkit-border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:w
+	-webkit-border-image: ${0}
+snippet bdrz:w
+	-webkit-border-radius: ${0}
+snippet bxsh:w+
+	-webkit-box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh:w
+	-webkit-box-shadow: ${0}
+snippet @f
+	@font-face
+		font-family: ${1}
+		src: url('${0}')
+snippet @i
+	@import url('${0}')
+snippet @m
+	@media ${1:print}
+		${0}
+snippet bg+
+	background: #${1:fff} url('${2}') ${3:0} ${4:0} ${0:no-repeat}
+snippet bga
+	background-attachment: ${0}
+snippet bga:f
+	background-attachment: fixed
+snippet bga:s
+	background-attachment: scroll
+snippet bgbk
+	background-break: ${0}
+snippet bgbk:bb
+	background-break: bounding-box
+snippet bgbk:c
+	background-break: continuous
+snippet bgbk:eb
+	background-break: each-box
+snippet bgcp
+	background-clip: ${0}
+snippet bgcp:bb
+	background-clip: border-box
+snippet bgcp:cb
+	background-clip: content-box
+snippet bgcp:nc
+	background-clip: no-clip
+snippet bgcp:pb
+	background-clip: padding-box
+snippet bgc
+	background-color: #${0:fff}
+snippet bgc:t
+	background-color: transparent
+snippet bgi
+	background-image: url('${0}')
+snippet bgi:n
+	background-image: none
+snippet bgo
+	background-origin: ${0}
+snippet bgo:bb
+	background-origin: border-box
+snippet bgo:cb
+	background-origin: content-box
+snippet bgo:pb
+	background-origin: padding-box
+snippet bgpx
+	background-position-x: ${0}
+snippet bgpy
+	background-position-y: ${0}
+snippet bgp
+	background-position: ${1:0} ${0:0}
+snippet bgr
+	background-repeat: ${0}
+snippet bgr:n
+	background-repeat: no-repeat
+snippet bgr:x
+	background-repeat: repeat-x
+snippet bgr:y
+	background-repeat: repeat-y
+snippet bgr:r
+	background-repeat: repeat
+snippet bgz
+	background-size: ${0}
+snippet bgz:a
+	background-size: auto
+snippet bgz:ct
+	background-size: contain
+snippet bgz:cv
+	background-size: cover
+snippet bg
+	background: ${0}
+snippet bg:ie
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+snippet bg:n
+	background: none
+snippet bd+
+	border: ${1:1px} ${2:solid} #${0:000}
+snippet bdb+
+	border-bottom: ${1:1px} ${2:solid} #${0:000}
+snippet bdbc
+	border-bottom-color: #${0:000}
+snippet bdbi
+	border-bottom-image: url('${0}')
+snippet bdbi:n
+	border-bottom-image: none
+snippet bdbli
+	border-bottom-left-image: url('${0}')
+snippet bdbli:c
+	border-bottom-left-image: continue
+snippet bdbli:n
+	border-bottom-left-image: none
+snippet bdblrz
+	border-bottom-left-radius: ${0}
+snippet bdbri
+	border-bottom-right-image: url('${0}')
+snippet bdbri:c
+	border-bottom-right-image: continue
+snippet bdbri:n
+	border-bottom-right-image: none
+snippet bdbrrz
+	border-bottom-right-radius: ${0}
+snippet bdbs
+	border-bottom-style: ${0}
+snippet bdbs:n
+	border-bottom-style: none
+snippet bdbw
+	border-bottom-width: ${0}
+snippet bdb
+	border-bottom: ${0}
+snippet bdb:n
+	border-bottom: none
+snippet bdbk
+	border-break: ${0}
+snippet bdbk:c
+	border-break: close
+snippet bdcl
+	border-collapse: ${0}
+snippet bdcl:c
+	border-collapse: collapse
+snippet bdcl:s
+	border-collapse: separate
+snippet bdc
+	border-color: #${0:000}
+snippet bdci
+	border-corner-image: url('${0}')
+snippet bdci:c
+	border-corner-image: continue
+snippet bdci:n
+	border-corner-image: none
+snippet bdf
+	border-fit: ${0}
+snippet bdf:c
+	border-fit: clip
+snippet bdf:of
+	border-fit: overwrite
+snippet bdf:ow
+	border-fit: overwrite
+snippet bdf:r
+	border-fit: repeat
+snippet bdf:sc
+	border-fit: scale
+snippet bdf:sp
+	border-fit: space
+snippet bdf:st
+	border-fit: stretch
+snippet bdi
+	border-image: url('${1}') ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:n
+	border-image: none
+snippet bdl+
+	border-left: ${1:1px} ${2:solid} #${0:000}
+snippet bdlc
+	border-left-color: #${0:000}
+snippet bdli
+	border-left-image: url('${0}')
+snippet bdli:n
+	border-left-image: none
+snippet bdls
+	border-left-style: ${0}
+snippet bdls:n
+	border-left-style: none
+snippet bdlw
+	border-left-width: ${0}
+snippet bdl
+	border-left: ${0}
+snippet bdl:n
+	border-left: none
+snippet bdlt
+	border-length: ${0}
+snippet bdlt:a
+	border-length: auto
+snippet bdrz
+	border-radius: ${0}
+snippet bdr+
+	border-right: ${1:1px} ${2:solid} #${0:000}
+snippet bdrc
+	border-right-color: #${0:000}
+snippet bdri
+	border-right-image: url('${0}')
+snippet bdri:n
+	border-right-image: none
+snippet bdrs
+	border-right-style: ${0}
+snippet bdrs:n
+	border-right-style: none
+snippet bdrw
+	border-right-width: ${0}
+snippet bdr
+	border-right: ${0}
+snippet bdr:n
+	border-right: none
+snippet bdsp
+	border-spacing: ${0}
+snippet bds
+	border-style: ${0}
+snippet bds:ds
+	border-style: dashed
+snippet bds:dtds
+	border-style: dot-dash
+snippet bds:dtdtds
+	border-style: dot-dot-dash
+snippet bds:dt
+	border-style: dotted
+snippet bds:db
+	border-style: double
+snippet bds:g
+	border-style: groove
+snippet bds:h
+	border-style: hidden
+snippet bds:i
+	border-style: inset
+snippet bds:n
+	border-style: none
+snippet bds:o
+	border-style: outset
+snippet bds:r
+	border-style: ridge
+snippet bds:s
+	border-style: solid
+snippet bds:w
+	border-style: wave
+snippet bdt+
+	border-top: ${1:1px} ${2:solid} #${0:000}
+snippet bdtc
+	border-top-color: #${0:000}
+snippet bdti
+	border-top-image: url('${0}')
+snippet bdti:n
+	border-top-image: none
+snippet bdtli
+	border-top-left-image: url('${0}')
+snippet bdtli:c
+	border-corner-image: continue
+snippet bdtli:n
+	border-corner-image: none
+snippet bdtlrz
+	border-top-left-radius: ${0}
+snippet bdtri
+	border-top-right-image: url('${0}')
+snippet bdtri:c
+	border-top-right-image: continue
+snippet bdtri:n
+	border-top-right-image: none
+snippet bdtrrz
+	border-top-right-radius: ${0}
+snippet bdts
+	border-top-style: ${0}
+snippet bdts:n
+	border-top-style: none
+snippet bdtw
+	border-top-width: ${0}
+snippet bdt
+	border-top: ${0}
+snippet bdt:n
+	border-top: none
+snippet bdw
+	border-width: ${0}
+snippet bd
+	border: ${0}
+snippet bd:n
+	border: none
+snippet b
+	bottom: ${0}
+snippet b:a
+	bottom: auto
+snippet bxsh+
+	box-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet bxsh
+	box-shadow: ${0}
+snippet bxsh:n
+	box-shadow: none
+snippet bxz
+	box-sizing: ${0}
+snippet bxz:bb
+	box-sizing: border-box
+snippet bxz:cb
+	box-sizing: content-box
+snippet cps
+	caption-side: ${0}
+snippet cps:b
+	caption-side: bottom
+snippet cps:t
+	caption-side: top
+snippet cl
+	clear: ${0}
+snippet cl:b
+	clear: both
+snippet cl:l
+	clear: left
+snippet cl:n
+	clear: none
+snippet cl:r
+	clear: right
+snippet cp
+	clip: ${0}
+snippet cp:a
+	clip: auto
+snippet cp:r
+	clip: rect(${1:0} ${2:0} ${3:0} ${0:0})
+snippet c
+	color: #${0:000}
+snippet ct
+	content: ${0}
+snippet ct:a
+	content: attr(${0})
+snippet ct:cq
+	content: close-quote
+snippet ct:c
+	content: counter(${0})
+snippet ct:cs
+	content: counters(${0})
+snippet ct:ncq
+	content: no-close-quote
+snippet ct:noq
+	content: no-open-quote
+snippet ct:n
+	content: normal
+snippet ct:oq
+	content: open-quote
+snippet coi
+	counter-increment: ${0}
+snippet cor
+	counter-reset: ${0}
+snippet cur
+	cursor: ${0}
+snippet cur:a
+	cursor: auto
+snippet cur:c
+	cursor: crosshair
+snippet cur:d
+	cursor: default
+snippet cur:ha
+	cursor: hand
+snippet cur:he
+	cursor: help
+snippet cur:m
+	cursor: move
+snippet cur:p
+	cursor: pointer
+snippet cur:t
+	cursor: text
+snippet d
+	display: ${0}
+snippet d:mib
+	display: -moz-inline-box
+snippet d:mis
+	display: -moz-inline-stack
+snippet d:b
+	display: block
+snippet d:cp
+	display: compact
+snippet d:ib
+	display: inline-block
+snippet d:itb
+	display: inline-table
+snippet d:i
+	display: inline
+snippet d:li
+	display: list-item
+snippet d:n
+	display: none
+snippet d:ri
+	display: run-in
+snippet d:tbcp
+	display: table-caption
+snippet d:tbc
+	display: table-cell
+snippet d:tbclg
+	display: table-column-group
+snippet d:tbcl
+	display: table-column
+snippet d:tbfg
+	display: table-footer-group
+snippet d:tbhg
+	display: table-header-group
+snippet d:tbrg
+	display: table-row-group
+snippet d:tbr
+	display: table-row
+snippet d:tb
+	display: table
+snippet ec
+	empty-cells: ${0}
+snippet ec:h
+	empty-cells: hide
+snippet ec:s
+	empty-cells: show
+snippet exp
+	expression()
+snippet fl
+	float: ${0}
+snippet fl:l
+	float: left
+snippet fl:n
+	float: none
+snippet fl:r
+	float: right
+snippet f+
+	font: ${1:1em} ${2:Arial},${0:sans-serif}
+snippet fef
+	font-effect: ${0}
+snippet fef:eb
+	font-effect: emboss
+snippet fef:eg
+	font-effect: engrave
+snippet fef:n
+	font-effect: none
+snippet fef:o
+	font-effect: outline
+snippet femp
+	font-emphasize-position: ${0}
+snippet femp:a
+	font-emphasize-position: after
+snippet femp:b
+	font-emphasize-position: before
+snippet fems
+	font-emphasize-style: ${0}
+snippet fems:ac
+	font-emphasize-style: accent
+snippet fems:c
+	font-emphasize-style: circle
+snippet fems:ds
+	font-emphasize-style: disc
+snippet fems:dt
+	font-emphasize-style: dot
+snippet fems:n
+	font-emphasize-style: none
+snippet fem
+	font-emphasize: ${0}
+snippet ff
+	font-family: ${0}
+snippet ff:c
+	font-family: ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+snippet ff:f
+	font-family: ${0:Capitals,Impact},fantasy
+snippet ff:m
+	font-family: ${0:Monaco,'Courier New'},monospace
+snippet ff:ss
+	font-family: ${0:Helvetica,Arial},sans-serif
+snippet ff:s
+	font-family: ${0:Georgia,'Times New Roman'},serif
+snippet fza
+	font-size-adjust: ${0}
+snippet fza:n
+	font-size-adjust: none
+snippet fz
+	font-size: ${0}
+snippet fsm
+	font-smooth: ${0}
+snippet fsm:aw
+	font-smooth: always
+snippet fsm:a
+	font-smooth: auto
+snippet fsm:n
+	font-smooth: never
+snippet fst
+	font-stretch: ${0}
+snippet fst:c
+	font-stretch: condensed
+snippet fst:e
+	font-stretch: expanded
+snippet fst:ec
+	font-stretch: extra-condensed
+snippet fst:ee
+	font-stretch: extra-expanded
+snippet fst:n
+	font-stretch: normal
+snippet fst:sc
+	font-stretch: semi-condensed
+snippet fst:se
+	font-stretch: semi-expanded
+snippet fst:uc
+	font-stretch: ultra-condensed
+snippet fst:ue
+	font-stretch: ultra-expanded
+snippet fs
+	font-style: ${0}
+snippet fs:i
+	font-style: italic
+snippet fs:n
+	font-style: normal
+snippet fs:o
+	font-style: oblique
+snippet fv
+	font-variant: ${0}
+snippet fv:n
+	font-variant: normal
+snippet fv:sc
+	font-variant: small-caps
+snippet fw
+	font-weight: ${0}
+snippet fw:b
+	font-weight: bold
+snippet fw:br
+	font-weight: bolder
+snippet fw:lr
+	font-weight: lighter
+snippet fw:n
+	font-weight: normal
+snippet f
+	font: ${0}
+snippet h
+	height: ${0}
+snippet h:a
+	height: auto
+snippet l
+	left: ${0}
+snippet l:a
+	left: auto
+snippet lts
+	letter-spacing: ${0}
+snippet lh
+	line-height: ${0}
+snippet lisi
+	list-style-image: url('${0}')
+snippet lisi:n
+	list-style-image: none
+snippet lisp
+	list-style-position: ${0}
+snippet lisp:i
+	list-style-position: inside
+snippet lisp:o
+	list-style-position: outside
+snippet list
+	list-style-type: ${0}
+snippet list:c
+	list-style-type: circle
+snippet list:dclz
+	list-style-type: decimal-leading-zero
+snippet list:dc
+	list-style-type: decimal
+snippet list:d
+	list-style-type: disc
+snippet list:lr
+	list-style-type: lower-roman
+snippet list:n
+	list-style-type: none
+snippet list:s
+	list-style-type: square
+snippet list:ur
+	list-style-type: upper-roman
+snippet lis
+	list-style: ${0}
+snippet lis:n
+	list-style: none
+snippet mb
+	margin-bottom: ${0}
+snippet mb:a
+	margin-bottom: auto
+snippet ml
+	margin-left: ${0}
+snippet ml:a
+	margin-left: auto
+snippet mr
+	margin-right: ${0}
+snippet mr:a
+	margin-right: auto
+snippet mt
+	margin-top: ${0}
+snippet mt:a
+	margin-top: auto
+snippet m
+	margin: ${0}
+snippet m:4
+	margin: ${1:0} ${2:0} ${3:0} ${0:0}
+snippet m:3
+	margin: ${1:0} ${2:0} ${0:0}
+snippet m:2
+	margin: ${1:0} ${0:0}
+snippet m:0
+	margin: 0
+snippet m:a
+	margin: auto
+snippet mah
+	max-height: ${0}
+snippet mah:n
+	max-height: none
+snippet maw
+	max-width: ${0}
+snippet maw:n
+	max-width: none
+snippet mih
+	min-height: ${0}
+snippet miw
+	min-width: ${0}
+snippet op
+	opacity: ${0}
+snippet op:ie
+	filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+snippet op:ms
+	-ms-filter: 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+snippet orp
+	orphans: ${0}
+snippet o+
+	outline: ${1:1px} ${2:solid} #${0:000}
+snippet oc
+	outline-color: ${0:#000}
+snippet oc:i
+	outline-color: invert
+snippet oo
+	outline-offset: ${0}
+snippet os
+	outline-style: ${0}
+snippet ow
+	outline-width: ${0}
+snippet o
+	outline: ${0}
+snippet o:n
+	outline: none
+snippet ovs
+	overflow-style: ${0}
+snippet ovs:a
+	overflow-style: auto
+snippet ovs:mq
+	overflow-style: marquee
+snippet ovs:mv
+	overflow-style: move
+snippet ovs:p
+	overflow-style: panner
+snippet ovs:s
+	overflow-style: scrollbar
+snippet ovx
+	overflow-x: ${0}
+snippet ovx:a
+	overflow-x: auto
+snippet ovx:h
+	overflow-x: hidden
+snippet ovx:s
+	overflow-x: scroll
+snippet ovx:v
+	overflow-x: visible
+snippet ovy
+	overflow-y: ${0}
+snippet ovy:a
+	overflow-y: auto
+snippet ovy:h
+	overflow-y: hidden
+snippet ovy:s
+	overflow-y: scroll
+snippet ovy:v
+	overflow-y: visible
+snippet ov
+	overflow: ${0}
+snippet ov:a
+	overflow: auto
+snippet ov:h
+	overflow: hidden
+snippet ov:s
+	overflow: scroll
+snippet ov:v
+	overflow: visible
+snippet pb
+	padding-bottom: ${0}
+snippet pl
+	padding-left: ${0}
+snippet pr
+	padding-right: ${0}
+snippet pt
+	padding-top: ${0}
+snippet p
+	padding: ${0}
+snippet p:4
+	padding: ${1:0} ${2:0} ${3:0} ${0:0}
+snippet p:3
+	padding: ${1:0} ${2:0} ${0:0}
+snippet p:2
+	padding: ${1:0} ${0:0}
+snippet p:0
+	padding: 0
+snippet pgba
+	page-break-after: ${0}
+snippet pgba:aw
+	page-break-after: always
+snippet pgba:a
+	page-break-after: auto
+snippet pgba:l
+	page-break-after: left
+snippet pgba:r
+	page-break-after: right
+snippet pgbb
+	page-break-before: ${0}
+snippet pgbb:aw
+	page-break-before: always
+snippet pgbb:a
+	page-break-before: auto
+snippet pgbb:l
+	page-break-before: left
+snippet pgbb:r
+	page-break-before: right
+snippet pgbi
+	page-break-inside: ${0}
+snippet pgbi:a
+	page-break-inside: auto
+snippet pgbi:av
+	page-break-inside: avoid
+snippet pos
+	position: ${0}
+snippet pos:a
+	position: absolute
+snippet pos:f
+	position: fixed
+snippet pos:r
+	position: relative
+snippet pos:s
+	position: static
+snippet q
+	quotes: ${0}
+snippet q:en
+	quotes: '\201C' '\201D' '\2018' '\2019'
+snippet q:n
+	quotes: none
+snippet q:ru
+	quotes: '\00AB' '\00BB' '\201E' '\201C'
+snippet rz
+	resize: ${0}
+snippet rz:b
+	resize: both
+snippet rz:h
+	resize: horizontal
+snippet rz:n
+	resize: none
+snippet rz:v
+	resize: vertical
+snippet r
+	right: ${0}
+snippet r:a
+	right: auto
+snippet tbl
+	table-layout: ${0}
+snippet tbl:a
+	table-layout: auto
+snippet tbl:f
+	table-layout: fixed
+snippet tal
+	text-align-last: ${0}
+snippet tal:a
+	text-align-last: auto
+snippet tal:c
+	text-align-last: center
+snippet tal:l
+	text-align-last: left
+snippet tal:r
+	text-align-last: right
+snippet ta
+	text-align: ${0}
+snippet ta:c
+	text-align: center
+snippet ta:l
+	text-align: left
+snippet ta:r
+	text-align: right
+snippet td
+	text-decoration: ${0}
+snippet td:l
+	text-decoration: line-through
+snippet td:n
+	text-decoration: none
+snippet td:o
+	text-decoration: overline
+snippet td:u
+	text-decoration: underline
+snippet te
+	text-emphasis: ${0}
+snippet te:ac
+	text-emphasis: accent
+snippet te:a
+	text-emphasis: after
+snippet te:b
+	text-emphasis: before
+snippet te:c
+	text-emphasis: circle
+snippet te:ds
+	text-emphasis: disc
+snippet te:dt
+	text-emphasis: dot
+snippet te:n
+	text-emphasis: none
+snippet th
+	text-height: ${0}
+snippet th:a
+	text-height: auto
+snippet th:f
+	text-height: font-size
+snippet th:m
+	text-height: max-size
+snippet th:t
+	text-height: text-size
+snippet ti
+	text-indent: ${0}
+snippet ti:-
+	text-indent: -9999px
+snippet tj
+	text-justify: ${0}
+snippet tj:a
+	text-justify: auto
+snippet tj:d
+	text-justify: distribute
+snippet tj:ic
+	text-justify: inter-cluster
+snippet tj:ii
+	text-justify: inter-ideograph
+snippet tj:iw
+	text-justify: inter-word
+snippet tj:k
+	text-justify: kashida
+snippet tj:t
+	text-justify: tibetan
+snippet to+
+	text-outline: ${1:0} ${2:0} #${0:000}
+snippet to
+	text-outline: ${0}
+snippet to:n
+	text-outline: none
+snippet tr
+	text-replace: ${0}
+snippet tr:n
+	text-replace: none
+snippet tsh+
+	text-shadow: ${1:0} ${2:0} ${3:0} #${0:000}
+snippet tsh
+	text-shadow: ${0}
+snippet tsh:n
+	text-shadow: none
+snippet tt
+	text-transform: ${0}
+snippet tt:c
+	text-transform: capitalize
+snippet tt:l
+	text-transform: lowercase
+snippet tt:n
+	text-transform: none
+snippet tt:u
+	text-transform: uppercase
+snippet tw
+	text-wrap: ${0}
+snippet tw:no
+	text-wrap: none
+snippet tw:n
+	text-wrap: normal
+snippet tw:s
+	text-wrap: suppress
+snippet tw:u
+	text-wrap: unrestricted
+snippet t
+	top: ${0}
+snippet t:a
+	top: auto
+snippet va
+	vertical-align: ${0}
+snippet va:bl
+	vertical-align: baseline
+snippet va:b
+	vertical-align: bottom
+snippet va:m
+	vertical-align: middle
+snippet va:sub
+	vertical-align: sub
+snippet va:sup
+	vertical-align: super
+snippet va:tb
+	vertical-align: text-bottom
+snippet va:tt
+	vertical-align: text-top
+snippet va:t
+	vertical-align: top
+snippet v
+	visibility: ${0}
+snippet v:c
+	visibility: collapse
+snippet v:h
+	visibility: hidden
+snippet v:v
+	visibility: visible
+snippet whsc
+	white-space-collapse: ${0}
+snippet whsc:ba
+	white-space-collapse: break-all
+snippet whsc:bs
+	white-space-collapse: break-strict
+snippet whsc:k
+	white-space-collapse: keep-all
+snippet whsc:l
+	white-space-collapse: loose
+snippet whsc:n
+	white-space-collapse: normal
+snippet whs
+	white-space: ${0}
+snippet whs:n
+	white-space: normal
+snippet whs:nw
+	white-space: nowrap
+snippet whs:pl
+	white-space: pre-line
+snippet whs:pw
+	white-space: pre-wrap
+snippet whs:p
+	white-space: pre
+snippet wid
+	widows: ${0}
+snippet w
+	width: ${0}
+snippet w:a
+	width: auto
+snippet wob
+	word-break: ${0}
+snippet wob:ba
+	word-break: break-all
+snippet wob:bs
+	word-break: break-strict
+snippet wob:k
+	word-break: keep-all
+snippet wob:l
+	word-break: loose
+snippet wob:n
+	word-break: normal
+snippet wos
+	word-spacing: ${0}
+snippet wow
+	word-wrap: ${0}
+snippet wow:no
+	word-wrap: none
+snippet wow:n
+	word-wrap: normal
+snippet wow:s
+	word-wrap: suppress
+snippet wow:u
+	word-wrap: unrestricted
+snippet z
+	z-index: ${0}
+snippet z:a
+	z-index: auto
+snippet zoo
+	zoom: 1
+snippet :h
+	:hover
+snippet :fc
+	:first-child
+snippet :lc
+	:last-child
+snippet :nc
+	:nth-child(${0})
+snippet :nlc
+	:nth-last-child(${0})
+snippet :oc
+	:only-child
+snippet :a
+	:after
+snippet :b
+	:before
+snippet ::a
+	::after
+snippet ::b
+	::before
diff --git a/vim/snippets/vim-snippets/snippets/scala.snippets b/vim/snippets/vim-snippets/snippets/scala.snippets
new file mode 100644
index 0000000..a6c3f3c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/scala.snippets
@@ -0,0 +1,360 @@
+################################################################
+# © Copyright 2011 Konstantin Gorodinskiy. All Rights Reserved.#
+# Do What The Fuck You Want To Public License, Version 2.      #
+# See http://sam.zoy.org/wtfpl/COPYING for more details.       #
+################################################################
+# Scala lang
+#if
+snippet if
+	if (${1})
+		${0:${VISUAL}}
+#if not
+snippet ifn
+	if (!${1})
+		${0:${VISUAL}}
+#if-else
+snippet ife
+	if (${1})
+		${2:${VISUAL}}
+	else
+		${0}
+#if-else-if
+snippet ifelif
+	if (${1})
+		${2:${VISUAL}}
+	else if (${3})
+		${0:${VISUAL}}
+snippet eif
+	else if (${3})
+		${0:${VISUAL}}
+#while loop
+snippet wh
+	while (${1:obj}) {
+		${0:${VISUAL}}
+	}
+#for loop(classic)
+snippet for
+	for (${1:item} <- ${2:obj}) {
+		${0}
+	}
+#for loop(indexed)
+snippet fori
+	for (${1:i} <- ${2:0} to ${3:obj}.length) {
+		${0}
+	}
+#for comprehension
+snippet fory
+	for {
+		${1:item} <- ${2:obj}
+	} yield ${0}
+#exceptions
+snippet try
+	try {
+		${1:${VISUAL}}
+	} catch {
+		case e: FileNotFoundException => ${2}
+		case e: IOException => ${3}
+	} finally {
+		${0}
+	}
+#match
+snippet match
+	${1: obj} match {
+		case ${2:e} => ${3}
+		case _ => ${0}
+	}
+#case
+snippet case
+	case ${1:value} => ${0}
+############################
+# methods and arguments
+#
+#arg
+snippet arg
+	${1:a}: ${2:T}${0:, arg}
+#args
+snippet args
+	${1:args}: ${0:T}*
+#def
+snippet def
+	def ${1:name}(${2:arg}) = ${0:}
+#private def
+snippet prdef
+	private def ${1:name}(${2:arg}) = ${0:}
+#override def
+snippet ovdef
+	override def ${1:name}(${2:arg}) = ${0:}
+#first class function(see scalabook p 188)
+snippet fcf
+	(${1:a}: ${2:T}) => $1 ${0}
+snippet =>
+	${1:name} => ${0}
+#recursion
+snippet rec
+	def ${1:name}(${0:arg}) =
+		if($2) $2
+		else $1($2)
+#curried method
+snippet crdef
+	def ${1:name}(${2:arg})(${3:arg}) = ${0:}
+#main method
+#check validity of T
+snippet main
+	def main(args: Array[String]):${1:T} = ${0:}
+############################
+# basic types(general purpose)
+# you might want to use basic types snippets
+
+#1
+snippet T Double
+	dbl
+#2
+snippet T Int
+	int
+#3
+snippet T Long
+	lng
+#4
+snippet T Char
+	chr
+#5
+snippet T String
+	str
+#6
+snippet T Array
+	arr
+#7
+snippet T Buffer
+	buf
+#8
+snippet T List
+	list
+#9
+snippet T Tuple
+	tpl
+#10
+snippet T Set
+	set
+#11
+snippet T Map
+	map
+#12
+snippet T HashSet
+	hset
+#13
+snippet T HashMap
+	hmap
+#14
+snippet T Boolean
+	bool
+#end
+
+#named snippets for types
+snippet bool
+	Boolean
+snippet anyr
+	AnyRef
+snippet dbl
+	Double
+snippet int
+	Int
+snippet str
+	String
+snippet chr
+	Char
+snippet lng
+	Long
+snippet arr
+	Array${1:[T]}${0:()}
+snippet buf
+	Buffer${1:[T]}${0:()}
+snippet list
+	List${1:[T]}${0:()}
+snippet tpl
+	Tuple${1:2}[${2:T},${0:T}]
+snippet set
+	Set${1:[T]}${0:()}
+snippet hset
+	HashSet${1:[T]}${0:()}
+snippet mhset
+	mutable.HashSet${1:[T]}${0:()}
+#for maps
+snippet keyval
+	${1:key}->${2:val}${0:, keyval}
+snippet map
+	Map[${1:T},${2:T}]${0:(keyval)}
+snippet hmap
+	HashMap[${1:T},${2:T}]${0:(keyval)}
+snippet mmap
+	mutable.Map[${1:T},${2:T}]${0:(keyval)}
+snippet mhmap
+	mutable.HashMap[${1:T},${2:T}]${0:(keyval)}
+#TODO add TreeMap and TreeSet
+#asInstanceOf[]
+snippet as
+	${1:name}.asInstanceOf[${2:T}]
+#isInstanceOf[]
+snippet is
+	${1:name}.isInstanceOf[${2:T}]
+
+#collections methods
+
+#scope() with one arg
+snippet (a
+	(${1:a} => ${0})
+#scope() with two args
+snippet {(
+	{(${1:a},${2:b}) =>
+		${0}
+	}
+#filter
+snippet filter
+	${0:name}.filter (a
+#map function
+snippet mapf
+	${0:name}.map (a
+#flatmap
+snippet flatmap
+	${1:name}.flatMap${0:[T]}(a
+#fold left
+snippet fldl
+	${1:name}.foldLeft(${0:first}) {(
+#fold right
+snippet fldr
+	${1:name}.foldRight(${0:first}) {(
+#fold left operator(if u wanna reduce readability of ur code)
+#use wildcard symbols
+snippet /:
+	(${1:first}/:${2:name})(${0})
+#fold right operator
+snippet :\
+	(${1:first}:\${2:name})(${0})
+#reduce left
+snippet redl
+	${1:name}.reduceLeft[${0:T}] {(
+#reduce right
+snippet redr
+	${1:name}.reduceRight[${0:T}] {(
+#zipWithIndex(safe way).
+#see http://daily-scala.blogspot.com/2010/05/zipwithindex.html
+snippet zipwi
+	${0:name}.view.zipWithIndex
+#split
+snippet spl
+	${1:name}.split("${0:,}")
+#end
+snippet val
+	val ${1:name}${2:: T} = ${0:value}
+snippet var
+	var ${1:name}${2:: T} = ${0:value}
+############################
+# classes
+#
+#extends
+snippet extends
+	extends ${0:what}
+#with
+snippet with
+	with ${1:what}${0: with}
+#auxiliary constructor(a. this)
+snippet athis
+	def this(arg) = this(arg)
+#abstract class
+snippet abstract
+	abstract class ${1:name}${2:(arg)}${3: extends }${4: with} {
+		${5:override def toString = "$1"}
+		${0}
+	}
+#class
+snippet class
+	class ${1:name}${2:(arg)}${3: extends }${4: with} {
+		${5:override def toString = "$1"}
+		${0}
+	}
+#object
+snippet object
+	object ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
+#trait
+snippet trait
+	trait ${1:name}${2: extends }${3: with} {
+		${0:}
+	}
+#class with trait Ordered(page 265)
+snippet ordered
+	class ${1:name}${2:(arg)} extends Ordered[$1] ${3: with} {
+		${4:override def toString = "$1"}
+		def compare(that: $1) = ${5:this - that}
+		${0}
+	}
+#case class
+snippet casecl
+	case class ${1:name}${2:(arg)}${3: extends }${4: with} ${0:}
+############################
+# testing
+#
+#scalatest imports
+snippet scalatest
+	${1:import org.scalatest.Suite}
+	${0:import org.scalatest.FunSuite}
+#assert
+snippet assert
+	assert(${1:a} === ${0:b})
+#ensuring(p 296)
+snippet ensuring
+	ifel ensuring(${1:a}==${0:b})
+#expect
+snippet expect
+	expect(${1:what}) {
+		${0}
+	}
+#intercept
+snippet intercept
+	intercept[${1:IllegalArgumentException}] {
+		${0}
+	}
+#test
+snippet test
+	test("${1:description}") {
+		${0}
+	}
+#suite
+snippet suite
+	class ${0:name} extends Suite {
+		def test() {
+	}
+#funsuite
+snippet fsuite
+	class ${1:name} extends FunSuite {
+		test("${0:description}") {
+	}
+############################
+# SBT
+#
+snippet webproject
+	import sbt._
+
+	class ${1:Name}(info: ProjectInfo) extends DefaultWebProject(info) {
+		val liftVersion = "${0:2.3}"
+
+		override def libraryDependencies = Set(
+
+		) ++ super.libraryDependencies
+
+		val snapshots = ScalaToolsSnapshots
+	}
+#depencies
+snippet liftjar
+	"net.liftweb" %% "${0:lib}" % liftVersion % "compile->default",
+snippet jettyjar
+	"org.mortbay.jetty" % "jetty" % "${0:version}" % "test->default",
+############################
+# Lift
+#
+#lift imports
+snippet liftimports
+	import _root_.net.liftweb.http._
+	import S._
+	import _root_.net.liftweb.util._
+	import Helpers._
+	import _root_.scala.xml._
+#TODO LIFT,SBT,WEB.XML,HTML snippets
diff --git a/vim/snippets/vim-snippets/snippets/scheme.snippets b/vim/snippets/vim-snippets/snippets/scheme.snippets
new file mode 100644
index 0000000..035d534
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/scheme.snippets
@@ -0,0 +1,36 @@
+snippet +
+	(+	${1}
+		${0})
+
+snippet -
+	(-	${1}
+		${0})
+
+snippet /
+	(/	${1}
+		${0})
+
+snippet *
+	(*	${1}
+		${0})
+
+# Definition
+snippet def
+	(define (${1:name})
+			(${0:definition}))
+
+# Definition with lambda
+snippet defl
+	(define ${1:name}
+			(lambda (x)(${0:definition})))
+
+# Condition
+snippet cond
+	(cond	((${1:predicate}) (${2:action}))
+			((${3:predicate}) (${0:action})))
+
+# If statement
+snippet if
+	(if (${1:predicate})
+		(${2:true-action})
+		(${0:false-action}))
diff --git a/vim/snippets/vim-snippets/snippets/scss.snippets b/vim/snippets/vim-snippets/snippets/scss.snippets
new file mode 100644
index 0000000..998a120
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/scss.snippets
@@ -0,0 +1,44 @@
+extends css
+
+snippet $
+	$${1:variable}: ${0:value};
+snippet imp
+	@import '${0}';
+snippet mix
+	@mixin ${1:name}(${2}) {
+		${0}
+	}
+snippet inc
+	@include ${1:mixin}(${2});
+snippet ext
+	@extend ${0};
+snippet fun
+	@function ${1:name}(${2:args}) {
+		${0}
+	}
+snippet if
+	@if ${1:condition} {
+		${0}
+	}
+snippet ife
+	@if ${1:condition} {
+		${2}
+	} @else {
+		${0}
+	}
+snippet eif
+	@else if ${1:condition} {
+		${0}
+	}
+snippet for
+	@for ${1:$i} from ${2:1} through ${3:3} {
+		${0}
+	}
+snippet each
+	@each ${1:$item} in ${2:items} {
+		${0}
+	}
+snippet while
+	@while ${1:$i} ${2:>} ${3:0} {
+		${0}
+	}
diff --git a/vim/snippets/vim-snippets/snippets/sh.snippets b/vim/snippets/vim-snippets/snippets/sh.snippets
new file mode 100644
index 0000000..35afa30
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/sh.snippets
@@ -0,0 +1,106 @@
+# Shebang. Executing bash via /usr/bin/env makes scripts more portable.
+snippet #!
+	#!/usr/bin/env sh
+
+snippet s#!
+	#!/usr/bin/env sh
+	set -euo pipefail
+
+snippet safe
+	set -euo pipefail
+
+snippet bash
+	#!/usr/bin/env bash
+
+snippet sbash
+	#!/usr/bin/env bash
+	set -euo pipefail
+	IFS=$'\n\t'
+
+snippet if
+	if [[ ${1:condition} ]]; then
+		${0:${VISUAL}}
+	fi
+snippet elif
+	elif [[ ${1:condition} ]]; then
+		${0:${VISUAL}}
+snippet for
+	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
+		${0:${VISUAL}}
+	done
+snippet fori
+	for ${1:needle} in ${2:haystack} ; do
+		${0:${VISUAL}}
+	done
+snippet wh
+	while [[ ${1:condition} ]]; do
+		${0:${VISUAL}}
+	done
+snippet until
+	until [[ ${1:condition} ]]; do
+		${0:${VISUAL}}
+	done
+snippet case
+	case ${1:word} in
+		${2:pattern})
+			${0};;
+	esac
+snippet go
+	while getopts '${1:o}' ${2:opts}
+	do
+		case $$2 in
+		${3:o0})
+			${0:#staments};;
+		esac
+	done
+# Set SCRIPT_DIR variable to directory script is located.
+snippet sdir
+	SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+# getopt
+snippet getopt
+	__ScriptVersion="${1:version}"
+
+	#===  FUNCTION  ================================================================
+	#         NAME:  usage
+	#  DESCRIPTION:  Display usage information.
+	#===============================================================================
+	function usage ()
+	{
+		echo "Usage :  $${0:0} [options] [--]
+
+	    Options:
+	    -h|help       Display this message
+	    -v|version    Display script version"
+
+	}    # ----------  end of function usage  ----------
+
+	#-----------------------------------------------------------------------
+	#  Handle command line arguments
+	#-----------------------------------------------------------------------
+
+	while getopts ":hv" opt
+	do
+	  case $opt in
+
+		h|help     )  usage; exit 0   ;;
+
+		v|version  )  echo "$${0:0} -- Version $__ScriptVersion"; exit 0   ;;
+
+		* )  echo -e "\n  Option does not exist : $OPTARG\n"
+			  usage; exit 1   ;;
+
+	  esac    # --- end of case ---
+	done
+	shift $(($OPTIND-1))
+snippet root
+	if [ \$(id -u) -ne 0 ]; then exec sudo \$0; fi
+
+snippet fun-sh
+	${1:function_name}() {
+		${0:#function_body}
+	}
+
+snippet fun
+	function ${1:function_name}() {
+		${0:#function_body}
+	}
diff --git a/vim/snippets/vim-snippets/snippets/simplemvcf.snippets b/vim/snippets/vim-snippets/snippets/simplemvcf.snippets
new file mode 100644
index 0000000..2ef6a65
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/simplemvcf.snippets
@@ -0,0 +1,122 @@
+snippet sm_controller
+	<?php
+		namespace Controllers;
+		use Core\View;
+		use Core\Controller;
+
+		class ${1:class_name} extends Controller
+		{
+			public function __construct()
+			{
+				parent::__construct();
+			}
+
+			public function index()
+			{
+				${2:}
+			}
+		}
+snippet sm_model
+	<?php 
+		namespace Models;
+	 
+		use Core\Model;
+	  
+		class ${1:class_name} extends Model 
+		{    
+			function __construct()
+			{
+				parent::__construct();
+			}  
+		}
+snippet sm_model_crud
+	<?php 
+		namespace Models;
+
+		use Core\Model;
+
+		class ${1:class_name} extends Model 
+		{    
+			private $${2:table};
+			function __construct()
+			{
+				parent::__construct();
+			}  
+			
+			public function getRow($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.' WHERE ${3:where}', $data);
+			}
+
+			public function getRows($where)
+			{
+				return $this->db->select('SELECT * FROM '.$table.');
+			}
+
+			public function insert($data)
+			{
+				$this->db->insert($table, $data);
+			}
+
+			public function update($data, $where)
+			{
+				$this->db->update($table ,$data, $where);
+			}
+
+			public function delete($where)
+			{
+				$this->db->delete($table, $where);
+			}
+		}
+snippet sm_render
+	View::render('${1:view}', $${2:array});
+snippet sm_render_template
+	View::renderTemplate('${1:part}', $${2:array});
+
+# database
+snippet sm_db_select
+	$this->db->select(${1:sql}, ${2:where});
+
+snippet sm_db_insert
+	$this->db->insert(${1:table}, ${2:data});
+
+snippet sm_db_update
+	$this->db->update(${1:table}, ${2:data}, ${3:where});
+
+snippet sm_db_delete
+	$this->db->delete(${1:table}, ${2:where});
+
+snippet sm_db_truncate
+	$this->db->delete(${1:table});
+
+#session
+snippet sm_session_set
+	Session::set(${1:key}, ${2:value});
+
+snippet sm_session_get
+	Session::get(${1:key});
+
+snippet sm_session_pull
+	Session::pull(${1:key});
+
+snippet sm_session_id
+	Session::id();
+
+snippet sm_session_destroy
+	Session::set(${1:key});
+	
+snippet sm_session_display
+	Session::display();
+
+#url
+snippet sm_url_redirect
+	Url:redirect('${1:path}');
+
+snippet sm_url_previous
+	Url:previous();
+
+snippet sm_url_templatepath
+	Url:templatePath();
+
+snippet sm_url_autolink
+	Url:autolink('${1:string}');
diff --git a/vim/snippets/vim-snippets/snippets/slim.snippets b/vim/snippets/vim-snippets/snippets/slim.snippets
new file mode 100644
index 0000000..885ca8d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/slim.snippets
@@ -0,0 +1,63 @@
+snippet pry
+	- binding.pry
+snippet renp
+	= render partial: '${0}'
+# Forms
+# =====
+snippet fieldset
+	fieldset
+		legend ${1}
+snippet css
+	link rel="stylesheet" href="${1:style.css}" type="text/css" media="${2:all}"
+snippet script
+	script src="${1:script.js}" type="text/javascript"
+# Some useful Unicode entities
+# ============================
+# Non-Breaking Space
+snippet nbs
+	&nbsp;
+# ←
+snippet left
+	&#x2190;
+# →
+snippet right
+	&#x2192;
+# ↑
+snippet up
+	&#x2191;
+# ↓
+snippet down
+	&#x2193;
+# ↩
+snippet return
+	&#x21A9;
+# ⇤
+snippet backtab
+	&#x21E4;
+# ⇥
+snippet tab
+	&#x21E5;
+# ⇧
+snippet shift
+	&#x21E7;
+# ⌃
+snippet ctrl
+	&#x2303;
+# ⌅
+snippet enter
+	&#x2305;
+# ⌘
+snippet cmd
+	&#x2318;
+# ⌥
+snippet option
+	&#x2325;
+# ⌦
+snippet delete
+	&#x2326;
+# ⌫
+snippet backspace
+	&#x232B;
+# ⎋
+snippet esc
+	&#x238B;
diff --git a/vim/snippets/vim-snippets/snippets/snippets.snippets b/vim/snippets/vim-snippets/snippets/snippets.snippets
new file mode 100644
index 0000000..c2d932a
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/snippets.snippets
@@ -0,0 +1,8 @@
+# snippets for making snippets :)
+snippet snip
+	snippet ${1:trigger} "${2:description}"
+		${0:${VISUAL}}
+snippet v
+	{VISUAL}
+snippet $
+	${${1:1}:${0:text}}
diff --git a/vim/snippets/vim-snippets/snippets/sql.snippets b/vim/snippets/vim-snippets/snippets/sql.snippets
new file mode 100644
index 0000000..556fae0
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/sql.snippets
@@ -0,0 +1,26 @@
+snippet tbl
+	create table ${1:table} (
+		${0:columns}
+	);
+snippet col
+	${1:name}	${2:type}	${3:default ''}	${0:not null}
+snippet ccol
+	${1:name}	varchar2(${2:size})	${3:default ''}	${0:not null}
+snippet ncol
+	${1:name}	number	${3:default 0}	${0:not null}
+snippet dcol
+	${1:name}	date	${3:default sysdate}	${0:not null}
+snippet ind
+	create index ${0:$1_$2} on ${1:table}(${2:column});
+snippet uind
+	create unique index ${1:name} on ${2:table}(${0:column});
+snippet tblcom
+	comment on table ${1:table} is '${0:comment}';
+snippet colcom
+	comment on column ${1:table}.${2:column} is '${0:comment}';
+snippet addcol
+	alter table ${1:table} add (${2:column} ${0:type});
+snippet seq
+	create sequence ${1:name} start with ${2:1} increment by ${3:1} minvalue ${0:1};
+snippet s*
+	select * from ${0:table}
diff --git a/vim/snippets/vim-snippets/snippets/stylus.snippets b/vim/snippets/vim-snippets/snippets/stylus.snippets
new file mode 100644
index 0000000..3ce35c2
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/stylus.snippets
@@ -0,0 +1,999 @@
+snippet !
+	!important
+snippet bdi:m+
+	-moz-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:m
+	-moz-border-image ${0}
+snippet bdrz:m
+	-moz-border-radius ${0}
+snippet bxsh:m+
+	-moz-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh:m
+	-moz-box-shadow ${0}
+snippet bdi:w+
+	-webkit-border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:w
+	-webkit-border-image ${0}
+snippet bdrz:w
+	-webkit-border-radius ${0}
+snippet bxsh:w+
+	-webkit-box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh:w
+	-webkit-box-shadow ${0}
+snippet @f
+	@font-face ${0}
+snippet @i
+	@import '${0}'
+snippet @r
+	@require '${0}'
+snippet @m
+	@media ${1:screen}
+snippet @msmw
+	@media screen and (min-width: ${0}px)
+snippet @ext
+	@extend .${1}
+	${0}
+snippet bg+
+	background ${1} url(${2}) ${3:0} ${4:0} ${0:no-repeat}
+snippet bga
+	background-attachment ${0}
+snippet bga:f
+	background-attachment fixed
+snippet bga:s
+	background-attachment scroll
+snippet bgbk
+	background-break ${0}
+snippet bgbk:bb
+	background-break bounding-box
+snippet bgbk:c
+	background-break continuous
+snippet bgbk:eb
+	background-break each-box
+snippet bgcp
+	background-clip ${0}
+snippet bgcp:bb
+	background-clip border-box
+snippet bgcp:cb
+	background-clip content-box
+snippet bgcp:nc
+	background-clip no-clip
+snippet bgcp:pb
+	background-clip padding-box
+snippet bgc
+	background-color ${0}
+snippet bgc:t
+	background-color transparent
+snippet bgi
+	background-image url(${0})
+snippet bgi:n
+	background-image none
+snippet bgo
+	background-origin ${0}
+snippet bgo:bb
+	background-origin border-box
+snippet bgo:cb
+	background-origin content-box
+snippet bgo:pb
+	background-origin padding-box
+snippet bgpx
+	background-position-x ${0}
+snippet bgpy
+	background-position-y ${0}
+snippet bgp
+	background-position ${1:0} ${0:0}
+snippet bgr
+	background-repeat ${0}
+snippet bgr:n
+	background-repeat no-repeat
+snippet bgr:x
+	background-repeat repeat-x
+snippet bgr:y
+	background-repeat repeat-y
+snippet bgr:r
+	background-repeat repeat
+snippet bgz
+	background-size ${0}
+snippet bgz:a
+	background-size auto
+snippet bgz:ct
+	background-size contain
+snippet bgz:cv
+	background-size cover
+snippet bg
+	background ${0}
+snippet bg:ie
+	filter progid:DXImageTransform.Microsoft.AlphaImageLoader(src='${1}',sizingMethod='${0:crop}')
+snippet bg:n
+	background none
+snippet bd+
+	border ${1:1px} ${2:solid} ${0}
+snippet bdb+
+	border-bottom ${1:1px} ${2:solid} ${0}
+snippet bdbc
+	border-bottom-color ${0}
+snippet bdbi
+	border-bottom-image url(${0})
+snippet bdbi:n
+	border-bottom-image none
+snippet bdbli
+	border-bottom-left-image url(${0})
+snippet bdbli:c
+	border-bottom-left-image continue
+snippet bdbli:n
+	border-bottom-left-image none
+snippet bdblrz
+	border-bottom-left-radius ${0}
+snippet bdbri
+	border-bottom-right-image url(${0})
+snippet bdbri:c
+	border-bottom-right-image continue
+snippet bdbri:n
+	border-bottom-right-image none
+snippet bdbrrz
+	border-bottom-right-radius ${0}
+snippet bdbs
+	border-bottom-style ${0}
+snippet bdbs:n
+	border-bottom-style none
+snippet bdbw
+	border-bottom-width ${0}
+snippet bdb
+	border-bottom ${0}
+snippet bdb:n
+	border-bottom none
+snippet bdbk
+	border-break ${0}
+snippet bdbk:c
+	border-break close
+snippet bdcl
+	border-collapse ${0}
+snippet bdcl:c
+	border-collapse collapse
+snippet bdcl:s
+	border-collapse separate
+snippet bdc
+	border-color ${0}
+snippet bdci
+	border-corner-image url(${0})
+snippet bdci:c
+	border-corner-image continue
+snippet bdci:n
+	border-corner-image none
+snippet bdf
+	border-fit ${0}
+snippet bdf:c
+	border-fit clip
+snippet bdf:of
+	border-fit overwrite
+snippet bdf:ow
+	border-fit overwrite
+snippet bdf:r
+	border-fit repeat
+snippet bdf:sc
+	border-fit scale
+snippet bdf:sp
+	border-fit space
+snippet bdf:st
+	border-fit stretch
+snippet bdi
+	border-image url(${1}) ${2:0} ${3:0} ${4:0} ${5:0} ${6:stretch} ${0:stretch}
+snippet bdi:n
+	border-image none
+snippet bdl+
+	border-left ${1:1px} ${2:solid} ${0}
+snippet bdlc
+	border-left-color ${0}
+snippet bdli
+	border-left-image url(${0})
+snippet bdli:n
+	border-left-image none
+snippet bdls
+	border-left-style ${0}
+snippet bdls:n
+	border-left-style none
+snippet bdlw
+	border-left-width ${0}
+snippet bdl
+	border-left ${0}
+snippet bdl:n
+	border-left none
+snippet bdlt
+	border-length ${0}
+snippet bdlt:a
+	border-length auto
+snippet bdrz
+	border-radius ${0}
+snippet bdr+
+	border-right ${1:1px} ${2:solid} ${0}
+snippet bdrc
+	border-right-color ${0}
+snippet bdri
+	border-right-image url(${0})
+snippet bdri:n
+	border-right-image none
+snippet bdrs
+	border-right-style ${0}
+snippet bdrs:n
+	border-right-style none
+snippet bdrw
+	border-right-width ${0}
+snippet bdr
+	border-right ${0}
+snippet bdr:n
+	border-right none
+snippet bdsp
+	border-spacing ${0}
+snippet bds
+	border-style ${0}
+snippet bds:ds
+	border-style dashed
+snippet bds:dtds
+	border-style dot-dash
+snippet bds:dtdtds
+	border-style dot-dot-dash
+snippet bds:dt
+	border-style dotted
+snippet bds:db
+	border-style double
+snippet bds:g
+	border-style groove
+snippet bds:h
+	border-style hidden
+snippet bds:i
+	border-style inset
+snippet bds:n
+	border-style none
+snippet bds:o
+	border-style outset
+snippet bds:r
+	border-style ridge
+snippet bds:s
+	border-style solid
+snippet bds:w
+	border-style wave
+snippet bdt+
+	border-top ${1:1px} ${2:solid} ${0}
+snippet bdtc
+	border-top-color ${0}
+snippet bdti
+	border-top-image url(${0})
+snippet bdti:n
+	border-top-image none
+snippet bdtli
+	border-top-left-image url(${0})
+snippet bdtli:c
+	border-corner-image continue
+snippet bdtli:n
+	border-corner-image none
+snippet bdtlrz
+	border-top-left-radius ${0}
+snippet bdtri
+	border-top-right-image url(${0})
+snippet bdtri:c
+	border-top-right-image continue
+snippet bdtri:n
+	border-top-right-image none
+snippet bdtrrz
+	border-top-right-radius ${0}
+snippet bdts
+	border-top-style ${0}
+snippet bdts:n
+	border-top-style none
+snippet bdtw
+	border-top-width ${0}
+snippet bdt
+	border-top ${0}
+snippet bdt:n
+	border-top none
+snippet bdw
+	border-width ${0}
+snippet bd
+	border ${0}
+snippet bd:n
+	border none
+snippet b
+	bottom ${0}
+snippet b:a
+	bottom auto
+snippet bxsh+
+	box-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet bxsh
+	box-shadow ${0}
+snippet bxsh:n
+	box-shadow none
+snippet bxz
+	box-sizing ${0}
+snippet bxz:bb
+	box-sizing border-box
+snippet bxz:cb
+	box-sizing content-box
+snippet cps
+	caption-side ${0}
+snippet cps:b
+	caption-side bottom
+snippet cps:t
+	caption-side top
+snippet cl
+	clear ${0}
+snippet cl:b
+	clear both
+snippet cl:l
+	clear left
+snippet cl:n
+	clear none
+snippet cl:r
+	clear right
+snippet cp
+	clip ${0}
+snippet cp:a
+	clip auto
+snippet cp:r
+	clip rect(${1:0} ${2:0} ${3:0} ${0:0})
+snippet c
+	color ${0}
+snippet ct
+	content ${0}
+snippet ct:a
+	content attr(${0})
+snippet ct:cq
+	content close-quote
+snippet ct:c
+	content counter(${0})
+snippet ct:cs
+	content counters(${0})
+snippet ct:ncq
+	content no-close-quote
+snippet ct:noq
+	content no-open-quote
+snippet ct:n
+	content normal
+snippet ct:oq
+	content open-quote
+snippet coi
+	counter-increment ${0}
+snippet cor
+	counter-reset ${0}
+snippet cur
+	cursor ${0}
+snippet cur:a
+	cursor auto
+snippet cur:c
+	cursor crosshair
+snippet cur:d
+	cursor default
+snippet cur:ha
+	cursor hand
+snippet cur:he
+	cursor help
+snippet cur:m
+	cursor move
+snippet cur:p
+	cursor pointer
+snippet cur:t
+	cursor text
+snippet d
+	display ${0}
+snippet d:mib
+	display -moz-inline-box
+snippet d:mis
+	display -moz-inline-stack
+snippet d:b
+	display block
+snippet d:f
+	display flex
+snippet d:cp
+	display compact
+snippet d:ib
+	display inline-block
+snippet d:itb
+	display inline-table
+snippet d:i
+	display inline
+snippet d:li
+	display list-item
+snippet d:n
+	display none
+snippet d:ri
+	display run-in
+snippet d:tbcp
+	display table-caption
+snippet d:tbc
+	display table-cell
+snippet d:tbclg
+	display table-column-group
+snippet d:tbcl
+	display table-column
+snippet d:tbfg
+	display table-footer-group
+snippet d:tbhg
+	display table-header-group
+snippet d:tbrg
+	display table-row-group
+snippet d:tbr
+	display table-row
+snippet d:tb
+	display table
+snippet ec
+	empty-cells ${0}
+snippet ec:h
+	empty-cells hide
+snippet ec:s
+	empty-cells show
+snippet exp
+	expression()
+snippet fl
+	float ${0}
+snippet fl:l
+	float left
+snippet fl:n
+	float none
+snippet fl:r
+	float right
+snippet f+
+	font ${1:1em} ${2:Arial},${0:sans-serif}
+snippet fef
+	font-effect ${0}
+snippet fef:eb
+	font-effect emboss
+snippet fef:eg
+	font-effect engrave
+snippet fef:n
+	font-effect none
+snippet fef:o
+	font-effect outline
+snippet femp
+	font-emphasize-position ${0}
+snippet femp:a
+	font-emphasize-position after
+snippet femp:b
+	font-emphasize-position before
+snippet fems
+	font-emphasize-style ${0}
+snippet fems:ac
+	font-emphasize-style accent
+snippet fems:c
+	font-emphasize-style circle
+snippet fems:ds
+	font-emphasize-style disc
+snippet fems:dt
+	font-emphasize-style dot
+snippet fems:n
+	font-emphasize-style none
+snippet fem
+	font-emphasize ${0}
+snippet ff
+	font-family ${0}
+snippet ff:c
+	font-family ${0:'Monotype Corsiva','Comic Sans MS'},cursive
+snippet ff:f
+	font-family ${0:Capitals,Impact},fantasy
+snippet ff:m
+	font-family ${0:Monaco,'Courier New'},monospace
+snippet ff:ss
+	font-family ${0:Helvetica,Arial},sans-serif
+snippet ff:s
+	font-family ${0:Georgia,'Times New Roman'},serif
+snippet fza
+	font-size-adjust ${0}
+snippet fza:n
+	font-size-adjust none
+snippet fz
+	font-size ${0}
+snippet fsm
+	font-smooth ${0}
+snippet fsm:aw
+	font-smooth always
+snippet fsm:a
+	font-smooth auto
+snippet fsm:n
+	font-smooth never
+snippet fst
+	font-stretch ${0}
+snippet fst:c
+	font-stretch condensed
+snippet fst:e
+	font-stretch expanded
+snippet fst:ec
+	font-stretch extra-condensed
+snippet fst:ee
+	font-stretch extra-expanded
+snippet fst:n
+	font-stretch normal
+snippet fst:sc
+	font-stretch semi-condensed
+snippet fst:se
+	font-stretch semi-expanded
+snippet fst:uc
+	font-stretch ultra-condensed
+snippet fst:ue
+	font-stretch ultra-expanded
+snippet fs
+	font-style ${0}
+snippet fs:i
+	font-style italic
+snippet fs:n
+	font-style normal
+snippet fs:o
+	font-style oblique
+snippet fv
+	font-variant ${0}
+snippet fv:n
+	font-variant normal
+snippet fv:sc
+	font-variant small-caps
+snippet fw
+	font-weight ${0}
+snippet fw:b
+	font-weight bold
+snippet fw:br
+	font-weight bolder
+snippet fw:lr
+	font-weight lighter
+snippet fw:n
+	font-weight normal
+snippet f
+	font ${0}
+snippet h
+	height ${0}
+snippet h:a
+	height auto
+snippet l
+	left ${0}
+snippet l:a
+	left auto
+snippet lts
+	letter-spacing ${0}
+snippet lh
+	line-height ${0}
+snippet lisi
+	list-style-image url(${0})
+snippet lisi:n
+	list-style-image none
+snippet lisp
+	list-style-position ${0}
+snippet lisp:i
+	list-style-position inside
+snippet lisp:o
+	list-style-position outside
+snippet list
+	list-style-type ${0}
+snippet list:c
+	list-style-type circle
+snippet list:dclz
+	list-style-type decimal-leading-zero
+snippet list:dc
+	list-style-type decimal
+snippet list:d
+	list-style-type disc
+snippet list:lr
+	list-style-type lower-roman
+snippet list:n
+	list-style-type none
+snippet list:s
+	list-style-type square
+snippet list:ur
+	list-style-type upper-roman
+snippet lis
+	list-style ${0}
+snippet lis:n
+	list-style none
+snippet mb
+	margin-bottom ${0}
+snippet mb:a
+	margin-bottom auto
+snippet ml
+	margin-left ${0}
+snippet ml:a
+	margin-left auto
+snippet mr
+	margin-right ${0}
+snippet mr:a
+	margin-right auto
+snippet mt
+	margin-top ${0}
+snippet mt:a
+	margin-top auto
+snippet m
+	margin ${0}
+snippet m:4
+	margin ${1:0} ${2:0} ${3:0} ${0:0}
+snippet m:3
+	margin ${1:0} ${2:0} ${0:0}
+snippet m:2
+	margin ${1:0} ${0:0}
+snippet m:0
+	margin 0
+snippet m:a
+	margin auto
+snippet mah
+	max-height ${0}
+snippet mah:n
+	max-height none
+snippet maw
+	max-width ${0}
+snippet maw:n
+	max-width none
+snippet mih
+	min-height ${0}
+snippet miw
+	min-width ${0}
+snippet op
+	opacity ${0}
+snippet op:ie
+	filter progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})
+snippet op:ms
+	-ms-filter 'progid:DXImageTransform.Microsoft.Alpha(Opacity=${0:100})'
+snippet orp
+	orphans ${0}
+snippet o+
+	outline ${1:1px} ${2:solid} ${0}
+snippet oc
+	outline-color ${0}
+snippet oc:i
+	outline-color invert
+snippet oo
+	outline-offset ${0}
+snippet os
+	outline-style ${0}
+snippet ow
+	outline-width ${0}
+snippet o
+	outline ${0}
+snippet o:n
+	outline none
+snippet ovs
+	overflow-style ${0}
+snippet ovs:a
+	overflow-style auto
+snippet ovs:mq
+	overflow-style marquee
+snippet ovs:mv
+	overflow-style move
+snippet ovs:p
+	overflow-style panner
+snippet ovs:s
+	overflow-style scrollbar
+snippet ovx
+	overflow-x ${0}
+snippet ovx:a
+	overflow-x auto
+snippet ovx:h
+	overflow-x hidden
+snippet ovx:s
+	overflow-x scroll
+snippet ovx:v
+	overflow-x visible
+snippet ovy
+	overflow-y ${0}
+snippet ovy:a
+	overflow-y auto
+snippet ovy:h
+	overflow-y hidden
+snippet ovy:s
+	overflow-y scroll
+snippet ovy:v
+	overflow-y visible
+snippet ov
+	overflow ${0}
+snippet ov:a
+	overflow auto
+snippet ov:h
+	overflow hidden
+snippet ov:s
+	overflow scroll
+snippet ov:v
+	overflow visible
+snippet pb
+	padding-bottom ${0}
+snippet pl
+	padding-left ${0}
+snippet pr
+	padding-right ${0}
+snippet pt
+	padding-top ${0}
+snippet p
+	padding ${0}
+snippet p:4
+	padding ${1:0} ${2:0} ${3:0} ${0:0}
+snippet p:3
+	padding ${1:0} ${2:0} ${0:0}
+snippet p:2
+	padding ${1:0} ${0:0}
+snippet p:0
+	padding 0
+snippet pgba
+	page-break-after ${0}
+snippet pgba:aw
+	page-break-after always
+snippet pgba:a
+	page-break-after auto
+snippet pgba:l
+	page-break-after left
+snippet pgba:r
+	page-break-after right
+snippet pgbb
+	page-break-before ${0}
+snippet pgbb:aw
+	page-break-before always
+snippet pgbb:a
+	page-break-before auto
+snippet pgbb:l
+	page-break-before left
+snippet pgbb:r
+	page-break-before right
+snippet pgbi
+	page-break-inside ${0}
+snippet pgbi:a
+	page-break-inside auto
+snippet pgbi:av
+	page-break-inside avoid
+snippet pos
+	position ${0}
+snippet pos:a
+	position absolute
+snippet pos:f
+	position fixed
+snippet pos:r
+	position relative
+snippet pos:s
+	position static
+snippet q
+	quotes ${0}
+snippet q:en
+	quotes '\201C' '\201D' '\2018' '\2019'
+snippet q:n
+	quotes none
+snippet q:ru
+	quotes '\00AB' '\00BB' '\201E' '\201C'
+snippet rz
+	resize ${0}
+snippet rz:b
+	resize both
+snippet rz:h
+	resize horizontal
+snippet rz:n
+	resize none
+snippet rz:v
+	resize vertical
+snippet r
+	right ${0}
+snippet r:a
+	right auto
+snippet tbl
+	table-layout ${0}
+snippet tbl:a
+	table-layout auto
+snippet tbl:f
+	table-layout fixed
+snippet tal
+	text-align-last ${0}
+snippet tal:a
+	text-align-last auto
+snippet tal:c
+	text-align-last center
+snippet tal:l
+	text-align-last left
+snippet tal:r
+	text-align-last right
+snippet ta
+	text-align ${0}
+snippet ta:c
+	text-align center
+snippet ta:l
+	text-align left
+snippet ta:r
+	text-align right
+snippet td
+	text-decoration ${0}
+snippet td:l
+	text-decoration line-through
+snippet td:n
+	text-decoration none
+snippet td:o
+	text-decoration overline
+snippet td:u
+	text-decoration underline
+snippet te
+	text-emphasis ${0}
+snippet te:ac
+	text-emphasis accent
+snippet te:a
+	text-emphasis after
+snippet te:b
+	text-emphasis before
+snippet te:c
+	text-emphasis circle
+snippet te:ds
+	text-emphasis disc
+snippet te:dt
+	text-emphasis dot
+snippet te:n
+	text-emphasis none
+snippet th
+	text-height ${0}
+snippet th:a
+	text-height auto
+snippet th:f
+	text-height font-size
+snippet th:m
+	text-height max-size
+snippet th:t
+	text-height text-size
+snippet ti
+	text-indent ${0}
+snippet ti:-
+	text-indent -9999px
+snippet tj
+	text-justify ${0}
+snippet tj:a
+	text-justify auto
+snippet tj:d
+	text-justify distribute
+snippet tj:ic
+	text-justify inter-cluster
+snippet tj:ii
+	text-justify inter-ideograph
+snippet tj:iw
+	text-justify inter-word
+snippet tj:k
+	text-justify kashida
+snippet tj:t
+	text-justify tibetan
+snippet to+
+	text-outline ${1:0} ${2:0} ${0}
+snippet to
+	text-outline ${0}
+snippet to:n
+	text-outline none
+snippet tr
+	text-replace ${0}
+snippet tr:n
+	text-replace none
+snippet tsh+
+	text-shadow ${1:0} ${2:0} ${3:0} ${0}
+snippet tsh
+	text-shadow ${0}
+snippet tsh:n
+	text-shadow none
+snippet tt
+	text-transform ${0}
+snippet tt:c
+	text-transform capitalize
+snippet tt:l
+	text-transform lowercase
+snippet tt:n
+	text-transform none
+snippet tt:u
+	text-transform uppercase
+snippet tw
+	text-wrap ${0}
+snippet tw:no
+	text-wrap none
+snippet tw:n
+	text-wrap normal
+snippet tw:s
+	text-wrap suppress
+snippet tw:u
+	text-wrap unrestricted
+snippet t
+	top ${0}
+snippet t:a
+	top auto
+snippet va
+	vertical-align ${0}
+snippet va:bl
+	vertical-align baseline
+snippet va:b
+	vertical-align bottom
+snippet va:m
+	vertical-align middle
+snippet va:sub
+	vertical-align sub
+snippet va:sup
+	vertical-align super
+snippet va:tb
+	vertical-align text-bottom
+snippet va:tt
+	vertical-align text-top
+snippet va:t
+	vertical-align top
+snippet v
+	visibility ${0}
+snippet v:c
+	visibility collapse
+snippet v:h
+	visibility hidden
+snippet v:v
+	visibility visible
+snippet whsc
+	white-space-collapse ${0}
+snippet whsc:ba
+	white-space-collapse break-all
+snippet whsc:bs
+	white-space-collapse break-strict
+snippet whsc:k
+	white-space-collapse keep-all
+snippet whsc:l
+	white-space-collapse loose
+snippet whsc:n
+	white-space-collapse normal
+snippet whs
+	white-space ${0}
+snippet whs:n
+	white-space normal
+snippet whs:nw
+	white-space nowrap
+snippet whs:pl
+	white-space pre-line
+snippet whs:pw
+	white-space pre-wrap
+snippet whs:p
+	white-space pre
+snippet wid
+	widows ${0}
+snippet w
+	width ${0}
+snippet w:a
+	width auto
+snippet wob
+	word-break ${0}
+snippet wob:ba
+	word-break break-all
+snippet wob:bs
+	word-break break-strict
+snippet wob:k
+	word-break keep-all
+snippet wob:l
+	word-break loose
+snippet wob:n
+	word-break normal
+snippet wos
+	word-spacing ${0}
+snippet wow
+	word-wrap ${0}
+snippet wow:no
+	word-wrap none
+snippet wow:n
+	word-wrap normal
+snippet wow:s
+	word-wrap suppress
+snippet wow:u
+	word-wrap unrestricted
+snippet z
+	z-index ${0}
+snippet z:a
+	z-index auto
+snippet zoo
+	zoom 1
+snippet :h
+	:hover
+snippet :fc
+	:first-child
+snippet :lc
+	:last-child
+snippet :nc
+	:nth-child(${0})
+snippet :nlc
+	:nth-last-child(${0})
+snippet :oc
+	:only-child
+snippet :a
+	:after
+snippet :b
+	:before
+snippet ::a
+	::after
+snippet ::b
+	::before
+snippet if
+	if ${0}
+snippet mix
+	${1}(${0})
+snippet for
+	for ${1:i} in ${0}
+snippet keyf
+	@keyframes ${0}
+snippet jc:c
+	justify-content center
+snippet jc
+	justify-content
diff --git a/vim/snippets/vim-snippets/snippets/supercollider.snippets b/vim/snippets/vim-snippets/snippets/supercollider.snippets
new file mode 100644
index 0000000..afaefb6
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/supercollider.snippets
@@ -0,0 +1,22 @@
+snippet b
+	(
+		${0}
+	)
+snippet if
+	if (${1}) {
+		${0}
+	}
+snippet ife
+	if (${1}) {
+		${2}
+	} {
+		${0}
+	}
+snippet for
+	for (${1:1}, ${2:10}) { |i|
+		${0}
+	}
+snippet sdef
+	SynthDef(\\${1:synthName}, {${2}
+		${0}
+	}).add;
diff --git a/vim/snippets/vim-snippets/snippets/systemverilog.snippets b/vim/snippets/vim-snippets/snippets/systemverilog.snippets
new file mode 100644
index 0000000..70a9d2d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/systemverilog.snippets
@@ -0,0 +1,73 @@
+extends verilog
+
+# Foreach Loop
+snippet fe
+	foreach (${1}) begin
+		${0}
+	end
+# Do-while statement
+snippet dowh
+	do begin
+		${0}
+	end while (${1});
+# Combinational always block
+snippet alc
+	always_comb begin ${1:: statement_label}
+		${0}
+	end $1
+# Sequential logic
+snippet alff
+	always_ff @(posedge ${1:clk}) begin ${2:: statement_label}
+		${0}
+	end $2
+# Latched logic
+snippet all
+	always_latch begin ${1:: statement_label}
+		${0}
+	end $1
+# Class
+snippet cl
+	class ${1:class_name};
+		// data or class properties
+		${0}
+
+		// initialization
+		function new();
+		endfunction : new
+
+	endclass : $1
+# Typedef structure
+snippet types
+	typedef struct {
+		${0}
+	} ${1:name_t};
+# Program block
+snippet prog
+	program ${1:program_name} ();
+		${0}
+	endprogram : $1
+# Interface block
+snippet intf
+	interface ${1:program_name} ();
+		// nets
+		${0}
+		// clocking
+
+		// modports
+
+	endinterface : $1
+# Clocking Block
+snippet clock
+	clocking ${1:clocking_name} @(${2:posedge} ${3:clk});
+		${0}
+	endclocking : $1
+# Covergroup construct
+snippet cg
+	covergroup ${1:group_name} @(${2:posedge} ${3:clk});
+		${0}
+	endgroup : $1
+# Package declaration
+snippet pkg
+	package ${1:package_name};
+		${0}
+	endpackage : $1
diff --git a/vim/snippets/vim-snippets/snippets/tcl.snippets b/vim/snippets/vim-snippets/snippets/tcl.snippets
new file mode 100644
index 0000000..9da703c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/tcl.snippets
@@ -0,0 +1,96 @@
+# #!/usr/bin/env tclsh
+snippet #!
+	#!/usr/bin/env tclsh
+
+# Process
+snippet pro
+	proc ${1:function_name} {${2:args}} {
+		${0}
+	}
+#xif
+snippet xif
+	${1:expr}? ${2:true} : ${0:false}
+# Conditional
+snippet if
+	if {${1}} {
+		${0}
+	}
+# Conditional if..else
+snippet ife
+	if {${1}} {
+		${2}
+	} else {
+		${0:# else...}
+	}
+snippet eif
+	elseif {${1}} {
+		${0}
+	}
+# Conditional if..elsif..else
+snippet ifee
+	if {${1}} {
+		${2}
+	} elseif {${3}} {
+		${4:# elsif...}
+	} else {
+		${0:# else...}
+	}
+# If catch then
+snippet ifc
+	if { [catch {${1:#do something...}} ${2:err}] } {
+		${0:# handle failure...}
+	}
+# Catch
+snippet catch
+	catch {${1}} ${2:err} ${0:options}
+# While Loop
+snippet wh
+	while {${1}} {
+		${0}
+	}
+# For Loop
+snippet for
+	for {set ${2:var} 0} {$$2 < ${1:count}} {${3:incr} $2} {
+		${0}
+	}
+# Foreach Loop
+snippet fore
+	foreach ${1:x} {${2:#list}} {
+		${0}
+	}
+# after ms script...
+snippet af
+	after ${1:ms} ${0:#do something}
+# after cancel id
+snippet afc
+	after cancel ${0:id or script}
+# after idle
+snippet afi
+	after idle ${0:script}
+# after info id
+snippet afin
+	after info ${0:id}
+# Expr
+snippet exp
+	expr {${0:#expression here}}
+# Switch
+snippet sw
+	switch ${1:var} {
+		${3:pattern 1} {
+			${0:#do something}
+		}
+		default {
+			${2:#do something}
+		}
+	}
+# Case
+snippet ca
+	${1:pattern} {
+		${2:#do something}
+	}
+# Namespace eval
+snippet ns
+	namespace eval ${1:path} {${0:#script...}}
+# Namespace current
+snippet nsc
+	namespace current
diff --git a/vim/snippets/vim-snippets/snippets/tex.snippets b/vim/snippets/vim-snippets/snippets/tex.snippets
new file mode 100644
index 0000000..f60f312
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/tex.snippets
@@ -0,0 +1,341 @@
+#version 1
+#PREAMBLE
+#newcommand
+snippet nc \newcommand
+	\\newcommand{\\${1:cmd}}[${2:opt}]{${3:realcmd}} ${0}
+#usepackage
+snippet up \usepackage
+	\\usepackage[${1:options}]{${2:package}} ${0}
+#newunicodechar
+snippet nuc \newunicodechar
+	\\newunicodechar{${1}}{${2:\\ensuremath}${3:tex-substitute}}} ${0}
+#DeclareMathOperator
+snippet dmo \DeclareMathOperator
+	\\DeclareMathOperator{${1}}{${2}} ${0}
+
+#DOCUMENT
+# \begin{}...\end{}
+snippet begin \begin{} ... \end{} block
+	\\begin{${1:env}}
+		${0:${VISUAL}}
+	\\end{$1}
+# Tabular
+snippet tab tabular (or arbitrary) environment
+	\\begin{${1:tabular}}{${2:c}}
+		${0:${VISUAL}}
+	\\end{$1}
+snippet thm thm (or arbitrary) environment with optional argument
+	\\begin[${1:author}]{${2:thm}}
+		${0:${VISUAL}}
+	\\end{$2}
+snippet center center environment
+	\\begin{center}
+		${0:${VISUAL}}
+	\\end{center}
+# Align(ed)
+snippet ali align(ed) environment
+	\\begin{align${1:ed}}
+		\\label{eq:${2}}
+		${0:${VISUAL}}
+	\\end{align$1}
+# Gather(ed)
+snippet gat gather(ed) environment
+	\\begin{gather${1:ed}}
+		${0:${VISUAL}}
+	\\end{gather$1}
+# Equation
+snippet eq equation environment
+	\\begin{equation}
+		${0:${VISUAL}}
+	\\end{equation}
+# Equation
+snippet eql Labeled equation environment
+	\\begin{equation}
+		\\label{eq:${2}}
+	${0:${VISUAL}}
+	\\end{equation}
+# Equation
+snippet eq* unnumbered equation environment
+	\\begin{equation*}
+		${0:${VISUAL}}
+	\\end{equation*}
+# Unnumbered Equation
+snippet \ unnumbered equation: \[ ... \]
+	\\[
+		${0:${VISUAL}}
+	\\]
+# Equation array
+snippet eqnarray eqnarray environment
+	\\begin{eqnarray}
+		${0:${VISUAL}}
+	\\end{eqnarray}
+# Label
+snippet lab \label
+	\\label{${1:eq:}${2:fig:}${3:tab:}${0}}
+# Enumerate
+snippet enum enumerate environment
+	\\begin{enumerate}
+		\\item ${0}
+	\\end{enumerate}
+snippet enuma enumerate environment
+	\\begin{enumerate}[(a)]
+		\\item ${0}
+	\\end{enumerate}
+snippet enumi enumerate environment
+	\\begin{enumerate}[(i)]
+		\\item ${0}
+	\\end{enumerate}
+# Itemize
+snippet item itemize environment
+	\\begin{itemize}
+		\\item ${0}
+	\\end{itemize}
+snippet it \item
+	\\item ${1:${VISUAL}}
+# Description
+snippet desc description environment
+	\\begin{description}
+		\\item[${1}] ${0}
+	\\end{description}
+# Endless new item
+snippet ]i \item (recursive)
+	\\item ${1}
+		${0:]i}
+# Matrix
+snippet mat smart matrix environment
+	\\begin{${1:p/b/v/V/B/small}matrix}
+		${0:${VISUAL}}
+	\\end{$1matrix}
+# Cases
+snippet cas cases environment
+	\\begin{cases}
+		${1:equation}, &\\text{ if }${2:case}\\
+		${0:${VISUAL}}
+	\\end{cases}
+# Split
+snippet spl split environment
+	\\begin{split}
+		${0:${VISUAL}}
+	\\end{split}
+# Part
+snippet part document \part
+	\\part{${1:part name}} % (fold)
+	\\label{prt:${2:$1}}
+	${0}
+	% part $2 (end)
+# Chapter
+snippet cha \chapter
+	\\chapter{${1:chapter name}}
+	\\label{cha:${2:$1}}
+	${0}
+# Section
+snippet sec \section
+	\\section{${1:section name}}
+	\\label{sec:${2:$1}}
+	${0}
+# Section without number
+snippet sec* \section*
+	\\section*{${1:section name}}
+	\\label{sec:${2:$1}}
+	${0}
+# Sub Section
+snippet sub \subsection
+	\\subsection{${1:subsection name}}
+	\\label{sub:${2:$1}}
+	${0}
+# Sub Section without number
+snippet sub* \subsection*
+	\\subsection*{${1:subsection name}}
+	\\label{sub:${2:$1}}
+	${0}
+# Sub Sub Section
+snippet ssub \subsubsection
+	\\subsubsection{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
+	${0}
+# Sub Sub Section without number
+snippet ssub* \subsubsection*
+	\\subsubsection*{${1:subsubsection name}}
+	\\label{ssub:${2:$1}}
+	${0}
+# Paragraph
+snippet par \paragraph
+	\\paragraph{${1:paragraph name}}
+	\\label{par:${2:$1}}
+	${0}
+# Sub Paragraph
+snippet subp \subparagraph
+	\\subparagraph{${1:subparagraph name}}
+	\\label{subp:${2:$1}}
+	${0}
+snippet ni \noindent
+	\\noindent
+	${0}
+#References
+snippet itd description \item
+	\\item[${1:description}] ${0:item}
+snippet figure reference to a figure
+	${1:Figure}~\\ref{${2:fig:}}
+snippet table reference to a table
+	${1:Table}~\\ref{${2:tab:}}
+snippet listing reference to a listing
+	${1:Listing}~\\ref{${2:list}}
+snippet section reference to a section
+	${1:Section}~\\ref{sec:${2}} ${0}
+snippet page reference to a page
+	${1:page}~\\pageref{${2}} ${0}
+snippet index \index
+	\\index{${1:index}} ${0}
+#Citations
+snippet citen \citen
+	\\citen{${1}} ${0}
+# natbib citations
+snippet citep \citep
+	\\citep{${1}} ${0}
+snippet citet \citet
+	\\citet{${1}} ${0}
+snippet cite \cite[]{}
+	\\cite[${1}]{${2}} ${0}
+snippet citea \citeauthor
+	\\citeauthor{${1}} ${0}
+snippet citey \citeyear
+	\\citeyear{${1}} ${0}
+snippet fcite \footcite[]{}
+	\\footcite[${1}]{${2}}${0}
+#Formating text: italic, bold, underline, small capital, emphase ..
+snippet it italic text
+	\\textit{${1:${VISUAL:text}}} ${0}
+snippet bf bold face text
+	\\textbf{${1:${VISUAL:text}}} ${0}
+snippet under underline text
+	\\underline{${1:${VISUAL:text}}} ${0}
+snippet emp emphasize text
+	\\emph{${1:${VISUAL:text}}} ${0}
+snippet sc small caps text
+	\\textsc{${1:${VISUAL:text}}} ${0}
+#Choosing font
+snippet sf sans serife text
+	\\textsf{${1:${VISUAL:text}}} ${0}
+snippet rm roman font text
+	\\textrm{${1:${VISUAL:text}}} ${0}
+snippet tt typewriter (monospace) text
+	\\texttt{${1:${VISUAL:text}}} ${0}
+#Math font
+snippet mf mathfrak
+	\\mathfrak{${1:${VISUAL:text}}} ${0}
+snippet mc mathcal
+	\\mathcal{${1:${VISUAL:text}}} ${0}
+snippet ms mathscr
+	\\mathscr{${1:${VISUAL:text}}} ${0}
+#misc
+snippet ft \footnote
+	\\footnote{${1:${VISUAL:text}}} ${0}
+snippet fig figure environment (includegraphics)
+	\\begin{figure}
+	\\begin{center}
+		\\includegraphics[scale=${1}]{Figures/${2}}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
+	${0}
+snippet tikz figure environment (tikzpicture)
+	\\begin{figure}[htpb]
+	\\begin{center}
+	\\begin{tikzpicture}[scale=${1:1}, transform shape]
+		${2}
+	\\end{tikzpicture}
+	\\end{center}
+	\\caption{${3}}
+	\\label{fig:${4}}
+	\\end{figure}
+	${0}
+snippet subfig subfigure environment
+	\\begin{subfigure}[${1}]{${2:\\textwidth}}
+	\\begin{center}
+		${3}
+	\\end{center}
+	\\caption{${4}}
+	\\label{fig:${5}}
+	\\end{subfigure}
+	${0}
+snippet tikzcd tikzcd environment in equation
+	\\begin{equation}
+	\\begin{tikzcd}
+		${1}
+	\\end{tikzcd}
+	\\end{equation}
+	${0}
+snippet tikzcd* tikzcd environment in equation*
+	\\begin{equation*}
+	\\begin{tikzcd}
+		${1}
+	\\end{tikzcd}
+	\\end{equation*}
+	${0}
+#math
+snippet stackrel \stackrel{}{}
+	\\stackrel{${1:above}}{${2:below}} ${0}
+snippet frac \frac{}{}
+	\\frac{${1:num}}{${2:denom}} ${0}
+snippet sum \sum^{}_{}
+	\\sum^{${1:n}}_{${2:i=1}} ${0}
+snippet lim \lim_{}
+	\\lim_{${1:n \\to \\infty}} ${0}
+snippet frame frame environment
+	\\begin{frame}[${1:t}]{${2:title}}
+		${0:${VISUAL}}
+	\\end{frame}
+snippet block block environment
+	\\begin{block}{${1:title}}
+		${0:${VISUAL}}
+	\\end{block}
+snippet alert alertblock environment
+	\\begin{alertblock}{${1:title}}
+		${0:${VISUAL}}
+	\\end{alertblock}
+snippet example exampleblock environment
+	\\begin{exampleblock}{${1:title}}
+		${0:${VISUAL}}
+	\\end{exampleblock}
+snippet col2 two-column environment
+	\\begin{columns}
+		\\begin{column}{0.5\\textwidth}
+			${1}
+		\\end{column}
+		\\begin{column}{0.5\\textwidth}
+			${0}
+		\\end{column}
+	\\end{columns}
+snippet \{ \{ \}
+	\\{ ${0} \\}
+#delimiter
+snippet lr left right
+	\\left${1} ${0} \\right$1
+snippet lr( left( right)
+	\\left( ${0} \\right)
+snippet lr| left| right|
+	\\left| ${0} \\right|
+snippet lr{ left\{ right\}
+	\\left\\{ ${0} \\right\\}
+snippet lr[ left[ right]
+	\\left[ ${0} \\right]
+snippet lra langle rangle
+	\\langle ${0} \\rangle
+# Code listings
+snippet lst
+	\\begin{listing}[language=${1:language}]
+		${0:${VISUAL}}
+	\\end{listing}
+snippet lsi
+	\\lstinline|${1}| ${0}
+# Hyperlinks
+snippet url
+	\\url{${1}} ${0}
+snippet href
+	\\href{${1}}{${2}} ${0}
+# URL from Clipboard.
+snippet urlc
+	\\url{`@+`} ${0}
+snippet hrefc
+	\\href{`@+`}{${1}} ${0}
diff --git a/vim/snippets/vim-snippets/snippets/textile.snippets b/vim/snippets/vim-snippets/snippets/textile.snippets
new file mode 100644
index 0000000..1522bad
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/textile.snippets
@@ -0,0 +1,30 @@
+# Jekyll post header
+snippet header
+	---
+	title: ${1:title}
+	layout: post
+	date: ${2:date} ${0:hour:minute:second} -05:00
+	---
+
+# Image
+snippet img
+	!${1:url}(${2:title}):${0:link}!
+
+# Table
+snippet |
+	|${1}|
+
+# Link
+snippet link
+	"${1:link text}":${0:url}
+
+# Acronym
+snippet (
+	(${1:Expand acronym})
+
+# Footnote
+snippet fn
+	[${1:ref number}] ${0}
+
+	fn$1. ${2:footnote}
+
diff --git a/vim/snippets/vim-snippets/snippets/twig.snippets b/vim/snippets/vim-snippets/snippets/twig.snippets
new file mode 100644
index 0000000..d0d7e1c
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/twig.snippets
@@ -0,0 +1,34 @@
+snippet bl "{% block xyz %} .. {% endblock xyz %}"
+	{% block ${1} %}
+	${2:${VISUAL}}
+	{% endblock $1 %}
+snippet js "{% javascripts 'xyz' %} .. {% endjavascripts %}"
+	{% javascripts '${1}' %}
+		<script src="{{ asset_url }}"></script>
+	{% endjavascripts %}
+snippet css "{% stylesheets 'xyz' %} .. {% endstylesheets %}"
+	{% stylesheets '${1}' %}
+		<link rel="stylesheet" href="{{ asset_url }}">
+	{% endstylesheets %}
+snippet if "{% if %} .. {% endif %}"
+	{% if ${1} %}
+	${2:${VISUAL}}
+	{% endif %}
+snippet ife "{% if %} .. {% else %} .. {% endif %}"
+	{% if ${1} %}
+	${2:${VISUAL}}
+	{% else %}
+	${0}
+	{% endif %}
+snippet el "{% else %}"
+	{% else %}
+	${0:${VISUAL}}
+snippet eif "{% elseif %}"
+	{% elseif ${1} %}
+	${0}
+snippet for "{% for x in y %} .. {% endfor %}"
+	{% for ${1} in ${2} %}
+	${3}
+	{% endfor %}
+snippet ext "{% extends xyz %}"
+	{% extends ${1} %}
diff --git a/vim/snippets/vim-snippets/snippets/typescript.snippets b/vim/snippets/vim-snippets/snippets/typescript.snippets
new file mode 100644
index 0000000..aa87242
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/typescript.snippets
@@ -0,0 +1 @@
+extends javascript
diff --git a/vim/snippets/vim-snippets/snippets/verilog.snippets b/vim/snippets/vim-snippets/snippets/verilog.snippets
new file mode 100644
index 0000000..5cd80f3
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/verilog.snippets
@@ -0,0 +1,63 @@
+# if statement
+snippet if
+	if (${1}) begin
+		${0}
+	end
+# If/else statements
+snippet ife
+	if (${1}) begin
+		${2}
+	end
+	else begin
+		${1}
+	end
+# Else if statement
+snippet eif
+	else if (${1}) begin
+		${0}
+	end
+#Else statement
+snippet el
+	else begin
+		${0}
+	end
+# While statement
+snippet wh
+	while (${1}) begin
+		${0}
+	end
+# Repeat Loop
+snippet rep
+	repeat (${1}) begin
+		${0}
+	end
+# Case statement
+snippet case
+	case (${1:/* variable */})
+		${2:/* value */}: begin
+			${3}
+		end
+		default: begin
+			${4}
+		end
+	endcase
+# CaseZ statement
+snippet casez
+	casez (${1:/* variable */})
+		${2:/* value */}: begin
+			${3}
+		end
+		default: begin
+			${4}
+		end
+	endcase
+# Always block
+snippet al
+	always @(${1:/* sensitive list */}) begin
+		${0}
+	end
+# Module block
+snippet mod
+	module ${1:module_name} (${2});
+		${0}
+	endmodule
diff --git a/vim/snippets/vim-snippets/snippets/vhdl.snippets b/vim/snippets/vim-snippets/snippets/vhdl.snippets
new file mode 100644
index 0000000..f13f5bf
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/vhdl.snippets
@@ -0,0 +1,127 @@
+#
+## Libraries
+
+snippet lib
+	library ${1}
+	use ${1}.${2}
+
+# Standard Libraries
+snippet libs
+	library IEEE;
+	use IEEE.std_logic_1164.ALL;
+	use IEEE.numeric_std.ALL;
+
+# Xilinx Library
+snippet libx
+	library UNISIM;
+	use UNISIM.VCOMPONENTS.ALL;
+
+## Entity Declaration
+snippet ent
+	entity ${1:`vim_snippets#Filename()`} is
+		generic (
+			${2}
+		);
+		port (
+			${3}
+		);
+	end entity $1;
+
+## Architecture
+snippet arc
+	architecture ${1:behav} of ${2:`vim_snippets#Filename()`} is
+
+		${3}
+
+	begin
+
+
+	end $1;
+
+## Declarations
+# std_logic
+snippet st
+	signal ${1} : std_logic;
+# std_logic_vector
+snippet sv
+	signal ${1} : std_logic_vector (${2} downto 0);
+# std_logic in
+snippet ist
+	${1} : in std_logic;
+# std_logic_vector in
+snippet isv
+	${1} : in std_logic_vector (${2} downto 0);
+# std_logic out
+snippet ost
+	${1} : out std_logic;
+# std_logic_vector out
+snippet osv
+	${1} : out std_logic_vector (${2} downto 0);
+# unsigned
+snippet un
+	signal ${1} : unsigned (${2} downto 0);
+## Process Statements
+# process
+snippet pr
+	process (${1})
+	begin
+		${2}
+	end process;
+# process with clock
+snippet prc
+	process (${1:clk})
+	begin
+		if rising_edge ($1) then
+			${2}
+		end if;
+	end process;
+# process all
+snippet pra
+	process (${1:all})
+	begin
+		${2}
+	end process;
+## Control Statements
+# if
+snippet if
+	if ${1} then
+		${2}
+	end if;
+# if
+snippet ife
+	if ${1} then
+		${2}
+	else
+		${3}
+	end if;
+# else
+snippet el
+	else
+		${1}
+# if
+snippet eif
+	elsif ${1} then
+		${2}
+# case
+snippet ca
+	case ${1} is
+		${2}
+	end case;
+# when
+snippet wh
+	when ${1} =>
+		${2}
+# for
+snippet for
+	for ${1:i} in ${2} ${3:to} ${4} loop
+		${5}
+	end loop;
+# while
+snippet wh
+	while ${1} loop
+		${2}
+	end loop;
+## Misc
+# others
+snippet oth
+	(others => '${1:0}');
diff --git a/vim/snippets/vim-snippets/snippets/vim.snippets b/vim/snippets/vim-snippets/snippets/vim.snippets
new file mode 100644
index 0000000..c604d9a
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/vim.snippets
@@ -0,0 +1,52 @@
+snippet header standard Vim script file header
+	" File: ${1:`expand('%:t')`}
+	" Author: ${2:`g:snips_author`}
+	" Description: ${3}
+	${0:" Last Modified: `strftime("%B %d, %Y")`}
+snippet guard script reload guard
+	if exists('${1:did_`vim_snippets#Filename()`}') || &cp${2: || version < 700}
+		finish
+	endif
+	let $1 = 1${0}
+snippet f function
+	fun! ${1:`expand('%') =~ 'autoload' ? substitute(matchstr(expand('%:p'),'autoload/\zs.*\ze.vim'),'[/\\]','#','g').'#' : ''`}${2:function_name}(${3})
+		${0}
+	endf
+snippet t try ... catch statement
+	try
+		${1:${VISUAL}}
+	catch ${2}
+		${0}
+	endtry
+snippet for for ... in loop
+	for ${1} in ${2}
+		${0:${VISUAL}}
+	endfor
+snippet forkv for [key, value] in loop
+	for [${1},${2}] in items(${3})
+		${0}
+		unlet $1 $2
+	endfor
+snippet wh while loop
+	while ${1}
+		${0:${VISUAL}}
+	endw
+snippet if if statement
+	if ${1}
+		${0:${VISUAL}}
+	endif
+snippet ife if ... else statement
+	if ${1}
+		${2:${VISUAL}}
+	else
+		${0}
+	endif
+snippet au augroup ... autocmd block
+	augroup ${1:AU_NAME}
+		" this one is which you're most likely to use?
+		autocmd ${2:BufRead,BufNewFile} ${3:*.ext,*.ext3|<buffer[=N]>} ${0}
+	augroup end
+snippet bun Vundle.vim Plugin definition
+	Plugin '${0}'
+snippet plug Vundle.vim Plugin definition
+	Plugin '${0}'
diff --git a/vim/snippets/vim-snippets/snippets/vue.snippets b/vim/snippets/vim-snippets/snippets/vue.snippets
new file mode 100644
index 0000000..63764f8
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/vue.snippets
@@ -0,0 +1,183 @@
+# This snippet file enables vue files to use tabs for html, js and css. It also
+# includes some vue-specific html-like snippets, as well as some general 
+# boilerplate code for vue.
+
+extends html, javascript, css 
+
+# These snippets form a port of Sarah Drasner's vue-sublime-snippets
+
+# some html-like snippets
+
+snippet slot
+	<slot></slot>
+
+snippet template
+	<template></template>
+
+snippet transition 
+	<transition></transition>
+
+# The following snippets create more complex boilerplate code.
+
+snippet vbase
+	<template>
+		<div>
+
+		</div>
+	</template>
+
+	<script>
+		export default{
+
+		}	
+	</script>
+	<style scoped>
+
+	</style>
+snippet vimport:c
+	import New from './components/New.vue';
+
+	export default{
+		components: {
+			appNew: New 
+		}
+	}
+
+snippet vactionsis now
+
+	actions: {
+		updateValue({commit}, payload) {
+			commit(updateValue, payload);
+		}
+	}
+
+# Add in js animation hooks
+snippet vanim:js:el 
+	<transition 
+	  @before-enter="beforeEnter"
+	  @enter="enter"
+	  @after-enter="afterEnter"
+	  @enter-cancelled="enterCancelled"
+	  @before-Leave="beforeLeave"
+	  @leave="leave"
+	  @after-leave="afterLeave"
+	  @leave-cancelled="leaveCancelled"
+	  :css="false">
+	 
+	 </transition>
+	 
+snippet vanim:js:method
+	methods: {
+	  beforeEnter(el) {
+		console.log('beforeEnter');
+	  }, 
+	  enter(el, done) {
+		 console.log('enter');
+		 done();
+	  },
+	  afterEnter(el) {
+		console.log('afterEnter');
+	  }, 
+	  enterCancelled(el, done) {
+		 console.log('enterCancelled');
+	  },
+	  beforeLeave(el) {
+		console.log('beforeLeave');
+	  }, 
+	  leave(el, done) {
+		 console.log('leave');
+		 done();
+	  },
+	  afterLeave(el) {
+		console.log('afterLeave');
+	  }, 
+	  leaveCancelled(el, done) {
+		 console.log('leaveCancelled');
+	  }
+	}
+
+snippet vcl 
+	@click=""
+
+snippet vdata
+	data: function () {
+	  return {
+		key: value
+	  };
+	}
+
+snippet vfilter
+	filters: {
+	  fnName: function (v) {
+		return;
+	  }
+	}
+
+snippet vfor
+	<div v-for="item in items" :key="item.id">
+	  {{ item }}
+	</div
+
+snippet vgetters
+	getters: {
+		value: state => {
+			return state.value;
+		}
+	}
+
+snippet vimport 
+	import New from './components/New.vue';
+
+snippet vkeep
+	<keep-alive>
+	  <component :is="">
+		<p>default</p>
+	  </component>
+	</keep-alive>
+
+snippet vmixin
+	// define a mixin object
+	var myMixin = {
+	  created: function () {
+		this.hello()
+	  },
+	  methods: {
+		hello: function () {
+		  console.log('hello from mixin!')
+		}
+	  }
+	}
+	// define a component that uses this mixin
+	var Component = Vue.extend({
+	  mixins: [myMixin]
+	})
+	var component = new Component() // -> "hello from mixin!"
+
+snippet vmutations
+	// define a mixin object
+	var myMixin = {
+	  created: function () {
+		this.hello()
+	  },
+	  methods: {
+		hello: function () {
+		  console.log('hello from mixin!')
+		}
+	  }
+	}
+	// define a component that uses this mixin
+	var Component = Vue.extend({
+	  mixins: [myMixin]
+	})
+	var component = new Component() // -> "hello from mixin!"
+
+snippet vprops:d
+	propName: {
+	  type: Number,
+	  default: 100
+	},
+
+snippet vprops 
+	propName: {
+		type: Number
+	},
diff --git a/vim/snippets/vim-snippets/snippets/xml.snippets b/vim/snippets/vim-snippets/snippets/xml.snippets
new file mode 100644
index 0000000..0ab346b
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/xml.snippets
@@ -0,0 +1,12 @@
+# xml declaration
+snippet xml
+	<?xml version="1.0" encoding="UTF-8"?>
+# tag
+snippet t
+	<${1:}>
+		${2}
+	</$1>
+# inline tag
+snippet ti
+	<${1:}>${2}</$1>
+
diff --git a/vim/snippets/vim-snippets/snippets/xslt.snippets b/vim/snippets/vim-snippets/snippets/xslt.snippets
new file mode 100644
index 0000000..700e77d
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/xslt.snippets
@@ -0,0 +1,97 @@
+snippet apply-templates with-param
+	<xsl:apply-templates select="${1:*}">
+		<xsl:with-param name="${2:param}">${3}</xsl:with-param>${4}
+	</xsl:apply-templates>
+
+snippet apply-templates sort-by
+	<xsl:apply-templates select="${1:*}">
+		<xsl:sort select="${2:node}" order="${3:ascending}" data-type="${4:text}">${5}
+	</xsl:apply-templates>
+
+snippet apply-templates plain
+	<xsl:apply-templates select="${1:*}" />
+
+snippet attribute blank
+	<xsl:attribute name="${1:name}">${2}</xsl:attribute>
+
+snippet attribute value-of
+	<xsl:attribute name="${1:name}">
+		<xsl:value-of select="${2:*}" />
+	</xsl:attribute>
+
+snippet call-template
+	<xsl:call-template name="${1:template}" />
+
+snippet call-template with-param
+	<xsl:call-template name="${1:template}">
+		<xsl:with-param name="${2:param}">${3}</xsl:with-param>${4}
+	</xsl:call-template>
+
+snippet choose
+	<xsl:choose>
+		<xsl:when test="${1:value}">
+			${2}
+		</xsl:when>
+	</xsl:choose>
+
+snippet copy-of
+	<xsl:copy-of select="${1:*}" />
+
+snippet for-each
+	<xsl:for-each select="${1:*}">${2}
+	</xsl:for-each>
+
+snippet if
+	<xsl:if test="${1:test}">${2}
+	</xsl:if>
+
+snippet import
+	<xsl:import href="${1:stylesheet}" />
+
+snippet include
+	<xsl:include href="${1:stylesheet}" />
+
+snippet otherwise
+	<xsl:otherwise>${0}
+	</xsl:otherwise>
+
+snippet param
+	<xsl:param name="${1:name}">${2}
+	</xsl:param>
+
+snippet stylesheet
+	<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform">${0}
+	</xsl:stylesheet>
+
+snippet template
+	<xsl:template match="${1:*}">${0}
+	</xsl:template>
+
+snippet template named
+	<xsl:template name="${1:name}">${0}
+	</xsl:template>
+
+snippet text
+	<xsl:text>${0}</xsl:text>
+
+snippet value-of
+	<xsl:value-of select="${1:*}" />
+
+snippet variable blank
+	<xsl:variable name="${1:name}">${0}
+	</xsl:variable>
+
+snippet variable select
+	<xsl:variable select="${1:*}" />
+
+snippet when
+	<xsl:when test="${1:test}">${0}
+	</xsl:when>
+
+snippet with-param
+	<xsl:with-param name="${1:name}">${0}</xsl:with-param>
+
+snippet with-param select
+	<xsl:with-param name="${1:name}" select="${0:*}" />
+
diff --git a/vim/snippets/vim-snippets/snippets/yii-chtml.snippets b/vim/snippets/vim-snippets/snippets/yii-chtml.snippets
new file mode 100644
index 0000000..e827901
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/yii-chtml.snippets
@@ -0,0 +1,248 @@
+#--------------------Yii CHtml---------------------------------
+#Yii CHtml::radioButton
+snippet yhrb
+	echo CHtml::radioButton('${1:name}', ${2:false},array(${3:optionName}=>${0:optionValue} );
+
+#Yii CHtml::asset
+snippet yhass
+	echo CHtml::asset('${0:path}');
+
+#Yii CHtml::activeLabelEx
+snippet yhale
+	echo CHtml::activeLabelEx(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::encodeArray
+snippet yheca
+	echo CHtml::encodeArray(array(${0}));
+
+#Yii CHtml::normalizeUrl
+snippet yhnurl
+	echo CHtml::normalizeUrl(array('${0}'));
+
+#Yii CHtml::resetButton
+snippet yhsb
+	echo CHtml::submitButton('${1:label}',array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::linkButton
+snippet yhlinkb
+	echo CHtml::linkButton('${1:lable}',array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeTextArea
+snippet yhata
+	echo CHtml::activeTextArea(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::ajaxButton
+snippet yhajb
+	echo CHtml::ajaxButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeId
+snippet yhai
+	echo CHtml::activeId(${1:model}, '${0:attribute}');
+
+#Yii CHtml::activeCheckBox
+snippet yhacb
+	echo CHtml::activeCheckBox(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeHiddenField
+snippet yhahf
+	echo CHtml::activeHiddenField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::encode
+snippet yhec
+	echo CHtml::encode(${0:text});
+
+#Yii CHtml::metaTag
+snippet yhmtag
+	echo CHtml::metaTag('${1:content}', '${2:name}', '${3:httpEquiv}',array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::dropDownList
+snippet yhddl
+	echo CHtml::dropDownList('${1:name}', '${2:select}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::listBox
+snippet yhlb
+	echo CHtml::listBox('${1:name}', '${2:select}',array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::script
+snippet yhjs
+	echo CHtml::script('${0:test}');
+
+#Yii CHtml::ajax
+snippet yhaj
+	echo CHtml::ajax(array(${0}));
+
+#Yii CHtml::textField
+snippet yhtf
+	echo CHtml::textField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activePasswordField
+snippet yhapf
+	echo CHtml::activePasswordField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::listData
+snippet yhld
+	echo CHtml::listData(array(${1}),'${2:valueField}', '${3:textField}','${0:groupField}');
+
+#Yii CHtml::mailto
+snippet yhmt
+	echo CHtml::mailto('${1:text}', '${2:email}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::image
+snippet yhimg
+	echo CHtml::image('${1:src}', '${2:alt}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeListBox
+snippet yhalb
+	echo CHtml::activeListBox(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeFileField
+snippet yhaff
+	echo CHtml::activeFileField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::closeTag
+snippet yhct
+	echo CHtml::closeTag('${0:tag}');
+
+#Yii CHtml::activeInputField
+snippet yhaif
+	echo CHtml::activeInputField('${1:type}', ${2:model}, '${3:attribute}',array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::scriptFile
+snippet yhjsf
+	echo CHtml::scriptFile('${0:url}');
+
+#Yii CHtml::radioButtonList
+snippet yhrbl
+	echo CHtml::radioButtonList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::cssFile
+snippet yhcssf
+	echo CHtml::cssFile('${1:url}','${0:media}');
+
+#Yii CHtml::error
+snippet yherr
+	echo CHtml::error(${1:model}, '${0:attribute}');
+
+#Yii CHtml::passwordField
+snippet yhpf
+	echo CHtml::passwordField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::hiddenField
+snippet yhhf
+	echo CHtml::hiddenField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::cdata
+snippet yhc
+	echo CHtml::cdata(${0:text});
+
+#Yii CHtml::link
+snippet yhlink
+	echo CHtml::link('${1:text}',array(${2}),array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::errorSummary
+snippet yherrs
+	echo CHtml::errorSummary(${1:model},'${2:headerHtml}','${0:footerHtml}');
+
+#Yii CHtml::tag
+snippet yht
+	echo CHtml::tag('${1:tag}',array('${2:optionName}'=>${3:optionValue}),${4:false},${0:true});
+
+#Yii CHtml::ajaxLink
+snippet yhajl
+	echo CHtml::ajaxLink('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::label
+snippet yhlabel
+	echo CHtml::label('${1:label}', '${2:for}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeName
+snippet yhan
+	echo CHtml::activeName(${1:model}, '${0:attribute}');
+
+#Yii CHtml::statefulForm
+snippet yhsform
+	echo CHtml::statefulForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::fileField
+snippet yhff
+	echo CHtml::fileField('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeTextField
+snippet yhatf
+	echo CHtml::activeTextField(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::css
+snippet yhcss
+	echo CHtml::css('${1:test}','${0:media}');
+
+#Yii CHtml::imageButton
+snippet yhimgb
+	echo CHtml::imageButton('${1:src}',array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::ajaxSubmitButton
+snippet yhajsb
+	echo CHtml::ajaxSubmitButton('${1:label}', '${2:url}',array('${3:ajaxOptionName}'=>${4:ajaxOptionValue}),array('${5:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::button
+snippet yhb
+	echo CHtml::button('${1:label}',array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::listOptions
+snippet yhlo
+	echo CHtml::listOptions('${1:selection}', array(${2}), array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeCheckBoxList
+snippet yhacbl
+	echo CHtml::activeCheckBoxList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::openTag
+snippet yhot
+	echo CHtml::openTag('${1:tag}', array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::checkBox
+snippet yhcb
+	echo CHtml::checkBox('${1:name}', ${2:false}, array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::textArea
+snippet yhta
+	echo CHtml::textArea('${1:name}', '${2:value}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::linkTag
+snippet yhlinkt
+	echo CHtml::linkTag('${1:relation}', '${2:type}', '${3:href}', '${4:media}',array('${5:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::resetButton
+snippet yhrsb
+	echo CHtml::resetButton('${1:label}',array('${2:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeRadioButtonList
+snippet yharbl
+	echo CHtml::activeRadioButtonList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::checkBoxList
+snippet yhcbl
+	echo CHtml::checkBoxList('${1:name}', ${2:select}, array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::form
+snippet yhform
+	echo CHtml::form(array('${1}'), '${2:post}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::beginForm
+snippet yhbeform
+	echo CHtml::beginForm(array('${1}'), '${2:post}',array('${3:optionName}'=>${4:optionValue}));
+	${0}
+	echo CHtml::endForm();
+
+#Yii CHtml::activeDropDownList
+snippet yhaddl
+	echo CHtml::activeDropDownList(${1:model}, '${2:attribute}', array(${3}),array('${4:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeRadioButton
+snippet yharb
+	echo CHtml::activeRadioButton(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+#Yii CHtml::activeLabel
+snippet yhal
+	echo CHtml::activeLabel(${1:model}, '${2:attribute}',array('${3:optionName}'=>${0:optionValue}));
+
+
diff --git a/vim/snippets/vim-snippets/snippets/yii.snippets b/vim/snippets/vim-snippets/snippets/yii.snippets
new file mode 100644
index 0000000..1f9fc6f
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/yii.snippets
@@ -0,0 +1,300 @@
+#Yii session offset
+snippet yse
+	Yii::app()->session['${0}'];
+
+#Yii renderDynamic
+snippet yrd
+	$this->renderDynamic('${0:callback}');
+
+#Yii set cache
+snippet ycas
+	Yii::app()->cache->set('${1:key}', ${2:value}, ${3:expire}, new C${4:}CacheDependency(${0}));
+
+#Yii Add cache
+snippet ycad
+	Yii::app()->cache->add('${1:key}', ${2:value}, ${3:expire}, new C${4}CacheDependency(${0}));
+
+#Yii register CSS file
+snippet yregcf
+	Yii::app()->clientScript->registerCssFile('${0:file}');
+
+#Yii requestType
+snippet yreqtype
+	Yii::app()->request->requestType
+
+#Yii isAjaxRequest
+snippet yisajax
+	Yii::app()->request->isAjaxRequest
+
+#Yii translate
+snippet yt
+	Yii::t('${1:category}', '${2:message}',array(${0}));
+
+#Yii register CSS
+snippet yregc
+	Yii::app()->clientScript->registerCss('${1:id}', '${0}');
+
+#Yii log
+snippet ylog
+	Yii::log('${1:msg}', '${0:info}');
+
+#Yii userHostAddress
+snippet yuserip
+	YYii::app()->request->userHostAddress
+
+#Yii register script file
+snippet yregsf
+	Yii::app()->clientScript->registerScriptFile('${1:scriptUrl}', CClientScript::POS_${0:END});
+
+#Yii CLinkPager
+snippet ylinkpager
+	$this->widget('CLinkPager', array('pages'=>$pages,'header'=>'${0}'}))
+
+#Yii CJSON::encode
+snippet yjec
+	CJSON::encode(${0:text});
+
+#CActiveDataProvider
+snippet yadp
+	$dataProvider = new CActiveDataProvider('${1}', array(
+	  'criteria' => array(
+			'condition' => '${2}',
+			'order' => '${3}',
+			'with' => array('${4}')
+		),
+	//'pagination' => false,
+		'pagination' => array(
+			'pageSize'=>${5},
+		),
+	));
+	${0}
+	// $dataProvider->getData() will return a list of Post objects
+
+#Yii renderDynamic internal
+snippet yrdi
+	$this->renderDynamic('${1:callback}', array('${2:key}'=>${0:value}));
+
+#Yii register script
+snippet yregs
+	Yii::app()->clientScript->registerScript('${1:id}', '${2}', CClientScript::POS_${0:READY});
+
+#Yii Flush cache
+snippet ycaf
+	Yii::app()->cache->flush();
+
+#Yii Yii::app()->request->cookies
+snippet yco
+	Yii::app()->request->cookies['${0}']
+
+#Yii user->
+snippet yuser
+	Yii::app()->user->
+
+#Yii refresh
+snippet yrf
+	$this->refresh();
+
+#Yii import
+snippet yimp
+	Yii::import('${0}');
+
+#Yii trace
+snippet ytrace
+	Yii::trace('${0:msg}');
+
+#Yii params
+snippet ypar
+	Yii::app()->params['${0}']
+
+#Yii isPostRequest
+snippet yispost
+	Yii::app()->request->isPostRequest
+
+#Yii IF isAjaxRequest
+snippet yifisajax
+	if(Yii::app()->request->isAjaxRequest == TRUE)
+	{
+		${0}
+	}
+
+#Yii Yii::app()->cache->delete
+snippet ydelcache
+	Yii::app()->cache->delete('${0:key}');
+
+#Yii render view
+snippet yr
+	$this->render('${1:view}',array('${2:key}'=>${0:value}));
+
+#Yii redirect
+snippet yre
+	$this->redirect(array('${1:controller}/${0:action}'));
+
+#Yii Get cache
+snippet ycag
+	Yii::app()->cache->get('${0:key}');
+
+#Yii render text
+snippet yrt
+	$this->renderText('${0}');
+
+#Yii render partial
+snippet yrp
+	$this->renderPartial('${1:view}',array('${2:key}'=>${0:value}));
+
+#----------------Yii Model-----------------------------
+#Yii Model count
+snippet ycountm
+	${1:ModelName}::model()->count(${2:condition}, array('${3:key}'=>${0:value}));
+
+#Yii Model countBySql
+snippet ycountbs
+	${1:ModelName}::model()->countBySql(${2:sql},array('${3:key}'=>${0:value}));
+
+#Yii Model updateAll
+snippet yupdatea
+	${1:ModelName}::model()->updateAll(${2:array('attributes')}, ${3:condition},array('${4:key}'=>${0:value}));
+
+#Yii Model updateByPk
+snippet yupdatebp
+	${1:ModelName}::model()->updateByPk(${2:pk}, ${3:array('attributes')}, ${4:condition},array('${5:key}'=>${0:value}));
+
+#Yii Model deleteAll
+snippet ydela
+	${1:ModelName}::model()->deleteAll(${2:condition},array('${3:key}'=>${0:value}));
+
+#Yii Model deleteByPk
+snippet ydelbp
+	${1:ModelName}::model()->deleteByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
+
+#Yii Model find
+snippet yfind
+	${1:ModelName}::model()->find(${2:condition},array('${3:key}'=>${0:value}));
+
+#Yii Model findAll
+snippet yfinda
+	${1:ModelName}::model()->findAll(${2:condition},array('${3:key}'=>${0:value}));
+
+#Yii Model findByPk
+snippet yfindbp
+	${1:ModelName}::model()->findByPk(${2:pk}, ${3:condition}, array('${4:key}'=>${0:value}));
+
+#Yii Model findAllByPk
+snippet yfindabp
+	${1:ModelName}::model()->findAllByPk(${2:pk}, ${3:condition},array('${4:key}'=>${0:value}));
+
+#Yii Model findBySql
+snippet yfindbs
+	${1:ModelName}::model()->findBySql(${2:sql}, array('${3:key}'=>${0:value}));
+
+#Yii Model findAllByAttributes
+snippet yfindaba
+	${1:ModelName}::model()->findAllByAttributes(array('${2:attributeName}'=>${3:attributeValue}), ${4:condition}, array('${5:key}'=>${0:value}));
+
+#Yii Model exists
+snippet yexists
+	${1:ModelName}::model()->exists(${2:condition}, array('${3:key}'=>${0:value}));
+
+#Yii Create model class
+snippet ymodel
+	<?php
+
+	class ${1:ModelName} extends ${2:CActiveRecord}
+	{
+		/**
+		 * Returns the static model of the specified AR class.
+		 * @return CActiveRecord the static model class
+		 */
+		public static function model($className=__CLASS__)
+		{
+			return parent::model($className);
+		}
+
+		/**
+		 * @return string the associated database table name
+		 */
+		public function tableName()
+		{
+			return '${0:table_name}';
+		}
+
+		/**
+		 * @return array validation rules for model attributes.
+		 */
+		public function rules()
+		{
+			return array(
+			);
+		}
+
+		/**
+		 * @return array relational rules.
+		 */
+		public function relations()
+		{
+			return array(
+			);
+		}
+
+		/**
+		 * @return array customized attribute labels (name=&gt;label)
+		 */
+		public function attributeLabels()
+		{
+			return array(
+			);
+		}
+	}
+
+#------------Yii Controller------------------------------------
+
+#Yii Create controller class
+snippet ycontroller
+	<?php
+
+	/**
+	 * ${1:}
+	 */
+	class ${2:Site}Controller extends ${3:CController}
+	{
+		  public function action${4:Index}()
+		  {
+		      ${0}
+		  }
+
+		// -----------------------------------------------------------
+		// Uncomment the following methods and override them if needed
+		/*
+		public function filters()
+		{
+			// return the filter configuration for this controller, e.g.:
+			return array(
+				'inlineFilterName',
+				array(
+					'class'=>'path.to.FilterClass',
+					'propertyName'=>'propertyValue',
+				),
+			);
+		}
+
+		public function actions()
+		{
+			// return external action classes, e.g.:
+			return array(
+				'action1'=>'path.to.ActionClass',
+				'action2'=>array(
+					'class'=>'path.to.AnotherActionClass',
+					'propertyName'=>'propertyValue',
+				),
+			);
+		}
+		*/
+	}
+
+#Yii Create controller action method
+snippet yact
+	public function action${1:Index}(${2:params})
+	{
+		${0}
+	}
+
+
diff --git a/vim/snippets/vim-snippets/snippets/zsh.snippets b/vim/snippets/vim-snippets/snippets/zsh.snippets
new file mode 100644
index 0000000..a8173c2
--- /dev/null
+++ b/vim/snippets/vim-snippets/snippets/zsh.snippets
@@ -0,0 +1,66 @@
+# #!/bin/zsh
+snippet #!
+	#!/bin/zsh
+
+snippet if
+	if ${1:condition}; then
+		${0:${VISUAL}}
+	fi
+snippet ife
+	if ${1:condition}; then
+		${2:${VISUAL}}
+	else
+		${0:# statements}
+	fi
+snippet eif
+	elif ${1:condition}; then
+		${0:${VISUAL}}
+snippet for
+	for (( ${2:i} = 0; $2 < ${1:count}; $2++ )); do
+		${0:${VISUAL}}
+	done
+snippet fori
+	for ${1:needle} in ${2:haystack}; do
+		${0:${VISUAL}}
+	done
+snippet fore
+	for ${1:item} in ${2:list}; do
+		${0:${VISUAL}}
+	done
+snippet wh
+	while ${1:condition}; do
+		${0:${VISUAL}}
+	done
+snippet until
+	until ${1:condition}; do
+		${0:${VISUAL}}
+	done
+snippet repeat
+	repeat ${1:integer}; do
+		${0:${VISUAL}}
+	done
+snippet case
+	case ${1:word} in
+		${2:pattern})
+			${0};;
+	esac
+snippet select
+	select ${1:answer} in ${2:choices}; do
+		${0:${VISUAL}}
+	done
+snippet (
+	( ${0:#statements} )
+snippet {
+	{ ${0:#statements} }
+snippet [
+	[[ ${0:test} ]]
+snippet always
+	{ ${1:try} } always { ${0:always} }
+snippet fun
+	${1:function_name}() {
+		${0:# function_body}
+	}
+snippet ffun
+	function ${1:function_name}() {
+		${0:# function_body}
+	}
diff --git a/vim/snippets/vim-snippets/tests.sh b/vim/snippets/vim-snippets/tests.sh
new file mode 100755
index 0000000..07f0ff3
--- /dev/null
+++ b/vim/snippets/vim-snippets/tests.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+SPACED=$(grep -REn '^ .+' --include '*.snippets' snippets)
+
+if [[ $? -ne 1 ]]; then
+  echo These snippet lines are indented with spaces:
+  echo
+  echo "$SPACED"
+  echo
+  echo Tests failed!
+  exit 1
+fi
+
+echo Tests passed!
+exit 0
diff --git a/zsh/.zimrc b/zsh/.zimrc
new file mode 100644
index 0000000..2fff315
--- /dev/null
+++ b/zsh/.zimrc
@@ -0,0 +1,204 @@
+
+
+#################
+# CORE SETTINGS #
+#################
+
+#
+# Zim settings
+#
+
+# Select what modules you would like enabled.
+# The second line of modules may depend on options set by modules in the first line.
+# These dependencies are noted on the respective module's README.md.
+zmodules=(directory environment git history input utility meta custom \
+          syntax-highlighting history-substring-search prompt completion)
+
+
+###################
+# MODULE SETTINGS #
+###################
+
+#
+# Prompt
+#
+
+# Set your desired prompt here
+zprompt_theme='steeef'
+
+#
+# Completion
+#
+
+# set an optional host-specific filename for the completion cache file
+# if none is provided, the default '.zcompdump' is used.
+#zcompdump_file=".zcompdump-${HOST}-${ZSH_VERSION}"
+
+#
+# Utility
+#
+
+# Uncomment to enable command correction prompts
+# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
+#setopt CORRECT
+
+#
+# Environment
+#
+
+# Set the string below to the desired terminal title format string.
+# The terminal title is redrawn upon directory change, however, variables like 
+# ${PWD} are only evaluated once. Use prompt expansion strings for dynamic data:
+#   http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
+# The example below uses the following format: 'username@host:/current/directory'
+ztermtitle='%n@%m:%~'
+
+#
+# Input
+#
+
+# Uncomment to enable double-dot expansion.
+# This appends '../' to your input for each '.' you type after an initial '..'
+#zdouble_dot_expand='true'
+
+#
+# Syntax-Highlighting
+#
+
+# This determines what highlighters will be used with the syntax-highlighting module.
+# Documentation of the highlighters can be found here:
+#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+# For (u)rxvt, termite and gnome-terminal users,
+# removing the 'cursor' highlighter will fix the disappearing cursor problem
+zhighlighters=(main brackets cursor)
+
+
+#
+# SSH
+#
+
+# Load these ssh identities with the ssh module
+#zssh_ids=(id_rsa)
+
+
+#
+# Pacman
+#
+
+# Set (optional) pacman front-end.
+#zpacman_frontend='powerpill'
+
+# Load any helper scripts as defined here
+#zpacman_helper=(aur)
+
+#################
+# CORE SETTINGS #
+#################
+
+#
+# Zim settings
+#
+
+# Select what modules you would like enabled.
+# The second line of modules may depend on options set by modules in the first line.
+# These dependencies are noted on the respective module's README.md.
+zmodules=(directory environment git history input utility meta custom \
+          syntax-highlighting history-substring-search prompt completion \
+          pacman git-info fasd )
+source ~/.zim/modules/zsh-autosuggestions/zsh-autosuggestions.zsh
+
+###################
+# MODULE SETTINGS #
+###################
+
+#
+# Prompt
+#
+
+# Set your desired prompt here
+zprompt_theme='steeef'
+
+#
+# Completion
+#
+
+# set an optional host-specific filename for the completion cache file
+# if none is provided, the default '.zcompdump' is used.
+#zcompdump_file=".zcompdump-${HOST}-${ZSH_VERSION}"
+
+#
+# Utility
+#
+
+# Uncomment to enable command correction prompts
+# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
+setopt CORRECT
+
+#
+# Environment
+#
+
+# Set the string below to the desired terminal title format string.
+# The terminal title is redrawn upon directory change, however, variables like
+# ${PWD} are only evaluated once. Use prompt expansion strings for dynamic data:
+#   http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
+# The example below uses the following format: 'username@host:/current/directory'
+ztermtitle='%n@%m:%~'
+
+#
+# Input
+#
+
+# Uncomment to enable double-dot expansion.
+# This appends '../' to your input for each '.' you type after an initial '..'
+#zdouble_dot_expand='true'
+
+#
+# Syntax-Highlighting
+#
+
+# This determines what highlighters will be used with the syntax-highlighting module.
+# Documentation of the highlighters can be found here:
+#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+# For (u)rxvt, termite and gnome-terminal users,
+# removing the 'cursor' highlighter will fix the disappearing cursor problem
+zhighlighters=(main brackets)
+
+
+#
+# SSH
+#
+
+# Load these ssh identities with the ssh module
+zssh_ids=(id_rsa)
+
+
+# URXVT fix
+
+autoload -Uz add-zsh-hook
+
+function xterm_title_precmd () {
+    print -Pn '\e]2;%n@%m:%~\a'
+}
+
+
+if [[ "$TERM" == (screen*|xterm*|rxvt*) ]]; then
+    add-zsh-hook -Uz precmd xterm_title_precmd
+    # add-zsh-hook -Uz preexec xterm_title_preexec
+fi
+
+alias -g cb="xclip -selection clipboard"
+alias -g tb="nc termbin.com 9999 | xclip -selection clipboard"
+alias -g sshot='xfce4-screenshooter -o "$(which xclip) -i -t image/png -selection clipboard" $@'
+alias -g steam-wine='WINEDEBUG=-all wine ~/.wine/drive_c/Program\ Files\ \(x86\)/Steam/Steam.exe -no-cef-sandbox >/dev/null 2>&1 &'
+
+# Set (optional) pacman front-end.
+# zpacman_frontend='powerpill'
+
+# Load any helper scripts as defined here
+zpacman_helper=(aur)
+export VISUAL="vim"
+export PATH=/usr/local/texlive/2016/bin/x86_64-linux:$PATH
+# If not running interactively, do not do anything
+[[ $- != *i* ]] && return
+[[ -z "$TMUX" ]] && exec tmux -u
\ No newline at end of file
diff --git a/zsh/LICENSE.md b/zsh/LICENSE.md
new file mode 100644
index 0000000..0589535
--- /dev/null
+++ b/zsh/LICENSE.md
@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright (c) `2015-2016` `Matt Hamilton and contributors`
+
+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/zsh/README.md b/zsh/README.md
new file mode 100644
index 0000000..4df627a
--- /dev/null
+++ b/zsh/README.md
@@ -0,0 +1,107 @@
+This is a slightly modified version of https://github.com/zimfw/zimfw
+
+
+ZIM - Zsh IMproved
+==================
+
+<div align="center">
+  <a href="https://github.com/Eriner/zim">
+    <img width=650px src="https://i.eriner.me/zim_banner.png">
+  </a>
+</div>
+
+What is Zim?
+------------
+Zim is a Zsh configuration framework with [blazing speed][speed] and modular extensions.
+
+Zim is very easy to customize, and comes with a rich set of modules and features without compromising on speed or functionality!
+
+What does Zim offer?
+-----------------
+If you're here, it means you want to see the cool shit Zim can do. Check out the [available modules][modules]!
+
+Below is a brief showcase of Zim's features.
+
+### Speed
+For a speed comparison between Zim and other frameworks, see [this wiki entry][speed].
+
+### Themes
+
+To preview some of the available themes, check the [themes wiki page][themes].
+
+### Fish-shell History Navigation
+![history-substring-search][fish_shell]
+
+### Syntax Highlighting
+![syntax-highlighting][syntax_highlighting]
+
+### And much more!
+Zim has many modules! Enable as many or as few as you'd like.
+
+Installation
+------------
+Installing Zim is easy. If you have a different shell framework installed (like oh-my-zsh or prezto),
+*uninstall those first to prevent conflicts*. It can be installed manually by following the instructions below:
+
+1. In a Zsh shell, clone the repository:
+  ```
+  git clone --recursive https://github.com/Eriner/zim.git ${ZDOTDIR:-${HOME}}/.zim
+  ```
+
+2. Paste this into your terminal to prepend the initialization templates to your configs:
+  ```
+  setopt EXTENDED_GLOB
+  for template_file ( ${ZDOTDIR:-${HOME}}/.zim/templates/* ); do
+    user_file="${ZDOTDIR:-${HOME}}/.${template_file:t}"
+    touch ${user_file}
+    ( print -rn "$(<${template_file})$(<${user_file})" >! ${user_file} ) 2>/dev/null
+  done
+  ```
+
+3. Set Zsh as the default shell:
+  ```
+  chsh -s =zsh
+  ```
+
+4. Open a new terminal and finish optimization (this is only needed once, hereafter it will happen upon desktop/tty login):
+  ```
+  source ${ZDOTDIR:-${HOME}}/.zlogin
+  ```
+
+5. You're done! Enjoy your Zsh IMproved! Take some time to read about the [available modules][modules] and tweak your `.zshrc` file.
+
+Updating
+--------
+
+To update zim, run:
+
+```
+zmanage update
+```
+
+For more information about the `zmanage` tool, see the [meta module][meta-module] documentation.
+
+Uninstalling
+------------
+
+The best way to remove zim is to manually delete `~/.zim`, `~/.zimrc`, and
+remove the initialization lines from your `~/.zshrc`.
+
+However, there are some **experimental** convenience functions to remove zim:
+
+**NOTE: This functionality is experimental!**
+
+To remove zim, run:
+```
+zmanage remove
+```
+
+**NOTE: This functionality is experimental!**
+
+
+[fish_shell]: https://i.eriner.me/zim_history-substring-search.gif
+[syntax_highlighting]: https://i.eriner.me/zim_syntax-highlighting.gif
+[speed]: https://github.com/Eriner/zim/wiki/Speed
+[modules]: https://github.com/Eriner/zim/wiki/Modules
+[themes]: https://github.com/Eriner/zim/wiki/Themes
+[meta-module]: https://github.com/Eriner/zim/tree/master/modules/meta
diff --git a/zsh/init.zsh b/zsh/init.zsh
new file mode 100755
index 0000000..e5b1734
--- /dev/null
+++ b/zsh/init.zsh
@@ -0,0 +1,46 @@
+#
+# Zim initializition
+#
+
+# Define zim location
+ZIM="${ZDOTDIR:-${HOME}}/.zim"
+
+# Source user configuration
+if [[ -s "${ZDOTDIR:-${HOME}}/.zimrc" ]]; then
+  source "${ZDOTDIR:-${HOME}}/.zimrc"
+fi
+
+load_zim_module() {
+  local wanted_module
+
+  for wanted_module (${zmodules}); do
+    if [[ -s "${ZIM}/modules/${wanted_module}/init.zsh" ]]; then
+      source "${ZIM}/modules/${wanted_module}/init.zsh"
+    elif [[ ! -d "${ZIM}/modules/${wanted_module}" ]]; then
+      print "No such module \"${wanted_module}\"." >&2
+    fi
+  done
+}
+
+load_zim_function() {
+  local function_glob='^([_.]*|prompt_*_setup|README*)(-.N:t)'
+  local mod_function
+
+  # autoload searches fpath for function locations; add enabled module function paths
+  fpath=(${${zmodules}:+${ZIM}/modules/${^zmodules}/functions(/FN)} ${fpath})
+
+  function {
+    setopt LOCAL_OPTIONS EXTENDED_GLOB
+
+    for mod_function in ${ZIM}/modules/${^zmodules}/functions/${~function_glob}; do
+      autoload -Uz ${mod_function}
+    done
+  }
+}
+
+# initialize zim modules
+load_zim_function
+load_zim_module
+
+unset zmodules
+unfunction load_zim_{module,function}
diff --git a/zsh/modules/archive/README.md b/zsh/modules/archive/README.md
new file mode 100644
index 0000000..87e8943
--- /dev/null
+++ b/zsh/modules/archive/README.md
@@ -0,0 +1,31 @@
+Archive
+=======
+
+Provides `archive` and `unarchive` functions for easy archive manipulation.
+
+This module will make use of `pigz` and `pbzip2` if available to make use of all available CPU cores.
+
+Functions
+---------
+
+  * `archive` generates an archive based on file extension. Syntax is `archive myarchive.tar.gz /path/to/archive`
+  * `unarchive` unarchives a file based on the extension. Syntax is `unarchive myarchive.7z`
+
+Archive Formats
+---------------
+
+| Format | Requirements |
+| ------ | ------------ |
+| .tar | `tar` |
+| .tar.gz, .tgz | `tar` or `pigz` |
+| .tar.bz2, .tbz | `tar` or `pbzip2` |
+| .tar.xz, .txz | `tar` with xz support |
+| .tar.zma, .tlz | `tar` with lzma support |
+| .gz | `gunzip` or `pigz` |
+| .bz2 | `bunzip2` or `pbzip2` |
+| .xz | `unxz` |
+| .lzma | `unzlma` |
+| .Z | `uncompress` |
+| .zip | `unzip` |
+| .rar | `unrar` or `rar` |
+| .7z | `7za` |
diff --git a/zsh/modules/archive/functions/archive b/zsh/modules/archive/functions/archive
new file mode 100644
index 0000000..47f179f
--- /dev/null
+++ b/zsh/modules/archive/functions/archive
@@ -0,0 +1,43 @@
+#
+# Creates archive files
+#
+
+local archive_name dir_to_archive
+
+if (( ${#} != 2 )); then
+  print "usage: ${0} [archive_name.ext] [/path/to/include/in/archive]" >&2
+  return 1
+fi
+
+# we are quitting (above) if there are not exactly 2 vars,
+# so we don't need any argc check here.
+
+# strip the path, just in case one is provided for some reason
+archive_name="${1:t}"
+# use absolute paths, and follow symlinks
+dir_to_archive="${2}"
+
+# if the directory doesn't exist, quit. Nothing to archive
+if [[ ! -e "${dir_to_archive}" ]]; then
+  print "${0}: file or directory not valid: ${dir_to_archive}" >&2
+  return 1
+fi
+
+# pigz and pbzip2 are aliased in the init.zsh file. This provides a significant speedup, resulting in a
+# near-liner decrease in compression time based on on the number of available cores.
+
+case "${archive_name}" in
+  (*.tar.gz|*.tgz) tar -cvf "${archive_name}" --use-compress-program="${_gzip_bin}" "${dir_to_archive}" ;;
+  (*.tar.bz2|*.tbz|*.tbz2) tar -cvf "${archive_name}" --use-compress-program="${_bzip2_bin}" "${dir_to_archive}" ;; 
+  (*.tar.xz|*.txz) tar --xz --help &> /dev/null && tar -cvJf "${archive_name}" "${dir_to_archive}" ;;
+  (*.tar.lzma|*.tlz) tar --lzma --help &> /dev/null && tar -cvf "${archive_name}" --lzma "${dir_to_archive}" ;;
+  (*.tar) tar -cvf "${archive_name}" "${dir_to_archive}" ;;
+  (*.zip) zip -r "${archive_name}" "${dir_to_archive}" ;;
+  (*.rar) rar a "${archive_name}" "${dir_to_archive}" ;;
+  (*.7z) 7za a "${archive_name}" "${dir_to_archive}" ;;
+  (*.gz) print "${0}: .gz is only useful for single files, and does not capture permissions. Use .tar.gz" ;;
+  (*.bz2) print "${0}: .bzip2 is only useful for single files, and does not capture permissions. Use .tar.bz2" ;;
+  (*.xz) print "${0}: .xz is only useful for single files, and does not capture permissions. Use .tar.xz" ;;
+  (*.lzma) print "${0}: .lzma is only useful for single files, and does not capture permissions. Use .tar.lzma" ;;
+  (*) print "${0}: unknown archive type: ${archive_name}" ;;
+esac
diff --git a/zsh/modules/archive/functions/archive.zwc b/zsh/modules/archive/functions/archive.zwc
new file mode 100644
index 0000000..cc913ce
Binary files /dev/null and b/zsh/modules/archive/functions/archive.zwc differ
diff --git a/zsh/modules/archive/functions/unarchive b/zsh/modules/archive/functions/unarchive
new file mode 100644
index 0000000..d9cdcba
--- /dev/null
+++ b/zsh/modules/archive/functions/unarchive
@@ -0,0 +1,42 @@
+#
+# Unarchives files
+#
+
+local archive_name
+
+if (( ${#} != 1 )); then
+  print "usage: ${0} [archive.ext]" >&2
+  return 1
+fi
+
+if [[ ! -s ${1} ]]; then
+  print "archive \"${1}\" was not found or has size 0." >&2
+  return 1
+fi
+
+# strip the path, just in case one is provided for some reason
+archive_name="${1:t}"
+
+# using unpigz/pbunzip2 provides little to decompression time; the benefit is mainly in compression time.
+# setting it as an alias in the init.zsh file should be sufficient here.
+
+case "${archive_name}" in
+  (*.tar.gz|*.tgz) tar -xvzf "${archive_name}" ;;
+  (*.tar.bz2|*.tbz|*.tbz2) tar -xvjf "${archive_name}" ;;
+  (*.tar.xz|*.txz) tar --xz --help &> /dev/null && tar --xz -xvf "${archive_name}" \
+    || xzcat "${archive_name}" | tar xvf - ;;
+  (*.tar.zma|*.tlz) tar --lzma --help &> /dev/null && tar --lzma -xvf "${archive_name}" \
+    || lzcat "${archive_name}" | tar xvf - ;;
+  (*.tar) tar xvf "${archive_name}" ;;
+  (*.gz) gunzip "${archive_name}" ;;
+  (*.bz2) bunzip2 "${archive_name}" ;;
+  (*.xz) unxz "${archive_name}" ;;
+  (*.lzma) unlzma "${archive_name}" ;;
+  (*.Z) uncompress "${archive_name}" ;;
+  (*.zip) unzip "${archive_name}";;
+  (*.rar) unrar &> /dev/null \
+    && unrar x -ad "${archive_name}" \
+    || rar x -ad "${archive_name}" ;;
+  (*.7z) 7za x "${archive_name}" ;;
+  (*) print "${0}: unknown archive type: ${archive_name}" ;;
+esac
diff --git a/zsh/modules/archive/functions/unarchive.zwc b/zsh/modules/archive/functions/unarchive.zwc
new file mode 100644
index 0000000..6fad0a4
Binary files /dev/null and b/zsh/modules/archive/functions/unarchive.zwc differ
diff --git a/zsh/modules/archive/init.zsh b/zsh/modules/archive/init.zsh
new file mode 100644
index 0000000..d135c2d
--- /dev/null
+++ b/zsh/modules/archive/init.zsh
@@ -0,0 +1,29 @@
+#
+# Archive aliases
+#
+
+# if pigz/pbzip2 are available, alias them as they are drop-in replacements for gzip and bzip2, respectively.
+
+#
+# pigz
+#
+
+if (( ${+commands[pigz]} )); then
+  alias gzip='pigz'
+fi
+
+if (( ${+commands[unpigz]} )); then
+  alias gunzip='unpigz'
+fi
+
+#
+# pbzip2
+#
+
+if (( ${+commands[pbzip2]} )); then
+  alias bzip2='pbzip2'
+fi
+
+if (( ${+commands[pbunzip2]} )); then
+  alias bunzip2='pbunzip2'
+fi
diff --git a/zsh/modules/completion/README.md b/zsh/modules/completion/README.md
new file mode 100644
index 0000000..6fc0fa9
--- /dev/null
+++ b/zsh/modules/completion/README.md
@@ -0,0 +1,13 @@
+Completion
+==========
+
+Enables and configures smart and extensive tab completion.
+
+Completions are sourced from [zsh-completions](https://github.com/zsh-users/zsh-completions).
+
+This should be the **LAST** module in the `zmodules` list in your `.zimrc`.
+
+Contributing
+------------
+
+Command completions should be submitted [upstream to zsh-completions](https://github.com/zsh-users/zsh-completions).
diff --git a/zsh/modules/completion/compdefs.zsh b/zsh/modules/completion/compdefs.zsh
new file mode 100644
index 0000000..465f8e3
--- /dev/null
+++ b/zsh/modules/completion/compdefs.zsh
@@ -0,0 +1,14 @@
+#
+# Alias compdefs
+#
+
+# Any aliased commands will not function with completion without compdefs.
+# Because completion is the LAST module to be loaded (so we make sure to catch all completions)
+# we must assign the compdefs here, as opposed to within the modules themselves.
+
+# Unfortunately, I'm not aware of a worthwhile way to ensure that these will be included in .zcompdump
+
+# zpacman_frontend -> pacman
+if (( ${+zpacman_frontend} )); then
+  compdef ${zpacman_frontend}='pacman'
+fi
diff --git a/zsh/modules/completion/external/.editorconfig b/zsh/modules/completion/external/.editorconfig
new file mode 100644
index 0000000..e762a90
--- /dev/null
+++ b/zsh/modules/completion/external/.editorconfig
@@ -0,0 +1,10 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+
+[_*]
+indent_style = space
+indent_size = 2
+tab_width = 2
+end_of_line = LF
diff --git a/zsh/modules/completion/external/.gitignore b/zsh/modules/completion/external/.gitignore
new file mode 100644
index 0000000..ed16522
--- /dev/null
+++ b/zsh/modules/completion/external/.gitignore
@@ -0,0 +1,3 @@
+# zsh word code files
+*.zwc
+
diff --git a/zsh/modules/completion/external/README.md b/zsh/modules/completion/external/README.md
new file mode 100644
index 0000000..ba9e191
--- /dev/null
+++ b/zsh/modules/completion/external/README.md
@@ -0,0 +1,74 @@
+zsh-completions ![GitHub release](https://img.shields.io/github/release/zsh-users/zsh-completions.svg) ![GitHub contributors](https://img.shields.io/github/contributors/zsh-users/zsh-completions.svg) ![IRC](https://img.shields.io/badge/IRC-%23zsh--completions-yellow.svg)
+=============
+
+**Additional completion definitions for [Zsh](http://www.zsh.org).**
+
+*This projects aims at gathering/developing new completion scripts that are not available in Zsh yet. The scripts may be contributed to the Zsh project when stable enough.*
+
+
+## Status
+
+See [issues](https://github.com/zsh-users/zsh-completions/issues) for details on each completion definition.
+
+
+## Usage
+
+### Using packages
+
+| System  | Package |
+| ------------- | ------------- |
+| Debian / Ubuntu | [zsh-completions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-completions&package=zsh-completions) |
+| Fedora / CentOS / RHEL / Scientific Linux | [zsh-completions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-completions&package=zsh-completions) |
+| OpenSUSE / SLE | [zsh-completions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-completions&package=zsh-completions) |
+| Arch Linux | [zsh-completions](https://www.archlinux.org/packages/zsh-completions), [zsh-completions-git](https://aur.archlinux.org/packages/zsh-completions-git) |
+| Gentoo | [app-shells/zsh-completions](http://packages.gentoo.org/package/app-shells/zsh-completions)  |
+| NixOS | [zsh-completions](https://github.com/NixOS/nixpkgs/blob/master/pkgs/shells/zsh-completions/default.nix) |
+| Mac OS | [homebrew](https://github.com/Homebrew/homebrew-core/blob/master/Formula/zsh-completions.rb)  |
+
+### Using zsh frameworks
+
+#### [antigen](https://github.com/zsh-users/antigen)
+
+Add `antigen bundle zsh-users/zsh-completions` to your `~/.zshrc`.
+
+#### [oh-my-zsh](http://github.com/robbyrussell/oh-my-zsh)
+
+* Clone the repository inside your oh-my-zsh repo:
+
+        git clone https://github.com/zsh-users/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions
+
+* Enable it in your `.zshrc` by adding it to your plugin list and reloading the completion:
+
+        plugins=(… zsh-completions)
+        autoload -U compinit && compinit
+
+### Manual installation
+
+* Clone the repository:
+
+        git clone git://github.com/zsh-users/zsh-completions.git
+
+* Include the directory in your `$fpath`, for example by adding in `~/.zshrc`:
+
+        fpath=(path/to/zsh-completions/src $fpath)
+
+* You may have to force rebuild `zcompdump`:
+
+        rm -f ~/.zcompdump; compinit
+
+### Contributing
+
+Contributions are welcome, just make sure you follow the guidelines:
+
+ * Completions are not accepted when already available in zsh.
+ * Completions are not accepted when already available in their original project.
+ * Please do not just copy/paste someone else completion, ask before.
+ * Completions only partially implemented are not accepted.
+ * Please add a header containing authors, license info, status and origin of the script (example [here](src/_ack)).
+ * Please try to follow [Zsh completion style guide](https://github.com/zsh-users/zsh/blob/master/Etc/completion-style-guide).
+ * Please send one separate pull request per file.
+ * Send a pull request or ask for committer access.
+
+
+## License
+See each file for license details.
diff --git a/zsh/modules/completion/external/src/_ack b/zsh/modules/completion/external/src/_ack
new file mode 100644
index 0000000..55a38b8
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ack
@@ -0,0 +1,237 @@
+#compdef ack ack2 ack-grep ack-standalone
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ack 1.96 and 2.14 (http://betterthangrep.com).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com> (version 1.94)
+#  * Zhao Cai <caizhaoff@gmail.com> (version 2.04)
+#
+# ------------------------------------------------------------------------------
+
+_ack_version() {
+    local version
+    version=(${(f)"$(_call_program version $words[1] --version)"})
+    version=${${(z)${version[1]}}[2]}
+    echo $version
+}
+
+_ack() {
+  local context curcontext="$curcontext" state line cmds update_policy ret=1
+  integer NORMARG
+  typeset -A opt_args
+
+  # Don't complete if command doesn't exist
+  [[ ${+commands[${words[1]}]} -eq 0 ]] && return 0
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _ack_types_caching_policy
+
+  unset _ack_raw_types
+  if ( [[ ${+_ack_raw_types} -eq 0 ]] || _cache_invalid "ack-grep" ) && ! _retrieve_cache "ack-grep"; then
+    _ack_raw_types=(${(S)${(S)${(f)${${"$(_call_program types $words[1] --help=types)"}#*--\[no\]}}%; first line matches \/*\/}#*no\]})
+    [[ $#_ack_raw_types -gt 0 ]] && _store_cache "ack-grep" _ack_raw_types
+  fi
+
+  ack_20_options=(
+    '--ackrc[specify an ackrc file to use]:files:_files'
+    '(- 1 *)--bar[consult Admiral Ackbar]'
+    '(--nobreak --break)'{--nobreak,--break}'[print a break between results from different files, default on]'
+    '(- 1 *)--cathy[chocolate chocolate chocolate]'
+    '(- 1 *)--create-ackrc[create custom ackrc files based on the default settings loaded by ackrc]'
+    '(- 1 *)--dump[writes the list of options loaded and where they came from to standard output]'
+    '(--files-from -x)--files-from=[read the list of files to search from FILE]:files:_files'
+    '(--filter --nofilter)--filter[force ack to treat input as pipe]'
+    '(--filter --nofilter)--nofilter[force ack to treat input as tty]'
+    '(--noheading --heading)'{--noheading,--heading}'[print a filename heading above results, default on]'
+    '(- 1 *)--help-types[display all known types]'
+    '--ignore-ack-defaults[ignore default definitions included with ack]'
+    '*--ignore-file=[ignore file]:ignore file filter: _describe "ignore file filter" ignore_filter_opts'
+    '(-k --known-types)'{-k,--known-types}'[include only files of types that ack recognizes]'
+    '--lines=[only print line(s) NUM of each file]:number'
+    '--nopager[do not send output through a pager, overrides ackrc, ACK_PAGER & ACK_PAGER_COLOR]'
+    '-s[suppress error messages about nonexistent or unreadable files]'
+    '(- 1 *)--thpppt[bill the cat]'
+    '*--type-del[remove all filters associated with TYPE]' \
+    '(-x --files-from)-x[read the list of files to search from STDIN]'
+  )
+
+  ack_19_options=(
+    '(-a --all -u --unrestricted)'{-a,--all}'[operate on all files, regardless of type (but still skip directories like blib, CVS, etc.)]'
+    '-G+[only paths matching the given regex are included in the search]:regex'
+    '--invert-file-match[print/search handle files that do not match -g/-G]'
+    '--line=[only print given line of each file]:number' \
+    '(-u --unrestricted -a --all)'{-u,--unrestricted}'[all files and directories (including blib/, core.*, ...) are searched, nothing is skipped]'
+  )
+
+  if (( $(_ack_version) > 2.0 )); then
+    ack_version_options=(${ack_20_options})
+  else
+    ack_version_options=(${ack_19_options})
+  fi
+
+  _arguments -C -s -S -n \
+    '(- 1 *)--version[display version and copyright information]' \
+    '(- 1 *)--help[print a short help statement]' \
+    '(- 1 *)--man[print the manual page]' \
+    $ack_version_options \
+    '(-A --after-context -C --context)'{-A+,--after-context=}'[print N lines of trailing context after matching lines]:number' \
+    '(-B --before-context -C --context)'{-B+,--before-context=}'[print N lines of leading context before matching lines]:number' \
+    '(-C --context -A --after-context -B --before-context)'{-C-,--context=}'[print N lines (default 2) of context around matching lines]:number' \
+    '(-c --count)'{-c,--count}'[suppress normal output; instead print a count of matching lines for each input file]' \
+    '(--nocolor)--color[highlight the matching text]' \
+    '(--color --color-filename --color-match --color-lineno)--nocolor[suppress the color]' \
+    '(--nocolor --color)--color-filename[sets the color to be used for filenames]:color:->colors' \
+    '(--nocolor --color)--color-match[sets the color to be used for matches]:color:->colors' \
+    '(--nocolor --color)--color-lineno[sets the color to be used for line numbers]:color:->colors' \
+    '--column[show the column number of the first match]' \
+    '(--noenv)--env[enable environment processing]' \
+    '(--env)--noenv[disable all environment processing, no .ackrc is read and all environment variables are ignored]' \
+    '--flush[flush output immediately]' \
+    '-f[only print the files that would be searched, without actually doing any searching]' \
+    '(--nofollow)--follow[follow symlinks]' \
+    '(--follow)--nofollow[don'\''t follow symlinks]' \
+    '-g+[print files where the relative path + filename matches the given regex]:regex' \
+    '(--nogroup)--group[group matches by file name]' \
+    '(--group)--nogroup[do not group matches by file name]' \
+    '(-H --with-filename -h --no-filename)'{-H,--with-filename}'[print the filename for each match]' \
+    '(-h --no-filename -H --with-filename)'{-h,--no-filename}'[suppress the prefixing of filenames on output when multiple files are searched]' \
+    '(-i --ignore-case)'{-i,--ignore-case}'[ignore case in the search strings]' \
+    '*--ignore-dir=[ignore directory]:directory:_files' \
+    '*--noignore-dir=[ignore directory]:directory:_files' \
+    '(-l --files-with-matches -L --files-without-matches)'{-l,--files-with-matches}'[only print the filenames of matching files, instead of the matching text]' \
+    '(-L --files-without-matches -l --files-with-matches)'{-L,--files-without-matches}'[only print the filenames of files that do NOT match]' \
+    '--match=[specify the regular expression explicitly]:regex' \
+    '(-m --max-count)'{-m+,--max-count=}'[stop reading a file after N matches]:number' \
+    '(-r -R --recurse -n --no-recurse)'{-r,-R,--recurse}'[recurse into sub-directories]' \
+    '(-n --no-recurse -r -R --recurse)'{-n,--no-recurse}'[no descending into subdirectories]' \
+    '-o[show only the part of each line matching PATTERN (turns off text highlighting)]:pattern' \
+    '--output=[output the evaluation of expr for each line (turns off text highlighting)]:expression' \
+    '--pager=[direct ack'\''s output through program]:pager program:_command_names' \
+    '--passthru[prints all lines, whether or not they match the expression]' \
+    '--print0[the filenames are output separated with a null byte instead of the usual newline]' \
+    '(-Q --literal)'{-Q,--literal}'[quote all metacharacters in the pattern, it is treated as a literal]' \
+    '(--no-smart-case)--smart-case[ignore case in the search strings if pattern contains no uppercase characters]' \
+    '(--smart-case)--no-smart-case[disable --smart-case option]' \
+    '--sort-files[sorts the found files lexically]' \
+    '--show-types[outputs the filetypes that ack associates with each file]' \
+    '--thpppt[display the all-important Bill The Cat logo]' \
+    '*--type=[specify the types of files to include or exclude from a search]:type:->types' \
+    '*--type-add[files with the given extensions are recognized as being of the given type]:type-def:->type-defs' \
+    '*--type-set[files with the given extensions are recognized as being of the given type]:type-def:->type-defs' \
+    '(-v --invert-match)'{-v,--invert-match}'[invert match: select non-matching lines]' \
+    '(-w --word-regexp)'{-w,--word-regexp}'[force the given pattern to match only whole words]' \
+    '-1[stops after reporting first match of any kind]' \
+    {'--','--no'}${_ack_raw_types/ ##/\[}']' \
+    '*: :->args' \
+  && ret=0
+
+  case $state in
+    args)
+      if [[ CURRENT -eq NORMARG && ${+opt_args[--match]} -eq 0 ]]; then
+        # If the current argument is the first non-option argument
+        # and --match isn't present then a pattern is expected
+        _message -e patterns 'pattern' && ret=0
+      else
+        _files
+      fi
+      ;;
+    colors)
+      local colors; colors=(
+        'black'      'on_black'
+        'red'        'on_red'
+        'green'      'on_green'
+        'yellow'     'on_yellow'
+        'blue'       'on_blue'
+        'magenta'    'on_magenta'
+        'cyan'       'on_cyan'
+        'white'      'on_white'
+        'clear'
+        'reset'
+        'dark'
+        'bold'
+        'underline'
+        'underscore'
+        'blink'
+        'reverse'
+        'concealed'
+      )
+      _describe -t 'colors' 'color' colors && ret=0
+      ;;
+    type-defs)
+      if compset -P '*='; then
+        local extensions; extensions=(*.*(:e))
+        _values -s ',' 'file extension' '.'$extensions && ret=0
+      else
+        _message -e type-name 'type name' && ret=0
+      fi
+      ;;
+    types)
+      local types; types=({'','no'}${_ack_raw_types/ ##/:})
+      _describe -t 'types' 'type' types
+      ;;
+  esac
+
+  return ret
+}
+
+ignore_filter_opts=(
+  'is\::FILENAME'
+  'ext\::[EXTENSION,EXTENSION2,...]'
+  'match\::PATTERN'
+  'firstlinematch\::PATTERN'
+)
+
+_ack_types_caching_policy() {
+
+  # Rebuild if ackrc more recent than cache.
+  [[ -f ${ACKRC:-$HOME/.ackrc} && ${ACKRC:-$HOME/.ackrc} -nt "$1" ]] && return 0
+
+  # Rebuild if cache is older than one week.
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp )) && return 0
+
+  return 1
+}
+
+_ack "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
+
diff --git a/zsh/modules/completion/external/src/_afew b/zsh/modules/completion/external/src/_afew
new file mode 100644
index 0000000..15a9ab7
--- /dev/null
+++ b/zsh/modules/completion/external/src/_afew
@@ -0,0 +1,72 @@
+#compdef afew
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for afew an initial tagging script for notmuch mail. (https://github.com/teythoon/afew)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+_afew() {
+
+  _arguments -C \
+    '(- 1 *)'-h"[Show help and exit]" \
+    "(-c --classify -l --learn= -t --tag -u --update -U --update-reference -m --move-mails)"{-w,--watch}"[Continuously monitor the mailbox for new messages matching the given query]" \
+    "(-c --classify -l --learn= -u --update -U --update-reference -m --move-mails -w --watch)"{-t,--tag}"[Run the tag filters]" \
+    "(-c --classify -t --tag -u --update -U --update-reference -m --move-mails -w --watch)"{-l,--learn=}"[Train category with the messages matching query]" \
+    "(-c --classify -l --learn= -t --tag -U --update-reference -m --move-mails -w --watch)"{-u,--update}"[Update the categories (requires no query)]" \
+    "(-c --classify -l --learn= -t --tag -u --update -m --move-mails -w --watch)"{-U,--update-reference}"[Update the reference category (takes quite some time) (requires no query)]" \
+    "(-l --learn= -t --tag -u --update -U --update-reference -m --move-mails -w --watch)"{-c,--classify}"[Classify each message matching the iven query]" \
+    "(-c --classify -l --learn= -t --tag -u --update -U --update-reference -w --watch)"{-m,--move-mails}"[Move mail files between maildir folders]" \
+    "(-n --all)"{-a,--all}"[Operate on all email]" \
+    "(-a --new)"{-n,--new}"[Operate on all new email]" \
+    {-C,--notmuch-config=}"[Path to notmuch configuration file]:files:_files" \
+    {-e,--enable-filters=}"[Flter classes to use]:filters" \
+    {-d,--dry-run}"[Dont change the DB]" \
+    {-R,--reference-set-size=}"[Size of the reference set (default: 1000)]:size:" \
+    {-T,--reference-set-timeframe-days=}"[Do not use emails older than DAYS days (default: 30)]:days:" \
+    {--verbose,-v}"[Be more verbose]" \
+    '*:Query:' \
+
+}
+
+_afew
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ag b/zsh/modules/completion/external/src/_ag
new file mode 100644
index 0000000..6a41710
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ag
@@ -0,0 +1,217 @@
+#compdef ag
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ag (https://github.com/ggreer/the_silver_searcher)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+_ag_version() {
+  local version
+  version=( $($words[1] --version) )
+  version=${version[@]:2:1}
+  version=( "${(@s/./)version}" )
+  echo "${version[2]}"
+}
+
+# Dynamically build the file type completion
+# Modifies the global $AG_OPTS array
+_ag_add_file_types() {
+  local typ exts
+  for i in $($words[1] --list-file-types); do
+    if [[ "${i:0:2}" = '--' ]]; then
+      if [[ "${typ}x" != "x" ]]; then
+        AG_OPTS+="${typ}[${exts}]"
+      fi
+      typ=$i
+      exts=
+    else
+      exts+=$i
+    fi
+  done
+  AG_OPTS+="${typ}[${exts}]"
+}
+
+# Add version appropriate options above base
+# Modifies the global $AG_OPTS array
+_ag_add_version_opts() {
+  local minor=$(_ag_version)
+
+  if [[ $minor -gt 21 ]];then
+    _ag_add_file_types
+    AG_OPTS+=(
+      '(- 1 *)--list-file-types[list supported filetypes to search]'
+      '--silent[suppress all log messages, including errors]'
+    )
+  fi
+
+  if [[ $minor -gt 22 ]];then
+    AG_OPTS+=(
+      '(-z --search-zip)'{-z,--search-zip}'[search contents of compressed files]'
+    )
+  fi
+
+  if [[ $minor -le 24 ]];then
+    AG_OPTS+=(
+      '(-s --case-sensitive)'{-s,--case-sensitive}'[match case sensitively]'
+      '(--noheading --heading)'{--noheading,--heading}'[print file names above matching contents]'
+    )
+  fi
+  if [[ $minor -gt 24 ]];then
+    AG_OPTS+=(
+      '(-s --case-sensitive)'{-s,--case-sensitive}'[Match case sensitively. Default on.]'
+      '(-H --noheading --heading)'{-H,--noheading,--heading}'[print file names above matching contents]'
+      '--vimgrep[output results like vim''s, :vimgrep /pattern/g would (report every match on the line)]'
+    )
+  fi
+
+  if [[ $minor -gt 26 ]];then
+    AG_OPTS+=(
+      '(-0 --null --print0)'{-0,--null,--print0}'[separate the filenames with \\0, rather than \\n]'
+    )
+  fi
+
+  if [[ $minor -le 27 ]];then
+    AG_OPTS+=(
+      '--depth[Search up to NUM directories deep. Default is 25.]:number'
+    )
+  fi
+  if [[ $minor -gt 27 ]];then
+    AG_OPTS+=(
+      '(-c --count)'{-c,--count}'[only print the number of matches in each file]'
+      '--depth[Search up to NUM directories deep, -1 for unlimited. Default is 25.]:number'
+      '(-F --fixed-strings)'{-F,--fixed-strings}'[alias for --literal for compatibility with grep]'
+    )
+  fi
+
+  if [[ $minor -le 28 ]];then
+    AG_OPTS+=(
+      '(--no-numbers)--no-numbers[don´t show line numbers]'
+    )
+  fi
+  if [[ $minor -gt 28 ]];then
+    AG_OPTS+=(
+      '(--nofilename --filename)'{--nofilename,--filename}'[Print file names. Default on, except when searching a single file.]'
+      '(--nonumbers --numbers)'{--nonumbers,--numbers}'[Print line numbers. Default is to omit line numbers when searching streams]'
+      '(-o --only-matching)'{-o,--only-matching}'[print only the matching part of the lines]'
+    )
+  fi
+}
+
+_ag() {
+  local curcontext="$curcontext" state line cmds update_policy ret=1
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _ag_types_caching_policy
+
+  # Don't complete if command doesn't exist
+  [[ ${+commands[${words[1]}]} -eq 0 ]] && return 0
+
+  if ( [[ ${+AG_OPTS} -eq 0 ]] || _cache_invalid "_AG_OPTS" ) && ! _retrieve_cache "_AG_OPTS"; then
+    # Base opts starts at ag version 0.20
+    AG_OPTS=(
+      '(- 1 *)--help[print a short help statement]'
+      '(- 1 *)--man[print the manual page]'
+      '(- 1 *)--version[display version and copyright information]'
+      '--ackmate[output results in a format parseable by AckMate]'
+      '(-A --after)'{-A,--after}'[Print NUM lines before match. Default is 2]:number'
+      '(-t --all-text -a --all-types -u --unrestricted)'{-t,--all-text}"[search all text files, excluding hidden ones]"
+      '(-a --all-types -t --all-text -u --unrestricted)'{-a,--all-types}"[search all text files, excluding hidden ones and not obeying ignore files (.agignore, .gitignore...)]"
+      '(-B --before)'{-B,--before}'[Print NUM lines after match. Defaults is 2]:number'
+      '(--nobreak --break)'{--nobreak,--break}'[Print a newline between matches in different files. Default on.]'
+      '(--color --nocolor)--color[Print color codes in results. Default on.]'
+      '(--nocolor --color --color-line-number --color-match --color-path)--nocolor[Do not print color codes in results. Default on.]'
+      '(--nocolor)--color-line-number[Color codes for line numbers. Default is 1;33.]'
+      '(--nocolor)--color-match[Color codes for result match numbers. Default is 30;43.]'
+      '(--nocolor)--color-path[Color codes for path names. Default is 1;32.]'
+      '--column[print column numbers in results]'
+      '(-C --context)'{-C,--context}'[Print NUM lines before and after matches. Default is 2.]:number'
+      '(-D --debug)'{-D,--debug}'[enable debug logging]'
+      '(-G --file-search-regex)'{-G,--file-search-regex}'[only search file names matching PATTERN]:pattern'
+      '(-l --files-with-matches)'{-l,--files-with-matches}'[only print filenames containing matches, not matching lines]'
+      '(-L --files-without-matches)'{-L,--files-without-matches}"[only print filenames that don't contain matches]"
+      '(-f --follow)'{-f,--follow}'[follow symlinks]'
+      '(-g)-g[print filenames that match PATTERN]:pattern'
+      '(--nogroup --group)'{--nogroup,--group}'[same as --\[no\]break --\[no\]heading]'
+      '--hidden[search hidden files, still obeys ignore files.]'
+      '*--ignore[Ignore files/directories matching this pattern. Literal file and directory names are also allowed.]:files:_files'
+      '(-i --ignore-case)'{-i,--ignore-case}'[match case insensitively]:pattern'
+      '*--ignore-dir[alias for --ignore for compatibility with ack]:files:_files'
+      '(-v --invert-match)'{-v,--invert-match}'[invert match]'
+      '(-Q --literal)'{-Q,--literal}'[match PATTERN literally, no regular expression]'
+      '(-m --max-count)'{-m,--max-count}'[Skip the rest of a file after NUM matches. Default is 10,000.]:number'
+      '(--pager --nopager)'{--pager,--nopager}'[Display results with PAGER. Disabled by default.]:pager program:_command_names'
+      '(--passthrough)--passthrough[when searching a stream, print all lines even if they don''t match]'
+      '(-p --path-to-agignore)'{-p,--path-to-agignore}'[provide a path to a specific .agignore file]:files:_files'
+      '--print-long-lines[print matches on very long lines, > 2k characters by default]'
+      '--search-binary[search binary files]'
+      '(-U --skip-vcs-ignores)'{-U,--skip-vcs-ignores}'[ignore VCS ignore files (.gitigore, .hgignore, svn:ignore), but still use .agignore]'
+      '(-S --smart-case)'{-S,--smart-case}'[match case sensitively if PATTERN contains any uppercase letters, else match case insensitively]'
+      '--stats[print stats (files scanned, time taken, etc)]'
+      '(-u --unrestricted -t --all-text -a --all-types)'{-u,--unrestricted}'[search ALL files, includes: hidden, binary & ignored files (.agignore, .gitignore...)]'
+      '(-w --word-regexp)'{-w,--word-regexp}'[only match whole words]'
+    )
+    _ag_add_version_opts
+    AG_OPTS+=(
+      '*: :_files'
+    )
+    [[ $#AG_OPTS -gt 0 ]] && _store_cache '_AG_OPTS' AG_OPTS
+  fi
+
+  _arguments -C -s -S ${AG_OPTS} && ret=0
+  unset AG_OPTS
+
+  case $state in
+    # placeholder
+  esac
+
+  return ret
+}
+
+_ag_types_caching_policy() {
+  # Rebuild if .agignore more recent than cache.
+  [[ -f $HOME/.agignore && $$HOME/.agignore -nt "$1" ]] && return 0
+
+  # Rebuild if cache is older than one week.
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp )) && return 0
+
+  return 1
+}
+
+_ag "$@"
diff --git a/zsh/modules/completion/external/src/_android b/zsh/modules/completion/external/src/_android
new file mode 100644
index 0000000..993a493
--- /dev/null
+++ b/zsh/modules/completion/external/src/_android
@@ -0,0 +1,333 @@
+#compdef android
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for the android command (Revision 12)
+#  (http://developer.android.com/guide/developing/tools/android.html).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_android() {
+  typeset -A opt_args
+  local context state line curcontext="$curcontext"
+
+  local ret=1
+  
+  _arguments -C -A "-*" \
+    '(- : *)'{-h,--help}'[get help on a specific command]:command:_android_cmds' \
+    '(-s --silent -v --verbose)'{-v,--verbose}'[verbose mode: errors, warnings and informational messages are printed]' \
+    '(-v --verbose -s --silent)'{-s,--silent}'[silent mode: only errors are printed out]' \
+    '1: :_android_cmds' \
+    '*::arg:->args' \
+  && ret=0
+
+  case "$state" in
+    (args)
+      curcontext="${curcontext%:*:*}:android-cmd-$words[1]:"
+      case $words[1] in
+        (list)
+          _arguments -C \
+            '1: :_android_list_entities' \
+            '*::list-arg:->list-args' \
+          && ret=0
+          case "$state" in
+            (list-args)
+              case $words[1] in
+                (avd|target)
+                  _arguments \
+                    '(-0 --null)'{-0,--null}'[terminate lines with \0 instead of \n (e.g. for xargs -0)]' \
+                    '(-c --compact)'{-c,--compact}'[compact output (suitable for scripts)]' \
+                  && ret=0
+                ;;
+                (sdk)
+                  _arguments \
+                    '(-o --obsolete)'{-o,--obsolete}'[install obsolete packages]' \
+                    '--proxy-host[HTTP/HTTPS proxy host (overrides settings if defined)]:proxy host:_hosts' \
+                    '--proxy-port[HTTP/HTTPS proxy port (overrides settings if defined)]:proxy port number' \
+                    '(-s --no-https)'{-s,--no-https}'[use HTTP instead of HTTPS (the default) for downloads]' \
+                    '(-u --no-ui)'{-u,--no-ui}'[display list result on console (no GUI)]' \
+                  && ret=0
+                ;;
+              esac
+            ;;
+          esac
+        ;;
+        (create)
+          _arguments -C \
+            '1: :_android_create_entities' \
+            '*::create-arg:->create-args' \
+          && ret=0
+          case "$state" in
+            (create-args)
+              case $words[1] in
+                (avd)
+                  _arguments \
+                    '(-c --sdcard)'{-c,--sdcard}'[path to a shared SD card image, or size of a new sdcard for the new AVD]:SD card image or size:_files -g "*.img"' \
+                    '(-n --name)'{-n,--name}'[name of the new AVD]:name' \
+                    '(-a --snapshot)'{-a,--snapshot}'[place a snapshots file in the AVD, to enable persistence]' \
+                    '(-p --path)'{-p,--path}'[directory where the new AVD will be created]: :_files -/' \
+                    '(-f --force)'{-f,--force}'[forces creation (overwrites an existing AVD)]' \
+                    '(-s --skin)'{-s,--skin}'[skin for the new AVD]:skin' \
+                    '(-t --target)'{-t,--target}'[target ID of the new AVD]: :_android_targets' \
+                  && ret=0
+                ;;
+                (project)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[project name]:project name' \
+                    '(-p --path)'{-p,--path}'[the new project'\''s directory]: :_files -/' \
+                    '(-k --package)'{-k,--package}'[Android package name for the application]:package name' \
+                    '(-a --activity)'{-a,--activity}'[name of the default Activity that is created]:activity name' \
+                    '(-t --target)'{-t,--target}'[target ID of the new project]: :_android_targets' \
+                  && ret=0
+                ;;
+                (test-project)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[project name]:project name' \
+                    '(-p --path)'{-p,--path}'[the new project'\''s directory]: :_files -/' \
+                    '(-m --main)'{-m,--main}'[path to directory of the app under test, relative to the test project directory]:path' \
+                  && ret=0
+                ;;
+                (lib-project)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[project name]:project name' \
+                    '(-p --path)'{-p,--path}'[the new project'\''s directory]: :_files -/' \
+                    '(-k --package)'{-k,--package}'[Android package name for the application]:package name' \
+                    '(-t --target)'{-t,--target}'[target ID of the new project]: :_android_targets' \
+                  && ret=0
+                ;;
+              esac
+            ;;
+          esac
+        ;;
+        (update)
+          _arguments -C \
+            '1: :_android_update_entities' \
+            '*::update-arg:->update-args' \
+          && ret=0
+          case "$state" in
+            (update-args)
+              case $words[1] in
+                (avd)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[name of the AVD to update]: :_android_avd_names' \
+                  && ret=0
+                ;;
+                (project)
+                  _arguments \
+                    '(-l --library)'{-l,--library}'[directory of an Android library to add, relative to this project'\''s directory]: :_files -/' \
+                    '(-p --path)'{-p,--path}'[the project'\''s directory]: :_files -/' \
+                    '(-n --name)'{-n,--name}'[project name]:name' \
+                    '(-t --target)'{-t,--target}'[target ID to set for the project]: :_android_targets' \
+                    '(-s --subprojects)'{-s,--subprojects}'[also updates any projects in sub-folders, such as test projects]' \
+                  && ret=0
+                ;;
+                (test-project)
+                  _arguments \
+                    '(-p --path)'{-p,--path}'[the project'\''s directory]: :_files -/' \
+                    '(-m --main)'{-m,--main}'[directory of the app under test, relative to the test project directory]:path' \
+                  && ret=0
+                ;;
+                (lib-project)
+                  _arguments \
+                    '(-p --path)'{-p,--path}'[the project'\''s directory]: :_files -/' \
+                    '(-t --target)'{-t,--target}'[target ID to set for the project]: :_android_targets' \
+                  && ret=0
+                ;;
+                (sdk)
+                  _arguments \
+                    '(-o --obsolete)'{-o,--obsolete}'[install obsolete packages]' \
+                    '--proxy-host[HTTP/HTTPS proxy host (overrides settings if defined)]:proxy host:_hosts' \
+                    '--proxy-port[HTTP/HTTPS proxy port (overrides settings if defined)]:proxy port number' \
+                    '(-s --no-https)'{-s,--no-https}'[use HTTP instead of HTTPS (the default) for downloads]' \
+                    '(-u --no-ui)'{-u,--no-ui}'[update from command-line (no GUI)]' \
+                    '(-f --force)'{-f,--force}'[force replacement of a package or its parts, even if something has been modified]' \
+                    '(-t --filter)'{-t,--filter}'[a filter that limits the update to the specified types of packages]: :_android_sdk_update_filters -s ,' \
+                    '(-n --dry-mode)'{-n,--dry-mode}'[simulate the update but does not download or install anything]' \
+                  && ret=0
+                ;;
+              esac
+            ;;
+          esac
+        ;;
+        (move)
+          _arguments -C \
+            '1: :_android_move_entities' \
+            '*::move-arg:->move-args' \
+          && ret=0
+          case "$state" in
+            (move-args)
+              case $words[1] in
+                (avd)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[name of the AVD to move or rename]: :_android_avd_names' \
+                    '(-p --path)'{-p,--path}'[path to the AVD'\''s new directory]: :_files -/' \
+                    '(-r --rename)'{-r,--rename}'[new name of the AVD]:name' \
+                  && ret=0
+                ;;
+              esac
+            ;;
+          esac
+        ;;
+        (delete)
+          _arguments -C \
+            '1: :_android_delete_entities' \
+            '*::delete-arg:->delete-args' \
+          && ret=0
+          case "$state" in
+            (delete-args)
+              case $words[1] in
+                (avd)
+                  _arguments \
+                    '(-n --name)'{-n,--name}'[name of the AVD to delete]: :_android_avd_names' \
+                  && ret=0
+                ;;
+              esac
+            ;;
+          esac
+        ;;
+        (display)
+          _arguments \
+            '1: :_android_display_entities' \
+          && ret=0
+        ;;
+      esac
+    ;;
+  esac
+
+  return ret
+}
+
+(( $+functions[_android_cmds] )) ||
+_android_cmds() {
+  local commands; commands=(
+    'list:list existing targets or virtual devices'
+    'create:create new virtual devices or projects'
+    'update:update a virtual device, project, SDK or adb'
+    'move:move a virtual device'
+    'delete:delete a virtual device'
+    'avd:displays the AVD Manager window'
+    'sdk:displays the SDK Manager window'
+    'display:display manager windows'
+  )
+  _describe -t commands 'command' commands "$@"
+}
+
+(( $+functions[_android_list_entities] )) ||
+_android_list_entities() {
+  local entities; entities=(
+    'avd:list existing Android Virtual Devices'
+    'target:list existing targets'
+    'sdk:list remote SDK repository'
+  )
+  _describe -t entities 'entity' entities "$@"
+}
+
+(( $+functions[_android_create_entities] )) ||
+_android_create_entities() {
+  local entities; entities=(
+    'avd:create a new Android Virtual Device'
+    'project:create a new Android project'
+    'test-project:create a new Android project for a test package'
+    'lib-project:create a new Android library project'
+  )
+  _describe -t entities 'entity' entities "$@"
+}
+
+(( $+functions[_android_update_entities] )) ||
+_android_update_entities() {
+  local entities; entities=(
+    'avd:update an Android Virtual Device to match the folders of a new SDK'
+    'project:update an Android project'
+    'test-project:update the Android project for a test package'
+    'lib-project:update an Android library project'
+    'adb:update adb to support the USB devices declared in the SDK add-ons'
+    'sdk:update the SDK by suggesting new platforms to install if available'
+  )
+  _describe -t entities 'entity' entities "$@"
+}
+
+(( $+functions[_android_move_entities] )) ||
+_android_move_entities() {
+  local entities; entities=(
+    'avd:move or rename an Android Virtual Device'
+  )
+  _describe -t entities 'entity' commands "$@"
+}
+
+(( $+functions[_android_delete_entities] )) ||
+_android_delete_entities() {
+  local entities; entities=(
+    'avd:delete an Android Virtual Device'
+  )
+  _describe -t entities 'entity' entities "$@"
+}
+
+(( $+functions[_android_display_entities] )) ||
+_android_display_entities() {
+  local entities; entities=(
+    'sdk:display the SDK Manager window'
+    'avd:display the AVD Manager window'
+  )
+  _describe -t entities 'entity' entities "$@"
+}
+
+(( $+functions[_android_targets] )) ||
+_android_targets() {
+  local targets; targets=(${(f)"$(_call_program targets $service list target --compact)"//:/\\:})
+  _describe -t targets 'target' targets "$@"
+}
+
+(( $+functions[_android_avd_names] )) ||
+_android_avd_names() {
+  local avd_names; avd_names=(${(f)"$(_call_program targets $service list avd --compact)"//:/\\:})
+  _describe -t avd-names 'AVD name' avd_names "$@"
+}
+
+(( $+functions[_android_sdk_update_filters] )) ||
+_android_sdk_update_filters() {
+  local filters; filters=(platform tool platform-tool doc sample extra)
+  _values $@ 'filter' "${filters[@]}"
+}
+
+_android "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ansible b/zsh/modules/completion/external/src/_ansible
new file mode 100644
index 0000000..e3a1d0c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ansible
@@ -0,0 +1,709 @@
+#compdef ansible
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ansible v2.0.0.2 (http://ansible.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Romain Bossart (https://github.com/bosr)
+#  * Adam Stevko (https://github.com/xen0l)
+#
+# ------------------------------------------------------------------------------
+#
+# Needs either ANSIBLE_HOSTS or /etc/ansible/hosts on linux
+# (or /usr/local/etc/ansible/hosts on OSX)
+#
+# Note 1: the following gist (https://gist.github.com/15ed54a438a36d67fd99.git)
+# has some files to help improve the hostfile shell parsing
+#
+# Note 2: I tried to use `_arguments --`, but the output of `ansible --help`
+# is not parsed entirely correctly, and anyway no modules or host would available.
+#
+
+
+# ansible zsh completion
+#
+
+__host_file_location () {
+  # find the location of the host file:
+  # 1. check $ANSIBLE_HOSTS
+  # 2. else check /etc/ansible/hosts or /usr/local/etc/...
+  #    (depending on platform)
+  #
+  [[ "$OSTYPE" == darwin* ]] && FALLBACK="/usr/local/etc/ansible/hosts"
+  [[ "$OSTYPE" == linux* ]] && FALLBACK="/etc/ansible/hosts"
+  HOST_FILE=${ANSIBLE_HOSTS:=${FALLBACK}}
+  [[ -f ${HOST_FILE} ]] || HOST_FILE="$PWD/ansible/inventory/hosts"
+  [[ -f ${HOST_FILE} ]] || HOST_FILE=/dev/null
+
+  echo ${HOST_FILE}
+}
+
+__ll_group_list () {
+  # parses the ini hostfile for groups only: [...]
+  HOST_FILE=$(__host_file_location)
+
+  local -a group_list
+  group_list=$(command \
+      cat ${HOST_FILE} \
+      | awk '$1 ~ /^\[.*\]$/ && !/=/ && !/:vars/ \
+        { gsub(/[\[\]]/, "", $1); gsub(/:children/, "", $1) ; print $1 }' \
+      | uniq )
+
+  echo ${group_list}
+}
+
+
+__host_list ()
+{
+  # parses the ini hostfile for hosts only
+  # but then has to remove all group occurrences
+  HOST_FILE=$(__host_file_location)
+
+  # this will also contain groups if they are referenced in other groups
+  local -a mixed_host_list
+  mixed_host_list=$(command \
+    cat ${HOST_FILE} \
+    | awk 'NF && $1 !~ /^[[:space:]]*#|[\[:=]/ { print $1 }' \
+    | sort | uniq)
+
+  # compute set difference h1 - h2
+  local -a h1 h2 host_list
+  h1=${mixed_host_list}
+  h2=$(__ll_group_list)
+  host_list=($(command \
+    sort <(echo $h1) <(echo $h2) <(echo $h2) \
+    | uniq -u \
+    | paste -s -d ' ' - )
+  )
+
+  _wanted application expl 'hosts' compadd ${host_list}
+
+  # method that delegates to ansible (slow)
+  # _wanted application expl 'hosts' compadd $(command ansible \
+  #                                             all --list-hosts\
+  #                                             2>/dev/null)
+}
+
+__group_list ()
+{
+  gl=($(command echo $(__ll_group_list) | paste -s -d ' ' - )) # 'a\nb\nc' -> (a b c)
+  _wanted application2 expl 'groups' compadd $gl
+}
+
+
+_modules=(
+'a10_server:Manage A10 Networks AX/SoftAX/Thunder/vThunder devices'
+'a10_service_group:Manage A10 Networks devices’ service groups'
+'a10_virtual_server:Manage A10 Networks devices’ virtual servers'
+'accelerate:Enable accelerated mode on remote node'
+'acl:Sets and retrieves file ACL information.'
+'add_host:add a host (and alternatively a group) to the ansible-playbook in-memory inventory'
+'airbrake_deployment:Notify airbrake about app deployments'
+'alternatives:Manages alternative programs for common commands'
+'apache2_module:enables/disables a module of the Apache2 webserver'
+'apk:Manages apk packages'
+'apt:Manages apt-packages'
+'apt_key:Add or remove an apt key'
+'apt_repository:Add and remove APT repositories'
+'apt_rpm:apt_rpm package manager'
+'assemble:Assembles a configuration file from fragments'
+'assert:Fail with custom message'
+'async_status:Obtain status of asynchronous task'
+'at:Schedule the execution of a command or script file via the at command.'
+'authorized_key:Adds or removes an SSH authorized key'
+'azure:create or terminate a virtual machine in azure'
+'bigip_facts:Collect facts from F5 BIG-IP devices'
+'bigip_gtm_wide_ip:Manages F5 BIG-IP GTM wide ip'
+'bigip_monitor_http:Manages F5 BIG-IP LTM http monitors'
+'bigip_monitor_tcp:Manages F5 BIG-IP LTM tcp monitors'
+'bigip_node:Manages F5 BIG-IP LTM nodes'
+'bigip_pool:Manages F5 BIG-IP LTM pools'
+'bigip_pool_member:Manages F5 BIG-IP LTM pool members'
+'bigip_virtual_server:Manages F5 BIG-IP LTM virtual servers'
+'bigpanda:Notify BigPanda about deployments'
+'blockinfile:Insert/update/remove a text block surrounded by marker lines.'
+'boundary_meter:Manage boundary meters'
+'bower:Manage bower packages with bower'
+'bundler:Manage Ruby Gem dependencies with Bundler'
+'bzr:Deploy software (or files) from bzr branches'
+'campfire:Send a message to Campfire'
+'capabilities:Manage Linux capabilities'
+'circonus_annotation:create an annotation in circonus'
+'cl_bond:Configures a bond port on Cumulus Linux'
+'cl_bridge:Configures a bridge port on Cumulus Linux'
+'cl_img_install:Install a different Cumulus Linux version.'
+'cl_interface:Configures a front panel port, loopback or management port on Cumulus Linux.'
+'cl_interface_policy:Configure interface enforcement policy on Cumulus Linux'
+'cl_license:Install Cumulus Linux license'
+'cl_ports:Configure Cumulus Switch port attributes (ports.conf)'
+'clc_aa_policy:Create or Delete Anti Affinity Policies at CenturyLink Cloud.'
+'clc_alert_policy:Create or Delete Alert Policies at CenturyLink Cloud.'
+'clc_blueprint_package:deploys a blue print package on a set of servers in CenturyLink Cloud.'
+'clc_firewall_policy:Create/delete/update firewall policies'
+'clc_group:Create/delete Server Groups at Centurylink Cloud'
+'clc_loadbalancer:Create, Delete shared loadbalancers in CenturyLink Cloud.'
+'clc_modify_server:modify servers in CenturyLink Cloud.'
+'clc_publicip:Add and Delete public ips on servers in CenturyLink Cloud.'
+'clc_server:Create, Delete, Start and Stop servers in CenturyLink Cloud.'
+'clc_server_snapshot:Create, Delete and Restore server snapshots in CenturyLink Cloud.'
+'cloudflare_dns:manage Cloudflare DNS records'
+'cloudformation:Create or delete an AWS CloudFormation stack'
+'cloudtrail:manage CloudTrail creation and deletion'
+'command:Executes a command on a remote node'
+'composer:Dependency Manager for PHP'
+'consul:Add, modify & delete services within a consul cluster.'
+'consul_acl:manipulate consul acl keys and rules'
+'consul_kv:Manipulate entries in the key/value store of a consul cluster.'
+'consul_session:manipulate consul sessions'
+'copy:Copies files to remote locations.'
+'cpanm:Manages Perl library dependencies.'
+'cron:Manage cron.d and crontab entries.'
+'cronvar:Manage variables in crontabs'
+'crypttab:Encrypted Linux block devices'
+'cs_account:Manages accounts on Apache CloudStack based clouds.'
+'cs_affinitygroup:Manages affinity groups on Apache CloudStack based clouds.'
+'cs_cluster:Manages host clusters on Apache CloudStack based clouds.'
+'cs_configuration:Manages configuration on Apache CloudStack based clouds.'
+'cs_domain:Manages domains on Apache CloudStack based clouds.'
+'cs_facts:Gather facts on instances of Apache CloudStack based clouds.'
+'cs_firewall:Manages firewall rules on Apache CloudStack based clouds.'
+'cs_instance:Manages instances and virtual machines on Apache CloudStack based clouds.'
+'cs_instance_facts:Gathering facts from the API of instances from Apache CloudStack based clouds.'
+'cs_instancegroup:Manages instance groups on Apache CloudStack based clouds.'
+'cs_ip_address:Manages public IP address associations on Apache CloudStack based clouds.'
+'cs_iso:Manages ISO images on Apache CloudStack based clouds.'
+'cs_loadbalancer_rule:Manages load balancer rules on Apache CloudStack based clouds.'
+'cs_loadbalancer_rule_member:Manages load balancer rule members on Apache CloudStack based clouds.'
+'cs_network:Manages networks on Apache CloudStack based clouds.'
+'cs_pod:Manages pods on Apache CloudStack based clouds.'
+'cs_portforward:Manages port forwarding rules on Apache CloudStack based clouds.'
+'cs_project:Manages projects on Apache CloudStack based clouds.'
+'cs_resourcelimit:Manages resource limits on Apache CloudStack based clouds.'
+'cs_securitygroup:Manages security groups on Apache CloudStack based clouds.'
+'cs_securitygroup_rule:Manages security group rules on Apache CloudStack based clouds.'
+'cs_sshkeypair:Manages SSH keys on Apache CloudStack based clouds.'
+'cs_staticnat:Manages static NATs on Apache CloudStack based clouds.'
+'cs_template:Manages templates on Apache CloudStack based clouds.'
+'cs_user:Manages users on Apache CloudStack based clouds.'
+'cs_vmsnapshot:Manages VM snapshots on Apache CloudStack based clouds.'
+'cs_volume:Manages volumes on Apache CloudStack based clouds.'
+'cs_zone:Manages zones on Apache CloudStack based clouds.'
+'cs_zone_facts:Gathering facts of zones from Apache CloudStack based clouds.'
+'datadog_event:Posts events to DataDog service'
+'datadog_monitor:Manages Datadog monitors'
+'debconf:Configure a .deb package'
+'debug:Print statements during execution'
+'deploy_helper:Manages some of the steps common in deploying projects.'
+'digital_ocean:Create/delete a droplet/SSH_key in DigitalOcean'
+'digital_ocean_domain:Create/delete a DNS record in DigitalOcean'
+'digital_ocean_sshkey:Create/delete an SSH key in DigitalOcean'
+'django_manage:Manages a Django application.'
+'dnf:Manages packages with the *dnf* package manager'
+'dnsimple:Interface with dnsimple.com (a DNS hosting service).'
+'dnsmadeeasy:Interface with dnsmadeeasy.com (a DNS hosting service).'
+'docker:manage docker containers'
+'docker_image:manage docker images'
+'docker_login:Manage Docker registry logins'
+'dpkg_selections:Dpkg package selection selections'
+'dynamodb_table:Create, update or delete AWS Dynamo DB tables.'
+'easy_install:Installs Python libraries'
+'ec2:create, terminate, start or stop an instance in ec2'
+'ec2_ami:create or destroy an image in ec2'
+'ec2_ami_copy:copies AMI between AWS regions, return new image id'
+'ec2_ami_find:Searches for AMIs to obtain the AMI ID and other information'
+'ec2_ami_search(D):Retrieve AWS AMI information for a given operating system.'
+'ec2_asg:Create or delete AWS Autoscaling Groups'
+'ec2_eip:associate an EC2 elastic IP with an instance.'
+'ec2_elb:De-registers or registers instances from EC2 ELBs'
+'ec2_elb_facts:Gather facts about EC2 Elastic Load Balancers in AWS'
+'ec2_elb_lb:Creates or destroys Amazon ELB.'
+'ec2_eni:Create and optionally attach an Elastic Network Interface (ENI) to an instance'
+'ec2_eni_facts:Gather facts about ec2 ENI interfaces in AWS'
+'ec2_facts:Gathers facts about remote hosts within ec2 (aws)'
+'ec2_group:maintain an ec2 VPC security group.'
+'ec2_key:maintain an ec2 key pair.'
+'ec2_lc:Create or delete AWS Autoscaling Launch Configurations'
+'ec2_metric_alarm:Create/update or delete AWS Cloudwatch ‘metric alarms’'
+'ec2_remote_facts:Gather facts about ec2 instances in AWS'
+'ec2_scaling_policy:Create or delete AWS scaling policies for Autoscaling groups'
+'ec2_snapshot:creates a snapshot from an existing volume'
+'ec2_tag:create and remove tag(s) to ec2 resources.'
+'ec2_vol:create and attach a volume, return volume id and device map'
+'ec2_vol_facts:Gather facts about ec2 volumes in AWS'
+'ec2_vpc:configure AWS virtual private clouds'
+'ec2_vpc_dhcp_options:Manages DHCP Options, and can ensure the DHCP options for the given VPC match what’s requested'
+'ec2_vpc_igw:Manage an AWS VPC Internet gateway'
+'ec2_vpc_net:Configure AWS virtual private clouds'
+'ec2_vpc_net_facts:Gather facts about ec2 VPCs in AWS'
+'ec2_vpc_route_table:Manage route tables for AWS virtual private clouds'
+'ec2_vpc_route_table_facts:Gather facts about ec2 VPC route tables in AWS'
+'ec2_vpc_subnet:Manage subnets in AWS virtual private clouds'
+'ec2_vpc_subnet_facts:Gather facts about ec2 VPC subnets in AWS'
+'ec2_win_password:gets the default administrator password for ec2 windows instances'
+'ecs_cluster:create or terminate ecs clusters'
+'ecs_service:create, terminate, start or stop a service in ecs'
+'ecs_service_facts:list or describe services in ecs'
+'ecs_task:run, start or stop a task in ecs'
+'ecs_taskdefinition:register a task definition in ecs'
+'ejabberd_user:Manages users for ejabberd servers'
+'elasticache:Manage cache clusters in Amazon Elasticache.'
+'elasticache_subnet_group:manage Elasticache subnet groups'
+'elasticsearch_plugin:Manage Elasticsearch plugins'
+'eos_command:Run arbitrary command on EOS device'
+'eos_config:Manage Arista EOS configuration sections'
+'eos_eapi:Manage and configure EAPI. Requires EOS v4.12 or greater.'
+'eos_template:Manage Arista EOS device configurations'
+'expect:Executes a command and responds to prompts'
+'facter:Runs the discovery program *facter* on the remote system'
+'fail:Fail with custom message'
+'fetch:Fetches a file from remote nodes'
+'file:Sets attributes of files'
+'filesystem:Makes file system on block device'
+'find:return a list of files based on specific criteria'
+'fireball(D):Enable fireball mode on remote node'
+'firewalld:Manage arbitrary ports/services with firewalld'
+'flowdock:Send a message to a flowdock'
+'gc_storage:This module manages objects/buckets in Google Cloud Storage.'
+'gce:create or terminate GCE instances'
+'gce_img:utilize GCE image resources'
+'gce_lb:create/destroy GCE load-balancer resources'
+'gce_net:create/destroy GCE networks and firewall rules'
+'gce_pd:utilize GCE persistent disk resources'
+'gce_tag:add or remove tag(s) to/from GCE instance'
+'gem:Manage Ruby gems'
+'get_url:Downloads files from HTTP, HTTPS, or FTP to node'
+'getent:a wrapper to the unix getent utility'
+'git:Deploy software (or files) from git checkouts'
+'github_hooks:Manages github service hooks.'
+'glance_image(D):Add/Delete images from glance'
+'gluster_volume:Manage GlusterFS volumes'
+'group:Add or remove groups'
+'group_by:Create Ansible groups based on facts'
+'grove:Sends a notification to a grove.io channel'
+'hall:Send notification to Hall'
+'haproxy:Enable, disable, and set weights for HAProxy backend servers using socket commands.'
+'hg:Manages Mercurial (hg) repositories.'
+'hipchat:Send a message to hipchat.'
+'homebrew:Package manager for Homebrew'
+'homebrew_cask:Install/uninstall homebrew casks.'
+'homebrew_tap:Tap a Homebrew repository.'
+'hostname:Manage hostname'
+'htpasswd:manage user files for basic authentication'
+'iam:Manage IAM users, groups, roles and keys'
+'iam_cert:Manage server certificates for use on ELBs and CloudFront'
+'iam_policy:Manage IAM policies for users, groups, and roles'
+'include_vars:Load variables from files, dynamically within a task.'
+'ini_file:Tweak settings in INI files'
+'ios_command:Run arbitrary commands on ios devices.'
+'ios_config:Manage Cisco IOS configuration sections'
+'ios_template:Manage Cisco IOS device configurations over SSH'
+'iosxr_command:Run arbitrary commands on ios devices.'
+'iosxr_config:Manage Cisco IOS XR configuration sections'
+'iosxr_template:Manage Cisco IOS device configurations over SSH'
+'ipify_facts:Retrieve the public IP of your internet gateway.'
+'iptables:Modify the systems iptables'
+'irc:Send a message to an IRC channel'
+'jabber:Send a message to jabber user or chat room'
+'jboss:deploy applications to JBoss'
+'jira:create and modify issues in a JIRA instance'
+'junos_command:Execute arbitrary commands on Juniper JUNOS devices'
+'junos_config:Manage Juniper JUNOS configuration sections'
+'junos_template:Manage Juniper JUNOS device configurations'
+'kernel_blacklist:Blacklist kernel modules'
+'keystone_user(D):Manage OpenStack Identity (keystone) users, tenants and roles'
+'known_hosts:Add or remove a host from the ``known_hosts`` file'
+'layman:Manage Gentoo overlays'
+'librato_annotation:create an annotation in librato'
+'lineinfile:Ensure a particular line is in a file, or replace an existing line using a back-referenced regular expression.'
+'linode:create / delete / stop / restart an instance in Linode Public Cloud'
+'lldp:get details reported by lldp'
+'locale_gen:Creates or removes locales.'
+'logentries:Module for tracking logs via logentries.com'
+'lvg:Configure LVM volume groups'
+'lvol:Configure LVM logical volumes'
+'lxc_container:Manage LXC Containers'
+'macports:Package manager for MacPorts'
+'mail:Send an email'
+'maven_artifact:Downloads an Artifact from a Maven Repository'
+'modprobe:Add or remove kernel modules'
+'mongodb_user:Adds or removes a user from a MongoDB database.'
+'monit:Manage the state of a program monitored via Monit'
+'mount:Control active and configured mount points'
+'mqtt:Publish a message on an MQTT topic for the IoT'
+'mysql_db:Add or remove MySQL databases from a remote host.'
+'mysql_replication:Manage MySQL replication'
+'mysql_user:Adds or removes a user from a MySQL database.'
+'mysql_variables:Manage MySQL global variables'
+'nagios:Perform common tasks in Nagios related to downtime and notifications.'
+'netscaler:Manages Citrix NetScaler entities'
+'newrelic_deployment:Notify newrelic about app deployments'
+'nexmo:Send a SMS via nexmo'
+'nmcli:Manage Networking'
+'nova_compute(D):Create/Delete VMs from OpenStack'
+'nova_keypair(D):Add/Delete key pair from nova'
+'npm:Manage node.js packages with npm'
+'nxos_command:Run arbitrary command on Cisco NXOS devices'
+'nxos_config:Manage Cisco NXOS configuration sections'
+'nxos_nxapi:Manage NXAPI configuration on an NXOS device.'
+'nxos_template:Manage Cisco NXOS device configurations'
+'ohai:Returns inventory data from *Ohai*'
+'open_iscsi:Manage iscsi targets with open-iscsi'
+'openbsd_pkg:Manage packages on OpenBSD.'
+'openvswitch_bridge:Manage Open vSwitch bridges'
+'openvswitch_db:Configure open vswitch database.'
+'openvswitch_port:Manage Open vSwitch ports'
+'opkg:Package manager for OpenWrt'
+'ops_command:Run arbitrary commands on OpenSwitch devices.'
+'ops_config:Manage OpenSwitch configuration using CLI'
+'ops_template:Push configuration to OpenSwitch'
+'os_auth:Retrieve an auth token'
+'os_client_config:Get OpenStack Client config'
+'os_flavor_facts:Retrieve facts about one or more flavors'
+'os_floating_ip:Add/Remove floating IP from an instance'
+'os_group:Manage OpenStack Identity Groups'
+'os_image:Add/Delete images from OpenStack Cloud'
+'os_image_facts:Retrieve facts about an image within OpenStack.'
+'os_ironic:Create/Delete Bare Metal Resources from OpenStack'
+'os_ironic_node:Activate/Deactivate Bare Metal Resources from OpenStack'
+'os_keypair:Add/Delete a keypair from OpenStack'
+'os_keystone_domain:Manage OpenStack Identity Domains'
+'os_keystone_role:Manage OpenStack Identity Roles'
+'os_network:Creates/removes networks from OpenStack'
+'os_networks_facts:Retrieve facts about one or more OpenStack networks.'
+'os_nova_flavor:Manage OpenStack compute flavors'
+'os_object:Create or Delete objects and containers from OpenStack'
+'os_port:Add/Update/Delete ports from an OpenStack cloud.'
+'os_project:Manage OpenStack Projects'
+'os_router:Create or delete routers from OpenStack'
+'os_security_group:Add/Delete security groups from an OpenStack cloud.'
+'os_security_group_rule:Add/Delete rule from an existing security group'
+'os_server:Create/Delete Compute Instances from OpenStack'
+'os_server_actions:Perform actions on Compute Instances from OpenStack'
+'os_server_facts:Retrieve facts about one or more compute instances'
+'os_server_volume:Attach/Detach Volumes from OpenStack VM’s'
+'os_subnet:Add/Remove subnet to an OpenStack network'
+'os_subnets_facts:Retrieve facts about one or more OpenStack subnets.'
+'os_user:Manage OpenStack Identity Users'
+'os_user_group:Associate OpenStack Identity users and groups'
+'os_volume:Create/Delete Cinder Volumes'
+'osx_defaults:osx_defaults allows users to read, write, and delete Mac OS X user defaults from Ansible'
+'osx_say:Makes an OSX computer to speak.'
+'ovirt:oVirt/RHEV platform management'
+'package:Generic OS package manager'
+'pacman:Manage packages with *pacman*'
+'pagerduty:Create PagerDuty maintenance windows'
+'pagerduty_alert:Trigger, acknowledge or resolve PagerDuty incidents'
+'pam_limits:Modify Linux PAM limits'
+'patch:Apply patch files using the GNU patch tool.'
+'pause:Pause playbook execution'
+'pear:Manage pear/pecl packages'
+'ping:Try to connect to host, verify a usable python and return ``pong`` on success.'
+'pingdom:Pause/unpause Pingdom alerts'
+'pip:Manages Python library dependencies.'
+'pkg5:Manages packages with the Solaris 11 Image Packaging System'
+'pkg5_publisher:Manages Solaris 11 Image Packaging System publishers'
+'pkgin:Package manager for SmartOS, NetBSD, et al.'
+'pkgng:Package manager for FreeBSD >= 9.0'
+'pkgutil:Manage CSW-Packages on Solaris'
+'portage:Package manager for Gentoo'
+'portinstall:Installing packages from FreeBSD’s ports system'
+'postgresql_db:Add or remove PostgreSQL databases from a remote host.'
+'postgresql_ext:Add or remove PostgreSQL extensions from a database.'
+'postgresql_lang:Adds, removes or changes procedural languages with a PostgreSQL database.'
+'postgresql_privs:Grant or revoke privileges on PostgreSQL database objects.'
+'postgresql_user:Adds or removes a users (roles) from a PostgreSQL database.'
+'profitbricks:Create, destroy, start, stop, and reboot a ProfitBricks virtual machine.'
+'profitbricks_datacenter:Create or destroy a ProfitBricks Virtual Datacenter.'
+'profitbricks_nic:Create or Remove a NIC.'
+'profitbricks_volume:Create or destroy a volume.'
+'profitbricks_volume_attachments:Attach or detach a volume.'
+'proxmox:management of instances in Proxmox VE cluster'
+'proxmox_template:management of OS templates in Proxmox VE cluster'
+'puppet:Runs puppet'
+'pushbullet:Sends notifications to Pushbullet'
+'pushover:Send notifications via https'
+'quantum_floating_ip(D):Add/Remove floating IP from an instance'
+'quantum_floating_ip_associate(D):Associate or disassociate a particular floating IP with an instance'
+'quantum_network(D):Creates/Removes networks from OpenStack'
+'quantum_router(D):Create or Remove router from openstack'
+'quantum_router_gateway(D):set/unset a gateway interface for the router with the specified external network'
+'quantum_router_interface(D):Attach/Dettach a subnet’s interface to a router'
+'quantum_subnet(D):Add/remove subnet from a network'
+'rabbitmq_binding:This module manages rabbitMQ bindings'
+'rabbitmq_exchange:This module manages rabbitMQ exchanges'
+'rabbitmq_parameter:Adds or removes parameters to RabbitMQ'
+'rabbitmq_plugin:Adds or removes plugins to RabbitMQ'
+'rabbitmq_policy:Manage the state of policies in RabbitMQ.'
+'rabbitmq_queue:This module manages rabbitMQ queues'
+'rabbitmq_user:Adds or removes users to RabbitMQ'
+'rabbitmq_vhost:Manage the state of a virtual host in RabbitMQ'
+'raw:Executes a low-down and dirty SSH command'
+'rax:create / delete an instance in Rackspace Public Cloud'
+'rax_cbs:Manipulate Rackspace Cloud Block Storage Volumes'
+'rax_cbs_attachments:Manipulate Rackspace Cloud Block Storage Volume Attachments'
+'rax_cdb:create/delete or resize a Rackspace Cloud Databases instance'
+'rax_cdb_database:create / delete a database in the Cloud Databases'
+'rax_cdb_user:create / delete a Rackspace Cloud Database'
+'rax_clb:create / delete a load balancer in Rackspace Public Cloud'
+'rax_clb_nodes:add, modify and remove nodes from a Rackspace Cloud Load Balancer'
+'rax_clb_ssl:Manage SSL termination for a Rackspace Cloud Load Balancer.'
+'rax_dns:Manage domains on Rackspace Cloud DNS'
+'rax_dns_record:Manage DNS records on Rackspace Cloud DNS'
+'rax_facts:Gather facts for Rackspace Cloud Servers'
+'rax_files:Manipulate Rackspace Cloud Files Containers'
+'rax_files_objects:Upload, download, and delete objects in Rackspace Cloud Files'
+'rax_identity:Load Rackspace Cloud Identity'
+'rax_keypair:Create a keypair for use with Rackspace Cloud Servers'
+'rax_meta:Manipulate metadata for Rackspace Cloud Servers'
+'rax_mon_alarm:Create or delete a Rackspace Cloud Monitoring alarm.'
+'rax_mon_check:Create or delete a Rackspace Cloud Monitoring check for an existing entity.'
+'rax_mon_entity:Create or delete a Rackspace Cloud Monitoring entity'
+'rax_mon_notification:Create or delete a Rackspace Cloud Monitoring notification.'
+'rax_mon_notification_plan:Create or delete a Rackspace Cloud Monitoring notification plan.'
+'rax_network:create / delete an isolated network in Rackspace Public Cloud'
+'rax_queue:create / delete a queue in Rackspace Public Cloud'
+'rax_scaling_group:Manipulate Rackspace Cloud Autoscale Groups'
+'rax_scaling_policy:Manipulate Rackspace Cloud Autoscale Scaling Policy'
+'rds:create, delete, or modify an Amazon rds instance'
+'rds_param_group:manage RDS parameter groups'
+'rds_subnet_group:manage RDS database subnet groups'
+'redhat_subscription:Manage Red Hat Network registration and subscriptions using the ``subscription-manager`` command'
+'redis:Various redis commands, slave and flush'
+'replace:Replace all instances of a particular string in a file using a back-referenced regular expression.'
+'rhn_channel:Adds or removes Red Hat software channels'
+'rhn_register:Manage Red Hat Network registration using the ``rhnreg_ks`` command'
+'riak:This module handles some common Riak operations'
+'rollbar_deployment:Notify Rollbar about app deployments'
+'route53:add or delete entries in Amazons Route53 DNS service'
+'route53_facts:Retrieves route53 details using AWS methods'
+'route53_health_check:add or delete health-checks in Amazons Route53 DNS service'
+'route53_zone:add or delete Route53 zones'
+'rpm_key:Adds or removes a gpg key from the rpm db'
+'s3:manage objects in S3.'
+'s3_bucket:Manage s3 buckets in AWS'
+'s3_lifecycle:Manage s3 bucket lifecycle rules in AWS'
+'s3_logging:Manage logging facility of an s3 bucket in AWS'
+'script:Runs a local script on a remote node after transferring it'
+'seboolean:Toggles SELinux booleans.'
+'selinux:Change policy and state of SELinux'
+'selinux_permissive:Change permissive domain in SELinux policy'
+'sendgrid:Sends an email with the SendGrid API'
+'sensu_check:Manage Sensu checks'
+'seport:Manages SELinux network port type definitions'
+'service:Manage services.'
+'set_fact:Set host facts from a task'
+'setup:Gathers facts about remote hosts'
+'shell:Execute commands in nodes.'
+'slack:Send Slack notifications'
+'slackpkg:Package manager for Slackware >= 12.2'
+'slurp:Slurps a file from remote nodes'
+'snmp_facts:Retrieve facts for a device using SNMP.'
+'sns:Send Amazon Simple Notification Service (SNS) messages'
+'sns_topic:Manages AWS SNS topics and subscriptions'
+'solaris_zone:Manage Solaris zones'
+'sqs_queue:Creates or deletes AWS SQS queues.'
+'stackdriver:Send code deploy and annotation events to stackdriver'
+'stat:retrieve file or file system status'
+'sts_assume_role:Assume a role using AWS Security Token Service and obtain temporary credentials'
+'subversion:Deploys a subversion repository.'
+'supervisorctl:Manage the state of a program or group of programs running via supervisord'
+'svc:Manage daemontools services.'
+'svr4pkg:Manage Solaris SVR4 packages'
+'swdepot:Manage packages with swdepot package manager (HP-UX)'
+'synchronize:Uses rsync to make synchronizing file paths in your playbooks quick and easy.'
+'sysctl:Manage entries in sysctl.conf.'
+'taiga_issue:Creates/deletes an issue in a Taiga Project Management Platform'
+'template:Templates a file out to a remote server.'
+'twilio:Sends a text message to a mobile phone through Twilio.'
+'typetalk:Send a message to typetalk'
+'ufw:Manage firewall with UFW'
+'unarchive:Unpacks an archive after (optionally) copying it from the local machine.'
+'uptimerobot:Pause and start Uptime Robot monitoring'
+'uri:Interacts with webservices'
+'urpmi:Urpmi manager'
+'user:Manage user accounts'
+'vca_fw:add remove firewall rules in a gateway in a vca'
+'vca_nat:add remove nat rules in a gateway in a vca'
+'vca_vapp:Manages vCloud Air vApp instances.'
+'vertica_configuration:Updates Vertica configuration parameters.'
+'vertica_facts:Gathers Vertica database facts.'
+'vertica_role:Adds or removes Vertica database roles and assigns roles to them.'
+'vertica_schema:Adds or removes Vertica database schema and roles.'
+'vertica_user:Adds or removes Vertica database users and assigns roles.'
+'virt:Manages virtual machines supported by libvirt'
+'virt_net:Manage libvirt network configuration'
+'virt_pool:Manage libvirt storage pools'
+'vmware_cluster:Create VMware vSphere Cluster'
+'vmware_datacenter:Manage VMware vSphere Datacenters'
+'vmware_dns_config:Manage VMware ESXi DNS Configuration'
+'vmware_dvs_host:Add or remove a host from distributed virtual switch'
+'vmware_dvs_portgroup:Create or remove a Distributed vSwitch portgroup'
+'vmware_dvswitch:Create or remove a distributed vSwitch'
+'vmware_host:Add/remove ESXi host to/from vCenter'
+'vmware_migrate_vmk:Migrate a VMK interface from VSS to VDS'
+'vmware_portgroup:Create a VMware portgroup'
+'vmware_target_canonical_facts:Return canonical (NAA) from an ESXi host'
+'vmware_vm_facts:Return basic facts pertaining to a vSphere virtual machine guest'
+'vmware_vm_shell:Execute a process in VM'
+'vmware_vm_vss_dvs_migrate:Migrates a virtual machine from a standard vswitch to distributed'
+'vmware_vmkernel:Create a VMware VMkernel Interface'
+'vmware_vmkernel_ip_config:Configure the VMkernel IP Address'
+'vmware_vsan_cluster:Configure VSAN clustering on an ESXi host'
+'vmware_vswitch:Add a VMware Standard Switch to an ESXi host'
+'vsphere_copy:Copy a file to a vCenter datastore'
+'vsphere_guest:Create/delete/manage a guest VM through VMware vSphere.'
+'wait_for:Waits for a condition before continuing.'
+'webfaction_app:Add or remove applications on a Webfaction host'
+'webfaction_db:Add or remove a database on Webfaction'
+'webfaction_domain:Add or remove domains and subdomains on Webfaction'
+'webfaction_mailbox:Add or remove mailboxes on Webfaction'
+'webfaction_site:Add or remove a website on a Webfaction host'
+'win_acl:Set file/directory permissions for a system user or group.'
+'win_chocolatey:Installs packages using chocolatey'
+'win_copy:Copies files to remote locations on windows hosts.'
+'win_dotnet_ngen:Runs ngen to recompile DLLs after .NET updates'
+'win_environment:Modifies environment variables on windows hosts.'
+'win_feature:Installs and uninstalls Windows Features'
+'win_file:Creates, touches or removes files or directories.'
+'win_file_version:Get DLL or EXE file build version'
+'win_firewall_rule:Windows firewall automation'
+'win_get_url:Fetches a file from a given URL'
+'win_group:Add and remove local groups'
+'win_iis_virtualdirectory:Configures a virtual directory in IIS.'
+'win_iis_webapplication:Configures a IIS Web application.'
+'win_iis_webapppool:Configures a IIS Web Application Pool.'
+'win_iis_webbinding:Configures a IIS Web site.'
+'win_iis_website:Configures a IIS Web site.'
+'win_lineinfile:Ensure a particular line is in a file, or replace an existing line using a back-referenced regular expression.'
+'win_msi:Installs and uninstalls Windows MSI files'
+'win_nssm:NSSM '
+'win_package:Installs/Uninstalls a installable package, either from local file system or url'
+'win_ping:A windows version of the classic ping module.'
+'win_regedit:Add, Edit, or Remove Registry Keys and Values'
+'win_regmerge:Merges the contents of a registry file into the windows registry'
+'win_scheduled_task:Manage scheduled tasks'
+'win_service:Manages Windows services'
+'win_share:Manage Windows shares'
+'win_stat:returns information about a Windows file'
+'win_template:Templates a file out to a remote server.'
+'win_timezone:Sets Windows machine timezone'
+'win_unzip:Unzips compressed files and archives on the Windows node'
+'win_updates:Download and install Windows updates'
+'win_uri:Interacts with webservices.'
+'win_user:Manages local Windows user accounts'
+'win_webpicmd:Installs packages using Web Platform Installer command-line'
+'xattr:set/retrieve extended attributes'
+'xenserver_facts:get facts reported on xenserver'
+'yum:Manages packages with the *yum* package manager'
+'yum_repository:Add and remove YUM repositories'
+'zabbix_group:Zabbix host groups creates/deletes'
+'zabbix_host:Zabbix host creates/updates/deletes'
+'zabbix_hostmacro:Zabbix host macro creates/updates/deletes'
+'zabbix_maintenance:Create Zabbix maintenance windows'
+'zabbix_screen:Zabbix screen creates/updates/deletes'
+'zfs:Manage zfs'
+'znode:Create, delete, retrieve, and update znodes using ZooKeeper.'
+'zypper:Manage packages on SUSE and openSUSE'
+'zypper_repository:Add and remove Zypper repositories'
+)
+
+
+_ansible ()
+{
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C -W \
+    '1:pattern:->pattern'\
+    "(-a --args)"{-a,--args}"[ARGS module arguments]:arguments:(ARG)"\
+    '--ask-become-pass[ask for privilege escalation password]'\
+    "(-k --ask-pass)"{-k,--ask-pass}"[ask for connection password]"\
+    '--ask-su-pass[ask for su password (deprecated, use become)]'\
+    "(-K --ask-sudo-pass)"{-K,--ask-sudo-pass}"[ask for sudo password (deprecated, use become)]"\
+    '--ask-vault-pass[ask for vault password]'\
+    "(-B --background)"{-B,--background}"[DURATION run asynchronously for DURATION (s)]:duration:(DURATION)"\
+    "(-b --become)"{-b,--become}"[run operations with become (nopasswd implied)]"\
+    '--become-method[privilege escalation method to use (default=sudo)]:method:(sudo su pbrun pfexec runas doas)'\
+    '--become-user[run operations as this user (default=root)]:user:(USER)'\
+    "(-C --check)"{-C,--check}"[don't make any changes]"\
+    "(-c --connection)"{-c,--connection}"[CONNECTION connection type to use (default=smart)]:connection type:(smart ssh local chroot)"\
+    "(-D --diff)"{-D,--diff}"[show differences when changing (small) files and templates]"\
+    "(-e --extra-vars)"{-e,--extra-vars}"[set additional variables as key=value or YAML/JSON]"\
+    "(-f --forks)"{-f,--forks}"[FORKS number of parallel processes to use (default=5)]:forks:(5)"\
+    "(-h --help)"{-h,--help}"[help message]"\
+    "(-i --inventory-file)"{-i,--inventory-file}"[INVENTORY specify inventory host file]:inventory file:_files"\
+    "(-l --limit)"{-l,--limit}"[SUBSET further limit selected hosts to an additional pattern]:subset pattern:->pattern"\
+    '--list-hosts[outputs a list of matching hosts. Does not execute anything else]'\
+    "(-m --module-name)"{-m,--module-name}"[MODULE_NAME module name (default=command)]:module name:->module"\
+    "(-M --module-path)"{-M,--module-path}"[MODULE_PATH specify path to module library (default=None)]:module path:_files -/"\
+    '--new-vault-password-file[new vault password file for rekey]:new vault password file:_files'\
+    "(-o --one-line)"{-o,--one-line}"[condense output]"\
+    '--output[output file name for encrypt or decrypt; use - for stdout]:output file:_files'\
+    "(-P --poll)"{-P,--poll}"[POLL_INTERVAL set the poll interval (s) if using -B (default=15)]:poll interval:(15)"\
+    '--private-key[PRIVATE_KEY_FILE use this file to authenticate the connection]:private key file:_files'\
+    '--scp-extra-args[specify extra arguments to pass to scp only]'\
+    '--sftp-extra-args[specify extra arguments to pass to sftp only]'\
+    '--ssh-common-args[specify common arguments to pass to sftp/scp/ssh]'\
+    '--ssh-extra-args[specify extra arguments to pass to ssh only]'\
+    "(-S --su)"{-S,--su}"[run operations with su (deprecated, use become)]"\
+    "(-R --su-user)"{-R,--su-user}"[SU_USER run operations with su as this user (default=root) (deprecated, use become)]:su user:(root)"\
+    "(-s --sudo)"{-s,--sudo}"[run operations with sudo (nopasswd) (deprecated, use become)]"\
+    "(-U --sudo-user)"{-U,--sudo-user}"[SUDO_USER desired sudo user (default=root) (deprecated, use become)]:su user:(root)"\
+    '--syntax-check[perform a syntax check on the playbook, but do not execute it]'\
+    "(-T --timeout)"{-T,--timeout}"[TIMEOUT override the SSH timeout (s) (default=10)]:ssh timeout:(10)"\
+    "(-t --tree)"{-t,--tree}"[OUTPUT_DIRECTORY log output to this directory]:output directory:_files -/"\
+    "(-u --user)"{-u,--user}"[REMOTE_USER connect as this user (default=${USER})]:connect as user:(${USER})"\
+    "--vault-password-file[VAULT_PASSWORD_FILE vault password file]:vault password file:_files"\
+    "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]"\
+    "--version[show program's version number and exit]"\
+
+  case $state in
+    pattern)
+      _arguments '*:feature:__host_list'
+      _arguments '*:feature:__group_list'
+      ;;
+    module)
+      _describe -t commands "modules" _modules
+      ;;
+  esac
+}
+
+_ansible "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ansible-galaxy b/zsh/modules/completion/external/src/_ansible-galaxy
new file mode 100644
index 0000000..53b8c64
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ansible-galaxy
@@ -0,0 +1,183 @@
+#compdef ansible-galaxy
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ansible-galaxy v2.0.0.2 (http://ansible.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Romain Bossart (https://github.com/bosr)
+#  * Adam Stevko (https://github.com/xen0l)
+#
+# ------------------------------------------------------------------------------
+#
+# Note: I tried to use `_arguments --`, but the output of `ansible --help`
+# is not parsed entirely correctly, and anyway no modules or host would available.
+#
+
+# ansible-galaxy zsh completion
+#
+_ansible-galaxy ()
+{
+  local context curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    "1:command:(delete import info init install list login remove search setup)" \
+    "*::option:->option"
+
+  case $state in
+    option)
+      case $line[1] in
+        delete)
+         _arguments \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":github_user:(GITHUB_USER)" \
+            ":github_repo:(GITHUB_REPO)"
+          ;;
+        import)
+         _arguments \
+            "--branch[REFERENCE The name of a branch to import.]:reference:(master)" \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "--no-wait[Don't wait for import results.]" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "--status[Check the status of the most recent import request forgiven github_user/github_repo.]" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":github_user:(GITHUB_USER)" \
+            ":github_repo:(GITHUB_REPO)"
+          ;;
+        info)
+          _arguments \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "(-p --roles-path)"{-p,--roles-path}"[ROLES_PATH The path to the directory containing your roles (default: from ansible.cfg)]:roles path:_files -/" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":role name:(ROLE,version)"
+          ;;
+        init)
+          _arguments \
+            "(-f --force)"{-f,--force}"[ Force overwriting an existing role]" \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "(-p --init-path)"{-p,--init-path}"[INIT_PATH path in which the skeleton role will be created (default=./)]:init path:(./)" \
+            "(--offline)--offline[Don't query the galaxy API when creating roles]" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":role name:(ROLE)"
+          ;;
+        install)
+          _arguments \
+            "(-f --force)"{-f,--force}"[Force overwriting an existing role]" \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "(-i --ignore-errors)"{-i,--ignore-errors}"[Ignore errors and continue with the next specified role]" \
+            "(-n --no-deps)"{-n,--no-deps}"[Don't download roles listed as dependencies]" \
+            "(-r --role-file)"{-r,--role-file}"[ROLE_FILE A file containing a list of roles to be imported]:role file:_files" \
+            "(-p --roles-path)"{-p,--roles-path}"[ROLES_PATH The path to the directory containing your roles (default: from ansible.cfg)]:roles path:_files -/" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":role name:(ROLE)"
+          ;;
+        list)
+          _arguments \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-p --roles-path)"{-p,--roles-path}"[ROLES_PATH The path to the directory containing your roles (default: from ansible.cfg)]:roles path:_files -/" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":role name:(ROLE)"
+          ;;
+        login)
+          _arguments \
+            "--github_token[TOKEN Identify with github token rather than username and password.]:token:(TOKEN)" \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]"
+          ;;
+        remove)
+          _arguments \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-p --roles-path)"{-p,--roles-path}"[ROLES_PATH The path to the directory containing your roles (default: from ansible.cfg)]:roles path:_files -/" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            "*:role name:(ROLE)"
+          ;;
+        search)
+          _arguments \
+            "--author[AUTHOR GitHub username]:author:(AUTHOR)" \
+            "--galaxy-tags[TAGS list of galaxy tags to filter by]:tags:(TAGS)" \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "--platforms[PLATFORMS list of OS platforms to filter by" \
+            "(-p --roles-path)"{-p,--roles-path}"[ROLES_PATH The path to the directory containing your roles (default: from ansible.cfg)]:roles path:_files -/" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]"
+          ;;
+        setup)
+          _arguments \
+            "(-h --help)"{-h,--help}"[help message]" \
+            "(-c --ignore-certs)"{-c,--ignore-certs}"[Ignore SSL certificate validation errors.]" \
+            "--list[List all of your integrations.]" \
+            "--remove[REMOVE_ID Remove the integration matching the provided ID value.]:id:(REMOVE_ID)" \
+            "(-s --server)"{-s,--server}"[API_SERVER The API server destination]:api server:(http://apiserver)" \
+            "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]" \
+            "--version[show program's version number and exit]" \
+            ":source:(travis)" \
+            ":github_user:(GITHUB_USER)" \
+            ":github_repo:(GITHUB_REPO)" \
+            ":secret:(SECRET)"
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_ansible-galaxy "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ansible-playbook b/zsh/modules/completion/external/src/_ansible-playbook
new file mode 100644
index 0000000..95aa261
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ansible-playbook
@@ -0,0 +1,191 @@
+#compdef ansible-playbook
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ansible-playbook v2.0.0.2 (http://ansible.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Romain Bossart (https://github.com/bosr)
+#  * Adam Stevko (https://github.com/xen0l)
+#
+# ------------------------------------------------------------------------------
+#
+# Needs either ANSIBLE_HOSTS or /etc/ansible/hosts on linux
+# (or /usr/local/etc/ansible/hosts on OSX)
+#
+# Note 1: the following gist (https://gist.github.com/15ed54a438a36d67fd99.git)
+# has some files to help improve the hostfile shell parsing
+#
+# Note 2: I tried to use `_arguments --`, but the output of `ansible --help`
+# is not parsed entirely correctly, and anyway no modules or host would available.
+#
+
+# ansible-playbook zsh completion
+#
+__host_file_location () {
+  # find the location of the host file:
+  # 1. check $ANSIBLE_HOSTS
+  # 2. else check /etc/ansible/hosts or /usr/local/etc/...
+  #    (depending on platform)
+  #
+
+  [[ "$OSTYPE" == darwin* ]] && FALLBACK="/usr/local/etc/ansible/hosts"
+  [[ "$OSTYPE" == linux* ]] && FALLBACK="/etc/ansible/hosts"
+  HOST_FILE=${ANSIBLE_HOSTS:=${FALLBACK}}
+  [[ -f ${HOST_FILE} ]] || HOST_FILE="$PWD/ansible/inventory/hosts"
+  [[ -f ${HOST_FILE} ]] || HOST_FILE=/dev/null
+
+  echo ${HOST_FILE}
+}
+
+__ll_group_list () {
+  # parses the ini hostfile for groups only: [...]
+  HOST_FILE=$(__host_file_location)
+
+  local -a group_list
+  group_list=$(command \
+      cat ${HOST_FILE} \
+      | awk '$1 ~ /^\[.*\]$/ && !/=/ && !/:vars/ \
+        { gsub(/[\[\]]/, "", $1); gsub(/:children/, "", $1) ; print $1 }' \
+      | uniq )
+
+  echo ${group_list}
+}
+
+
+__host_list ()
+{
+  # parses the ini hostfile for hosts only
+  # but then has to remove all group occurrences
+  HOST_FILE=$(__host_file_location)
+
+  # this will also contain groups if they are referenced in other groups
+  local -a mixed_host_list
+  mixed_host_list=$(command \
+    cat ${HOST_FILE} \
+    | awk 'NF && $1 !~ /[\[:=]/ { print $1 }' \
+    | sort | uniq)
+
+  # compute set difference h1 - h2
+  local -a h1 h2 host_list
+  h1=${mixed_host_list}
+  h2=$(__ll_group_list)
+  host_list=($(command \
+    sort <(echo $h1) <(echo $h2) <(echo $h2) \
+    | uniq -u \
+    | paste -s -d ' ' - )
+  )
+
+  _wanted application expl 'hosts' compadd ${host_list}
+
+  # method that delegates to ansible (slow)
+  # _wanted application expl 'hosts' compadd $(command ansible \
+  #                                             all --list-hosts\
+  #                                             2>/dev/null)
+}
+
+__group_list ()
+{
+  gl=($(command echo $(__ll_group_list) | paste -s -d ' ' - )) # 'a\nb\nc' -> (a b c)
+  _wanted application2 expl 'groups' compadd $gl
+}
+
+
+
+_ansible-playbook ()
+{
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C -W \
+    "1:playbook yml file:_files -g '*.yml'"\
+    '--ask-become-pass[ask for privilege escalation password]'\
+    "(-k --ask-pass)"{-k,--ask-pass}"[ask for connection password]"\
+    '--ask-su-pass[ask for su password (deprecated, use become)]'\
+    "(-K --ask-sudo-pass)"{-K,--ask-sudo-pass}"[ask for sudo password (deprecated, use become)]"\
+    '--ask-vault-pass[ask for vault password]'\
+    "(-b --become)"{-b,--become}"[run operations with become (nopasswd implied)]"\
+    '--become-method[privilege escalation method to use (default=sudo)]:method:(sudo su pbrun pfexec runas doas)'\
+    '--become-user[run operations as this user (default=root)]:user:(USER)'\
+    "(-C --check)"{-C,--check}"[don't make any changes]"\
+    "(-c --connection)"{-c,--connection}"[CONNECTION connection type to use (default=smart)]:connection type:(smart ssh local chroot)"\
+    "(-D --diff)"{-D,--diff}"[when changing (small files and templates, show the diff in those. Works great with --check)]"\
+    "(-e --extra-vars)"{-e,--extra-vars}"[EXTRA_VARS set additional variables as key=value or YAML/JSON]:extra vars:(EXTRA_VARS)"\
+    '--flush-cache[clear the fact cache]'\
+    '--force-handlers[run handlers even if a task fails]'\
+    "(-f --forks)"{-f,--forks}"[FORKS number of parallel processes to use (default=5)]:forks:(5)"\
+    "(-h --help)"{-h,--help}"[help message]"\
+    "(-i --inventory-file)"{-i,--inventory-file}"[INVENTORY specify inventory host file]:inventory file:_files"\
+    "(-l --limit)"{-l,--limit}"[SUBSET further limit selected hosts to an additional pattern]:subset pattern:->pattern"\
+    '--list-hosts[outputs a list of matching hosts. Does not execute anything else]'\
+    '--list-tags[list all available tags]'\
+    '--list-tasks[list all tasks that would be executed]'\
+    "(-M --module-path)"{-M,--module-path}"[MODULE_PATH specify path to module library (default=None)]:module path:_files -/"\
+    '--new-vault-password-file[new vault password file for rekey]:new vault password file:_files'\
+    '--output[output file name for encrypt or decrypt; use - for stdout]:output file:_files'\
+    '--private-key[PRIVATE_KEY_FILE use this file to authenticate the connection]:private key file:_files'\
+    '--scp-extra-args[specify extra arguments to pass to scp only]'\
+    '--sftp-extra-args[specify extra arguments to pass to sftp only]'\
+    "--skip-tags[SKIP_TAGS only run plays and tasks whose tags do not match these values]:skip tags:(SKIP_TAGS)"\
+    '--ssh-common-args[specify common arguments to pass to sftp/scp/ssh]'\
+    '--ssh-extra-args[specify extra arguments to pass to ssh only]'\
+    "--start-at-task[START_AT start the playbook at the task matching this name]:name:(TASK_NAME)"\
+    '--step[one-step-at-a-time: confirm each task before running]'\
+    "(-S --su)"{-S,--su}"[run operations with su (deprecated, use become)]"\
+    "(-R --su-user)"{-R,--su-user}"[SU_USER run operations with su as this user (default=root) (deprecated, use become)]:su user:(root)"\
+    "(-s --sudo)"{-s,--sudo}"[run operations with sudo (nopasswd) (deprecated, use become)]"\
+    "(-U --sudo-user)"{-U,--sudo-user}"[SUDO_USER desired sudo user (default=root) (deprecated, use become)]:su user:(root)"\
+    '--syntax-check[perform a syntax check on the playbook, but do not execute it]'\
+    "(-t --tags)"{-t,--tags}"[TAGS only run plays and tasks gagged with these values]:task tags:(TAGS)"\
+    "(-T --timeout)"{-T,--timeout}"[TIMEOUT override the SSH timeout (s) (default=10)]:ssh timeout:(10)"\
+    "(-u --user)"{-u,--user}"[REMOTE_USER connect as this user (default=${USER})]:connect as user:(${USER})"\
+    "--vault-password-file[VAULT_PASSWORD_FILE vault password file]:vault password file:_files"\
+    "(-v --verbose)"{-v,--verbose}"[verbose mode (-vvv for more, -vvvv to enable connection debugging)]"\
+    "--version[show program's version number and exit]"\
+
+  case $state in
+    pattern)
+      _arguments '*:feature:__host_list'
+      _arguments '*:feature:__group_list'
+      ;;
+  esac
+}
+
+_ansible-playbook "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ansible-vault b/zsh/modules/completion/external/src/_ansible-vault
new file mode 100644
index 0000000..ede78d5
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ansible-vault
@@ -0,0 +1,94 @@
+#compdef ansible-vault
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ansible v1.9.2 (http://ansible.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Rick van Hattem (https://github.com/wolph)
+#
+# ------------------------------------------------------------------------------
+#
+
+_ansible-vault-commands() {
+  local -a commands
+  
+  commands=(
+    'create:Create new encrypted file'
+    'decrypt:Decrypt encrypted file'
+    'edit:Edit encrypted file'
+    'encrypt:Encrypt unencrypted file'
+    'rekey:Change password for encrypted file'
+    'view:View encrypted file'
+  )
+  
+  _arguments -s : $nul_args && ret=0
+  _describe -t commands 'ansible-vault command' commands && ret=0
+}
+
+_ansible-vault-command(){
+  args=(
+    '--debug[enable debugging]' \
+    '--vault-password-file[vault password file]:password_file:_files'
+    $nul_args
+    "1::file_name:_files"
+  )
+  _arguments -s : $args && ret=0
+}
+
+_ansible-vault() {
+  local -a nul_args
+  nul_args=(
+    '(-h --help)'{-h,--help}'[show help message and exit.]'
+  )
+  
+  local curcontext=$curcontext ret=1
+  
+  if ((CURRENT == 2)); then
+    _ansible-vault-commands
+  else
+    shift words
+    (( CURRENT -- ))
+    curcontext="${curcontext%:*:*}:ansible-vault-$words[1]:"
+    _call_function ret _ansible-vault-command
+  fi
+}
+
+_ansible-vault "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_archlinux-java b/zsh/modules/completion/external/src/_archlinux-java
new file mode 100644
index 0000000..a497f76
--- /dev/null
+++ b/zsh/modules/completion/external/src/_archlinux-java
@@ -0,0 +1,85 @@
+#compdef archlinux-java
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for archlinux-java a tool for selecting default Java runtime (https://wiki.archlinux.org/index.php/java).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_archlinux-java_command_arguments() {
+  case $words[1] in
+    (set)
+      local java_versions=("${(@f)$(archlinux-java status | tail -n +2 | tr -s ' ' | cut -d ' ' -f2)}")
+      _describe -t output 'Downloads to delete' java_versions
+    ;;
+  esac
+}
+
+_archlinux-java() {
+  local -a commands
+
+  commands=(
+    "status:List installed Java environments and enabled one"
+    "get:Return the short name of the Java environment set as default"
+    "set:Force <JAVA_ENV> as default"
+    "unset:Unset current default Java environment"
+    "fix:Fix an invalid/broken default Java environment configuration"
+    "help:Show help"
+  )
+
+  _arguments -C \
+    '1:cmd:->cmds' \
+    '*:: :->args' \
+
+  case "$state" in
+    (cmds)
+      _describe -t commands 'commands' commands
+      ;;
+    (*)
+      _archlinux-java_command_arguments
+      ;;
+  esac
+}
+
+_archlinux-java
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_artisan b/zsh/modules/completion/external/src/_artisan
new file mode 100644
index 0000000..1104a20
--- /dev/null
+++ b/zsh/modules/completion/external/src/_artisan
@@ -0,0 +1,63 @@
+#compdef artisan
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for artisan (http://laravel.com/docs/artisan).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * loranger (https://github.com/loranger)
+#  * Yohan Tambè (https://github.com/Cronos87)
+#
+# ------------------------------------------------------------------------------
+
+
+_artisan_get_command_list () {
+    IFS=" "
+    php artisan --no-ansi | \
+        sed "1,/Available commands/d" | \
+        awk '/ [a-z]+/ { print $1 }' | \
+        sed -E 's/^[ ]+//g' | \
+        sed -E 's/[:]+/\\:/g' | \
+        sed -E 's/[ ]{2,}/\:/g'
+}
+
+_artisan () {
+    if [ -f artisan ]; then
+        local -a commands
+        IFS=$'\n'
+        commands=(`_artisan_get_command_list`)
+        _describe 'commands' commands
+    fi
+}
+
+compdef _artisan php artisan
+compdef _artisan artisan
diff --git a/zsh/modules/completion/external/src/_atach b/zsh/modules/completion/external/src/_atach
new file mode 100644
index 0000000..5da9633
--- /dev/null
+++ b/zsh/modules/completion/external/src/_atach
@@ -0,0 +1,71 @@
+#compdef atach
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for atach (https://github.com/sorin-ionescu/atach).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local state mode_values existing_sessions ret=1
+
+mode_values=(
+  "none:disable redrawing"
+  "ctrl_l:use ctrl + l to redraw"
+  "winch:use sigwinch to redraw"
+)
+
+existing_sessions=($(_call_program session atach))
+
+_arguments -C -s -S \
+  '(--list -l)'{--list,-l}'[list sessions]' \
+  '(--sockets -L)'{--sockets,-L}'[list sockets]' \
+  '(--session -s)'{--session=,-s+}'[set the session name]:session' \
+  '(--char -c)'{--char=,-c+}'[set the detach character (default: ^\\)]:char' \
+  '(--redraw -r)'{--redraw=,-r+}'[set the redraw method (none, ctrl_l, or winch)]:mode:->mode' \
+  '(--detached -d)'{--detached,-d}'[start the session detached]' \
+  '(--no-detach -D)'{--no-detach,-D}'[disable detaching]' \
+  '(--no-suspend -Z)'{--no-suspend,-Z}'[disable suspending]' \
+  '(--version -v)'{--version,-v}'[display version and copyright]' \
+  '(--help -h)'{--help,-h}'[display help]' \
+  '(-)::args:->session-or-command' && ret=0
+
+case "$state" in
+  (mode)
+    _describe -t mode 'redraw mode' mode_values && ret=0
+  ;;
+  (session-or-command)
+    _describe -t 'session' 'sessions' existing_sessions && ret=0
+    _path_commands && ret=0
+  ;;
+esac
+
+return $ret
+
diff --git a/zsh/modules/completion/external/src/_bower b/zsh/modules/completion/external/src/_bower
new file mode 100644
index 0000000..0daa978
--- /dev/null
+++ b/zsh/modules/completion/external/src/_bower
@@ -0,0 +1,172 @@
+#compdef bower
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Bower (http://bower.io).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Joe Lencioni (https://github.com/lencioni)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext="$curcontext" state line _packages _opts ret=1
+
+_arguments -C -A "-v" -A "--version" \
+  '(- 1 *)'{-v,--version}'[display version information]' \
+  '1: :->cmds' \
+  '*:: :->args' && ret=0
+
+case $state in
+  cmds)
+    _values "bower command" \
+      "cache[Manage bower cache]" \
+      "help[Display help information about Bower]" \
+      "home[Opens a package homepage into your favorite browser]" \
+      "info[Info of a particular package]" \
+      "init[Interactively create a bower.json file]" \
+      "install[Install a package locally]" \
+      "link[Symlink a package folder]" \
+      "list[List local packages - and possible updates]" \
+      "login[Authenticate with GitHub and store credentials]" \
+      "lookup[Look up a package URL by name]" \
+      "prune[Removes local extraneous packages]" \
+      "register[Register a package]" \
+      "search[Search for a package by name]" \
+      "update[Update a local package]" \
+      "uninstall[Remove a local package]" \
+      "unregister[Remove a package from the registry]" \
+      "version[Bump a package version]"
+    _arguments \
+      '(--force)--force[Makes various commands more forceful]' \
+      '(--json)--json[Output consumable JSON]' \
+      '(--log-level)--log-level[What level of logs to report]' \
+      '(--offline)--offline[Do not hit the network]' \
+      '(--quiet)--quiet[Only output important information]' \
+      '(--silent)--silent[Do not output anything, besides errors]' \
+      '(--verbose)--verbose[Makes output more verbose]' \
+      '(--allow-root)--allow-root[Allows running commands as root]' \
+      '(--version)--version[Output Bower version]' \
+      '(--no-color)--no-color[Disable colors]'
+    ret=0
+    ;;
+  args)
+    case $line[1] in
+      help)
+        _values 'commands' \
+          'cache' \
+          'home' \
+          'info' \
+          'init' \
+          'install' \
+          'link' \
+          'list' \
+          'login' \
+          'lookup' \
+          'prune' \
+          'register' \
+          'search' \
+          'update' \
+          'uninstall' \
+          'unregister' \
+          'version'
+        ret=0
+        ;;
+      (home|info|init|link|lookup|prune|register|search|unregister)
+        _arguments \
+          '(--help)--help[Show help message]'
+        ret=0
+        ;;
+      install)
+        _arguments \
+          '(--force-latest)--force-latest[Force latest version on conflict]' \
+          '(--help)--help[Show help message]' \
+          '(--production)--production[Do not install project devDependencies]' \
+          '(--save)--save[Save installed packages into the project''s bower.json dependencies]' \
+          '(--save-dev)--save-dev[Save installed packages into the project''s bower.json devDependencies]'
+        ret=0
+        ;;
+      list)
+        _arguments \
+          '(--help)--help[Show help message]' \
+          '(--paths)--paths[Generate a simple JSON source mapping]' \
+          '(--relative)--relative[Make paths relative to the directory config property, which defaults to bower_components]'
+        ret=0
+        ;;
+      login)
+        _arguments \
+          '(--help)--help[Show help message]' \
+          '(-t --token)'{-t,--token}'[Pass GitHub auth token (will not prompt for username/password)]'
+        ret=0
+        ;;
+      uninstall)
+        _arguments \
+          '(--help)--help[Show help message]' \
+          '(--save)--save[Save installed packages into th projects''s bower.json dependencies]' \
+          '(--save-dev)--save-dev[Save installed packages into th projects''s bower.json devDependencies]'
+        ret=0
+        ;;
+      update)
+        _arguments \
+          '(--force-latest)--force-latest[Force latest version on conflict]' \
+          '(--help)--help[Show help message]' \
+          '(--production)--production[Do not install project devDependencies]'
+        ret=0
+        ;;
+      version)
+        _arguments \
+          '(--message)--message[Custom git commit and tag message]'
+        ret=0
+        ;;
+      exec)
+        _normal && ret=0
+        ;;
+      *)
+        _opts=(  $(bower help $line[1] | sed -e '/^  \[-/!d; s/^  \[\(-[^=]*\)=.*/\1/') )
+        _opts+=( $(bower help $line[1] | sed -e '/^  -/!d; s/^  \(-.\), \[\(-[^=]*\)=.*/\1 \2/') )
+        if [[ $_opts != "" ]]; then
+          _values 'options' $_opts && ret=0
+        fi
+        ;;
+    esac
+    ;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_bundle b/zsh/modules/completion/external/src/_bundle
new file mode 100644
index 0000000..a630918
--- /dev/null
+++ b/zsh/modules/completion/external/src/_bundle
@@ -0,0 +1,129 @@
+#compdef bundle
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Bundler (http://gembundler.com).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Bruno Michel (https://github.com/nono)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext="$curcontext" state line _gems _opts ret=1
+
+_arguments -C -A "-v" -A "--version" \
+	'(- 1 *)'{-v,--version}'[display version information]' \
+	'1: :->cmds' \
+	'*:: :->args' && ret=0
+
+case $state in
+	cmds)
+		_values "bundle command" \
+			"install[Install the gems specified by the Gemfile or Gemfile.lock]" \
+			"update[Update dependencies to their latest versions]" \
+			"package[Package the .gem files required by your application]" \
+			"exec[Execute a script in the context of the current bundle]" \
+			"config[Specify and read configuration options for bundler]" \
+			"check[Determine whether the requirements for your application are installed]" \
+			"list[Show all of the gems in the current bundle]" \
+			"show[Show the source location of a particular gem in the bundle]" \
+			"console[Start an IRB session in the context of the current bundle]" \
+			"open[Open an installed gem in the editor]" \
+			"viz[Generate a visual representation of your dependencies]" \
+			"init[Generate a simple Gemfile, placed in the current directory]" \
+			"gem[Create a simple gem, suitable for development with bundler]" \
+			"help[Describe available tasks or one specific task]" \
+			"platform[Displays platform compatibility information]" \
+			"outdated[Show all of the outdated gems in the current bundle]"
+		ret=0
+		;;
+	args)
+		case $line[1] in
+			help)
+				_values 'commands' 'install' 'update' 'package' 'exec' 'config' 'check' 'list' 'show' 'console' 'open' 'viz' 'init' 'gem' 'help' 'platform' 'outdated' && ret=0
+				;;
+			install)
+				_policies=('HighSecurity' 'MediumSecurity' 'LowSecurity' 'AlmostNoSecurity' 'NoSecurity')
+				_arguments \
+					'(--no-color)--no-color[disable colorization in output]' \
+					'(--local)--local[do not attempt to connect to rubygems.org]' \
+					'(--quiet)--quiet[only output warnings and errors]' \
+					'(--gemfile)--gemfile=-[use the specified gemfile instead of Gemfile]:gemfile' \
+					'(--system)--system[install to the system location]' \
+					'(--deployment)--deployment[install using defaults tuned for deployment environments]' \
+					'(--frozen)--frozen[do not allow the Gemfile.lock to be updated after this install]' \
+					'(--path)--path=-[specify a different path than the system default]:path:_files' \
+					'(--binstubs)--binstubs=-[generate bin stubs for bundled gems to ./bin]:directory:_files' \
+					'(--without)--without=-[exclude gems that are part of the specified named group]:groups' \
+					'(--with)--with=-[include gems that are part of the specified named group]:groups' \
+					'(--clean)--clean[remove any gems not present in the current Gemfile]' \
+					'(--full-index)--full-index[download and cache the index file of all gems]' \
+					'(--jobs)--jobs=-[install gems parallely]:number' \
+					'(--force)--force[force download every gem]' \
+					'(--no-cache)--no-cache[do not update the cache in vendor/cache with newly installed gems]' \
+					'(--no-prune)--no-prune[do not remove stale gem from cache after installation]' \
+					'(--retry)--retry=-[number of times to retry failed network or git requests]:number' \
+					'(--sheband)--shebang=-[specify ruby executable to execute scripts]:ruby' \
+					'(--standalone)--standalone=-[create standalone bundles]:groups' \
+					"(--trust-policy)--trust-policy=-[apply the Rubygems security policy]:arg:($_policies)"
+				ret=0
+				;;
+			exec)
+				_normal && ret=0
+				;;
+			(open|show)
+				_gems=( $(bundle show 2> /dev/null | sed -e '/^  \*/!d; s/^  \* \([^ ]*\) .*/\1/') )
+				if [[ $_gems != "" ]]; then
+					_values 'gems' $_gems && ret=0
+				fi
+				;;
+			*)
+				_opts=(  $(bundle help $line[1] | sed -e '/^  \[-/!d; s/^  \[\(-[^=]*\)=.*/\1/') )
+				_opts+=( $(bundle help $line[1] | sed -e '/^  -/!d; s/^  \(-.\), \[\(-[^=]*\)=.*/\1 \2/') )
+				if [[ $_opts != "" ]]; then
+					_values 'options' $_opts && ret=0
+				fi
+				;;
+		esac
+		;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_cap b/zsh/modules/completion/external/src/_cap
new file mode 100644
index 0000000..a9a8fe5
--- /dev/null
+++ b/zsh/modules/completion/external/src/_cap
@@ -0,0 +1,81 @@
+#compdef cap
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Capistrano (http://capify.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Bruno Michel (https://github.com/nono)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+	{-d,--debug}'[Prompts before each remote command execution]' \
+    {-e,--explain}'[Displays help (if available) for the task]:task' \
+    {-F,--default-config}'[Always use default config, even with -f]' \
+    {-f,--file}'[A recipe file to load. May be given more than once]:file:_files' \
+    {-H,--long-help}'[Explain these options and environment variables]' \
+    {-h,--help}'[Display this help message]' \
+    {-l,--logger}'[Choose logger method. STDERR used by default]:file:_files' \
+    {-n,--dry-run}'[Prints out commands without running them]' \
+    {-p,--password}'[Immediately prompt for the password]' \
+    {-q,--quiet}'[Make the output as quiet as possible]' \
+    {-r,--preserve-roles}'[Preserve task roles]' \
+    {-S,--set-before}'[Set a variable before the recipes are loaded]:variable' \
+    {-s,--set}'[Set a variable after the recipes are loaded]:variable' \
+    {-T,--tasks}'[List all tasks (matching optional PATTERN) in the loaded recipe files]:pattern' \
+    {-t,--tool}'[Abbreviates the output of -T for tool integration]' \
+    {-V,--version}'[Display the Capistrano version, and exit]' \
+    {-v,--verbose}'[Be more verbose. May be given more than once]' \
+    {-X,--skip-system-config}'[Do not load the system config file (capistrano.conf)]' \
+    {-x,--skip-user-config}'[Do not load the user config file (.caprc)]' \
+	'*: :->cmds' && ret=0
+
+case $state in
+	cmds)
+		cmds=( ${(f)"$(_call_program commands cap -T 2> /dev/null | sed -e '/ # /!d; s/:/\\:/g; s/cap \([A-Za-z0-9\\:_-]*\) .*# /\1:/')"} )
+		_describe -t commands 'cap command' cmds && ret=0
+		;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_cask b/zsh/modules/completion/external/src/_cask
new file mode 100644
index 0000000..b2ba82a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_cask
@@ -0,0 +1,89 @@
+#compdef cask
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# Completion script for cask (http://cask.readthedocs.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * ptrv <mail@petervasil.net>
+# * Johan Andersson <johan.rejeep@gmail.com>
+# * Sebastien Duthil <duthils@free.fr>
+#
+# ------------------------------------------------------------------------------
+
+function _cask() {
+  local ret=1 state
+  _arguments \
+    ':subcommand:->subcommand' \
+    '*:: :->subcmds' && ret=0
+
+  case $state in
+    subcommand)
+      subcommands=(
+        "build:build all Elisp files in the files directive"
+        "clean-elc:remove all byte compiled Elisp files in the files directive"
+        "exec:execute command with correct 'exec-path' and 'load-path'"
+        "exec-path:print 'exec-path' for all packages and dependencies"
+        "files:print list of files specified in the files directive"
+        "help:display usage information or documentation for specified command"
+        "info:show info about the current package"
+        "init:initialize the current directory with a Cask-file"
+        "install:install all packages specified in the Cask-file"
+        "link:manage links"
+        "list:list dependencies"
+        "load-path:print 'load-path' for all packages and dependencies"
+        "outdated:print list of outdated packages"
+        "package:build package and put in specified directory (default: dist)"
+        "package-directory:print current package installation directory"
+        "path:print 'exec-path' for all packages and dependencies"
+        "pkg-file:write a 'define-package' file"
+        "update:update package version"
+        "upgrade-cask:upgrade Cask itself and its dependencies"
+        "upgrade:upgrade Cask itself and its dependencies"
+        "version:print program version"
+      )
+      _describe -t subcommands 'cask subcommands' subcommands && ret=0
+  esac
+
+  case "$words[1]" in
+    init)
+      _arguments \
+        '(--dev)--dev[Run in dev mode]' && ret=0 ;;
+    exec)
+      _generic
+      ;;
+  esac
+
+  return ret
+}
+
+_cask "$@"
diff --git a/zsh/modules/completion/external/src/_cf b/zsh/modules/completion/external/src/_cf
new file mode 100644
index 0000000..344dae8
--- /dev/null
+++ b/zsh/modules/completion/external/src/_cf
@@ -0,0 +1,958 @@
+#compdef cf
+# ------------------------------------------------------------------------------
+#
+# Copyright 2015 Ferran Rodenas & Danny Rosen
+#
+# 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.
+#
+# ------------------------------------------------------------------------------
+#
+# Description
+# -----------
+#
+#  Completion script for Cloud Foundry CLI (https://github.com/cloudfoundry/cli#downloads)
+#
+# ------------------------------------------------------------------------------
+#
+# Authors
+# -------
+#
+#  * Ferran Rodenas (https://github.com/frodenas)
+#  * Danny Rosen (https://github.com/dannyzen)
+#
+# ------------------------------------------------------------------------------
+
+# ----------------------
+# ----- Helper functions
+# ----------------------
+
+# Output a selectable list of organizations
+__cf_orgs() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf orgs | awk 'NR>3{print $1}'))
+    if [[ 'X$cont_cmd' != 'X' ]]
+        _describe 'ORG' cont_cmd
+}
+
+# Output a selectable list of spaces
+__cf_spaces() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf spaces | awk 'NR>3{print $1}'))
+    if [[ 'X$cont_cmd' != 'X' ]]
+        _describe 'SPACE' cont_cmd
+}
+
+# Output a selectable list of applications
+__cf_apps() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf apps | awk 'NR>4{print $1}'))
+    if [[ 'X$cont_cmd' != 'X' ]]
+        _describe 'APP' cont_cmd
+}
+
+# Output a selectable list of stacks
+__cf_stacks() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf stacks | awk 'NR>4{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'STACK' cont_cmd
+}
+
+# Output a selectable list of services
+__cf_marketplace_services() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf marketplace | awk 'NR>4{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'SERVICE' cont_cmd
+}
+
+# Output a selectable list of services
+__cf_services() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf services | awk 'NR>4{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'SERVICE' cont_cmd
+}
+
+# Output a selectable list of domains
+__cf_domains() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf domains | grep -v shared | awk 'NR>2{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'DOMAIN' cont_cmd
+}
+
+# Output a selectable list of shared domains
+__cf_shared_domains() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf domains | grep -v owned | awk 'NR>2{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'SHARED-DOMAIN' cont_cmd
+}
+
+# Output a selectable list of hostnames
+__cf_hostnames() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf routes | awk 'NR>3{print $2}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'ROUTE' cont_cmd
+}
+
+# Output a selectable list of buildpacks
+__cf_buildpacks() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf buildpacks | awk 'NR>3{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'BUILDPACK' cont_cmd
+}
+
+# Output a selectable list of feature flags
+__cf_feature_flags() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf feature-flags | awk 'NR>4{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'FEATURE-FLAG' cont_cmd
+}
+
+# Output a selectable list of plugin repos
+__cf_repo_plugins() {
+    declare -a cont_cmd
+    cont_cmd=($(CF_COLOR=false CF_TRACE=false cf list-plugin-repos | awk 'NR>3{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'REPO-PLUGIN' cont_cmd
+}
+
+# Output a selectable list of plugins
+__cf_plugins() {
+    declare -a cont_cmd
+    cont_cmd=($(cf plugins | awk 'NR>4{print $1}'))
+    if [[  'X$cont_cmd' != 'X' ]]
+        _describe 'PLUGIN' cont_cmd
+}
+
+# --------------------------
+# ----- end Helper functions
+# --------------------------
+
+# --------------
+# ----- Commands
+# --------------
+
+__login() {
+  _arguments \
+    '-a=[API endpoint (e.g. https://api.example.com)]:api endpoint:' \
+    '-u=[Username]:username:' \
+    '-p=[Password]:password:' \
+    '-o=[Organization]:organization name:' \
+    '-s=[Space]:space name:' \
+    '--sso[Use a one-time password to login]' \
+    '--skip-ssl-validation[Skip SSL validation]'
+}
+
+__logout() {
+    # no arguments
+}
+
+__passwd() {
+  _arguments \
+    '1:password:'
+}
+
+__target() {
+  _arguments \
+    '-o=[Organization]:organization name:__cf_orgs' \
+    '-s=[Space]:space name:__cf_spaces'
+}
+
+__api() {
+  _arguments \
+    '1:API url:' \
+    '--unset[Remove all api endpoint targeting]' \
+    '--skip-ssl-validation[Skip SSL validation]'
+}
+
+__auth() {
+  # no arguments
+}
+
+__apps() {
+  # no arguments
+}
+
+__app() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '--guid[Retrieve and display the given app guid. All other health and status output for the app is suppressed]'
+}
+
+__push() {
+  _arguments \
+    '1:application name:' \
+    '-b=[Custom buildpack by name (e.g. my-buildpack) or GIT URL or GIT BRANCH URL]' \
+    '-c=[Startup command, set to null to reset to default start command]:startup command:' \
+    '-d=[Domain (e.g. example.com)]:domain (e.g. example.com):__cf_domains' \
+    '-f=[Path to manifest]:file:_files:' \
+    '-i=[Number of instances]:number of instances:' \
+    '-k=[Disk limit (e.g. 256M, 1024M, 1G)]:disk limit (e.g. 256M, 1024M, 1G):' \
+    '-m=[Memory limit (e.g. 256M, 1024M, 1G)]:memory limit (e.g. 256M, 1024M, 1G):' \
+    '-n=[Hostname (e.g. my-subdomain)]:hostname (e.g. my-subdomain):' \
+    '-p=[Path to app directory or to a zip file of the contents of the app directory]:file:_files' \
+    '-s=[Stack to use (a stack is a pre-built file system, including an operating system, that can run apps)]:stack name:__cf_stacks:' \
+    '-t=[Maximum time (in seconds) for CLI to wait for application start, other server side timeouts may apply]:maximum time (in seconds):' \
+    '--no-hostname[Map the root domain to this app]' \
+    '--no-manifest[Ignore manifest file]' \
+    '--no-route[Do not map a route to this app and remove routes from previous pushes of this app]' \
+    '--no-start[Do not start an app after pushing]' \
+    '--random-route[Create a random route for this app]'
+}
+
+__scale() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '-i=[Number of instances]:number of instances:' \
+    '-k=[Disk limit (e.g. 256M, 1024M, 1G)]:disk limit (e.g. 256M, 1024M, 1G):' \
+    '-m=[Memory limit (e.g. 256M, 1024M, 1G)]:memory limit (e.g. 256M, 1024M, 1G):' \
+    '-f[Force restart of app without prompt]'
+}
+
+__delete() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '--f[Force deletion without confirmation]' \
+    '--r[Also delete any mapped routes]'
+}
+
+__rename() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:application name:'
+}
+
+__start() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__stop() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__restart() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__restage() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__restart-app-instance() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:application index:'
+}
+
+__events() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__files() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2::path:' \
+    '-i=[instance]'
+}
+
+__logs() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '--recent[Dump recent logs instead of tailing]'
+}
+
+__env() {
+  _arguments \
+    '1:application name:__cf_apps'
+}
+
+__set-env() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:env var name:' \
+    '3:env var value:'
+}
+
+__unset-env() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:env var name:'
+}
+
+__stacks() {
+  # no arguments
+}
+
+__stack() {
+  _arguments \
+    '1:stack name:__cf_stacks' \
+    '--guid[Retrieve and display the given stack guid. All other output for the stack is suppressed]'
+}
+
+__copy-source() {
+  _arguments \
+    '1:source application name:__cf_apps' \
+    '2:target application name:' \
+    '-o=[Org that contains the target application]:organization name:__cf_orgs' \
+    '-s=[Space that contains the target application]:space name:__cf_spaces' \
+    '--no-restart[Override restart of the application in target environment after copy-source completes]'
+}
+
+__create-app-manifest() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '-p=[Specify a path for file creation. If path not specified, manifest file is created in current working directory]:path:_files'
+}
+
+__marketplace() {
+  _arguments \
+    '-s=[Show plan details for a particular service offering]'
+}
+
+__services() {
+  # no arguments
+}
+
+__service() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '--guid[Retrieve and display the given service guid. All other output for the service is suppressed]'
+}
+
+__create-service() {
+  _arguments \
+    '1:service:__cf_marketplace_services' \
+    '2:plan:' \
+    '3:service name:' \
+    '-c=[Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file]' \
+    '-t=[User provided tags]'
+}
+
+__update-service() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '-p=[Change service plan for a service instance]' \
+    '-c=[Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file]' \
+    '-t=[User provided tags]'
+}
+
+__rename-service() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '2:service name:'
+}
+
+__delete-service() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '-f[Force deletion without confirmation]'
+}
+
+__create-service-key() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '2:service key:' \
+    '-c=[Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file]'
+}
+
+__service-keys() {
+  _arguments \
+    '1:service name:__cf_services'
+}
+
+__service-key() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '2:service key:'
+}
+
+__delete-service-key() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '2:service key:' \
+    '-f[Force deletion without confirmation]'
+}
+
+__bind-service() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:service name:__cf_services' \
+    '-c=[Valid JSON object containing service-specific configuration parameters, provided either in-line or in a file]'
+}
+
+__unbind-service() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:service name:__cf_services'
+}
+
+__create-user-provided-service() {
+  _arguments \
+    '1:service name:' \
+    '-p=[Credentials]' \
+    '-l=[Syslog Drain Url]'
+}
+
+__update-user-provided-service() {
+  _arguments \
+    '1:service name:__cf_services' \
+    '-p=[Credentials]' \
+    '-l=[Syslog Drain Url]'
+}
+
+__orgs() {
+  # no arguments
+}
+
+__org() {
+  _arguments \
+    '1:organization name:__cf_orgs' \
+    '--guid[Retrieve and display the given org guid. All other output for the org is suppressed]'
+}
+
+__create-org() {
+  _arguments \
+    '1:organization name:' \
+    '-q=[Quota to assign to the newly created org (excluding this option results in assignment of default quota)]'
+}
+
+__delete-org() {
+  _arguments \
+    '1:organization name:__cf_orgs' \
+    '-f[Force deletion without confirmation]'
+}
+
+__spaces() {
+    # no arguments
+}
+
+__space() {
+  _arguments \
+    '1:space name:__cf_spaces' \
+    '--guid[Retrieve and display the given space guid. All other output for the space is suppressed]' \
+    '--security-group-rules[Retrive the rules for all the security groups associated with the space]'
+}
+
+__create-space() {
+  _arguments \
+    '1:space name:' \
+    '-o=[Org that contains the target application]:organization name:__cf_orgs' \
+    '-q=[Quota to assign to the newly created space (excluding this option results in assignment of default quota)]'
+}
+
+__delete-space() {
+  _arguments \
+    '1:space name:__cf_spaces' \
+    '-f[Force deletion without confirmation]'
+}
+
+__domains() {
+  # no arguments
+}
+
+__create-domain() {
+  _arguments \
+    '1:organization name:__cf_orgs' \
+    '2:domain:'
+}
+
+__delete-domain() {
+  _arguments \
+    '1:domain:__cf_domains' \
+    '-f[Force deletion without confirmation]'
+}
+
+__create-shared-domain() {
+  _arguments \
+    '1:domain:'
+}
+
+__delete-shared-domain() {
+  _arguments \
+    '1:domain:__cf_shared_domains' \
+    '-f[Force deletion without confirmation]'
+}
+
+__routes() {
+  _arguments \
+    '--orglevel[List all the routes for all spaces of current organization]'
+}
+
+__create-route() {
+  _arguments \
+    '1:space name:__cf_spaces' \
+    '2:domain:__cf_domains' \
+    '-n=[Hostname]'
+}
+
+__check-route() {
+  _arguments \
+    '1:hostname:__cf_hostnames' \
+    '2:domain:__cf_domains'
+}
+
+__map-route() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:domain:__cf_domains' \
+    '-n=[Hostname]:hostname:__cf_hostnames:'
+}
+
+__unmap-route() {
+  _arguments \
+    '1:application name:__cf_apps' \
+    '2:domain:__cf_domains' \
+    '-n=[Hostname]:hostname:__cf_hostnames:'
+}
+
+__delete-route() {
+  _arguments \
+    '1:domain:__cf_domains' \
+    '-n=[Hostname]:hostname:__cf_hostnames:' \
+    '-f[Force deletion without confirmation]'
+}
+
+__delete-orphaned-routes() {
+  _arguments \
+    '-f[Force deletion without confirmation]'
+}
+
+__buildpacks() {
+  # no arguments
+}
+
+__create-buildpack() {
+  _arguments \
+    '1:buildpack name:' \
+    '2:path:_files' \
+    '3:position:' \
+    '--enable[Enable the buildpack to be used for staging]' \
+    '--disable[Disable the buildpack from being used for staging]'
+}
+
+__update-buildpack() {
+  _arguments \
+    '1:buildpack name:__cf_buildpacks' \
+    '-p=[Path to directory or zip file]:file:_files' \
+    '-i=[The order in which the buildpacks are checked during buildpack auto-detection]' \
+    '--enable[Enable the buildpack to be used for staging]' \
+    '--disable[Disable the buildpack from being used for staging]' \
+    '--lock[Lock the buildpack to prevent updates]' \
+    '--unlock[Unlock the buildpack to enable updates]'
+}
+
+__rename-buildpack() {
+  _arguments \
+    '1:buildpack name:__cf_buildpacks' \
+    '2:new buildpack name:'
+}
+
+__delete-buildpack() {
+  _arguments \
+    '1:buildpack name:__cf_buildpacks' \
+    '-f[Force deletion without confirmation]'
+}
+
+__running-environment-variable-group() {
+  # no arguments
+}
+
+__staging-environment-variable-group() {
+  # no arguments
+}
+
+__set-staging-environment-variable-group() {
+  # no arguments
+}
+
+__set-running-environment-variable-group() {
+  # no arguments
+}
+
+__feature-flags() {
+  # no arguments
+}
+
+__feature-flag() {
+  _arguments \
+    '1:feature name:__cf_feature_flags'
+}
+
+__enable-feature-flag() {
+  _arguments \
+    '1:feature name:__cf_feature_flags'
+}
+
+__disable-feature-flag() {
+  _arguments \
+    '1:feature name:__cf_feature_flags'
+}
+
+__curl() {
+  _arguments \
+    '1:path:' \
+    '-i[Include response headers in the output]' \
+    '-v[Enable CF_TRACE output for all requests and responses]' \
+    '-X=[HTTP method]:http method:(GET POST PUT DELETE)' \
+    '-h=[Custom headers to include in the request, flag can be specified multiple times]' \
+    '-d=[HTTP data to include in the request body]' \
+    '--output[Write curl body to FILE instead of stdout]'
+}
+
+__config() {
+  _arguments \
+    '--async-timeout=[Timeout for async HTTP requests]' \
+    '--trace=[Trace HTTP requests]:trace:(true false)' \
+    '--color=[Enable or disable color]:color:(true false)' \
+    '--locale=[Set default locale. If LOCALE is CLEAR, previous locale is deleted]'
+}
+
+__oauth-token() {
+  # no arguments
+}
+
+__add-plugin-repo() {
+  _arguments \
+    '1:repo name:' \
+    '2:url:'
+}
+
+__remove-plugin-repo() {
+  _arguments \
+    '1:repo name:__cf_repo_plugins' \
+    '2:url:'
+}
+
+__list-plugin-repos() {
+  # no arguments
+}
+
+__repo-plugins() {
+  _arguments \
+    '-r=[Repo Name]:repo name:__cf_repo_plugins'
+}
+
+__plugins() {
+  _arguments \
+    '-checksum[Compute and show the sha1 value of the plugin binary file]'
+}
+
+__install-plugin() {
+  _arguments \
+    '1:plugin URL or path:_files' \
+    '-r=[repo name where the plugin binary is located]:repo name:__cf_repo_plugins'
+}
+
+__uninstall-plugin() {
+  _arguments \
+    '1:plugin name:__cf_plugins'
+}
+
+# ------------------
+# ----- end Commands
+# ------------------
+
+# -------------------
+# ----- 1st Arguments
+# -------------------
+
+local -a _1st_arguments
+_1st_arguments=(
+  "login":"Log user in"
+  "logout":"Log user out"
+  "passwd":"Change user password"
+  "target":"Set or view the targeted org or space"
+  "api":"Set or view target api url"
+  "auth":"Authenticate user non-interactively"
+  "apps":"List all apps in the target space"
+  "app":"Display health and status for app"
+  "push":"Push a new app or sync changes to an existing app"
+  "scale":"Change or view the instance count, disk space limit, and memory limit for an app"
+  "delete":"Delete an app"
+  "rename":"Rename an app"
+  "start":"Start an app"
+  "stop":"Stop an app"
+  "restart":"Restart an app"
+  "restage":"Restage an app"
+  "restart-app-instance":"Terminate the running application Instance at the given index and instantiate a new instance of the application with the same index"
+  "events":"Show recent app events"
+  "files":"Print out a list of files in a directory or the contents of a specific file"
+  "logs":"Tail or show recent logs for an app"
+  "env":"Show all env variables for an app"
+  "set-env":"Set an env variable for an app"
+  "unset-env":"Remove an env variable"
+  "stacks":"List all stacks"
+  "stack":"Show information for a stack"
+  "copy-source":"Make a copy of app source code from one application to another.  Unless overridden, the copy-source command will restart the application"
+  "create-app-manifest":"Create an app manifest for an app that has been pushed successfully"
+  "marketplace":"List available offerings in the marketplace"
+  "services":"List all service instances in the target space"
+  "service":"Show service instance info"
+  "create-service":"Create a service instance"
+  "update-service":"Update a service instance"
+  "delete-service":"Delete a service instance"
+  "rename-service":"Rename a service instance"
+  "create-service-key":"Create key for a service instance"
+  "service-keys":"List keys for a service instance"
+  "service-key":"Show service key info"
+  "delete-service-key":"Delete a service key"
+  "bind-service":"Bind a service instance to an app"
+  "unbind-service":"Unbind a service instance from an app"
+  "create-user-provided-service":"Make a user-provided service instance available to cf apps"
+  "update-user-provided-service":"Update user-provided service instance name value pairs"
+  "orgs":"List all orgs"
+  "org":"Show org info"
+  "create-org":"Create an org"
+  "delete-org":"Delete an org"
+  "rename-org":"Rename an org"
+  "spaces":"List all spaces in an org"
+  "space":"Show space info"
+  "create-space":"Create a space"
+  "delete-space":"Delete a space"
+  "rename-space":"Rename a space"
+  "domains":"List domains in the target org"
+  "create-domain":"Create a domain in an org for later use"
+  "delete-domain":"Delete a domain"
+  "create-shared-domain":"Create a domain that can be used by all orgs (admin-only)"
+  "delete-shared-domain":"Delete a shared domain"
+  "routes":"List all routes in the current space or the current organization"
+  "create-route":"Create a url route in a space for later use"
+  "check-route":"Perform a simple check to determine whether a route currently exists or not"
+  "map-route":"Add a url route to an app"
+  "unmap-route":"Remove a url route from an app"
+  "delete-route":"Delete a route"
+  "delete-orphaned-routes":"Delete all orphaned routes (e.g.: those that are not mapped to an app)"
+  "buildpacks":"List all buildpacks"
+  "create-buildpack":"Create a buildpack"
+  "update-buildpack":"Update a buildpack"
+  "rename-buildpack":"Rename a buildpack"
+  "delete-buildpack":"Delete a buildpack"
+  "running-environment-variable-group":"Retrieve the contents of the running environment variable group"
+  "staging-environment-variable-group":"Retrieve the contents of the staging environment variable group"
+  "set-staging-environment-variable-group":"Pass parameters as JSON to create a staging environment variable group"
+  "set-running-environment-variable-group":"Pass parameters as JSON to create a running environment variable group"
+  "feature-flags":"Retrieve list of feature flags with status of each flag-able feature"
+  "feature-flag":"Retrieve an individual feature flag with status"
+  "enable-feature-flag":"Enable the use of a feature so that users have access to and can use the feature"
+  "disable-feature-flag":"Disable the use of a feature so that users have access to and can use the feature"
+  "curl":"Executes a raw request, content-type set to application/json by default"
+  "config":"write default values to the config"
+  "oauth-token":"Retrieve and display the OAuth token for the current session"
+  "add-plugin-repo":"Add a new plugin repository"
+  "remove-plugin-repo":"Remove a plugin repository"
+  "list-plugin-repos":"list all the added plugin repository"
+  "repo-plugins":"List all available plugins in all added repositories"
+  "plugins":"list all available plugin commands"
+  "install-plugin":"Install the plugin defined in command argument"
+  "uninstall-plugin":"Uninstall the plugin defined in command argument"
+)
+
+# -----------------------
+# ----- end 1st Arguments
+# -----------------------
+
+# ----------
+# ----- Main
+# ----------
+
+_arguments '*:: :->command'
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "cf command" _1st_arguments
+  return
+fi
+
+local -a _command_args
+case "$words[1]" in
+  login)
+    __login ;;
+  logout)
+    __logout ;;
+  passwd)
+    __passwd ;;
+  target)
+    __target ;;
+  api)
+    __api ;;
+  auth)
+    __auth ;;
+  apps)
+    __apps ;;
+  app)
+    __app ;;
+  push)
+    __push ;;
+  scale)
+    __scale ;;
+  delete)
+    __delete ;;
+  rename)
+    __rename ;;
+  start)
+    __start ;;
+  stop)
+    __stop ;;
+  restart)
+    __restart ;;
+  restage)
+    __restage ;;
+  restart-app-instance)
+    __restart-app-instance ;;
+  events)
+    __events ;;
+  files)
+    __files ;;
+  logs)
+    __logs ;;
+  env)
+    __env ;;
+  set-env)
+    __set-env ;;
+  unset-env)
+    __unset-env ;;
+  stacks)
+    __stacks ;;
+  stack)
+    __stack ;;
+  copy-source)
+    __copy-source ;;
+  create-app-manifest)
+    __create-app-manifest ;;
+  marketplace)
+    __marketplace ;;
+  services)
+    __services ;;
+  service)
+    __service ;;
+  create-service)
+    __create-service ;;
+  update-service)
+    __update-service ;;
+  rename-service)
+    __rename-service ;;
+  delete-service)
+    __delete-service ;;
+  create-service-key)
+    __create-service-key ;;
+  service-keys)
+    __service-keys ;;
+  service-key)
+    __service-key ;;
+  delete-service-key)
+    __delete-service-key ;;
+  bind-service)
+    __bind-service ;;
+  unbind-service)
+    __unbind-service ;;
+  create-user-provided-service)
+    __create-user-provided-service ;;
+  update-user-provided-service)
+    __update-user-provided-service ;;
+  orgs)
+    __orgs ;;
+  org)
+    __org ;;
+  create-org)
+    __create-org ;;
+  delete-org)
+    __delete-org ;;
+  spaces)
+    __spaces ;;
+  space)
+    __space ;;
+  create-space)
+    __create-space ;;
+  delete-space)
+    __delete-space ;;
+  domains)
+    __domains ;;
+  create-domain)
+    __create-domain ;;
+  delete-domain)
+    __delete-domain ;;
+  create-shared-domain)
+    __create-shared-domain ;;
+  delete-shared-domain)
+    __delete-shared-domain ;;
+  routes)
+    __routes ;;
+  create-route)
+    __create-route ;;
+  check-route)
+    __check-route ;;
+  map-route)
+    __map-route ;;
+  unmap-route)
+    __unmap-route ;;
+  delete-route)
+    __delete-route ;;
+  delete-orphaned-routes)
+    __delete-orphaned-routes ;;
+  buildpacks)
+    __buildpacks ;;
+  create-buildpack)
+    __create-buildpack ;;
+  update-buildpack)
+    __update-buildpack ;;
+  rename-buildpack)
+    __rename-buildpack ;;
+  delete-buildpack)
+    __delete-buildpack ;;
+  running-environment-variable-group)
+    __running-environment-variable-group ;;
+  staging-environment-variable-group)
+    __staging-environment-variable-group ;;
+  set-staging-environment-variable-group)
+    __set-staging-environment-variable-group ;;
+  set-running-environment-variable-group)
+    __set-running-environment-variable-group ;;
+  feature-flags)
+    __feature-flags ;;
+  feature-flag)
+    __feature-flag ;;
+  enable-feature-flag)
+    __enable-feature-flag ;;
+  disable-feature-flag)
+    __disable-feature-flag ;;
+  curl)
+    __curl ;;
+  config)
+    __config ;;
+  oauth-token)
+    __oauth-token ;;
+  add-plugin-repo)
+    __add-plugin-repo ;;
+  remove-plugin-repo)
+    __remove-plugin-repo ;;
+  list-plugin-repos)
+    __list-plugin-repos ;;
+  repo-plugins)
+    __repo-plugins ;;
+  plugins)
+    __plugins ;;
+  install-plugin)
+    __install-plugin ;;
+  uninstall-plugin)
+    __uninstall-plugin ;;
+esac
diff --git a/zsh/modules/completion/external/src/_chattr b/zsh/modules/completion/external/src/_chattr
new file mode 100644
index 0000000..072bb14
--- /dev/null
+++ b/zsh/modules/completion/external/src/_chattr
@@ -0,0 +1,77 @@
+#compdef chattr
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for chattr a tool to change file attributes on a Linux second extended file system. (http://e2fsprogs.sourceforge.net/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_chattr() {
+
+_arguments -C \
+   "-R[Recursively change attributes of directories and their contents.]" \
+   "-V[Be verbose with chattr's output and print the program version.]" \
+   "-f[Suppress most error messages.]" \
+   "-v[Set the file's version/generation number.]:version:" \
+   "(-A)+A[Disable atime updates]" \
+   "(+A)-A[Enable atime updates]" \
+   "(-a)+a[Enable append only - file cannot be overridden]" \
+   "(+a)-a[Disable append only - file can be overridden]" \
+   "(-c)+c[Enable automatic compression]" \
+   "(+c)-c[Disable automatic compression]" \
+   "(-D)+D[Enable synchronous directory updates]" \
+   "(+D)-D[Disable synchronous directory updates]" \
+   "(-d)+d[Forbid backing file up with dump program]" \
+   "(+d)-d[Allow backing file up with dump program]" \
+   "(-i)+i[Mark as immutable]" \
+   "(+i)-i[Unmark as immutable]" \
+   "(-j)+j[Enable ext3 journaling]" \
+   "(+j)-j[Disable ext3 journaling]" \
+   "(-s)+s[Enable secure deletion - zero all blocks on delete]" \
+   "(+s)-s[Disable secure deletion - do not zero all blocks on delete]" \
+   "(-S)+S[Enable synchronous updates]" \
+   "(+S)-S[Disable synchronous updates]" \
+   "(-T)+T[Set top of hierarchy - direct subdirectories are allocated independently]" \
+   "(+T)-T[Unset top of hierarchy]" \
+   "(-t)+t[Disable tail merging]" \
+   "(+t)-t[Enable tail merging]" \
+   "(-u)+u[Mark as undeletable - enable undeletion]" \
+   "(+u)-u[Unmark as undeletable - disable undeletion]" \
+   '*:files:_files' \
+}
+
+_chattr
+
diff --git a/zsh/modules/completion/external/src/_cheat b/zsh/modules/completion/external/src/_cheat
new file mode 100644
index 0000000..349249c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_cheat
@@ -0,0 +1,73 @@
+#compdef cheat
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Cheat an interactive cheatsheets on the command-line. (https://github.com/chrisallenlane/cheat/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+local cheats
+
+_cheat_load_cheats() {
+  cheats=("${(f)$(cheat -l | cut -d' ' -f1)}")
+}
+
+
+_cheat() {
+
+
+  _arguments -C -s -S -n \
+    '(- 1 *)'{-d,--directories}'[List directories on CHEATPATH]: :->full' \
+    '(- 1 *)'{-e,--edit}'[Edit cheatsheet]:cheat:->cheats' \
+    '(- 1 *)'{-l,--list}'[List cheatsheets]: :->full' \
+    '(- 1 *)'{-s,--search}'[Search cheatsheets for <keyword>]: :->full' \
+    '(- 1 *)'{-v,--version}'[display version and copyright information]: :->full' \
+
+    case "$state" in
+    (full)
+    ;;
+    (cheats)
+        _cheat_load_cheats
+        _describe -t cheats 'cheats' cheats
+    ;;
+    (*)
+        _cheat_load_cheats
+        _describe -t cheats 'cheats' cheats
+    ;;
+    esac
+}
+
+_cheat
+
diff --git a/zsh/modules/completion/external/src/_choc b/zsh/modules/completion/external/src/_choc
new file mode 100644
index 0000000..3ac8c59
--- /dev/null
+++ b/zsh/modules/completion/external/src/_choc
@@ -0,0 +1,60 @@
+#compdef choc
+# ------------------------------------------------------------------------------
+# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for choc (http://chocolatapp.com)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Nicholas Penree (https://github.com/drudge)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_arguments -C \
+  '(-a --async)'{-a,--async}'[do not wait for the user to close the file in Chocolat]' \
+  '(-w --wait)'{-w,--wait}'[wait for file to be closed by Chocolat]' \
+  '(-n --no-reactivation)'{-n,--no-reactivation}'[after editing with -w, do not reactivate the calling app]' \
+  '(-h --help)'{-h,--help}'[show help information]' \
+  '(-v --version)'{-v,--version}'[print version information]' \
+  '*:script or directory:_files' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_cmake b/zsh/modules/completion/external/src/_cmake
new file mode 100644
index 0000000..240c7ea
--- /dev/null
+++ b/zsh/modules/completion/external/src/_cmake
@@ -0,0 +1,427 @@
+#compdef cmake
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# -------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for CMake (http://www.cmake.org).
+#
+# -------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Scott M. Kroll <skroll@gmail.com> (initial version)
+#  * Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de> (handling of --build)
+#
+# -------------------------------------------------------------------------
+# Notes
+# -----
+#
+#   * By default only C and C++ languages are supported for compiler flag
+#     variables. To define your own list of languages:
+#
+#       cmake_langs=('C'   'C'
+#                    'CXX' 'C++')
+#       zstyle ':completion:*:cmake:*' languages $cmake_langs
+#
+# -------------------------------------------------------------------------
+
+local context state line curcontext="$curcontext" cmake_args
+
+local cmake_build_options;cmake_build_options=(
+    '-C[Pre-load a script to populate the cache]:script:_files'
+    '*-D-[Create a cmake cache entry]:property:_cmake_define_property'
+    '-U[Remove matching entries from CMake cache]:globbing expression'
+    '-G[Specify a makefile generator]:generator:_cmake_generators'
+    '-T[Specify toolset name if supported by generator]:toolset name'
+    '(-Wno-dev -Wdev)-Wno-dev[Suppress/Enable developer warnings]'
+    '(-Wno-dev -Wdev)-Wdev[Suppress/Enable developer warnings]'
+    '(-Wno-deprecated -Wdeprecated)-Wno-deprecated[Suppress/Enable deprecation warnings]'
+    '(-Wno-deprecated -Wdeprecated)-Wdeprecated[Suppress/Enable deprecation warnings]'
+    '(-Wno-error=dev -Werror=dev)-Wno-error=dev[Make developer warnings (not) errors]'
+    '(-Wno-error=dev -Werror=dev)-Werror=dev[Make developer warnings (not) errors]'
+    '(-Wno-error=deprecated -Werror=deprecated)-Werror=deprecated[Make deprecated macro and function warnings (not) errors]'
+    '(-Wno-error=deprecated -Werror=deprecated)-Wno-error=deprecated[Make deprecated macro and function warnings (not) errors]'
+    '--warn-uninitialized[Warn about uninitialized values.]'
+    '--warn-unused-vars[Warn about unused variables.]'
+    '--no-warn-unused-cli[Dont warn about command line options.]'
+    '-i[Run in wizard mode]'
+    '-L-[List cache variables]::_values "options" "[non-advanced cache variables]" "A[advanced cache variables]" "H[non-advanced cached variables with help]" "AH[advanced cache variables with help]"'
+    '--trace[Put cmake in trace mode]'
+    '--find-package[Run in pkg-config like mode.]'
+    ':cmake project:_files -/'
+)
+
+# ------------------------
+# _cmake_generator_options
+# ------------------------
+(( $+functions[_cmake_generator_options] )) ||
+_cmake_generator_options() {
+  if [ -f $1/Makefile ]
+  then
+    $_comps[make]
+  elif [ -f $1/build.ninja ]
+  then
+    $_comps[ninja]
+  fi
+}
+
+# --------------
+# _cmake_targets
+# --------------
+(( $+functions[_cmake_targets] )) ||
+_cmake_targets() {
+  local -a targets
+  if [ -f $1/Makefile ]
+  then
+    # `make help` doesn't work for Makefiles in general, but for cmake generated makefiles it does.
+    i=1
+    for target in $(make help | \grep -e "\.\.\." | sed "s/\.\.\. //" | sed "s/ (the default.*//") ; do
+      targets[$i]=$target
+      (( i = $i + 1 ))
+    done
+  elif [ -f $1/build.ninja ]
+  then
+    # `ninja help` doesn't seem to be the list of targets we're interested in
+    i=1
+    for target in $(ninja -C $1 -t targets all 2&>/dev/null | awk -F: '{print $1}') ; do
+      targets[$i]="$target"
+      (( i++ ))
+    done
+  fi
+  _describe 'build targets' targets
+}
+
+_cmake_on_build() {
+  local build_extras;build_extras=(
+    '--[Native build tool options]'
+    '--target[specify build target]'
+    '--clean-first[build target clean first]'
+    '--config[For multi-configuration tools]'
+    '--use-stderr')
+  local -a undescribed_build_extras
+  i=1
+  for be in $build_extras ; do
+    undescribed_build_extras[$i]=$(echo $be | sed "s/\[.*//")
+    (( i++ ))
+  done
+  inbuild=false
+  nativemode=false
+  for ((i = (($CURRENT - 1)); i > 1 ; i--)); do
+    if [[ $words[$i] == --build ]] ; then
+      inbuild=true
+      buildat=$i
+      (( difference = $CURRENT - $i ))
+    elif [[ $words[$i] == -- ]] ; then
+      nativemode=true
+    fi
+  done
+  # check if build mode has been left
+  outofbuild=false
+  for ((i = (($CURRENT - 1)); i > (($buildat + 1)); i--)); do
+    # don't check the word after --build (should be a directory)
+    if [[ ${undescribed_build_extras[(r)$words[$i]]} == $words[$i] ]] ; then continue ; fi
+    if [[ $words[(($i - 1))] == --target ]] ; then continue ; fi
+    if [[ $words[(($i - 1))] == --config ]] ; then continue ; fi
+    outofbuild=true
+  done
+  if [ "$nativemode" = true ] ; then
+    _cmake_generator_options $words[(($buildat + 1))] && return 0
+  fi
+  if [ "$inbuild" = false ] ; then
+    _arguments -C -s \
+      - build_opts \
+      "$cmake_build_options[@]" \
+      - build_cmds \
+      "$cmake_suggest_build[@]" && return 0
+  elif [ $difference -eq 1 ] ; then
+    # directly after --build comes the build directory
+    _alternative ':current directory:(.)' 'directory::_directories' && return 0
+  elif [[ $words[(($CURRENT - 1))] == --target ]] ; then
+    # after --build <dir> --target, suggest targets
+    _cmake_targets $words[(($buildat + 1))] && return 0
+  elif [[ $words[(($CURRENT - 1))] == --config ]] ; then
+    # after --build <dir> --config, no idea
+    return 0
+  elif [ "$outofbuild" = true ] ; then
+    # after --build <dir> --<not a --build option>, suggest other cmake_build_options (like -Wno-dev)
+    _arguments "$cmake_build_options[@]" && return 0
+  else
+    # after --build <dir>, suggest other cmake_build_options (like -Wno-dev) or --build options (like --clean-first)
+    _arguments "$build_extras[@]" "$cmake_build_options[@]" && return 0
+  fi
+}
+
+local cmake_help_actions;cmake_help_actions=(
+    '(- 1)--help-command[Print help for a single command and exit]:command-name:_cmake_command_names'
+    '(- 1)--help-command-list[List available listfile commands and exit]'
+    '(- 1)--help-commands[Print help for all commands and exit]'
+    '(- 1)--help-compatcommands[Print help for compatibility commands]'
+    '(- 1)--help-module[Print help for compatibility commands]:module-name:_cmake_module_names'
+    '(- 1)--help-module-list[Print help for a single module and exit]'
+    '(- 1)--help-modules[Print help for all modules and exit]'
+    '(- 1)--help-property[List available properties and exit]:property-name:_cmake_property_names'
+    '(- 1)--help-property-list[List available properties and exit]'
+    '(- 1)--help-properties[Print help for all properties and exit]'
+    '(- 1)--help-variable[Print help for a single variable and exit]:variable-name:_cmake_variable_names'
+    '(- 1)--help-variable-list[List documented variables and exit]'
+    '(- 1)--help-variables[Print help for all variables and exit]'
+    '(- 1)--copyright[Print the CMake copyright and exit]'
+    '(- 1)'{--help,-help,-usage,-h,-H}'[Print usage information and exit]'
+    '(- 1)--help-full[Print full help and exit]'
+    '(- 1)--help-html[Print full help in HTML format]'
+    '(- 1)--help-man[Print full help as a UNIX man page and exit]'
+    '(- 1)'{--version,-version}'[Print full help as a UNIX man page and exit]'
+)
+_cmake_help() {
+  _arguments -C -s - help "$cmake_help_actions[@]"
+}
+
+# -------------------
+# _cmake_command_names
+# -------------------
+(( $+functions[_cmake_command_names] )) ||
+_cmake_command_names() {
+  local command_names; command_names=(${(f)"$($service --help-command-list 2> /dev/null)"})
+  _values 'command name' ${command_names[@]:1} && return 0
+}
+
+# -----------------
+# _cmake_list_names
+# -----------------
+(( $+functions[_cmake_list_names] )) ||
+_cmake_list_names() {
+  local command; command="$@[1]"
+  local desc; desc="$@[2]"
+  local list_names; list_names=(${(f)"$($service $command 2> /dev/null | sed -e 's/\[/\\\[/' -e 's/\]/\\\]/')"})
+
+  _values ${desc} ${list_names[@]:1} && return 0
+}
+
+# ------------------
+# _cmake_module_names
+# ------------------
+(( $+functions[_cmake_module_names] )) ||
+_cmake_module_names() {
+  _cmake_list_names '--help-module-list' 'module name' && return 0
+}
+
+# --------------------
+# _cmake_property_names
+# --------------------
+(( $+functions[_cmake_property_names] )) ||
+_cmake_property_names() {
+  _cmake_list_names '--help-property-list' 'property name' && return 0
+}
+
+# ---------------------
+# _cmake_variable_names
+# ---------------------
+(( $+functions[_cmake_variable_names] )) ||
+_cmake_variable_names() {
+  _cmake_list_names '--help-variable-list' 'variable name' && return 0
+}
+
+# ----------------------
+# _cmake_define_property
+# ----------------------
+(( $+functions[_cmake_define_property] )) ||
+_cmake_define_property() {
+  if compset -P '*='; then
+    _wanted property-values expl 'property value' _cmake_define_property_values ${${IPREFIX%=}#-D} && return 0
+  else
+    _wanted property-names expl 'property name' _cmake_define_property_names -qS= && return 0
+  fi
+}
+
+# ----------------------------
+# _cmake_define_property_names
+# ----------------------------
+(( $+functions[_cmake_define_property_names] )) ||
+_cmake_define_property_names() {
+  local alternatives; alternatives=(
+    'common-property-names:common property name:_cmake_define_common_property_names -qS='
+  )
+  local -A cmake_langs
+  zstyle -a ":completion:${curcontext}:" languages cmake_langs
+  [[ $#cmake_langs -eq 0 ]] && cmake_langs=('C' 'C' 'CXX' 'C++')
+
+  for cmake_lang in ${(k)cmake_langs}; do
+    cmake_lang_desc="${cmake_langs[$cmake_lang]}"
+    alternatives+=("${cmake_lang//:/-}-property-names:${cmake_lang_desc} language property name:_cmake_define_lang_property_names -qS= ${cmake_lang} ${cmake_lang_desc}")
+  done
+
+  _alternative "${alternatives[@]}"
+}
+
+# ---------------------------------
+# _cmake_define_lang_property_names
+# ---------------------------------
+(( $+functions[_cmake_define_lang_property_names] )) ||
+_cmake_define_lang_property_names() {
+  local cmake_lang="$@[-2]" cmake_lang_desc="$@[-1]"
+  local properties; properties=(
+    "CMAKE_${cmake_lang}_COMPILER:${cmake_lang_desc} compiler"
+    "CMAKE_${cmake_lang}_FLAGS:${cmake_lang_desc} compiler flags for all builds"
+    "CMAKE_${cmake_lang}_FLAGS_DEBUG:${cmake_lang_desc} compiler flags for all Debug build"
+    "CMAKE_${cmake_lang}_FLAGS_RELEASE:${cmake_lang_desc} compiler flags for all Relase build"
+    "CMAKE_${cmake_lang}_FLAGS_MINSIZREL:${cmake_lang_desc} compiler flags for all MinSizRel build"
+    "CMAKE_${cmake_lang}_FLAGS_RELWITHDEBINFO:${cmake_lang_desc} compiler flags for all RelWithDebInfo build"
+  )
+
+  _describe -t "${cmake_lang//:/-}-property-names" "${cmake_lang_desc} property name" properties $@[0,-3] && return 0
+}
+
+# -----------------------------------
+# _cmake_define_common_property_names
+# -----------------------------------
+(( $+functions[_cmake_define_common_property_names] )) ||
+_cmake_define_common_property_names() {
+  local properties; properties=(
+    'CMAKE_MODULE_PATH:Search path for cmake modules'
+    'CMAKE_BUILD_TYPE:Specifies the build type for make based generators'
+    'CMAKE_TOOLCHAIN_FILE:Absolute or relative path to a cmake script which sets up toolchain related variables'
+    'CMAKE_COLOR_MAKEFILE:Enables/disables color output when using the Makefile generator'
+    'CMAKE_INSTALL_PREFIX:Install directory used by install'
+    'CMAKE_EXPORT_COMPILE_COMMANDS:Enable/disable output of compilation database during generation'
+  )
+
+  _describe -t 'common-property-names' 'common property name' properties $@
+}
+
+# ----------------------------
+# _cmake_define_property_values
+# ----------------------------
+(( $+functions[_cmake_define_property_values] )) ||
+_cmake_define_property_values() {
+  local ret=1
+  setopt localoptions extendedglob
+  case $@[-1] in
+    (CMAKE_BUILD_TYPE)     _wanted build-types expl 'build type' _cmake_build_types && ret=0;;
+    (CMAKE_TOOLCHAIN_FILE) _wanted toolchain-files expl 'file' _cmake_toolchain_files && ret=0;;
+    (CMAKE_COLOR_MAKEFILE) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
+    (CMAKE_INSTALL_PREFIX) _files -/ && ret=0;;
+    (CMAKE_EXPORT_COMPILE_COMMANDS) _wanted booleans expl 'boolean' _cmake_booleans && ret=0;;
+    (CMAKE_*_COMPILER)     _wanted compilers expl 'compiler' _cmake_compilers && ret=0;;
+    (CMAKE_*_FLAGS(|_?*))  _message -e compiler-flags 'compiler flags' && ret=0;;
+    (*)                    _files && ret=0;;
+  esac
+
+  return ret
+}
+
+# ------------------
+# _cmake_build_types
+# ------------------
+(( $+functions[_cmake_build_types] )) ||
+_cmake_build_types() {
+  local build_types; build_types=(
+    'Debug'
+    'Release'
+    'RelWithDebInfo'
+    'MinSizeRel'
+  )
+  _values 'build type' ${build_types[@]}
+}
+
+# -----------------
+# _cmake_generators
+# -----------------
+(( $+functions[_cmake_generators] )) ||
+_cmake_generators() {
+  local generators; generators=(
+    'Unix Makefiles'
+    'Ninja'
+    'CodeBlocks - Ninja'
+    'CodeBlocks - Unix Makefiles'
+    'Eclipse CDT4 - Ninja'
+    'Eclipse CDT4 - Unix Makefiles'
+    'KDevelop3'
+    'KDevelop3 - Unix Makefiles'
+    'Sublime Text 2 - Ninja'
+    'Sublime Text 2 - Unix Makefiles'
+  )
+
+  _describe -t generators 'generator' generators
+}
+
+# ----------------------
+# _cmake_toolchain_files
+# ----------------------
+(( $+functions[_cmake_toolchain_files] )) ||
+_cmake_toolchain_files() {
+  _files -g '*\.cmake*'
+}
+
+# ---------------
+# _cmake_booleans
+# ---------------
+(( $+functions[_cmake_booleans] )) ||
+_cmake_booleans() {
+  local booleans; booleans=(
+    'YES'
+    'NO'
+  )
+  _describe -t booleans 'boolean' booleans
+}
+
+# ---------------
+# _cmake_compilers
+# ---------------
+(( $+functions[_cmake_compilers] )) ||
+_cmake_compilers() {
+  _command_names -e
+}
+
+local cmake_command_actions;cmake_command_actions=(
+    '-E[CMake command mode]:*:command'
+)
+_cmake_command() {
+  _arguments -C -s - command "$cmake_command_actions[@]"
+}
+
+local cmake_suggest_build;cmake_suggest_build=(
+    '--build[build]'
+)
+
+if [ $CURRENT -eq 2 ] ; then
+  _arguments -C -s \
+    - help \
+      "$cmake_help_actions[@]" \
+    - command \
+      "$cmake_command_actions[@]" \
+    - build_opts \
+      "$cmake_build_options[@]" \
+    - build_cmds \
+      "$cmake_suggest_build[@]" && return 0
+elif [[ $words[2] = --help* ]] ; then
+  _cmake_help
+elif [[ $words[2] != -E ]] ; then
+  _cmake_on_build
+else
+  _cmake_command
+fi
diff --git a/zsh/modules/completion/external/src/_coffee b/zsh/modules/completion/external/src/_coffee
new file mode 100644
index 0000000..10b6b81
--- /dev/null
+++ b/zsh/modules/completion/external/src/_coffee
@@ -0,0 +1,81 @@
+#compdef coffee
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Coffee.js v0.6.11 (http://coffeejs.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mario Fernandez (https://github.com/sirech)
+#  * Dong Weiming (https://github.com/dongweiming)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1 version opts first second third
+typeset -A opt_args
+version=(${(f)"$(_call_program version $words[1] --version)"})
+version=${${(z)${version[1]}}[3]}
+first=$(echo $version|cut -d '.' -f 1)
+second=$(echo $version|cut -d '.' -f 2)
+third=$(echo $version|cut -d '.' -f 3)
+if (( $first < 2 )) &&  (( $second < 7 )) && (( $third < 3 ));then
+  opts+=('(-l --lint)'{-l,--lint}'[pipe the compiled JavaScript through JavaScript Lint]'
+         '(-r --require)'{-r,--require}'[require a library before executing your script]:library')
+fi
+
+
+_arguments -C \
+  '(- *)'{-h,--help}'[display this help message]' \
+  '(- *)'{-v,--version}'[display the version number]' \
+  $opts \
+  '(-b --bare)'{-b,--bare}'[compile without a top-level function wrapper]' \
+  '(-e --eval)'{-e,--eval}'[pass a string from the command line as input]:Inline Script' \
+  '(-i --interactive)'{-i,--interactive}'[run an interactive CoffeeScript REPL]' \
+  '(-j --join)'{-j,--join}'[concatenate the source CoffeeScript before compiling]:Destination JS file:_files -g "*.js"' \
+  '(--nodejs)--nodejs[pass options directly to the "node" binary]' \
+  '(-c --compile)'{-c,--compile}'[compile to JavaScript and save as .js files]' \
+  '(-o --output)'{-o,--output}'[set the output directory for compiled JavaScript]:Output Directory:_files -/' \
+  '(-n -t -p)'{-n,--nodes}'[print out the parse tree that the parser produces]' \
+  '(-n -t -p)'{-p,--print}'[print out the compiled JavaScript]' \
+  '(-n -t -p)'{-t,--tokens}'[print out the tokens that the lexer/rewriter produce]' \
+  '(-s --stdio)'{-s,--stdio}'[listen for and compile scripts over stdio]' \
+  '(-w --watch)'{-w,--watch}'[watch scripts for changes and rerun commands]' \
+  '*:script or directory:_files' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_column b/zsh/modules/completion/external/src/_column
new file mode 100644
index 0000000..1cb2245
--- /dev/null
+++ b/zsh/modules/completion/external/src/_column
@@ -0,0 +1,60 @@
+#compdef column
+#
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for column (from util-linux 2.27.1->)
+#    (https://git.kernel.org/cgit/utils/util-linux/util-linux.git/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Ole Jørgen Brønner <olejorgenb@yahoo.no>
+#
+# ------------------------------------------------------------------------------
+#
+# Note: column has upstream bash completions.
+#
+# Automatically generated with http://github.com/RobSis/zsh-completion-generator
+
+local arguments
+
+arguments=(
+    '(-c --columns)'{-c,--columns}'[width of output in number of characters]:width:'
+    '(-t --table)'{-t,--table}'[create a table]'
+    '(-s --separator)'{-s,--separator}'[possible table delimiters]:separator:'
+    '(-o --output-separator)'{-o,--output-separator}'[columns separator for table output; default is two spaces]:separator:'
+    '(-x --fillrows)'{-x,--fillrows}'[fill rows before columns]'
+    '(-h --help)'{-h,--help}'[display this help and exit]'
+    '(-V --version)'{-V,--version}'[output version information and exit]'
+    '*:filename:_files'
+)
+
+_arguments -s $arguments
diff --git a/zsh/modules/completion/external/src/_composer b/zsh/modules/completion/external/src/_composer
new file mode 100644
index 0000000..76e1260
--- /dev/null
+++ b/zsh/modules/completion/external/src/_composer
@@ -0,0 +1,76 @@
+#compdef composer
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for composer (https://getcomposer.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Daniel Gomes (me@danielcsgomes.com)
+#  * Valerii Hiora (https://github.com/vhbit)
+#  * loranger (https://github.com/loranger)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext=$curcontext state line
+declare -A opt_args
+
+_composer_get_command_list () {
+    composer --no-ansi | sed "1,/Available commands/d" | awk '/ [a-z]+/ { print $1 }'
+}
+
+_composer_get_required_list () {
+    composer show -s --no-ansi | sed '1,/requires/d' | awk 'NF > 0 && !/^requires \(dev\)/{ print $1 }'
+}
+
+
+_composer () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+  
+  _arguments \
+    '1: :->command'\
+    '*: :->args'
+  if [ -f composer.json ]; then
+    case $state in
+      command)
+        compadd `_composer_get_command_list`
+        ;;
+      *)
+        compadd `_composer_get_required_list`
+        ;;
+    esac
+  else
+   compadd create-project init search selfupdate show
+  fi
+}
+
+compdef _composer composer
\ No newline at end of file
diff --git a/zsh/modules/completion/external/src/_console b/zsh/modules/completion/external/src/_console
new file mode 100644
index 0000000..7e5b454
--- /dev/null
+++ b/zsh/modules/completion/external/src/_console
@@ -0,0 +1,64 @@
+#compdef console
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for symfony console (https://github.com/symfony/Console).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * loranger (https://github.com/loranger)
+#  * Yohan Tambè (https://github.com/Cronos87)
+#
+# ------------------------------------------------------------------------------
+
+_find_console () {
+     echo "php $(find . -maxdepth 2 -mindepth 1 -name 'console' -type f | head -n 1)"
+}
+
+_console_get_command_list () {
+    IFS=" "
+    `_find_console` --no-ansi | \
+        sed "1,/Available commands/d" | \
+        awk '/  [a-z]+/ { print $0 }' | \
+        sed -E 's/^[ ]+//g' | \
+        sed -E 's/[:]+/\\:/g' | \
+        sed -E 's/[ ]{2,}/\:/g'
+}
+
+_console () {
+    local -a commands
+    IFS=$'\n'
+    commands=(`_console_get_command_list`)
+    _describe 'commands' commands
+}
+
+compdef _console php console
+compdef _console console
diff --git a/zsh/modules/completion/external/src/_dad b/zsh/modules/completion/external/src/_dad
new file mode 100644
index 0000000..9ceee06
--- /dev/null
+++ b/zsh/modules/completion/external/src/_dad
@@ -0,0 +1,68 @@
+#compdef dad
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for dad a command line manager of aria2 daemon. (https://github.com/baskerville/diana).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+_dad() {
+    local -a commands
+
+    commands=(
+        "start:Start aria2c daemon"
+        "stop:Stop aria2c daemon"
+    )
+
+    _arguments -C \
+      '(- 1 *)'-h"[Show help and exit]" \
+      "-d[Set download dir]:download_dir:->val" \
+      "-s[Set secret token]:secret_token:->val" \
+      "-u[Set aria2c username]:username:->val" \
+      "-p[Set aria2c password]:password:->val" \
+      '1:cmd:->cmds' \
+      '*: : :->args' \
+
+    case "$state" in
+      (cmds)
+        _describe -t commands 'commands' commands
+      ;;
+      (*)
+      ;;
+    esac
+}
+
+_dad
+
diff --git a/zsh/modules/completion/external/src/_debuild b/zsh/modules/completion/external/src/_debuild
new file mode 100644
index 0000000..e2c5b62
--- /dev/null
+++ b/zsh/modules/completion/external/src/_debuild
@@ -0,0 +1,65 @@
+#compdef debuild
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for debuild 2.10.
+#
+#  Status: incomplete.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+# FIXME --noconf is only allowed in first position
+_arguments \
+  '(- 1 *)'{-h,--help}'[show help]' \
+  '(- 1 *)--version[show version and copyright information]' \
+  {--no-conf,--noconf}'[don'\''t read devscripts config files]' \
+  {-r-,--rootcmd=}'[command used to become root if debuild not setuid root (default: fakeroot)]: :_command_names' \
+  '*'{-e-,--preserve-envvar=}'[preserve environment variable]: :_vars' \
+  '(-e --preserve-envvar)--preserve-env[preserve all environment vars (except PATH)]' \
+  '*'{-e-,--set-envvar=}'[preserve environment variable]: :_vars -qS=' \
+  '--prepend-path=[prepend to the sanitised PATH]: :_files -/' \
+  '(-D)-d[skip checking of build dependencies]' \
+  '(-d)-D[force checking of build dependencies]' \
+  '--check-dirname-level[how much to check directory names]:level:((0\:never 1\:only\ if\ program\ changes\ directory\ \(default\) 2\:always))' \
+  '--check-dirname-regex[Perl regex defining matching directory names, the string PACKAGE will be replaced by the package name (default: '\''PACKAGE(-.+)?'\'')]:regex'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_dget b/zsh/modules/completion/external/src/_dget
new file mode 100644
index 0000000..7460210
--- /dev/null
+++ b/zsh/modules/completion/external/src/_dget
@@ -0,0 +1,61 @@
+#compdef dget
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for dget
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kris Shannon <k.shannon@amaze.com.au>
+#
+# ------------------------------------------------------------------------------
+
+_dget() {
+    local context state line expl
+    local -A opt_args
+
+    _arguments -A "-*" \
+        '(--no-conf -h --help)'{-h,--help}'[Show help message]' \
+        '(--no-conf -V --version)'{-v,--version}'[Print license, copyright, and version information and exit]' \
+        '(--no-conf -b --backup)'{-b,--backup}'[Move files that would be overwritten to ./backup]' \
+        '(--no-conf -q --quiet)'{-q,--quiet}'[Suppress wget/curl output]' \
+        '(--no-conf -x --extract -d --download-only --build)'{-d,--download-only}'[Do not extract downloaded source]' \
+        '(--no-conf -x --extract -d --download-only --build)'{-x,--extract}'[Unpack downloaded source]' \
+        '(--no-conf -x --extract -d --download-only --build)--build[Build package with dpkg-buildpackage after download]' \
+        '(--no-conf -u --allow-unauthenticated)'{-u,--allow-unauthenticated}'[Make no attempt to verify source package signature]' \
+        '(--no-conf)--path[Check this directory in addition to the apt archive]:DIR:_files -/' \
+        '(--no-conf --insecure)--insecure[Do not check SSL certificates when downloading]' \
+        '(--no-conf --no-cache)--no-cache[Disable server-side HTTP cache]' \
+        "(--no-conf)--no-conf[Don't read devscripts config files]" \
+        '(-)*:debian package urls:_urls'
+}
+
+_dget "$@"
diff --git a/zsh/modules/completion/external/src/_dhcpcd b/zsh/modules/completion/external/src/_dhcpcd
new file mode 100644
index 0000000..5683424
--- /dev/null
+++ b/zsh/modules/completion/external/src/_dhcpcd
@@ -0,0 +1,78 @@
+#compdef dhcpcd
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for dhcpcd 2.3.2.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+    '1:network interface:_net_interfaces' \
+  - release \
+    '(-k --release)'{-k,--release}'[causes an existing dhcpcd process running on the interface to release it'\''s lease, deconfigure the interface and then exit]' \
+  - exit \
+    '(-x --exit)'{-x,--exit}'[causes an existing dhcpcd process running on the interface to exit]' \
+  - main \
+    '(-d --debug)'{-d,--debug}'[echo debug and informational messages to the console]' \
+    '(-h --hostname)'{-h,--hostname}'[specify the hostname sent, or an empty string to stop any hostname from being sent]:hostname:_hosts' \
+    '(-i --classid)'{-i,--classid}'[override the DHCP vendor classid field we send]:classid' \
+    '(-l --leasetime)'{-l,--leasetime}'[request a specific lease time in seconds]:lease time \(seconds\)' \
+    '(-m --metric)'{-m,--metric}'[added routes will use the metric on systems where this is supported]:metric' \
+    '(-n --renew)'{-n,--renew}'[notifies an existing dhcpcd process running on the interface to renew it'\''s lease]' \
+    '(-p --persistent)'{-p,--persistent}'[don'\''t deconfigure the interface and configuration at exit]' \
+    '(-r --request)'{-r,--request}'[skip the broadcast request step and just request an address]:address' \
+    '(-s --inform)'{-s,--inform}'[behaves exactly like -r, but sends a DHCP inform instead of a request]:address' \
+    '(-t --timeout)'{-t,--timeout}'[timeout after seconds, instead of the default 20]:timeout \(seconds\)' \
+    '(-u --userclass)'{-u,--userclass}'[tags the DHCP message with the userclass class]:class' \
+    '*'{-H,--sethostname}'[forces dhcpcd to set the hostname as supplied by the DHCP server]' \
+    '({-I --clientid)'{-I,--clientid}'[send clientid as a client identifier string]:clientid' \
+    '*'{-S,--mscsr}'[request Microsoft specific Classless Static Routes (RFC 3442) code as well]' \
+    '(-A --noarp)'{-A,--noarp}'[don'\''t request or claim the address by ARP]' \
+    '(-G --nogateway)'{-G,--nogateway}'[don'\''t set any default routes]' \
+    '(-L --noipv4ll)'{-L,--noipv4ll}'[don'\''t use IPv4LL at all]' \
+    '(-M --nomtu)'{-M,--nomtu}'[don'\''t set the MTU of the interface]' \
+    '(-N --nontp)'{-N,--nontp}'[don'\''t touch /etc/ntpd.conf or restart the ntp service]' \
+    '(-R --nodns)'{-R,--nodns}'[don'\''t send DNS information to resolvconf or touch /etc/resolv.conf]' \
+    '(-T --test)'{-T,--test}'[on receipt of discover messages, simply print the contents of the DHCP message to the console]' \
+    '(-Y --nonis)'{-Y,--nonis}'[don'\''t touch /etc/yp.conf or restart the ypbind service]'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_diana b/zsh/modules/completion/external/src/_diana
new file mode 100644
index 0000000..54bb029
--- /dev/null
+++ b/zsh/modules/completion/external/src/_diana
@@ -0,0 +1,150 @@
+#compdef diana
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Diana a command line interface to the aria2 daemon. (https://github.com/baskerville/diana).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+local GIDs PGIDs
+
+_diana_load_gids() {
+  GIDs=()
+  local downloads hashArr fileName
+
+  downloads=$(diana list | cut -d' ' -f1)
+
+  if [ ${#downloads} -eq "0" ]; then
+    return
+  fi
+
+  hashArr=("${(f)$(echo "$downloads")}")
+  for ((i=1; i<=${#hashArr[@]}; i++)); do
+    fileName=$(diana files $hashArr[i] | grep "[X]" | rev | cut -d'/' -f1 | rev);
+    GIDs+=("$hashArr[i]:$fileName");
+  done
+}
+
+_diana_load_paused_gids() {
+  PGIDs=()
+  local downloads hashArr fileName
+
+  downloads=$(diana paused | cut -d' ' -f1)
+
+  if [ ${#downloads} -eq "0" ]; then
+    return
+  fi
+
+  hashArr=("${(f)$(echo "$downloads")}")
+  for ((i=1; i<=${#hashArr[@]}; i++)); do
+    fileName=$(diana files $hashArr[i] | grep "[X]" | rev | cut -d'/' -f1 | rev);
+    PGIDs+=("$hashArr[i]:$fileName");
+  done
+}
+
+_diana_command_arguments() {
+  case $words[1] in
+    (remove)
+      _diana_load_gids
+      _describe -t output 'Downloads to delete' GIDs
+    ;;
+    (info)
+      _diana_load_gids
+      _describe -t output 'Downloads to get info' GIDs
+    ;;
+    (files)
+      _diana_load_gids
+      _describe -t output 'Get files for downloads' GIDs
+    ;;
+    (forcerm)
+      _diana_load_gids
+      _describe -t output 'Downloads to delete' GIDs
+    ;;
+    (pause)
+      _diana_load_gids
+      _describe -t output 'Downloads to pause' GIDs
+    ;;
+    (resume)
+      _diana_load_paused_gids
+      _describe -t output 'Downloads to resume' PGIDs
+    ;;
+    (preview)
+      _diana_load_gids
+      _describe -t output 'Downloads to preview' GIDs
+    ;;
+  esac
+
+
+}
+
+_diana() {
+    local -a commands
+
+    commands=(
+        "list:Output the list of active downloads."
+        "paused:Output the list of paused downloads."
+        "stopped:Output the list of stopped downloads."
+        "info:Output informations regarding the given GIDs."
+        "files:Output the files owned by the downloads corresponding to the given GIDs."
+        "errors:Output the list of errors."
+        "stats:Output download bandwidth statistics."
+        "add:Download the given items (local or remote URLs to torrents, etc.)."
+        "remove:Remove the downloads corresponding to the given GIDs."
+        "forcerm:Forcibly remove the downloads corresponding to the given GIDs."
+        "pause:Pause the downloads corresponding to the given GIDs."
+        "resume:Resume the downloads corresponding to the given GIDs."
+        "preview:Preview all the files from all the downloads corresponding to the given GIDs."
+        "sleep:Pause all the active downloads."
+        "wake:Resume all the paused downloads."
+        "purge:Clear the list of stopped downloads and errors."
+        "clean:Stop seeding completed downloads."
+    )
+
+_arguments -C \
+  '1:cmd:->cmds' \
+  '*:: :->args' \
+
+case "$state" in
+  (cmds)
+    _describe -t commands 'commands' commands
+  ;;
+  (*)
+    _diana_command_arguments
+  ;;
+esac
+}
+
+_diana
+
diff --git a/zsh/modules/completion/external/src/_docpad b/zsh/modules/completion/external/src/_docpad
new file mode 100644
index 0000000..0828474
--- /dev/null
+++ b/zsh/modules/completion/external/src/_docpad
@@ -0,0 +1,83 @@
+#compdef docpad
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for docpad (https://github.com/bevry/docpad).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Changwoo Park (https://github.com/pismute)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line  ret=1
+
+local -a _1st_arguments
+_1st_arguments=(
+  'run: run [options], does everything - skeleton, generate, watch, server'
+  'server: server [options], creates a server for your generated project'
+  'skeleton: skeleton [options], will create a new project in your cwd based off an existing skeleton'
+  'render: render [path], render the file at <path> and output its results to stdout:path:_files'
+  'generate: (re)generates your project'
+  'watch: watches your project for changes, and (re)generates whenever a change is made'
+  'install: ensure everything is installed correctly'
+  'clean: ensure everything is cleaned correctly'
+  'info: display the information about your docpad instance'
+  'help: output the help'
+)
+
+_arguments -C \
+  '(-h,--help)'{-h,--help}'[output usage information]'\
+  '(-V,--version)'{-V,--version}'[output the version number]'\
+  '(-o,--out)'{-o,--out}'[where to output the rendered directory or files]:path:_files'\
+  '(-c,--config)'{-c,--config}'[a custom configuration file to load in]:path:_files'\
+  '(-e,--env)'{-e,--env}'[the environment name to use for this instance, multiple names can be separated with a comma]'\
+  '(-d,--debug)'{-d,--debug}'+[the level of debug messages you would like to display, if specified defaults to 7, otherwise 6]:number'\
+  '(-f,--force)'{-f,--force}'[force a re-install of all modules]'\
+  '1: :->cmds'\
+  '*: :_files'&& ret=0
+
+case $state in
+  cmds)
+    _describe -t commands 'docpad command' _1st_arguments && ret=0
+    ;;
+
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_drush b/zsh/modules/completion/external/src/_drush
new file mode 100644
index 0000000..8f281db
--- /dev/null
+++ b/zsh/modules/completion/external/src/_drush
@@ -0,0 +1,191 @@
+#compdef drush
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Drush (http://drush.ws).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Vasily Kraev (https://github.com/vasilykraev)
+#
+# ------------------------------------------------------------------------------
+
+_drush() {
+  local curcontext='$curcontext' state line cmds ret=1
+  integer NORMARG
+  typeset -A opt_args
+
+  global_args=('--debug' '--verbose' '--yes' '--no' '--simulate' '--root=' '--uri=')
+
+  _arguments -C \
+    '(--*)'{--version,--version}'[Show drush version.]' \
+    '(- *)'{-d,--debug}'[Display even more information, including internal messages.]' \
+    '(- *)'{-v,--verbose}'[Display extra information about the command.]' \
+    '(- *)'{-y,--yes}'[Assume "yes" as answer to all prompts.]' \
+    '(- *)'{-n,--no}'[Assume "no" as answer to all prompts.]' \
+    '(- *)'{-s,--simulate}'[Simulate all relevant actions (dont actually change the system).]' \
+    '(- *)'{-r,--root=}'[Drupal root directory to use (default: current directory).]' \
+    '(- *)'{-l,--uri=}'[URI of the drupal site to use (only needed in multisite environments or when running on an alternate port).]' \
+    '1: :->cmds' \
+    '*::arg:->args' \
+  && ret=0
+
+case $state in
+  cmds)
+    _values 'drush command' \
+      '(archive-dump)'{archive-dump,ard,arb}'[Backup your code, files, and database into a single file.]' \
+      '(archive-restore)'{archive-restore,arr}'[Expand a site archive into a Drupal web site.]' \
+      '(cache-clear)'{cache-clear,cc}'[Clear a specific cache, or all drupal caches.]' \
+      '(core-status)'{core-status,status,st}'[Provides a birds-eye view of the current Drupal installation, if any.]' \
+      '(core-cron)'{core-cron,cron}'[Run all cron hooks in all active modules for specified site.]' \
+      '(core-execute)'{core-execute,exec}'[Execute a shell command. Usually used with a site alias.]' \
+      '(drupal-directory)'{drupal-directory,dd}'[Return the filesystem path for modules/themes and other key folders.]' \
+      'help[Print this help message.]' \
+      'image-flush[Flush all derived images for a given style.]' \
+      '(site-alias)'{site-alias,sa}'[Print an alias record.]' \
+      '(site-install)'{site-install,si}'[Install Drupal along with modules/themes/configuration using the specified install profile.]' \
+      'test-clean[Clean temporary tables and files.]' \
+      'test-run[Run tests. Note that you must use the --uri option.]' \
+      '(updatedb)'{updatedb,updb}'[Apply any database updates required (as with running update.php).]' \
+      '(variable-delete)'{variable-delete,vdel}'[Delete a variable.]' \
+      '(variable-get)'{variable-get,vget}'[Get a list of some or all site variables and values.]' \
+      '(variable-set)'{variable-set,vset}'[Set a variable.]' \
+      '(pm-list)'{pm-list,pml}'[Show a list of available extensions (modules and themes).]' \
+      '(pm-disable)'{pm-disable,dis}'[Disable one or more extensions (modules or themes). Disable dependant extensions as well.]' \
+      '(pm-download)'{pm-download,dl}'[Download projects from drupal.org or other sources.]' \
+      '(pm-enable)'{pm-enable,en}'[Enable one or more extensions (modules or themes). Enable dependant extensions as well.]' \
+      'pm-uninstall[Uninstall one or more modules.]' \
+      'pm-update[Update Drupal core and contrib projects and apply any pending database updates (Same as pm-updatecode + updatedb).]' \
+      '(sql-cli)'{sql-cli,sqlc}'[Open a SQL command-line interface using Drupals credentials.]' \
+      'sql-drop[Drop all tables in a given database.]' \
+      'sql-dump[Exports the Drupal DB as SQL using mysqldump or equivalent.]' \
+      '(sql-query)'{sql-query,sqlq}'[Execute a query against the site database.]' \
+      'sql-sync[Copy and import source database to target database. Transfers via rsync.]' \
+      '(user-login)'{user-login,uli}'[Display a one time login link for the given user account (defaults to uid 1).]' \
+      '(user-password)'{user-password,upwd}'[(Re)Set the password for the user account with the specified name.]' \
+      '(devel-reinstall)'{devel-reinstall,dre}'[Disable, Uninstall, and Install a list of projects. (devel)]' \
+      '(devel-token)'{devel-token,token}'[List available tokens (devel)]' \
+      '(generate-content)'{generate-content,genc}'[Create content. (devel_generate)]' \
+      '(generate-menus)'{generate-menus,genm}'[Create menus and menu items. (devel_generate)]' \
+      '(generate-terms)'{generate-terms,gent}'[Create terms in specified vocabulary. (devel_generate)]' \
+      '(generate-users)'{generate-users,genu}'[Create users. (devel_generate)]' \
+      '(generate-vocabs)'{generate-vocabs,genv}'[Create vocabularies. (devel_generate)]' \
+      '(features-diff)'{features-diff,fd}'[Show the difference between the default and overridden state of a feature.]' \
+      '(features-export)'{features-export,fe}'[Export a feature from your site into a module.]' \
+      '(features-list)'{features-list,fl}'[List all the available features for your site.]' \
+      '(features-revert)'{features-revert,fr}'[Revert a feature module on your site.]' \
+      '(features-revert-all)'{features-revert-all,fra}'[Revert all enabled feature module on your site.]' \
+      '(features-update)'{features-update,fu}'[Update a feature module on your site.]' \
+      '(features-update-all)'{features-update-all,fua}'[Update all feature modules on your site.]' \
+  && ret=0
+    ;;
+  args)
+    case $line[1] in
+      (archive-dump|ard)
+        _arguments \
+          '(--description)--description=[Filter out extensions that are provided by drupal core.]' \
+          '(--destination)--destination=[The full path and filename in which the archive should be stored. If omitted, it will be saved to the drush-backups directory.]' \
+          '(--no-core)--no-core[Exclude Drupal core, so the backup only contains the site specific stuff.]' \
+          '(--pipe)--pipe[Only print the destination of the archive. Useful for scripts that dont pass --destination.]' \
+          '(--tar-options)--tar-options=[Options passed thru to the tar command.]' \
+        && ret=0
+        compadd -a global_args
+      ;;
+      (archive-restore|arr)
+        _arguments \
+          '(--db-prefix)--db-prefix[An optional table prefix to use during restore.]' \
+          '(--db-su)--db-su[Account to use when creating the new database. Optional.]' \
+          '(--db-su-pw)--db-su-pw[Password for the "db-su" account. Optional.]' \
+          '(--db-url)--db-url=[A Drupal 6 style database URL indicating the target for database restore. If not provided, the archived settings.php is used. ]' \
+          '(--destination)--destination[Specify where the Drupal site should be expanded, including the docroot. Defaults to the current working directory.]' \
+          '(--overwrite)--overwrite[Allow drush to overwrite any files in the destination.]' \
+        && ret=0
+        compadd -a global_args
+      ;;
+      (user-password|upwd)
+        _arguments \
+          '--password=:Set the password for the username someuser.' \
+        && ret=0
+      ;;
+      (help)
+        _values 'commands' 'arb' 'archive-dump' 'archive-restore' 'ard' 'arr' 'cache-clear' 'cc' 'core-cron' 'core-execute' 'core-status' 'cron' 'dd' 'devel-reinstall' 'devel-token' 'dis' 'dl' 'dre' 'drupal-directory' 'en' 'exec' 'fd' 'fe' 'features-diff' 'features-export' 'features-list' 'features-revert' 'features-revert-all' 'features-update' 'features-update-all' 'fl' 'fr' 'fra' 'fu' 'fua' 'genc' 'generate-content' 'generate-menus' 'generate-terms' 'generate-users' 'generate-vocabs' 'genm' 'gent' 'genu' 'genv' 'help' 'image-flush' 'pm-disable' 'pm-download' 'pm-enable' 'pm-list' 'pm-uninstall' 'pm-update' 'pml' 'sa' 'si' 'site-alias' 'site-install' 'sql-cli' 'sql-drop' 'sql-dump' 'sql-query' 'sql-sync' 'sqlc' 'sqlq' 'st' 'status' 'test-clean' 'test-run' 'token' 'uli' 'updatedb' 'updb' 'upwd' 'user-login' 'user-password' 'variable-delete' 'variable-get' 'variable-set' 'vdel' 'vget' 'vset'
+      ;;
+      (cc)
+        _values 'options' 'all' 'drush' 'theme-registry' 'menu' 'css-js' 'block'
+      ;;
+      (pm-list|pml)
+        _arguments \
+          '(--core)--core[Filter out extensions that are not in drupal core.]' \
+          '(--no-core)--no-core[Filter out extensions that are provided by drupal core.]' \
+          '(--pipe)--pipe[Returns a whitespace delimited list of the names of the resulting extensions.]' \
+          '(--status)--status=-[Filter by extension status. Choices: enabled, disabled and/or "not installed".]:status:(enabled disabled)' \
+          '(--type)--type=-[Filter by extensions ension type. Choices: module, theme.]:type:(module theme)' \
+        && ret=0
+      ;;
+      (pm-disable|dis)
+        _modules=( $(drush pml --status=enabled --pipe) )
+        if [[ $_modules != "" ]]; then
+          _values 'enabled modules' $_modules
+        fi
+      ;;
+      (pm-enable|en)
+        _arguments -C \
+          '--resolve-dependencies[Attempt to download any missing dependencies. At the moment, only works when the module name is the same as the project name.]' \
+          '--skip[Skip automatic downloading of libraries (c.f. devel).]' && ret=0
+        _modules=( $(drush pml --status="disabled,not installed" --pipe) )
+        if [[ $_modules != "" ]]; then
+          _values -s 'not yet enabled modules' $_modules && ret=0
+        fi
+      ;;
+      (*)
+        _values 'Global options' \
+          {-d,--debug}'[Display even more information, including internal messages.]' \
+          {-v,--verbose}'[Display extra information about the command.]' \
+          {-y,--yes}'[Assume "yes" as answer to all prompts.]' \
+          {-n,--no}'[Assume "no" as answer to all prompts.]' \
+          {-s,--simulate}'[Simulate all relevant actions (dont actually change the system).]' \
+          {-r,--root=}'[Drupal root directory to use (default: current directory).]' \
+          {-l,--uri=}'[URI of the drupal site to use (only needed in multisite environments or when running on an alternate port).]'
+        ;;
+    esac
+    ;;
+esac
+}
+
+_drush '$@'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_emulator b/zsh/modules/completion/external/src/_emulator
new file mode 100644
index 0000000..ae86717
--- /dev/null
+++ b/zsh/modules/completion/external/src/_emulator
@@ -0,0 +1,139 @@
+#compdef emulator
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for emulator (Android Emulator) 12.0
+#  (http://developer.android.com/guide/developing/tools/emulator.html).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+typeset -A opt_args
+local context state line curcontext="$curcontext"
+
+# TODO All image options are contextual to -sysdir value
+# TODO All skin options are contextual to -skindir value
+# TODO snapshot options are mutually exclusive
+# TODO Use '-snapshot-list' output for snapshot names
+# TODO Complete -avd with avd names ?
+# TODO -logcat: use completer from _adb
+# TODO Complete options with device values
+# TODO Complete -prop
+_arguments \
+  '(- : *)-version[display emulator version number]' \
+  '(- : *)-help[display help information]' \
+  '(- : *)-help-disk-images[about disk images]' \
+  '(- : *)-help-keys[supported key bindings]' \
+  '(- : *)-help-debug-tags[debug tags for -debug <tags>]' \
+  '(- : *)-help-char-devices[character <device> specification]' \
+  '(- : *)-help-environment[environment variables]' \
+  '(- : *)-help-keyset-file[key bindings configuration file]' \
+  '(- : *)-help-virtual-device[virtual device management]' \
+  '(- : *)-help-sdk-images[about disk images when using the SDK]' \
+  '(- : *)-help-build-images[about disk images when building Android]' \
+  '(- : *)-help-all[prints all help content]' \
+  '(- : *)-help-'{version,sysdir,system,image,datadir,kernel,ramdisk,initdata,data,partition-size,cache,no-cache,nocache,sdcard,snapstorage,no-snapstorage,snapshot,no-snapshot,no-snapshot-save,no-snapshot-load,snapshot-list,no-snapshot-update-time,wipe-data,avd,skindir,skin,noskin,no-skin,memory,netspeed,netdelay,netfast,trace,show-kernel,shell,no-jni,nojni,logcat,noaudio,no-audio,audio,raw-keys,radio,port,ports,onion,onion-alpha,onion-rotation,scale,dpi-device,http-proxy,timezone,dns-server,cpu-delay,no-boot-anim,no-window,report-console,gps,keyset,shell-serial,tcpdump,bootchart,charmap,prop,shared-net-id,nand-limits,memcheck,qemu,verbose}'[print option-specific help]' \
+  '-sysdir[search for system disk images in the directory]: :_files -/' \
+  '(-system -image)'{-system,-image}'[read initial system image from the file]: :_files -g "*.img"' \
+  '-datadir[write user data into the directory]: :_files -/' \
+  '-kernel[use specific emulated kernel]: :_files' \
+  '-ramdisk[ramdisk image (default <system>/ramdisk.img]: :_files -g "*.img"' \
+  '-initdata[same as '\''-init-data <file>'\'']: :_files' \
+  '-data[data image (default <datadir>/userdata-qemu.img]: :_files -g "*.img"' \
+  '-partition-size[system/data partition size]:size (in MBs)' \
+  '(-no-cache -nocache)-cache[cache partition image (default is temporary file)]: :_files -g "*.img"' \
+  '(-cache -no-cache -nocache)'{-no-cache,-nocache}'[disable the cache partition]' \
+  '-sdcard[SD card image (default <system>/sdcard.img]: :_files -g "*.img"' \
+  '(-no-snapstorage)-snapstorage[file that contains all state snapshots (default <datadir>/snapshots.img)]: :_files -g "*.img"' \
+  '(-snapstorage)-no-snapstorage[do not mount a snapshot storage file (this disables all snapshot functionality)]' \
+  '-snapshot[name of snapshot within storage file for auto-start and auto-save (default '\''default-boot'\'')]:snapshot name' \
+  '-no-snapshot[perform a full boot and do not do not auto-save, but qemu vmload and vmsave operate on snapstorage]' \
+  '-no-snapshot-save[do not auto-save to snapshot on exit: abandon changed state]' \
+  '-no-snapshot-load[do not auto-start from snapshot: perform a full boot]' \
+  '-snapshot-list[show a list of available snapshots]' \
+  '-no-snapshot-update-time[do not do try to correct snapshot time on restore]' \
+  '-wipe-data[reset the user data image (copy it from initdata)]' \
+  '-avd[use a specific android virtual device]:android virtual device name' \
+  '-skindir[search skins in <dir> (default <system>/skins)]: :_files -/' \
+  '-skin[select a given skin]' \
+  '(-noskin -no-skin)'{-noskin,-no-skin}'[don'\''t use any emulator skin]' \
+  '-memory[physical RAM size in MBs]:size (in MBs)' \
+  '-netspeed[maximum network download/upload speeds]:speed' \
+  '-netdelay[network latency emulation]:delay' \
+  '-netfast[disable network shaping]' \
+  '-trace[enable code profiling (F9 to start)]:trace name' \
+  '-show-kernel[display kernel messages]' \
+  '-shell[enable root shell on current terminal]' \
+  {-no-jni,-nojni}'[disable JNI checks in the Dalvik runtime]' \
+  '-logcat[enable logcat output with given tags]:logcat tags' \
+  '(-audio -noaudio -no-audio)'{-noaudio,-no-audio}'[disable audio support]' \
+  '(-noaudio -no-audio)-audio[use specific audio backend]:audio backend' \
+  '-raw-keys[disable Unicode keyboard reverse-mapping]' \
+  '-radio[redirect radio modem interface to character device]:device' \
+  '-port[TCP port that will be used for the console]:port number' \
+  '-ports[TCP ports used for the console and adb bridge]:console port,adb port' \
+  '-onion[use overlay PNG image over screen]: :_files -g "*.(png|PNG)"' \
+  '-onion-alpha[specify onion-skin translucency]:percentage' \
+  '-onion-rotation[specify onion-skin rotation]:rotation:((1 2 3 4))' \
+  '-scale[scale emulator window]:scale' \
+  '-dpi-device[specify device'\''s resolution in dpi (default 165)]:dpi' \
+  '-http-proxy[make TCP connections through a HTTP/HTTPS proxy]:proxy' \
+  '-timezone[use this timezone instead of the host'\''s default]:timezone' \
+  '-dns-server[use this DNS server(s) in the emulated system]:DNS servers' \
+  '-cpu-delay[throttle CPU emulation]:CPU delay' \
+  '-no-boot-anim[disable animation for faster boot]' \
+  '-no-window[disable graphical window display]' \
+  '-report-console[report console port to remote socket]: :_socket' \
+  '-gps[redirect NMEA GPS to character device]:device' \
+  '-keyset[specify keyset file name]: :_files' \
+  '-shell-serial[specific character device for root shell]:device' \
+  '-tcpdump[capture network packets to file]: :_files' \
+  '-bootchart[enable bootcharting]:timeout' \
+  '-charmap[use specific key character map]: :_files' \
+  '*-prop[set system property on boot]:name=value' \
+  '-shared-net-id[join the shared network, using IP address 10.1.2.<number>]:number' \
+  '-nand-limits[enforce NAND/Flash read/write thresholds]:limits' \
+  '-memcheck[enable memory access checking]:flags' \
+  '-qemu[pass arguments to qemu]:arguments' \
+  '-verbose[same as '\''-debug-init'\'']' \
+  '*'{-debug,-debug-,-debug-no-}'[enable/disable specific debug messages]:tag'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_envdir b/zsh/modules/completion/external/src/_envdir
new file mode 100644
index 0000000..6437993
--- /dev/null
+++ b/zsh/modules/completion/external/src/_envdir
@@ -0,0 +1,49 @@
+#compdef envdir
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016, Github zsh-users (https://github.com/zsh-users)
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for envdir (https://github.com/jezdez/envdir).
+#  It completes its few options and then a directory and command.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Daniel Hahler <https://daniel.hahler.de/>
+#
+# ------------------------------------------------------------------------------
+
+args=(
+  '(-h --help)'{-h+,--help}'[show this help message and exit]'
+  '(-)'--version'[display version information and exit]'
+  '(-)1:directory: _path_files -/'
+  '(-)2:command: _command_names -e'
+  '*::arguments: _precommand'
+)
+_arguments -S $args
diff --git a/zsh/modules/completion/external/src/_exportfs b/zsh/modules/completion/external/src/_exportfs
new file mode 100644
index 0000000..1925f07
--- /dev/null
+++ b/zsh/modules/completion/external/src/_exportfs
@@ -0,0 +1,51 @@
+#compdef exportfs
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for nfs's exportfs - maintain table of exported NFS file systems.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Timofey Titovets <nefelim4ag@gmail.com>
+#
+# ------------------------------------------------------------------------------
+_exportfs() {
+  _values -w 'option' \
+    '(-i)-a[Export or unexport all directories]' \
+    '(-a -r -u)-i[Ignore the /etc/exports file and files under /etc/exports.d directory]' \
+    '(-i)-r[Reexport  all  directories]' \
+    '(-i)-u[Unexport one or more directories]' \
+    '-f[flush everything out of export table]' \
+    '-o[option1,option2.. Specify a list of export options]' \
+    '-s[Display the current export list suitable for /etc/exports]' \
+    '-v[Be verbose]'
+}
+_exportfs "$@"
diff --git a/zsh/modules/completion/external/src/_fab b/zsh/modules/completion/external/src/_fab
new file mode 100644
index 0000000..21b3a28
--- /dev/null
+++ b/zsh/modules/completion/external/src/_fab
@@ -0,0 +1,109 @@
+#compdef fab
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Fabric (http://fabfile.org)
+#
+#  Source: https://github.com/vhbit/fabric-zsh-autocomplete
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Valerii Hiora (https://github.com/vhbit)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext=$curcontext state line
+declare -A opt_args
+
+declare target_list
+target_list=(`fab --shortlist 2>/dev/null`)
+
+_targets() {
+    _describe -t commands "fabric targets" target_list
+}
+
+output_levels=(
+    'status: Status messages, i.e. noting when Fabric is done running, if the user used a keyboard interrupt, or when servers are disconnected from. These messages are almost always relevant and rarely verbose.'
+    'aborts: Abort messages. Like status messages, these should really only be turned off when using Fabric as a library, and possibly not even then. Note that even if this output group is turned off, aborts will still occur – there just won’t be any output about why Fabric aborted!'
+    'warnings: Warning messages. These are often turned off when one expects a given operation to fail, such as when using grep to test existence of text in a file. If paired with setting env.warn_only to True, this can result in fully silent warnings when remote programs fail. As with aborts, this setting does not control actual warning behavior, only whether warning messages are printed or hidden.'
+    'running: Printouts of commands being executed or files transferred, e.g. [myserver] run: ls /var/www. Also controls printing of tasks being run, e.g. [myserver] Executing task ''foo''.'
+    'stdout: Local, or remote, stdout, i.e. non-error output from commands.'
+    'stderr: Local, or remote, stderr, i.e. error-related output from commands.'
+    'user: User-generated output, i.e. local output printed by fabfile code via use of the fastprint or puts functions.'
+)
+
+_arguments -w -S -C \
+  '(-)'{-h,--help}'[show this help message and exit]: :->noargs' \
+  '(-)'{-V,--version}'[show program''s version number and exit]: :->noargs' \
+  '(-)--list[print list of possible commands and exit]: :->noargs' \
+  '(-)--shortlist[print non-verbose list of possible commands and exit]: :->noargs' \
+  '(--reject-unknown-hosts)--reject-unknown-hosts[reject unknown hosts]' \
+  '(--no-pty)--no-pty[do not use pseudo-terminal in run/sudo]' \
+  "(-d+ --display=-)"{-d+,--display=-}"[print detailed info about a given command]: :_targets" \
+  '(-D --disable-known-hosts)'{-D,--disable-known-hosts}'[do not load user known_hosts file]' \
+  '(-r --reject-unknown-hosts)'{-r,--reject-unknown-hosts}'[reject unknown hosts]' \
+  '(-u+ --user=-)'{-u+,--user=-}'[username to use when connecting to remote hosts]: :' \
+  '(-p+ --password=-)'{-p+,--password=-}'[password for use with authentication and/or sudo]: :' \
+  '(-H+ --hosts=-)'{-H+,--hosts=-}'[comma separated list of hosts to operate on]: :' \
+  '(-R+ --roles=-)'{-R+,--roles=-}'[comma separated list of roles to operate on]: :' \
+  '(-a --no-agent)'{-a,--no-agent}'[don''t use the running SSH agent]' \
+  '(-k --no-keys)'{-k,--no-keys}'[don''t load private key files from ~/.ssh/]' \
+  '(-w --warn-only)'{-w,--warn-only}'[warn instead of abort, when commands fail]' \
+  '-i+[path to SSH private key file. May be repeated]: :_files' \
+  "(-f+ --fabfile=)"{-f+,--fabfile=}"[Python module file to import]: :_files -g *.py" \
+  '(-c+ --config=-)'{-c+,--config=-}'[specify location of config file to use]: :_files' \
+  '(-s+ --shell=-)'{-s+,--shell=-}'[specify a new shell, defaults to ''/bin/bash -l -c'']: :' \
+  '(--ssh-config-path=)--ssh-config-path=[ssh config path]: :_files' \
+  '(--hide=-)--hide=-[comma-separated list of output levels to hide]: :->levels' \
+  '(--show=-)--show=-[comma-separated list of output levels to show]: :->levels' \
+  '*::: :->subcmds' && return 0
+
+if [[ CURRENT -ge 1 ]]; then
+    case $state in
+        noargs)
+             _message "nothing to complete";;
+        levels)
+            _describe -t commands "output levels" output_levels;;
+        *)
+            _targets;;
+    esac
+
+    return
+fi
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ffind b/zsh/modules/completion/external/src/_ffind
new file mode 100644
index 0000000..c9a05a0
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ffind
@@ -0,0 +1,61 @@
+#compdef ffind
+# ------------------------------------------------------------------------------
+# Copyright (c) 2017 Github zsh-users - http://github.com/zsh-users
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ffind (https://github.com/jaimebuelta/ffind).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Sergei Eremenko (https://github.com/SmartFinn)
+#
+# ------------------------------------------------------------------------------
+
+_arguments -C \
+  '(-h --help)'{-h,--help}'[show help message and exit]' \
+  '--version[show version number and exit]' \
+  '-p[match whole path, not only name of files]' \
+  '--nocolor[do not display color]' \
+  '--nosymlinks[do not follow symlinks]' \
+  '--hidden[do not ignore hidden directories]' \
+  '-c[force case sensitive]' \
+  '--delete[delete files found]' \
+  '--exec[execute the given command with the file found]:command:_command_names' \
+  '--module[execute the given module with the file found]:module_name args:' \
+  '--command[execute the given python program with the file found]:program:_files' \
+  '--ignore-vcs[ignore version control system files and directories]' \
+  '-f[experimental fuzzy search]' \
+  '--return-results[for testing purposes only]' \
+  '1:directory to search:_path_files -/' \
+  '*:filepattern:'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_fleetctl b/zsh/modules/completion/external/src/_fleetctl
new file mode 100644
index 0000000..a754e3c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_fleetctl
@@ -0,0 +1,123 @@
+#compdef fleetctl
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for fleetctl (https://github.com/coreos/fleet).
+#
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Remi Paulmier (https://github.com/shtouff)
+#
+# ------------------------------------------------------------------------------
+
+# fleetctl zsh completion
+
+local -a _1st_arguments
+_1st_arguments=(
+    'cat:Output the contents of a submitted unit'
+    'destroy:Destroy one or more units in the cluster'
+    'fd-forward:Proxy stdin and stdout to a unix domain socket'
+    'help:Show a list of commands or help for one command'
+    'journal:Print the journal of a unit in the cluster to stdout'
+    'list-machines:Enumerate the current hosts in the cluster'
+    'list-unit-files:List the units that exist in the cluster.'
+    'list-units:List the current state of units in the cluster'
+    'load:Schedule one or more units in the cluster, first submitting them if necessary.'
+    'ssh:Open interactive shell on a machine in the cluster'
+    'start:Instruct systemd to start one or more units in the cluster, first submitting and loading if necessary.'
+    'status:Output the status of one or more units in the cluster'
+    'stop:Instruct systemd to stop one or more units in the cluster.'
+    'submit:Upload one or more units to the cluster without starting them'
+    'unload:Unschedule one or more units in the cluster.'
+    'version:Print the version and exit'
+)
+
+__task_list ()
+{
+    local expl
+    declare -a tasks
+
+    tasks=(cat destroy fd-forward help journal list-machines list-unit-files \
+      list-units load ssh start status stop submit unload version)
+
+    _wanted tasks expl 'help' compadd $tasks
+}
+
+__unit_list ()
+{
+    _wanted application expl 'command' compadd $(command fleetctl list-units | \
+      tail -n +2  | awk '{print $1}')
+}
+
+local expl
+
+local curcontext="$curcontext" state line
+local -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+      _describe -t commands "gem subcommand" _1st_arguments
+      return
+  ;;
+
+  (options)
+    case $line[1] in
+      (help)
+         _arguments ':feature:__task_list'
+      ;;
+
+      (destroy|journal|start|status|stop|unload|cat)
+          _arguments '*:feature:__unit_list'
+      ;;
+
+      (load|submit)
+          _arguments '*:file:_files -g *.service'
+      ;;
+
+      (ssh)
+          _arguments '*:host:_hosts'
+      ;;
+
+      (*)
+          _arguments '*:file:_files'
+      ;;
+    esac
+  ;;
+esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_gas b/zsh/modules/completion/external/src/_gas
new file mode 100644
index 0000000..c173507
--- /dev/null
+++ b/zsh/modules/completion/external/src/_gas
@@ -0,0 +1,69 @@
+#compdef gas
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for gas (https://github.com/walle/gas).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Fredrik Wallgren <fredrik.wallgren@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+  '(- 1 *)'{-v,--version}'[display version information]' \
+  '(-h|--help)'{-h,--help}'[show help information]' \
+  '1: :->cmds' \
+  '*: :->args' && ret=0
+
+case "$state" in
+  (cmds)
+    cmds=(
+      "version:Prints Gas's version"
+      "use:Uses author"
+      "show:Shows your current user"
+      "list:Lists your authors"
+      "import:Imports current user to gasconfig"
+      "help:Describe available tasks or one specific task"
+      "delete:Deletes author"
+      "add:Adds author to gasconfig"
+    )
+    _describe -t commands 'gas command' cmds && ret=0
+  ;;
+  (args)
+    case "$line[1]" in
+      (use|delete)
+        _values -S , 'authors' $(cat ~/.gas | sed -n -e 's/^\[\(.*\)\]/\1/p') && ret=0
+      ;;
+    esac
+  ;;
+esac
+
+return ret
+
diff --git a/zsh/modules/completion/external/src/_geany b/zsh/modules/completion/external/src/_geany
new file mode 100644
index 0000000..b55bd5c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_geany
@@ -0,0 +1,73 @@
+#compdef geany
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Geany (http://www.geany.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+  '(- 1 *)'{-h,--help}'[Show help options]' \
+  '(- 1 *)--help-all[Show all help options]' \
+  '(- 1 *)--help-gtk[Show GTK+ Options]' \
+  '(- 1 *)'{-V,--version}'[Show version and exit]' \
+  '(--column)--column[Set initial column number for the first opened file (useful in conjunction with --line)]:column number' \
+  '(-c --config)'{-c,--config}'[Use an alternate configuration directory]:configuration file:_files' \
+  '(--ft-names)--ft-names[Print internal filetype names]' \
+  '(-g --generate-tags)'{-g,--generate-tags}'[Generate global tags file (see documentation)]' \
+  '(-P --no-preprocessing)'{-P,--no-preprocessing}'[Don'\''t preprocess C/C++ files when generating tags]' \
+  '(-i --new-instance)'{-i,--new-instance}'[Don'\''t open files in a running instance, force opening a new instance]' \
+  '(--socket-file)--socket-file[Use this socket filename for communication with a running Geany instance]:socket file:_files' \
+  '(--list-documents)--list-documents[Return a list of open documents in a running Geany instance]' \
+  '(-l --line)'{-l,--line}'[Set initial line number for the first opened file]:line number' \
+  '(-m --no-msgwin)'{-m,--no-msgwin}'[Don'\''t show message window at startup]' \
+  '(-n --no-ctags)'{-n,--no-ctags}'[Don'\''t load auto completion data (see documentation)]' \
+  '(-p --no-plugins)'{-p,--no-plugins}'[Don'\''t load plugins]' \
+  '(--print-prefix)--print-prefix[Print Geany'\''s installation prefix]' \
+  '(-s --no-session)'{-s,--no-session}'[Don'\''t load the previous session'\''s files]' \
+  '(-t --no-terminal)'{-t,--no-terminal}'[Don'\''t load terminal support]' \
+  '(--vte-lib)--vte-lib[Filename of libvte.so]:libvte.so filename:_files -g "*.so"' \
+  '(-v --verbose)'{-v,--verbose}'[Be verbose]' \
+  '(--display)--display[X display to use]:X display:_x_display' \
+  '*: :_files'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ghc b/zsh/modules/completion/external/src/_ghc
new file mode 100644
index 0000000..7d4e1ef
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ghc
@@ -0,0 +1,618 @@
+#compdef ghc ghci ghc-pkg
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# Completion script for ghc (http://www.haskell.org/ghc/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Gérard Milmeister
+# * Philip Dexter <philip.dexter@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local state
+local WORDS
+
+#
+# ghci
+#
+
+_ghc_ghci () { _ghc_compiler }
+
+#
+# ghc
+#
+
+_ghc_compiler ()
+{
+    _arguments \
+        "-no-hs-main[Don't assume this program contains main]" \
+        "-no-user-package-conf[Don't load the user's package config file]" \
+        '(- *)'{--help,-\?}'[Show help information]' \
+        '*-I-[Add directory to path for #include files]:directory:_files -/' \
+        '*-X-[Language flags]:flag:_ghc_language_flags' \
+        '*-d-[Debugging options]:flag:_ghc_debugging_options' \
+        '*-f-[Compiler options]:flag:_ghc_compiler_flags' \
+        '*-hide-package[Hide package]:Package:_ghc_pkg_list_packages' \
+        '*-trust[Expose package and set it to be trusted]:Package:_ghc_pkg_list_packages' \
+        '*-distrust[Expose package and set it to be distrusted]:Package:_ghc_pkg_list_packages' \
+        '*-distrust-all[Distrust all packages by default]' \
+        '*-i-[Add directory to import path]:directory:->ghc_include_directory' \
+        '*-package[Expose package]:Package:_ghc_pkg_list_packages' \
+        '*:file:_files -g \*.\{lhs,hs,hc,c,s\}' \
+        '--info[Display information about the compiler]' \
+        '--show-options[Display the supported command line options]' \
+        '--interactive[Interactive mode]' \
+        '--make[Compile and link a complete Haskell program]:file:_files -g "*.{lhs,hs,hc,c,s}"' \
+        '--numeric-version[Display GHC version (numeric only)]' \
+        '--print-libdir[Display GHC library directory]' \
+        '--show-iface[Show interface]:file:_files -g "*.hi"' \
+        {--supported-languages,--supported-extensions}'[Display the supported language extensions]' \
+        '-C[Stop after generating C]' \
+        '-E[Stop after generating preprocessed, de-litted Haskell]' \
+        '-H[Minimum heap size]:size:' \
+        '-M[Output Makefile rules]' \
+        '-O-[Enable optimization]:level:(0 1 2)' \
+        '-Rghc-timing[Summarise timing stats for GHC]' \
+        '-S[Stop after generating assembler]' \
+        '-V[Display GHC version]' \
+        '-W[Enable normal warnings]' \
+        '-Wall[Enable almost all warnings]' \
+        '-Werror[Make warnings fatal]' \
+        '-Wwarn[Make warnings non-fatal]' \
+        '-c[Stop after generating object files]' \
+        '-eventlog[Enable runtime event tracing]' \
+        '-debug[Use the debugging runtime]' \
+        "-dylib-install-name[On Darwin/OS X only, set the install name]" \
+        '-dynamic[Use dynamic Haskell libraries]' \
+        '-dynamic-too[Build dynamic object files as well as static object files during compilation]' \
+        '-dynosuf[Set the output suffix for dynamic object files]' \
+        '-dynload[Select one of a number of modes for finding shared libraries at runtime]' \
+        '--mk-dll[DLL-creation mode (Windows only)]' \
+        '-framework-path[On Darwin/OS X/iOS only, add dir to the list of directories searched for frameworks]' \
+        '-shared[Generate a shared library (as opposed to an executable)]' \
+        '-staticlib[On Darwin/OS X/iOS only, generate a standalone static library (as opposed to an executable)]' \
+        '-e[Evaluate expression]' \
+        '-hide-all-packages[Hide all packages by default]' \
+        '-hpcdir[Directory to deposit .mix files during compilation (default is .hpc)]' \
+        '-n[Do a dry run]' \
+        '-o[Set output filename]:file:_files' \
+        '-outputdir[Set output directory]:directory:_files -/' \
+        '-package-name[Compile to be part of package]' \
+        '-hide-all-packages[Hide all packages by default]' \
+        '-package-db[Add file to the package db stack]:file:_files' \
+        '-clear-package-db[Clear the package db stack]' \
+        '-msse2[(x86 only) Use SSE2 for floating point]' \
+        '-monly-\[432\]-regs[(x86 only) give some registers back to the C compiler]' \
+        '-no-global-package-db[Remove the global package db from the stack]' \
+        '-global-package-db[Add the global package db to the stack]' \
+        "-no-user-package-db[Remove the user's package db from the stack]" \
+        "-user-package-db[Add the user's package db to the stack]" \
+        "-no-auto-link-packages[Don't automatically link in the base and rts packages]" \
+        '-optL[pass option to the literate pre-processor]' \
+        '-optP[pass option to cpp (with -cpp only)]' \
+        '-optF[pass option to the custom pre-processor]' \
+        '-optc[pass option to the C compiler]' \
+        '-optlo[pass option to the LLVM optimiser]' \
+        '-optlc[pass option to the LLVM compiler]' \
+        '-optm[pass option to the mangler]' \
+        '-opta[pass option to the assembler]' \
+        '-optl[pass option to the linker]' \
+        '-optdll[pass option to the DLL generator]' \
+        '-optwindres[pass option to windres.]' \
+        '-prof[Turn on profiling]' \
+        '-pgmL[Use cmd as the literate pre-processor]' \
+        '-pgmP[Use cmd as the C pre-processor (with -cpp only)]' \
+        '-pgmc[Use cmd as the C compiler]' \
+        '-pgms[Use cmd as the splitter]' \
+        '-pgml[Use cmd as the linker]' \
+        '-pgmdll[Use cmd as the DLL generator]' \
+        '-pgmF[Use cmd as the pre-proecessor (with -F only)]' \
+        '-pgmwindres[Use cmd as the program for embedding manifests on Windows]' \
+        '-pgmlibtool[Use cmd as the command for libtool (with -staticlib only)]' \
+        '-rtsopts[Only a minimum of safe options can be given to RTS]' \
+        '-rtsopts=[Control whether the RTS behavior can be tweaked via command-line flags and the GHCRTS environment varaible (none, som, or all)]' \
+        '-with-rtsopts=[Set the default RTS options]' \
+        '-threaded[Use the threaded runtime]' \
+        '-ticky[Turn on ticky-ticky profiling]' \
+        '-tmpdir[Set the directory for temporary files]:directory:_files -/' \
+        '-v-[Control verbosity]:level:(0 1 2 3 4 5)' \
+        '-w[Disable all warnings]' \
+        '-x[Override default behaviour for source files]:suffix:(hs lhs hc c s o hspp)' \
+        '-hcsuf[Set the suffix to use for intermediate]:suffix:' \
+        '-hidir[Set directory for interface files]:directory:_files -/' \
+        '-hisuf[Set the suffix to use for interface files]:suffix:' \
+        '-odir[Set directory for object files]:directory:_files -/' \
+        '-ohi[Set the filename in which to put the interface]:filename:_files -/' \
+        '-osuf[Set the output file suffix]:suffix:' \
+        '-stubdir[Redirect FFi stub files]:directory:_files -/' \
+        '-dumpdir[Redirect dump files]:directory:_files -/' \
+        '-outputdir[Set output directory]:directory:_files -/' \
+        '-keep-hc-files[Retain intermediate .hc files]' \
+        '-keep-llvm-files[Retain intermediate LLVM .ll files]' \
+        '-keep-s-files[Retain intermediate .s files]' \
+        '-keep-raw-s-files[Retain intermediate .raw_s files]' \
+        '-keep-tmp-files[Retain all intermediate temporary files]' \
+        '-static[Use static Haskell libraries]' \
+        '-split-objs[Split objects (for libraries)]' \
+        '-no-link[Omit linking]' \
+        '-main-is[Set main module and function]:function:' \
+        '*-L-[Add dir to the list of directories searched for libraries]:directory:_files -/' \
+        '*-l-[Link in library]:library:->library'
+
+    [[ -n "$state" ]] &&
+    case "$state" in
+        ghc_include_directory) _ghc_include_directory ;;
+        library)
+            _wanted libraries expl library \
+                compadd - \
+                ${^=LD_LIBRARY_PATH:-/usr/lib /usr/local/lib}/lib*.(a|so*)(:t:fr:s/lib//) \
+                && ret=0
+    esac
+}
+
+
+_ghc_include_directory ()
+{
+    compset -P '*:'
+    compset -S ':*'
+    _path_files -r': ' -/
+}
+
+_ghc_compiler_flags ()
+{
+    local _ghc_compiler_flags_list
+    _ghc_compiler_flags_list=(
+        'ghci-hist-size:Set the number of entries GHCi keeps for \:history'
+        'print-explicit-foralls:Print explicit forall quantification in types'
+        'print-explicit-kinds:Print explicit kind foralls and kind arguments in types'
+        {no-,}'break-on-error:Break on uncaught exceptions and errors'
+        {no-,}'break-on-exception:Break on any exception thrown'
+        {no-,}'case-merge:Enable case-merging'
+        {no-,}'defer-type-errors:Defer as many type errors as possible until runtime'
+        {no-,}'dicts-strict:Make dictionaries strict'
+        {no-,}'do-eta-reduction:Enable eta-reduction'
+        {no-,}'do-lambda-eta-expansion:Enable lambda eta-reduction'
+        'eager-blackholing:Turn on eager blackholing'
+        {no-,}'enable-rewrite-rules:Switch on all rewrite rules (including rules generated by automatic specialisation of overloaded functions)'
+        'error-spans:Output full span in error messages'
+        'ext-core:Generate .hcr external Core file'
+        'force-recomp:Turn off recompilation checking'
+        {no-,}'float-in:Turn on the float-in transformation'
+        {no-,}'full-laziness:Turn on full laziness (floating bindings outwards)'
+        {no-,}'fun-to-thunk:Allow worker-wrapper to convert a function closure into a thunk if the function does not use any of its arguments. Off by default.'
+        {no-,}'glasgow-exts:Enable most language extensions'
+        {no-,}'helpful-errors:Make suggestions for mis-spelled names'
+        'history-size:Set simplification history size'
+        {no-,}'ignore-asserts:Ignore assertions in the source'
+        {no-,}'ignore-interface-pragmas:Ignore pragmas in interface files'
+        {no-,}'loopification:Turn saturated self-recursive tail-calls into local jumps in the generated assembly'
+        {no-,}'late-dmd-anal:Run demand analysis again, at the end of the simplification pipeline'
+        {no-,}'liberate-case:Turn on the liberate-case transformation'
+        'liberate-case-threshold=:Set the size threshold for the liberate-case transformation (default 200)'
+        'no-liberate-case-threshold:Set the size threshold for the liberate-case transformation (default 200)'
+        {no-,}'max-relevant-bindings=N:Set the maximum number of bindings to display in type error messages (default 6).'
+        'max-worker-args=:If a worker has that many arguments, none will be unpacked anymore (default 10)'
+        'max-simplifier-iterations=:Set the max iterations for the simplifier'
+        'no-asm-mangling:Turn off assembly mangling'
+        'no-black-holing:Turn off black holing'
+        "no-hi-version-check:Don't complain about .hi file mismatches"
+        'no-implicit-import-qualified:Turn off implicit qualified import of everything in GHCi'
+        'no-print-bind-contents:Turn off printing of binding contents in GHCi'
+        'no-opt-coercion:Turn off the coercion optimiser'
+        'no-ghci-history:Do not use the load/store the GHCi command history from/to ghci_history'
+        'no-ghci-sandbox:Turn off the GHCi sandbox. Means computations are run in the main thread, rather than a forked thread'
+        'no-gen-manifest:Do not generate a manifest file (Windows only)'
+        'no-embed-manifest:Do not embed the manifest in the executable (Windows only)'
+        "no-shared-implib:Don't generate an import library for a DLL (Windows only)"
+        'no-pre-inlining:Turn off pre-inlining'
+        'no-state-hack:Turn off the "state hack" whereby any lambda with a real-world state token as argument is considered to be single-entry'
+        {no-,}'print-bind-result:Turn on printing of binding results in GHCi'
+        {no-,}'print-evld-with-show:Enable usage of Show instances in \:print'
+        'unregisterised:Unregisterised compilation'
+        'asm:Use the native code generator'
+        'via-C:Compile via C'
+        'no-code:Omit code generation'
+        'byte-code:Generate byte-code'
+        'object-code:Generate object code'
+        'hpc:Turn on Haskell program coverage instrumentation'
+        'PIC:Generate position-independent code'
+        'plugin=:Load a plugin exported by a given module'
+        'plugin-opt=:Give arguments to a plugin module'
+        'context-stack=:Set the limit for context reduction (default is 20)'
+        'type-function-depth=:Set the limit for type function reductions (default is 200)'
+        'force-recomp:Turn off recompilation checking'
+        {no-,}"omit-interface-pragmas:Don't generate interface pragmas"
+        'package-trust:Enable Safe Haskell trusted package requirement for trustworthy modules'
+        {no-,}'pedantic-bottoms:Make GHC be more precise about its treatment of bottom'
+        {no-,}'disambiguate-record-fields:Enable record field disambiguation'
+        {no-,}'irrefutable-tuples:Make tuple pattern matching irrefutable'
+        {no-,}'vectorise:Enable vectorisation of nested data parallelism'
+        {no-,}'avoid-vect:Enable vectorisation avoidance'
+        {no-,}'excess-precision:Enable excess intermediate precision'
+        {no-,}'prof-auto:Auto-add SCCs to all bindings not marked INLINE'
+        {no-,}'prof-auto-top:Auto-add SCCs to all top-level bindings not marked INLINE'
+        {no-,}'prof-auto-exported:Auto-add SCCs to all exported bindings not marked INLINE'
+        {no-,}'prof-cafs:Auto-add SCCs to all CAFs'
+        {no-,}'prof-count-entries:Collect entry counts'
+        'simplifier-phases:Set the number of phases for the simplifier (default 2)'
+        'simpl-tick-factor=:Set the percentage factor for simplifier ticks (default 100)'
+        {no-,}'spec-constr:Turn on the SpecConstr transformation'
+        {no-,}'spec-constr-threshold=:Set the size threshold for the SpecConstr transformation (default 200)'
+        {no-,}'spec-constr-count=:Set the maximum number of specialisations that will be created for any one function by the SpecConstr transformation (default 3)'
+        'strictness=before=:Run an additional strictness analysis before a simplifier phase'
+        {no-,}'static-argument-transformation:Turn on the static argument transformation'
+        {no-,}'unbox-strict-fields:Flatten strict constructor fields'
+        {no-,}'unbox-small-strict-fields:Flatten strict constructor fields with a pointer-sized representation'
+        {no-,}'unfolding-creation-threshold:Tweak unfolding settings'
+        {no-,}'unfolding-fun-discount:Tweak unfolding settings'
+        {no-,}'unfolding-keeness-factor:Tweak unfolding settings'
+        {no-,}'unfolding-use-threshold:Tweak unfolding settings'
+        {no-,}'warn-warnings-deprecations:Warn about uses of functions & types that have warnings or deprecated pragmas'
+        {no-,}'warn-deprecated-flags:Warn about uses of commandline flags that are deprecated'
+        {no-,}'warn-duplicate-exports:Warn when an entity is exported multiple times'
+        {no-,}'warn-hi-shadowing:Warn when a .hi file in the current directory shadows a library'
+        {no-,}'warn-implicit-prelude:Warn when the Prelude is implicitly imported'
+        {no-,}'warn-incomplete-patterns:Warn when a pattern match could fail'
+        {no-,}'warn-incomplete-record-updates:Warn when a record update could fail'
+        {no-,}'warn-missing-fields:Warn when fields of a record are uninitialised'
+        {no-,}'warn-missing-methods:Warn when class methods are undefined'
+        {no-,}'warn-missing-signatures:Warn about top-level functions without signatures'
+        {no-,}'warn-duplicate-constraints:Warn when a constraint appears duplicated in a type signature'
+        {no-,}'warn-identities:Warn about uses of Prelude numeric conversions that are probably the identity (and hence could be omitted)'
+        {no-,}'warn-incomplete-uni-patterns:Warn when a pattern match in a lambda expression or pattern binding could fail'
+        {no-,}'warn-lazy-unlifted-bindings:(Deprecated) warn when a pattern binding looks lazy but must be strict'
+        {no-,}'warn-missing-import-lists:Warn when an import declaration does not explicitly list all the names brought into scope'
+        {no-,}'warn-missing-local-sigs:Warn about polymorphic local bindings without signatures'
+        {no-,}'warn-monomorphism-restriction:Warn when the Monomorphism Restriction is applied'
+        {no-,}'warn-name-shadowing:Warn when names are shadowed'
+        {warn-orphans,warn-auto-orphans}':Warn when the module contains orphan instance declarations or rewrite rules'
+        {no-,}'warn-overlapping-patterns:Warn about overlapping patterns'
+        {no-,}'warn-tabs:Warn if there are tabs in the source file'
+        {no-,}'warn-type-defaults:Warn when defaulting happens'
+        {no-,}"warn-unrecognised-pragmas:Warn about uses of pragmas that GHC doesn't recognise"
+        {no-,}'warn-unused-binds:Warn about bindings that are unused'
+        {no-,}'warn-unused-imports:Warn about unnecessary imports'
+        {no-,}"warn-unused-matches:Warn about variables in patterns that aren't used"
+        {no-,}'warn-unused-do-bind:Warn about do bindings that appear to throw away values of types other than ()'
+        {no-,}'warn-wrong-do-bind:Warn about do bindings that appear to throw away monadic values that you should have bound instead'
+        {no-,}'warn-unsafe:Warn if the module being compiled is regarded to be unsafe'
+        {no-,}'warn-safe:Warn if the module being compiled is regarded to be safe'
+        {no-,}'warn-amp:Warn on definitions conflicting with the Applicative-Monad Proposal (AMP)'
+        {no-,}'warn-typed-holes:Enable holes in expressions'
+        )
+    _describe -t flags 'ghc' _ghc_compiler_flags_list || compadd "$@"
+}
+
+_ghc_debugging_options ()
+{
+    local _ghc_debugging_options_list
+    _ghc_debugging_options_list=(
+        "dump-hi:Dump the new interface to stdout"
+        "dump-hi-diffs:Show the differences vs. the old interface"
+        "dump-minimal-imports:Dump a minimal set of imports"
+        "core-lint:Turn on internal sanity checking"
+        "dump-asm:Dump assembly"
+        "dump-bcos:Dump interpreter byte code"
+        "dump-cmm:Dump C-- output"
+        "dump-cpranal:Dump output from CPR analysis"
+        "dump-cse:Dump CSE output"
+        "dump-deriv:Dump deriving output"
+        "dump-ds:Dump desugarer output"
+        'dump-flatC:Dump "flat" C'
+        "dump-foreign:Dump foreign export stubs"
+        "dump-hpc:Dump after instrumentation for program coverage"
+        "dump-inlinings:Dump inlining info"
+        "dump-occur-anal:Dump occurrence analysis output"
+        "dump-opt-cmm:Dump the results of C-- to C-- optimising passes"
+        "dump-parsed:Dump parse tree"
+        "dump-prep:Dump prepared core"
+        "dump-rn:Dump renamer output"
+        "dump-rules:Dump rules"
+        "dump-simpl:Dump final simplifier output"
+        "dump-simpl-phases:Dump output from each simplifier phase"
+        "dump-simpl-iterations:Dump output from each simplifier iteration"
+        "dump-spec:Dump specialiser output"
+        "dump-splices:Dump TH spliced expressions"
+        "dump-stg:Dump final STG"
+        "dump-stranal:Dump strictness analyser output"
+        "dump-tc:Dump typechecker output"
+        "dump-types:Dump type signatures"
+        "dump-worker-wrapper:Dump worker-wrapper output"
+        "dump-if-trace:Trace interface files"
+        "dump-tc-trace:Trace typechecker"
+        "dump-to-file:Dump to files instead of stdout"
+        "dump-core-stats:Print a one-line summary of the size of the Core program at the end of the optimisation pipeline"
+        "dump-llvm:Dump LLVM intermediate code"
+        "dump-rule-firings:Dump rule firing info"
+        "dump-rule-rewrites:Dump detailed rule firing info"
+        "dump-vect:Dump vectoriser input and output"
+        "dump-strsigs:Dump strictness signatures"
+        "dump-vt-trace:Trace vectoriser"
+        "dump-rn-trace:Trace renamer"
+        "dump-rn-stats:Renamer stats"
+        "dump-simpl-stats:Dump simplifier stats"
+        "suppress-all:In core dumps, suppress everything (except for uniques) that is suppressible"
+        "suppress-uniques:Suppress the printing of uniques in debug output (easier to use diff)"
+        "suppress-idinfo:Suppress extended information about identifiers where they are bound"
+        "suppress-module-prefixes:Suppress the printing of module qualification prefixes"
+        "suppress-type-signatures:Suppress type signatures"
+        "suppress-type-applications:Suppress type applications"
+        "suppress-coercions:Suppress the printing of coercions in Core dumps to make them shorter"
+        "no-debug-output:Suppress unsolicited debugging output"
+        "ppr-debug:Turn on debug printing (more verbose)"
+        "ppr-noprags:Don't output pragma info in dumps"
+        "ppr-user-length:Set the depth for printing expressions in error msgs"
+        "ppr-colsNNN:Set the width of debugging output. For example -dppr-cols200"
+        "ppr-case-as-let:Print single alternative case expressions as strict lets"
+        "source-stats:Dump haskell source stats"
+        "cmm-lint:C-- pass sanity checking"
+        "stg-lint:STG pass sanity checking"
+        "stg-stats:Dump STG stats"
+        "verbose-core2core:Show output from each core-to-core pass"
+        "verbose-stg2stg:Show output from each STG-to-STG pass"
+        "show-passes:Print out each pass name as it happens"
+        "faststring-stats:Show statistics for fast string usage when finished"
+    )
+    _describe -t flags 'ghc' _ghc_debugging_options_list || compadd "$@"
+}
+
+
+_ghc_language_flags ()
+{
+    local _ghc_language_flags_list
+    _ghc_language_flags_list=(
+        "AllowAmbiguousTypes:Allow the user to write ambiguous types, and the type inference engine to infer them"
+        "Arrows:Enable arrow notation extension"
+        "AutoDeriveTypeable:Automatically derive Typeable instances for every datatype and type class declaration"
+        "BangPatterns:Enable bang patterns"
+        "ConstraintKinds:Enable a kind of constraints"
+        "CPP:Enable the C preprocessor"
+        "ConstrainedClassMethods:Enable constrained class methods"
+        "DataKinds:Enable datatype promotion"
+        "DefaultSignatures:Enable default signatures"
+        "DeriveDataTypeable:Enable deriving for the Data and Typeable classes"
+        "DeriveGeneric:Enable deriving for the Generic class"
+        "DisambiguateRecordFields:Enable record field disambiguation"
+        "EmptyCase:Allow empty case alternatives"
+        "EmptyDataDecls:Enable empty data declarations"
+        "ExistentialQuantification:Enable existential quantification"
+        "ExplicitForAll:Enable explicit universal quantification"
+        "ExplicitNamespaces:Enable using the keyword type to specify the namespace of entries in imports and exports"
+        "ExtendedDefaultRules:Use GHCi's extended default rules in a normal module"
+        "FlexibleContexts:Enable flexible contexts"
+        "FlexibleInstances:Enable flexible instances"
+        "ForeignFunctionInterface:Enable foreign function interface"
+        "FunctionalDependencies:Enable functional dependencies"
+        "GADTs:Enable generalised algebraic data types"
+        "GADTSyntax:Enable generalised algebraic data type syntax"
+        "GeneralizedNewtypeDeriving:Enable newtype deriving"
+        "Generics:Enable generic classes"
+        "ImplicitParams:Enable Implicit Parameters"
+        "ImpredicativeTypes:Enable impredicative types"
+        "IncoherentInstances:Enable incoherent instances"
+        "InterruptibleFFI:Enable interruptible FFI"
+        "KindSignatures:Enable kind signatures"
+        "LambdaCase:Enable lambda-case expressions"
+        "LiberalTypeSynonyms:Enable liberalised type synonyms"
+        "MonadComprehensions:Enable monad comprehensions"
+        "MonoLocalBinds:Enable do not generalise local bindings"
+        "MultiParamTypeClasses:Enable multi parameter type classes"
+        "MultiWayIf:Enable multi-way if-expressions"
+        "NamedFieldPuns:Enable record puns"
+        "NegativeLiterals:Enable support for negative literals"
+        "NewQualifiedOperators:Enable new qualified operator syntax"
+        "NoImplicitPrelude:Don't implicitly import Prelude"
+        "NoMonoPatBinds:Make pattern bindings polymorphic"
+        "NoMonomorphismRestriction:Disable the monomorphism"
+        "NoNPlusKPatterns:Disable support for n+k patterns"
+        "NoTraditionalRecordSyntax:Disable support for traditional record syntax (as supported by Haskell 98) C {f = x}"
+        "NullaryTypeClasses:Enable nullary (no parameter) type classes"
+        "NumDecimals:Enable support for 'fractional' integer literals"
+        "OverlappingInstances:Enable overlapping instances"
+        "OverloadedLists:Enable overloaded lists"
+        "OverloadedStrings:Enable overloaded string literals"
+        "PArr:Enable parallel arrays"
+        "PackageImports:Enable package-qualified imports"
+        "ParallelArrays:Enable parallel arrays"
+        "ParallelListComp:Enable parallel list comprehensions"
+        "PatternGuards:Enable pattern guards"
+        "PolyKinds:Enable kind polymorphism"
+        "PolymorphicComponents:Enable polymorphic components for data constructors"
+        "QuasiQuotes:Enable quasiquotation"
+        "Rank2Types:Enable rank-2 types"
+        "RankNTypes:Enable rank-N types"
+        "RebindableSyntax:Employ rebindable syntax"
+        "RecordWildCards:Enable record wildcards"
+        "RecursiveDo:Enable recursive do (mdo) notation"
+        "RelaxedPolyRec:Relaxed checking for mutually-recursive polymorphic functions"
+        "Safe:Enable the Safe Haskell Safe mode"
+        "ScopedTypeVariables:Enable lexically-scoped type variables"
+        "StandaloneDeriving:Enable standalone deriving"
+        "TemplateHaskell:Enable Template Haskell"
+        "TransformListComp:Enable transform list comprehensions"
+        "TypeFamilies:Enable type families"
+        "TypeOperators:Enable type operators"
+        "TypeSynonymInstances:Enable type synonyms"
+        "Trustworthy:Enable the Safe Haskell Trustworthy mode"
+        "UnboxedTuples:Enable unboxed tuples"
+        "UndecidableInstances:Enable undecidable instances"
+        "UnicodeSyntax:Enable unicode syntax"
+        "UnliftedFFITypes:Enable unlifted FFI types"
+        "Unsafe:Enable Safe Haskell Unsafe mode"
+        "ViewPatterns:Enable view patterns"
+        'MagicHash:Allow "#" as a postfix modifier on identifiers'
+    )
+    _describe -t flags 'ghc' _ghc_language_flags_list || compadd "$@"
+}
+
+#
+# ghc-pkg
+#
+
+_ghc_pkg ()
+{
+    WORDS=()
+    for w in $words[1,(($CURRENT - 1))]; do
+        if [[ $w != --* ]]; then WORDS+=$w; fi
+    done
+    _arguments '*:command:_ghc_pkg_command'
+}
+
+_ghc_pkg_command()
+{
+    local -a _ghc_pkg_cmds
+    _ghc_pkg_cmds=(
+        "register:Register the package using package description"
+        "update:Register the package (overwriting existing package)"
+        "unregister:Unregister the specified package"
+        "expose:Expose the specified package"
+        "hide:Hide the specified package"
+        "list:List registered packages"
+        "find-module:List registered packages exposing module"
+        "latest:Prints the highest registered version of a package"
+        "check:Check the consistency of package dependencies and list broken packages"
+        "describe:Give the registered description for the specified package"
+        "field:Extract the specified field of the package description"
+        "dump:Dump the registered description for every package"
+    )
+
+    if (( $#WORDS == 1 )); then
+	_describe -t commands 'command' _ghc_pkg_cmds || compadd "$@"
+    else
+    	local curcontext="$curcontext"
+        cmd="${${_ghc_pkg_cmds[(r)$WORDS[2]:*]%%:*}}"
+        if (( $#cmd )); then
+            _arguments \
+                "--user[Use current user's package database]" \
+                '--global[User the global package database]' \
+                {-f,--package-conf=}'[Use the specified package config file]:Package config file:_files' \
+                '--no-user-package-conf[Never reader the user package config]' \
+                {-V,--version}'[Output version information and exit]' \
+                '--force[Ignore missing directories and libraries only]' \
+                {-g,--auto-ghci-libs}'[Automatically build libs for GHCi]' \
+                {-?,--help}'[Display this help and exit]' \
+                '--simple-output[Print output in easy-to-parse format for some commands]' \
+                '--names-only[Only print package names, not versions]' \
+                '--ignore-case[Ignore case for substring matching]' \
+                '*:argument:_ghc_pkg_'$cmd
+        else
+            _message "unknown ghc-pkg command: $WORDS[2]"
+        fi
+    fi
+}
+
+_ghc_pkg_unregister () { _ghc_pkg_list_packages }
+
+_ghc_pkg_expose () { _ghc_pkg_list_packages }
+
+_ghc_pkg_hide () { _ghc_pkg_list_packages }
+
+_ghc_pkg_latest () { _ghc_pkg_list_packages }
+
+_ghc_pkg_describe () { _ghc_pkg_list_packages }
+
+_ghc_pkg_field ()
+{
+    _ghc_pkg_available_packages
+    if (( $#WORDS == 2 )); then
+        compadd "$@" -a -- _ghc_pkg_packages
+    elif (( $#WORDS == 3 )); then
+        compset -P '*,'
+        compset -S ',*'
+        compadd "$@" -S ',' -q -- \
+            name version license copyright maintainer \
+            stability homepage package-url description \
+            category author exposed exposed-modules \
+            hidden-modules import-dirs hs-libraries \
+            extra-libraries extra-ghci-libraries include-dirs \
+            includes depends hugs-options cc-options ld-options \
+            framework-dirs frameworks haddock-interfaces \
+            haddock-html
+    fi
+}
+
+_ghc_pkg_register () { _files }
+
+_ghc_pkg_update () { _files }
+
+_ghc_pkg_list () { _ghc_pkg_list_packages }
+
+_ghc_pkg_find-module ()
+{
+    if (( $#WORDS == 2)); then
+        if ( [[ ${+_ghc_modules} -eq 0 ]] || _cache_invalid GHC_MODULES ) &&
+	    ! _retrieve_cache GHC_MODULES;
+        then
+            _ghc_modules=( $(ghc-pkg dump | sed -n '/^exposed-modules:/{s/^exposed-modules:[ ]\+\(.*\)$/\1/;s/ /\n/;p;be};b;:e;n;/^ /{s/^[ ]\+\(.*\)$/\1/;s/ /\n/;p;be}') )
+            _store_cache GHC_MODULES _ghc_modules
+        fi
+        compadd "$@" -a -- _ghc_modules
+    fi
+}
+
+_ghc_pkg_dump () {}
+
+_ghc_pkg_check () {}
+
+_ghc_pkg_available_packages ()
+{
+    if ( [[ ${+_ghc_pkg_packages_pkgs} -eq 0 ]] || _cache_invalid GHC_PACKAGES ) &&
+	! _retrieve_cache GHC_PACKAGES;
+    then
+        _ghc_pkg_packages=( $(ghc-pkg list --simple-output --names-only) )
+        _store_cache GHC_PACKAGES _ghc_pkg_packages
+    fi
+}
+
+_ghc_pkg_list_packages ()
+{
+    _ghc_pkg_available_packages
+    compadd "$@" -a -- _ghc_pkg_packages
+}
+
+
+#
+# dispatcher
+#
+
+case $service in
+    ghc)
+        _ghc_compiler
+        ;;
+    ghci)
+        _ghc_ghci
+        ;;
+    ghc-pkg)
+        _ghc_pkg
+        ;;
+esac
diff --git a/zsh/modules/completion/external/src/_gist b/zsh/modules/completion/external/src/_gist
new file mode 100644
index 0000000..826c1b7
--- /dev/null
+++ b/zsh/modules/completion/external/src/_gist
@@ -0,0 +1,66 @@
+#compdef gist
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for gist (https://github.com/defunkt/gist)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_arguments -C \
+  '(--login)--login[Authenticate gist on this computer.]' \
+  '(-f --filename)'{-f,--filename}'[Sets the filename and syntax type.]:NAME' \
+  '(-t --type)'{-t,--type}'[Sets the file extension and syntax type.]:EXT' \
+  '(-p --private)'{-p,--private}'[Makes your gist private.]' \
+  '(--no-private)'--no-private'[Makes your gist no private.]' \
+  '(-d --description)'{-d,--description}'[Adds a description to your gist.]:DESCRIPTION' \
+  '(-s --shorten)'{-s,--shorten}'[Shorten the gist URL using git.io.]' \
+  '(-u --update)'{-u,--update}'[Update an existing gist.]:URL ID' \
+  '(-a --anonymous)'{-a,--anonymous}'[Create an anonymous gist.]' \
+  '(-c --copy)'{-c,--copy}'[Copy the resulting URL to the clipboard]' \
+  '(-e --embed)'{-e,--embed}'[Copy the embed code for the gist to the clipboard]' \
+  '(-o --open)'{-o,--open}'[Open the resulting URL in a browser]' \
+  '(--no-open)'--no-open'[No open the resulting URL in a browser]' \
+  '(-P --paste)'{-P,--paste}'[Paste from the clipboard to gist]' \
+  '(-h --help)'{-h,--help}'[print options help]' \
+  '(-v --version)'{-v,--version}'[print version]' \
+  '*: :_files' && ret=0
+
+return ret
diff --git a/zsh/modules/completion/external/src/_git-flow b/zsh/modules/completion/external/src/_git-flow
new file mode 100644
index 0000000..d7c7b73
--- /dev/null
+++ b/zsh/modules/completion/external/src/_git-flow
@@ -0,0 +1,444 @@
+#compdef git-flow
+# ------------------------------------------------------------------------------
+# Copyright (c) 2010-2015 Justin Hileman
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for git-flow (http://github.com/nvie/gitflow).
+#
+#  Source: https://github.com/bobthecow/git-flow-completion
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Justin Hileman (https://github.com/bobthecow)
+#  * Yusuke Muraoka (https://github.com/jbking)
+#  * Vincent Driessen (https://github.com/nvie)
+#  * Zifei Tong (https://github.com/chevalun)
+#  * Ben O'Hara (https://github.com/benohara)
+#
+# ------------------------------------------------------------------------------
+
+
+_git-flow ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'init:Initialize a new git repo with support for the branching model.'
+				'feature:Manage your feature branches.'
+				'release:Manage your release branches.'
+				'hotfix:Manage your hotfix branches.'
+				'support:Manage your support branches.'
+				'version:Shows version information.'
+				'status:Shows some status.'
+			)
+			_describe -t commands 'git flow' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(init)
+					_arguments \
+						-f'[Force setting of gitflow branches, even if already configured]' \
+						-d'[Use default branch naming conventions and prefixes]'
+					;;
+
+					(version)
+					;;
+
+					(hotfix)
+						__git-flow-hotfix
+					;;
+
+					(release)
+						__git-flow-release
+					;;
+
+					(feature)
+						__git-flow-feature
+					;;
+
+          (support)
+						__git-flow-support
+					;;
+
+			esac
+		;;
+	esac
+}
+
+__git-flow-release ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new release branch.'
+				'finish:Finish a release branch.'
+				'list:List all your release branches. (Alias to `git flow release`)'
+				'publish:Publish this release branch to origin.`)'
+				'track:Track a release branch from origin.`)'
+			)
+			_describe -t commands 'git flow release' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-n'[Dont tag this release ]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						-k'[Keep branch after performing finish]'\
+						':version:__git_flow_version_list'
+				;;
+
+				(publish)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+				(track)
+					_arguments \
+						':version:__git_flow_version_list'
+				;;
+
+
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-hotfix ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new hotfix branch.'
+				'finish:Finish a hotfix branch.'
+				'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
+				'publish:Publish this hotfix branch to origin`)'
+			)
+			_describe -t commands 'git flow hotfix' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':hotfix:__git_flow_version_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-s'[Sign the release tag cryptographically]'\
+						-u'[Use the given GPG-key for the digital signature (implies -s)]'\
+						-m'[Use the given tag message]'\
+						-p'[Push to $ORIGIN after performing finish]'\
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				(publish)
+					_arguments \
+						':hotfix:__git_flow_hotfix_list'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-feature ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new feature branch.'
+				'finish:Finish a feature branch.'
+				'list:List all your feature branches. (Alias to `git flow feature`)'
+				'publish:Publish this feature branch to origin.'
+				'track:Track a feature branch from origin.'
+				'diff:Show a diff of changes since this feature branched off.'
+				'rebase:Rebase a feature branch on top of develop.'
+        'checkout:Check out (switch to) the given feature branch.'
+				'pull:Pull a feature branch from a remote peer.'
+			)
+			_describe -t commands 'git flow feature' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':feature:__git_flow_feature_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				(finish)
+					_arguments \
+						-F'[Fetch from origin before performing finish]' \
+						-r'[Finish branch by rebasing first]'\
+						-k'[Keep branch after performing finish]'\
+						-D'[Force delete feature branch after finish]'\
+						':feature:__git_flow_feature_list'
+				;;
+
+				(publish)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(track)
+					_arguments \
+						':feature:__git_flow_feature_list'\
+				;;
+
+				(diff)
+					_arguments \
+						':branch:__git_branch_names'\
+				;;
+
+				(rebase)
+					_arguments \
+						-i'[Do an interactive rebase]' \
+						':branch:__git_branch_names'
+				;;
+
+				(checkout)
+					_arguments \
+						':branch:__git_flow_feature_list'\
+				;;
+
+				(pull)
+					_arguments \
+						':remote:__git_remotes'\
+						':branch:__git_branch_names'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git-flow-support ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+				'start:Start a new support branch.'
+				'list:List all your support branches. (Alias to `git flow support`)'
+			)
+			_describe -t commands 'git flow support' subcommands
+			_arguments \
+				-v'[Verbose (more) output]'
+		;;
+
+		(options)
+			case $line[1] in
+
+				(start)
+					_arguments \
+						-F'[Fetch from origin before performing finish]'\
+						':feature:__git_flow_support_list'\
+						':branch-name:__git_branch_names'
+				;;
+
+				*)
+					_arguments \
+						-v'[Verbose (more) output]'
+				;;
+			esac
+		;;
+	esac
+}
+
+__git_flow_version_list ()
+{
+	local expl
+	declare -a versions
+
+	versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted versions expl 'version' compadd $versions
+}
+
+__git_flow_feature_list ()
+{
+	local expl
+	declare -a features
+
+	features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted features expl 'feature' compadd $features
+}
+
+__git_remotes () {
+	local expl gitdir remotes
+
+	gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
+	__git_command_successful || return
+
+	remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
+	__git_command_successful || return
+
+	# TODO: Should combine the two instead of either or.
+	if (( $#remotes > 0 )); then
+		_wanted remotes expl remote compadd $* - $remotes
+	else
+		_wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
+	fi
+}
+
+__git_flow_hotfix_list ()
+{
+	local expl
+	declare -a hotfixes
+
+	hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted hotfixes expl 'hotfix' compadd $hotfixes
+}
+
+__git_flow_support_list ()
+{
+	local expl
+	declare -a support
+
+	support=(${${(f)"$(_call_program support git flow support list 2> /dev/null | tr -d ' |*')"}})
+	__git_command_successful || return
+
+	_wanted hotfixes expl 'support' compadd $support
+}
+
+
+__git_branch_names () {
+	local expl
+	declare -a branch_names
+
+	branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
+	__git_command_successful || return
+
+	_wanted branch-names expl branch-name compadd $* - $branch_names
+}
+
+__git_command_successful () {
+	if (( ${#pipestatus:#0} > 0 )); then
+		_message 'not a git repository'
+		return 1
+	fi
+	return 0
+}
+
+_git-flow "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_git-journal b/zsh/modules/completion/external/src/_git-journal
new file mode 100644
index 0000000..0f2dfbe
--- /dev/null
+++ b/zsh/modules/completion/external/src/_git-journal
@@ -0,0 +1,225 @@
+#compdef git-journal
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# Completion script for git-journal:
+# https://github.com/saschagrunert/git-journal
+#
+# Authors
+# -------
+#
+# * Sascha Grunert <mail@saschagruenrt.de>
+# * Nico Wagner <nico@cryptopone.org>
+# ------------------------------------------------------------------------------
+
+_git-journal() {
+	typeset -A opt_args
+	local ret=1
+
+	local context curcontext="$curcontext" state line
+    _arguments -s -S -C \
+"-p+[Sets a custom working path.]" \
+"--path+[Sets a custom working path.]" \
+"-n+[The number of tags until the parser stops when a single revision is given.]" \
+"--tags-count+[The number of tags until the parser stops when a single revision is given.]" \
+"-e+[A pattern to exclude git tags from the processing.]" \
+"-t+[Use a custom output template.]" \
+"--template+[Use a custom output template.]" \
+"-o+[The output file for the changelog.]" \
+"--output+[The output file for the changelog.]" \
+"-a[Do not stop parsing at the first tag when a single revision is given. Overwrites '-n/--tags-count'.]" \
+"--all[Do not stop parsing at the first tag when a single revision is given. Overwrites '-n/--tags-count'.]" \
+"-g[Generate a fresh output template from a commit range.]" \
+"--generate[Generate a fresh output template from a commit range.]" \
+"-s[Print only the shortlog (summary) form.]" \
+"--short[Print only the shortlog (summary) form.]" \
+"-u[Skip entries without any relation to a git TAG.]" \
+"--skip-unreleased[Skip entries without any relation to a git TAG.]" \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+"1:: :_git-journal_commands" \
+"*:: :->git-journal" \
+&& ret=0
+    case $state in
+    (git-journal)
+        curcontext="${curcontext%:*:*}:git-journal-command-$words[1]:"
+        case $line[1] in
+            (p)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+"1:: :_git-journal_prepare_commands" \
+&& ret=0
+;;
+(prepare)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+"1:: :_git-journal_prepare_commands" \
+&& ret=0
+;;
+(s)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+&& ret=0
+;;
+(setup)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+&& ret=0
+;;
+(v)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+"1:: :_git-journal_verify_commands" \
+&& ret=0
+;;
+(verify)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+"1:: :_git-journal_verify_commands" \
+&& ret=0
+;;
+(help)
+_arguments -s -S -C \
+"-h[Prints help information]" \
+"--help[Prints help information]" \
+"-V[Prints version information]" \
+"--version[Prints version information]" \
+&& ret=0
+;;
+        esac
+    ;;
+esac
+}
+
+(( $+functions[_git-journal_commands] )) ||
+_git-journal_commands() {
+    local commands; commands=(
+        "prepare:Prepare a commit message before the user can edit it." \
+"p:Prepare a commit message before the user can edit it." \
+"setup:Creates all necessary git hooks and an initial configuration file. Shell completions for bash and fish will be available inside the current working directory." \
+"s:Creates all necessary git hooks and an initial configuration file. Shell completions for bash and fish will be available inside the current working directory." \
+"verify:Verify the specified commit message." \
+"v:Verify the specified commit message." \
+"help:Prints this message or the help of the given subcommand(s)" \
+"REVISION_RANGE:Specifies the revision range to be processed. If a single revision is specified, the output will stop at the first following git TAG." \
+    )
+    _describe -t commands 'git-journal commands' commands "$@"
+}
+(( $+functions[_git-journal_help_commands] )) ||
+_git-journal_help_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'git-journal help commands' commands "$@"
+}
+(( $+functions[_git-journal_p_commands] )) ||
+_git-journal_p_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+"TYPE:The type of the commit. For example "message"." \
+    )
+    _describe -t commands 'git-journal p commands' commands "$@"
+}
+(( $+functions[_p_commands] )) ||
+_p_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+"TYPE:The type of the commit. For example "message"." \
+    )
+    _describe -t commands 'p commands' commands "$@"
+}
+(( $+functions[_git-journal_prepare_commands] )) ||
+_git-journal_prepare_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+"TYPE:The type of the commit. For example "message"." \
+    )
+    _describe -t commands 'git-journal prepare commands' commands "$@"
+}
+(( $+functions[_git-journal_s_commands] )) ||
+_git-journal_s_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'git-journal s commands' commands "$@"
+}
+(( $+functions[_s_commands] )) ||
+_s_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 's commands' commands "$@"
+}
+(( $+functions[_git-journal_setup_commands] )) ||
+_git-journal_setup_commands() {
+    local commands; commands=(
+        
+    )
+    _describe -t commands 'git-journal setup commands' commands "$@"
+}
+(( $+functions[_git-journal_v_commands] )) ||
+_git-journal_v_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+    )
+    _describe -t commands 'git-journal v commands' commands "$@"
+}
+(( $+functions[_v_commands] )) ||
+_v_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+    )
+    _describe -t commands 'v commands' commands "$@"
+}
+(( $+functions[_git-journal_verify_commands] )) ||
+_git-journal_verify_commands() {
+    local commands; commands=(
+        "MESSAGE:The path to the commit message which should be prepared." \
+    )
+    _describe -t commands 'git-journal verify commands' commands "$@"
+}
+
+_git-journal "$@"
\ No newline at end of file
diff --git a/zsh/modules/completion/external/src/_git-pulls b/zsh/modules/completion/external/src/_git-pulls
new file mode 100644
index 0000000..88fb8a8
--- /dev/null
+++ b/zsh/modules/completion/external/src/_git-pulls
@@ -0,0 +1,108 @@
+#compdef git-pulls
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for git-pulls 0.3.1 (https://git-pulls.com/schacon/git-pulls).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud (https://github.com/nicoulaj)
+#
+# ------------------------------------------------------------------------------
+
+
+_git-pulls() {
+  typeset -A opt_args
+  local context state line curcontext="$curcontext"
+
+  local ret=1
+
+  _arguments -C \
+    '(- 1 *)--help[show usage]' \
+    '1:cmd:->cmds' \
+    '*::arg:->args' \
+  && ret=0
+
+  case "$state" in
+    (cmds)
+      local commands; commands=(
+        'update:update pull requests list'
+        'list:list pull requests'
+        'show:show pull request'
+        'browse:open pull request in a web browser'
+        'merge:merge pull request'
+      )
+      _describe -t commands 'command' commands && ret=0
+    ;;
+    (args)
+      curcontext="${curcontext%:*:*}:git-pulls-cmd-$words[1]:"
+      case $words[1] in
+        (update)
+          _message 'no more arguments' && ret=0
+        ;;
+        (list)
+          _arguments \
+            '--reverse[list in reverse order]' \
+          && ret=0
+        ;;
+        (show)
+          _arguments \
+            '1: :_git-pulls_pull_requests_numbers' \
+            '--full[use verbose output]' \
+          && ret=0
+        ;;
+        (browse|merge)
+          _arguments \
+            '1: :_git-pulls_pull_requests_numbers' \
+          && ret=0
+        ;;
+      esac
+    ;;
+  esac
+
+  return ret
+}
+
+(( $+functions[_git-pulls_pull_requests_numbers] )) ||
+_git-pulls_pull_requests_numbers() {
+  local pull_requests; pull_requests=(${${${(M)${(f)"$(_call_program users $service list)"}:#[[:digit:]]##[[:space:]]*}//:/\\:}/[[:space:]]##/:})
+  _describe -t pull-request-numbers 'pull request number' pull_requests "$@"
+}
+
+_git-pulls "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_git-wtf b/zsh/modules/completion/external/src/_git-wtf
new file mode 100644
index 0000000..e909235
--- /dev/null
+++ b/zsh/modules/completion/external/src/_git-wtf
@@ -0,0 +1,58 @@
+#compdef git-wtf
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for git-wtf, authored by
+#  William Morgan (http://git-wt-commit.rubyforge.org/git-wtf)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mario Fernandez (https://github.com/sirech)
+#
+# ------------------------------------------------------------------------------
+
+_arguments -w -C -s \
+    '(--long --short)'{-l,--long}'[include author info and date for each commit]' \
+    '(--long --short)'{-s,--short}'[do not show commits]' \
+    '(--all)'{-a,--all}'[show all branches across all remote repos, not just those from origin]' \
+    '(--all-commits)'{-A,--all-commits}'[show all commits, not just the first 5]' \
+    '(--key)'{-k,--key}'[show key]' \
+    '(--relations)'{-r,--relations}'[show relation to features / integration branches]' \
+    '(--dump-config)--dump-config[print out current configuration and exit]' \
+    '*: :__git_branch_names'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_glances b/zsh/modules/completion/external/src/_glances
new file mode 100644
index 0000000..e0298ea
--- /dev/null
+++ b/zsh/modules/completion/external/src/_glances
@@ -0,0 +1,63 @@
+#compdef glances
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for glances (http://nicolargo.github.com/glances/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * loranger (https://github.com/loranger)
+#
+# ------------------------------------------------------------------------------
+
+_glances() {
+
+	_arguments \
+		"-b[Display network rate in Byte per second]" \
+		"-B[Bind server to the given IP or host NAME]:host:_hosts" \
+		"-c[Connect to a Glances server]:host:_hosts" \
+		"-C[Path to the configuration file]:configuration path:_files -/" \
+		"-d[Disable disk I/O module]" \
+		"-e[Enable the sensors module (Linux-only)]" \
+		"-f[Set the output folder (HTML) or file (CSV)]:output path:_files -/" \
+		"-h[Display the syntax and exit]" \
+		"-m[Disable mount module]" \
+		"-n[Disable network module]" \
+		"-o[Define additional output (available: HTML or CSV)]:output type:(HTML CSV)" \
+		"-p[Define the client or server TCP port (default: 61209)]:port:_ports" \
+		"-P[Client/server password]:password:" \
+		"-s[Run Glances in server mode]" \
+		"-t[Set the refresh time in seconds (default: 3)]:seconds:" \
+		"-v[Display the version and exit]" \
+		"-z[Do not use the bold color attribute]" \
+}
+
+_glances "$@"
\ No newline at end of file
diff --git a/zsh/modules/completion/external/src/_go b/zsh/modules/completion/external/src/_go
new file mode 100644
index 0000000..0a9b6a0
--- /dev/null
+++ b/zsh/modules/completion/external/src/_go
@@ -0,0 +1,554 @@
+#compdef go
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2013-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+# Copyright (c) 2010-2014 Go authors
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for go 1.5 (http://golang.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mikkel Oscar Lyderik <mikkeloscar@gmail.com>
+#  * oh-my-zsh authors:
+#        https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/golang/golang.plugin.zsh
+#  * Go authors
+#
+# ------------------------------------------------------------------------------
+
+typeset -A opt_args
+
+_go() {
+  local -a commands build_flags
+  commands=(
+  'build:compile packages and dependencies'
+  'clean:remove object files'
+  'doc:show documentation for package or symbol'
+  'env:print Go environment information'
+  'fix:run go tool fix on packages'
+  'fmt:run gofmt on package sources'
+  'generate:generate Go files by processing source'
+  'get:download and install packages and dependencies'
+  'install:compile and install packages and dependencies'
+  'list:list packages'
+  'run:compile and run Go program'
+  'test:test packages'
+  'tool:run specified go tool'
+  'version:print Go version'
+  'vet:run go tool vet on packages'
+  'help:get more information about a command'
+  )
+
+  _arguments \
+    "1: :{_describe 'command' commands}" \
+    '*:: :->args'
+
+  case $state in
+    args)
+      build_flags=(
+      '-a[force rebuilding of packages that are already up-to-date]'
+      '-n[print the commands but do not run them]'
+      '-p[number of builds that can be run in parallel]:number'
+      '-race[enable data race detection]'
+      '-v[print the names of packages as they are compiled]'
+      '-work[print temporary work directory and keep it]'
+      '-x[print the commands]'
+      '-asmflags[arguments for each go tool asm invocation]:flags'
+      '-buildmode[build mode to use]:mode'
+      '-compiler[name of compiler to use]:name'
+      '-gccgoflags[arguments for gccgo]:args'
+      '-gcflags[arguments for each go tool compile invocation]:args'
+      '-installsuffix[suffix to add to package directory]:suffix'
+      '-ldflags[arguments to pass on each go tool link invocation.]:flags'
+      '-linkshared[link against shared libraries]'
+      '-pkgdir[install and load all packages from dir]:dir'
+      '-tags[list of build tags to consider satisfied]:tags'
+      '-toolexec[program to use to invoke toolchain programs]:args'
+      )
+
+      __go_packages() {
+        local gopaths
+        declare -a gopaths
+        gopaths=("${(s/:/)$(go env GOPATH)}")
+        gopaths+=("$(go env GOROOT)")
+        for p in $gopaths; do
+          _path_files -W "$p/src" -/
+        done
+      }
+
+      case $words[1] in
+        build)
+          _arguments \
+            '-o[force build to write to named output file]:file:_files' \
+            '-i[installs the packages that are dependencies of the target]' \
+            ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+
+        clean)
+          _arguments \
+            '-i[remove corresponding installed archive or binary]' \
+            '-r[apply clean recursively on all dependencies]' \
+            ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+
+        doc)
+          _arguments \
+            '-c[respect case when matching symbols]' \
+            '-cmd[treat a command (package main) like a regular package]' \
+            '-u[show docs for unexported and exported symbols and methods]'
+            ;;
+
+        fix)
+          _arguments '*:importpaths:__go_packages'
+          ;;
+
+        fmt)
+          _arguments \
+            '-n[prints commands that would be executed]' \
+            '-x[prints commands as they are executed]' \
+            '*:importpaths:__go_packages'
+            ;;
+
+        generate)
+          _arguments \
+            '-run=[specifies a regular expression to select directives]:regex' \
+            '-x[print the commands]' \
+            '-n[print the commands but do not run them]' \
+            '-v[print the names of packages as they are compiled]' \
+            "*:args:{ _alternative ':importpaths:__go_packages' _files }"
+            ;;
+
+        get)
+          _arguments \
+            '-d[instructs get to stop after downloading the packages]' \
+            '-f[force get -u not to verify that each package has been checked from vcs]' \
+            '-fix[run the fix tool on the downloaded packages]' \
+            '-insecure[permit fetching/resolving custom domains]' \
+            '-t[also download the packages required to build tests]' \
+            '-u[use the network to update the named packages]' \
+            ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+
+        install)
+          _arguments ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+
+        list)
+          _arguments \
+            '-e[changes the handling of erroneous packages]' \
+            '-f[specifies an alternate format for the list]:format' \
+            '-json[causes package data to be printed in JSON format]' \
+            ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+
+        run)
+          _arguments \
+            ${build_flags[@]} \
+            '-exec[invoke the binary using xprog]:xporg' \
+            '*:file:_files -g "*.go(-.)"'
+            ;;
+
+        test)
+          _arguments \
+            "-c[compile but don't run test]" \
+            '-i[install dependencies of the test]' \
+            '-bench[run benchmarks matching the regular expression]:regexp' \
+            '-benchmem[print memory allocation statistics for benchmarks]' \
+            '-benchtime[run benchmarks for t rime]:t' \
+            '-blockprofile[write a goroutine blocking profile to the specified file]:block' \
+            '-blockprofilerate[control goroutine blocking profiles]:n' \
+            '-count[run each test and benchmark n times]:n' \
+            '-cover[enable coverage analysis]' \
+            '-covermode[set the mode for coverage analysis]:mode:(set count atomic)' \
+            '-coverpkg[apply coverage analysis in each test of listed packages]:list' \
+            '-coverprofile[write a coverage profile to file]:cover' \
+            '-cpu[specify a list of GOMAXPROCS values]:cpus' \
+            '-cpuprofile[write a CPU profile to the specified file]:profile' \
+            '-memprofile[write a memory profile to file]:mem' \
+            '-memprofilerate[enable more precise memory profiles]:n' \
+            '-outputdir[place output files from profiling in output dir]:dir' \
+            '-parallel[allow parallel execution of test functions]:n' \
+            '-run[run tests and examples matching the regular expression]:regexp' \
+            '-short[tell long-running tests to shorten their run time]' \
+            '-timeout[timeout long running tests]:t' \
+            '-trace[write an execution trace to the specified file]:trace' \
+            '-v[verbose output]' \
+            ${build_flags[@]} \
+            '-exec[run test binary using xprog]:xprog' \
+            '-o[compile test binary to named file]:file:_files' \
+            '*:importpaths:__go_packages'
+            ;;
+
+        tool)
+          local -a tools
+          tools=($(go tool))
+
+          _arguments \
+            '-n[print command that would be executed]' \
+            "1: :{_describe 'tool' tools}" \
+            '*:: :->args'
+
+          case $state in
+            args)
+              case $words[1] in
+                addr2line)
+                  _files
+                  ;;
+
+                asm)
+                  _arguments \
+                    '-D[predefined symbol with optional simple value]:value' \
+                    '-I[include directory]:value' \
+                    '-S[print assembly and machine code]' \
+                    '-debug[dump instructions as they are parsed]' \
+                    '-dynlink[support references to Go symbols]' \
+                    '-o[output file]:string' \
+                    '-shared[generate code that can be linked into a shared lib]' \
+                    '-trimpath[remove prefix from recorded source file paths]:string'
+                  ;;
+
+                callgraph)
+                  local -a algos graphs
+                  algos=(
+                  'static:static calls only'
+                  'cha:Class Hierarchy Analysis'
+                  'rta:Rapid Type Analysis'
+                  'pta:inclusion-based Points-To Analysis'
+                  )
+                  graphs=(
+                  'digraph:output in digraph format'
+                  'graphviz:output in AT&T GraphViz (.dot) format'
+                  )
+
+                  _arguments \
+                    '-algo=[call-graph construction algorithm]:algos:{ _describe "algos" algos }' \
+                    "-test[include the package's tests in the analysis]" \
+                    '-format=[format in which each call graph edge is displayed]:graphs:{ _describe "graphs" graphs }'
+                  ;;
+
+                cgo)
+                  _arguments \
+                    '-debug-define[print relevant #defines]' \
+                    '-debug-gcc[print gcc invocations]' \
+                    '-dynimport[if non-empty, print dynamic import data]:string' \
+                    '-dynlinker[record dynamic linker information]' \
+                    '-dynout[write -dynimport output to file]:file' \
+                    '-dynpackage[set Go package for -dynimport output]:string' \
+                    '-exportheader[where to write export header]:string' \
+                    '-gccgo[generate files for use with gccgo]' \
+                    '-gccgopkgpath[-fgo-pkgpath option used with gccgo]:string' \
+                    '-gccgoprefix[-fgo-prefix option used with gccgo]:string' \
+                    '-godefs[write Go definitions for C file to stdout]' \
+                    '-import_runtime_cgo[import runtime/cgo in generated code]' \
+                    '-import_syscall[import syscall in generated code]' \
+                    '-importpath[import path of package being built]:path' \
+                    '-objdir[object directory]:dir'
+                  ;;
+
+                compile)
+                  _arguments \
+                    '-%[debug non-static initializers]' \
+                    '-+[compiling runtime]' \
+                    "-A[for bootstrapping, allow 'any' type]" \
+                    '-B[disable bounds checking]' \
+                    '-D[set relative path for local imports]:path' \
+                    '-E[debug symbol export]' \
+                    '-I[add directory to import search path]:directory' \
+                    '-K[debug missing line numbers]' \
+                    '-L[use full (long) path in error messages]' \
+                    '-M[debug move generation]' \
+                    '-N[disable optimizations]' \
+                    '-P[debug peephole optimizer]' \
+                    '-R[debug register optimizer]' \
+                    '-S[print assembly listing]' \
+                    '-V[print compiler version]' \
+                    '-W[debug parse tree after type checking]' \
+                    '-asmhdr[write assembly header to file]:file' \
+                    '-buildid[record id as the build id in the export metadata]:id' \
+                    '-complete[compiling complete package (no C or assembly)]' \
+                    '-cpuprofile[write cpu profile to file]:file' \
+                    '-d[print debug information about items in list]:list' \
+                    '-dynlink[support references to Go symbols]' \
+                    '-e[no limit on number of errors reported]' \
+                    '-f[debug stack frames]' \
+                    '-g[debug code generation]' \
+                    '-h[halt on error]' \
+                    '-i[debug line number stack]' \
+                    '-importmap[add definition of the form source=actual to import map]:definition' \
+                    '-installsuffix[set pkg directory suffix]:suffix' \
+                    '-j[debug runtime-initialized variables]' \
+                    '-l[disable inlining]' \
+                    '-largemodel[generate code that assumes a large memory model]' \
+                    '-live[debug liveness analysis]' \
+                    '-m[print optimization decisions]' \
+                    '-memprofile[write memory profile to file]:file' \
+                    '-memprofilerate[set runtime.MemProfileRate to rate]:rate' \
+                    '-nolocalimports[reject local (relative) imports]' \
+                    '-o[write output to file]:file' \
+                    '-p[set expected package import path]:path' \
+                    '-pack[write package file instead of object file]' \
+                    '-r[debug generated wrappers]' \
+                    '-race[enable race detector]' \
+                    '-s[warn about composite literals that can be simplified]' \
+                    '-shared[generate code that can be linked into a shared library]' \
+                    '-trimpath[remove prefix from recorded source file paths]:prefix' \
+                    '-u[reject unsafe code]' \
+                    '-v[increase debug verbosity]' \
+                    '-w[debug type checking]' \
+                    '-wb[enable write barrier (default 1)]' \
+                    '-x[debug lexer]' \
+                    '-y[debug declarations in canned imports (with -d)]' \
+                    '*:file:_files -g "*.go(-.)"'
+                  ;;
+
+                cover)
+                  if (( CURRENT == 2 )); then
+                    _arguments \
+                      '-func=[output coverage profile information for each function]:string' \
+                      '-html=[generate HTML representation of coverage profile]:file:_files' \
+                      '-mode=[coverage mode]:mode:(set count atomic)'
+                    return
+                  fi
+
+                  _arguments \
+                    '-o[file for output]:file' \
+                    '-var=[name of coverage variable to generate]:var' \
+                    '*:file:_files -g "*.go(-.)"'
+                  ;;
+
+                doc)
+                  _arguments \
+                    '-c[respect case when matching symbols]' \
+                    '-cmd[treat a command (package main) like a regular package]' \
+                    '-u[show docs for unexported and exported symbols and methods]' \
+                    ;;
+
+                fix)
+                  _arguments \
+                    '-diff[display diffs instead of rewriting files]' \
+                    '-force[force fixes to run even if the code looks updated]:string' \
+                    '-r[restrict the rewrites]:string' \
+                    '*:files:_files'
+                  ;;
+
+                link)
+                  _arguments \
+                    '-B[add an ELF NT_GNU_BUILD_ID note when using ELF]:note' \
+                    '-C[check Go calls to C code]' \
+                    '-D[set data segment address (default -1)]:address' \
+                    '-E[set entry symbol name]:entry' \
+                    '-H[set header type]:type' \
+                    '-I[use linker as ELF dynamic linker]:linker' \
+                    '-L[add specified directory to library path]:directory' \
+                    '-R[set address rounding quantum (default -1)]:quantum' \
+                    '-T[set text segment address (default -1)]:address' \
+                    '-V[print version and exit]' \
+                    '-W[disassemble input]' \
+                    '-X[add string value definition]:definition' \
+                    '-a[disassemble output]' \
+                    '-buildid[record id as Go toolchain build id]:id' \
+                    '-buildmode[set build mode]:mode' \
+                    '-c[dump call graph]' \
+                    '-cpuprofile[write cpu profile to file]:file' \
+                    '-d[disable dynamic executable]' \
+                    '-extld[use linker when linking in external mode]:linker' \
+                    '-extldflags[pass flags to external linker]:flags' \
+                    '-f[ignore version mismatch]' \
+                    '-g[disable go package data checks]' \
+                    '-h[halt on error]' \
+                    '-installsuffix[set package directory suffix]:suffix' \
+                    '-k[set field tracking symbol]:symbol' \
+                    '-linkmode[set link mode]:mode:(internal external auto)' \
+                    '-linkshared[link against installed Go shared libraries]' \
+                    '-memprofile[write memory profile to file]:file' \
+                    '-memprofilerate[set runtime.MemProfileRate to rate]:rate' \
+                    '-n[dump symbol table]' \
+                    '-o[write output to file]:file' \
+                    '-r[set the ELF dynamic linker search path to dir1:dir2:...]:path' \
+                    '-race[enable race detector]' \
+                    '-s[disable symbol table]' \
+                    '-shared[generate shared object (implies -linkmode external)]' \
+                    '-tmpdir[use directory for temporary files]:directory' \
+                    '-u[reject unsafe packages]' \
+                    '-v[print link trace]' \
+                    '-w[disable DWARF generation]' \
+                    '*:files:_files'
+                  ;;
+
+                objdump)
+                  _arguments \
+                    '-s[only dump symbols matching this regexp]:regexp' \
+                    '*:files:_files'
+                  ;;
+
+                pack)
+                  _arguments '1:ops:(c p r t x)' '::verbose:(v)' ':files:_files'
+                  ;;
+
+                pprof)
+                  _arguments \
+                    '-callgrind[outputs a graph in callgrind format]' \
+                    '-disasm=[output annotated assembly]:p' \
+                    '-dot[outputs a graph in DOT format]' \
+                    '-eog[visualize graph through eog]' \
+                    '-evince[visualize graph through evince]' \
+                    '-gif[outputs a graph image in GIF format]' \
+                    '-gv[visualize graph through gv]' \
+                    '-list=[output annotated source for functions matching regexp]:p' \
+                    '-pdf[outputs a graph in PDF format]' \
+                    '-peek=[output callers/callees of functions matching regexp]:p' \
+                    '-png[outputs a graph image in PNG format]' \
+                    '-proto[outputs the profile in compressed protobuf format]' \
+                    '-ps[outputs a graph in PS format]' \
+                    '-raw[outputs a text representation of the raw profile]' \
+                    '-svg[outputs a graph in SVG format]' \
+                    '-tags[outputs all tags in the profile]' \
+                    '-text[outputs top entries in text form]' \
+                    '-top[outputs top entries in text form]' \
+                    '-tree[outputs a text rendering of call graph]' \
+                    '-web[visualize graph through web browser]' \
+                    '-weblist=[output annotated source in HTML]:p' \
+                    '-output=[generate output on file f (stdout by default)]:f' \
+                    '-functions[report at function level (default)]' \
+                    '-files[report at source file level]' \
+                    '-lines[report at source line level]' \
+                    '-addresses[report at address level]' \
+                    '-base[show delta from this profile]:profile' \
+                    '-drop_negative[ignore negative differences]' \
+                    '-cum[sort by cumulative data]' \
+                    '-seconds=[length of time for dynamic profiles]:n' \
+                    '-nodecount=[max number of nodes to show]:n' \
+                    '-nodefraction=[hide nodes below <f>*total]:f' \
+                    '-edgefraction=[hide edges below <f>*total]:f' \
+                    '-sample_index[index of sample value to display]' \
+                    '-mean[average sample value over first value]' \
+                    '-inuse_space[display in-use memory size]' \
+                    '-inuse_objects[display in-use object counts]' \
+                    '-alloc_space[display allocated memory size]' \
+                    '-alloc_objects[display allocated object counts]' \
+                    '-total_delay[display total delay at each region]' \
+                    '-contentions[display number of delays at each region]' \
+                    '-mean_delay[display mean delay at each region]' \
+                    '-runtime[show runtime call frames in memory profiles]' \
+                    '-focus=[restricts to paths going through a node matching regexp]:r' \
+                    '-ignore=[skips paths going through any nodes matching regexp]:r' \
+                    '-tagfocus=[restrict to samples tagged with key:value matching regexp]:r' \
+                    '-tagignore=[discard samples tagged with key:value matching regexp]' \
+                    '-call_tree[generate a context-sensitive call tree]' \
+                    '-unit=[convert all samples to unit u for display]:u' \
+                    '-divide_by=[scale all samples by dividing them by f]:f' \
+                    '-buildid=[override build id for main binary in profile]:id' \
+                    '-tools=[search path for object-level tools]:path' \
+                    '-help[help message]' \
+                    '*:files:_files'
+                  ;;
+
+                trace)
+                  _arguments \
+                    '-http=[HTTP service address]:addr' \
+                    '*:files:_files'
+                  ;;
+
+                vet)
+                  _arguments \
+                    '-all[check everything]' \
+                    '-asmdecl[check assembly against Go declarations]' \
+                    '-assign[check for useless assignments]' \
+                    '-atomic[check for common mistaken usages of the sync/atomic]' \
+                    '-bool[check for mistakes involving boolean operators]' \
+                    '-buildtags[check that +build tags are valid]' \
+                    '-composites[check that composite literals used field-keyed elements]' \
+                    '-compositewhitelist[use composite white list]' \
+                    '-copylocks[check that locks are not passed by value]' \
+                    '-methods[check that canonically named methods are canonically defined]' \
+                    '-nilfunc[check for comparisons between functions and nil]' \
+                    '-printf[check printf-like invocations]' \
+                    '-printfuncs[print function names to check]:string' \
+                    '-rangeloops[check that range loop variables are used correctly]' \
+                    '-shadow[check for shadowed variables]' \
+                    '-shadowstrict[whether to be strict about shadowing]' \
+                    '-shift[check for useless shifts]' \
+                    '-structtags[check that struct field tags have canonical format]' \
+                    '-tags[list of build tags to apply when parsing]:list' \
+                    '-test[for testing only: sets -all and -shadow]' \
+                    '-unreachable[check for unreachable code]' \
+                    '-unsafeptr[check for misuse of unsafe.Pointer]' \
+                    '-unusedfuncs[list of functions whose results must be used]:string' \
+                    '-unusedresult[check for unused result of calls to functions in -unusedfuncs]' \
+                    '-unusedstringmethods[list of methods whose results must be used]:string' \
+                    '-v[verbose]' \
+                    '*:files:_files'
+                  ;;
+
+                yacc)
+                  _arguments \
+                    '-o[output]:output' \
+                    '-v[parsetable]:parsetable' \
+                    '*:files:_files'
+                  ;;
+              esac
+              ;;
+          esac
+          ;;
+
+        vet)
+          _arguments \
+            '-n[print commands that would be executed]' \
+            '-x[prints commands as they are executed]' \
+            ${build_flags[@]} \
+            '*:importpaths:__go_packages'
+            ;;
+        help)
+          local -a topics
+          topics=(
+          'c:calling between Go and C'
+          'buildmode:description of build modes'
+          'filetype:file types'
+          'gopath:GOPATH environment variable'
+          'environment:environment variables'
+          'importpath:import path syntax'
+          'packages:description of package lists'
+          'testflag:description of testing flags'
+          'testfunc:description of testing functions'
+          )
+
+          _arguments "1: :{_describe 'command' commands -- topics}"
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_go
diff --git a/zsh/modules/completion/external/src/_google b/zsh/modules/completion/external/src/_google
new file mode 100644
index 0000000..8cd6a1b
--- /dev/null
+++ b/zsh/modules/completion/external/src/_google
@@ -0,0 +1,94 @@
+#compdef google
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for googlecl (https://code.google.com/p/googlecl/)
+#
+#  Source: https://raw.github.com/dadrc/zsh-cfg/master/completions/_google
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * dadrc (https://github.com/dadrc)
+#  * Ben O'Hara (https://github.com/benohara)
+#
+# ------------------------------------------------------------------------------
+
+_google() {
+  # init variables
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  # init state
+   _arguments \
+    '1: :->service'\
+    '2: :->task'
+
+  case $state in
+  service)
+    _arguments '1:service:(picasa blogger youtube docs contacts calendar finance)'
+  ;;
+  *)
+    case $words[2] in
+    picasa)
+      compadd "$@" get create list list-albums tag post delete
+      ;;
+    blogger)
+      compadd "$@" post tag list delete
+      ;;
+    youtube)
+      compadd "$@" post tag list delete
+      ;;
+    docs)
+      compadd "$@" edit delete list upload get
+      ;;
+    contacts)
+      compadd "$@" list list-groups add add-groups delete-groups delete
+      ;;
+    calendar)
+      compadd "$@" add list today delete
+      ;;
+    finance)
+      compadd "$@" list-txn delete-pos create-pos delete-txn create create-txn list list-pos delete
+      ;;
+    *)
+    esac
+  esac
+}
+
+_google "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_gtk-launch b/zsh/modules/completion/external/src/_gtk-launch
new file mode 100644
index 0000000..a2bede4
--- /dev/null
+++ b/zsh/modules/completion/external/src/_gtk-launch
@@ -0,0 +1,87 @@
+#compdef gtk-launch
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for gtk-launch on gtk+-3.14.8 (http://www.gtk.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * ncaq <ncaq@ncaq.net> (version 3.14.8)
+#
+# ------------------------------------------------------------------------------
+
+_gtk-launch() {
+  _arguments \
+    {-h,--help}'[Show help options]' \
+    --help-all'[Show all help options]' \
+    --help-gtk'[Show GTK+ Options]' \
+    --display='[X display to use]' \
+    '1: :_applications'
+}
+
+_applications() {
+  local -a applications
+
+  for file in /usr/share/applications/*.desktop; do
+    applications+=`_format_entry $file`
+  done
+
+  _values -w \
+          'applications' \
+          $applications
+}
+
+_format_entry() {
+  echo "`_remove_path_extension $1`[`_get_description $1`]"
+}
+
+_remove_path_extension() {
+  # echo arg
+  # remove path string
+  # remove extension string
+  echo $1 | \
+    sed 's/.*\///' | \
+    sed 's/\.desktop//'
+}
+
+_get_description() {
+  # grep --no-messages option is handling of not UTF-8 text
+  grep --no-messages '^Comment=\|^Exec=' $1 | \
+    tr '\n' ' '
+}
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_homestead b/zsh/modules/completion/external/src/_homestead
new file mode 100644
index 0000000..9dc1c41
--- /dev/null
+++ b/zsh/modules/completion/external/src/_homestead
@@ -0,0 +1,53 @@
+#compdef homestead
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for homestead (http://laravel.com/docs/homestead).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * loranger (https://github.com/loranger)
+#
+# ------------------------------------------------------------------------------
+
+
+_homestead_get_command_list () {
+    homestead --no-ansi | sed "1,/Available commands/d" | awk '/ [a-z]+/ { print $1 }'
+}
+
+_homestead () {
+    if [ -f homestead ]; then
+        compadd `_homestead_get_command_list`
+    fi
+}
+
+compdef _homestead php homestead
+compdef _homestead homestead
diff --git a/zsh/modules/completion/external/src/_httpie b/zsh/modules/completion/external/src/_httpie
new file mode 100644
index 0000000..4d702ef
--- /dev/null
+++ b/zsh/modules/completion/external/src/_httpie
@@ -0,0 +1,181 @@
+#compdef http
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for httpie 0.7.2  (http://httpie.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#  * Valodim <https://github.com/Valodim>
+#  * Claus Klingberg <https://github.com/cjk>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+
+_httpie_params () {
+
+    local ret=1 expl
+
+    # or a url
+    if (( CURRENT <= NORMARG+1 )) && [[ $words[NORMARG] != *:* ]] ; then
+        _httpie_urls && ret=0
+
+    # regular param, if we already have a url
+    elif (( CURRENT > NORMARG )); then
+
+        # if the suffix is precisely : this is shorthand for a header
+        if [[ -prefix ':' ]]; then
+            PREFIX=
+            SUFFIX=:
+        fi
+
+        # if we are in front of a : (possibly due to the PREFIX move before)
+        if [[ -suffix ':' ]]; then
+
+            # this is rather buggy with normal tab behavior :\
+            compstate[insert]=menu
+            _wanted http_header expl 'HTTP Header' \
+                compadd -s ':' -S '' -- Content-Type Cookie && return 0
+        fi
+
+        # ignore all prefix stuff
+        compset -P '(#b)([^:@=]#)'
+        local name=$match[1]
+
+        if compset -P '='; then
+            _message "$name data field value"
+        elif compset -P '@'; then
+            _files
+        elif compset -P ':=@'; then
+            _files
+        elif compset -P ':='; then
+            _message "$name raw json data"
+        elif compset -P '=='; then
+            _message "$name url parameter value"
+        elif compset -P ':'; then
+            _message "$name header content"
+        else
+            typeset -a ops
+            ops=(
+                '=:data field'
+                '\::header'
+                '==:request parameter'
+                '@:data file field'
+                '\:=:raw json field'
+                '\:=@:raw json field file path'
+            )
+            _describe -t httpparams "parameter types" ops -Q -S ''
+        fi
+
+        ret=0
+
+    fi
+
+    # first arg may be a request method
+    (( CURRENT == NORMARG )) &&
+        _wanted http_method expl 'Request Method' \
+            compadd GET POST PUT DELETE HEAD OPTIONS TRACE CONNECT PATCH LINK UNLINK && ret=0
+
+    return $ret
+
+}
+
+_httpie_urls() {
+
+  local ret=1
+
+  if ! [[ -prefix [-+.a-z0-9]#:// ]]; then
+    local expl
+    compset -S '[^:/]*' && compstate[to_end]=''
+    _wanted url-schemas expl 'URL schema' compadd -S '' http:// https:// && ret=0
+  else
+    _urls && ret=0
+  fi
+
+  return $ret
+
+}
+
+_httpie_printflags () {
+
+    local ret=1
+
+    # not sure why this is necessary, but it will complete "-pH" style without it
+    [[ $IPREFIX == "-p" ]] && IPREFIX+=" "
+
+    compset -P '(#b)([a-zA-Z]#)'
+
+    local -a flags
+    [[ $match[1] != *H* ]] && flags+=( "H:request headers" )
+    [[ $match[1] != *B* ]] && flags+=( "B:request body" )
+    [[ $match[1] != *h* ]] && flags+=( "h:response headers" )
+    [[ $match[1] != *b* ]] && flags+=( "b:response body" )
+
+    _describe -t printflags "print flags" flags -S '' && ret=0
+
+    return $ret
+
+}
+
+integer NORMARG
+
+_arguments -n -C -s \
+  '(-j --json -f)'{-j,--json}'[Data items from the command line are serialized as a JSON object.]' \
+  '(-f --form -j)'{-f,--form}'[Data items from the command line are serialized as form fields.]' \
+  '--pretty=[Controls output processing.]:output format:(all colors format none)' \
+  '(-s --style)'{-s,--style}'=[Output coloring style]:STYLE:(autumn borland bw colorful default emacs friendly fruity manni monokai murphy native pastie perldoc ttr solarized tango trac vim vs)' \
+  '(-p --print)'{-p,--print}'=[String specifying what the output should contain]:print flags:_httpie_printflags' \
+  '(-v --verbose)'{-v,--verbose}'[Print the whole request as well as the response.]' \
+  '(-p -h --headers)'{-h,--headers}'[Print only the response headers.]' \
+  '(-p -b --body)'{-b,--body}'[Print only the response body.]' \
+  '(-S --stream)'{-S,--stream}'[Always stream the output by line, i.e., behave like `tail -f`.]' \
+  '(-o --output)'{-o,--output}'=[Save output to FILE.]:output file:_files' \
+  '(-d --download)'{-d,--download}'=[Do not print the response body to stdout.]' \
+  '(-c --continue)'{-c,--continue}'[Resume an interrupted download.]' \
+  '(--session-read-only)--session=[Create, or reuse and update a session.]:session name (or path)' \
+  '(--session)--session-read-only=[Create or read a session without updating it form the request/response exchange.]:session name (or path)' \
+  '(-a --auth)'{-a,--auth}'=[If only the username is provided (-a username)]:USER\:PASS' \
+  '--auth-type=[The authentication mechanism to be used. Defaults to "basic".]:AUTH-TYPE:(basic digest)' \
+  '--proxy=[String mapping protocol to the URL of the proxy.]:PROXY' \
+  '--follow[Allow full redirects.]' \
+  "--verify=[Enable or disable verification of ssl certificates.]:verify certificate:(yes no)" \
+  '--allow-redirects[Set this flag if full redirects are allowed (e.g. re-POST-ing of data at new ``Location``)]' \
+  '--timeout=[Float describes the timeout of the request (Use socket.setdefaulttimeout() as fallback).]:timeout (seconds)' \
+  '--check-status[This flag instructs HTTPie to also check the HTTP status code and exit with an error if the status indicates one.]' \
+  '--ignore-stdin[Do not attempt to read stdin.]' \
+  '(- *)--help[show help message.]' \
+  "(- *)--version[show program's version number and exit.]" \
+  '--traceback[Prints exception traceback should one occur.]' \
+  '--debug[Prints exception traceback should one occur and other information useful for debugging HTTPie itself.]' \
+  '*:args:_httpie_params' && return 0
diff --git a/zsh/modules/completion/external/src/_jmeter b/zsh/modules/completion/external/src/_jmeter
new file mode 100644
index 0000000..762747b
--- /dev/null
+++ b/zsh/modules/completion/external/src/_jmeter
@@ -0,0 +1,74 @@
+#compdef jmeter
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for JMeter (http://jakarta.apache.org/jmeter).
+#
+#  Status: incomplete
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+  '(- 1 *)'{-h,--help}'[print usage information and exit]' \
+  '(- 1 *)'{-v,--version}'[print the version information and exit]' \
+  {-p,--propfile}'[the jmeter property file to use]:properties file:_files -g "*.properties"' \
+  '*'{-q,--addprop}'[additional property file(s)]:properties file:_files -g "*.properties"' \
+  {-t,--testfile}'[the jmeter test plan file to run]:JMeter test plan file:_files -g "*.jmx"' \
+  {-j,--jmeterlogfile}'[the jmeter log file]: :_files -g "*.log"' \
+  {-l,--logfile}'[the file to log samples to]: :_files -g "*.jtl"' \
+  {-n,--nongui}'[run JMeter in nongui mode]' \
+  {-s,--server}'[run the JMeter server]' \
+  {-H,--proxyHost}'[set a proxy server for JMeter to use]: :_hosts' \
+  {-P,--proxyPort}'[set proxy server port for JMeter to use]:number' \
+  {-u,--username}'[set username for proxy server that JMeter is to use]:username:_users' \
+  {-a,--password}'[set password for proxy server that JMeter is to use]:password' \
+  {-J-,--jmeterproperty}'[define additional JMeter properties]:argument=value' \
+  {-G-,--globalproperty}'[define Global properties (sent to servers)]:argument=value' \
+  {-D-,--systemproperty}'[define additional System properties]:argument=value' \
+  {-S,--systemPropertyFile}'[a property file to be added as System properties]:properties file:_files -g "*.properties"' \
+  {-L,--loglevel}'[define loglevel]:[category=]level' \
+  {-r,--runremote}'[start remote servers (as defined by the jmeter property remote_hosts)]' \
+  {-R,--remotestart}'[start these remote servers (overrides remote_hosts)]:remote servers list' \
+  {-d,--homedir}'[the JMeter home directory to use]: :_files -/' \
+  {-X,--remoteexit}'[exit the remote servers at end of test (non-GUI)]'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_jmeter-plugins b/zsh/modules/completion/external/src/_jmeter-plugins
new file mode 100644
index 0000000..8c466ac
--- /dev/null
+++ b/zsh/modules/completion/external/src/_jmeter-plugins
@@ -0,0 +1,67 @@
+#compdef jmeter-plugins
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for jmeter-plugins command line tool 0.4.2
+#  (http://code.google.com/p/jmeter-plugins).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+  '(- 1 *)--help[show help options]' \
+  '--generate-png[generate PNG file containing graph]:PNG file name:_files -g "*.png"' \
+  '--generate-csv[generate CSV file containing graph data]:CSV file name:_files -g "*.csv"' \
+  '--input-jtl[load data from specified JTL file]:JTL file:_files -g "*.jtl"' \
+  '--plugin-type[type of graph to use for results generation]:class:((AggregateReport ThreadsStateOverTime BytesThroughputOverTime HitsPerSecond LatenciesOverTime PerfMon ResponseCodesPerSecond ResponseTimesDistribution ResponseTimesOverTime ResponseTimesPercentiles ThroughputOverTime ThroughputVsThreads TimesVsThreads TransactionsPerSecond))' \
+  '--width[set graph width]:graph width (pixels)' \
+  '--height[set graph height]::graph height (pixels)' \
+  '--granulation[granulation time for samples]:time (ms)' \
+  '--relative-times[use relative X axis times, no will set absolute times]: :((yes no))' \
+  '--aggregate-rows[aggregate all rows into one]: :((yes no))' \
+  '--paint-gradient[paint gradient background]: :((yes no))' \
+  '--paint-zeroing[paint zeroing lines]: :((yes no))' \
+  '--prevent-outliers[prevent outliers on distribution graph]: :((yes no))' \
+  '--limit-rows[limit number of points in row]:number of points' \
+  '--force-y[force Y axis limit]:limit' \
+  '--hide-low-counts[hide points with sample count below limit]:limit'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_jonas b/zsh/modules/completion/external/src/_jonas
new file mode 100644
index 0000000..6aeb879
--- /dev/null
+++ b/zsh/modules/completion/external/src/_jonas
@@ -0,0 +1,125 @@
+#compdef jonas
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for JOnAS 5.2 (http://jonas.ow2.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+typeset -A opt_args
+local context state line curcontext="$curcontext" ret=1
+
+_arguments -C \
+  '1:cmd:->cmds' \
+  '*::arg:->args' \
+&& ret=0
+
+case "$state" in
+  (cmds)
+    local commands; commands=(
+      'version:show version information'
+      'check:check that the JOnAS environment is correctly set'
+      'start:start a server instance'
+      'stop:stop a server instance'
+      'admin:administrate a server instance'
+    )
+    _describe -t commands 'command' commands && ret=0
+  ;;
+  (args)
+    curcontext="${curcontext%:*:*}:jonas-cmd-$words[1]:"
+    case $words[1] in
+      (version|check)
+        _message 'no more arguments' && ret=0
+      ;;
+      (start)
+        _arguments \
+          '-standby[start a minimal JOnAS server with only mandatory services]' \
+          '(-bg)-fg[start the server in foreground mode]' \
+          '(-fg)-bg[start the server in background mode]' \
+          '-win[start the server in a new window]' \
+          '(-bg)-tui[start the Apache Felix TUI (force foreground mode)]' \
+          '-gui[start the Apache Felix GUI]' \
+          '-dev[start a JOnAS server by using bundles present in the default maven repository instead of bundles under $JONAS_ROOT/lib/bundles]' \
+          '-clean[clean the Apache Felix cache before starting a JOnAS server]' \
+          '-n[set the server name, must be unique in the domain (default: jonas)]:name' \
+          '-target[start another server or cluster (group of servers) in the domain]:server' \
+          '-Ddomain.name=[set the name of the management domain to which the server belongs]:domain' \
+        && ret=0
+      ;;
+      (stop)
+        _arguments \
+          '-standby[stop all services except the mandatory ones]' \
+          '-n[set the name of the server to stop (default: jonas)]:name' \
+          '-target[stop another server or cluster (group of servers) in the domain]:server' \
+          '-Ddomain.name=[set the name of the management domain to which the server belongs]:domain' \
+        && ret=0
+      ;;
+      (admin)
+        _arguments \
+          '(- : *)-?[print the help message]' \
+          '-win[administer the server in a new window]' \
+          '-n[set the name of the server to administer (default: jonas)]:name' \
+          '-username[set the username when authentication is required]: :_users' \
+          '-password[set the password when authentication is required]:password' \
+          '-registry[set the registry URL]: :_urls' \
+          '-protocol[set the protocol name]:protocol:((jrmp\:JRE\ implementation\ of\ RMI\ on\ the\ JRMP\ protocol\ \(default\) iiop\:JacORB\ implementation\ of\ RMI\ over\ the\ IIOP\ protocol irmi\:Oracle\ JRE\ independant\ implementation\ of\ RMI))' \
+          '-a[deploy an application from a given filepath on the current server, or on another target in the domain if the current server is a master]:Java application archive:_files -g "*.(j|w|r|e)ar"' \
+          '-r[undeploy a previously deployed application from the current server or from the specified target if the current server is a master]:Java application archive:_files -g "*.(j|w|r|e)ar"' \
+          '-gc[run the garbage collector on the current JOnAS server]' \
+          '-passivate[passivate all entity bean instances]' \
+          '-e[list the properties of the current JOnAS server]' \
+          '-j[list the registered JNDI names, as seen by the current JOnAS server]' \
+          '-l[list the beans currently loaded by the current JOnAS server]' \
+          '-synch[synchronize the entity bean instances on the current JOnAS server]' \
+          '-debug[set the logging level for the given topic to DEBUG]:topic' \
+          '-tt[change the default timeout for transactions]:timeout (seconds)' \
+          '-ping[wait until the JOnAS server is available]' \
+          '-timeout[maximum time to wait when -ping is used]:timeout (seconds)' \
+        && ret=0
+      ;;
+    esac
+  ;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_jq b/zsh/modules/completion/external/src/_jq
new file mode 100644
index 0000000..3cd9c50
--- /dev/null
+++ b/zsh/modules/completion/external/src/_jq
@@ -0,0 +1,84 @@
+#compdef jq
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for jq (http://stedolan.github.io/jq/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Hideaki Miyake (https://github.com/mollifier)
+#  * George Kontridze (https://github.com/gkze)
+#
+# ------------------------------------------------------------------------------
+
+declare -a opts args
+args=(
+  '--argfile[This option passes the first value from the named file as a value to the jq program as a predefined variable]'
+  '--unbuffered[Flush the output after each JSON object is printed]'
+  '(-C --color-output)'{-C,--color-output}'[Colorize the output even if writing to a pipe or a file]'
+  '(-I --online-input)'{-I,--online-input}'[When the top-level input value is an array produce its elements instead of the array]'
+  '(-M --monochrome-output)'{-M,--monochrome-output}'[Not colorize the output]'
+  '(-R --raw-input)'{-R,--raw-input}'[Parse the input as not JSON but string]'
+  '(-S --sort-keys)'{-S,--sort-keys}'[Output the fields of each object with the keys in sorted order]'
+  '(-V --version)'{-V,--version}'[Display version information]'
+  '(-a --ascii-output)'{-a,--ascii-output}'[Output with pure ASCII characters]'
+  '(-e --exit-status)'{-e,--exit-status}'[Sets the exitstatus of jq to 0 if the last output values was neither false nor null, 1 if the last output value was either false or null, or 4 if no valid result was ever produced]'
+  '(-c --compact-output)'{-c,--compact-output}'[Compact output]'
+  '(-h --help)'{-h,--help}'[Display help information]'
+  '(-n --null-input)'{-n,--null-input}'[Run the filter using null as the input]'
+  '(-r --raw-output)'{-r,--raw-output}'[Not format string result as a JSON string with quotes]'
+  '(-s --slurp)'{-s,--slurp}'[Run the filter just once]'
+  '--arg[Passes a value to the jq program, e.g. --arg foo bar]:jq variable: '
+  '1: :_guard "^-*" pattern'
+  '*:files:->file'
+)
+local curcontext=$curcontext state line ret=1
+declare -A opt_args
+
+_arguments -C $opts \
+  $args && ret=0
+
+case $state in
+  file)
+    _files && ret=0
+    ;;
+esac
+
+return $ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
+
diff --git a/zsh/modules/completion/external/src/_jrnl b/zsh/modules/completion/external/src/_jrnl
new file mode 100644
index 0000000..c0c03e6
--- /dev/null
+++ b/zsh/modules/completion/external/src/_jrnl
@@ -0,0 +1,65 @@
+#compdef jrnl
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for jrnl a simple journal application for your command line. (https://maebert.github.io/jrnl/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_jrnl() {
+
+    _arguments -C \
+      '(- 1 *)'-h"[Show help and exit]" \
+      '(- 1 *)'-v"[Prints version information and exits]" \
+      '(- 1 *)'-ls"[Displays accessible journals]" \
+      '(- 1 *)'-d"[Execute in debug mode]" \
+      '(- 1 *)'--tags"[Returns a list of all tags and number of occurences]" \
+      "--short[Show only titles or line containing the search]" \
+      "-from[View entries after this date]:date:" \
+      "-until[View entries before this date]:date:" \
+      "-to[View entries before this date]:date:" \
+      "-on[View entries on this date]:date:" \
+      "-and[Filter by tags using AND (default: OR)]" \
+      "-starred[Show only starred entries]" \
+      "-n[Shows the last n entries matching the filter. And '-3' have the same effect.]":number: \
+      "--export[Export your journal. TYPE can be json, markdown text.]:format:(json markdown text)" \
+      "-o[Optionally specifies output file when using --export If OUTPUT is a directory, exports each entry in individual file instead.]:output file:" \
+      "--encrypt[Encrypts your existing journal with a new pass]" \
+      "--decrypt[Decrypts your journal and stores it in plain text]" \
+}
+
+_jrnl
+
diff --git a/zsh/modules/completion/external/src/_kitchen b/zsh/modules/completion/external/src/_kitchen
new file mode 100644
index 0000000..dee5c58
--- /dev/null
+++ b/zsh/modules/completion/external/src/_kitchen
@@ -0,0 +1,85 @@
+#compdef kitchen
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Test Kitchen (http://kitchen.ci/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Peter Eisentraut (https://github.com/petere)
+#
+# ------------------------------------------------------------------------------
+
+
+_kitchen() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments '1: :->cmds'\
+             '2: :->args'
+
+  case $state in
+    cmds)
+      _kitchen_commands
+      ;;
+    args)
+      case $line[1] in
+        converge|create|destroy|diagnose|list|setup|test|verify)
+          compadd 'all'
+          _kitchen_instances
+          ;;
+        login)
+          _kitchen_instances
+          ;;
+      esac
+      ;;
+  esac
+}
+
+_kitchen_commands() {
+  local commands
+
+  commands=("${(@f)$(_call_program commands $service help | sed -n 's/^  kitchen \([[:alpha:]]*\) [ [].*# \(.*\)$/\1:\2/p')}")
+  _describe -t commands 'kitchen commands' commands
+}
+
+_kitchen_instances() {
+  if [[ $_kitchen_instances_cache_dir != $PWD ]]; then
+    unset _kitchen_instances_cache
+  fi
+  if [[ ${+_kitchen_instances_cache} -eq 0 ]]; then
+    _kitchen_instances_cache=(${(f)"$(_call_program instances $service list -b 2>/dev/null)"})
+    _kitchen_instances_cache_dir=$PWD
+  fi
+  _wanted instances expl 'instance' compadd -a _kitchen_instances_cache
+}
+
+_kitchen "$@"
diff --git a/zsh/modules/completion/external/src/_knife b/zsh/modules/completion/external/src/_knife
new file mode 100644
index 0000000..2c61d4f
--- /dev/null
+++ b/zsh/modules/completion/external/src/_knife
@@ -0,0 +1,238 @@
+#compdef knife
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Chef's knife (http://www.opscode.com/chef).
+#
+#  Source: https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/knife
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Frank Louwers (https://github.com/franklouwers)
+#  * Mark Cornick (https://github.com/markcornick)
+#
+# ------------------------------------------------------------------------------
+
+
+# knife has a very special syntax, some example calls are:
+# knife status
+# knife cookbook list
+# knife role show ROLENAME
+# knife data bag show DATABAGNAME
+# knife role show ROLENAME --attribute ATTRIBUTENAME
+# knife cookbook show COOKBOOKNAME COOKBOOKVERSION recipes
+
+# The -Q switch in compadd allow for completions of things like "data bag" without having to go through two rounds of completion and avoids zsh inserting a \ for escaping spaces
+_knife() {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  # These flags should be available everywhere according to man knife
+  knife_general_flags=( --help --server-url --key --config --editor --format --log_level --logfile --no-editor --user --print-after --version --yes --environment )
+
+  cloudproviders=(bluebox ec2 rackspace slicehost terremark)
+  _arguments \
+    '1: :->knifecmd'\
+    '2: :->knifesubcmd'\
+    '3: :->knifesubcmd2' \
+    '4: :->knifesubcmd3' \
+    '5: :->knifesubcmd4' \
+    '6: :->knifesubcmd5'
+  
+  case $state in
+  knifecmd)
+    compadd -Q "$@" bootstrap client configure cookbook "cookbook site" "data bag" diff environment user exec index node recipe role search ssh status windows $cloudproviders
+  ;;
+  knifesubcmd)
+    case $words[2] in
+    (bluebox|ec2|rackspace|slicehost|terremark)
+      compadd "$@" server images
+    ;;
+    client)
+      compadd -Q "$@" "bulk delete" list create show delete edit reregister
+    ;;
+    configure)
+      compadd "$@" client
+    ;;
+    cookbook)
+      compadd -Q "$@" test list create download delete "metadata from" show "bulk delete" metadata upload
+    ;;
+    diff)
+      _arguments '*:file or directory:_files -g "*.(rb|json)"'
+    ;;
+    environment)
+      compadd -Q "$@" create delete edit "from file" list show
+    ;;
+    user)
+      compadd -Q "$@" create delete edit list reregister show
+    ;;
+    node)
+     compadd -Q "$@" "from file" create show edit delete list run_list "bulk delete"
+    ;;
+    recipe)
+     compadd "$@" list
+    ;;
+    role)
+      compadd -Q "$@" "bulk delete" create delete edit "from file" list show
+    ;; 
+    windows)
+      compadd "$@" bootstrap
+    ;;
+    *)
+    _arguments '2:Subsubcommands:($(_knife_options1))'
+    esac
+   ;;
+   knifesubcmd2)
+    case $words[3] in
+     server)
+      compadd "$@" list create delete
+    ;;
+     images)
+      compadd "$@" list
+    ;;
+     site)
+      compadd "$@" vendor show share search download list unshare
+    ;;
+     (show|delete|edit)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_remote))'
+    ;;
+    (upload|test)
+     _arguments '3:Subsubcommands:($(_chef_$words[2]s_local) --all)'
+    ;;
+    list)
+     compadd -a "$@" knife_general_flags
+    ;;
+    bag)
+      compadd -Q "$@" show edit list "from file" create delete
+    ;;
+    *)
+      _arguments '3:Subsubcommands:($(_knife_options2))'
+    esac
+   ;;
+   knifesubcmd3)
+     case $words[3] in
+      show)
+       case $words[2] in
+       cookbook)
+          versioncomp=1
+          _arguments '4:Cookbookversions:($(_cookbook_versions) latest)'
+       ;;
+       (node|client|role|environment)
+         compadd "$@" --attribute
+       esac
+     esac
+     case $words[4] in
+     (show|edit)
+     _arguments '4:Subsubsubcommands:($(_chef_$words[2]_$words[3]s_remote))'
+    ;;
+     file)
+     _arguments '*:file or directory:_files -g "*.(rb|json)"'
+    ;;
+      list)
+     compadd -a "$@" knife_general_flags
+    ;;
+        *)
+       _arguments '*:Subsubcommands:($(_knife_options3))'
+    esac
+    ;;
+    knifesubcmd4)
+      if (( versioncomp > 0 )); then
+        compadd "$@" attributes definitions files libraries providers recipes resources templates
+      else
+       _arguments '*:Subsubcommands:($(_knife_options2))'
+      fi
+    ;; 
+    knifesubcmd5) 
+      _arguments '*:Subsubcommands:($(_knife_options3))'
+   esac
+}
+
+# Helper functions to provide the argument completion for several depths of commands
+_knife_options1() {
+ ( for line in $( knife $words[2] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options2() {
+ ( for line in $( knife $words[2] $words[3] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+_knife_options3() {
+ ( for line in $( knife $words[2] $words[3] $words[4] --help | grep -v "^knife" ); do echo $line | grep "\-\-"; done )
+}
+
+# The chef_x_remote functions use knife to get a list of objects of type x on the server
+_chef_roles_remote() {
+ (knife role list | awk '{print $1}')
+}
+
+_chef_clients_remote() {
+ (knife client list | awk '{print $1}')
+}
+
+_chef_nodes_remote() {
+ (knife node list | awk '{print $1}')
+}
+
+_chef_cookbooks_remote() {
+ (knife cookbook list | awk '{print $1}')
+}
+
+_chef_sitecookbooks_remote() {
+ (knife cookbook site list | awk '{print $1}')
+}
+
+_chef_data_bags_remote() {
+ (knife data bag list | awk '{print $1}')
+}
+
+_chef_environments_remote() {
+ (knife environment list | awk '{print $1}')
+}
+
+_chef_users_remote() {
+ (knife user list | awk '{print $1}')
+}
+
+# The chef_x_local functions use the knife config to find the paths of relevant objects x to be uploaded to the server
+_chef_cookbooks_local() {
+ (for i in $( grep cookbook_path $HOME/.chef/knife.rb | awk 'BEGIN {FS = "[" }; {print $2}' | sed 's/\,//g' | sed "s/'//g" | sed 's/\(.*\)]/\1/' ); do ls $i; done)
+}
+
+# This function extracts the available cookbook versions on the chef server
+_cookbook_versions() {
+  (knife cookbook show $words[4] | grep -v $words[4] | grep -v -E '\]|\[|\{|\}' | sed 's/ //g' | sed 's/"//g')
+}
+
+_knife "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_language_codes b/zsh/modules/completion/external/src/_language_codes
new file mode 100644
index 0000000..19322ac
--- /dev/null
+++ b/zsh/modules/completion/external/src/_language_codes
@@ -0,0 +1,275 @@
+#autoload
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completer for language codes.
+#
+#  Usage: _language_codes ISO-639-1
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+(( $+functions[_language_codes_iso_639_1] )) ||
+_language_codes_iso_639_1() {
+  local codes; codes=(
+    'aa:Afar'
+    'ab:Abkhazian'
+    'af:Afrikaans'
+    'ak:Akan'
+    'sq:Albanian'
+    'am:Amharic'
+    'ar:Arabic'
+    'an:Aragonese'
+    'hy:Armenian'
+    'as:Assamese'
+    'av:Avaric'
+    'ae:Avestan'
+    'ay:Aymara'
+    'az:Azerbaijani'
+    'ba:Bashkir'
+    'bm:Bambara'
+    'eu:Basque'
+    'be:Belarusian'
+    'bn:Bengali'
+    'bh:Bihari languages'
+    'bi:Bislama'
+    'bo:Tibetan'
+    'bs:Bosnian'
+    'br:Breton'
+    'bg:Bulgarian'
+    'my:Burmese'
+    'ca:Catalan'
+    'cs:Czech'
+    'ch:Chamorro'
+    'ce:Chechen'
+    'zh:Chinese'
+    'cu:Church Slavic'
+    'cv:Chuvash'
+    'kw:Cornish'
+    'co:Corsican'
+    'cr:Cree'
+    'cy:Welsh'
+    'cs:Czech'
+    'da:Danish'
+    'de:German'
+    'dv:Divehi'
+    'nl:Dutch'
+    'dz:Dzongkha'
+    'el:Greek, Modern (1453-)'
+    'en:English'
+    'eo:Esperanto'
+    'et:Estonian'
+    'eu:Basque'
+    'ee:Ewe'
+    'fo:Faroese'
+    'fa:Persian'
+    'fj:Fijian'
+    'fi:Finnish'
+    'fr:French'
+    'fy:Western Frisian'
+    'ff:Fulah'
+    'ka:Georgian'
+    'de:German'
+    'gd:Gaelic'
+    'ga:Irish'
+    'gl:Galician'
+    'gv:Manx'
+    'gn:Guarani'
+    'gu:Gujarati'
+    'ht:Haitian'
+    'ha:Hausa'
+    'he:Hebrew'
+    'hz:Herero'
+    'hi:Hindi'
+    'ho:Hiri Motu'
+    'hr:Croatian'
+    'hu:Hungarian'
+    'hy:Armenian'
+    'ig:Igbo'
+    'is:Icelandic'
+    'io:Ido'
+    'ii:Sichuan Yi'
+    'iu:Inuktitut'
+    'ie:Interlingue'
+    'ia:Interlingua (International Auxiliary Language Association)'
+    'id:Indonesian'
+    'ik:Inupiaq'
+    'is:Icelandic'
+    'it:Italian'
+    'jv:Javanese'
+    'ja:Japanese'
+    'kl:Kalaallisut'
+    'kn:Kannada'
+    'ks:Kashmiri'
+    'ka:Georgian'
+    'kr:Kanuri'
+    'kk:Kazakh'
+    'km:Central Khmer'
+    'ki:Kikuyu'
+    'rw:Kinyarwanda'
+    'ky:Kirghiz'
+    'kv:Komi'
+    'kg:Kongo'
+    'ko:Korean'
+    'kj:Kuanyama'
+    'ku:Kurdish'
+    'lo:Lao'
+    'la:Latin'
+    'lv:Latvian'
+    'li:Limburgan'
+    'ln:Lingala'
+    'lt:Lithuanian'
+    'lb:Luxembourgish'
+    'lu:Luba-Katanga'
+    'lg:Ganda'
+    'mk:Macedonian'
+    'mh:Marshallese'
+    'ml:Malayalam'
+    'mi:Maori'
+    'mr:Marathi'
+    'ms:Malay'
+    'mk:Macedonian'
+    'mg:Malagasy'
+    'mt:Maltese'
+    'mn:Mongolian'
+    'mi:Maori'
+    'ms:Malay'
+    'my:Burmese'
+    'na:Nauru'
+    'nv:Navajo'
+    'nr:Ndebele, South'
+    'nd:Ndebele, North'
+    'ng:Ndonga'
+    'ne:Nepali'
+    'nl:Dutch'
+    'nn:Norwegian Nynorsk'
+    'nb:Bokmål, Norwegian'
+    'no:Norwegian'
+    'ny:Chichewa'
+    'oc:Occitan (post 1500)'
+    'oj:Ojibwa'
+    'or:Oriya'
+    'om:Oromo'
+    'os:Ossetian'
+    'pa:Panjabi'
+    'fa:Persian'
+    'pi:Pali'
+    'pl:Polish'
+    'pt:Portuguese'
+    'ps:Pushto'
+    'qu:Quechua'
+    'rm:Romansh'
+    'ro:Romanian'
+    'ro:Romanian'
+    'rn:Rundi'
+    'ru:Russian'
+    'sg:Sango'
+    'sa:Sanskrit'
+    'si:Sinhala'
+    'sk:Slovak'
+    'sk:Slovak'
+    'sl:Slovenian'
+    'se:Northern Sami'
+    'sm:Samoan'
+    'sn:Shona'
+    'sd:Sindhi'
+    'so:Somali'
+    'st:Sotho, Southern'
+    'es:Spanish'
+    'sq:Albanian'
+    'sc:Sardinian'
+    'sr:Serbian'
+    'ss:Swati'
+    'su:Sundanese'
+    'sw:Swahili'
+    'sv:Swedish'
+    'ty:Tahitian'
+    'ta:Tamil'
+    'tt:Tatar'
+    'te:Telugu'
+    'tg:Tajik'
+    'tl:Tagalog'
+    'th:Thai'
+    'bo:Tibetan'
+    'ti:Tigrinya'
+    'to:Tonga (Tonga Islands)'
+    'tn:Tswana'
+    'ts:Tsonga'
+    'tk:Turkmen'
+    'tr:Turkish'
+    'tw:Twi'
+    'ug:Uighur'
+    'uk:Ukrainian'
+    'ur:Urdu'
+    'uz:Uzbek'
+    've:Venda'
+    'vi:Vietnamese'
+    'vietnamien'
+    'vo:Volapük'
+    'cy:Welsh'
+    'wa:Walloon'
+    'wo:Wolof'
+    'xh:Xhosa'
+    'yi:Yiddish'
+    'yo:Yoruba'
+    'za:Zhuang'
+    'zh:Chinese'
+    'zu:Zulu'
+  )
+  _describe -t language-codes 'ISO 639-1 language code' codes "$@"
+}
+
+_language_codes() {
+  local command="$argv[$#]" ret=1
+
+  case $command in
+    ISO-639-1)
+	  _language_codes_${${command//-/_}:l} "${@[1,-2]}" && ret=0
+      ;;
+    *)
+      _message "unknown command: $command"
+      ;;
+  esac
+
+  return ret    
+}
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_lsattr b/zsh/modules/completion/external/src/_lsattr
new file mode 100644
index 0000000..3d936fe
--- /dev/null
+++ b/zsh/modules/completion/external/src/_lsattr
@@ -0,0 +1,54 @@
+#compdef lsattr
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for lsattr a tool which lists file attributes on a Linux second extended file system. (http://e2fsprogs.sourceforge.net/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_lsattr() {
+
+_arguments -C \
+   "(-d)-R[Recursively list attributes of directories and their contents.]" \
+   "-V[Display the program version.]" \
+   "(-d)-a[List all files in directories, including files that start with '.']" \
+   "(-a -R)-d[List directories like other files, rather than listing their contents.]" \
+   "-v[List the file\'s version/generation number.]" \
+  '*:files:_files' \
+}
+
+_lsattr
+
diff --git a/zsh/modules/completion/external/src/_lsblk b/zsh/modules/completion/external/src/_lsblk
new file mode 100644
index 0000000..4040338
--- /dev/null
+++ b/zsh/modules/completion/external/src/_lsblk
@@ -0,0 +1,97 @@
+#compdef lsblk
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for lsblk (from util-linux 2.27.1->)
+#    (https://git.kernel.org/cgit/utils/util-linux/util-linux.git/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Ole Jørgen Brønner <olejorgenb@yahoo.no>
+#
+# ------------------------------------------------------------------------------
+#
+# Note: lsblk has upstream bash completions, which has served as a guide
+# Note: Credit to https://github.com/RobSis/zsh-completion-generator which was
+#       used to generate an initial skeleton
+
+local arguments
+
+local lsblk_cols_all=(
+    NAME KNAME MAJ:MIN FSTYPE MOUNTPOINT
+    LABEL UUID PARTTYPE PARTLABEL PARTUUID PARTFLAGS
+    RA RO RM
+    MODEL SIZE STATE OWNER GROUP MODE
+    ALIGNMENT MIN-IO OPT-IO PHY-SEC LOG-SEC
+    ROTA SCHED RQ-SIZE TYPE DISC-ALN
+    DISC-GRAN DISC-MAX DISC-ZERO WSAME WWN
+    RAND PKNAME HCTL TRAN REV VENDOR)
+
+_lsblk_columns() {
+    compadd $@ $lsblk_cols_all
+}
+
+_lsblk_major_number() {
+    # /sys/dev/block/ contains MAJOR:MINOR symlinks. eg. 7:0
+    local device_paths=(/sys/dev/block/*(N))
+    local major_numbers=(${${device_paths##*/}%%:*})
+    # major_numbers might have duplicates but compadd handles that
+    compadd $@ $major_numbers
+}
+
+arguments=(
+    '(-a --all)'{-a,--all}'[print all devices]'
+    '(-b --bytes)'{-b,--bytes}'[print size in bytes rather than in human readable format]'
+    '(-d --nodeps)'{-d,--nodeps}'[dont print slaves or holders]'
+    '(-D --discard)'{-D,--discard}'[print discard capabilities]'
+    '(-e --exclude)'{-e,--exclude}'[exclude devices by major number]:major number:_sequence _lsblk_major_number'
+    '(-f --fs)'{-f,--fs}'[output info about filesystems]'
+    '(-i --ascii)'{-i,--ascii}'[use ascii characters only]'
+    '(-I --include)'{-I,--include}'=[show only devices with specified major numbers]:major number:_sequence _lsblk_major_number'
+    '(-J --json)'{-J,--json}'[use JSON output format]'
+    '(-l --list)'{-l,--list}'[use list format output]'
+    '(-m --perms)'{-m,--perms}'[output info about permissions]'
+    '(-n --noheadings)'{-n,--noheadings}'[dont print headings]'
+    '(-o --output)'{-o,--output}'=[specify output columns]:output column:_sequence _lsblk_columns'
+    '(-O --output-all)'{-O,--output-all}'[output all columns]'
+    '(-p --paths)'{-p,--paths}'[print complete device path]'
+    '(-P --pairs)'{-P,--pairs}'[use key="value" output format]'
+    '(-r --raw)'{-r,--raw}'[use raw output format]'
+    '(-s --inverse)'{-s,--inverse}'[inverse dependencies]'
+    '(-S --scsi)'{-S,--scsi}'[output info about SCSI devices]'
+    '(-t --topology)'{-t,--topology}'[output info about topology]'
+    '(-x --sort)'{-x,--sort}'=[sort output by specified column]:sort column:_lsblk_columns'
+    '(-h --help)'{-h,--help}'[display this help and exit]'
+    '(-V --version)'{-V,--version}'[output version information and exit]'
+    '*:device:_path_files -g "*(N-%) *(N-/)"'
+)
+
+_arguments -s $arguments
diff --git a/zsh/modules/completion/external/src/_lunchy b/zsh/modules/completion/external/src/_lunchy
new file mode 100644
index 0000000..38cbda9
--- /dev/null
+++ b/zsh/modules/completion/external/src/_lunchy
@@ -0,0 +1,74 @@
+#compdef lunchy
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for lunchy (https://github.com/mperham/lunchy).
+#
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Blake Walters (https://github.com/markupboy)
+#
+# ------------------------------------------------------------------------------
+
+local state line cmds ret=1
+
+_arguments -C '1: :->cmds' '*: :->args'
+
+case $state in
+  cmds)
+    local -a cmds
+    cmds=(
+      'ls:list available agents'
+      'start:start an agent'
+      'stop:stop an agent'
+      'restart:restart an agent'
+      'status:get the status of agent[s]'
+      'install:install an agents plist file'
+      'edit:edit an agent'
+    )
+    _describe -t commands 'lunchy command' cmds && ret=0
+    ;;
+  args)
+    case $line[1] in
+      (install)
+        ;;
+      (restart|stop)
+        _values 'items' `lunchy status | awk '{print $3}' ` 2>/dev/null && ret=0
+        ;;
+      *)
+        _values 'items' `lunchy ls` 2>/dev/null && ret=0
+        ;;
+    esac
+    ;;
+esac
+
+return ret
diff --git a/zsh/modules/completion/external/src/_middleman b/zsh/modules/completion/external/src/_middleman
new file mode 100644
index 0000000..cbcebf2
--- /dev/null
+++ b/zsh/modules/completion/external/src/_middleman
@@ -0,0 +1,156 @@
+#compdef middleman
+# ------------------------------------------------------------------------------
+# Copyright (c) 2013 Jozef Izso, MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for middleman (http://middlemanapp.com/)
+#  Includes commands from middleman-blog and middleman-deploy extesions.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jozef Izso (https://github.com/jozefizso)
+#
+# ------------------------------------------------------------------------------
+
+local ret=1 state
+
+local -a common_ops
+common_ops=(
+  "--help[Display help]"
+)
+
+typeset -A opt_args
+_arguments \
+  ':subcommand:->subcommand' \
+  $common_ops \
+  '*::options:->options' && ret=0
+
+case $state in
+  subcommand)
+    local -a subcommands
+    subcommands=(
+      "article:Create a new blog article"
+      "build:Builds the static site for deployment"
+      "console:Start an interactive console in the context of your Middleman application"
+      "deploy:Deploy a middleman built site over rsync, ftp, sftp, or git (e.g. gh-pages on github)."
+      "extension:Create Middleman extension scaffold"
+      "init:Create new project"
+      "server:Start the preview server"
+      "upgrade:Upgrade installed bundle"
+      "version:Show version"
+    )
+
+    _describe -t subcommands 'middleman subcommand' subcommands && ret=0
+  ;;
+
+  options)
+    local -a args
+    args=(
+      $common_ops
+    )
+
+    local -a help
+    help=(
+      "--help[Display help information]"
+    )
+
+    case $words[1] in
+      article)
+        args=(
+          {-d,--date}"[The date to create the post with (defaults to now)]:date"
+        )
+      ;;
+
+      build)
+        args=(
+          "--clean[Remove orphaned files from build (Default: true)]"
+          "--no-clean[Disable removing orphaned files from build]"
+          {-g,--glob}"[Build a subset of the project]:glob"
+          "--verbose[Print debug messages]"
+          "--instrument[Print instrument messages]:instrument"
+          "--profile[Generate profiling report for the build]"
+        )
+      ;;
+
+      console)
+        args=(
+          {-e,--environment}"[The environment Middleman will run under (Default: development)]:environment"
+          "--verbose[Print debug messages]"
+        )
+      ;;
+
+      deploy)
+        args=(
+          {-b,--build-before}"[Run \`middleman build\` before the deploy step]"
+        )
+      ;;
+
+      extension)
+        args=(
+          "--git[Default: true]"
+        )
+      ;;
+
+      init)
+        args=(
+          {-T,--template}"[Use a project template: default, html5, mobile, smacss, empty. (Default: default)]:template"
+          "--css-dir      [The path to the css files]:css_dir"
+          "--js-dir       [The path to the javascript files]:js_dir"
+          "--images-dir   [The path to the image files]:images_dir"
+          "--rack         [Include a config.ru file]"
+          "--skip-gemfile [Don't create a Gemfile]"
+          "--skip-bundle  [Don't run bundle install]"
+          "--skip-git     [Skip Git ignores and keeps]"
+        )
+      ;;
+
+      server)
+        args=(
+          {-e,--environment}"[The environment Middleman will run under (Default: development)]:environment"
+          {-h,--host}"[Bind to HOST address (Default: 0.0.0.0)]:host"
+          {-p,--port}"[The port Middleman will listen on (Default: 4567)]:port"
+          "--verbose                    [Print debug messages]"
+          "--instrument                 [Print instrument messages]:instrument"
+          "--disable-watcher            [Disable the file change and delete watcher process]"
+          "--profile                    [Generate profiling report for server startup]"
+          "--reload-paths               [Additional paths to auto-reload when files change]:reload_paths"
+          "--force-polling              [Force file watcher into polling mode]"
+        )
+      ;;
+
+      upgrade)
+        args=()
+      ;;
+
+      version)
+        args=()
+      ;;
+    esac
+
+    _arguments $args && ret=0
+  ;;
+esac
+
+return ret
diff --git a/zsh/modules/completion/external/src/_mina b/zsh/modules/completion/external/src/_mina
new file mode 100644
index 0000000..01b06f2
--- /dev/null
+++ b/zsh/modules/completion/external/src/_mina
@@ -0,0 +1,68 @@
+#compdef mina
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Mina (http://nadarei.co/mina/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kazuya Takeshima (https://github.com/mitukiii)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+  {-h,--help}'[Show help]' \
+  {-V,--version}'[Show program version]' \
+  {-v,--verbose}'[Show commands as they happen]' \
+  {-s,--simulate}'[Run in simulation mode]' \
+  {-t,--trace}'[Show backtraces when errors occur]' \
+  -f'[Use FILE as the deploy configuration]:file:_files' \
+  '*: :->cmds' && ret=0
+
+case $state in
+  cmds)
+    cmds=( ${(f)"$(_call_program commands mina -T 2> /dev/null | sed -e 's/:/\\:/g; s/\[/\\[/g; s/\]/\\]/g; s/mina \([^ ]*\) .*# /\1:/g')"} )
+    _describe -t commands 'mina command' cmds && ret=0
+    ;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_mix b/zsh/modules/completion/external/src/_mix
new file mode 100644
index 0000000..1ab8b03
--- /dev/null
+++ b/zsh/modules/completion/external/src/_mix
@@ -0,0 +1,138 @@
+#compdef mix
+#autoload
+
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Elixir Mix
+#
+#  Last updated: 23.01.2016
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Han Ngo (https://github.com/tieubao)
+#
+# ------------------------------------------------------------------------------
+
+local -a _1st_arguments
+_1st_arguments=(
+    'app.start:Start all registered apps'
+    'archive:List all archives'
+    'archive.build:Archive this project into a .ez file'
+    'archive.install:Install an archive locally'
+    'archive.uninstall:Uninstall archives'
+    'clean:Delete generated application files'
+    'cmd:Executes the given command'
+    'compile:Compile source files'
+    'compile.protocols:Consolidates all protocols in all paths'
+    'deps:List dependencies and their status'
+    "deps.clean:Remove the given dependencies' files"
+    'deps.compile:Compile dependencies'
+    'deps.get:Get all out of date dependencies'
+    'deps.unlock:Unlock the given dependencies'
+    'deps.update:Update the given dependencies'
+    'do:Executes the tasks separated by comma'
+    'ecto.create:Create the storage for the repo'
+    'ecto.drop:Drop the storage for the repo'
+    'ecto.gen.migration:Generate a new migration for the repo'
+    'ecto.gen.repo:Generate a new repository'
+    'ecto.migrate:Run migrations up on a repo'
+    'ecto.rollback:Rollback migrations from a repo'
+    'escript.build:Builds an escript for the project'
+    'gettext.extract:Get text extract'
+    'gettext.merge:Get text merge'
+    'help:Print help information for tasks'
+    'hex:Print hex help information'
+    'hex.build:Builds a new package version locally'
+    'hex.config:Read or update hex config'
+    'hex.docs:Publish docs for package'
+    'hex.info:Print hex information'
+    'hex.key:Hex API key tasks'
+    'hex.outdated:Shows outdated hex deps for the current project'
+    'hex.owner:Hex package ownership tasks'
+    'hex.publish:Publish a new package version'
+    'hex.registry:Hex registry tasks'
+    'hex.search:Search for package names'
+    'hex.user:Hex user tasks'
+    'loadconfig:Loads and persists the given configuration'
+    'local:List local tasks'
+    'local.hex:Install hex locally'
+    'local.public_keys:Public keys'
+    'local.rebar:Install rebar locally'
+    'new:Create a new Elixir project'
+    'phoenix.digest:Digests and compress static files'
+    'phoenix.gen.channel:Generates a Phoenix channel'
+    'phoenix.gen.html:Generates controller, model and views for an HTML based resource'
+    'phoenix.gen.json:Generates a controller and model for a JSON based resource'
+    'phoenix.gen.model:Generates an Ecto model'
+    'phoenix.gen.secret:Generates a secret'
+    'phoenix.new:Create a new Phoenix application'
+    'phoenix.routes:Prints all routes'
+    'phoenix.server:Starts applications and their servers'
+    'profile.fprof:Profiles the given file or expression with fprof'
+    'run:Run the given file or expression'
+    "test:Run a project's tests"
+    '--help:Describe available tasks'
+    '--version:Prints the Elixir version information'
+)
+
+__task_list ()
+{
+    local expl
+    declare -a tasks
+
+    tasks=$(mix --help | grep -v "default task" | awk '{print $2}')
+
+    _wanted tasks expl 'help' compadd $tasks
+}
+
+local expl
+
+local curcontext="$curcontext" state line
+typeset -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+      _describe -t commands "mix subcommand" _1st_arguments
+      return
+  ;;
+
+  (options)
+    case $line[1] in
+      (help)
+         _arguments ':feature:__task_list'
+    esac
+  ;;
+esac
diff --git a/zsh/modules/completion/external/src/_multirust b/zsh/modules/completion/external/src/_multirust
new file mode 100644
index 0000000..00deb67
--- /dev/null
+++ b/zsh/modules/completion/external/src/_multirust
@@ -0,0 +1,163 @@
+#compdef multirust
+# ------------------------------------------------------------------------------
+# Copyright (C) 2016 by Hideo Hattori <hhatto.jp@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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for multirust (https://github.com/brson/multirust).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Hideo Hattori (https://github.com/hhatto)
+#
+# ------------------------------------------------------------------------------
+
+_multirust() {
+  typeset -A opt_args
+  local context state line
+
+  _arguments -s -S \
+    "--verbose[run verbosely]" \
+    "--version[print version info]" \
+    "*::multirust commands:_multirust_command"
+}
+
+(( $+functions[_multirust_command] )) ||
+_multirust_command() {
+  local cmd ret=1
+
+  (( $+multirust_cmds )) || _multirust_cmds=(
+    "default:Set the default toolchain" \
+    "override:Set the toolchain override for the current directory tree" \
+    "update:Install or update a given toolchain" \
+    "show-override:Show information about the current override" \
+    "show-default:Show information about the current default" \
+    "list-overrides:List all overrides" \
+    "list-toolchains:List all installed toolchains" \
+    "remove-override:Remove an override, for current directory unless specified" \
+    "remove-toolchain:Uninstall a toolchain" \
+    "run:Run a command in an environment configured for a toolchain" \
+    "delete-data:Delete all user metadata, including installed toolchains" \
+    "upgrade-data:Upgrade the ~/.multirust directory from previous versions" \
+    "doc:Open the documentation for the currently active toolchain" \
+    "which:Report location of the currently active Rust tool." \
+    "help:Show help for this command or subcommands" \
+    )
+
+  if (( CURRENT == 1 )); then
+    _describe -t commands 'multirust subcommand' _multirust_cmds || compadd "$@" - ${(s.:.)${(j.:.)_multirust_syns}}
+  else
+    local curcontext="$curcontext"
+
+    cmd="${${_multirust_cmds[(r)$words[1]:*]%%:*}:-${(k)_multirust_syns[(r)(*:|)$words[1](:*|)]}}"
+    if (( $#cmd )); then
+      curcontext="${curcontext%:*:*}:multirust-${cmd}:"
+      _call_function ret _multirust_$cmd || _message 'no more arguments'
+    else
+      _message "unknown multirust command: $words[1]"
+      fi
+    return ret
+  fi
+}
+
+(( $+functions[_multirust_default] )) ||
+_multirust_default() {
+  _arguments -s \
+    "--copy-local[install by copying a local toolchain]:PATH:_gnu_generic::" \
+    "--link-local[install by linking a local toolchain]:PATH:_gnu_generic::" \
+    "--installer[allows arbitrary builds of rust to be installed from a custom-built installer]:PATH:_gnu_generic::" \
+    "*::multirust commands:_multirust"
+}
+
+(( $+functions[_multirust_override] )) ||
+_multirust_override() {
+  _multirust_default
+}
+
+(( $+functions[_multirust_update] )) ||
+_multirust_update() {
+  _multirust_default
+}
+
+__overrides() {
+  declare -a overrides
+  overrides=($(multirust list-overrides|awk -F";" '{print $1":"$2}'))
+  _describe 'override' overrides
+}
+
+__toolchains() {
+  declare -a toolchains
+  toolchains=($(multirust list-toolchains))
+  _describe "toolchain" toolchains
+}
+
+__subcommands() {
+  declare -a cmds
+  cmds=($(multirust|grep "#    "|awk '{print $2}'))
+  _describe "command" cmds
+}
+
+(( $+functions[_multirust_remove-override] )) ||
+_multirust_remove-override() {
+  __overrides
+}
+
+(( $+functions[_multirust_remove-toolchain] )) ||
+_multirust_remove-toolchain() {
+  __toolchains
+}
+
+(( $+functions[_multirust_run] )) ||
+_multirust_run() {
+  __toolchains
+}
+
+(( $+functions[_multirust_delete-data] )) ||
+_multirust_delete-data() {
+  _arguments -s \
+    "-y[Disable prompt]" \
+    "*::multirust commands:_multirust"
+}
+
+(( $+functions[_multirust_doc] )) ||
+_multirust_doc() {
+  _arguments -s \
+    "--all[open the documentation overview page, which gives access to all the installed documentation]:" \
+    "*::multirust commands:_multirust"
+}
+
+(( $+functions[_multirust_help] )) ||
+_multirust_help() {
+  __subcommands
+}
+
+_multirust "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_mussh b/zsh/modules/completion/external/src/_mussh
new file mode 100644
index 0000000..ff2e96e
--- /dev/null
+++ b/zsh/modules/completion/external/src/_mussh
@@ -0,0 +1,86 @@
+#compdef mussh
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for MUltihost SSH Wrapper (http://mussh.sourceforge.net/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mario Fernandez (https://github.com/sirech)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+# TODO:
+# -i: admit more than one use
+# -d, -v, -t: control input
+# -m: Accept number (but also empty)
+# -h: Accept multiple hosts, also more than one use
+# -H: Accept multiple files, also more than one use
+
+_arguments -C \
+  '--help[display this help message]' \
+  '-V[print version info and exit]' \
+  '-d[Verbose debug]:level (from 0 to 2)' \
+  '-v[SSH debug level]:level (from 0 to 3)' \
+  '-m[Run concurrently]' \
+  '(-b -B)-b[Print each hosts output in a block without mingling with other hosts output]' \
+  '(-b -B)-B[Allow hosts output to mingle. (default)]' \
+  '(-a -A)-a[Force loading ssh-agent]' \
+  '(-a -A)-A[Do NOT load ssh-agent]' \
+  '(-u -U)-u[Unique. Eliminate duplicate hosts. (default)]' \
+  '(-u -U)-U[Do NOT make host list unique]' \
+  '-P[Do NOT fall back to passwords on any host. This will skip hosts where keys fail]' \
+  '-i[Load an identity file. May be used more than once]:identity' \
+  '-o[Args to pass to ssh with -o option]:ssh-args' \
+  '(-l -L)-l[Use _login_ when no other is specified with the hostname]:login' \
+  '(-l -L)-L[Force use of _login_ on all hosts]:login' \
+  '-s[Path to shell on remote host]:shell' \
+  '-t[Timeout setting for each session]:timeout' \
+  '-p[Host to use as proxy]:[user@]host' \
+  '-po[Args to pass to ssh on proxy with -o option]:ssh-args' \
+  '(-h -H)-h[Add a host to list of hosts]:[user@]host' \
+  '(-h -H)-H[Add contents of file to list of hosts]:host file:_files' \
+  '(-c -C)-c[Add a command or quoted list of commands to list of commands to be executed on each host]:command' \
+  '(-c -C)-C[Add file contents to list of commands to be executed on each host]:commands file:_files' \
+  '(-q)-q[No output unless necessary]' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_mvn b/zsh/modules/completion/external/src/_mvn
new file mode 100644
index 0000000..266f8b1
--- /dev/null
+++ b/zsh/modules/completion/external/src/_mvn
@@ -0,0 +1,638 @@
+#compdef mvn mvnDebug
+# ------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Maven (http://maven.apache.org).
+#
+#  Status: See FIXME and TODO tags.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+# Notes
+# -----
+#
+#   * By default advanced phases are displayed only if you start typing them. To have
+#     them always displayed:
+#
+#       zstyle ':completion:*:mvn:*' show-all-phases true
+#
+#   * By default full form plugins (groupId:artifactId[:version]) are only shown if you
+#     start typing them. To have them always displayed:
+#
+#       zstyle ':completion:*:mvn:*' show-full-form-plugins true
+#
+#   * By default only the plugins for which the completion has already been
+#     called ("mvn plugin:<TAB>") are shown. To define your own list of plugins:
+#
+#       maven_plugins=(jboss tomcat gwt android)
+#       zstyle ':completion:*:mvn:*' plugins $maven_plugins
+#
+#   * To have a better presentation of completions:
+#
+#       zstyle ':completion:*:*:mvn:*:matches' group 'yes'
+#       zstyle ':completion:*:*:mvn:*:options' description 'yes'
+#       zstyle ':completion:*:*:mvn:*:options' auto-description '%d'
+#       zstyle ':completion:*:*:mvn:*:descriptions' format $'\e[1m -- %d --\e[22m'
+#       zstyle ':completion:*:*:mvn:*:messages' format $'\e[1m -- %d --\e[22m'
+#       zstyle ':completion:*:*:mvn:*:warnings' format $'\e[1m -- No matches found --\e[22m'
+#
+# ------------------------------------------------------------------------------
+
+
+_mvn() {
+  typeset -A opt_args
+  local context state line
+
+  local curcontext="$curcontext" maven_version excl_opts
+
+  excl_opts=(-h --help -v --version -ep --encrypt-password -emp --encrypt-master-password)
+
+  _pick_variant -r maven_version maven3='Maven 3' maven2='Maven 2' unknown --version
+  if [[ $maven_version == 'maven3' ]]; then
+    opts=(
+      "($excl_opts -T --threads)"{-T,--threads}'[thread count, for instance 2.0C where C is core multiplied]:thread count:_mvn_thread_counts'
+      "($excl_opts -t --toolchains)"{-t,--toolchains}'[alternate path for the user toolchains file]:toolchains file:_mvn_toolchains_files'
+      "($excl_opts -l --log-file)"{-l,--log-file}'[log file to where all build output will go]:log file:_mvn_log_files'
+    )
+  elif [[ $maven_version == 'maven2' ]]; then
+    opts=(
+      "($excl_opts -cpu --check-plugin-updates -up --update-plugins -npu --no-plugin-updates -o --offline)"{-cpu,--check-plugin-updates,-up,--update-plugins}'[force upToDate check for any relevant registered plugins]'
+      "($excl_opts -npr --no-plugin-registry)"{-npr,--no-plugin-registry}'[don'\''t use plugin-registry.xml for plugin versions]'
+      "($excl_opts -npu --no-plugin-updates -cpu --check-plugin-updates -up --update-plugins)"{-npu,--no-plugin-updates}'[suppress upToDate check for any relevant registered plugins]'
+      "($excl_opts -r --reactor)"{-r,--reactor}'[dynamically build reactor from subdirectories]:reactor:_mvn_reactors'
+    )
+  fi
+
+  [[ -n ${(M)words:#"-pl"} || -n ${(M)words:#"--projects"} ]] && opts+=(
+    "($excl_opts -am --also-make)"{-am,--also-make}'[if project list is specified, also build projects required by the list]'
+    "($excl_opts -amd --also-make-dependents)"{-amd,--also-make-dependents}'[if project list is specified, also build projects that depend on projects on the list]'
+  )
+
+  _arguments -C \
+    "(- : *)"{-h,--help}'[display help information]' \
+    "(- : *)"{-v,--version}'[display version information]' \
+    "(- : *)"{-emp,--encrypt-master-password}'[encrypt master security password]:master password:_mvn_passwords' \
+    "(- : *)"{-ep,--encrypt-password}'[encrypt server password]:password:_mvn_passwords' \
+    "($excl_opts -B --batch-mode)"{-B,--batch-mode}'[run in non-interactive (batch) mode]' \
+    "($excl_opts -V --show-version)"{-V,--show-version}'[display version information without stopping build]' \
+    "($excl_opts -q --quiet -X --debug)"{-q,--quiet}'[quiet output, only show errors]' \
+    "($excl_opts -X --debug -q --quiet)"{-X,--debug}'[produce execution debug output]' \
+    "($excl_opts -N --non-recursive)"{-N,--non-recursive}'[do not recurse into sub-projects]' \
+    "($excl_opts -C --strict-checksums -c --lax-checksums)"{-C,--strict-checksums}'[fail the build if checksums don'\''t match]' \
+    "($excl_opts -c --lax-checksums -C --strict-checksums)"{-c,--lax-checksums}'[warn if checksums don'\''t match]' \
+    "($excl_opts -e --errors)"{-e,--errors}'[produce execution error messages]' \
+    "($excl_opts -f --file)"{-f,--file}'[force the use of an alternate POM file]:POM file:_mvn_pom_files' \
+    "($excl_opts -s --settings)"{-s,--settings}'[alternate path for the user settings file]:settings file:_mvn_settings_files' \
+    "($excl_opts -gs --global-settings)"{-gs,--global-settings}'[alternate path for the global settings file]:global settings file:_mvn_settings_files' \
+    "($excl_opts -fae --fail-at-end -ff --fail-fast -fn --fail-never)"{-fae,--fail-at-end}'[only fail the build afterwards, allow all non-impacted builds to continue]' \
+    "($excl_opts -ff --fail-fast -fae --fail-at-end -fn --fail-never)"{-ff,--fail-fast}'[stop at first failure in reactorized builds]' \
+    "($excl_opts -fn --fail-never -fae --fail-at-end -ff --fail-fast)"{-fn,--fail-never}'[never fail the build, regardless of project result]' \
+    "($excl_opts)*"{-P,--activate-profiles}'[comma-delimited list of profiles to activate]:profile:_mvn_profiles -s ,' \
+    "($excl_opts -pl --projects)"{-pl,--projects}'[build specified reactor projects instead of all projects]:project list:_mvn_projects -s ,' \
+    "($excl_opts -rf --resume-from)"{-rf,--resume-from}'[resume reactor from specified project]:project:_mvn_projects' \
+    "($excl_opts -o --offline -U --update-snapshots -cpu --check-plugin-updates -up --update-plugins)"{-o,--offline}'[work offline]' \
+    "($excl_opts -U --update-snapshots -nsu --no-snapshot-updates -o --offline)"{-U,--update-snapshots}'[force a check for updated releases and snapshots on remote repositories]' \
+    "($excl_opts -nsu --no-snapshot-updates -U --update-snapshots -o --offline)"{-nsu,--no-snapshot-updates}'[Suppress SNAPSHOT updates]' \
+    "*"{-D-,--define}'[define a system property]:property:_mvn_properties' \
+    "${opts[@]}" \
+    "($excl_opts)*: :_mvn_args"
+}
+
+(( $+functions[_mvn_args] )) ||
+_mvn_args() {
+  _alternative \
+    'phases:phase:_mvn_phases' \
+    'plugin-colon-goals:plugin colon goal:_mvn_plugin_colon_goals'
+}
+
+(( $+functions[_mvn_phases] )) ||
+_mvn_phases() {
+  local phases
+  phases=(
+    'clean:remove all files generated by the previous build'
+    'compile:compile the source code of the project'
+    'test:run tests using a suitable unit testing framework'
+    'package:take the compiled code and package it in its distributable format, such as a JAR'
+    'integration-test:process and deploy the package if necessary into an environment where integration tests can be run'
+    'verify:run any checks to verify the package is valid and meets quality criteria'
+    'install:install the package into the local repository, for use as a dependency in other projects locally'
+    'deploy:done in an integration or release environment, copies the final package to the remote repository'
+    'site:generates the projects site documentation'
+    'site-deploy:deploys the generated site documentation to the specified web server'
+  )
+  if [[ $#PREFIX -gt 0 ]] || zstyle -t ":completion:${curcontext}:" show-all-phases; then
+    phases+=(
+      'pre-clean:executes processes needed prior to the actual project cleaning'
+      'post-clean:executes processes needed to finalize the project cleaning'
+      'validate:validate the project is correct and all necessary information is available'
+      'initialize:initialize build state, e.g. set properties or create directories'
+      'generate-sources:generate any source code for inclusion in compilation'
+      'process-sources:process the source code, for example to filter any values'
+      'generate-resources:generate resources for inclusion in the package'
+      'process-resources:copy and process the resources into the destination directory, ready for packaging'
+      'process-classes:post-process the generated files from compilation'
+      'generate-test-sources:generate any test source code for inclusion in compilation'
+      'process-test-sources:process the test source code, for example to filter any values'
+      'generate-test-resources:create resources for testing'
+      'process-test-resources:copy and process the resources into the test destination directory'
+      'test-compile:compile the test source code into the test destination directory'
+      'process-test-classes:post-process the generated files from test compilation'
+      'prepare-package:perform any operations necessary to prepare a package before the actual packaging'
+      'pre-integration-test:perform actions required before integration tests are executed'
+      'post-integration-test:perform actions required after integration tests have been executed'
+      'pre-site:executes processes needed prior to the actual project site generation.'
+      'post-site:executes processes needed to finalize the site generation, and to prepare for site deployment'
+    )
+  fi
+  _describe -t 'phases' "phase" phases
+}
+
+(( $+functions[_mvn_plugins] )) ||
+_mvn_plugins() {
+  local ret=1
+  if [[ $words[CURRENT] == *.* ]] || zstyle -t ":completion:${curcontext}:" show-full-form-plugins; then
+    _wanted full-form-plugins expl 'full form plugin' _mvn_full_form_plugins && ret=0
+  else
+    _wanted plugin-prefixes expl 'plugin prefix' _mvn_plugin_prefixes && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_plugin_colon_goals] )) ||
+_mvn_plugin_colon_goals() {
+  local ret=1
+  if [[ $words[CURRENT] == *.* ]] || zstyle -t ":completion:${curcontext}:" show-full-form-plugins; then
+    _wanted full-form-plugin-colon-goals expl 'full form plugin colon goal' _mvn_full_form_plugin_colon_goals && ret=0
+  else
+    _wanted plugin-prefix-colon-goals expl 'plugin prefix colon goal' _mvn_plugin_prefix_colon_goals && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_plugin_prefix_colon_goals] )) ||
+_mvn_plugin_prefix_colon_goals() {
+  local ret=1
+  if compset -P '*:'; then
+    local plugin="${IPREFIX%:}"
+    _wanted goals expl "${plugin} plugin goal" _mvn_plugin_goals $plugin && ret=0
+  else
+    _wanted plugin-prefixes expl 'plugin prefix' _mvn_plugin_prefixes -qS: && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_plugin_prefixes] )) ||
+_mvn_plugin_prefixes() {
+  local plugins
+  zstyle -a ":completion:${curcontext}:" plugins plugins
+  [[ $#plugins -eq 0 ]] && plugins=($(__mvn_get_plugin_prefix $(__mvn_get_cache_dir)/mvn/plugins/*(:t)))
+  _describe -t plugin-prefixes 'plugin prefix' plugins $@
+}
+
+(( $+functions[_mvn_full_form_plugin_colon_goals] )) ||
+_mvn_full_form_plugin_colon_goals() {
+  local ret=1
+  # FIXME Duplicates _mvn_full_form_plugins
+  if compset -P 1 '*:'; then
+    local groupId="${${IPREFIX%:}##*:}"
+    if compset -P 1 '*:'; then
+      local artifactId="${${IPREFIX%:}##*:}"
+      if compset -P 1 '*:'; then
+        local version="${${IPREFIX%:}##*:}"
+        _wanted goals expl "${artifactId}:${version} goal" _mvn_plugin_goals "${groupId}:${artifactId}:${version}" && ret=0
+      else
+        _alternative \
+          "versions:${artifactId} version:_mvn_artifact_versions -qS: ${groupId}:${artifactId}" \
+          "goals:${artifactId} goal:_mvn_plugin_goals ${groupId}:${artifactId}" \
+        && ret=0
+      fi
+    else
+      _wanted artifactIds expl "${groupId} artifactId" _mvn_groupId_artifactIds -qS: $groupId && ret=0
+    fi
+  else
+    _wanted groupIds expl "groupId" _mvn_groupIds -qS: && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_full_form_plugins] )) ||
+_mvn_full_form_plugins() {
+  local ret=1 chunk="${PREFIX%%:*}"
+  if compset -P 1 '*:'; then
+    local groupId="$chunk"
+    chunk="${PREFIX%%:*}"
+    if compset -P 1 '*:'; then
+      _wanted versions expl "${current} version" _mvn_artifact_versions $@ "${groupId}:${chunk}" && ret=0
+    else
+      _wanted artifactIds expl "${groupId} artifactId" _mvn_groupId_artifactIds -qS: "${groupId}" && ret=0
+    fi
+  else
+    _wanted groupIds expl "groupId" _mvn_groupIds -qS: && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_groupIds] )) ||
+_mvn_groupIds() {
+  local repository_location=$(__mvn_get_repository_location) update_policy ret=1
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _mvn_groupIds_caching_policy
+
+  if [[ -d $repository_location ]]; then
+    unset _groupIds
+    if ( [[ ${+_groupIds} -eq 0 ]] || _cache_invalid "mvn/repositories/${repository_location}/groupIds" ) && ! _retrieve_cache "mvn/repositories/${repository_location}/groupIds"; then
+      _groupIds=($repository_location/**/)
+      _groupIds=(${${${(u)_groupIds:h:h}#"$repository_location/"}//\//.})
+      [[ $#_groupIds -gt 0 ]] && _store_cache "mvn/repositories/${repository_location}/groupIds" _groupIds
+    fi
+
+    [[ $#_groupIds -gt 0 ]] && _multi_parts $@ . _groupIds && ret=0
+  fi
+
+  return ret
+}
+
+(( $+functions[_mvn_groupId_artifactIds] )) ||
+_mvn_groupId_artifactIds() {
+  local groupId_repository_location="${$(__mvn_get_repository_location)}/${${@[-1]}//\.//}" ret=1
+
+  if [[ -d $groupId_repository_location ]]; then
+    local artifactIds; artifactIds=($groupId_repository_location/*/*/*.pom(:h:h:t))
+    _describe -t artifactIds "artifactId" artifactIds $@[0,-2] && ret=0
+  fi
+
+  return ret
+}
+
+(( $+functions[_mvn_artifact_versions] )) ||
+_mvn_artifact_versions() {
+  local artifact_repository_location="${$(__mvn_get_repository_location)}/${${@[-1]}//[\.:]//}" ret=1
+
+  if [[ -d $artifact_repository_location ]]; then
+    local versions; versions=($artifact_repository_location/*/*.pom(:h:t))
+    _describe -t versions "version" versions $@[0,-2]
+  fi
+
+  return ret
+}
+
+(( $+functions[_mvn_plugin_goals] )) ||
+_mvn_plugin_goals() {
+  local ret=1 plugin="$@[-1]" update_policy
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _mvn_goals_caching_policy 
+
+  unset _goals
+  if ( [[ ${+_goals} -eq 0 ]] || _cache_invalid "mvn/plugins/${plugin}" ) && ! _retrieve_cache "mvn/plugins/${plugin}"; then
+    setopt localoptions extendedglob
+    _goals=(${(s:,,,:)${${${(f)${${${(f)${${${${(F)${(S)${(f)"$(_call_program goals $words[1] -N org.apache.maven.plugins:maven-help-plugin:2.1.1:describe -Dplugin=$plugin)"}//#$(__mvn_get_plugin_prefix $plugin):/,,,}}:#*BUILD FAILURE*}#*This plugin has*goals#:}%For more information, run \'mvn help:describe*}}//:/\\:}}}// ##/ }// Description\\: /:}})
+    [[ $#_goals -gt 0 ]] && _store_cache "mvn/plugins/${plugin}" _goals
+  fi
+
+  [[ $#_goals -gt 0 ]] && _describe -t "goals" "${plugin} goal" _goals $@[0,-2] && ret=0
+
+  return ret
+}
+
+(( $+functions[_mvn_profiles] )) ||
+_mvn_profiles() {
+
+  # FIXME Use "mvn help:all-profiles" output instead of parsing settings and pom files...
+  # Blocked on http://jira.codehaus.org/browse/MPH-82 and http://jira.codehaus.org/browse/MPH-83
+  local profs update_policy settings_file=$(__mvn_get_settings_file) parent_pom_file=$(__mvn_get_parent_pom_file) cache_name profiles_section ret=1
+
+  # TODO Should be split into _mvn_profiles/mvn_profiles_lists
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _mvn_profiles_caching_policy
+
+  profs=()
+
+  # Resolve profiles from settings.xml
+  if [[ -f  $settings_file ]]; then
+    unset _profiles
+    cache_name="mvn/profiles${settings_file:A}" # FIXME Don't use A modifier, it is only available on Zsh >= 4.3.10
+    if ( [[ ${+_profiles} -eq 0 ]] || _cache_invalid "$cache_name" ) && ! _retrieve_cache "$cache_name"; then
+      _profiles=()
+      profiles_section="${(M)${(f)$(<$settings_file)}:#*<profiles>*}"
+      if [[ -n "$profiles_section" ]]; then
+        for profile in ${(s:,,,:)${${${(S)${(S)${(S)${(S)${${profiles_section#*<profile>}%</profile>*}//<repositories>*<\/repositories>}//<pluginRepositories>*<\/pluginRepositories>}//<build>*<\/build>}//<\/id>*<id>/,,,}##*<id>}%%</id>*}}; do
+          [[ -z ${(M)profiles:#"$profile"*} ]] && _profiles+=("$profile"'['"in settings file"']')
+        done
+      fi
+      [[ $#_profiles -gt 0 ]] && _store_cache "$cache_name" _profiles
+    fi
+    profs+=($_profiles)
+  fi
+
+  # Resolve project profiles
+  if [[ -f  $parent_pom_file ]]; then
+    unset _profiles
+    cache_name="mvn/profiles${parent_pom_file:A}" # FIXME Don't use A modifier, it is only available on Zsh >= 4.3.10
+    if ( [[ ${+_profiles} -eq 0 ]] || _cache_invalid "$cache_name" ) && ! _retrieve_cache "$cache_name"; then
+      _profiles=()
+      setopt localoptions extendedglob
+      for file in ${parent_pom_file:h}/**/pom.xml~*target\/*; do  # FIXME project.build.directory is not always target/
+        profiles_section="${(M)${(f)$(<$file)}:#*<profiles>*}"
+        if [[ -n "$profiles_section" ]]; then
+          for profile in ${(s:,,,:)${${${(S)${(S)${(S)${(S)${${profiles_section#*<profile>}%</profile>*}//<repositories>*<\/repositories>}//<pluginRepositories>*<\/pluginRepositories>}//<build>*<\/build>}//<\/id>*<id>/,,,}##*<id>}%%</id>*}}; do
+            [[ -z ${(M)profiles:#"$profile"*} ]] && _profiles+=("$profile"'['"in ${file#${parent_pom_file:h}\/}"']')
+          done
+        fi
+      done
+      [[ $#_profiles -gt 0 ]] && _store_cache "$cache_name" _profiles
+    fi
+    profs+=($_profiles)
+  fi
+
+  compset -P '-'; compset -P '+'; compset -P '!' # FIXME Only works for the first profile
+
+  [[ $#profs -gt 0 ]] && _values $@ 'profile' "${profs[@]}" && ret=0
+
+  return ret
+}
+
+(( $+functions[_mvn_projects] )) ||
+_mvn_projects() {
+  # TODO Projects can also be given in the form [groupId:]artifactId.
+  # TODO Should be split into _mvn_projects/mvn_projects_lists
+  local pom_file=$(__mvn_get_parent_pom_file) ret=1
+
+  if [[ -f $pom_file ]]; then
+    setopt localoptions extendedglob
+    local projects; projects=(${pom_file:h}/*/**/pom.xml~*target\/*) # FIXME project.build.directory is not always target/
+    projects=(${${projects#.\/}:h})
+    [[ $#projects -gt 0 ]] && _values "$@" 'project' "${projects[@]}" && ret=0
+  fi
+
+  return ret
+}
+
+(( $+functions[_mvn_properties] )) ||
+_mvn_properties() {
+  local ret=1
+  if compset -P '*='; then
+    _wanted property-values expl 'property value' _mvn_property_values ${${IPREFIX%=}#-D} && ret=0
+  else
+    _wanted property-names expl 'property name' _mvn_property_names -qS= && ret=0
+  fi
+  return ret
+}
+
+(( $+functions[_mvn_property_names] )) ||
+_mvn_property_names() {
+  # FIXME "-qS=" should be inherited from _mvn_properties
+  local alternatives; alternatives=(
+    "common-property-names:common property name:_mvn_common_property_names -qS="
+  )
+  for plugin_colon_goal in ${(M)words:#[^-]*:*}; do
+    alternatives+=("plugin-property-names:plugin property name:_mvn_plugin_goal_property_names -qS= ${plugin_colon_goal}")
+  done
+  _alternative "${alternatives[@]}"
+}
+
+(( $+functions[_mvn_common_property_names] )) ||
+_mvn_common_property_names() {
+  local properties; properties=(
+    'skipTests:skip tests execution'
+    'maven.test.skip:skip tests compilation and execution'
+    'gpg.passphrase:gpg passphrase'
+    'tycho.mode:enable maven mode for Tycho projects to disable p2 resolution'
+  )
+  _describe -t 'common-property-names' 'common property name' properties $@
+}
+
+(( $+functions[_mvn_plugin_goal_property_names] )) ||
+_mvn_plugin_goal_property_names() {
+  local plugin_colon_goal="$@[-1]" update_policy ret=1
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  [[ -z "$update_policy" ]] && zstyle ":completion:${curcontext}:" cache-policy _mvn_properties_caching_policy
+
+  unset _properties
+  if ( [[ ${+_properties} -eq 0 ]] || _cache_invalid "mvn/plugins/${plugin_colon_goal}" ) && ! _retrieve_cache "mvn/plugins/${plugin_colon_goal}"; then
+    # FIXME Does not work for:
+    #   android:apk (new line before expression)
+    #   ear:ear (unknown cause)
+    _properties=(${(M)${(ps:,,,:)${${${${(pj: :)${${${(f)${"$(_call_program properties $words[1] -N org.apache.maven.plugins:maven-help-plugin:2.1.1:describe -Dplugin=${plugin_colon_goal%:*} -Dgoal=${plugin_colon_goal##*:} -Ddetail)"#*Available parameters:}%%\[INFO\]*}//#    [a-z]*/,,,}##*Expression: \$\{}}//\}[[:space:]]##/:}//[[:space:]]##/ }//[[:space:]]#,,,[[:space:]]#/,,,}}:#[a-zA-Z]##:*})
+    [[ $#_properties -gt 0 ]] && _store_cache "mvn/plugins/${plugin_colon_goal}" _properties
+  fi
+
+  [[ $#_properties -gt 0 ]] && _describe -t "${plugin_colon_goal//:/-}-property-names" "${plugin_colon_goal} property name" _properties $@[0,-2] && ret=0
+
+  return ret
+}
+
+(( $+functions[_mvn_property_values] )) ||
+_mvn_property_values() {
+  local ret=1
+  setopt localoptions extendedglob
+  case $@[-1] in
+    ((#i)*pomFile*) _wanted pom-files expl 'POM file' _mvn_pom_files && ret=0;;
+    ((#i)*file*) _wanted files expl 'file' _files && ret=0;;
+    ((#i)*groupId*) _wanted groupIds expl 'groupId' _mvn_groupIds && ret=0;;
+    ((#i)*artifactId*) _wanted artifactIds expl 'artifactId' _mvn_groupId_artifactIds ${${(M)${(ps.:.)opt_args[(K)-D]}:#groupId=*}#groupId=} && ret=0;;
+    ((#i)*version*) _wanted versions expl 'version' _mvn_artifact_versions ${${(M)${(ps.:.)opt_args[(K)-D]}:#groupId=*}#groupId=}:${${(M)${(ps.:.)opt_args[(K)-D]}:#artifactId=*}#artifactId=} && ret=0;;
+    ((#i)*repositoryId*) _message -e repositoryIds 'repositoryId' && ret=0;; # TODO Not implemented
+    ((#i)*classifier*) _message -e classifiers 'classifier' && ret=0;;
+    ((#i)*scope*) _wanted scopes expl 'scope' _mvn_scopes && ret=0;;
+    ((#i)*url*) _wanted urls expl 'url' _urls && ret=0;; # TODO Use _alternative and add repository urls from settings + projects
+    ((#i)*(password|passphrase)*) _wanted passwords expl password _mvn_passwords && ret=0;;
+    ((#i)*(createChecksum|generatePom|maven.test.skip)*) _wanted booleans expl 'boolean' _mvn_booleans && ret=0;;
+    ((#i)*user*) _wanted users expl 'user' _users && ret=0;; # TODO Use _alternative and add repository usernames from settings + projects
+    ((#i)*plugin*) _wanted plugin expl 'plugin' _mvn_plugins && ret=0;;
+    ((#i)*tycho.mode*) _wanted tychomodes expl 'tychomode' _mvn_tycho_modes && ret=0;;
+    (*) _default && ret=0;;
+  esac
+  return ret
+}
+
+(( $+functions[_mvn_scopes] )) ||
+_mvn_scopes() {
+  local scopes; scopes=(
+    'compile:default scope, used if none is specified. Compile dependencies are available in all classpaths of a project. Furthermore, those dependencies are propagated to dependent projects.'
+    'provided:much like compile, but indicates you expect the JDK or a container to provide the dependency at runtime. For example, when building a web application for the Java Enterprise Edition, you would set the dependency on the Servlet API and related Java EE APIs to scope provided because the web container provides those classes. This scope is only available on the compilation and test classpath, and is not transitive.'
+    'runtime:indicates that the dependency is not required for compilation, but is for execution. It is in the runtime and test classpaths, but not the compile classpath.'
+    'test:indicates that the dependency is not required for normal use of the application, and is only available for the test compilation and execution phases.'
+    'system:similar to provided except that you have to provide the JAR which contains it explicitly. The artifact is always available and is not looked up in a repository.'
+    'import:only used on a dependency of type pom in the <dependencyManagement> section. It indicates that the specified POM should be replaced with the dependencies in that POM'\''s <dependencyManagement> section. Since they are replaced, dependencies with a scope of import do not actually participate in limiting the transitivity of a dependency.'
+  )
+  _describe -t scopes 'scope' scopes
+}
+
+(( $+functions[_mvn_thread_counts] )) ||
+_mvn_thread_counts() {
+  local thread_counts; thread_counts=(
+    '1:build with 1 thread'  '1C:build with 1 thread per CPU core'
+    '2:build with 2 threads' '2C:build with 2 threads per CPU core'
+    '3:build with 3 threads' '3C:build with 3 threads per CPU core'
+    '4:build with 4 threads' '4C:build with 4 threads per CPU core'
+    '5:build with 5 threads' '5C:build with 5 threads per CPU core'
+    '6:build with 6 threads' '6C:build with 6 threads per CPU core'
+    '7:build with 7 threads' '7C:build with 7 threads per CPU core'
+    '8:build with 8 threads' '8C:build with 8 threads per CPU core'
+  )
+  _describe -t thread-counts 'thread count' thread_counts
+}
+
+(( $+functions[_mvn_reactors] )) ||
+_mvn_reactors() {
+  _message -e reactors 'reactor' # FIXME No idea what kind of value the "--reactor" option is supposed to take
+}
+
+(( $+functions[_mvn_passwords] )) ||
+_mvn_passwords() {
+  _message -e passwords 'password'
+}
+
+(( $+functions[_mvn_pom_files] )) ||
+_mvn_pom_files() {
+  _files -g '*pom*\.xml*'
+}
+
+(( $+functions[_mvn_toolchains_files] )) ||
+_mvn_toolchains_files() {
+  _files -g '*toolchains*\.xml*'
+}
+
+(( $+functions[_mvn_settings_files] )) ||
+_mvn_settings_files() {
+  _files -g '*settings*\.xml*'
+}
+
+(( $+functions[_mvn_log_files] )) ||
+_mvn_log_files() {
+  _files
+}
+
+(( $+functions[_mvn_booleans] )) ||
+_mvn_booleans() {
+  local booleans; booleans=(
+    'true:"true" boolean value'
+    'false:"false" boolean value'
+  )
+  _describe -t booleans 'boolean' booleans
+}
+
+
+(( $+functions[_mvn_tycho_modes] )) ||
+_mvn_tycho_modes() {
+  local tychomodes; tychomodes=(
+    'maven:maven mode, Tycho will not do any p2 dependency resolution'
+  )
+  _describe -t tychomodes 'boolean' tychomodes
+}
+
+# ------------------------------------------------------------------------------
+# Helper functions
+# ------------------------------------------------------------------------------
+
+__mvn_get_pom_file() {
+  print ${~opt_args[-f]:-${opt_args[--file]:-pom.xml}}
+}
+
+__mvn_get_parent_pom_file() {
+  local pom_file=$(__mvn_get_pom_file)
+  while [[ -f ${pom_file:a:h:h}/pom.xml ]]; do
+    pom_file=${pom_file:a:h:h}/pom.xml;
+  done
+  print $pom_file
+}
+
+__mvn_get_settings_file() {
+  print ${~opt_args[-s]:-${opt_args[--settings]:-$HOME/.m2/settings.xml}}
+}
+
+__mvn_get_repository_location() {
+  print ${${${${(M)"$(<$(__mvn_get_settings_file))":#*<localRepository>*}:-$HOME/.m2/repository}##*<localRepository>}%%<\/localRepository>*}
+}
+
+__mvn_get_plugin_prefix() {
+  print ${${${${@#*.*:}%%:*}%-plugin}/-#maven-#}
+}
+
+__mvn_get_cache_dir() {
+  local cache_dir
+  zstyle -s ":completion:${curcontext}:" cache-path cache_dir
+  print ${cache_dir:-${ZDOTDIR:-$HOME}/.zcompcache}
+}
+
+
+# ------------------------------------------------------------------------------
+# Caching policies
+# ------------------------------------------------------------------------------
+
+(( $+functions[_mvn_goals_caching_policy] )) ||
+_mvn_goals_caching_policy() {
+  # Rebuild if cache is older than one month.
+  local -a oldp
+  oldp=( "$1"(NmM+1) )
+  (( $#oldp ))
+}
+
+(( $+functions[_mvn_properties_caching_policy] )) ||
+_mvn_properties_caching_policy() {
+  _mvn_goals_caching_policy 
+}
+
+(( $+functions[_mvn_groupIds_caching_policy] )) ||
+_mvn_groupIds_caching_policy() {
+  _mvn_goals_caching_policy
+}
+
+(( $+functions[_mvn_profiles_caching_policy] )) ||
+_mvn_profiles_caching_policy() {
+  # Rebuild if cached file more recent than cache.
+  local cached_file="${1#$(__mvn_get_cache_dir)}"
+  [[ -f $cached_file && $cached_file -nt "$1" ]] && return 0
+
+  # Rebuild if cache is older than one week.  
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp )) && return 0
+
+  return 1
+}
+
+_mvn "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_node b/zsh/modules/completion/external/src/_node
new file mode 100644
index 0000000..f9ef3c7
--- /dev/null
+++ b/zsh/modules/completion/external/src/_node
@@ -0,0 +1,66 @@
+#compdef node
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Node.js v0.8.4 (http://nodejs.org)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Mario Fernandez (https://github.com/sirech)
+#  * Nicholas Penree (https://github.com/drudge)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_arguments -C \
+  '(- 1 *)--help[print options help]' \
+  '(- 1 *)'{-v,--version}'[print node version]' \
+  '(--no-deprecation)--no-deprecation[silence deprecation warnings]' \
+  '(--trace-deprecation)--trace-deprecation[show stack traces on deprecations]' \
+  '(- 1 *)--v8-options[print v8 command line options]' \
+  '(--max-stack-size)--max-stack-size=[set max v8 stack size (bytes)]' \
+  '(-e --eval)'{-e,--eval}'[evaluate script]:Inline Script' \
+  '(-i --interactive)'{-i,--interactive}'[always enter the REPL even if stdin does not appear to be a terminal]' \
+  '(-p --print)'{-p,--print}'[print result of --eval]' \
+  '(--vars)--vars[print various compiled-in variables]' \
+  '*:JS Script:_files -g "*.js"' && ret=0
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_nvm b/zsh/modules/completion/external/src/_nvm
new file mode 100644
index 0000000..05b4cf1
--- /dev/null
+++ b/zsh/modules/completion/external/src/_nvm
@@ -0,0 +1,110 @@
+#compdef nvm
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for nvm (https://github.com/creationix/nvm).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Changwoo Park (https://github.com/pismute)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line  ret=1
+
+local -a _1st_arguments
+_1st_arguments=(
+  'help:Show this message'
+  'install:Download and install a <version>'
+  'uninstall:Uninstall a <version>'
+  'use:Modify PATH to use <version>'
+  'run:Run <version> with <args> as arguments'
+  'ls:List installed [versions]'
+  'ls-remote:List remote versions available for install'
+  'deactivate:Undo effects of NVM on current shell'
+  'alias:Set an alias named <name> pointing to <version>. Show all aliases beginning with [<pattern>].'
+  'unalias:Deletes the alias named <name>'
+  'copy-packages:Install global NPM packages contained in <version> to current version'
+  'clear-cache:Clear cache'
+  'version:Show current node version'
+)
+
+_arguments -C \
+  '1: :->cmds' \
+  '*: :->args' && ret=0
+
+__nvm_aliases(){
+  local aliases
+  aliases=""
+  if [ -d $NVM_DIR/alias ]; then
+    aliases="`cd $NVM_DIR/alias && ls`"
+  fi
+  echo "${aliases}"
+}
+
+__nvm_versions(){
+  echo "$(nvm_ls) $(__nvm_aliases)"
+}
+
+case $state in
+  cmds)
+    _describe -t commands 'nvm command' _1st_arguments && ret=0
+    ;;
+
+  args)
+    case $words[2] in
+      (use|run|ls|list|install|uninstall|copy-packages)
+
+        _values 'version' $(__nvm_versions) && ret=0
+        ;;
+
+      (alias|unalias)
+
+        _values 'aliases' $(__nvm_aliases) && ret=0
+        ;;
+
+      *)
+        (( ret )) && _message 'no more arguments'
+        ;;
+
+    esac
+    ;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_openssl b/zsh/modules/completion/external/src/_openssl
new file mode 100644
index 0000000..1c48650
--- /dev/null
+++ b/zsh/modules/completion/external/src/_openssl
@@ -0,0 +1,1695 @@
+#compdef openssl
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+
+# openssl command [ command_opts ] [ command_args ]
+# pseudo commands:
+# openssl [ list-standard-commands | list-message-digest-commands | list-cipher-commands | list-cipher-algorithms | list-message-digest-algorithms | list-public-key-algorithms]
+
+_openssl() {
+  local openssl_commands cmd cmds
+  if [[ "$CURRENT" -lt 2 ]]; then
+    # I do not think this can happen...
+    return
+  elif [[ "$CURRENT" -eq 2 ]]; then
+    # first parameter, the command
+    openssl_commands=(${(f)"$(openssl list-standard-commands; \
+                              openssl list-message-digest-commands; \
+                              openssl list-cipher-commands)"} \
+                              list-standard-commands \
+                              list-message-digest-commands \
+                              list-cipher-commands \
+                              list-cipher-algorithms \
+                              list-message-digest-algorithms \
+                              list-public-key-algorithms)
+    _describe 'openssl commands' openssl_commands
+  else
+    # $CURRENT -gt 2
+    cmd="${words[2]}"
+    # Note: we could use ${(k)functions} to get a list of all functions and
+    # filter those that start with _openssl_
+    # but that would mean defining a new function *somewhere* might mess with
+    # the completion...
+    cmds=(asn1parse ca ciphers cms crl crl2pkcs7 dgst dh dhparam dsa dsaparam \
+          ec ecparam enc engine errstr gendh gendsa genpkey genrsa nseq ocsp \
+          passwd pkcs12 pkcs7 pkcs8 pkey pkeyparam pkeyutl prime rand req rsa \
+          rsautl s_client s_server s_time sess_id smime speed spkac srp ts \
+          verify version x509)
+    # check if $cmd is in $cmds, the list of supported commands
+    if [[ "${cmds[(r)$cmd]}" == "${cmd}" ]]; then
+      # we should be able to complete $cmd
+      # run _openssl_$cmd with the remaining words from the command line
+      shift words
+      (( CURRENT-- ))
+      _openssl_${cmd}
+    elif [[ "${${(@f)"$(openssl list-cipher-commands)"}[(r)$cmd]}" == "${cmd}" ]]; then
+      # $cmd is a cipher command, which is practically an alias to enc
+      shift words
+      (( CURRENT-- ))
+      _openssl_enc
+    elif [[ "${${(@f)"$(openssl list-message-digest-commands)"}[(r)$cmd]}" == "${cmd}" ]]; then
+      # $cmd is a message digest command, which is practically an alias to dgst
+      shift words
+      (( CURRENT-- ))
+      _openssl_dgst
+    fi
+  fi
+}
+
+
+_openssl_asn1parse() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format - one of DER PEM]:format:(DER PEM)' \
+    '-in[input file]:file:_files' \
+    '-out[output file (output format is always DER]:file:_files' \
+    "-noout[don't produce any output]" \
+    '-offset[offset into file]:number: ' \
+    '-length[length of section in file]:number: ' \
+    '-i[indent entries]' \
+    '-dump[dump unknown data in hex form]' \
+    '-dlimit[dump the first arg bytes of unknown data in hex form]:number: ' \
+    '-oid[file of extra oid definitions]:file:_files' \
+    "-strparse[a series of these can be used to 'dig' into multiple ASN1 blob wrappings]:offset:" \
+    '-genstr[string to generate ASN1 structure from]:str:' \
+    '-genconf[file to generate ASN1 structure from]:file:_files'
+}
+
+
+_openssl_ca() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-verbose[talk alot while doing things]' \
+    '-config[a config file]:file:_files' \
+    '-name[the particular CA definition to use]:section: ' \
+    '-gencrl[generate a new CRL]' \
+    '-crldays[days is when the next CRL is due]:days: ' \
+    '-crlhours[hours is when the next CRL is due]:hours: ' \
+    '-startdate[certificate validity notBefore]:date: ' \
+    '-enddate[certificate validity notAfter (overrides -days)]:date: ' \
+    '-days[number of days to certify the certificate for]:days: ' \
+    '-md[md to use, one of md2, md5, sha or sha1]:alg:(md2 md5 sha sha1)' \
+    "-policy[the CA 'policy' to support]:policy: " \
+    '-keyfile[private key file]:file:_files' \
+    '-keyform[private key file format (PEM or ENGINE)]:format:(PEM ENGINE)' \
+    '-key[key to decode the private key if it is encrypted]:password: ' \
+    '-cert[the CA certificate]:file:_files' \
+    '-selfsign[sign a certificate with the key associated with it]' \
+    '-in[the input PEM encoded certificate request(s)]:file:_files' \
+    '-out[where to put the output file(s)]:file:_files' \
+    '-outdir[where to put output certificates]:dir:_files -/' \
+    '-infiles[the last argument, requests to process]:*:files:_files' \
+    '-spkac[file contains DN and signed public key and challenge]:file:_files' \
+    '-ss_cert[file contains a self signed cert to sign]:file:_files' \
+    "-preserveDN[don't re-order the DN]" \
+    "-noemailDN[don't add the EMAIL field into certificate' subject]" \
+    "-batch[don't ask questions]" \
+    '-msie_hack[msie modifications to handle all those universal strings]' \
+    '-revoke[revoke a certificate (given in file)]:file:_files' \
+    "-subj[use arg instead of request's subject]:subject: " \
+    '-utf8[input characters are UTF8 (default ASCII)]' \
+    '-multivalue-rdn[enable support for multivalued RDNs]' \
+    '-extensions[extension section (override value in config file)]:section: ' \
+    '-extfile[configuration file with X509v3 extentions to add]:file:_files' \
+    '-crlexts[CRL extension section (override value in config file)]:section: ' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-status[shows certificate status given the serial number]:serial: ' \
+    '-updatedb[updates db for expired certificates]'
+}
+
+
+_openssl_ciphers() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-v[verbose mode, a textual listing of the SSL/TLS ciphers in OpenSSL]' \
+    '-V[even more verbose]' \
+    '-ssl2[SSL2 mode]' \
+    '-ssl3[SSL3 mode]' \
+    '-tls1[TLS1 mode]' \
+    ':cipher suite:_list_ciphers'
+}
+
+
+_openssl_cms() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-encrypt[encrypt message]' \
+    '-decrypt[decrypt encrypted message]' \
+    '-sign[sign message]' \
+    '-verify[verify signed message]' \
+    '-cmsout[output CMS structure]' \
+    '-des3[encrypt with triple DES]' \
+    '-des[encrypt with DES]' \
+    '-seed[encrypt with SEED]' \
+    '-rc2-40[encrypt with RC2-40 (default)]' \
+    '-rc2-64[encrypt with RC2-64]' \
+    '-rc2-128[encrypt with RC2-128]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    "-nointern[don't search certificates in message for signer]" \
+    "-nosigs[don't verify message signature]" \
+    "-noverify[don't verify signers certificate]" \
+    "-nocerts[don't include signers certificate when signing]" \
+    '-nodetach[use opaque signing]' \
+    "-noattr[don't include any signed attributes]" \
+    "-binary[don't translate message to text]" \
+    '-certfile[other certificates file]:file:_files' \
+    '-certsout[certificate output file]:file:_files' \
+    '-signer[signer certificate file]:file:_files' \
+    '-recip[recipient certificate file for decryption]:file:_files' \
+    '-keyid[use subject key identifier]' \
+    '-in[input file]:file:_files' \
+    '-inform[input format SMIME (default), PEM or DER]:format:(SMIME PEM DER)' \
+    '-inkey[input private key (if not signer or recipient)]:file:_files' \
+    '-keyform[input private key format (PEM or ENGINE)]:format:(PEM ENGINE)' \
+    '-out[output file]:file:_files' \
+    '-outform[output format SMIME (default), PEM or DER]:format:(SMIME PEM DER)' \
+    '-content[supply or override content for detached signature]:file:_files' \
+    '-to[to address mail head]:address: ' \
+    '-from[from address mail head]:address: ' \
+    '-subject[subject mail head]:subject: ' \
+    '-text[include or delete text MIME headers]' \
+    '-CApath[trusted certificates directory]:dir:_files -/' \
+    '-CAfile[trusted certificates file]:file:_files' \
+    "-crl_check[check revocation status of signer's certificate using CRLs]" \
+    "-crl_check_all[check revocation status of signer's certificate chain using CRLs]" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '*:certificate:_files'
+}
+
+
+_openssl_crl() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format - default PEM (DER or PEM)]:format:(PEM DER)' \
+    '-outform[output format - default PEM]:format:(PEM DER)' \
+    '-text[print out a text format version]' \
+    '-in[input file - default stdin]:file:_files' \
+    '-out[output file - default stdout]:file:_files' \
+    '-hash[print hash value]' \
+    '-hash_old[print old-style (MD5) hash value]' \
+    '-fingerprint[print the crl fingerprint]' \
+    '-issuer[print issuer DN]' \
+    '-lastupdate[print lastUpdate field]' \
+    '-nextupdate[print nextUpdate field]' \
+    '-crlnumber[print CRL number]' \
+    '-noout[no CRL output]' \
+    '-CAfile[verify CRL using certificates in the specified file]:file:_files' \
+    '-CApath[verify CRL using certificates in the specified directory]:dir:_files -/' \
+    '*-nameopt[various certificate name options]:options:_nameopts'
+}
+
+
+_openssl_crl2pkcs7() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format - DER or PEM]:format:(PEM DER)' \
+    '-outform[output format - DER or PEM]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-certfile[certificates file of chain to a trusted CA (can be used more than once)]:file:_files' \
+    "-nocrl[no crl to load, just certs from '-certfile']"
+}
+
+
+_openssl_dgst() {
+  # written for openssl 1.0.1k
+  local digests
+  digests=(-dss1 -md4 -md5 -mdc2 -ripemd160 -sha -sha1 -sha224 -sha256 -sha384 -sha512 -whirlpool)
+  # -hmac is listed twice because it's documented twice by openssl
+  _arguments -C -A '-*' \
+    '(-r -hex -binary)-c[to output the digest with separating colons]' \
+    '(-c -hex -binary)-r[to output the digest in coreutils format]' \
+    '-d[to output debug info]' \
+    '(-c -r -binary)-hex[output as hex dump]' \
+    '(-c -r -hex)-binary[output in binary form]' \
+    '-hmac[set the HMAC key to arg]:key: ' \
+    '-non-fips-allow[allow use of non FIPS digest]' \
+    '-sign[sign digest using private key in the specified file]:file:_files' \
+    '-verify[verify a signature using public key in the specified file]:file:_files' \
+    '-prverify[verify a signature using private key in the specified file]:file:_files' \
+    '-keyform[key file format (PEM or ENGINE)]:format:(PEM ENGINE)' \
+    '-out[output to filename rather than stdout]:file:_files' \
+    '-signature[signature to verify]:file:_files' \
+    '-sigopt[signature parameter]:nm\:v: ' \
+    '-hmac[create hashed MAC with key]:key: ' \
+    '-mac[create MAC (not neccessarily HMAC)]:algorithm: ' \
+    '-macopt[MAC algorithm parameters or key]:nm\:v: ' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    "($digests)-dss1[use the dss1 message digest algorithm]" \
+    "($digests)-md4[to use the md4 message digest algorithm]" \
+    "($digests)-md5[to use the md5 message digest algorithm]" \
+    "($digests)-mdc2[to use the mdc2 message digest algorithm]" \
+    "($digests)-ripemd160[to use the ripemd160 message digest algorithm]" \
+    "($digests)-sha[to use the sha message digest algorithm]" \
+    "($digests)-sha1[to use the sha1 message digest algorithm]" \
+    "($digests)-sha224[to use the sha224 message digest algorithm]" \
+    "($digests)-sha256[to use the sha256 message digest algorithm]" \
+    "($digests)-sha384[to use the sha384 message digest algorithm]" \
+    "($digests)-sha512[to use the sha512 message digest algorithm]" \
+    "($digests)-whirlpool[to use the whirlpool message digest algorithm]" \
+    '*:file:_files'
+}
+
+
+_openssl_dh() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-check[check the DH parameters]' \
+    '-text[print a text form of the DH parameters]' \
+    '-C[output C code]' \
+    '-noout[no output]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_dhparam() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-dsaparam[read or generate DSA parameters, convert to DH]' \
+    '-check[check the DH parameters]' \
+    '-text[print a text form of the DH parameters]' \
+    '-C[output C code]' \
+    '-2[generate parameters using  2 as the generator value]' \
+    '-5[generate parameters using  5 as the generator value]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-noout[no output]' \
+    ':numbits: '
+}
+
+
+_openssl_dsa() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-passin[input file pass phrase source]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-passout[output file pass phrase source]:file:_files' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-des[encrypt PEM output with cbc des]' \
+    '-des3[encrypt PEM output with ede cbc des using 168 bit key]' \
+    '-idea[encrypt PEM output with cbc idea]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    '-seed[encrypt PEM output with cbc seed]' \
+    '-text[print the key in text]' \
+    "-noout[don't print key out]" \
+    '-modulus[print the DSA public value]'
+}
+
+
+_openssl_dsaparam() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-text[print as text]' \
+    '-C[output C code]' \
+    '-noout[no output]' \
+    '-genkey[generate a DSA key]' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    ':numbits: '
+}
+
+
+_openssl_ec() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-passin[input file pass phrase source]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-passout[output file pass phrase source]:file:_files' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    "-des[encrypt PEM output, instead of 'des' every other cipher supported by OpenSSL can be used]" \
+    '-text[print the key]' \
+    "-noout[don't print key out]" \
+    '-param_out[print the elliptic curve parameters]' \
+    '-conv_form[specifies the point conversion form]:form:(compressed uncompressed hybrid)' \
+    '-param_enc[specifies the way the ec parameters are encoded in the asn1 der encoding]:encoding:(named_curve explicit)'
+}
+
+
+_openssl_ecparam() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file  - default stdin]:file:_files' \
+    '-out[output file - default stdout]:file:_files' \
+    '-noout[do not print the ec parameter]' \
+    '-text[print the ec parameters in text form]' \
+    '-check[validate the ec parameters]' \
+    "-C[print a 'C' function creating the parameters]" \
+    "-name[use the ec parameters with 'short name' name]:name: " \
+    "-list_curves[prints a list of all currently available curve 'short names']" \
+    '-conv_form[specifies the point conversion form]:form:(compressed uncompressed hybrid)' \
+    '-param_enc[specifies the way the ec parameters are encoded in the asn1 der encoding]:encoding:(named_curve explicit)' \
+    "-no_seed[if 'explicit' parameters are chosen do not use the seed]" \
+    '-genkey[generate ec key]' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_enc() {
+  # written for openssl 1.0.1k
+  local ciphers
+  ciphers=(-aes-128-cbc -aes-128-cbc-hmac-sha1 -aes-128-cfb -aes-128-cfb1 \
+           -aes-128-cfb8 -aes-128-ctr -aes-128-ecb -aes-128-gcm -aes-128-ofb \
+           -aes-128-xts -aes-192-cbc -aes-192-cfb -aes-192-cfb1 -aes-192-cfb8 \
+           -aes-192-ctr -aes-192-ecb -aes-192-gcm -aes-192-ofb -aes-256-cbc \
+           -aes-256-cbc-hmac-sha1 -aes-256-cfb -aes-256-cfb1 -aes-256-cfb8 \
+           -aes-256-ctr -aes-256-ecb -aes-256-gcm -aes-256-ofb -aes-256-xts \
+           -aes128 -aes192 -aes256 -bf -bf-cbc -bf-cfb -bf-ecb -bf-ofb \
+           -blowfish -camellia-128-cbc -camellia-128-cfb -camellia-128-cfb1 \
+           -camellia-128-cfb8 -camellia-128-ecb -camellia-128-ofb \
+           -camellia-192-cbc -camellia-192-cfb -camellia-192-cfb1 \
+           -camellia-192-cfb8 -camellia-192-ecb -camellia-192-ofb \
+           -camellia-256-cbc -camellia-256-cfb -camellia-256-cfb1 \
+           -camellia-256-cfb8 -camellia-256-ecb -camellia-256-ofb \
+           -camellia128 -camellia192 -camellia256 -cast -cast-cbc -cast5-cbc \
+           -cast5-cfb -cast5-ecb -cast5-ofb -des -des-cbc -des-cfb -des-cfb1 \
+           -des-cfb8 -des-ecb -des-ede -des-ede-cbc -des-ede-cfb -des-ede-ofb \
+           -des-ede3 -des-ede3-cbc -des-ede3-cfb -des-ede3-cfb1 \
+           -des-ede3-cfb8 -des-ede3-ofb -des-ofb -des3 -desx -desx-cbc \
+           -id-aes128-GCM -id-aes192-GCM -id-aes256-GCM -idea -idea-cbc \
+           -idea-cfb -idea-ecb -idea-ofb -rc2 -rc2-40-cbc -rc2-64-cbc \
+           -rc2-cbc -rc2-cfb -rc2-ecb -rc2-ofb -rc4 -rc4-40 -rc4-hmac-md5 \
+           -rc5 -rc5-cbc -rc5-cfb -rc5-ecb -rc5-ofb -seed -seed-cbc -seed-cfb \
+           -seed-ecb -seed-ofb)
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-pass[pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-e[encrypt]' \
+    '-d[decrypt]' \
+    '(-a -base64)'{-a,-base64}'[base64 encode/decode, depending on encryption flag]' \
+    '-k[the password to derive the key from]:password: ' \
+    '-kfile[read the password to derive the key from the first line of the file]:file:_files' \
+    '-md[the md to use to create a key from a passphrase]:alg:(md2 md5 sha sha1)' \
+    '-S[the actual salt to use]:salt: ' \
+    '-K[the actual key to use]:key: ' \
+    '-iv[the actual IV to use]:IV: ' \
+    '-p[print out the key and IV used]' \
+    '-P[print out the key and IV used the exit]' \
+    '-bufsize[set the buffer size for I/O]:size: ' \
+    '-nopad[disable standard block padding]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    "(${ciphers})-aes-128-cbc[cipher types]" \
+    "(${ciphers})-aes-128-cbc-hmac-sha1[cipher types]" \
+    "(${ciphers})-aes-128-cfb[cipher types]" \
+    "(${ciphers})-aes-128-cfb1[cipher types]" \
+    "(${ciphers})-aes-128-cfb8[cipher types]" \
+    "(${ciphers})-aes-128-ctr[cipher types]" \
+    "(${ciphers})-aes-128-ecb[cipher types]" \
+    "(${ciphers})-aes-128-gcm[cipher types]" \
+    "(${ciphers})-aes-128-ofb[cipher types]" \
+    "(${ciphers})-aes-128-xts[cipher types]" \
+    "(${ciphers})-aes-192-cbc[cipher types]" \
+    "(${ciphers})-aes-192-cfb[cipher types]" \
+    "(${ciphers})-aes-192-cfb1[cipher types]" \
+    "(${ciphers})-aes-192-cfb8[cipher types]" \
+    "(${ciphers})-aes-192-ctr[cipher types]" \
+    "(${ciphers})-aes-192-ecb[cipher types]" \
+    "(${ciphers})-aes-192-gcm[cipher types]" \
+    "(${ciphers})-aes-192-ofb[cipher types]" \
+    "(${ciphers})-aes-256-cbc[cipher types]" \
+    "(${ciphers})-aes-256-cbc-hmac-sha1[cipher types]" \
+    "(${ciphers})-aes-256-cfb[cipher types]" \
+    "(${ciphers})-aes-256-cfb1[cipher types]" \
+    "(${ciphers})-aes-256-cfb8[cipher types]" \
+    "(${ciphers})-aes-256-ctr[cipher types]" \
+    "(${ciphers})-aes-256-ecb[cipher types]" \
+    "(${ciphers})-aes-256-gcm[cipher types]" \
+    "(${ciphers})-aes-256-ofb[cipher types]" \
+    "(${ciphers})-aes-256-xts[cipher types]" \
+    "(${ciphers})-aes128[cipher types]" \
+    "(${ciphers})-aes192[cipher types]" \
+    "(${ciphers})-aes256[cipher types]" \
+    "(${ciphers})-bf[cipher types]" \
+    "(${ciphers})-bf-cbc[cipher types]" \
+    "(${ciphers})-bf-cfb[cipher types]" \
+    "(${ciphers})-bf-ecb[cipher types]" \
+    "(${ciphers})-bf-ofb[cipher types]" \
+    "(${ciphers})-blowfish[cipher types]" \
+    "(${ciphers})-camellia-128-cbc[cipher types]" \
+    "(${ciphers})-camellia-128-cfb[cipher types]" \
+    "(${ciphers})-camellia-128-cfb1[cipher types]" \
+    "(${ciphers})-camellia-128-cfb8[cipher types]" \
+    "(${ciphers})-camellia-128-ecb[cipher types]" \
+    "(${ciphers})-camellia-128-ofb[cipher types]" \
+    "(${ciphers})-camellia-192-cbc[cipher types]" \
+    "(${ciphers})-camellia-192-cfb[cipher types]" \
+    "(${ciphers})-camellia-192-cfb1[cipher types]" \
+    "(${ciphers})-camellia-192-cfb8[cipher types]" \
+    "(${ciphers})-camellia-192-ecb[cipher types]" \
+    "(${ciphers})-camellia-192-ofb[cipher types]" \
+    "(${ciphers})-camellia-256-cbc[cipher types]" \
+    "(${ciphers})-camellia-256-cfb[cipher types]" \
+    "(${ciphers})-camellia-256-cfb1[cipher types]" \
+    "(${ciphers})-camellia-256-cfb8[cipher types]" \
+    "(${ciphers})-camellia-256-ecb[cipher types]" \
+    "(${ciphers})-camellia-256-ofb[cipher types]" \
+    "(${ciphers})-camellia128[cipher types]" \
+    "(${ciphers})-camellia192[cipher types]" \
+    "(${ciphers})-camellia256[cipher types]" \
+    "(${ciphers})-cast[cipher types]" \
+    "(${ciphers})-cast-cbc[cipher types]" \
+    "(${ciphers})-cast5-cbc[cipher types]" \
+    "(${ciphers})-cast5-cfb[cipher types]" \
+    "(${ciphers})-cast5-ecb[cipher types]" \
+    "(${ciphers})-cast5-ofb[cipher types]" \
+    "(${ciphers})-des[cipher types]" \
+    "(${ciphers})-des-cbc[cipher types]" \
+    "(${ciphers})-des-cfb[cipher types]" \
+    "(${ciphers})-des-cfb1[cipher types]" \
+    "(${ciphers})-des-cfb8[cipher types]" \
+    "(${ciphers})-des-ecb[cipher types]" \
+    "(${ciphers})-des-ede[cipher types]" \
+    "(${ciphers})-des-ede-cbc[cipher types]" \
+    "(${ciphers})-des-ede-cfb[cipher types]" \
+    "(${ciphers})-des-ede-ofb[cipher types]" \
+    "(${ciphers})-des-ede3[cipher types]" \
+    "(${ciphers})-des-ede3-cbc[cipher types]" \
+    "(${ciphers})-des-ede3-cfb[cipher types]" \
+    "(${ciphers})-des-ede3-cfb1[cipher types]" \
+    "(${ciphers})-des-ede3-cfb8[cipher types]" \
+    "(${ciphers})-des-ede3-ofb[cipher types]" \
+    "(${ciphers})-des-ofb[cipher types]" \
+    "(${ciphers})-des3[cipher types]" \
+    "(${ciphers})-desx[cipher types]" \
+    "(${ciphers})-desx-cbc[cipher types]" \
+    "(${ciphers})-id-aes128-GCM[cipher types]" \
+    "(${ciphers})-id-aes192-GCM[cipher types]" \
+    "(${ciphers})-id-aes256-GCM[cipher types]" \
+    "(${ciphers})-idea[cipher types]" \
+    "(${ciphers})-idea-cbc[cipher types]" \
+    "(${ciphers})-idea-cfb[cipher types]" \
+    "(${ciphers})-idea-ecb[cipher types]" \
+    "(${ciphers})-idea-ofb[cipher types]" \
+    "(${ciphers})-rc2[cipher types]" \
+    "(${ciphers})-rc2-40-cbc[cipher types]" \
+    "(${ciphers})-rc2-64-cbc[cipher types]" \
+    "(${ciphers})-rc2-cbc[cipher types]" \
+    "(${ciphers})-rc2-cfb[cipher types]" \
+    "(${ciphers})-rc2-ecb[cipher types]" \
+    "(${ciphers})-rc2-ofb[cipher types]" \
+    "(${ciphers})-rc4[cipher types]" \
+    "(${ciphers})-rc4-40[cipher types]" \
+    "(${ciphers})-rc4-hmac-md5[cipher types]" \
+    "(${ciphers})-rc5[cipher types]" \
+    "(${ciphers})-rc5-cbc[cipher types]" \
+    "(${ciphers})-rc5-cfb[cipher types]" \
+    "(${ciphers})-rc5-ecb[cipher types]" \
+    "(${ciphers})-rc5-ofb[cipher types]" \
+    "(${ciphers})-seed[cipher types]" \
+    "(${ciphers})-seed-cbc[cipher types]" \
+    "(${ciphers})-seed-cfb[cipher types]" \
+    "(${ciphers})-seed-ecb[cipher types]" \
+    "(${ciphers})-seed-ofb[cipher types]"
+}
+
+
+_openssl_engine() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '(-vv -vvv -vvvv)-v[verbose mode, for each engine, list its "control commands"]' \
+    "(-v -vvv -vvvv)-vv[like -v, but additionally display each command's description]" \
+    '(-v -vv -vvvv)-vvv[like -vv, but also add the input flags for each command]' \
+    '(-v -vv -vvv)-vvvv[like -vvv, but also show internal input flags]' \
+    '-c[for each engine, also list the capabilities]' \
+    '(-tt)-t[for each engine, check that they are really available]' \
+    '(-t)-tt[display error trace for unavailable engines]' \
+    "-pre[runs command 'cmd' against the ENGINE before any attempts to load it (if -t is used)]:cmd: " \
+    "-post[runs command 'cmd' against the ENGINE after loading it (only used if -t is also provided)]:cmd: " \
+    '*:engine:_engines'
+  # TODO: can cmd (for -pre and -post) be completed?
+}
+
+
+_openssl_errstr() {
+  # written for openssl 1.0.1k
+  # written for openssl 1.0.2a
+  _arguments -C \
+    '-stats' \
+    ':errno: '
+}
+
+
+_openssl_gendh() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    "-out[output the key to 'file']:file:_files" \
+    '-2[use 2 as the generator value]' \
+    '-5[use 5 as the generator value]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    ':numbits: '
+}
+
+
+_openssl_gendsa() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    "-out[output the key to 'file']:file:_files" \
+    '-des[encrypt the generated key with DES in cbc mode]' \
+    '-des3[encrypt the generated key with DES in ede cbc mode (168 bit key)]' \
+    '-idea[encrypt the generated key with IDEA in cbc mode]' \
+    '-seed[encrypt PEM output with cbc seed]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    ':dsaparam-file:_files'
+}
+
+
+_openssl_genpkey() {
+  # written for openssl 1.0.1k
+  local ciphers cipher_opts
+  ciphers=( ${$(openssl list-cipher-algorithms | cut -d' ' -f1)} )
+  cipher_opts=()
+  for alg in ${ciphers}; do
+    cipher_opts=(${cipher_opts} "(${${(l:32:: ::-:)ciphers[@]}//  / })-${alg}[use this cipher to encrypt the key]")
+  done
+  _arguments -C \
+    '-out[output file]:file:_files' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-pass[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    $cipher_opts \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '(-algorithm)-paramfile[parameters file]:file:_files' \
+    '(-paramfile)-algorithm[the public key algorithm]:algorithm:(EC RSA DSA DH)' \
+    '-pkeyopt[public key options]:option\:value: ' \
+    '-genparam[generate parameters, not key]' \
+    '-text[print the in text]'
+  # NB: options order may be important!  See the manual page.
+  # TODO: complete pkeyopts
+  # However: "The precise set of options supported depends on the public key
+  # algorithm used and its implementation."
+}
+
+
+_openssl_genrsa() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-des[encrypt the generated key with DES in cbc mode]' \
+    '-des3[encrypt the generated key with DES in ede cbc mode (168 bit key)]' \
+    '-idea[encrypt the generated key with IDEA in cbc mode]' \
+    '-seed[encrypt PEM output with cbc seed]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    '-out[output the key to file]:file:_files' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-f4[use F4 (0x10001) for the E value]' \
+    '-3[use 3 for the E value]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    ':numbits: '
+}
+
+
+_openssl_nseq() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-toseq[output NS Sequence file]'
+}
+
+
+_openssl_ocsp() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-out[output filename]:file:_files' \
+    '-issuer[issuer certificate]:file:_files' \
+    '-cert[certificate to check]:file:_files' \
+    '-serial[serial number to check]:serial: ' \
+    '-signer[certificate to sign OCSP request with]:file:_files' \
+    '-signkey[private key to sign OCSP request with]:file:_files' \
+    '-sign_other[additional certificates to include in signed request]:file:_files' \
+    "-no_certs[don't include any certificates in signed request]" \
+    '-req_text[print text form of request]' \
+    '-resp_text[print text form of response]' \
+    '-text[print text form of request and response]' \
+    '-reqout[write DER encoded OCSP request to "file"]:file:_files' \
+    '-respout[write DER encoded OCSP reponse to "file"]:file:_files' \
+    '-reqin[read DER encoded OCSP request from "file"]:file:_files' \
+    '-respin[read DER encoded OCSP reponse from "file"]:file:_files' \
+    '-nonce[add OCSP nonce to request]' \
+    "-no_nonce[don't add OCSP nonce to request]" \
+    '-url[OCSP responder URL]:URL: ' \
+    '-host[send OCSP request to given host on given port]:host\:port: ' \
+    '-path[path to use in OCSP request]' \
+    '-CApath[trusted certificates directory]:directory:_files -/' \
+    '-CAfile[trusted certificates file]:file:_files' \
+    '-VAfile[validator certificates file]:file:_files' \
+    '-validity_period[maximum validity discrepancy in seconds]:seconds: ' \
+    '-status_age[maximum status age in seconds]:seconds: ' \
+    "-noverify[don't verify response at all]" \
+    '-verify_other[additional certificates to search for signer]:file:_files' \
+    "-trust_other[don't verify additional certificates]" \
+    "-no_intern[don't search certificates contained in response for signer]" \
+    "-no_signature_verify[don't check signature on response]" \
+    "-no_cert_verify[don't check signing certificate]" \
+    "-no_chain[don't chain verify response]" \
+    "-no_cert_checks[don't do additional checks on signing certificate]" \
+    '-port[port to run responder on]:port: ' \
+    '-index[certificate status index file]:file:_files' \
+    '-CA[CA certificate]:file:_files' \
+    '-rsigner[responder certificate to sign responses with]:file:_files' \
+    '-rkey[responder key to sign responses with]:file:_files' \
+    '-rother[other certificates to include in response]:file:_files' \
+    "-resp_no_certs[don't include any certificates in response]" \
+    '-nmin[number of minutes before next update]:minutes: ' \
+    '-ndays[number of days before next update]:days: ' \
+    '-resp_key_id[identify reponse by signing certificate key ID]' \
+    '-nrequest[number of requests to accept (default unlimited)]:limit: ' \
+    '-dss1[use specified digest in the request]' \
+    '-md4[use specified digest in the request]' \
+    '-md5[use specified digest in the request]' \
+    '-mdc2[use specified digest in the request]' \
+    '-ripemd160[use specified digest in the request]' \
+    '-ripemd[use specified digest in the request]' \
+    '-rmd160[use specified digest in the request]' \
+    '-sha1[use specified digest in the request]' \
+    '-sha224[use specified digest in the request]' \
+    '-sha256[use specified digest in the request]' \
+    '-sha384[use specified digest in the request]' \
+    '-sha512[use specified digest in the request]' \
+    '-sha[use specified digest in the request]' \
+    '-ssl2-md5[use specified digest in the request]' \
+    '-ssl3-md5[use specified digest in the request]' \
+    '-ssl3-sha1[use specified digest in the request]' \
+    '-whirlpool[use specified digest in the request]' \
+    '-timeout[timeout connection to OCSP responder after n seconds]:seconds: '
+}
+
+
+_openssl_passwd() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-crypt[standard Unix password algorithm (default)]' \
+    '-1[MD5-based password algorithm]' \
+    '-apr1[MD5-based password algorithm, Apache variant]' \
+    '-salt[use provided salt]:salt: ' \
+    '-in[read passwords from file]:file:_files' \
+    '-stdin[read passwords from stdin]' \
+    '-noverify[never verify when reading password from terminal]' \
+    '-quiet[no warnings]' \
+    '-table[format output as table]' \
+    '-reverse[switch table columns]' \
+    '*:password:'
+}
+
+
+_openssl_pkcs12() {
+  # written for openssl 1.0.2d
+  local algorithms
+  algorithms=(aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc \
+              aes-256-ecb bf-cbc bf-cfb bf-ecb bf-ofb camellia-128-cbc \
+              camellia-128-ecb camellia-192-cbc camellia-192-ecb \
+              camellia-256-cbc camellia-256-ecb cast-cbc cast5-cbc cast5-cfb \
+              cast5-ecb cast5-ofb des-cbc des-cfb des-ecb des-ede des-ede-cbc \
+              des-ede-cfb des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb \
+              des-ede3-ofb des-ofb idea-cbc idea-cfb idea-ecb idea-ofb \
+              rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 \
+              rc4-40 rc5-cbc rc5-cfb rc5-ecb rc5-ofb seed-cbc seed-cfb \
+              seed-ecb seed-ofb PBE-MD2-DES PBE-MD5-DES PBE-SHA1-RC2-64 \
+              PBE-MD2-RC2-64 PBE-MD5-RC2-64 PBE-SHA1-DES PBE-SHA1-RC4-128 \
+              PBE-SHA1-RC4-40 PBE-SHA1-3DES PBE-SHA1-2DES PBE-SHA1-RC2-128 \
+              PBE-SHA1-RC2-40)
+  _arguments -C \
+    '-export[output PKCS12 file]' \
+    '-chain[add certificate chain]' \
+    '-inkey[private key if not infile]:file:_files' \
+    '-certfile[add all certs in the specified file]:file:_files' \
+    "-CApath[PEM format directory of CA's]:file:_files" \
+    "-CAfile[PEM format file of CA's]:file:_files" \
+    '-name[use specified friendly name]:name: ' \
+    '*-caname[use specified CA friendly name]:name: ' \
+    '-in[input filename]:file:_files' \
+    '-out[output filename]:file:_files' \
+    "-noout[don't output anything, just verify]" \
+    "-nomacver[don't verify MAC]" \
+    "-nocerts[don't output certificates]" \
+    '-clcerts[only output client certificates]' \
+    '-cacerts[only output CA certificates]' \
+    "-nokeys[don't output private keys]" \
+    '-info[give info about PKCS#12 structure]' \
+    '-des[encrypt private keys with DES]' \
+    '-des3[encrypt private keys with triple DES (default)]' \
+    '-idea[encrypt private keys with idea]' \
+    '-seed[encrypt private keys with seed]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    "-nodes[don't encrypt private keys]" \
+    "-noiter[don't use encryption iteration]" \
+    "-nomaciter[don't use MAC iteration]" \
+    '-maciter[use MAC iteration]' \
+    "-nomac[don't generate MAC]" \
+    '-twopass[separate MAC, encryption passwords]' \
+    '-descert[encrypt PKCS#12 certificates with triple DES (default RC2-40)]' \
+    "-certpbe[specify certificate PBE algorithm (default RC2-40)]:alg:(${algorithms})" \
+    '-keypbe[specify private key PBE algorithm (default 3DES)]:alg:(${algorithms})' \
+    '-macalg[digest algorithm used in MAC (default SHA1)]:alg:_list_message_digest_algorithms' \
+    '-keyex[set MS key exchange type]' \
+    '-keysig[set MS key signature type]' \
+    '-password[set import/export password source]:pass phrase source:_pass_phrase_source' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-CSP[Microsoft CSP name]:name: ' \
+    '-LMK[add local machine keyset attribute to private key]'
+}
+
+
+_openssl_pkcs7() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-print_certs[print any certs or crl in the input]' \
+    '-text[print full details of certificates]' \
+    "-noout[don't output encoded data]" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_pkcs8() {
+  # written for openssl 1.0.2d
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-inform[input format]:format:(PEM DER)' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-out[output file]:file:_files' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-topk8[output PKCS8 file]' \
+    '-nooct[use (nonstandard) no octet format]' \
+    '-embed[use (nonstandard) embedded DSA parameters format]' \
+    '-nsdb[use (nonstandard) DSA Netscape DB format]' \
+    '-noiter[use 1 as iteration count]' \
+    '-nocrypt[use or expect unencrypted private key]' \
+    '-v2[use PKCS#5 v2.0 and given cipher]:alg:(aes-128-cbc aes-128-ecb aes-192-cbc aes-192-ecb aes-256-cbc aes-256-ecb bf bf-cbc bf-cfb bf-ecb bf-ofb camellia-128-cbc camellia-128-ecb camellia-192-cbc camellia-192-ecb camellia-256-cbc camellia-256-ecb cast cast-cbc cast5-cbc cast5-cfb cast5-ecb cast5-ofb des des-cbc des-cfb des-ecb des-ede des-ede-cbc des-ede-cfb des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb des-ofb des3 desx idea idea-cbc idea-cfb idea-ecb idea-ofb rc2 rc2-40-cbc rc2-64-cbc rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc4-40 rc5 rc5-cbc rc5-cfb rc5-ecb rc5-ofb seed seed-cbc seed-cfb seed-ecb seed-ofb)' \
+    '-v2prf[set the PRF algorithm to use with PKCS#5 v2.0]:alg:(hmacWithMD5 hmacWithRMD160 hmacWithSHA1 hmacWithSHA224 hmacWithSHA256 hmacWithSHA384 hmacWithSHA512)' \
+    '-v1[use PKCS#5 v1.5 and given cipher]:obj:(PBE-MD2-DES PBE-MD5-DES PBE-SHA1-RC2-64 PBE-MD2-RC2-64 PBE-MD5-RC2-64 PBE-SHA1-DES PBE-SHA1-RC4-128 PBE-SHA1-RC4-40 PBE-SHA1-3DES PBE-SHA1-2DES PBE-SHA1-RC2-128 PBE-SHA1-RC2-40)' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_pkey() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-inform[input format]:format:(PEM DER)' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-out[output file]:file:_files' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_pkeyparam() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[the input filename to read parameters from]:file:_files' \
+    '-out[the output filename to write parameters]:file:_files' \
+    '-text[prints out the parameters in plain text in addition to the encoded version]' \
+    '-noout[do not output the encoded version of the parameters]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_pkeyutl() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-sigfile[signature file (verify operation only)]:file:_files' \
+    '-inkey[input key]:file:_files' \
+    '-keyform[private key format]:format:(PEM DER)' \
+    '-pubin[input is a public key]' \
+    '-certin[input is a certificate carrying a public key]' \
+    '-pkeyopt[public key options]:option\:value:_pkeyopts' \
+    '-sign[sign with private key]' \
+    '-verify[verify with public key]' \
+    '-verifyrecover[verify with public key, recover original data]' \
+    '-encrypt[encrypt with public key]' \
+    '-decrypt[decrypt with private key]' \
+    '-derive[derive shared secret]' \
+    '-hexdump[hex dump output]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-passin[pass phrase source]:pass phrase source:_pass_phrase_source'
+}
+
+
+_openssl_prime() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-hex[hex]' \
+    '-checks[number of checks]:checks: ' \
+    ':number:'
+}
+
+
+_openssl_rand() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-out[write to file]:file:_files' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-base64[base64 encode output]' \
+    '-hex[hex encode output]' \
+    ':num:'
+}
+
+
+_openssl_req() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-text[text form of request]' \
+    '-pubkey[output public key]' \
+    '-noout[do not output REQ]' \
+    '-verify[verify signature on REQ]' \
+    '-modulus[RSA modulus]' \
+    "-nodes[don't encrypt the output key]" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    "-subject[output the request's subject]" \
+    '-passin[private key pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-key[use the private key contained in the specified file]:file:_files' \
+    '-keyform[key file format]:format:(PEM DER)' \
+    '-keyout[file to send the key to]:file:_files' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    "-newkey rsa\:-[generate a new RSA key of the specified number of bits in size]:bits: " \
+    "-newkey dsa\:[generate a new DSA key, parameters taken from CA in the specified file]:file:_files" \
+    "-newkey ec\:[generate a new EC key, parameters taken from CA in the specified file]:file:_files" \
+    '-md2[digest to sign with]' \
+    '-md4[digest to sign with]' \
+    '-md5[digest to sign with]' \
+    '-mdc2[digest to sign with]' \
+    '-sha1[digest to sign with]' \
+    '-config[request template file]:file:_files' \
+    '-subj[set or modify request subject]:subject: ' \
+    '-multivalue-rdn[enable support for multivalued RDNs]' \
+    '-new[new request]' \
+    '-batch[do not ask anything during request generation]' \
+    '-x509[output a x509 structure instead of a certificate request]' \
+    '-days[number of days a certificate generated by -x509 is valid for]:days: ' \
+    '-set_serial[serial number to use for a certificate generated by -x509]:serial: ' \
+    '-newhdr[output "NEW" in the header lines]' \
+    "-asn1-kludge[output the 'request' in a format that is wrong but some CA's have been reported as requiring]" \
+    '-extensions[specify certificate extension section (override value in config file)]:section: ' \
+    '-reqexts[specify request extension section (override value in config file)]:section: ' \
+    '-utf8[input characters are UTF8 (default ASCII)]' \
+    '*-nameopt[various certificate name options]:options:_nameopts' \
+    '*-reqopt[- various request text options]:options:_certopts'
+  # TODO: complete -extensions and -reqexts
+}
+
+
+_openssl_rsa() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER NET)' \
+    '-outform[output format]:format:(PEM DER NET)' \
+    '-in[input file]:file:_files' \
+    '-sgckey[use IIS SGC key format]' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-out[output file]:file:_files' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-des[encrypt PEM output with cbc des]' \
+    '-des3[encrypt PEM output with ede cbc des using 168 bit key]' \
+    '-idea[encrypt PEM output with cbc idea]' \
+    '-seed[encrypt PEM output with cbc seed]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    '-text[print the key in text]' \
+    "-noout[don't print key out]" \
+    '-modulus[print the RSA key modulus]' \
+    '-check[verify key consistency]' \
+    '-pubin[expect a public key in input file]' \
+    '-pubout[output a public key]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_rsautl() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-inkey[input key]:file:_files' \
+    '-keyform[private key format]:format:(PEM DER)' \
+    '-pubin[input is an RSA public]' \
+    '-certin[input is a certificate carrying an RSA public key]' \
+    '-ssl[use SSL v2 padding]' \
+    '-raw[use no padding]' \
+    '-pkcs[use PKCS#1 v1.5 padding (default)]' \
+    '-oaep[use PKCS#1 OAEP]' \
+    '-sign[sign with private key]' \
+    '-verify[verify with public key]' \
+    '-encrypt[encrypt with public key]' \
+    '-decrypt[decrypt with private key]' \
+    '-hexdump[hex dump output]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-passin[pass phrase source]:pass phrase source:_pass_phrase_source'
+}
+
+
+_openssl_s_client() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '(-6)-4[use IPv4 only]' \
+    '(-4)-6[use IPv6 only]' \
+    '(-connect)-host[use -connect instead]:host: ' \
+    '(-connect)-port[use -connect instead]:port: ' \
+    '(-host -port)-connect[who to connect to (default is localhost:4433)]:host\:port: ' \
+    '-verify[turn on peer certificate verification]:depth: ' \
+    '-verify_return_error[return verification errors]' \
+    '-cert[certificate file to use, PEM format assumed]:file:_files' \
+    '-certform[certificate format (PEM or DER) PEM default]:format:(PEM DER)' \
+    '-key[private key file to use, in cert file if not specified but cert file is]:file:_files' \
+    '-keyform[key format (PEM or DER) PEM default]:format:(PEM DER)' \
+    '-pass[private key file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    "-CApath[PEM format directory of CA's]:directory:_files -/" \
+    "-CAfile[PEM format file of CA's]:file:_files" \
+    '-reconnect[drop and re-make the connection with the same Session-ID]' \
+    '-pause[sleep(1) after each read(2) and write(2) system call]' \
+    '-prexit[print session information even on connection failure]' \
+    '-showcerts[show all certificates in the chain]' \
+    '-debug[extra output]' \
+    '-msg[show protocol messages]' \
+    '-nbio_test[more ssl protocol testing]' \
+    "-state[print the 'ssl' states]" \
+    '-nbio[run with non-blocking IO]' \
+    '-crlf[convert LF from terminal into CRLF]' \
+    '-quiet[no s_client output]' \
+    '(-no_ign_eof)-ign_eof[ignore input eof (default when -quiet)]' \
+    "(-ign_eof)-no_ign_eof[don't ignore input eof]" \
+    '-psk_identity[PSK identity]:identity: ' \
+    '-psk[PSK in hex (without 0x)]:key: ' \
+    "-srpuser[SRP authentification for 'user']:user: " \
+    "-srppass[password for 'user']:password: " \
+    '-srp_lateuser[SRP username into second ClientHello message]' \
+    '-srp_moregroups[tolerate other than the known g N values]' \
+    '-srp_strength[minimal length in bits for N (default 1024)]:int: ' \
+    '(-no_ssl2 -ssl3 -tls1 -tls1_1 -tls1_2 -dtls1)-ssl2[just use SSLv2]' \
+    '(-no_ssl3 -ssl2 -tls1 -tls1_1 -tls1_2 -dtls1)-ssl3[just use SSLv3]' \
+    '(-no_tls1_2 -ssl2 -ssl3 -tls1 -tls1_1 -dtls1)-tls1_2[just use TLSv1.2]' \
+    '(-no_tls1_1 -ssl2 -ssl3 -tls1 -tls1_1 -dtls1)-tls1_1[just use TLSv1.1]' \
+    '(-no_tls1 -ssl2 -ssl3 -tls1 -tls1_1 -dtls1)-tls1[just use TLSv1.0]' \
+    '(-no_dtls1 -ssl2 -ssl3 -tls1 -tls1_1 -tls1_2)-dtls1[just use DTLSv1]' \
+    '-fallback_scsv[send TLS_FALLBACK_SCSV]' \
+    '-mtu[set the link layer MTU]' \
+    '(-tls1_2)-no_tls1_2[turn off TLSv1.2]' \
+    '(-tls1_1)-no_tls1_1[turn off TLSv1.1]' \
+    '(-tls1)-no_tls1[turn off TLSv1.0]' \
+    '(-ssl3)-no_ssl3[turn off SSLv3]' \
+    '(-ssl2)-no_ssl2[turn off SSLv2]' \
+    '-bugs[switch on all SSL implementation bug workarounds]' \
+    "-serverpref[use server's cipher preferences (only SSLv2)]" \
+    '-cipher[preferred cipher to use]:cipher suite:_list_ciphers' \
+    "-starttls[use the STARTTLS command before starting TLS for those protocols that support it]:protocol:(smtp pop3 imap ftp xmpp)" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-sess_out[file to write SSL session to]:file:_files' \
+    '-sess_in[file to read SSL session from]:file:_files' \
+    '-servername[set TLS extension servername in ClientHello]:host: ' \
+    '-tlsextdebug[hex dump of all TLS extensions received]' \
+    '-status[request certificate status from server]' \
+    '-no_ticket[disable use of RFC4507bis session tickets]' \
+    '-nextprotoneg[enable NPN extension, considering named protocols supported (comma-separated list)]:protocols: ' \
+    '-legacy_renegotiation[enable use of legacy renegotiation (dangerous)]' \
+    '-use_srtp[offer SRTP key management with a colon-separated profile list]:profiles: ' \
+    '-keymatexport[export keying material using label]:label: ' \
+    '-keymatexportlen[export len bytes of keying material (default 20)]:len: '
+}
+
+
+_openssl_s_server() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-accept[port to accept on (default is 4433)]:port: ' \
+    '-context[set session ID context]:id: ' \
+    '-verify[turn on peer certificate verification]:depth: ' \
+    '-Verify[turn on peer certificate verification, must have a cert]:depth: ' \
+    '-verify_return_error[return verification errors]' \
+    '-cert[certificate file to use (default is server.pem)]:file:_files' \
+    '-crl_check[check the peer certificate has not been revoked by its CA]' \
+    '-crl_check_all[check the peer certificate has not been revoked by its CA or any other CRL in the CA chain]' \
+    '-certform[certificate format]:format:(PEM DER)' \
+    '-key[Private Key file to use, in cert file if not specified (default is server.pem)]:file:_files' \
+    '-keyform[key format]:format:(PEM DER ENGINE)' \
+    '-pass[private key file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-dcert[second certificate file to use (usually for DSA)]:file:_files' \
+    '-dcertform[second certificate format]:format:(PEM DER)' \
+    '-dkey[second private key file to use (usually for DSA)]:file:_files' \
+    '-dkeyform[second key format]:format:(PEM DER ENGINE)' \
+    '-dpass[second private key file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-dhparam[DH parameter file to use, in cert file if not specified or a default set of parameters is used]:file:_files' \
+    '-named_curve[elliptic curve name to use for ephemeral ECDH keys. (default is nistp256)]:named curve:_list_curves' \
+    '-nbio[run with non-blocking IO]' \
+    '-nbio_test[test with the non-blocking test bio]' \
+    '-crlf[convert LF from terminal into CRLF]' \
+    '-debug[print more output]' \
+    '-msg[show protocol messages]' \
+    '-state[print the SSL states]' \
+    "-CApath[PEM format directory of CA's]:file:_files -/" \
+    "-CAfile[PEM format file of CA's]:file:_files" \
+    "-nocert[don't use any certificates (Anon-DH)]" \
+    '-cipher[preferred cipher to use]:cipher suite:_list_ciphers' \
+    "-serverpref[use server's cipher preferences]" \
+    '-quiet[no server output]' \
+    '-no_tmp_rsa[do not generate a tmp RSA key]' \
+    '-psk_hint[PSK identity hint to use]:hint: ' \
+    '-psk[PSK in hex (without 0x)]:PSK: ' \
+    '-srpvfile[the verifier file for SRP]:file:_files' \
+    '-srpuserseed[a seed string for a default user salt]:seed: ' \
+    '-ssl2[just talk SSLv2]' \
+    '-ssl3[just talk SSLv3]' \
+    '-tls1_2[just talk TLSv1.2]' \
+    '-tls1_1[just talk TLSv1.1]' \
+    '-tls1[just talk TLSv1]' \
+    '-dtls1[just talk DTLSv1]' \
+    '-timeout[enable timeouts]' \
+    '-mtu[set link layer MTU]' \
+    '-chain[read a certificate chain]' \
+    '-no_ssl2[just disable SSLv2]' \
+    '-no_ssl3[just disable SSLv3]' \
+    '-no_tls1[just disable TLSv1]' \
+    '-no_tls1_1[just disable TLSv1.1]' \
+    '-no_tls1_2[just disable TLSv1.2]' \
+    '-no_dhe[disable ephemeral DH]' \
+    '-no_ecdhe[disable ephemeral ECDH]' \
+    '-bugs[turn on SSL bug compatibility]' \
+    '-hack[workaround for early Netscape code]' \
+    "-www[respond to a 'GET /' with a status page]" \
+    "-WWW[respond to a 'GET /<path> HTTP/1.0' with file ./<path>]" \
+    "-HTTP[respond to a 'GET /<path> HTTP/1.0' with file ./<path> with the assumption it contains a complete HTTP response]" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-id_prefix[generate SSL/TLS session IDs prefixed by arg]:prefix: ' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    '-servername[servername for HostName TLS extension]:hostname: ' \
+    '-servername_fatal[on mismatch send fatal alert (default warning alert)]' \
+    '-cert2[certificate file to use for servername (default is server2.pem)]:file:_files' \
+    '-key2[Private Key file to use for servername, in cert file if not specified (default is server2.pem)]:file:_files' \
+    '-tlsextdebug[hex dump of all TLS extensions received]' \
+    '-no_ticket[disable use of RFC4507bis session tickets]' \
+    '-legacy_renegotiation[enable use of legacy renegotiation (dangerous)]' \
+    '-nextprotoneg[set the advertised protocols for the NPN extension (comma-separated list)]:protocol:(http/1.0 http/1.1)' \
+    '-use_srtp[offer SRTP key management with a colon-separated profile list]:profiles: ' \
+    '-4[use IPv4 only]' \
+    '-6[use IPv6 only]' \
+    '-keymatexport[export keying material using label]:label: ' \
+    '-keymatexportlen[export len bytes of keying material (default 20)]:length: ' \
+    '-status[respond to certificate status requests]' \
+    '-status_verbose[enable status request verbose printout]' \
+    '-status_timeout[status request responder timeout]:seconds: ' \
+    '-status_url[status request fallback URL]:URL: '
+  # TODO: srtp profiles
+}
+
+
+_openssl_s_time() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-connect[host:port to connect to (default is localhost:4433)]:host\:port: ' \
+    '-nbio[run with non-blocking IO]' \
+    '-ssl2[just use SSLv2]' \
+    '-ssl3[just use SSLv3]' \
+    '-bugs[turn on SSL bug compatibility]' \
+    '-new[just time new connections]' \
+    '-reuse[just time connection reuse]' \
+    "-www[retrieve the specified page from the site]:page: " \
+    '-time[max number of seconds to collect data, default 30]:seconds: ' \
+    '-verify[turn on peer certificate verification]:depth: ' \
+    '-cert[certificate file to use, PEM format assumed]:file:_files' \
+    '-key[RSA file to use, PEM format assumed, key is in cert file]:file:_files' \
+    "-CApath[PEM format directory of CA's]:file:_files -/" \
+    "-CAfile[PEM format file of CA's]:file:_files" \
+    '-cipher[preferred cipher to use]:cipher suite:_list_ciphers'
+}
+
+
+_openssl_sess_id() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format]:format:(PEM DER)' \
+    '-outform[output format]:format:(PEM DER)' \
+    '-in[input file (default stdin)]:file:_files' \
+    '-out[output file (default stdout)]:file:_files' \
+    '-text[print ssl session id details]' \
+    '-cert[output certificate ]' \
+    '-noout[no CRL output]' \
+    '-context[set the session ID context]:id: '
+}
+
+
+_openssl_smime() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-encrypt[encrypt message]' \
+    '-decrypt[decrypt encrypted message]' \
+    '-sign[sign message]' \
+    '-verify[verify signed message]' \
+    '-pk7out[output PKCS#7 structure]' \
+    '-des3[encrypt with triple DES]' \
+    '-des[encrypt with DES]' \
+    '-seed[encrypt with SEED]' \
+    '-rc2-40[encrypt with RC2-40 (default)]' \
+    '-rc2-64[encrypt with RC2-64]' \
+    '-rc2-128[encrypt with RC2-128]' \
+    '-aes128[encrypt PEM output with cbc aes]' \
+    '-aes192[encrypt PEM output with cbc aes]' \
+    '-aes256[encrypt PEM output with cbc aes]' \
+    '-camellia128[encrypt PEM output with cbc camellia]' \
+    '-camellia192[encrypt PEM output with cbc camellia]' \
+    '-camellia256[encrypt PEM output with cbc camellia]' \
+    "-nointern[don't search certificates in message for signer]" \
+    "-nosigs[don't verify message signature]" \
+    "-noverify[don't verify signers certificate]" \
+    "-nocerts[don't include signers certificate when signing]" \
+    '-nodetach[use opaque signing]' \
+    "-noattr[don't include any signed attributes]" \
+    "-binary[don't translate message to text]" \
+    '-certfile[other certificates file]:file:_files' \
+    '-signer[signer certificate file]:file:_files' \
+    '-recip[recipient certificate file for decryption]:file:_files' \
+    '-in[input file]:file:_files' \
+    '-inform[input format]:format:(SMIME PEM DER)' \
+    '-inkey[input private key (if not signer or recipient)]:file:_files' \
+    '-keyform[input private key format]:format:(PEM ENGINE)' \
+    '-out[output file]:file:_files' \
+    '-outform[output format]:format:(SMIME PEM DER)' \
+    '-content[supply or override content for detached signature]:file:_files' \
+    '-to[to address]:address: ' \
+    '-from[from address]:address: ' \
+    '-subject[subject]:subject: ' \
+    '-text[include or delete text MIME headers]' \
+    '-CApath[trusted certificates directory]:directory:_files -/' \
+    '-CAfile[trusted certificates file]:file:_files' \
+    "-crl_check[check revocation status of signer's certificate using CRLs]" \
+    "-crl_check_all[check revocation status of signer's certificate chain using CRLs]" \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    ':certificate:_files'
+}
+
+
+_openssl_speed() {
+  # written for openssl 1.0.1k
+  local algorithms
+  algorithms=(mdc2 md4 md5 hmac sha1 sha256 sha512 whirlpoolrmd160 idea-cbc \
+              seed-cbc rc2-cbc rc5-cbc bf-cbc des-cbc des-ede3 aes-128-cbc \
+              aes-192-cbc aes-256-cbc aes-128-ige aes-192-ige aes-256-ige \
+              camellia-128-cbc camellia-192-cbc camellia-256-cbc rc4 rsa512 \
+              rsa1024 rsa2048 rsa4096 dsa512 dsa1024 dsa2048 ecdsap160 \
+              ecdsap192 ecdsap224 ecdsap256 ecdsap384 ecdsap521 ecdsak163 \
+              ecdsak233 ecdsak283 ecdsak409 ecdsak571 ecdsab163 ecdsab233 \
+              ecdsab283 ecdsab409 ecdsab571 ecdsa ecdhp160 ecdhp192 ecdhp224 \
+              ecdhp256 ecdhp384 ecdhp521 ecdhk163 ecdhk233 ecdhk283 ecdhk409 \
+              ecdhk571 ecdhb163 ecdhb233 ecdhb283 ecdhb409 ecdhb571 ecdh idea \
+              seed rc2 des aes camellia rsa blowfish)
+  _arguments -C \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-evp[use the specified EVP]:EVP: ' \
+    '-decrypt[time decryption instead of encryption (only EVP)]' \
+    '-mr[produce machine readable output]' \
+    '-multi[run n benchmarks in parallel]:benchmarks: ' \
+    "*:algorithm:(${algorithms})"
+}
+
+
+_openssl_spkac() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-in[input file]:file:_files' \
+    '-out[output file]:file:_files' \
+    '-key[create SPKAC using private key]:file:_files' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-challenge[challenge string]:string: ' \
+    '-spkac[alternative SPKAC name]:spkacname: ' \
+    '-spksect[alternative section name]:section: ' \
+    "-noout[don't print SPKAC]" \
+    '-pubkey[output public key]' \
+    '-verify[verify SPKAC signature]' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+}
+
+
+_openssl_srp() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-verbose[talk alot while doing things]' \
+    '-config[a config file]:file:_files' \
+    '-name[the particular srp definition to use]:definition: ' \
+    '-srpvfile[the srp verifier file name]:file:_files' \
+    '(-modify -delete -list)-add[add an user and srp verifier]' \
+    '(-add -delete -list)-modify[modify the srp verifier of an existing user]' \
+    '(-add -modify -list)-delete[delete user from verifier file]' \
+    '(-add -modify -delete)-list[list user]' \
+    '-gn[g and N values to be used for new verifier]:g and N: ' \
+    '-userinfo[additional info to be set for user]:userinfo: ' \
+    '-passin[input file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-passout[output file pass phrase source]:pass phrase source:_pass_phrase_source' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '-rand[files to use for random number input]:file:_rand_files' \
+    ':user:'
+}
+
+
+_openssl_ts() {
+  # written for openssl 1.0.1k
+  # written for openssl 1.0.2e
+  local action digests
+  digests=(-dss1 -md4 -md5 -mdc2 -ripemd160 -sha -sha1 -sha224 -sha256 \
+           -sha384 -sha512 -whirlpool)
+  if [[ "${CURRENT}" -eq 2 ]]; then
+    # first parameter to ts
+    _values 'openssl time stamp action' '-query[time stamp request generation]' '-reply[time stamp response generation]' '-verify[time stamp response verification]'
+  else
+    action="${words[2]}"
+    case "${action}" in
+      -query)
+        _arguments -C \
+          '-rand[files to use for random number input]:file:_rand_files' \
+          '-config[config file to use]:file:_files' \
+          '(-digest)-data[data file for which the time stamp request needs to be created]:file:_files' \
+          '(-data)-digest[digest of the data file]:bytes: ' \
+          "($digests)-dss1[use the dss1 message digest algorithm]" \
+          "($digests)-md4[to use the md4 message digest algorithm]" \
+          "($digests)-md5[to use the md5 message digest algorithm]" \
+          "($digests)-mdc2[to use the mdc2 message digest algorithm]" \
+          "($digests)-ripemd160[to use the ripemd160 message digest algorithm]" \
+          "($digests)-sha[to use the sha message digest algorithm]" \
+          "($digests)-sha1[to use the sha1 message digest algorithm]" \
+          "($digests)-sha224[to use the sha224 message digest algorithm]" \
+          "($digests)-sha256[to use the sha256 message digest algorithm]" \
+          "($digests)-sha384[to use the sha384 message digest algorithm]" \
+          "($digests)-sha512[to use the sha512 message digest algorithm]" \
+          "($digests)-whirlpool[to use the whirlpool message digest algorithm]" \
+          '-policy[policy to use for creating the time stamp token]:policy ID: ' \
+          '-no_nonce[do not include a nonce in the request]' \
+          '-cert[request a signing certificate in the response]' \
+          '-in[use the previously created time stamp request]:file:_files' \
+          '-out[name of the output file to which the request will be written]:file:_files' \
+          '-text[output in human-readable format instead of DER]'
+        ;;
+      -reply)
+        _arguments -C \
+          '-config[config file to use]:file:_files' \
+          '-section[config file section for response generation]:section: ' \
+          '-queryfile[file containing a DER encoded time stamp request]:file:_files' \
+          '-passin[private key password source]:pass phrase source:_pass_phrase_source' \
+          '-signer[signer certificate of the TSA in PEM format]:file:_files' \
+          '-inkey[signer private key in PEM format]:file:_files' \
+          '-chain[signer certificate chain in PEM format]:file:_files' \
+          '-policy[default policy to use for response]:policy ID: ' \
+          '-in[use the previously created time stamp response in DER format]:file:_files' \
+          '-token_in[the paramter to -in is a time stamp token in DER format]' \
+          '-out[name of the output file to which the response will be written]:file:_files' \
+          '-token_out[output a time stamp token instead of a time stamp response]' \
+          '-text[output in human-readable format instead of DER]' \
+          '-engine[use the specified engine, possibly a hardware device]:engine:_engines'
+        ;;
+      -verify)
+        _arguments -C \
+          '(-digest -queryfile)-data[verify response against the specified file]:file:_files' \
+          '(-data -queryfile)-digest[verify the response against the specified message digest]:digest bytes: ' \
+          '(-data -digest)-queryfile[the original time stamp request in DER format]:file:_files' \
+          '-in[time stamp response that needs to be verified in DER format]:file:_files' \
+          '-token_in[the paramter to -in is a time stamp token in DER format]' \
+          '-CApath[directory containing the trused CA certificates of the client]:directory:_files -/' \
+          '-CAFile[file containing a set of trusted self-signed CA certificates in PEM format]:file:_files' \
+          '-untrusted[set of additional untrusted certificates in PEM format which may be needed when building the certificate chain]:file:_files'
+        ;;
+    esac
+  fi
+}
+
+
+_openssl_verify() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-CApath[a directory of trusted certificates]:directory:_files -/' \
+    '-CAfile[file A file of trusted certificates]:file:_files' \
+    '-purpose[the intended use for the certificate]:purpose:(sslclient sslserver nssslserver smimesign smimeencrypt crlsign any ocsphelper timestampsign)' \
+    '*-policy[enable policy processing and add arg to the user-initial-policy-set]:object name or OID: ' \
+    '-ignore_critical[ignore critical extensions]' \
+    '-attime[perform validation checks using the given time]:timestamp: ' \
+    '-check_ss_sig[verify the signature on the self-signed root CA]' \
+    "-crlfile[file containing one or more CRL's (in PEM format) to load]:file:_files" \
+    '-crl_check[check end entity certificate in CRL]' \
+    '-crl_check_all[check all certificates in CRL]' \
+    '-policy_check[enables certificate policy processing]' \
+    '-explicit_policy[set policy variable require-explicit-policy]' \
+    '-inhibit_any[set policy variable inhibit-any-policy]' \
+    '-inhibit_map[set policy variable inhibit-policy-mapping]' \
+    '-x509_strict[strict X.509-compliance]' \
+    '-extended_crl[enable extended CRL features]' \
+    '-use_deltas[enable support for delta CRLs]' \
+    '-policy_print[print out diagnostics related to policy processing]' \
+    '-untrusted[a file of untrusted certificates]:file:_files' \
+    '(-*)-help[print out a usage message]' \
+    '-issuer_checks[print out diagnostics relating to searches for the issuer certificate of the current certificate]' \
+    '-verbose[print extra information about the operations being performed]' \
+    '*:certificate:_files'
+  # TODO: - may be used to separate certificates from options
+  # TODO: Do not hardcode purposes
+}
+
+
+_openssl_version() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-a[all information, this is the same as setting all the other flags]' \
+    '-v[the current OpenSSL version]' \
+    '-b[the date the current version of OpenSSL was built]' \
+    '-o[option information: various options set when the library was built]' \
+    '-f[compilation flags]' \
+    '-p[platform setting]' \
+    '-d[OPENSSLDIR setting]'
+}
+
+
+_openssl_x509() {
+  # written for openssl 1.0.1k
+  _arguments -C \
+    '-inform[input format - default PEM (one of DER, NET or PEM)]:format:(DER NET PEM)' \
+    '-outform[output format - default PEM (one of DER, NET or PEM)]:arg:(DER NET PEM)' \
+    '-keyform[private key format - default PEM]:arg:(DER PEM)' \
+    '-CAform[CA format - default PEM]:arg:(DER PEM)' \
+    '-CAkeyform[CA key format - default PEM]:arg:(DER PEM)' \
+    '-in[input file - default stdin]:file:_files' \
+    '-out[output file - default stdout]:file:_files' \
+    '-passin[private key password source]:pass phrase source:_pass_phrase_source' \
+    '-serial[print serial number value]' \
+    '-subject_hash[print subject hash value]' \
+    '-subject_hash_old[print old-style (MD5) subject hash value]' \
+    '-issuer_hash[print issuer hash value]' \
+    '-issuer_hash_old[print old-style (MD5) issuer hash value]' \
+    '-hash[synonym for -subject_hash]' \
+    '-subject[print subject DN]' \
+    '-issuer[print issuer DN]' \
+    '-email[print email address(es)]' \
+    '-startdate[notBefore field]' \
+    '-enddate[notAfter field]' \
+    '-purpose[print out certificate purposes]' \
+    '-dates[both Before and After dates]' \
+    '-modulus[print the RSA key modulus]' \
+    '-pubkey[output the public key]' \
+    '-fingerprint[print the certificate fingerprint]' \
+    '-alias[output certificate alias]' \
+    '-noout[no certificate output]' \
+    '-ocspid[print OCSP hash values for the subject name and public key]' \
+    '-ocsp_uri[print OCSP Responder URL(s)]' \
+    '-trustout[output a "trusted" certificate]' \
+    '-clrtrust[clear all trusted purposes]' \
+    '-clrreject[clear all rejected purposes]' \
+    '-addtrust[trust certificate for a given purpose]:purpose:(clientAuth serverAuth emailProtection)' \
+    '-addreject[reject certificate for a given purpose]:purpose:(clientAuth serverAuth emailProtection)' \
+    '-setalias[set certificate alias]:alias: ' \
+    '-days[how long till expiry of a signed certificate (default 30 days)]:days: ' \
+    '-checkend[check whether the cert expires in the specified time]:seconds: ' \
+    '-signkey[self sign cert with arg]:file:_files' \
+    '-x509toreq[output a certification request object]' \
+    '-req[input is a certificate request, sign and output]' \
+    '-CA[set the CA certificate, must be PEM format]:file:_files' \
+    '-CAkey[set the CA key, must be PEM format]:file:_files' \
+    '-CAcreateserial[create serial number file if it does not exist]' \
+    '-CAserial[serial file]:file:_files' \
+    '-set_serial[serial number to use]' \
+    '-text[print the certificate in text form]' \
+    '-C[print out C code forms]' \
+    '(-md5 -sha1 -mdc2)-md2[digest to use]' \
+    '(-md2 -sha1 -mdc2)-md5[digest to use]' \
+    '(-md2 -md5 -mdc2)-sha1[digest to use]' \
+    '(-md2 -md5 -sha1)-mdc2[digest to use]' \
+    '-extfile[configuration file with X509V3 extensions to add]' \
+    '-extensions[section from config file with X509V3 extensions to add]' \
+    '-clrext[delete extensions before signing and input certificate]' \
+    '*-nameopt[various certificate name options]:options:_nameopts' \
+    '-engine[use the specified engine, possibly a hardware device]:engine:_engines' \
+    '*-certopt[various certificate text options]:options:_certopts'
+}
+
+
+_pass_phrase_source() {
+  # pass:password
+  # env:var
+  # file:pathname
+  # fd:number
+  # stdin
+  _values -S : 'pass phrase source' \
+    'pass[obtain the password from the command line]:password: ' \
+    'env[obtain the password from the environment variable var]:var:_parameters -g "*export*"' \
+    'file[obtain the password from a file]:file:_files' \
+    'fd[read the password from the file descriptor number]:number: ' \
+    'stdin[read the password from standard input]'
+}
+
+
+_rand_files() {
+  # FIXME: this does not allow using multiple files separated by :
+  # the following would probably work, but how to generate $files?
+  #_values -s : -S ' ' 'random source file or directory' ${files}
+  _files
+}
+
+
+_engines() {
+  # openssl engines
+  local engines
+  engines=(${${${(@f)"$(_call_program engines openssl engine)"}%)*}#\(})
+  _values 'engines' ${engines}
+}
+
+
+_list_ciphers() {
+  # openssl ciphers
+  local ciphers
+  # add cipher suites
+  ciphers=(${(@s/:/)"$(_call_program ciphers openssl ciphers)"})
+  # add static cipher strings
+  ciphers=(${ciphers} \
+    'DEFAULT[the default cipher list]' \
+    'COMPLEMENTOFDEFAULT[the ciphers included in ALL but not enabled by default]' \
+    'ALL[all cipher suites except the eNULL ciphers]' \
+    'COMPLEMENTOFALL[the cipher suites not enabled by ALL]' \
+    'HIGH["high" encryption cipher suites]' \
+    'MEDIUM["medium" encryption cipher suites]' \
+    'LOW["low" encryption cipher suites]' \
+    {EXP,EXPORT}'[export encryption algorithms]' \
+    'EXPORT40[40 bit export encryption algorithms]' \
+    'EXPORT56[56 bit export encryption algorithms]' \
+    {eNULL,NULL}'[ciphers offering no encryption]' \
+    'aNULL[ciphers offering no authentication]' \
+    {kRSA,RSA}'[cipher suites rusing RSA key exchange]' \
+    'kDHr[cipher suites using DH key agreement signed by CAs with RSA keys]' \
+    'kDHd[cipher suites using DH key agreement signed by CAs with DSS keys]' \
+    'kDH[cipher suites using DH key agreement]' \
+    {kDHE,kEDH}'[cipher suites using ephemeral DH key agreement, including anonymous cipher suites]' \
+    {DHE,EDH}'[cipher suites using authenticated ephemeral DH key agreement]' \
+    'ADH[anonymous DH cipher suites, not including anonymous ECDH ciphers]' \
+    'DH[cipher suites using DH, including anonymous DH, ephemeral DH and fixed DH]' \
+    'kECDHr[cipher suites using fixed ECDH key agreement signed by CAs with RSA keys]' \
+    'kECDHe[cipher suites using fixed ECDH key agreement signed by CAs with ECDSA keys]' \
+    'kECDH[cipher suites using fixed ECDH key agreement]' \
+    {kECDHE,kEECDH}'[cipher suites using ephemeral ECDH key agreement, including anonymous cipher suites]' \
+    {ECDHE,kEECDH}'[cipher suites using authenticated ephemeral ECDH key agreement]' \
+    'AECDH[anonymous Elliptic Curve Diffie Hellman cipher suites]' \
+    'ECDH[cipher suites using ECDH key exchange, including anonymous, ephemeral and fixed ECDH]' \
+    'aRSA[cipher suites using RSA authentication]' \
+    {aDSS,DSS}'[cipher suites using DSS authentication]' \
+    'aDH[cipher suites effectively using DH authentication]' \
+    'aECDH[cipher suites effectively using ECDH authentication]' \
+    {aECDSA,ECDSA}'[cipher suites using ECDSA authentication]' \
+    'TLSv1.2[TLSv1.2 cipher suites]' \
+    'TLSv1[TLSv1.0 cipher suites]' \
+    'SSLv3[SSLv3.0 cipher suites]' \
+    'SSLv2[SSLv2.0 cipher suites]' \
+    'AES128[cipher suites using 128 bit AES]' \
+    'AES256[cipher suites using 256 bit AES]' \
+    'AES[cipher suites using AES]' \
+    'AESGCM[AES in Galois Counter Mode (GCM)]' \
+    'CAMELLIA128[cipher suites using 128 bit CAMELLIA]' \
+    'CAMELLIA256[cipher suites using 256 bit CAMELLIA]' \
+    'CAMELLIA[cipher suites using CAMELLIA]' \
+    '3DES[cipher suites using triple DES]' \
+    'DES[cipher suites using DES (not triple DES)]' \
+    'RC4[cipher suites using RC4]' \
+    'RC2[cipher suites using RC2]' \
+    'IDEA[cipher suites using IDEA]' \
+    'SEED[cipher suites using SEED]' \
+    'MD5[cipher suites using MD5]' \
+    {SHA1,SHA}'[cipher suites using SHA1]' \
+    'SHA256[cipher suites using SHA256]' \
+    'SHA384[cipher suites using SHA284]' \
+    'aGOST[cipher suites using GOST R 34.10 for authenticaction]' \
+    'aGOST01[cipher suites using GOST R 34.10-2001 authentication]' \
+    'aGOST94[cipher suites using GOST R 34.10-94 authentication]' \
+    'kGOST[cipher suites, using VKO 34.10 key exchange]' \
+    'GOST94[cipher suites, using HMAC based on GOST R 34.11-94]' \
+    'GOST89MAC[cipher suites using GOST 28147-89 MAC instead of HMAC]' \
+    'PSK[cipher suites using pre-shared keys (PSK)]' \
+    'SUITEB128[suite B mode operation using 128 or 192 bit level of security]' \
+    'SUITEB128ONLY[suite B mode operation using 128 bit level of security]' \
+    'SUITEB192[suite B mode operation using 192 bit level of security]' \
+    )
+  # FIXME: support !, + and - before each cipher suite
+  _values -s : 'cipher suite' ${ciphers}
+}
+
+
+_list_curves() {
+  # openssl ecparam -list_curves
+  local curves not_curves
+  curves="$(_call_program list_curves openssl ecparam -list_curves)"
+  # identify lines that do not contain curve names but only descriptions
+  not_curves=(${${(f)curves[@]}:#*:*})
+  # remove non-curve lines, trailing descriptions and leading spaces
+  curves=(${${${${(f)curves[@]}:|not_curves}%:*}##* })
+  _values 'named curves' ${curves}
+}
+
+
+_list_message_digest_algorithms() {
+  # openssl list-message-digest-algorithms
+  local algorithms
+  algorithms=(${${(@f)"$(_call_program message_digest_algorithms openssl list-message-digest-algorithms)"}%% *})
+  _values 'message digest algorithms' ${algorithms}
+}
+
+
+_nameopts() {
+  _values -s ',' -w 'nameopts' \
+    '(-compat compat)'{-compat,compat}'[use the old format. This is equivalent to specifying no name options at all]' \
+    '(-RFC2253 RFC2253)'{-RFC2253,RFC2253}'[displays names compatible with RFC2253 equivalent to esc_2253, esc_ctrl, esc_msb, utf8, dump_nostr, dump_unknown, dump_der, sep_comma_plus, dn_rev and sname]' \
+    '(-oneline oneline)'{-oneline,oneline}'[a oneline format which is more readable than RFC2253. Equivalent to esc_2253, esc_ctrl, esc_msb, utf8, dump_nostr, dump_der, use_quote, sep_comma_plus_space, space_eq and sname options]' \
+    '(-multiline multiline)'{-multiline,multiline}'[a multiline format. Equivalent to esc_ctrl, esc_msb, sep_multiline, space_eq, lname and align]' \
+    '(-esc_2253 esc_2253)'{-esc_2253,esc_2253}'[escape the "special" characters required by RFC2253 in a field]' \
+    '(-esc_ctrl esc_ctrl)'{-esc_ctrl,esc_ctrl}'[escape control characters]' \
+    '(-esc_msb esc_msb)'{-esc_msb,esc_msb}'[escape characters with the MSB set]' \
+    '(-use_quote use_quote)'{-use_quote,use_quote}'[escapes some characters by surrounding the whole string with " characters]' \
+    '(-utf8 utf8)'{-utf8,utf8}'[convert all strings to UTF8 format first]' \
+    '(-ignore_type ignore_type)'{-ignore_type,ignore_type}'[this option does not attempt to interpret multibyte characters in any way]' \
+    '(-show_type show_type)'{-show_type,show_type}'[show the type of the ASN1 character string]' \
+    '(-dump_der dump_der)'{-dump_der,dump_der}'[use DER encoding when hexdumping fields]' \
+    '(-dump_nostr dump_nostr)'{-dump_nostr,dump_nostr}'[dump non character string types]' \
+    '(-dump_all dump_all)'{-dump_all,dump_all}'[dump all fields]' \
+    '(-dump_unknown dump_unknown)'{-dump_unknown,dump_unknown}'[dump any field whose OID is not recognised by OpenSSL]' \
+    '(-sep_comma_plus sep_comma_plus)'{-sep_comma_plus,sep_comma_plus}'[these options determine the field separators]' \
+    '(-sep_comma_plus_space sep_comma_plus_space)'{-sep_comma_plus_space,sep_comma_plus_space}'[these options determine the field separators]' \
+    '(-sep_semi_plus_space sep_semi_plus_space)'{-sep_semi_plus_space,sep_semi_plus_space}'[these options determine the field separators]' \
+    '(-sep_multiline sep_multiline)'{-sep_multiline,sep_multiline}'[these options determine the field separators]' \
+    '(-dn_rev dn_rev)'{-dn_rev,dn_rev}'[reverse the fields of the DN]' \
+    '(-nofname nofname)'{-nofname,nofname}'[do not display field names]' \
+    '(-sname sname)'{-sname,sname}'[display field names in short form]' \
+    '(-lname lname)'{-lname,lname}'[display field names in long form]' \
+    '(-oid oid)'{-oid,oid}'[display field names in numerical form]' \
+    '(-align align)'{-align,align}'[align field values for a more readable output. Only usable with sep_multiline]' \
+    '(-space_eq space_eq)'{-space_eq,space_eq}'[places spaces around the = character which follows the field name]'
+}
+
+
+_certopts() {
+  _values -s ',' -w 'certopts' \
+    'compatible[use the old format. This is equivalent to specifying no output options at all]' \
+    "no_header[don't print header information: that is the lines saying \"Certificate\" and \"Data\"]" \
+    "no_version[don't print out the version number]" \
+    "no_serial[don't print out the serial number]" \
+    "no_signame[don't print out the signature algorithm used]" \
+    "no_validity[don't print the validity, that is the notBefore and notAfter fields]" \
+    "no_subject[don't print out the subject name]" \
+    "no_issuer[don't print out the issuer name]" \
+    "no_pubkey[don't print out the public key]" \
+    "no_sigdump[don't give a hexadecimal dump of the certificate signature]" \
+    "no_aux[don't print out certificate trust information]" \
+    "no_extensions[don't print out any X509V3 extensions]" \
+    'ext_default[retain default extension behaviour: attempt to print out unsupported certificate extensions]' \
+    'ext_error[print an error message for unsupported certificate extensions]' \
+    'ext_parse[ASN1 parse unsupported extensions]' \
+    'ext_dump[hex dump unsupported extensions]' \
+    '(no_issuer no_pubkey no_header no_version no_sigdump no_signame)ca_default[the value used by the ca utility, equivalent to no_issuer, no_pubkey, no_header, no_version, no_sigdump and no_signame]'
+}
+
+
+_openssl "$@"
+
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_optirun b/zsh/modules/completion/external/src/_optirun
new file mode 100644
index 0000000..ebc0e00
--- /dev/null
+++ b/zsh/modules/completion/external/src/_optirun
@@ -0,0 +1,75 @@
+#compdef optirun
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for the optirun command from bumblebee
+#  (https://github.com/Bumblebee-Project/Bumblebee).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Christophe-Marie Duquesne <chm.duquesne@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line
+typeset -A opt_args
+
+local -a arguments
+
+arguments=(
+    '--version[output version information]'
+    '(-h --help)'{-h,--help}'[show help]'
+    '(-c --vgl-compress)'{-c,--vgl-compress}'[image transport method]:method:(proxy jpeg rgb xb yuv)'
+    '--failsafe[run a program even if the nvidia card is unavailable]:boolean:(true false)'
+    '--no-failsafe[do not run a program if the nvidia card is unavailable]'
+    '--vgl-options[options to be passed to vglrun (example: +tr)]'
+    '(-q --quiet --silent)'{-q,--quiet,--silent}'[suppress all logging messages]'
+    '(-v --verbose)'{-v,--verbose}'[increase the verbosity level of log messages]'
+    '--debug[set the verbosity level to the maximum]'
+    '(-b --bridge)'{-b,--bridge}'[specify bridge library to use: VirtualGL, Primus or auto]:method:(auto primus virtualgl none)'
+    '(-d --display)'{-d,--display}'[the X display number to use]'
+    '(-C --config)'{-C,--config}'[retrieve settings for Bumblebee from FILE]:file:_files'
+    '(-l --ldpath)'{-l,--ldpath}'[PATH the libraries like libGL.so are searched in]:file:_files'
+    '--primus-ldpath[a colon-separated list of paths which are searched for the primus libGL.so.1]:file:_files'
+    '(-s --socket)'{-s,--socket}'[use FILE for communication with the daemon]:file:_files'
+    '--no-xorg[do not start secondary X server (implies -b none)]'
+    '*::arguments: _normal'
+)
+
+_arguments $arguments
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_paste b/zsh/modules/completion/external/src/_paste
new file mode 100644
index 0000000..fd7d035
--- /dev/null
+++ b/zsh/modules/completion/external/src/_paste
@@ -0,0 +1,58 @@
+#compdef paste
+#
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for paste (from util-linux 2.27.1->)
+#    (https://git.kernel.org/cgit/utils/util-linux/util-linux.git/)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Ole Jørgen Brønner <olejorgenb@yahoo.no>
+#
+# ------------------------------------------------------------------------------
+#
+# Note: paste has upstream bash completion
+# Note: Credit to https://github.com/RobSis/zsh-completion-generator which was
+#       used to generate most of the script.
+
+local arguments
+
+arguments=(
+    '*'{-d,--delimiters}'[reuse characters from LIST instead of TABs]:delimiters'
+    '(-s --serial)'{-s,--serial}'[paste one file at a time instead of in parallel]'
+    '(-z --zero-terminated)'{-z,--zero-terminated}'[line delimiter is NUL, not newline]'
+    '--help[display this help and exit]'
+    '--version[output version information and exit]'
+    '*:filename:_files'
+)
+
+_arguments -s $arguments
diff --git a/zsh/modules/completion/external/src/_patool b/zsh/modules/completion/external/src/_patool
new file mode 100644
index 0000000..d132a6c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_patool
@@ -0,0 +1,95 @@
+#compdef patool
+# ------------------------------------------------------------------------------
+# Copyright (c) 2017 Github zsh-users - http://github.com/zsh-users
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for patool (https://github.com/wummel/patool).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+# * Sergei Eremenko (https://github.com/SmartFinn)
+#
+# ------------------------------------------------------------------------------
+
+local state line ret=1
+
+_arguments -C \
+  '(-h --help)'{-h,--help}'[show help message and exit]' \
+  '(--non-interactive)'--non-interactive'[do not query for user input]' \
+  '(-v --verbose)'{-v,--verbose}'[verbose operation]' \
+  '1:cmd:->cmds' \
+  '*:arg:->args' && ret=0
+
+case $state in
+  (cmds)
+    local -a cmds
+
+    cmds=(
+      'create:create an archive from given files'
+      'diff:show differences between two archives'
+      'extract:extract files from given archives'
+      'formats:show all supported archive formats'
+      'list:list files in archives'
+      'repack:repackage archive to a different format'
+      'recompress:recompress an archive to smaller size'
+      'search:search in archive contents for given pattern'
+      'test:test the given archives'
+    )
+
+    _describe -t commands 'patool commands' cmds && ret=0
+    ;;
+  (args)
+    case $line[1] in
+      (extract)
+        _arguments \
+          '--outdir[extract to the given output directory]:select directory:_files -/' \
+          '*:files:_files' && ret=0
+      ;;
+      (formats)
+        _message 'no more arguments' && ret=0
+      ;;
+      (search)
+        _arguments \
+          '2:search pattern:' \
+          '*:files:_files' && ret=0
+      ;;
+      (*)
+        _arguments \
+          '*:files:_files' && ret=0
+      ;;
+    esac
+    ;;
+esac
+
+return $ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_perf b/zsh/modules/completion/external/src/_perf
new file mode 100644
index 0000000..bf5898d
--- /dev/null
+++ b/zsh/modules/completion/external/src/_perf
@@ -0,0 +1,279 @@
+#compdef perf
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Linux performance counters 3.3 (perf.wiki.kernel.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_perf() {
+  local context curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  local ret=1
+
+  _arguments -C \
+    '(- : *)--version[show version number and exit]' \
+    '(- : *)--help[show help]: :_perf_cmds' \
+    '1: :_perf_cmds' \
+    '*::arg:->args' \
+  && ret=0
+
+  case $state in
+    (args)
+      curcontext="${curcontext%:*:*}:perf-cmd-$words[1]:"
+      case $line[1] in
+        (annotate)
+          # TODO Complete CPU list
+          # TODO Complete disassembler style
+          _arguments \
+            '(- : *)'{-a,--all}'[prints all the available commands on the standard output]' \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-d --dsos)'{-d,--dsos=}'[only consider symbols in these dsos]:dso list' \
+            '(-s --symbol)'{-s,--symbol=}'[symbol to annotate]:symbol' \
+            '(-f --force)'{-f,--force}'[do not complain, do it]' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            '(-D --dump-raw-trace)'{-D,--dump-raw-trace}'[dump raw trace in ASCII]' \
+            '(-k --vmlinux)'{-k,--vmlinux=}'[vmlinux pathname]: :_files' \
+            '(-m --modules)'{-m,--modules}'[load module symbols]' \
+            '(-l --print-line)'{-l,--print-line}'[print matching source lines]' \
+            '(-P --full-paths)'{-P,--full-paths}'[don'\''t shorten the displayed pathnames]' \
+            '--stdio[use the stdio interface]' \
+            '--tui[use the TUI interface]' \
+            '(-C --cpu)'{-C,--cpu}'[only report samples for the list of CPUs provided]:CPU list' \
+            '--asm-raw[show raw instruction encoding of assembly instructions]' \
+            '(--no-source)--source[interleave source code with assembly code]' \
+            '(--source)--no-source[don'\''t interleave source code with assembly code]' \
+            '--symfs=[look for files with symbols relative to this directory]: :_files -/' \
+            '(-M --disassembler-style)'{-M,--disassembler-style=}'[set disassembler style for objdump]:disassembler style' \
+            '1::symbol name' \
+            && ret=0
+        ;;
+        (archive)
+          _arguments \
+            '1: :_files' \
+            && ret=0
+        ;;
+        (bench)
+          # TODO Complete subsystems
+          # TODO Complete suites
+          _arguments \
+            '(-f --format)'{-f,--format=}'[specify format style]: :((default\:mainly\ for\ human\ reading simple\:friendly\ for\ automated\ processing\ by\ scripts))' \
+            '1::subsystem' \
+            '2::suite' \
+            && ret=0
+        ;;
+        (buildid-cache)
+          _arguments \
+            '(-a --add)'{-a,--add=}'[add specified file to the cache]: :_files' \
+            '(-r --remove)'{-r,--remove=}'[remove specified file from the cache]: :_files' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            && ret=0
+		;;
+        (buildid-list)
+          _arguments \
+            '(-H --with-hits)'{-H,--with-hits}'[show only DSOs with hits]' \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-f --force)'{-f,--force}'[don'\''t do ownership validation]' \
+            '(-k --kernel)'{-k,--kernel}'[show running kernel build id]' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            && ret=0
+        ;;
+        (diff)
+          _arguments \
+            '(-M --displacement)'{-M,--displacement}'[show position displacement relative to baseline]' \
+            '(-D --dump-raw-trace)'{-D,--dump-raw-trace}'[dump raw trace in ASCII]' \
+            '(-m --modules)'{-m,--modules}'[load module symbols]' \
+            '(-d --dsos)'{-d,--dsos=}'[only consider symbols in these dsos]:dso list' \
+            '(-C --comms)'{-C,--comms=}'[only consider symbols in these comms]:comm list' \
+            '(-S --symbols)'{-S,--symbols=}'[only consider these symbols]:symbol list' \
+            '(-s --sort)'{-s,--sort=}'[sort by key(s)]: :_values -s , key pid comm dso symbol' \
+            '(-t --field-separator)'{-t,--field-separator=}'[use a special separator character and don'\''t pad with spaces]:separator' \
+            '(-v --verbose)'{-v,--verbose}'[be verbose, for instance, show the raw counts in addition to the diff]' \
+            '(-f --force)'{-f,--force}'[don'\''t complain, do it]' \
+            '--symfs=[look for files with symbols relative to this directory]: :_files -/' \
+            '1:old file:_files' \
+            '2:new file:_files' \
+            && ret=0
+        ;;
+        (evlist)
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            && ret=0
+        ;;
+        (inject)
+          _arguments \
+            '(-b --build-ids)'{-b,--build-ids=}'[inject build-ids into the output stream]:build-id list' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            && ret=0
+        ;;
+        (kmem)
+          # TODO Complete 'record' command
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '--caller[show per-callsite statistics]' \
+            '--alloc[show per-allocation statistics]' \
+            '(-s --sort)'{-s,--sort=}'[sort by output]: :_values -s , key frag hit bytes' \
+            '(-n --lines)'{-n,--lines}'[print n lines only]:number' \
+            '1:command:((record\:record\ the\ kmem\ events\ of\ an\ arbitrary\ workload stat\:report\ kernel\ memory\ statistics))' \
+            && ret=0
+        ;;
+        (kvm)
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-o --output)'{-o,--output=}'[output file name]: :_files' \
+            '--host=[collect host side performance profile]:host' \
+            '--guest=[collect guest side performance profile]:guest' \
+            '--guestmount=[guest os root file system mount directory]: :_files -/' \
+            '--guestkallsyms=[guest os /proc/kallsyms file copy]: :_files' \
+            '--guestmodules=[guest os /proc/modules file copy]: :_files' \
+            '--guestvmlinux=[guest os kernel vmlinux]: :_files' \
+            '1:command:((top record report diff buildid-list))' \
+            && ret=0
+        ;;
+        (list)
+          _arguments \
+            '1:event type:((hw\:hardware\ events hardware\:hardware\ events sw\:software\ events software\:software\ events cache\:cache\ events hwcache\:cache\ events tracepoint\:tracepoint\ events))' \
+            && ret=0
+        ;;
+        (lock)
+          # TODO Complete 'record' command
+          # TODO Complete 'report' command options
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            '(-D --dump-raw-trace)'{-D,--dump-raw-trace}'[dump raw trace in ASCII]' \
+            '1:command:((record\:record\ lock\ events trace\:show\ raw\ lock\ events report\:report\ statistical\ data))' \
+            && ret=0
+        ;;
+        (probe)
+          # TODO not implemented
+        ;;
+        (record)
+          # TODO not implemented
+        ;;
+        (report)
+          # TODO not implemented
+        ;;
+        (sched)
+          # TODO Complete 'record' command
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            '(-D --dump-raw-trace)'{-D,--dump-raw-trace}'[dump raw trace in ASCII]' \
+            '1:command:((record\:record\ scheduling\ events script\:see\ a\ detailed\ trace replay\:simulate\ the\ workload map\:print\ a\ textual\ context-switching\ outline))' \
+            && ret=0
+        ;;
+        (script)
+          # TODO not implemented
+        ;;
+        (stat)
+          # TODO not implemented
+        ;;
+        (test)
+          _arguments \
+            '(-v --verbose)'{-v,--verbose}'[be more verbose]' \
+            && ret=0
+        ;;
+        (timechart)
+          # TODO Complete 'record' command
+          _arguments \
+            '(-i --input)'{-i,--input=}'[input file name]: :_files' \
+            '(-o --output)'{-o,--output=}'[output file name]: :_files' \
+            '(-w --width)'{-w,--width=}'[select the width of the SVG file]:width' \
+            '(-P --power-only)'{-P,--power-only}'[only output the CPU power section of the diagram]' \
+            '(-p --process)'{-p,--process}'[select the processes to display, by name or PID]:process' \
+            '--symfs=[look for files with symbols relative to this directory]: :_files -/' \
+            '1:command:((record))' \
+            && ret=0
+        ;;
+        (top)
+          # TODO not implemented
+        ;;
+        (help)
+          _arguments \
+            '(- : *)'{-a,--all}'[prints all the available commands on the standard output]' \
+            '1: :_perf_cmds' \
+            && ret=0
+          ;;
+        *)
+          _call_function ret _perf_cmd_$words[1] && ret=0
+          (( ret )) && _message 'no more arguments'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+# FIXME Parse 'perf --help' instead of hard-coding.
+(( $+functions[_perf_cmds] )) ||
+_perf_cmds() {
+  local commands; commands=(
+    'annotate:read perf.data (created by perf record) and display annotated code'
+    'archive:create archive with object files with build-ids found in perf.data file'
+    'bench:general framework for benchmark suites'
+    'buildid-cache:manage build-id cache'
+    'buildid-list:list the buildids in a perf.data file'
+    'diff:read two perf.data files and display the differential profile'
+    'evlist:list the event names in a perf.data file'
+    'inject:filter to augment the events stream with additional information'
+    'kmem:tool to trace/measure kernel memory(slab) properties'
+    'kvm:tool to trace/measure kvm guest os'
+    'list:list all symbolic event types'
+    'lock:analyze lock events'
+    'probe:define new dynamic tracepoints'
+    'record:run a command and record its profile into perf.data'
+    'report:read perf.data (created by perf record) and display the profile'
+    'sched:tool to trace/measure scheduler properties (latencies)'
+    'script:read perf.data (created by perf record) and display trace output'
+    'stat:run a command and gather performance counter statistics'
+    'test:runs sanity tests'
+    'timechart:tool to visualize total system behavior during a workload'
+    'top:system profiling tool'
+    'help:show command usage information'
+  )
+  _describe -t commands 'command' commands "$@"
+}
+
+_perf "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_periscope b/zsh/modules/completion/external/src/_periscope
new file mode 100644
index 0000000..1d950b4
--- /dev/null
+++ b/zsh/modules/completion/external/src/_periscope
@@ -0,0 +1,61 @@
+#compdef periscope
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Periscope (http://code.google.com/p/periscope).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+  '(- : *)'{-h,--help}'[show help message and exit]' \
+  '(- : *)--version[show version number and exit]' \
+  '*'{-l,--language}'[wanted language]: :_language_codes ISO-639-1' \
+  '(-f --force)'{-f,--force}'[replace existing subtitle file]' \
+  '(-q --query)'{-q,--query}'[query to send to the subtitles website]:queries' \
+  '--list-plugins[list all plugins supported by periscope]' \
+  '--list-active-plugins[list all plugins used to search subtitles]' \
+  '--cache-folder[cache/config directory to use]: :_files -/' \
+  '--quiet[run in quiet mode (only show warn and error messages)]' \
+  '--debug[set the logging level to debug]' \
+  '*: :_files'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_pgsql_utils b/zsh/modules/completion/external/src/_pgsql_utils
new file mode 100644
index 0000000..fb9456c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_pgsql_utils
@@ -0,0 +1,479 @@
+#compdef psql pg_dump pg_dumpall pg_restore createdb dropdb vacuumdb createuser dropuser initdb
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users, Dominic Mitchell, Johann 'Myrkraverk' Oskarsson, Daniel Serodio, J Smith
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for PostgreSQL utils (http://postgresql.org).
+#
+#  Source: http://www.zsh.org/mla/users/2004/msg01006.html
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Dominic Mitchell <dom+zsh@happygiraffe.net>
+#
+#  * Johann 'Myrkraverk' Oskarsson <johann@2ndquadrant.com>
+#
+#  * Daniel Serodio <dserodio@gmail.com> pg_dumpall completion
+#
+#  * J Smith <dark.panda@gmail.com> pg_restore completion
+#
+# ------------------------------------------------------------------------------
+
+
+_pgsql_get_identity () {
+    _pgsql_user=${(v)opt_args[(i)-U|--username]}
+    _pgsql_port=${(v)opt_args[(i)-p|--port]}
+    _pgsql_host=${(v)opt_args[(i)-h|--host]}
+
+    _pgsql_params=(
+        ${_pgsql_user:+"--username=$_pgsql_user"}
+        ${_pgsql_port:+"--port=$_pgsql_port"}
+        ${_pgsql_host:+"--host=$_pgsql_host"}
+    )
+}
+
+# Postgres Allows specifying the path to the directory containing the
+# socket as well as a hostname.
+_pgsql_host_or_dir() {
+    _alternative \
+        'hosts:host:_hosts' \
+        'directories:directory:_directories'
+}
+
+# This creates a port completion list based on socket files on the
+# local computer.  Be default, Postgres puts them in /tmp/ but Debian
+# changed that to /var/run/postgresql/ in their packages.
+_pgsql_ports() {
+    compadd "$@" - /tmp/.s.PGSQL.<->(N:e) /var/run/postgresql/.s.PGSQL.<->(N:e)
+}
+
+_pgsql_users () {
+    local _pgsql_user _pgsql_port _pgsql_host _pgsql_params
+    local _pgsql_user_sql
+    _pgsql_get_identity
+
+    # We use _pgsql_port and _pgsql_host directly here instead of
+    # _pgsql_params so as to not pick up a partially completed
+    # username.
+    _pgsql_params=(
+        ${_pgsql_port:+"--port=$_pgsql_port"}
+        ${_pgsql_host:+"--host=$_pgsql_host"}
+    )
+
+    _pgsql_user_sql='select r.rolname from pg_catalog.pg_roles r where r.rolcanlogin = true'
+
+    compadd "$@" - $( psql $_pgsql_params[@] -Aqt -c $_pgsql_user_sql template1 2>/dev/null )
+
+}
+
+_pgsql_tables () {
+    local _pgsql_user _pgsql_port _pgsql_host _pgsql_params
+    _pgsql_get_identity
+
+    # Need to pull out the database name from the existing arguments.
+    # This is going to vary between commands.  Thankfully, it's only
+    # used by pg_dump, which always has the dbname in arg1.  If it's
+    # not present it defaults to ${PGDATABASE:-$LOGNAME}, which
+    # matches (I think) the PostgreSQL behaviour.
+
+    local db
+    db=${line[1]:-${PGDATABASE:-$LOGNAME}}
+
+    ## Instead of parsing the output of the psql \ commands, we look
+    ## up the tables ourselves.  The following query has been tested
+    ## with Postgres 8.2 - 9.2.
+
+    local _pgsql_table_sql
+    _pgsql_table_sql="select n.nspname || '.' || c.relname \
+	from pg_catalog.pg_class c \
+		left join pg_catalog.pg_namespace n on n.oid = c.relnamespace \
+	where c.relkind in ('r', '') \
+		and n.nspname <> 'pg_catalog' \
+		and n.nspname <> 'information_schema' \
+		and n.nspname !~ '^pg_toast' \
+		and pg_catalog.pg_table_is_visible( c.oid ) \
+	order by 1"
+
+    compadd "$@" - \
+        $( psql $_pgsql_params[@] -Aqt -c $_pgsql_table_sql $db 2>/dev/null )
+}
+
+_pgsql_schemas () {
+    local _pgsql_user _pgsql_port _pgsql_host _pgsql_params
+    _pgsql_get_identity
+
+    local db
+    db=${line[1]:-${PGDATABASE:-$LOGNAME}}
+
+    local _pgsql_schema_sql="select n.nspname \
+        from pg_catalog.pg_namespace n \
+        where n.nspname !~ '^pg_' \
+            and n.nspname <> 'information_schema' \
+        order by 1;"
+
+    compadd "$@" - \
+        $( psql $_pgsql_params[@] -Aqt -c $_pgsql_schema_sql $db 2>/dev/null )
+}
+
+_pgsql_databases () {
+    local _pgsql_user _pgsql_port _pgsql_host _pgsql_params
+    _pgsql_get_identity
+
+    local _pgsql_services _pgsql_service_files
+    _pgsql_service_files=(
+      ~/.pg_service.conf
+      $(pg_config --sysconfdir)/pg_service.conf
+    )
+    _pgsql_services=$( grep -h '^\[.*\]' $_pgsql_service_files 2>/dev/null \
+                         | sed -e 's/^\[/service=/' -e 's/\].*$//' )
+
+    local _pgsql_db_sql
+    _pgsql_db_sql="select d.datname from pg_catalog.pg_database d \
+	where d.datname <> 'template0'"
+
+    compadd "$@" - \
+            ${(f)_pgsql_services} \
+            $( psql $_pgsql_params[@] -Atq -c $_pgsql_db_sql template1 2>/dev/null )
+}
+
+_pgsql_encodings () {
+    local _pgsql_user
+    _pgsql_get_identity
+
+    local _pgsql_db_sql
+    _pgsql_db_sql="select pg_encoding_to_char(i) from generate_series(0,100) i;"
+
+    compadd "$@" - $( psql $_pgsql_params[@] -Atq -c $_pgsql_db_sql template1  )
+}
+
+
+##
+## The actual completion code for the commands
+##
+
+_psql () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s "-*" \
+        "$_pgsql_common_opts[@]" \
+        {-V,--version}'[display client version]' \
+        {-a,--echo-all}'[print commands read]' \
+        {-A,--no-align}'[unaligned output mode]' \
+        {-c+,--command=}':execute SQL command:' \
+        {-d+,--dbname=}':database to connect to:_pgsql_databases' \
+        {-e,--echo-queries}'[display queries submitted]' \
+        {-E,--echo-hidden}'[display hidden queries]' \
+        {-f+,--file=}':SQL file to read:_files' \
+        {-F+,--field-separator=}':field separator char:' \
+        {-H,--html}'[HTML output]' \
+        {-l,--list}'[list databases]' \
+        {-o+,--output=}':query output:_files' \
+        {-P+,--pset=}':set psql variable:' \
+        {-q,--quiet}'[non verbose mode]' \
+        {-R+,--record-separator=}':record separator char:' \
+        {-s,--single-step}'[prompt before each query]' \
+        {-S,--single-line}'[newline sends query]' \
+        {-t,--tuples-only}'[dont display header/footer]' \
+        {-T+,--table-attr=}':HTML table options:' \
+        -u'[prompt for username/password]' \
+        {-v+,--set=,--variable=}':set SQL variable:' \
+        {-x,--expanded}'[one column per line]' \
+        {-X,--no-psqlrc}'[dont read ~/.psqlrc]' \
+        ':PostgreSQL database:_pgsql_databases' \
+        ':PostgreSQL user:_pgsql_users'
+}
+
+_pg_dump () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-a,--data-only}'[dump only data]' \
+        {-b,--blobs}'[dump blobs as well]' \
+        {-c,--clean}'[include clean cmds in dump]' \
+        {-C,--create}'[include createdb cmds in dump]' \
+        {-E+,--encoding=}':database encoding:_pgsql_encodings' \
+        {-d,--inserts}'[use INSERT not COPY]' \
+        {-D,--{attribute,column}-inserts}'[use INSERT (cols) not COPY]' \
+        {-f+,--file=}':output file:_files' \
+        {-F+,--format=}':output format:_values "format" "p[plain text]" "t[tar]" "c[custom]"' \
+        {-i,--ignore-version}'[ignore version mismatch]' \
+        {-n+,--schema=}':schema to dump:_pgsql_schemas' \
+        {-N+,--exclude-schema=}':schema to NOT dump:_pgsql_schemas' \
+        {-o,--oids}'[dump objects identifiers for every table]' \
+        {-O,--no-owner}'[dont recreate as same owner]' \
+        {-R,--no-reconnect}'[dont output connect]' \
+        {-s,--schema-only}'[no data, only schema]' \
+        {-S+,--superuser=}':superuser name:_pgsql_users' \
+        {-t+,--table=}':table to dump:_pgsql_tables' \
+        {-T+,--exclude-table=}':table to NOT dump:_pgsql_tables' \
+        {-v,--verbose}'[verbose mode]' \
+        {-V,--version}'[display client version]' \
+        {-x,--no-{acl,privileges}}'[dont dump ACLs]' \
+        -X+':option:_values "option" use-set-session-authorization disable-triggers' \
+        {-Z+,--compress=}':compression level:_values "level" 9 8 7 6 5 4 3 2 1 0' \
+        ':PostgreSQL database:_pgsql_databases' \
+        --section=':dump named section:_values "section" pre-data data post-data' \
+        --disable-dollar-quoting'[disable dollar quoting, use SQL standard quoting]' \
+        --disable-triggers'[disable triggers during data-only restore]' \
+        --no-security-labels'[do not dump security label assignments]' \
+        --no-tablespaces'[do not dump tablespace assignments]' \
+        --no-unlogged-table-data'[do not dump unlogged table data]' \
+        --quote-all-identifiers'[quote all identifiers, even if not key words]' \
+        --serializable-deferrable'[wait until the dump can run without anomalies]' \
+        --use-set-session-authorization'[use SET SESSION AUTHORIZATION commands instead of ALTER OWNER]'
+}
+
+_pg_restore () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-d+,--dbname=}':database to connect to:_pgsql_databases' \
+        {-f+,--file=}':output file:_files' \
+        {-F+,--format=}':output format:_values "format" "p[plain text]" "t[tar]" "c[custom]"' \
+        {-l,--list}'[list databases]' \
+        {-a,--data-only}'[dump only data]' \
+        {-c,--clean}'[include clean (drop) cmds before recreating]' \
+        {-C,--create}'[include createdb cmds in dump]' \
+        {-e,--exit-on-error}'[exit on error, default is to continue]' \
+        {-I,--index=}':index name:' \
+        {-j,--jobs=}':use this many parallel jobs to restore:' \
+        {-L,--use-list=}':use table of contents from this file for selecting/ordering output:' \
+        {-n,--schema=}':restore only objects in this schema:' \
+        {-O,--no-owner}'[skip restoration of object ownership]' \
+        {-P,--function=}':restore named function:' \
+        {-s,--schema-only}'[restore only the schema, no data]' \
+        {-S,--superuser=}':superuser user name to use for disabling triggers:' \
+        {-t,--table=}':restore named table:' \
+        {-T,--trigger=}':restore named trigger:' \
+        {-x,--no-privileges}'[skip restoration of access privileges (grant/revoke)]' \
+        {-1,--single-transaction}'[restore as a single transaction]' \
+        {-v,--verbose}'[verbose mode]' \
+        {-V,--version}'[display client version]' \
+        --disable-triggers'[disable triggers during data-only restore]' \
+        --if-exists'[use IF EXISTS when dropping objects]' \
+        --no-data-for-failed-tables'[do not restore data of tables that could not be created]' \
+        --no-security-labels'[do not restore security labels]' \
+        --no-tablespaces'[do not restore tablespace assignments]' \
+        --section=':dump named section:_values "section" pre-data data post-data' \
+        --use-set-session-authorization'[use SET SESSION AUTHORIZATION commands instead of ALTER OWNER commands to set ownership]'
+}
+
+_pg_dumpall () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-a,--data-only}'[dump only data]' \
+        {-c,--clean}'[include clean (drop) cmds before recreating]' \
+        {-g,--globals-only}'[dump only global objects, no databases]' \
+        {-f+,--file=}':output file:_files' \
+        {-o,--oids}'[dump objects identifiers for every table]' \
+        {-O,--no-owner}'[dont recreate as same owner]' \
+        {-r,--roles-only}'[no databases or tablespaces, only roles]' \
+        {-s,--schema-only}'[no data, only schema]' \
+        {-S+,--superuser=}':superuser name:_pgsql_users' \
+        {-t,--tablespaces-only}'[no databases or roles, only tablespaces]' \
+        {-x,--no-privileges}'[dont dump ACLs]' \
+        --binary-upgrade'[for use by upgrade utilities only]' \
+        --column-inserts'[use INSERT with column names not COPY]' \
+        --disable-dollar-quoting'[disable dollar quoting, use SQL standard quoting]' \
+        --disable-triggers'[disable triggers during data-only restore]' \
+        --inserts'[use INSERT not COPY]' \
+        --no-security-labels'[do not dump security label assignments]' \
+        --no-tablespaces'[do not dump tablespace assignments]' \
+        --no-unlogged-table-data'[do not dump unlogged table data]' \
+        --quote-all-identifiers'[quote all identifiers, even if not key words]' \
+        --use-set-session-authorization'[use SET SESSION AUTHORIZATION cmds instead of ALTER OWNER]'
+}
+
+_createdb () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-e,--echo}'[display SQL queries]' \
+        {-q,--quiet}'[non verbose mode]' \
+        {-D+,--location=}':database location:_directories' \
+        {-T+,--template=}':database template:_pgsql_databases' \
+        {-E+,--encoding=}':database encoding:_pgsql_encodings' \
+        ':PostgreSQL database:' \
+        ':comment:'
+}
+
+_dropdb () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-e,--echo}'[display SQL queries]' \
+        {-q,--quiet}'[non verbose mode]' \
+        {-i,--interactive}'[confirm before drop]' \
+        ':PostgreSQL database:_pgsql_databases'
+}
+
+_vacuumdb () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-a,--all}'[vacuum all databases]' \
+        {-d+,--dbname=}':database to connect to:_pgsql_databases' \
+        {-t+,--table=}':table to dump:_pgsql_tables' \
+        {-f,--full}'[do full vacuuming]' \
+        {-z,--analyze}'[update optimizer hints]' \
+        {-e,--echo}'[show the commands being sent to the server]' \
+        {-q,--quiet}'[do not write any messages]' \
+        {-v,--verbose}'[write a lot of output]' \
+        '--help[show this help, then exit]' \
+        '--version[output version information, then exit]' \
+        '1:PostgreSQL database:_pgsql_databases'
+}
+
+_createuser () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-e,--echo}'[display SQL queries]' \
+        {-c,--connection-limit=}'[connection limit for role (default: no limit)]' \
+        {-d,--createdb}'[role can create new databases]' \
+        {-D,--no-createdb}'[role cannot create databases]' \
+        {-E,--encrypted}'[encrypt stored password]' \
+        {-i,--inherit}'[role inherits privileges of roles it is a member of (default)]' \
+        {-I,--no-inherit}'[role does not inherit privileges]' \
+        {-l,--login}'[role can login (default)]' \
+        {-L,--no-login}'[role cannot login]' \
+        {-N,--unencrypted}'[do not encrypt stored password]' \
+        {-P,--pwprompt}'[assign a password to new role]' \
+        {-r,--createrole}'[role can create new roles]' \
+        {-R,--no-createrole}'[role cannot create roles]' \
+        {-s,--superuser}'[role will be superuser]' \
+        {-S,--no-superuser}'[role will not be superuser]'
+}
+
+_dropuser () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        "$_pgsql_common_opts[@]" \
+        {-e,--echo}'[display SQL queries]' \
+        {-q,--quiet}'[non verbose mode]' \
+        {-i,--interactive}'[confirm before drop]' \
+        ':PostgreSQL user:_pgsql_users'
+}
+
+_initdb () {
+    local curcontext="$curcontext" state line expl
+    typeset -A opt_args
+
+    _arguments -C -s \
+        {--auth=,-A+}':default authentication method for local connections:_values "auth methods" $_pgsql_auth_methods[@]' \
+        {-D+,--pgdata=}':location for this database cluster:_files' \
+        {-E+,--encoding=}':set default encoding for new databases:' \
+        --locale=':set default locale for new databases:' \
+        --lc-collate=':set the default locale for collate:' \
+        --lc-ctype=':set the default locale for ctype:' \
+        --lc-messages=':set the default locale for messages:' \
+        --lc-monetary=':set the default locale for monetary:' \
+        --lc-numeric=':set the default locale for numeric:' \
+        --lc-time=':set the default local for time:' \
+        --no-locale'[equivalent to --locale=C]' \
+        --pwfile=':read password for the new superuser from file:_files' \
+        {-T+,--text-search-config=}'[default text search configuration]' \
+        {-U+,--username=NAME}':database superuser name:' \
+        {-W,--pwprompt}'[prompt for a password for the new superuser]' \
+        {-X+,--xlogdir=}':location for the transaction log directory:_files' \
+        {-d,--debug}'[generate lots of debugging output]' \
+        -L+':where to find the input files:_files' \
+        {-n,--noclean}'[do not clean up after errors]' \
+        {-s,--show}'[show internal settings]' \
+        ':location for this database cluster:_files'
+}
+
+_pgsql_utils () {
+    local _pgsql_common_opts _pgsql_auth_methods
+
+    _pgsql_common_opts=(
+        {-\?,--help}'[display help]'
+        {-h+,--host=}':database host:_pgsql_host_or_dir'
+        {-p+,--port=}':database port number:_pgsql_ports'
+        {-U+,--username=}':connect as user:_pgsql_users'
+        {-W,--password}'[prompt for password]'
+    )
+
+    _pgsql_auth_methods=(
+        trust
+        reject
+        md5
+        password
+        gss
+        sspi
+        krb5
+        ident
+        peer
+        ldap
+        radius
+        cert
+        pam
+    )
+
+    case "$service" in
+        psql)     _psql "$@"     ;;
+        pg_dump)  _pg_dump "$@"  ;;
+        pg_restore)  _pg_restore "$@" ;;
+        createdb) _createdb "$@" ;;
+        dropdb)   _dropdb "$@"   ;;
+        vacuumdb) _vacuumdb "$@"   ;;
+        createuser) _createuser "$@" ;;
+        dropuser) _dropuser "$@" ;;
+        initdb) _initdb "$@"     ;;
+    esac
+}
+
+_pgsql_utils "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_phing b/zsh/modules/completion/external/src/_phing
new file mode 100644
index 0000000..afdaf3e
--- /dev/null
+++ b/zsh/modules/completion/external/src/_phing
@@ -0,0 +1,94 @@
+#compdef phing
+# ------------------------------------------------------------------------------
+# Copyright (c) Igor M. Timoshenko <igor.timoshenko@i.ua>
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Phing (http://phing.info).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Igor Timoshenko <igor.timoshenko@i.ua>
+#
+# ------------------------------------------------------------------------------
+
+_phing() {
+  local context curcontext="$curcontext" state line ret=1
+  integer NORMARG
+  typeset -A opt_args
+
+  # Follow http://phing.info/docs/stable/webhelp/sec.commandlineargs.html for more information
+  _arguments \
+    '(-h -help)'{-h,-help}'[display the help screen]' \
+    '(-v -version)'{-v,-version}'[print version information and exit]' \
+    '(-l -list)'{-l,-list}'[list all available targets in buildfile (excluding targets that have their hidden attribute set to true)]' \
+    '(-q -quiet)'{-q,-quiet}'[quiet operation, no output at all]' \
+    '-verbose[verbose, give some more output]' \
+    '-debug[output debug information]' \
+    '-logfile [use given file for log]:file:_files' \
+    '-D[set the property to the specified value to be used in the buildfile]' \
+    '-find []:file:_files' \
+    '-buildfile [specify an alternate buildfile name. Default is build.xml]:file:_files' \
+    '-logger [specify an alternate logger. Default is phing.listener.DefaultLogger. Other options include phing.listener.NoBannerLogger, phing.listener.AnsiColorLogger, phing.listener.XmlLogger, phing.listener.TargetLogger and phing.listener.HtmlColorLogger]' \
+    '-propertyfile [load properties from the specified file]:file:_files' \
+    '(-v --version)'{-v,--version}'[show version]' \
+    '1: :->targets' \
+    '*:: :->args' \
+  && ret=0
+
+  case $state in
+    targets)
+      local buildfile; buildfile=build.xml
+      if [[ ! -f $buildfile ]]
+      then
+        ret=0
+      else
+        local targets; targets=($(sed -nE "/<target /s/.*name=[\"'](\w+)[\"'].*/\1/p" $buildfile))
+        _describe -t 'targets' 'target' targets && ret=0
+      fi
+    ;;
+    args)
+      if [[ CURRENT -eq NORMARG && ${+opt_args[--match]} -eq 0 ]]
+      then
+        # If the current argument is the first non-option argument
+        # and --match isn't present then a pattern is expected
+        _message -e patterns 'pattern' && ret=0
+      else
+        _files
+      fi
+    ;;
+  esac
+
+  return ret
+}
+
+_phing "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_pixz b/zsh/modules/completion/external/src/_pixz
new file mode 100644
index 0000000..f15c3ca
--- /dev/null
+++ b/zsh/modules/completion/external/src/_pixz
@@ -0,0 +1,100 @@
+#compdef pixz
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for pixz a parallel, indexing version of xz. (https://github.com/vasi/pixz).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+local -a files index
+files=()
+index=()
+
+_pixz_compressed_files() {
+    files=("${(f)$(ls -l | grep '.tpxz$\|.xz$' | rev | cut -d' ' -f1 | rev)}")
+}
+
+_pixz_load_file_index() {
+    index=("${(f)$(pixz -l $1)}")
+}
+
+_pixz() {
+
+    _arguments -C \
+      '(- 1 *)'-h"[Show help and exit]" \
+      '(- 1 *)'-l"[List tarball contents very fast]:file:->xzfiles" \
+      '(- 1 *)'-x"[Extract one file very fast]:filepath:->filepath" \
+      '(- 1 *)'-d"[Decompress]:file:->xzfiles" \
+      "-i[Input]:file:->files" \
+      "-o[Output]:output:->outputxz" \
+      "-p[Use a maximum of NUM CPU-intensive threads]:cpu:->cpus" \
+      "-t[Don't assume input is in tar format]" \
+      "-k[Keep original input (do not remove it)]" \
+      "-e[Use "extreme" compression, which is much slower]" \
+      "-f[Set the size of each compression block, relative to the LZMA dictionary size (default is 2.0)]:num" \
+      "-q[Set the number of blocks to allocate for the compression queue (default is 1.3 * cores + 2)]:num" \
+      '1:inputfile:->files' \
+      '2:outputfile' \
+      '*: : :->args' \
+
+    case "$state" in
+      (cmds)
+            _describe -t commands 'commands' commands
+      ;;
+      (xzfiles)
+            _pixz_compressed_files
+            _describe -t files 'files' files
+      ;;
+      (files)
+          _files
+      ;;
+      (cpus)
+          local num_cpus cores
+          num_cpus=$(nproc)
+          cores=()
+          for i in {1..$num_cpus}; do
+              cores+=($i)
+          done
+          _describe -t cores 'cores' cores
+      ;;
+      (filepath)
+      ;;
+      (*)
+      ;;
+    esac
+}
+
+_pixz
+
diff --git a/zsh/modules/completion/external/src/_pkcon b/zsh/modules/completion/external/src/_pkcon
new file mode 100644
index 0000000..440a7fe
--- /dev/null
+++ b/zsh/modules/completion/external/src/_pkcon
@@ -0,0 +1,137 @@
+#compdef pkcon
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for pkcon (http://www.packagekit.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+local -a options
+options=(
+  '--version[Show the program version and exit]'
+  '--filter[Set the filter, e.g. installed]'
+  "--root[Set the install root, e.g. '/' or '/mnt/ltsp']"
+  '(-n --nowait)'{-n,--nowait}'[Exit without waiting for actions to complete]'
+  '(-y --noninteractive)'{-g,--noninteractive}'[Install the packages without asking for confirmation]'
+  '--background[Run the command using idle network bandwidth and also using less power]'
+  '(-p --plain)'{-p,--plain}'[Print to screen a machine readable output, rather than using animated widgets]'
+  '(-c --cache-age)'{-c,--cache-age}"[The maximum metadata cache age. Use -1 for 'never'.]"
+  '(-h --help)'{-h,--help}'[Show help options.]'
+  '(-v --verbose)'{-v,--verbose}'[Show debugging information for all files]'
+)
+
+local -a actions
+actions=(
+  'accept-eula'
+  'get-roles'
+  'get-distro-upgrades'
+  'get-categories'
+  'get-actions'
+  'get-groups'
+  'get-filters'
+  'get-transactions'
+  'get-time'
+  'search'
+  'install'
+  'install-local'
+  'download'
+  'remove'
+  'update'
+  'refresh'
+  'resolve'
+  'get-updates'
+  'get-depends'
+  'get-requires'
+  'get-details'
+  'get-files'
+  'get-update-detail'
+  'get-packages'
+  'repo-list'
+  'repo-enable'
+  'repo-disable'
+  'repo-set-data'
+  'what-provides'
+  'upgrade-system'
+)
+
+local context state line expl cmd
+local -A opt_args
+
+integer i=2
+while (( i < $#words )); do
+  case "$words[$i]" in
+    -*)
+      # skip option
+      (( i++ ))
+      continue
+    ;;
+  esac
+
+  if [[ -z "$cmd" ]]; then
+    cmd="$words[$i]"
+    words[$i]=()
+    (( CURRENT-- ))
+  fi
+  (( i++ ))
+done
+
+if [[ -z "$cmd" ]]
+then
+  _arguments -s -w : $options \
+    ":action:($actions)"
+  return
+fi
+
+case "$cmd" in
+  search)
+    _arguments : $options \
+      ':type:(name details group file)' \
+      ':data: :'
+  ;;
+  refresh)
+    _arguments -s -w : $options \
+      '--force'
+  ;;
+  *)
+    _arguments -s -w : $options
+  ;;
+esac
+return 1
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_play b/zsh/modules/completion/external/src/_play
new file mode 100644
index 0000000..3960d8a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_play
@@ -0,0 +1,215 @@
+#compdef play
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Play! framework 1.2.2 (http://www.playframework.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#  * Mario Fernandez (https://github.com/sirech)
+#
+# ------------------------------------------------------------------------------
+
+
+_play() {
+  local context curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  local ret=1
+
+  _arguments -C \
+    '1: :_play_cmds' \
+    '*::arg:->args' \
+  && ret=0
+
+  case $state in
+    (args)
+      curcontext="${curcontext%:*:*}:play-cmd-$words[1]:"
+      case $line[1] in
+        (build-module|list-modules|lm|check|id)
+          _message 'no more arguments' && ret=0
+        ;;
+        (dependencies|deps)
+          _arguments \
+            '1:: :_play_apps' \
+            '(--debug)--debug[Debug mode (even more informations logged than in verbose mode)]' \
+            '(--jpda)--jpda[Listen for JPDA connection. The process will  suspended until a client is plugged to the JPDA port.]' \
+            '(--sync)--sync[Keep lib/ and modules/ directory synced. Delete unknown dependencies.]' \
+            '(--verbose)--verbose[Verbose Mode]' \
+          && ret=0
+        ;;
+        (clean|javadoc|jd|out|pid|secret|stop)
+          _arguments '1:: :_play_apps' && ret=0
+        ;;
+        (help)
+          _arguments '1: :_play_cmds -F "(cp deps ec idea jd st lm nb nm help antify evolutions evolutions:apply evolutions:markApplied evolutions:resolve)"' && ret=0
+        ;;
+        (status|st)
+          _arguments \
+            '1:: :_play_apps' \
+            '(--url)--url[If you want to monitor an application running on a remote server, specify the application URL using this option]:URL:_urls' \
+            '(--secret)--secret[You can provide your own secret key using this option]:Secret key' \
+          && ret=0
+        ;;
+        (new)
+          _arguments \
+            '1: :_play_apps' \
+            '(--with)--with[Automatically enable this set of module for the newly created application]:Modules list:_play_modules_list' \
+          && ret=0
+        ;;
+        (install)
+          _arguments '1:Play! module:_play_modules_dash_versions' && ret=0
+        ;;
+        (new-module)
+          _arguments '1:Module directory:_files -/' && ret=0
+        ;;
+        (test|precompile|run|start|war|auto-test|classpath|cp|eclipsify|ec|idealize|idea|modules|netbeansify|nb)
+          local cmd_args; cmd_args=(
+            '1:: :_play_apps'
+            '(--deps)--deps[Resolve and install dependencies before running the command]'
+          )
+          case $line[1] in
+            (precompile|run|start|restart|war)
+              local app_dir="$line[2]"
+              [[ -d "$app_dir" ]] || app_dir=.
+              [[ -f "$app_dir/conf/application.conf" ]] && cmd_args+=('--'${(u)${(M)$(<$app_dir/conf/application.conf):#%*}%%.*}'[Use this ID to run the application (override the default framework ID)]')
+            ;|
+            (test|run)
+              cmd_args+=('(-f)-f[Disable the JPDA port checking and force the jpda.port value]')
+            ;|
+            (war)
+              cmd_args+=(
+                '(-o --output)'{-o,--output}'[The path where the WAR directory will be created. The contents of this directory will first be deleted]:output directory:_files -/'
+                '(--zip)--zip[By default, the script creates an exploded WAR. If you want a zipped archive, specify the --zip option]'
+                '(--exclude)--exclude[Excludes a list of colon separated directories]:excluded directories list:_play_colon_dirs_list'
+              )
+            ;|
+            (test|run|start|restart|war)
+              cmd_args+=('*:Java option')
+            ;;
+          esac
+          _arguments "$cmd_args[@]" && ret=0
+        ;;
+        *)
+          _call_function ret _play_cmd_$words[1] && ret=0
+          (( ret )) && _message 'no more arguments'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+# FIXME Completes only core commands, some modules add commands too (eg Maven). Where do we get them ?
+# FIXME Parse 'play help' and 'play help <command>' (for aliases) instead of hard-coding.
+(( $+functions[_play_cmds] )) ||
+_play_cmds() {
+  local commands; commands=(
+    'antify:Create a build.xml file for this project'
+    'auto-test:Automatically run all application tests'
+    'build-module:Build and package a module'
+    'check:Check for a release newer than the current one'
+    {classpath,cp}':Display the computed classpath'
+    'clean:Delete temporary files (including the bytecode cache)'
+    {dependencies,deps}':Resolve and retrieve project dependencies'
+    {eclipsify,ec}':Create all Eclipse configuration files'
+    'evolutions:Run the evolution check'
+    'evolutions\:apply:Automatically apply pending evolutions'
+    'evolutions\:mark:AppliedMark pending evolutions as manually applied'
+    'evolutions\:resolve:Resolve partially applied evolution'
+    'help:Display help on a specific command'
+    'id:Define the framework ID'
+    {idealize,idea}':Create all IntelliJ Idea configuration files'
+    'install:Install a module'
+    {javadoc,jd}':Generate your application Javadoc'
+    {list-modules,lm}':List modules available from the central modules repository'
+    'modules:Display the computed modules list'
+    {netbeansify,nb}':Create all NetBeans configuration files'
+    'new:Create a new application'
+    {new-module,nm}':Create a module'
+    'out:Follow logs/system.out file'
+    'pid:Show the PID of the running application'
+    'precompile:Precompile all Java sources and templates to speed up application start-up'
+    'restart:Restart the running application'
+    'run:Run the application in the current shell'
+    'secret:Generate a new secret key'
+    'start:Start the application in the background'
+    {status,st}':Display the running application status'
+    'stop:Stop the running application'
+    'test:Run the application in test mode in the current shell'
+    'war:Export the application as a standalone WAR archive'
+  )
+  _describe -t commands 'Play! command' commands "$@"
+}
+
+(( $+functions[_play_apps] )) ||
+_play_apps() {
+  _wanted application expl 'Play! application directory' _files -/
+}
+
+(( $+functions[_play_modules] )) ||
+_play_modules() {
+  local modules; modules=(${(ps:,:)${${${(S)${(f)$(_call_program modules $service list-modules)}//\]*\[/,}%%\]*}##*\[}})
+  _describe -t modules 'Play! module' modules "$@"
+}
+
+(( $+functions[_play_modules_dash_versions] )) ||
+_play_modules_dash_versions() {
+  local ret=1
+  if compset -P '*-'; then
+    local versions; versions=(${(ps:,:)${${${${${(f)$(_call_program versions $service list-modules)}##*${IPREFIX%-}\]}#*Versions:}%%"~"*}//[[:space:]]/}})
+    _describe -t module-versions "${IPREFIX%-} module versions" versions && ret=0
+  else
+    _wanted modules expl 'Play! module' _play_modules -qS- && ret=0
+  fi
+}
+
+(( $+functions[_play_modules_list] )) ||
+_play_modules_list() {
+  compset -P '*,'; compset -S ',*'
+  _wanted module-list expl 'Play! modules list' _play_modules -qS,
+}
+
+(( $+functions[_play_colon_dirs_list] )) ||
+_play_colon_dirs_list() {
+  compset -P '*:'; compset -S ':*'
+  _wanted directories-list expl 'Directories list' _files -/ -qS:
+}
+
+_play "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_port b/zsh/modules/completion/external/src/_port
new file mode 100644
index 0000000..29a08fa
--- /dev/null
+++ b/zsh/modules/completion/external/src/_port
@@ -0,0 +1,274 @@
+#compdef port
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for MacPorts (http://www.macports.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Matt Cable <wozz@wookie.net>
+#  * Sorin Ionescu <sorin.ionescu@gmail.com>
+#  * Aljaž Srebrnič <a2piratesoft@gmail.com>
+# -----------------------------------------------------------------------------
+# License
+# -------
+#
+# Copyright (c) 2016, Matt Cable, Sorin Ionescu, Aljaž Srebrnič
+# All rights reserved.
+#
+# Redistribution and use 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 the <organization> nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 <COPYRIGHT HOLDER> 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.
+#
+# ------------------------------------------------------------------------------
+
+_port() {
+  local -a  upgrade_options revupgrade_options select_options \
+              actions pseudo_common pseudo_advanced port_prefix
+
+  port_prefix=$(which port | sed 's|/bin/port||')
+
+  actions=(
+    'activate\:Activate\ the\ given\ ports'
+    'archive\:Archive\ the\ given\ ports,\ i.e.\ install\ the\ port\ image\ but\ do\ not\ activate'
+    'archivefetch\:Fetch\ archive\ for\ the\ given\ ports'
+    'build\:Build\ the\ given\ ports'
+    'cat\:Writes\ the\ Portfiles\ of\ the\ given\ ports\ to\ stdout'
+    'checksum\:Compares\ the\ checksums\ for\ the\ downloaded\ files\ of\ the\ given\ ports'
+    'clean\:Removes\ files\ associated\ with\ the\ given\ ports'
+    'configure\:Configure\ the\ given\ ports'
+    'contents\:\Returns\ a\ list\ of\ files\ installed\ by\ given\ ports'
+    'deactivate\:Deactivates\ the\ given\ ports'
+    'dependents\:Returns\ a\ list\ of\ installed\ dependents\ for\ each\ of\ the\ given\ ports'
+    'deps\:Display\ a\ dependency\ listing\ for\ the\ given\ ports'
+    'destroot\:Destroot\ the\ given\ ports'
+    'dir\:Returns\ the\ directories\ of\ the\ given\ ports'
+    'distcheck\:Checks\ if\ the\ given\ ports\ can\ be\ fetched\ from\ all\ of\ its\ master_sites'
+    'distfiles\:Returns\ a\ list\ of\ distfiles\ for\ the\ given\ port'
+    'dmg\:Creates\ a\ dmg\ for\ each\ of\ the\ given\ ports'
+    'dpkg\:Creates\ a\ dpkg\ for\ each\ of\ the\ given\ ports'
+    'echo\:Returns\ the\ list\ of\ ports\ the\ argument\ expands\ to'
+    'edit\:Edit\ given\ ports'
+    'extract\:Extract\ the\ downloaded\ files\ of\ the\ given\ ports'
+    'fetch\:Downloaded\ distfiles\ for\ the\ given\ ports'
+    'file\:Returns\ the\ path\ to\ the\ Portfile\ for\ each\ of\ the\ given\ ports'
+    'gohome\:Opens\ the\ homepages\ of\ the\ given\ ports\ in\ your\ browser'
+    'help\:Displays\ short\ help\ texts\ for\ the\ given\ actions'
+    'info\:Returns\ information\ about\ the\ given\ ports '
+    'install\:Installs\ the\ given\ ports'
+    'installed\:List\ installed\ versions\ of\ the\ given\ port,\ or\ all\ installed\ ports\ if\ no\ port\ is\ given'
+    'lint\:Checks\ if\ the\ Portfile\ is\ lint-free\ for\ each\ of\ the\ given\ ports'
+    'list\:List\ the\ available\ version\ for\ each\ of\ the\ given\ ports'
+    'livecheck\:Checks\ if\ a\ new\ version\ of\ the\ software\ is\ available'
+    'load\:Interface\ to\ launchctl(1)\ for\ ports\ providing\ startup\ items'
+    'location\:Returns\ the\ install\ location\ for\ each\ of\ the\ given\ ports'
+    'log\:Shows\ main\ log\ for\ given\ ports'
+    'logfile\:Returns\ the\ log\ file\ path\ for\ each\ of\ the\ given\ ports'
+    'mdmg\:Creates\ a\ dmg\ containing\ an\ mpkg\ for\ each\ of\ the\ given\ ports\ and\ their\ dependencies'
+    'mirror\:Fetches\ distfiles\ for\ the\ given\ ports'
+    'mpkg\:Creates\ an\ mpkg\ for\ each\ of\ the\ given\ ports\ and\ their\ dependencies'
+    'notes\:Displays\ informational\ notes\ for\ each\ of\ the\ given\ ports'
+    'outdated\:Returns\ a\ list\ of\ outdated\ ports'
+    'patch\:Applies\ patches\ to\ each\ of\ the\ given\ ports'
+    'pkg\:Creates\ a\ pkg\ for\ each\ of\ the\ given\ ports'
+    'platform\:Returns\ the\ current\ platform\ that\ port\ is\ running\ on'
+    'provides\:Return\ which\ port\ provides\ each\ of\ the\ files\ given'
+    'rdependents\:Recursive\ version\ of\ dependents'
+    'rdeps\:Display\ a\ recursive\ dependency\ listing\ for\ the\ given\ ports'
+    'rev-upgrade\:Scan\ for\ broken\ binaries\ in\ the\ installed\ ports\ and\ rebuild\ them\ as\ needed'
+    'rpm\:Creates\ a\ rpm\ for\ each\ of\ the\ given\ ports'
+    'search\:Search\ for\ a\ port'
+    'select\:Select\ between\ multiple\ versions\ of\ a\ versioned\ port'
+    'selfupdate\:Upgrade\ MacPorts\ itself\ and\ run\ the\ sync\ target'
+    'setrequested\:Marks\ each\ of\ the\ given\ ports\ as\ requested'
+    'space\:Show\ the\ disk\ space\ used\ by\ the\ given\ ports'
+    'srpm\:Creates\ a\ srpm\ for\ each\ of\ the\ given\ ports'
+    'sync\:Synchronize\ the\ set\ of\ Portfiles'
+    'test\:Run\ tests\ on\ each\ of\ the\ given\ ports'
+    'unarchive\:Unarchive\ the\ destroot\ of\ the\ given\ ports\ from\ installed\ images'
+    'uninstall\:Uninstall\ the\ given\ ports'
+    'unload\:Interface\ to\ launchctl(1)\ for\ ports\ providing\ startup\ items'
+    'unsetrequested\:Marks\ each\ of\ the\ given\ ports\ as\ unrequested'
+    'upgrade\:Upgrades\ the\ given\ ports\ to\ the\ latest\ version'
+    'url\:Returns\ the\ URL\ for\ each\ of\ the\ given\ ports'
+    'usage\:Returns\ basic\ usage\ of\ the\ port\ command'
+    'variants\:Returns\ a\ list\ of\ variants\ provided\ by\ the\ given\ ports,\ with\ descriptions\ if\ present'
+    'version\:Returns\ the\ version\ of\ MacPorts'
+    'work\:Returns\ the\ path\ to\ the\ work\ directory\ for\ each\ of\ the\ given\ ports'
+  )
+
+  pseudo_common=(all current active inactive actinact installed uninstalled outdated
+  obsolete requested unrequested leaves)
+
+  pseudo_advanced=('variants:' 'variant:' 'description:' 'depends:'
+  'depends_lib:' 'depends_run:' 'depends_build:' 'depends_fetch:' 'depends_extract:'
+  'portdir:' 'homepage:' 'epoch:' 'platforms:' 'platform:' 'name:' 'long_description:'
+  'maintainers:' 'maintainer:' 'categories:' 'category:' 'version:' 'revision:' 'license:')
+
+  select_options=(
+  '--list:List available versions for the group'
+  '--set:Select the given version for the group'
+  '--show:Show which version is currently selected for the group (default if none given)'
+  )
+
+  revupgrade_options=('--id-loadcmd-check:Run more checks against a special loadcommand in Mach-O binaries')
+
+  upgrade_options=(
+    '--force\:Ignore\ circumstances\ that\ would\ normally\ cause\ ports\ to\ be\ skipped\ \(e.g.\ not\ outdated\).' \
+    '--enforce-variants\:If\ the\ installed\ variants\ do\ not\ match\ those\ requested,\ upgrade\ even\ if\ the\ port\ is\ not\ outdated.' \
+    '--no-replace\:Do\ not\ replace\ one\ port\ with\ another\ according\ to\ the\ replaced_by\ field.' \
+  )
+
+  _arguments -s -C \
+    '-v[Verbose mode (generate verbose messages)]' \
+    '-d[Debug mode (generate debugging messages, implies -v)]' \
+    '-q[Quiet mode (suppress messages)]' \
+    "-n[Don't upgrade dependencies (affects upgrade and install)]" \
+    "-R[Also upgrade dependents (only affects upgrade) - note that this does not upgrade dependents' dependencies]" \
+    '-u[Uninstall non-active ports when upgrading and uninstalling]' \
+    '-f[Force mode (ignore state file)]' \
+    '-o[Honor state files even if the Portfile has been modified since (called -o because it used to mean "older")]' \
+    '-s[Source-only mode (build and install from source, do not attempt to fetch binary archives)]' \
+    '-b[Binary-only mode (build and install from binary archives, ignore source, abort if no archive available)]' \
+    '-c[Autoclean mode (execute clean after install)]' \
+    "-k[Keep mode (don't autoclean after install)]" \
+    '-D[Specify portdir]' \
+    '-F[Read and process the file of commands specified by the argument.]' \
+    '-p[Despite any errors encountered, proceed to process multiple ports and commands.]' \
+    '-y[Perform a dry run.]' \
+    '-t[Enable trace mode debug facilities on platforms that support it (Mac OS X).]' \
+    "1:Port actions:(($actions))" \
+    '::Per-action arguments:_port_dispatch' \
+    && return 0
+}
+
+_port_dispatch() {
+  local cache_policy
+  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+  zstyle ":completion:${curcontext}:" cache-policy ${cache_policy:-_port_caching_policy}
+
+  case "$words[2]" in
+    provides)
+      _files
+      ;;
+    search)
+      _message 'pattern'
+      ;;
+    help)
+      _describe -t actions 'Port actions' actions
+      ;;
+    select)
+      _call_function - _port_select
+      ;;
+    contents|deactivate|setrequested|space|uninstall|unsetrequested)
+      # Cache the list of installed ports.
+      if ( [[ ${+_port_installed_packages} -eq 0 ]] || _cache_invalid PORT_INSTALLED_PACKAGES ) &&
+        ! _retrieve_cache PORT_INSTALLED_PACKAGES;
+      then
+        _port_installed_packages=( $(_call_program path-all "port -q echo installed") )
+        _store_cache PORT_INSTALLED_PACKAGES _port_installed_packages
+      fi
+      _alternative \
+        "ports:Installed ports:($_port_installed_packages)" \
+        "pseudo-common:Common Pseudo-portnames:($pseudo_common)" \
+        "pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)"
+      ;;
+    upgrade)
+      # No good reason to actually cache outdated ports list
+      local outdated_packages
+      outdated_packages=( $(_call_program path-outdated "port -q echo outdated") )
+      _alternative -- \
+        "upgrade-options:Upgrade options:(($upgrade_options))" \
+        "ports:Outdated ports:($outdated_packages)" \
+        "pseudo-common:Common Pseudo-portnames:($pseudo_common)" \
+        "pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)"
+      ;;
+    rev-upgrade)
+      if (( CURRENT == 3 )); then
+        _describe 'Rev-upgrade options' revupgrade_options
+      fi
+      ;;
+    outdated|sync)
+      # No need to complete anything more here.
+      return 0;
+      ;;
+    selfupdate)
+      _all_labels 'Selfupdate options' '--nosync'
+      ;;
+    *)
+      # Cache the list of all ports.
+      if ( [[ ${+_port_available_packages} -eq 0 ]] || _cache_invalid PORT_AVAILABLE_PACKAGES ) &&
+        ! _retrieve_cache PORT_AVAILABLE_PACKAGES;
+      then
+        _port_available_packages=( $(_call_program path-all "port -q echo all") )
+        _store_cache PORT_AVAILABLE_PACKAGES _port_available_packages
+      fi
+      _alternative \
+        "ports:Available ports:($_port_available_packages)" \
+        "pseudo-common:Common Pseudo-portnames:($pseudo_common)" \
+        "pseudo-advanced:Advanced Pseudo-portnames:($pseudo_advanced)"
+      ;;
+  esac
+}
+
+_port_select() {
+  if (( CURRENT == 3 )); then
+    _describe 'Port select options' select_options
+  elif (( CURRENT == 4 )); then
+    local select_group
+    select_group=()
+    for f in $port_prefix/etc/select/*; do
+      select_group+=$(basename $f)
+    done
+    _describe "Port select groups" select_group
+  elif [[ $CURRENT -eq 5 && $words[3] == '--set' ]]; then
+    local select_variants
+    select_variants=("${(f)$(port select --list $words[4] | sed -e '1 d' -e 's/^[ \t]*//' -e 's/ (active)$//')}")
+    _describe "Port select group $words[4] variants" select_variants
+  fi
+}
+
+stat -f%m . > /dev/null 2>&1
+if [ "$?" = 0 ]; then
+  stat_cmd=(stat -f%Z)
+else
+  stat_cmd=(stat --format=%Z)
+fi
+
+_port_caching_policy() {
+  local reg_time comp_time check_file
+  case "${1##*/}" in
+    PORT_INSTALLED_PACKAGES)
+      check_file=$port_prefix/var/macports/registry/registry.db
+      ;;
+    PORT_AVAILABLE_PACKAGES)
+      check_file=${$(port dir MacPorts)%/*/*}/PortIndex
+      ;;
+  esac
+  reg_time=$($stat_cmd $check_file)
+  comp_time=$($stat_cmd $1)
+  return $(( reg_time < comp_time ))
+}
+
+_port "$@"
diff --git a/zsh/modules/completion/external/src/_pygmentize b/zsh/modules/completion/external/src/_pygmentize
new file mode 100644
index 0000000..bc62304
--- /dev/null
+++ b/zsh/modules/completion/external/src/_pygmentize
@@ -0,0 +1,147 @@
+#compdef pygmentize
+# ------------------------------------------------------------------------------
+# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for pygmentize.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Hideo Hattori <hhatto.jp@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_pygmentize() {
+  local context state line
+
+  _arguments -s -S \
+    '-h[prints help]:' \
+    '-V[prints the package version]:' \
+    '-L[lists lexers, formatters, styles or filters]:args:(lexers formatters styles filters):' \
+    '-f[formatter]:FORMATTER:_get_formatters' \
+    '-o[output file]:FILENAME:_gnu_generic' \
+    '(-h -V -L -f -o -S -F -H -g -l)-N[guesses and prints out a lexer name based solely on given filename]:FILENAME:_files:' \
+    '(-h -V -L -o -F -H -g -l -N)-S[style]:STYLE:_get_styles' \
+    '-F[filter]:STYLE:_get_filters' \
+    '-H[prints detailed help for the object <name> of type <type>]:' \
+    '(-g)-l[lexer]::LEXER:_get_lexers:' \
+    '(-l)-g[attempt to guess the lexer from the file contents]' \
+    '*:args:_gnu_generic'
+}
+
+
+_get_filters() {
+  local cache_policy
+  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+  if [[ -z "$cache_policy" ]]; then
+    zstyle ":completion:${curcontext}:" cache-policy _pygmentize_caching_policy
+  fi
+
+  if ( [[ ${+_pygmentize_filters} -eq 0 ]] || _cache_invalid pygmentize_filters ) \
+      && ! _retrieve_cache pygmentize_filters; then
+    _pygmentize_filters=(${${(f)"$(pygmentize -L filters | grep '* ' | cut -c3- | sed -e 's/:$//')"}})
+    _store_cache pygmentize_filters _pygmentize_filters
+  fi
+
+  local expl
+  _wanted pygmentize_filters expl 'pygmentize filters' compadd -a _pygmentize_filters
+}
+
+
+(( $+functions[_pygmentize_get_formatters] )) ||
+_get_formatters() {
+  local cache_policy
+  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+  if [[ -z "$cache_policy" ]]; then
+    zstyle ":completion:${curcontext}:" cache-policy _pygmentize_caching_policy
+  fi
+
+  if ( [[ ${+_pygmentize_formatter} -eq 0 ]] || _cache_invalid pygmentize_formatter ) \
+      && ! _retrieve_cache pygmentize_formatter; then
+    _pygmentize_formatter=(${${(f)"$(pygmentize -L formatters | grep '* ' | cut -c3- | sed -e 's/, /\n/g' -e 's/:$//')"}})
+    _store_cache pygmentize_formatter _pygmentize_formatter
+  fi
+
+  local expl
+  _wanted pygmentize_formatter expl 'pygmentize formatters' compadd -a _pygmentize_formatter
+}
+
+
+_get_lexers() {
+  local cache_policy
+  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+  if [[ -z "$cache_policy" ]]; then
+    zstyle ":completion:${curcontext}:" cache-policy _pygmentize_caching_policy
+  fi
+
+  if ( [[ ${+_pygmentize_lexer} -eq 0 ]] || _cache_invalid pygmentize_lexer ) \
+      && ! _retrieve_cache pygmentize_lexer; then
+    _pygmentize_lexer=(${${(f)"$(pygmentize -L lexers | grep '* ' | cut -c3- | sed -e 's/, /\n/g' -e 's/:$//')"}})
+    _store_cache pygmentize_lexer _pygmentize_lexer
+  fi
+
+  local expl
+  _wanted pygmentize_lexer expl 'pygmentize lexers' compadd -a _pygmentize_lexer
+}
+
+
+_get_styles() {
+  local cache_policy
+  zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+  if [[ -z "$cache_policy" ]]; then
+    zstyle ":completion:${curcontext}:" cache-policy _pygmentize_caching_policy
+  fi
+
+  if ( [[ ${+_pygmentize_style} -eq 0 ]] || _cache_invalid pygmentize_style ) \
+      && ! _retrieve_cache pygmentize_style; then
+    _pygmentize_style=(${${(f)"$(pygmentize -L styles | grep '* ' | cut -c3- | sed -e 's/:$//')"}})
+    _store_cache pygmentize_style _pygmentize_style
+  fi
+
+  local expl
+  _wanted pygmentize_style expl 'pygmentize styles' compadd -a _pygmentize_style
+}
+
+
+_pygmentize_caching_policy() {
+  local -a oldp
+  oldp=( "$1"(Nmh+24) )     # 24 hour
+  (( $#oldp ))
+}
+
+_pygmentize "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_rails b/zsh/modules/completion/external/src/_rails
new file mode 100644
index 0000000..d8cc7bb
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rails
@@ -0,0 +1,624 @@
+#compdef rails
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Ruby on Rails (http://rubyonrails.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kazuya Takeshima (https://github.com/mitukiii)
+#
+# ------------------------------------------------------------------------------
+
+
+_rails() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_${words[1]}" || _nothing
+  else
+    __rails_commands
+  fi
+}
+
+__rails_commands() {
+  local context state line curcontext="$curcontext"
+
+  local -a rails_options
+  __rails_setup_rails_options
+
+  _arguments -C \
+    $rails_options \
+    ': :->command'
+
+  case "$state" in
+    command)
+      local -a commands
+      local application_directory
+      __rails_setup_application_directory
+
+      if [ -n "$application_directory" ]; then
+        commands=(
+          {generate,g}'[Generate new code]'
+          {console,c}'[Start the Rails console]'
+          {server,s}'[Start the Rails server]'
+          {dbconsole,db}'[Start a console for the database specified in config/database.yml]'
+          application'[Generate the Rails application code]'
+          {destroy,d}'[Undo code generated with "generate"]'
+          benchmarker'[See how fast a piece of code runs]'
+          profiler'[Get profile information from a piece of code]'
+          plugin'[Install a plugin]'
+          {runner,r}'[Run a piece of code in the application environment]'
+          {test,t}'[Run tests]'
+        )
+      else
+        commands=(
+          new'[Create a new Rails application]'
+        )
+      fi
+
+      _values 'command' $commands
+      ;;
+  esac
+}
+
+__rails_setup_application_directory() {
+  application_directory="$(pwd)"
+
+  while [ -n "$application_directory" ]; do
+    if [ -f "${application_directory}/script/rails" -o -f "${application_directory}/bin/rails" ]; then
+      return
+    fi
+    application_directory="${application_directory%/*}"
+  done
+
+  application_directory=
+}
+
+__rails_setup_rails_options() {
+  rails_options=(
+    {-h,--help}'[Show this help message and quit]'
+    {-v,--version}'[Show Rails version number and quit]'
+  )
+}
+
+__rails_setup_runtime_options() {
+  runtime_options=(
+    '(-f --force)'{-f,--force}'[Overwrite files that already exist]'
+    '(-p --pretend)'{-p,--pretend}'[Run but do not make any changes]'
+    '(-q --quiet)'{-q,--quiet}'[Suppress status output]'
+    '(-s --skip)'{-s,--skip}'[Skip files that already exist]'
+  )
+}
+
+__rails_setup_generators_options() {
+  local -a runtime_options
+  __rails_setup_runtime_options
+
+  generators_options=(
+    $runtime_options
+    --skip-namespace'[Skip namespace (affects only isolated applications)]'
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]"
+  )
+}
+
+__rails_setup_model_generators_options() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  model_generators_options=(
+    $generators_options
+    '(-o --orm)'{-o,--orm=}'[Orm to be invoked]:orm'
+  )
+}
+
+__rails_setup_resource_generators_options() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  resource_generators_options=(
+    $model_generators_options
+    --force-plural'[Forces the use of a plural ModelName]'
+    --resource-route'[Indicates when to generate resource route]: :__rails_boolean'
+  )
+}
+
+__rails_boolean() {
+  _values 'boolean' 'true' 'false'
+}
+
+__rails_migration_fields() {
+  if compset -P '*:*:'; then
+    _values 'index' 'index' 'uniq'
+  else
+    if compset -P '*:'; then
+      _values -s ':' 'type' 'string' 'text' 'integer' 'float' 'decimal' 'datetime' 'timestamp' 'time' 'date' 'binary' 'boolean' 'references'
+    else
+      _guard '[[:alnum:]_]#' 'field'
+    fi
+  fi
+}
+
+_rails_generate() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_generate_${words[1]}" || _rails_generate_default
+  else
+    __rails_generate_commands
+  fi
+}
+
+_rails_g() {
+  _rails_generate
+}
+
+__rails_generate_commands() {
+  local context curcontext="$curcontext" update_policy
+
+  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
+  if [ -z "$update_policy" ]; then
+    zstyle ":completion:${curcontext}:" cache-policy _rails_generate_commands_caching_policy
+  fi
+
+  local application_directory
+  __rails_setup_application_directory
+  local cache_name
+  cache_name="rails/${application_directory##*/}/all_generators"
+  if ! _retrieve_cache ${cache_name}; then
+    local -a all_generators
+    all_generators=($(_call_program rails_generators rails generate 2> /dev/null | awk '/^  [a-zA-Z_]+/{ print $1 }'))
+    _store_cache ${cache_name} all_generators
+  fi
+
+  local -a rails_generators
+  rails_generators=(${all_generators:#*:*})
+  _describe -t rails_generators 'rails generator' rails_generators
+
+  local -a -U namespaces
+  local namespace
+  local -a generators
+  namespaces=(${(R)${(M)all_generators:#*:*}%:*})
+  for namespace in $namespaces; do
+    generators=(${${(M)all_generators:#${namespace}:*}/:/\\:})
+    _describe -t ${namespace}_generators "${namespace/_/ } generator" generators
+  done
+}
+
+_rails_generate_commands_caching_policy() {
+  local application_directory
+  __rails_setup_application_directory
+
+  if [ "${application_directory}/Gemfile" -nt "$1" ]; then
+    return 0
+  fi
+
+  local -a oldp
+  oldp=( "$1"(Nmw+1) )
+  (( $#oldp ))
+}
+
+_rails_generate_default() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '*:argument'
+}
+
+_rails_generate_assets() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-j --javascripts)'{-j,--javascripts}'[Generate JavaScripts]: :__rails_boolean' \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-je --javascript-engine)'{-je,--javascript-engine=}'[Engine for JavaScripts]:javascript engine' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_controller() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    --assets'[Indicates when to generate assets]: :__rails_boolean' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_generate_generator() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --namespace'[Namespace generator under lib/generators/name]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_helper() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_integration_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --integration-tool='[Integration tool to be invoke]:integration tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_jbuilder() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_mailer() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "method"'
+}
+
+_rails_generate_migration() {
+  local -a modelgenerators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_model() {
+  _rails_generate_migration
+}
+
+_rails_generate_observer() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_performance_test() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    --performance-tool='[Performance tool to be invoked]:performance tool' \
+    ': :_guard "^-*" "name"' \
+}
+
+_rails_generate_resource() {
+  local context state line curcontext="$curcontext"
+
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments -C \
+    $resource_generators_options \
+    '(-c --resource-controller)'{-c,--resource-controller=}'[Resource controller to be invoked]:name' \
+    '(-a --actions)'{-a,--actions=}'[Actions for the resource controller]: :->actions' \
+    ': :->name' \
+    '*: :->fields'
+
+  if (( words[(I)(--actions=*|-a)] > 0 && words[(I)(--actions=*|-a)] == words[(I)-*] )); then
+    state=actions
+  fi
+
+  case "$state" in
+    actions)
+      _guard "[[:alnum:]_]#" "actions"
+      ;;
+    name)
+      _guard "^-*" "name"
+      ;;
+    fields)
+      __rails_migration_fields
+      ;;
+  esac
+}
+
+_rails_generate_scaffold() {
+  local -a resource_generators_options
+  __rails_setup_resource_generators_options
+
+  _arguments \
+    $resource_generators_options \
+    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
+    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
+    '(-c --scaffold-controller)'{-c,--scaffold-controller=}'[Scaffold controller to be invoked]:name' \
+    --assets'[Indicates when to generate assets]:boolean:(true false)' \
+    ': :_guard "^-*" "name"' \
+    '*: :__rails_migration_fields'
+}
+
+_rails_generate_scaffold_controller() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    '(-e,--template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
+    '(-t,--test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
+      --helper'[Indicates when to generate helper]: :__rails_boolean' \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_session_migration() {
+  local -a model_generators_options
+  __rails_setup_model_generators_options
+
+  _arguments \
+    $model_generators_options \
+    ': :_guard "^-*" "name"'
+}
+
+_rails_generate_task() {
+  local -a generators_options
+  __rails_setup_generators_options
+
+  _arguments \
+    $generators_options \
+    ': :_guard "^-*" "name"' \
+    '*: :_guard "^-*" "action"'
+}
+
+_rails_console() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-s --sandbox)'{-s,--sandbox}'[Rollback database modifications on exit]' \
+    --debugger'[Enable ruby-debugging for the console]'
+}
+
+_rails_c() {
+  _rails_console
+}
+
+_rails_server() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-p --port)'{-p,--port=}'[Runs Rails on the specified port]: :_guard "[[\:digit\:]]#" "port"' \
+    '(-b --binding)'{-b,--binding=}'[Binds Rails to the specified ip]:ip:_hosts' \
+    '(-c --config)'{-c,--config=}'[Use custom rackup configuration file]:file:_files -g "*.ru"' \
+    '(-d --daemon)'{-d,--daemon}'[Make server run as a Daemon]' \
+    '(-u --debugger)'{-u,--debugger}'[Enable ruby-debugging for the server]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment to run this server under (test/development/production)]:name:(test development production)' \
+    '(-P --pid)'{-P,--pid=}'[Specifies the PID file]:pid:_files -g "*.pid"'
+}
+
+_rails_s() {
+  _rails_server
+}
+
+_rails_dbconsole() {
+  _arguments \
+    '(- *)'--help'[Show this help message]' \
+    '(-p --include-password)'{-p,--include-password}'[Automatically provide the password from database.yml]' \
+    --mode'[Automatically put the sqlite3 database in the specified mode (html, list, line, column)]:mode:(html list line column)' \
+    --header
+}
+
+_rails_new() {
+  local context state line curcontext="$curcontext"
+
+  local _a rails_options runtime_options
+  __rails_setup_rails_options
+  __rails_setup_runtime_options
+
+  _arguments -C \
+    $rails_options \
+    $runtime_options \
+    '(-r,--ruby)'{-r,--ruby=}'[Path to the Ruby binary of your choice]:path' \
+    '(-b,--builder)'{-b,--builder=}'[Path to a application builder (can be a filesystem path or URL)]: :->path_or_url' \
+    '(-m,--template)'{-m,--template=}'[Path to an application template (can be a filesystem path or URL)]: :->path_or_url' \
+    --skip-gemfile"[Don't create a Gemfile]" \
+    --skip-bundle"[Don't run bundle install]" \
+    '(-G,--skip-git)'{-G,--skip-git}'[Skip Git ignores and keeps]' \
+    '(-O,--skip-active-record)'{-O,--skip-active-record}'[Skip Active Record files]' \
+    '(-S,--skip-sprockets)'{-S,--skip-sprockets}'[Skip Sprockets files]' \
+    '(-d,--database)'{-d,--database=}'[Preconfigure for selected database]:database:(mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc)' \
+    '(-j,--javascript)'{-j,--javascript=}'[Preconfigure for selected JavaScript library]:javascript' \
+    '(-J --skip-javascript)'{-J,--skip-javascript}'[Skip JavaScript files]' \
+    --dev'[Setup the application with Gemfile pointing to your Rails checkout]' \
+    --edge'[Setup the application with Gemfile pointing to Rails repository]' \
+    '(-T --skip-test-unit)'{-T,--skip-test-unit}'[Skip Test::Unit files]' \
+    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]" \
+    ':app path:_directories'
+
+  case "$state" in
+    path_or_url)
+      _alternative \
+        'files:path:_files -g "*.rb"' \
+        'url:url:_urls'
+      ;;
+  esac
+}
+
+_rails_application() {
+  _rails_new
+}
+
+_rails_db() {
+  _rails_dbconsole
+}
+
+_rails_destroy() {
+  _rails_generate
+}
+
+_rails_d() {
+  _rails_destroy
+}
+
+_rails_benchmarker() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "wall_time" "memory" "objects" "gc_runs" "gc_time"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_profiler() {
+  _arguments \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
+    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
+    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "process_time" "memory" "objects"' \
+    '(-f --formats)'{-f,--formats}'[Formats to output to]: :_values -s "," "formats" "flat" "graph" "html" "call_tree" "call_stack"' \
+    '*: :_guard "^-*" "ruby code"'
+}
+
+_rails_plugin() {
+  local context state line curcontext="$curcontext"
+
+  if (( CURRENT > 2 )); then
+    (( CURRENT-- ))
+    shift words
+    _call_function - "_rails_plugin_${words[1]}" || _nothing
+  else
+    __rails_plugin_commands
+  fi
+}
+
+__rails_plugin_commands() {
+  _values 'plugin command' \
+    install'[Install plugin(s) from known repositories or URLs]' \
+    remove'[Uninstall plugins]' \
+    new
+}
+
+_rails_plugin_install() {
+  _arguments \
+    '(-x --externals)'{-x,--externals}'[Use svn:externals to grab the plugin. Enables plugin updates and plugin versioning]' \
+    '(-o --checkout)'{-o,--checkout}'[Use svn checkout to grab the plugin. Enables updating but does not add a svn:externals entry]' \
+    '(-e --export)'{-e,--export}'[Use svn export to grab the plugin. Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry]' \
+    '(-q --quiet)'{-q,--quiet}'[Suppresses the output from installation. Ignored if -v is passed (rails plugin -v install ...)]' \
+    '(-r --revision)'{-r,--revision=}'[Checks out the given revision from subversion or git. Ignored if subversion/git is not used]:revision' \
+    '(-f --force)'{-f,--force}"[Reinstalls a plugin if it's already installed]" \
+    '*:plugin:_urls'
+}
+
+_rails_plugin_remove() {
+  local -a plugins
+
+  plugins=($(_call_program rails_plugins ls -1 vendor/plugins))
+
+  _describe -t plugins 'plugin' plugins
+}
+
+_rails_plugin_new() {
+  _rails_new
+}
+
+_rails_runner() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    '(- *)'{-h,--help}'[Show this help message]' \
+    '(-e --environment)'{-e,--environment=}'[Specifies the environment for the runner to operate under (test/development/production)]:name:(test development production)' \
+    ': :->code_or_path'
+
+  case "$state" in
+    code_or_path)
+      _alternative \
+        'files:filename:_files -g "*.rb"' \
+        'codes:ruby code:_guard "^-*" "ruby code"'
+      ;;
+  esac
+}
+
+_rails_r() {
+  _rails_runner
+}
+
+_rails_test() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    ': :->path'
+
+  case "$state" in
+    path)
+      _alternative \
+        'files:filename:_files -g "*.rb"'
+      ;;
+  esac
+}
+
+_rails_t() {
+  _rails_test
+}
+
+_rails "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_ralio b/zsh/modules/completion/external/src/_ralio
new file mode 100644
index 0000000..cedbb02
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ralio
@@ -0,0 +1,146 @@
+#compdef ralio
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ralio (https://github.com/oesmith/ralio), a
+#  Rally client
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Peter Yates <pd.yates@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_ralio ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options' \
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+        "backlog:Show the product backlog"
+        "sprint:Show the current team iteration"
+        "show:Show related information for an individual story, defect or task"
+        "open:Open a story, defect or task in a web browser"
+        "start:Set a task, defect or story state to in-progress and assign it to you"
+        "finish:Set a task, defect or story state to completed and assign it to you"
+        "abandon:Set a task, defect or story state to defined and clear the owner"
+        "block:Set a task, defect or story state to blocked"
+        "unblock:Set a task, defect or story state to unblocked"
+        "current:Show your current tasks and stories"
+        "point:Set the points for a story or defect"
+        "task:Allow you to create and delete story tasks."
+        "configure:Set your Rally configurations."
+			)
+			_describe -t commands 'ralio commands' subcommands
+
+      _arguments -C \
+        {-V,--version}"[display version information]" \
+        {-h,--help}"[output usage information]"
+		;;
+
+		(options)
+			case $line[1] in
+
+
+        (sprint)
+          _arguments \
+            "-t[Show tasks]" \
+            "-p[Project name]" \
+            "-f[Filter results]"
+        ;;
+
+				(start | finish)
+					_arguments \
+            '--pair[Pair programming partner]' \
+            "--resolution[Resolution status]" \
+            "--rootcause[Root cause]"
+				;;
+
+        (task)
+          __ralio-task
+		    ;;
+
+			esac
+		;;
+	esac
+}
+
+__ralio-task ()
+{
+	local curcontext="$curcontext" state line
+	typeset -A opt_args
+
+	_arguments -C \
+		':command:->command' \
+		'*::options:->options'
+
+	case $state in
+		(command)
+
+			local -a subcommands
+			subcommands=(
+        "create:Create a new task" 
+        "delete:Delete a task" 
+			)
+			_describe -t commands 'ralio task' subcommands
+		;;
+
+		(options)
+			case $line[1] in
+
+				(create|delete)
+					_arguments \
+            -n"[Name of the new task]" \
+            -t"[Name of the parent task]"
+				;;
+
+			esac
+		;;
+	esac
+}
+
+_ralio "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_redis-cli b/zsh/modules/completion/external/src/_redis-cli
new file mode 100644
index 0000000..d11c06f
--- /dev/null
+++ b/zsh/modules/completion/external/src/_redis-cli
@@ -0,0 +1,184 @@
+#compdef redis-cli rec
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Redis (http://redis.io).
+#
+#  Source: https://github.com/robbyrussell/oh-my-zsh/blob/master/plugins/redis-cli
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Alexandru Totolici (https://github.com/totolici)
+#
+# ------------------------------------------------------------------------------
+
+
+local -a _1st_arguments
+_1st_arguments=(
+  'append:append a value to a key'
+  'auth:authenticate to the server'
+  'bgrewriteeaof:asynchronously rewrite the append-only file'
+  'bgsave:asynchornously save the dataset to disk'
+  'blpop:remove and get the first element in a list, or block until one is available'
+  'brpop:remove and get the last element in a list, or block until one is available'
+  'brpoplpush:pop a value from a list, push it to another list and return it; or block until one is available'
+  # 'config get:get the value of a configuration parameter'
+  # 'config set:set a configuration parameter to the given value'
+  # 'config resetstat: reset the stats returned by INFO'
+  'dbsize:return the number of keys in the selected database'
+  # 'debug object:get debugging information about a key'
+  # 'debug setgfault:make the server crash'
+  'decr:decrement the integer value of a key by one'
+  'decrby:decrement the integer value of a key by the given number'
+  'del:delete a key'
+  'discard:discard all commands issued after MULTI'
+  'echo:echo the given string'
+  'exec:execute all commands issued after a MULTI'
+  'exists:determine if a key exists'
+  'expire:set the time to live for a key, in seconds'
+  'expireat:set the expiration for a key as a UNIX timestamp'
+  'flushall:remove all keys from all databases'
+  'flushdb:remove all keys from the current database'
+  'get:get the value of a key'
+  'getbit:returns the bit value at offset in the string value stored at key'
+  'getrange:get a substring of the string stored at a key'
+  'getset:set the string value of a key and return its old value'
+  'hdel:delete a hash field'
+  'hexists:determine if a hash field exists'
+  'hget:get the value of a hash field'
+  'hgetall:get all the fields and values in a hash'
+  'hincrby:increment the integer value of a hash field by the given number'
+  'hkeys:get all the fields in a hash'
+  'hlen:get the number of fields in a hash'
+  'hmget:get the values of all the given hash fields'
+  'hmset:set multiple hash fields to multiple values'
+  'hset:set the string value of a hash field'
+  'hsetnx:set the value of a hash field, only if the field does not exist'
+  'hvals:get all the values in a hash'
+  'incr:increment the integer value of a key by one'
+  'incrby:increment the integer value of a key by the given number'
+  'info:get information and statistics about the server'
+  'keys:find all keys matching the given pattern'
+  'lastsave:get the UNIX timestamp of the last successful save to disk'
+  'lindex:get an element from a list by its index'
+  'linsert:insert an element before or after another element in a list'
+  'llen:get the length of a list'
+  'lpop:remove and get the first element in a list'
+  'lpush:prepend a value to a list'
+  'lpushx:prepend a value to a list, only if the list exists'
+  'lrange:get a range of elements from a list'
+  'lrem:remove elements from a list'
+  'lset:set the value of an element in a list by its index'
+  'ltrim:trim a list to the specified range'
+  'mget:get the values of all the given keys'
+  'monitor:listen for all requests received by the server in real time'
+  'move:move a key to another database'
+  'mset:set multiple keys to multiple values'
+  'msetnx:set multiple keys to multiple values, only if none of the keys exist'
+  'multi:mark the start of a transaction block'
+  'object:inspect the internals of Redis objects'
+  'persist:remove the expiration from a key'
+  'ping:ping the server'
+  'psubscribe:listen for messages published to channels matching the given patterns'
+  'publish:post a message to a channel'
+  'punsubscribe:stop listening for messages posted to channels matching the given patterns'
+  'quit:close the connection'
+  'randomkey:return a random key from the keyspace'
+  'rename:rename a key'
+  'renamenx:rename a key, only if the new key does not exist'
+  'rpop:remove and get the last element in a list'
+  'rpoplpush:remove the last element in a list, append it to another list and return it'
+  'rpush:append a value to a list'
+  'rpushx:append a value to a list, only if the list exists'
+  'sadd:add a member to a set'
+  'save:synchronously save the dataset to disk'
+  'scard:get the number of members in a set'
+  'sdiff:subtract multiple sets'
+  'sdiffstore:subtract multiple sets and store the resulting set in a key'
+  'select:change the selected database for the current connection'
+  'set:set the string value of a key'
+  'setbit:sets or clears the bit at offset in the string value stored at key'
+  'setex:set the value and expiration of a key'
+  'setnx:set the value of a key, only if the key does not exist'
+  'setrange:overwrite part of a string at key starting at the specified offset'
+  'shutdown:synchronously save the dataset to disk and then shut down the server'
+  'sinter:intersect multiple sets'
+  'sinterstore:intersect multiple sets and store the resulting set in a key'
+  'sismember:determine if a given value is a member of a set'
+  'slaveof:make the server a slave of another instance, or promote it as master'
+  'smembers:get all the members in a set'
+  'smove:move a member from one set to another'
+  'sort:sort the elements in a list, set or sorted set'
+  'spop:remove and return a random member from a set'
+  'srandmember:get a random member from a set'
+  'srem:remove a member from a set'
+  'strlen:get the length of the value stored in a key'
+  'subscribe:listen for messages published to the given channels'
+  'sunion:add multiple sets'
+  'sunionstore:add multiple sets and store the resulting set in a key'
+  'ttl:get the time to live for a key'
+  'type:determine the type stored at key'
+  'unsubscribe:stop listening for messages posted to the given channels'
+  'unwatch:forget about all watched keys'
+  'watch:watch the given keys to determine execution of the MULTI/EXEC block'
+  'zadd:add a member to a sorted set, or update its score if it already exists'
+  'zcard:get the number of members in a sorted set'
+  'zcount:count the members in a sorted set with scores within the given values'
+  'zincrby:increment the score of a member in a sorted set'
+  'zinterstore:intersect multiple sorted sets and store the resulting sorted set in a new key'
+  'zrange:return a range of members in a sorted set, by index'
+  'zrangebyscore:return a range of members in a sorted set, by score'
+  'zrank:determine the index of a member in a sorted set'
+  'zrem:remove a member from a sorted set'
+  'zremrangebyrank:remove all members in a sorted set within the given indexes'
+  'zremrangebyscore:remove all members in a sorted set within the given scores'
+  'zrevrange:return a range of members in a sorted set, by index, with scores ordered from high to low'
+  'zrevrangebyscore:return a range of members in a sorted set, by score, with scores ordered from high to low'
+  'zrevrank:determine the index of a member in a sorted set, with scores ordered from high to low'
+  'zscore:get the score associated with the given member in a sorted set'
+  'zunionstore:add multiple sorted sets and store the resulting sorted set in a new key'
+)
+
+local expl
+
+_arguments \
+  '(-v --version)'{-v,--version}'[show version]' \
+  '(-h --help)'{-h,--help}'[show help]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "redis-cli subcommand" _1st_arguments
+  return
+fi
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_rfkill b/zsh/modules/completion/external/src/_rfkill
new file mode 100644
index 0000000..1c88133
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rfkill
@@ -0,0 +1,102 @@
+#compdef rfkill
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Vincent Bernat <bernat@luffy.cx>
+# Copyright (c) 2014 Github zsh-users - http://github.com/zsh-users
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+# Completion script for rfkill (http://wireless.kernel.org/en/users/Documentation/rfkill)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Vincent Bernat <bernat@luffy.cx>
+#
+# ------------------------------------------------------------------------------
+
+_rfkill_types() {
+  declare -a devicetypes
+  devicetypes=(all
+    "wifi:Wireless LAN" "wlan:Wireless LAN"
+    "bluetooth:Bluetooth"
+    "uwb:Ultrawide Band"
+    "ultrawideband:Ultrawide Band"
+    "wimax:Wimax"
+    "wwan:3G"
+    "gps:GPS"
+    "fm:FM Radio"
+    "nfc:NFC")
+  _describe -t device-types "device types" devicetypes
+}
+
+_rfkill_devices() {
+  declare -a devices
+  devices=(${(M)${(f)"$(rfkill list)"}:#[0-9]*})
+  _rfkill_types
+  _describe -t devices "devices" devices
+}
+
+_rfkill_commands () {
+  declare -a subcommands
+  subcommands=(help event list block unblock)
+  _describe -t rfkill-commands "rfkill command" subcommands
+}
+
+_rfkill_subcommand () {
+  case "$words[1]" in
+    (help|event)
+      ;;
+    (list)
+      _arguments ':types:_rfkill_types'
+      ;;
+    (block|unblock)
+      _arguments ':device:_rfkill_devices'
+      ;;
+    (*)
+      _message 'Unknown subcommand'
+  esac
+}
+
+_rfkill () {
+  local curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  _arguments -C \
+    '--version[get version]:' \
+    '(-): :->command' \
+    '(-)*:: :->arguments'
+
+  case $state in
+    (command)
+      _rfkill_commands
+      ;;
+    (arguments)
+      curcontext=${curcontext%:*:*}:rfkill-$words[1]:
+      _rfkill_subcommand
+      ;;
+  esac
+}
+
+_rfkill "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_rkt b/zsh/modules/completion/external/src/_rkt
new file mode 100644
index 0000000..dd5c442
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rkt
@@ -0,0 +1,287 @@
+#compdef rkt
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for rkt (https://coreos.com/rkt/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+typeset -A opt_args
+autoload -U regexp-replace
+
+_rkt() {
+  _arguments \
+    '--debug[print out more debug information to stderr]' \
+    '--dir=[rkt data directory]:data directory:_files -/' \
+    '--insecure-options=[comma-separated list of security features to disable]:option:{_values -s , none image tls ondisk http all}' \
+    '--local-config=[local configuration directory]:configuration directory:_files -/' \
+    '--system-config=[system configuration directory]:configuration directory:_files -/' \
+    '--trust-keys-from-https[automatically trust gpg keys fetched from https]' \
+    '--user-config=[user configuration directory]:configuration directory:_files -/' \
+    '--help' \
+    '1: :_rkt_cmds' \
+    '*:: :->rkt_cmd_args'
+
+  case $state in
+    rkt_cmd_args)
+      case $words[1] in
+        help)
+          _arguments \
+            '1: :_rkt_cmds' \
+            '*:: :->rkt_help_args' \
+            ;;
+
+        api-service)
+          _arguments \
+            '--listen=[address to listen for client API requests]:address' \
+            ;;
+
+        cat-manifest)
+          _arguments \
+            '--pretty-print[apply indent to format the output]' \
+            ;;
+
+        config)
+          _arguments \
+            '--pretty-print[apply indent to format the output]' \
+            ;;
+
+        enter)
+          _arguments \
+            '--app=:appname' \
+            ;;
+
+        export)
+          _arguments \
+            '--app=:appname' \
+            '--overwrite[overwrite output ACI]' \
+            ;;
+
+        fetch)
+          _arguments \
+            '--full[print the full image hash after fetching]' \
+            '--no-store[fetch images ignoring the local store]' \
+            '--signature=[local signature file to use in validating the preceding image]:signature:_files' \
+            '--store-only[use only available images in the store]' \
+            ;;
+
+        gc)
+          _arguments \
+            '--grace-period=[duration to wait before discarding inactive pods from garbage]:duration' \
+            '--expire-prepared=[duration to wait before expiring prepared pods]:duration' \
+            ;;
+
+        image)
+          _arguments \
+            '1: :_rkt_image_cmds' \
+            '*:: :->rkt_image_args'
+            ;;
+
+        list)
+          _arguments \
+            '--full[use long output format]' \
+            '--no-legend[suppress a legend with the list]' \
+            ;;
+
+        metadata-service)
+          _arguments \
+            '--listen-port=[listen port]:port' \
+            ;;
+
+        prepare)
+          # TODO: autocomplete stage1 images
+          _arguments \
+            '--exec=[override the exec command for the preceding image]:command' \
+            '--inherit-env[inherit all environment variables not set by apps]' \
+            '--mount=[mount point binding a volume to a path within an app]:mount point' \
+            '--no-overlay[disable overlay filesystem]' \
+            '--no-store[fetch images ignoring the local store]' \
+            '--pod-manifest=[the path to the pod manifest]:manifest:_files' \
+            '--port=[ports to expose on the host]:NAME\:HOSTPORT' \
+            '--private-users[run within user namespaces]' \
+            '--quiet[suppress superfluous output on stdout, print only the UUID on success]' \
+            '--set-env=[an environment variable to set for apps]:NAME=VALUE' \
+            '--signature=[local signature file to use in validating the preceding image]:signature:_files' \
+            '--stage1-from-dir=[a filename of an image in stage1 images directory to use as stage1]:image' \
+            '--stage1-hash=[a hash of an image to use as stage1]:image hash' \
+            '--stage1-name=[a name of an image to use as stage1]:image name' \
+            '--stage1-path=[a path to an image to use as stage1]:image path:_files' \
+            '--stage1-url=[a URL to an image to use as stage1]:image url' \
+            '--store-only[use only available images in the store]' \
+            '--volume=[volumes to make available in the pod]:volume' \
+            ;;
+
+        rm)
+          _arguments \
+            '--uuid-file=[read pod UUID from file instead of argument]:uuid file:_files' \
+            ;;
+
+        run)
+          _arguments \
+            '--cpu=[cpu limit for the preceding image]:cpu limit' \
+            '--dns=[name servers to write in /etc/resolv.conf]:name servers' \
+            '--dns-opt=[DNS options to write in /etc/resolv.conf]:dns options' \
+            '--dns-search=[DNS search domains to write in /etc/resolv.conf]:search domains' \
+            '--exec=[override the exec command for the preceding image]:command' \
+            "--hostname=[pod's hostname]:hostname" \
+            '--inherit-env[inherit all environment variables not set by apps]' \
+            '--interactive[run pod interactively]' \
+            '--mds-register[register pod with metadata service]' \
+            '--memory=[memory limit for the preceding image]:memory limit' \
+            "--net=[configure the pod's networking]:networks" \
+            '--no-overlay[disable overlay filesystem]' \
+            '--no-store[fetch images ignoring the local store]' \
+            '--pod-manifest=[the path to the pod manifest]:manifest:_files' \
+            '--port=[ports to expose on the host]:NAME\:HOSTPORT' \
+            '--private-users[run within user namespaces]' \
+            '--set-env=[an environment variable to set for apps]:NAME=VALUE' \
+            '--signature=[local signature file to use in validating the preceding image]:signature:_files' \
+            '--stage1-from-dir=[a filename of an image in stage1 images directory to use as stage1]:image' \
+            '--stage1-hash=[a hash of an image to use as stage1]:image hash' \
+            '--stage1-name=[a name of an image to use as stage1]:image name' \
+            '--stage1-path=[a path to an image to use as stage1]:image path:_files' \
+            '--stage1-url=[a URL to an image to use as stage1]:image url' \
+            '--store-only[use only available images in the store]' \
+            '--uuid-file-save=[write out pod UUID to specified file]:uuid file:_files' \
+            '--volume=[volumes to make available in the pod]:volume' \
+            ;;
+
+        run-prepared)
+          _arguments \
+            '--dns=[name servers to write in /etc/resolv.conf]:name servers' \
+            '--dns-opt=[DNS options to write in /etc/resolv.conf]:dns options' \
+            '--dns-search=[DNS search domains to write in /etc/resolv.conf]:search domains' \
+            "--hostname=[pod's hostname]:hostname" \
+            '--interactive[run pod interactively]' \
+            '--mds-register[register pod with metadata service]' \
+            "--net=[configure the pod's networking]:networks" \
+            ;;
+
+        status)
+          _arguments \
+            '--wait[toggle waiting for the pod to exit]' \
+            ;;
+
+        trust)
+          _arguments \
+            '--insecure-allow-http[allow HTTP use for key discovery and/or retrieval]' \
+            '--prefix=[prefix to limit trust to]:prefix' \
+            '--root[add root key from filesystem without a prefix]' \
+            '--skip-fingerprint-review[accept key without fingerprint confirmation]' \
+            ;;
+      esac
+      ;;
+  esac
+
+  case $state in
+    rkt_help_args)
+      case $words[1] in
+        image)
+          _arguments \
+            '1: :_rkt_image_cmds'
+            ;;
+      esac
+      ;;
+
+    rkt_image_args)
+      case $words[1] in
+        cat-manifest)
+          _arguments \
+            '--pretty-print[apply indent to format the output]' \
+            ;;
+
+        gc)
+          _arguments \
+            '--grace-period=[duration to wait before discarding inactive pods from garbage]:duration' \
+            ;;
+
+        list)
+          _arguments \
+            '--fields=[comma-separated list of fields to display]:fields:{_values -s , id name importtime lastused size latest}' \
+            '--full[use long output format]' \
+            '--no-legend[suppress a legend with the list]' \
+            ;;
+
+        rm)
+          _arguments \
+            ':image' \
+            ;;
+      esac
+      ;;
+  esac
+}
+
+_rkt_cmds() {
+  local -a commands
+  commands=(
+    'api-service:Run API service'
+    'cat-manifest:Inspect and print the pod manifest'
+    'config:Print configuration for each stage in JSON format'
+    'enter:Enter the namespaces of an app within a rkt pod'
+    'export:Export an app from an exited pod to an ACI file'
+    'fetch:Fetch image(s) and store them in the local store'
+    'gc:Garbage collect rkt pods no longer in use'
+    'image:Operate on image(s) in the local store'
+    'list:List pods'
+    'metadata-service:Run metadata service'
+    'prepare:Prepare to run image(s) in a pod in rkt'
+    'rm:Remove all files and resources associated with an exited pod'
+    'run:Run image(s) in a pod in rkt'
+    'run-prepared:Run a prepared application pod in rkt'
+    'status:Check the status of a rkt pod'
+    'trust:Trust a key for image verification'
+    'version:Print the version and exit'
+    'help:Help about any command'
+  )
+  _describe 'command' commands
+}
+
+_rkt_image_cmds() {
+  local -a commands
+  commands=(
+    'cat-manifest:Inspect and print the image manifest'
+    'gc:Garbage collect local store'
+    'list:List images in the local store'
+    'rm:Remove image(s) with the given ID(s) or name(s) from the local store'
+  )
+  _describe 'command' commands
+}
+
+_rkt "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_rspec b/zsh/modules/completion/external/src/_rspec
new file mode 100644
index 0000000..2ffb196
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rspec
@@ -0,0 +1,103 @@
+#compdef rspec
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for RSpec (http://rspec.info/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Kazuya Takeshima (https://github.com/mitukiii)
+#
+# ------------------------------------------------------------------------------
+
+
+_rspec() {
+  local context state line curcontext="$curcontext"
+
+  _arguments -C \
+    -I'[Specify PATH to add to $LOAD_PATH (may be used more than once)]:PATH:_files' \
+    '*'{-r,--require}'[Require a file]:PATH:_files' \
+    '*'{-O,--options}'[Specify the path to a custom options file]:PATH:_files' \
+    --order'[Run examples by the specified order type]: :->order' \
+    --seed'[Equivalent of --order rand:SEED]: :_guard "[[\:digit\:]]#" "SEED"' \
+    --fail-fast'[Abort the run on first failure]' \
+    --no-fail-fast'[Do not abort the run on first failure]' \
+    --failure-exit-code'[Override the exit code used when there are failing specs]: :_guard "[[\:digit\:]]#" "CODE"' \
+    --dry-run'[Print the formatter output of your suite without running any examples or hooks]' \
+    '(-X --drb)'{-X,--drb}'[Run examples via DRb]' \
+    --drb-port'[Port to connect to the DRb server]: :_guard "[[\:digit\:]]#" "PORT"' \
+    '(-f --format)'{-f,--format}'[Choose a formatter]:FORMATTER:(progress documentation html json)' \
+    '(-o --out)'{-o,--out}'[Write output to a file instead of $stdout]:FILE:_files' \
+    --deprecation-out'[Write deprecation warnings to a file instead of $stderr]:FILE:_files' \
+    '(-b --backtrace)'{-b,--backtrace}'[Enable full backtrace]' \
+    '(-c --color)'{-c,--color}'[Enable color in the output]' \
+    '(-p --profile)'{-p,--profile}'[Enable profiling of examples and list the slowest examples (default: 10)]: :_guard "[[\:digit\:]]#" "COUNT"' \
+    '(-w --warnings)'{-w,--warnings}'[Enable ruby warnings]' \
+    '(-P --pattern)'{-P,--pattern}'[Load files matching pattern (default: "spec/**/*_spec.rb")]:PATTERN:' \
+    --exclude-pattern'[Load files except those matching pattern]:PATTERN:' \
+    '(-e --example)'{-e,--example}'[Run examples whose full nested names include STRING (may be used more than once)]:STRING:' \
+    '(-t --tag)'{-t,--tag}'[Run examples with the specified tag, or exclude examples by adding ~ before the tag]: :->tag' \
+    --default-path'[Set the default path where RSpec looks for examples (can be a path to a file or a directory)]:PATH:_files' \
+    '(- *)'--init'[Initialize your project with RSpec]' \
+    '(- *)'{-h,--help}"[You're looking at it]" \
+    '(- *)'{-v,--version}'[Display the version]' \
+    '*:files or directories:_files'
+
+  case "$state" in
+    order)
+      if compset -P '*:'; then
+        _guard '[[:digit:]]#' 'SEED'
+      else
+        _values 'TYPE[:SEED]' \
+          defined'[examples and groups are run in the order they are defined]' \
+          rand'[randomize the order of groups and examples]' \
+          random'[alias for rand]'
+      fi
+      ;;
+    tag)
+      if compset -P '*:'; then
+        _message 'VALUE'
+      else
+        _message 'TAG[:VALUE]'
+      fi
+      ;;
+  esac
+}
+
+_rspec "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_rsvm b/zsh/modules/completion/external/src/_rsvm
new file mode 100644
index 0000000..d6de50c
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rsvm
@@ -0,0 +1,88 @@
+#compdef rsvm
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for rsvm (https://github.com/sdepold/rsvm).
+#  Adapted from Docker Machine completion by hhatto (https://github.com/ilkka)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * michaelmior (https://github.com/michaelmior)
+#
+# ------------------------------------------------------------------------------
+
+# helper function for completing available rusts
+__rusts() {
+  declare -a rusts_cmd
+  rusts_cmd=($(ls "$HOME/.rsvm/versions"))
+  _describe 'rusts' rusts_cmd
+}
+
+# subcommands
+local -a _rsvm_cmds
+
+_rsvm_cmds=(
+   'help:Show a help message' \
+   'install:Download and install a version' \
+   'uninstall:Uninstall a version' \
+   'use:Activate a version for now and the future' \
+   'ls:List all installed versions of rust' \
+   'ls-remote:List remote versions available for install' \
+   'ls-channel:Print a channel version available for install' \
+)
+
+# subcommand completion functions
+__uninstall() {
+  __rusts
+}
+
+__use() {
+  __rusts
+}
+
+# common args
+_arguments \
+  '--help[show help]' \
+  '--version[print the version]' \
+  '*:: :->command'
+
+# start rusts!
+if (( CURRENT == 1 )); then
+  _describe -t commands 'rsvm command' _rsvm_cmds
+fi
+
+local -a _command_args
+case "$words[1]" in
+  uninstall)
+    __uninstall ;;
+  use)
+    __use ;;
+esac
diff --git a/zsh/modules/completion/external/src/_rubocop b/zsh/modules/completion/external/src/_rubocop
new file mode 100644
index 0000000..8be7be5
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rubocop
@@ -0,0 +1,83 @@
+#compdef rubocop
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for rubocop (https://github.com/bbatsov/rubocop)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+_rubocop_format_params() {
+  _values \
+    'FORMATTER' \
+    'progress' \
+    'simple' \
+    'clang' \
+    'disabled' \
+    'fuubar' \
+    'emacs' \
+    'json' \
+    'files' \
+    'offenses'
+}
+
+_arguments -C \
+  '(--only)--only[Run only the given cop(s)]' \
+  '(-c --config)'{-c,--config}'[Specify configuration file]' \
+  '(--auto-gen-config)--auto-gen-config[Generate a configuration file acting as a TODO list]' \
+  '(--force-exclusion)--force-exclusion[Force excluding files specified in the configuration `Exclude` even if they are explicitly passed as arguments]' \
+  '(-f --format)'{-f,--format}'[Choose an output formatter.]:FORMATTER:_rubocop_format_params' \
+  '(-o --out)'{-o,--out}'[Write output to a file instead of STDOUT]' \
+  '(-r --require)'{-r,--require}'[Require Ruby file.]' \
+  '(--fail-level)--fail-level[Minimum severity for exit with error code.]' \
+  '(--show-cops)--show-cops[Shows the given cops, or all cops by default, and their configurations for the current directory.]' \
+  '(-F --fail-fast)'{-f,--fail-fast}'[Inspect files in order of modification time ant stop after the first file containing offenses]' \
+  '(-d --debug)'{-d,--debug}'[Display debug info]' \
+  '(-D --display-cop-names)'{-D,--display-cop-names}'[Display cop names in offense messages.]' \
+  '(-R --rails)'{-R,--rails}'[Run extra Rails cops.]' \
+  '(-l --lint)'{-l,--lint}'[Run only lint cops.]' \
+  '(-a --auto-correct)'{-a,--auto-correct}'[Auto-correct offenses.]' \
+  '(-n --no-color)'{-n,--no-color}'[Disable color output.]' \
+  '(-v --version)'{-v,--version}'[Disable version.]' \
+  '(-V --verbose-version)'{-V,--verbose-version}'[Disable verbose version.]' \
+  '(-h --help)'{-h,--help}'[Show help.]' \
+  '*: :_files' && ret=0
+
+return ret
diff --git a/zsh/modules/completion/external/src/_rvm b/zsh/modules/completion/external/src/_rvm
new file mode 100644
index 0000000..390e0f5
--- /dev/null
+++ b/zsh/modules/completion/external/src/_rvm
@@ -0,0 +1,142 @@
+#compdef rvm
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2011 Wayne E. Seguin
+# Copyright (c) 2011-2015 Michal Papis
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for rvm (https://rvm.beginrescueend.com/).
+#
+#  Source: https://github.com/rvm/rvm/blob/master/scripts/extras/completion.zsh/_rvm
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Bruno Michel (https://github.com/nono)
+#
+# ------------------------------------------------------------------------------
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+  '(- 1 *)'{-v,--version}'[display version information]' \
+  '(-l --level)'{-l,--level}'+[patch level to use with rvm use / install]:number' \
+  '--bin[path for binaries to be placed (~/.rvm/bin/)]:path:_files' \
+  '--source[src directory to use (~/.rvm/src/)]:path:_files' \
+  '--archives[directory for downloaded files (~/.rvm/archives/)]:path:_files' \
+  '-S[Specify a script file to attempt to load and run (rubydo)]:file:_files' \
+  '-e[Execute code from the command line]:code' \
+  '-G[root gem path to use]:path:_files' \
+  '--gems[Used to set the gems_flag, use with remove to remove gems]' \
+  '--archive[Used to set the archive_flag, use with remove to remove archive]' \
+  '--patch[With MRI Rubies you may specify one or more full paths to patches]:paths:->patches' \
+  '(-C --configure)'{-C,--configure}'=[custom configure options]' \
+  '--nice[process niceness (for slow computers, default 0)]:number' \
+  '--ree-options[Options passed directly to ree ./installer on the command line]:options' \
+  '--head[with update, updates rvm to git head version]' \
+  '--rubygems[with update, updates rubygems for selected ruby]' \
+  '--default[with ruby select, sets a default ruby for new shells]' \
+  '--debug[Toggle debug mode on for very verbose output]' \
+  '--trace[Toggle trace mode on to see EVERYTHING rvm is doing]' \
+  '--force[Force install, even given ruby is already install]' \
+  '--summary[Used with rubydo to print out a summary of the commands run]' \
+  '--latest[with gemset --dump skips version strings for latest gem]' \
+  '--gems[with uninstall/remove removes gems with the interpreter]' \
+  '--docs[with install, attempt to generate ri after installation]' \
+  '--reconfigure[Force ./configure on install even if Makefile already exists]' \
+  '1: :->cmds' \
+  '*: :->args' && ret=0
+
+case $state in
+
+  patches)
+    compset -P '*,'
+    compset -S ',*'
+    _files -q -S ,
+    ;;
+
+  cmds)
+
+    cmds=( ${(f)"$(_call_program commands rvm help 2> /dev/null | __rvm_sed -e '/^== Action/,/^== Implementation/!d; / :: /!d; s/^[ *]*\([^ ]*\) *:: *\(.*\)/\1:\2/')"} )
+    cmds+=( $(rvm list strings) )
+    _describe -t commands 'rvm command' cmds && ret=0
+    ;;
+
+  args)
+
+    case $line[1] in
+
+      (use|uninstall|remove|list)
+
+        if (( CURRENT == 3 )); then
+          # See if we’ve made it to the ‘@’; eg, 1.9.2@
+          if ! __rvm_grep '@' <<< "${line[CURRENT-1]}" >/dev/null ; then
+            _values -S , 'rubies' \
+              $(rvm list strings | __rvm_sed -e 's/ruby-\([^) ]*\)-\([^) ]*\)/ruby-\1-\2 \1-\2 \1/g') \
+              default system $(rvm alias list names) && ret=0
+          else
+            # Construct a full version string for each of the gemsets.
+            # Eg, 1.9.2@min 1.9.2@rail3 …
+            _values -S , 'gemsets' \
+              $(rvm ${line[CURRENT-1]%%@*} gemset list | __rvm_awk '/^[ -_[:alnum:]]+$/ {print "'${line[CURRENT-1]%%@*}'@"$1}')
+          fi
+        fi
+        ;;
+
+      (install|fetch)
+
+        _values -S , 'rubies' $(rvm list known_strings) && ret=0
+        ;;
+
+      gemset)
+
+        if (( CURRENT == 3 )); then
+          _values 'gemset_commands' $(rvm gemset help | __rvm_sed -e '/create/!d; s/^.*[{]\(.*\)[}].*$/\1/; s/,/ /g')
+        else
+          #_values -S , 'gemsets' $(rvm gemset list | __rvm_grep -v gemset 2>/dev/null)
+          _values -S , 'gemsets' $(rvm gemset list | __rvm_grep -Ev '(gemset|info)' 2>/dev/null | __rvm_awk '/^[ -_[:alnum:]]+$/ {print '$1'}')
+        fi
+        ret=0
+        ;;
+
+      package)
+
+        if (( CURRENT == 3 )); then
+          _values 'package_commands' $(rvm package | __rvm_sed -e '/Usage/!d; s/^.*[{]\(.*\)[}] [{].*$/\1/; s/,/ /g')
+        else
+          _values 'packages' $(rvm package | __rvm_sed -e '/Usage/!d; s/^.*[}] [{]\(.*\)[}].*$/\1/; s/,/ /g')
+        fi
+        ret=0
+        ;;
+
+      *)
+        (( ret )) && _message 'no more arguments'
+        ;;
+
+    esac
+    ;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_sbt b/zsh/modules/completion/external/src/_sbt
new file mode 100644
index 0000000..f2de6e9
--- /dev/null
+++ b/zsh/modules/completion/external/src/_sbt
@@ -0,0 +1,93 @@
+#compdef sbt
+# ------------------------------------------------------------------------------
+# Copyright (c) 2013 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for sbt 0.12+ (http://scala-sbt.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Tony Sloane <inkytonik@gmail.com>
+#  * Mirko Caserta <mirko.caserta@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local -a _sbt_commands
+_sbt_commands=(
+  'clean:delete files produced by the build'
+  'compile:compile sources'
+  'console:start the Scala REPL with project classes on the classpath'
+  'console-quick:start the Scala REPL with project deps on the classpath'
+  'console-project:start the Scala REPL w/sbt+build-def on the classpath'
+  'dist:generate distribution artifacts'
+  'dist\:clean:clean distribution artifacts'
+  'doc:generate API documentation'
+  'gen-idea:generate Intellij Idea project files'
+  'package:produce the main artifact, such as a binary jar'
+  'package-doc:produce a doc artifact, such as a jar containing API docs'
+  'package-src:produce a source artifact, such as a jar containing sources'
+  'publish:publish artifacts to a repository'
+  'publish-local:publish artifacts to the local repository'
+  'run:run a main class'
+  'run-main:run the main class selected by the first argument'
+  'test:execute all tests'
+  'test-only:execute the tests provided as arguments'
+  'test-quick:execute previously failed tests'
+  'update:resolve and optionally retrieve dependencies'
+)
+
+local expl
+
+_arguments \
+  '(-help)-h[prints an help message]' \
+  '(-h)-help[prints an help message]' \
+  '(-verbose)-v[this runner is chattier]' \
+  '(-v)-verbose[this runner is chattier]' \
+  '(-debug)-d[set sbt log level to debug]' \
+  '(-d)-debug[set sbt log level to debug]' \
+  '-no-colors[disable ANSI color codes]' \
+  '-sbt-create[start even if current dir contains no sbt project]' \
+  '-sbt-dir[path to global settings/plugins dir (default: ~/.sbt)]' \
+  '-sbt-boot[path to shared boot dir (default: ~/.sbt/boot)]' \
+  '-ivy[path to local Ivy repository (default: ~/.ivy2)]' \
+  '-mem[set memory options]' \
+  '-no-share[use all local caches; no sharing]' \
+  '-no-global[use global caches, but do not use global ~/.sbt dir]' \
+  '-jvm-debug[turn on JVM debugging, open at the given port]' \
+  '-batch[disable interactive mode]' \
+  '-sbt-version[use the specified version of sbt]' \
+  '-sbt-jar[use the specified jar as the sbt launcher]' \
+  '(-sbt-snapshot)-sbt-rc[use an RC version of sbt]' \
+  '(-sbt-rc)-sbt-snapshot[use a snapshot version of sbt]' \
+  '-java-home[alternate JAVA_HOME]' \
+  '*:: :->subcmds' && return 0
+
+_describe -t commands "sbt subcommand" _sbt_commands
+return 0
diff --git a/zsh/modules/completion/external/src/_scala b/zsh/modules/completion/external/src/_scala
new file mode 100644
index 0000000..c4ccb37
--- /dev/null
+++ b/zsh/modules/completion/external/src/_scala
@@ -0,0 +1,249 @@
+#compdef scala scalac
+# ------------------------------------------------------------------------------
+# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for scala and scalac (http://www.scala-lang.org/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Tony Sloane <inkytonik@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+typeset -A opt_args
+local context state line
+
+_scala_features () {
+   compadd "postfixOps" "reflectiveCalls" "implicitConversions" "higherKinds" \
+     "existentials" "experimental.macros" "_"
+}
+
+_scala_phases () {
+   compadd "parser" "namer" "packageobjects" "typer" "patmat" "superaccessors" \
+     "extmethods" "pickler" "refchecks" "selectiveanf" "selectivecps" "uncurry" \
+     "tailcalls" "specialize" "explicitouter" "erasure" "posterasure" "lazyvals" \
+     "lambdalift" "constructors" "flatten" "mixin" "cleanup" "icode" "inliner" \
+     "inlineExceptionHandlers" "closelim" "dce" "jvm" "terminal"
+}
+
+local -a shared_opts
+shared_opts=(
+  "-bootclasspath+[Override location of bootstrap class files]:bootstrap class directory:_files -/"
+  "-classpath+[Specify where to find user class files]:directory:_files -/"
+  "-D-[Pass -Dproperty=value directly to the runtime system]"
+  "-d+[Destination for generated classfiles]: directory or jar file:_files"
+  "-dependencyfile+[Set dependency tracking file]:dependency tracking file:_files"
+  "-deprecation[Emit warning and location for usages of deprecated APIs]"
+  "-encoding+[Specify character encoding used by source files]:encoding:"
+  "-explaintypes[Explain type errors in more detail]"
+  "-extdirs+[Override location of installed extensions]:extensions directory:_files -/"
+  "-g\:-[Set level of generated debugging info (default\: vars)]:debugging info level:(none source line vars notailcalls)"
+  "-help[Print a synopsis of standard options]"
+  "-J-[pass argument directly to Java runtime system]:JVM argument:"
+  "-javabootclasspath+[Override java boot classpath]:Java boot class path directory]:_files -/"
+  "-javaextdirs+[Override java extdirs classpath]:Java extdirs directory:_files -/"
+  "-language\:-[Enable one or more language features]:feature:_scala_features"
+  "-no-specialization[Ignore @specialize annotations]"
+  "-nobootcp[Do not use the boot classpath for the scala jars]"
+  "-nowarn[Generate no warnings]"
+  "-optimise[Generate faster bytecode by applying optimisations to the program]"
+  "-P\:-[Pass an option to a plugin (written plugin\:opt)]:plugin option:"
+  "-print[Print program with Scala-specific features removed]"
+  "-sourcepath+[Specify location(s) of source files]:source file directory:_files -/"
+  "-target\:-[Target platform for object files (default\: jvm-1.5)]:platform name:(jvm-1.5 msil)"
+  "-toolcp+[Add to the runner classpath]:directory:_files -/"
+  "-unchecked[Enable detailed unchecked (erasure) warnings]"
+  "-uniqid[Uniquely tag all identifiers in debugging output]"
+  "-usejavacp[Utilize the java.class.path in classpath resolution]"
+  "-verbose[Output messages about what the compiler is doing]"
+  "-version[Print product version and exit]"
+  "-X[Print a synopsis of advanced options]"
+  "-Y[Print a synopsis of private options]"
+)
+
+local -a X_opts
+X_opts=(
+  "-Xcheck-null[Warn upon selection of nullable reference]"
+  "-Xcheckinit[Wrap field accessors to throw an exception on uninitialized access]"
+  "-Xdisable-assertions[Generate no assertions or assumptions]"
+  "-Xelide-below+[Calls to @elidable methods are omitted if method priority is lower than integer argument]"
+  "-Xexperimental[Enable experimental extensions]"
+  "-Xfatal-warnings[Fail the compilation if there are any warnings]"
+  "-Xfull-lubs[Retains pre 2.10 behavior of less aggressive truncation of least upper bounds]"
+  "-Xfuture[Turn on future language features]"
+  "-Xgenerate-phase-graph+[Generate the phase graphs (outputs .dot files) to fileX.dot]:output file:_files"
+  "-Xlint[Enable recommended additional warnings]"
+  "-Xlog-free-terms[Print a message when reification creates a free term]"
+  "-Xlog-free-types[Print a message when reification resorts to generating a free type]"
+  "-Xlog-implicits[Show more detail on why some implicits are not applicable]"
+  "-Xlog-implicit-conversions[Print a message whenever an implicit conversion is inserted]"
+  "-Xlog-reflective-calls[Print a message when a reflective method call is generated]"
+  "-Xmacro-settings\:-[Custom settings for macros]:option"
+  "-Xmain-class+[Class for manifest's Main-Class entry (only useful with -d jar)]:path:"
+  "-Xmax-classfile-name+[Maximum filename length for generated classes]"
+  "-Xmigration[Warn about constructs whose behavior may have changed]"
+  "-Xno-forwarders[Do not generate static forwarders in mirror classes]"
+  "-Xno-patmat-analysis[Don't perform exhaustivity/unreachability analysis. Also, ignore @switch annotation]"
+  "-Xno-uescape[Disable handling of \u unicode escapes]"
+  "-Xnojline[Do not use JLine for editing]"
+  "-Xoldpatmat[Use the pre-2.10 pattern matcher. Otherwise, the 'virtualizing' pattern matcher is used in 2.10]"
+  "-Xprint\:-[Print out program after <phase>]:phase name:_scala_phases"
+  "-Xprint-icode\:-[Log internal icode to *.icode files after phase (default\: icode)]:phase name:_scala_phases"
+  "-Xprint-pos[Print tree positions, as offsets]"
+  "-Xprint-types[Print tree types (debugging option)]"
+  "-Xprompt[Display a prompt after each error (debugging option)]"
+  "-Xresident[Compiler stays resident: read source filenames from standard input]"
+  "-Xscript+[Treat the source file as a script and wrap it in a main method]:main object name"
+  "-Xshow-class+[Show internal representation of class]:class name"
+  "-Xshow-object+[Show internal representation of object]:object name"
+  "-Xshow-phases[Print a synopsis of compiler phases]"
+  "-Xsource-reader+[Specify a class name for a custom method of reading source files]:class name"
+  "-Xverify[Verify generic signatures in generated bytecode]"
+
+  "-Xassem-extdirs+[List of directories containing assemblies (requires -target:msil) (default\: lib)]:assembly directory:_files -/"
+  "-Xassem-name+[Name of the output assembly (requires -target:msil)]:assembly name:_files"
+  "-Xassem-path+[List of assemblies referenced by the program (requires -target:msil)]:assembly path:_files"
+  "-Xsourcedir+[Mirror source folder structure in output directory (requires -target:msil)]:source directory:_files -/"
+
+  "-Xplugin\:-[Load one or more plugins from file]:plugin file:_files"
+  "-Xpluginsdir+[Path to search compiler plugins]:plugin directory:_files -/"
+  "-Xplugin-list[Print a synopsis of loaded plugins]"
+  "-Xplugin-disable\:-[Disable the given plugin(s)]"
+  "-Xplugin-require\:-[Abort unless the given plugin(s) are available]"
+)
+
+local -a Y_opts
+Y_opts=(
+  "-Y[Print a synopsis of private options]"
+  "-Ybuild-manager-debug[Generate debug information for the Refined Build Manager compiler]"
+  "-Ybuilder-debug\:-[Compile using the specified build manager (default\: none)]:build manager:(none refined simple)"
+  "-Yclosure-elim[Perform closure elimination]"
+  "-Ycompact-trees[Use compact tree printer when displaying trees]"
+  "-Ydead-code[Perform dead code elimination]"
+  "-Ydependent-method-types[Allow dependent method types]"
+  "-Ydump-classes+[Dump the generated bytecode to .class files (useful for reflective compilation that utilizes in-memory classloaders)]:output directory:_files -/"
+  "-Yeta-expand-keeps-star[Eta-expand varargs methods to T* rather than Seq[T].  This is a temporary option to ease transition.]"
+  "-Ygen-javap+[Generate a parallel output directory of .javap files]:output directory:_files -/"
+  "-Yinfer-argument-types[Infer types for arguments of overriden methods]"
+  "-Yinline[Perform inlining when possible]"
+  "-Yinline-handlers[Perform exception handler inlining when possible]"
+  "-Yinline-warnings[Emit inlining warnings (normally surpressed due to high volume)]"
+  "-Yinvalidate+[Invalidate classpath entry before run]:classpath entry"
+  "-Ylinearizer\:-[Linearizer to use (default\: rpo)]:linearizer:(normal dfs rpo dump)"
+  "-Ylog-classpath[Output information about what classpath is being applied]"
+  "-Yno-adapted-args[Do not adapt an argument list (either by inserting unit or creating a tuple) to match the receiver]"
+  "-Ymacro-debug-lite[Trace essential macro-related activities]"
+  "-Ymacro-debug-verbose[Trace all macro-related activities: compilation, generation of synthetics, classloading, expansion, exceptions]"
+  "-Yno-completion[Disable tab-completion in the REPL]"
+  "-Yno-generic-signatures[Suppress generation of generic signatures for Java]"
+  "-Yno-imports[Compile without any implicit imports]"
+  "-Yno-predef[Compile without importing Predef]"
+  "-Yno-self-type-checks[Suppress check for self-type conformance among inherited members]"
+  "-Yno-squeeze[Disable creation of compact code in matching]"
+  "-Ynotnull[Enable (experimental and incomplete) scala.NotNull]"
+  "-Yoverride-objects[Allow member objects to be overridden]"
+  "-Yoverride-vars[Allow vars to be overridden]"
+  "-Ypmat-naive[Desugar matches as naively as possible]"
+  "-Ypresentation-delay+[Wait number of ms after typing before starting typechecking]"
+  "-Ypresentation-log+[Log presentation compiler events into file]:log file:_files"
+  "-Ypresentation-replay+[Replay presentation compiler events from file]:log file:_files"
+  "-Ypresentation-strict[Do not report type errors in sources with syntax errors]"
+  "-Ypresentation-verbose[Print information about presentation compiler tasks]"
+  "-Yprofile-class+[Specify name of profiler class]:profiler class name"
+  "-Yprofile-memory[Heap snapshot after compiler run (requires jgpagent on JVM -agentpath)]"
+  "-Yrangepos[Use range positions for syntax trees]"
+  "-Yrecursion+[Set recursion depth used when locking symbols]"
+  "-Yreify-copypaste[Dump the reified trees in copypasteable representation]"
+  "-Yrepl-sync[Do not use asynchronous code for REPL startup]"
+  "-Yresolve-term-conflict\:-[Resolve term conflicts (default\: error)]:resolution strategy:(package object error)"
+  "-Yself-in-annots[Include a \"self\" identifier inside of annotations]"
+  "-Yshow\:-[Show after <phase> (requires -Xshow-class or -Xshow-object)]:phase name:_scala_phases"
+  "-Yshow-syms[Print the AST symbol hierarchy after each phase]"
+  "-Yshow-symkinds[Print abbreviated symbol kinds next to symbol names]"
+  "-Yshow-trees[Print detailed ASTs (requires -Xprint\:phase)]"
+  "-Yshow-trees-compact[Print detailed ASTs in compact form (requires -Xprint\:)]"
+  "-Yshow-trees-stringified[Print stringifications along with detailed ASTs (requires -Xprint\:)]"
+  "-Ystatistics[Print compiler statistics]"
+  "-Ystruct-dispatch\:-[Structural method dispatch policy (default\: poly-cache)]:policy name:(no-cache mono-cache poly-cache invoke-dynamic)"
+
+  "-Ybrowse\:-[Browse the abstract syntax tree after <phase>]:phase name:_scala_phases"
+  "-Ycheck\:-[Check the tree at the end of <phase>]:phase name:_scala_phases"
+  "-Ylog\:-[Log operations during <phase>]:phase name:_scala_phases"
+  "-Yprofile\:-[Profile CPU usage of given phases (requires jgpagent on JVM -agentpath)]:phase name:_scala_phases"
+  "-Yskip\:-[Skip <phase>]:phase name:_scala_phases"
+  "-Ystop-after\:-[Stop after given phase <phase>]:phase name:_scala_phases"
+  "-Ystop-before\:-[Stop before given phase <phase>]:phase name:_scala_phases"
+
+  "-Ywarn-adapted-args[Warn if an argument list is modified to match the receiver]"
+  "-Ywarn-all[Enable all -Y warnings]"
+  "-Ywarn-dead-code[Warn when dead code is identified]"
+  "-Ywarn-inaccessible[Warn about inaccessible types in method signatures]"
+  "-Ywarn-nullary-override[Warn when non-nullary overrides nullary, e.g. def foo() over def foo]"
+  "-Ywarn-nullary-unit[Warn when nullary methods return Unit]"
+  "-Ywarn-numeric-widen[Warn when numerics are widened]"
+  "-Ywarn-value-discard[Warn when non-Unit expression results are unused]"
+
+  "-Ybuild-manager-debug[Generate debug information for the Refined Build Manager compiler]"
+  "-Ybuilder-debug\:-[Compile using the specified build manager (default\: none)]:manager:(none refined simple)"
+  "-Ycompletion-debug[Trace all tab completion activity]"
+  "-Ydebug[Increase the quantity of debugging output]"
+  "-Ydoc-debug[Trace all scaladoc activity]"
+  "-Yide-debug[Generate, validate and output trees using the interactive compiler]"
+  "-Yinfer-debug[Trace type inference and implicit search]"
+  "-Yissue-debug[Print stack traces when a context issues an error]"
+  "-Ypatmat-debug[Trace pattern matching translation]"
+  "-Ypmat-debug[Trace all pattern matcher activity]"
+  "-Ypos-debug[Trace position validation]"
+  "-Ypresentation-debug[Enable debugging output for the presentation compiler]"
+  "-Yreify-debug[Trace reification]"
+  "-Yrepl-debug[Trace all REPL activity]"
+  "-Ytyper-debug[Trace all type assignments]"
+)
+
+local -a scala_opts
+scala_opts=(
+  "-e+[execute <string> as if entered in the repl]:string" \
+  "-howtorun+[what to run (default\: guess)]:execution mode:(script object jar guess)" \
+  "-i+[preload <file> before starting the repl]:file to preload:_files" \
+  "-nc[no compilation daemon\: do not use the fsc offline compiler]" \
+  "-save[save the compiled script in a jar for future use]"
+)
+
+case $words[$CURRENT] in
+    -X*) _arguments $X_opts;;
+    -Y*) _arguments $Y_opts;;
+      *) case $service in
+           scala)  _arguments $scala_opts $shared_opts "*::filename:_files";;
+           scalac) _arguments $shared_opts "*::filename:_files";;
+         esac
+esac
+
+return 0
diff --git a/zsh/modules/completion/external/src/_scl b/zsh/modules/completion/external/src/_scl
new file mode 100644
index 0000000..e0e0893
--- /dev/null
+++ b/zsh/modules/completion/external/src/_scl
@@ -0,0 +1,106 @@
+#compdef scl
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Software Collections (https://www.softwarecollections.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_scl() {
+  local context curcontext="$curcontext" state line
+  typeset -A opt_args
+
+  local ret=1
+
+  _arguments -C \
+    '1: :_scl_cmds' \
+    "(- : *)"{-h,--help}'[display help information]' \
+    "(- : *)"{-l,--list}'[list installed Software Collections or packages that belong to them]:installed collection:_scl_installed_collections' \
+    '*::arg:->args' \
+  && ret=0
+
+  case $state in
+    (args)
+      curcontext="${curcontext%:*:*}:scl-cmd-$words[1]:"
+      case $line[1] in
+        (register)
+          _arguments '1:Software Collection path:_files -/' && ret=0
+        ;;
+        (deregister)
+          _arguments -C \
+			'1:: :_scl_installed_collections' \
+			'--force[force suppression of the collection]' \
+		 && ret=0
+        ;;
+        (enable)
+          _arguments -C \
+			'1:: :_scl_installed_collections' \
+			'2:command: _command_names -e' \
+		 && ret=0
+        ;;
+        *)
+          _call_function ret _scl_cmd_$words[1] && ret=0
+          (( ret )) && _message 'no more arguments'
+        ;;
+      esac
+    ;;
+  esac
+}
+
+(( $+functions[_scl_cmds] )) ||
+_scl_cmds() {
+  local commands; commands=(
+    'register:register a Software Collection'
+    'deregister:deregister a Software Collection'
+    'enable:enable a Software Collection'
+  )
+  _describe -t commands 'scl command' commands "$@"
+}
+
+(( $+functions[_scl_installed_collections] )) ||
+_scl_installed_collections() {
+  local installed_collections; installed_collections=($(_call_program installed_collections $service --list))
+  _describe -t collections 'Software Collection' installed_collections "$@"
+}
+
+_scl "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_scrub b/zsh/modules/completion/external/src/_scrub
new file mode 100644
index 0000000..2c473e3
--- /dev/null
+++ b/zsh/modules/completion/external/src/_scrub
@@ -0,0 +1,66 @@
+#compdef scrub
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for scrub an utility which iteratively writes patterns on files or disk devices to make retrieving the data more difficult. (http://linux.die.net/man/1/scrub).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_scrub() {
+
+local patterns
+patterns="nnsa dod bsi gutmann schneier pfitzner7 pfitzner33 usarmy fillzero fillff random random2 old fastold"
+
+_arguments -C \
+   "(- 1 *)"{-v,--version}"[Print scrub version and exit.]" \
+   {-r,--remove}"[Remove the file after scrubbing.]" \
+   {-p,--pattern}"[Select  the  patterns to write.]:pattern:($patterns)" \
+   {-b,--blocksize}"[Perform read and write calls using the specified blocksize (in bytes).]:block size:" \
+   {-f,--force}"[Scrub even if target contains signature indicating it has already been scrubbed.]" \
+   {-S,--no-signature}"[Do not write scrub signature.]" \
+   {-X,--freespace}"[Create  specified directory and fill it with files until write returns ENOSPC (file sys‐tem full), then scrub the files as usual.]:directory name:" \
+   {-D,--dirent}"[After scrubbing the file, scrub its name in the directory entry, then rename it  to  the new name.]:new name:" \
+   {-s,--device-size}"[Override the device size (in bytes).]:size:" \
+   {-L,--no-link}"[If file is a symbolic link, do not scrub the link target.]" \
+   {-R,--no-hwrand}"[Don't use a hardware random number generator even if one is available.]" \
+   {-t,--no-threads}"[Don't generate random data in parallel with I/O.]" \
+   {-n,--dry-run}"[Do everything but write to targets.]" \
+   {-h,--help}"[Print a summary of command line options on stderr.]" \
+   '*:files:_files' \
+}
+
+_scrub
+
diff --git a/zsh/modules/completion/external/src/_sdd b/zsh/modules/completion/external/src/_sdd
new file mode 100644
index 0000000..c722095
--- /dev/null
+++ b/zsh/modules/completion/external/src/_sdd
@@ -0,0 +1,66 @@
+#compdef sdd
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for sdd (http://freshmeat.net/projects/sdd/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_values -w 'option' \
+  'if[specify input file]:input file:_tilde_files' \
+  'of[specify output file]:output file:_tilde_files' \
+  '(bs)ibs[input block size]:block size (bytes)' \
+  '(bs)obs[output block size]:block size (bytes)' \
+  '(ibs obs)bs[block size]:block size (bytes)' \
+  'cbs[conversion buffer size]:buffer size (bytes)' \
+  'skip[input/output initially skipped]:bytes' \
+  'seek[input/output initially skipped]:bytes' \
+  'count[number of input blocks to copy]:blocks' \
+  '-notrunc[do not truncate existing output file]' \
+  '-pg[print a dot on each write to indicate progress]' \
+  '-noerror[do not stop on error]' \
+  '-noerrwrite[do not write blocks not read correctly]' \
+  "-noseek[don't seek]" \
+  'try[error retry count]:number' \
+  '-debug[print debugging messages]' \
+  '-fill[fill each record with zeros up to obs]' \
+  '-swab' '-block' '-unblock' '-lcase' '-ucase' '-ascii' '-ebcdic' '-ibm' \
+  '-help[show help]' \
+  '-version[show version]'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_setcap b/zsh/modules/completion/external/src/_setcap
new file mode 100644
index 0000000..6f34a0e
--- /dev/null
+++ b/zsh/modules/completion/external/src/_setcap
@@ -0,0 +1,108 @@
+#compdef setcap
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+#
+# ------------------------------------------------------------------------------
+# Description
+# ------------------------------------------------------------------------------
+#  Completion script for libcap's setcap:
+#  - https://people.redhat.com/sgrubb/libcap-ng/
+#
+# ZSH provides the `zsh/cap` module that does not work on most modern systems,
+# in lieu of this I have written this zsh-completion modules.
+#
+# Written by
+#  - Zephyr Pellerin (https://github.com/zv)
+# ------------------------------------------------------------------------------
+
+local curcontext=$curcontext state line expl ret=1
+local -a args privs operators
+
+args=( '*:file:->files'
+       '1:capability:->capability'
+       '-v[verify]' '-q[quiet]' )
+
+_arguments -C -s "$args[@]" && ret=0
+
+operators=("e:effective" "i:inheritable" "p:permitted")
+
+case "$state" in
+    capability)
+        if compset -P '*?[=+-]'; then
+            _describe -t operators "operator" operators && ret=0
+        else
+            _values -s , capability \
+                    'cap_audit_control[Enable and disable kernel auditing]' \
+                    'cap_audit_read[Allow reading the audit log]' \
+                    'cap_audit_write[Write records to kernel auditing log.]' \
+                    'cap_block_suspend[Employ features that can block system suspend]' \
+                    'cap_chown[Make arbitrary changes to file UIDs and GIDs]' \
+                    'cap_dac_override[Bypass file read, write, and execute permission checks.]' \
+                    'cap_dac_read_search[Bypass file read permission checks]' \
+                    'cap_fowner[Bypass filesystem UID checks, set extended attrs.]' \
+                    "cap_fsetid[Don't clear set-user-ID and set-group-ID permission bits when a file is modified]" \
+                    'cap_ipc_lock[Lock memory]' \
+                    'cap_ipc_owner[Bypass checks on SySV IPC object operations.]' \
+                    'cap_kill[Bypass permission checks for sending signals]' \
+                    'cap_lease[Establish leases on arbitrary files]' \
+                    'cap_linux_immutable[Set immutability or append only]' \
+                    'cap_mac_admin[Override Mandatory Access Control]' \
+                    'cap_mac_override[Allow MAC configuration or state changes.]' \
+                    'cap_mknod[Create special files using mknod(2)]' \
+                    'cap_net_admin[Perform various network-related operations]' \
+                    'cap_net_bind_service[Bind a socket to a privileged ports.]' \
+                    'cap_net_broadcast[Make socket broadcasts and listen to multicast.]' \
+                    'cap_net_raw[Use raw sockets.]' \
+                    'cap_setgid[Manipulate process GIDs.]' \
+                    'cap_setfcap[Set file capabilities.]' \
+                    "cap_setpcap[Grant or remove any capability in the caller's permitted capability set to or from any other process.]" \
+                    'cap_setuid[Manipulate or forge process UIDs]' \
+                    'cap_sys_admin[Perform numerous administrative tasks.]' \
+                    'cap_sys_boot[Reboot]' \
+                    'cap_sys_chroot[Use chroot]' \
+                    'cap_sys_module[Load kernel module.]' \
+                    'cap_sys_nice[Nice or renice processes.]' \
+                    'cap_sys_pacct[Use acct(2).]' \
+                    'cap_sys_ptrace[Inspect processes with ptrace or use process_vm_writev.]' \
+                    'cap_sys_rawio[Numerous device IO functions, including performing raw IO and access x86 MSRs]' \
+                    'cap_sys_resource[Set numerous resource limits]' \
+                    'cap_sys_time[Set system clock]' \
+                    'cap_sys_tty_config[Use vhangup(2)]' \
+                    'cap_syslog[Perform privileged syslog(2) operations.]' \
+                    'cap_wake_alarm[Trigger something that will wake up the system]' && ret=0
+        fi ;;
+    files) _files && ret=0 ;;
+esac
+
+return ret
+
+# Local variables:
+# mode: shell-script
+# sh-basic-offset: 2
+# sh-indent-comment: t
+# indent-tabs-mode: nil
+# End:
+# ex: sw=2 ts=2 et filetype=sh
diff --git a/zsh/modules/completion/external/src/_setup.py b/zsh/modules/completion/external/src/_setup.py
new file mode 100644
index 0000000..c7d88d3
--- /dev/null
+++ b/zsh/modules/completion/external/src/_setup.py
@@ -0,0 +1,715 @@
+#compdef setup.py
+# ------------------------------------------------------------------------------
+# Copyright (C) 2015 by Hideo Hattori <hhatto.jp@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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for setup.py (http://docs.python.org/distutils/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Hideo Hattori (https://github.com/hhatto)
+#
+# ------------------------------------------------------------------------------
+
+_setup.py() {
+  typeset -A opt_args
+  local context state line
+
+  _arguments -s -S \
+    "--verbose[run verbosely (default)]" \
+    "-v[run verbosely (default)]" \
+    "--quiet[run quietly (turns verbosity off)]" \
+    "-q[run quietly (turns verbosity off)]" \
+    "--dry-run[don't actually do anything]" \
+    "-n[don't actually do anything]" \
+    "--help[show detailed help message]" \
+    "-h[show detailed help message]" \
+    "--no-user-cfg[ignore pydistutils.cfg in your home directory]" \
+    "--command-packages=[list of packages that provide distutils commands]" \
+    "--help-commands[list all available commands]" \
+    "--name[print package name]" \
+    "--version[print package version]" \
+    "-V[print package version]" \
+    "--fullname[print <package name>-<version>]" \
+    "--author[print the author's name]" \
+    "--author-email[print the author's email address]" \
+    "--maintainer[print the maintainer's name]" \
+    "--maintainer-email[print the maintainer's email address]" \
+    "--contact[print the maintainer's name if known, else the author's]" \
+    "--contact-email[print the maintainer's email address if known, else the author's]" \
+    "--url[print the URL for this package]" \
+    "--license[print the license of the package]" \
+    "--licence[alias for --license]" \
+    "--description[print the package description]" \
+    "--long-description[print the long package description]" \
+    "--platforms[print the list of platforms]" \
+    "--classifiers[print the list of classifiers]" \
+    "--keywords[print the list of keywords]" \
+    "--provides[print the list of packages/modules provided]" \
+    "--requires[print the list of packages/modules required]" \
+    "--obsoletes[print the list of packages/modules made obsolete]" \
+    "*::setup.py commands:_setuppy_command"
+}
+
+(( $+functions[_setuppy_command] )) ||
+_setuppy_command() {
+  local cmd ret=1
+
+  (( $+setuppy_cmds )) || _setuppy_cmds=(
+    "build:build everything needed to install" \
+    "build_py:\"build\" pure Python modules (copy to build directory)" \
+    "build_ext:build C/C++ extensions (compile/link to build directory)" \
+    "build_clib:build C/C++ libraries used by Python extensions" \
+    "build_scripts:\"build\" scripts (copy and fixup #! line)" \
+    "clean:clean up temporary files from 'build' command" \
+    "install:install everything from build directory" \
+    "install_lib:install all Python modules (extensions and pure Python)" \
+    "install_headers:install C/C++ header files" \
+    "install_scripts:install scripts (Python or otherwise)" \
+    "install_data:install data files" \
+    "sdist:create a source distribution (tarball, zip file, etc.)" \
+    "register:register the distribution with the Python package index" \
+    "bdist:create a built (binary) distribution" \
+    "bdist_dumb:create a \"dumb\" built distribution" \
+    "bdist_rpm:create an RPM distribution" \
+    "bdist_wininst:create an executable installer for MS Windows" \
+    "upload:upload binary package to PyPI" \
+    "check:perform some checks on the package" \
+    "alias:define a shortcut to invoke one or more commands" \
+    "bdist_egg:create an \"egg\" distribution" \
+    "develop:install package in 'development mode'" \
+    "easy_install:Find/get/install Python packages" \
+    "egg_info:create a distribution's .egg-info directory" \
+    "rotate:delete older distributions, keeping N newest files" \
+    "saveopts:save supplied options to setup.cfg or other config file" \
+    "setopt:set an option in setup.cfg or another config file" \
+    "test:run unit tests after in-place build" \
+    "install_egg_info:Install an .egg-info directory for the package" \
+    "upload_docs:Upload documentation to PyPI" \
+    )
+
+  if (( CURRENT == 1 )); then
+    _describe -t commands 'setup.py subcommand' _setuppy_cmds || compadd "$@" - ${(s.:.)${(j.:.)_setuppy_syns}}
+  else
+    local curcontext="$curcontext"
+
+    cmd="${${_setuppy_cmds[(r)$words[1]:*]%%:*}:-${(k)_setuppy_syns[(r)(*:|)$words[1](:*|)]}}"
+    if (( $#cmd )); then
+      curcontext="${curcontext%:*:*}:setuppy-${cmd}:"
+      _call_function ret _setuppy_$cmd || _message 'no more arguments'
+    else
+      _message "unknown setup.py command: $words[1]"
+      fi
+    return ret
+  fi
+}
+
+(( $+functions[_setuppy_build] )) ||
+_setuppy_build() {
+  _arguments -s \
+    "--build-base=[base directory for build library]" \
+    "-b[base directory for build library]" \
+    "--build-purelib=[build directory for platform-neutral distributions]" \
+    "--build-platlib=[build directory for platform-specific distributions]" \
+    "--build-lib=[build directory for all distribution (defaults to either build-purelib or build-platlib]" \
+    "--build-scripts=[build directory for scripts]" \
+    "--build-temp=[temporary build directory]" \
+    "-t[temporary build directory]" \
+    "--plat-name=[platform name to build for, if supported (default: linux-i686)]" \
+    "-p[platform name to build for, if supported (default: linux-i686)]" \
+    "--compiler=[specify the compiler type]" \
+    "-c[specify the compiler type]" \
+    "--debug[compile extensions and libraries with debugging information]" \
+    "-g[compile extensions and libraries with debugging information]" \
+    "--force[forcibly build everything (ignore file timestamps)]" \
+    "-f[forcibly build everything (ignore file timestamps)]" \
+    "--executable=[specify final destination interpreter path (build.py)]" \
+    "-e[specify final destination interpreter path (build.py)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_build_py] )) ||
+_setuppy_build_py() {
+  _arguments -s \
+    "--build-lib=[directory to \"build\" (copy) to]" \
+    "-d[directory to \"build\" (copy) to]" \
+    "--compile[compile .py to .pyc]" \
+    "-c[compile .py to .pyc]" \
+    "--no-compile[don't compile .py files \[default\]]" \
+    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "--force[forcibly build everything (ignore file timestamps)]" \
+    "-f[forcibly build everything (ignore file timestamps)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_build_ext] )) ||
+_setuppy_build_ext() {
+  _arguments -s \
+    "--build-lib=[directory for compiled extension modules]" \
+    "-b[directory for compiled extension modules]" \
+    "--build-temp=[directory for temporary files (build by-products)]" \
+    "-t[directory for temporary files (build by-products)]" \
+    "--plat-name=[platform name to cross-compile for, if supported (default: linux-i686)]" \
+    "-p[platform name to cross-compile for, if supported (default: linux-i686)]" \
+    "--inplace[ignore build-lib and put compiled extensions into the source directory alongside your pure Python modules]" \
+    "-i[ignore build-lib and put compiled extensions into the source directory alongside your pure Python modules]" \
+    "--include-dirs=[list of directories to search for header files (separated by ':')]" \
+    "-I[list of directories to search for header files (separated by ':')]" \
+    "--define=[C preprocessor macros to define]" \
+    "-D[C preprocessor macros to define]" \
+    "--undef=[C preprocessor macros to undefine]" \
+    "-U[C preprocessor macros to undefine]" \
+    "--libraries=[external C libraries to link with]" \
+    "-l[external C libraries to link with]" \
+    "--library-dirs=[directories to search for external C libraries (separated by ':')]" \
+    "-L[directories to search for external C libraries (separated by ':')]" \
+    "--rpath=[directories to search for shared C libraries at runtime]" \
+    "-R[directories to search for shared C libraries at runtime]" \
+    "--link-objects=[extra explicit link objects to include in the link]" \
+    "-O[extra explicit link objects to include in the link]" \
+    "--debug[compile/link with debugging information]" \
+    "-g[compile/link with debugging information]" \
+    "--force[forcibly build everything (ignore file timestamps)]" \
+    "-f[forcibly build everything (ignore file timestamps)]" \
+    "--compiler=[specify the compiler type]" \
+    "-c[specify the compiler type]" \
+    "--swig-cpp[make SWIG create C++ files (default is C)]" \
+    "--swig-opts=[list of SWIG command line options]" \
+    "--swig=[path to the SWIG executable]" \
+    "--user[add user include, library and rpath]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_build_clib] )) ||
+_setuppy_build_clib() {
+  _arguments -s \
+    "--build-clib=[directory to build C/C++ libraries to]" \
+    "-b[directory to build C/C++ libraries to]" \
+    "--build-temp=[directory to put temporary build by-products]" \
+    "-t[directory to put temporary build by-products]" \
+    "--debug[compile with debugging information]" \
+    "-g[compile with debugging information]" \
+    "--force[forcibly build everything (ignore file timestamps)]" \
+    "-f[forcibly build everything (ignore file timestamps)]" \
+    "--compiler=[specify the compiler type]" \
+    "-c[specify the compiler type]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_build_scripts] )) ||
+_setuppy_build_scripts() {
+  _arguments -s \
+    "--build-dir=[directory to \"build\" (copy) to]" \
+    "-d[directory to \"build\" (copy) to]" \
+    "--force[forcibly build everything (ignore file timestamps]" \
+    "-f[forcibly build everything (ignore file timestamps]" \
+    "--executable=[specify final destination interpreter path]" \
+    "-e[specify final destination interpreter path]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_clean] )) ||
+_setuppy_clean() {
+  _arguments -s \
+    "--build-base=[base build directory (default: 'build.build-base')]" \
+    "-b[base build directory (default: 'build.build-base')]" \
+    "--build-lib=[build directory for all modules (default: 'build.build-lib')]" \
+    "--build-temp=[temporary build directory (default: 'build.build-temp')]" \
+    "-t[temporary build directory (default: 'build.build-temp')]" \
+    "--build-scripts=[build directory for scripts (default: 'build.build-scripts')]" \
+    "--bdist-base=[temporary directory for built distributions]" \
+    "--all[remove all build output, not just temporary by-products]" \
+    "-a[remove all build output, not just temporary by-products]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install] )) ||
+_setuppy_install() {
+  _arguments -s \
+    "--prefix=[installation prefix]" \
+    "--exec-prefix=[(Unix only) prefix for platform-specific files]" \
+    "--home=[(Unix only) home directory to install under]" \
+    "--user[install in user site-package]" \
+    "--install-base=[base installation directory (instead of --prefix or --home)]" \
+    "--install-platbase=[base installation directory for platform-specific files (instead of --exec-prefix or --home)]" \
+    "--root=[install everything relative to this alternate root directory]" \
+    "--install-purelib=[installation directory for pure Python module distributions]" \
+    "--install-platlib=[installation directory for non-pure module distributions]" \
+    "--install-lib=[installation directory for all module distributions (overrides --install-purelib and --install-platlib)]" \
+    "--install-headers=[installation directory for C/C++ headers]" \
+    "--install-scripts=[installation directory for Python scripts]" \
+    "--install-data=[installation directory for data files]" \
+    "--compile[compile .py to .pyc \[default\]]" \
+    "-c[compile .py to .pyc \[default\]]" \
+    "--no-compile[don't compile .py files]" \
+    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "--force[force installation (overwrite any existing files)]" \
+    "-f[force installation (overwrite any existing files)]" \
+    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
+    "--record=[filename in which to record list of installed files]" \
+    "--old-and-unmanageable[Try not to use this!]" \
+    "--single-version-externally-managed[used by system package builders to create 'flat' eggs]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install_lib] )) ||
+_setuppy_install_lib() {
+  _arguments -s \
+    "--install-dir=[directory to install to]" \
+    "-d[directory to install to]" \
+    "--build-dir=[build directory (where to install from)]" \
+    "-b[build directory (where to install from)]" \
+    "--force[force installation (overwrite existing files)]" \
+    "-f[force installation (overwrite existing files)]" \
+    "--compile[compile .py to .pyc \[default\]]" \
+    "-c[compile .py to .pyc \[default\]]" \
+    "--no-compile[don't compile .py files]" \
+    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "--skip-build[skip the build steps]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install_headers] )) ||
+_setuppy_install_headers() {
+  _arguments -s \
+    "--install-dir=[directory to install header files to]" \
+    "-d[directory to install header files to]" \
+    "--force[force installation (overwrite existing files)]" \
+    "-f[force installation (overwrite existing files)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install_scripts] )) ||
+_setuppy_install_scripts() {
+  _arguments -s \
+    "--install-dir=[directory to install scripts to]" \
+    "-d[directory to install scripts to]" \
+    "--build-dir=[build directory (where to install from)]" \
+    "-b[build directory (where to install from)]" \
+    "--force[force installation (overwrite existing files)]" \
+    "-f[force installation (overwrite existing files)]" \
+    "--skip-build[skip the build steps]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install_data] )) ||
+_setuppy_install_data() {
+  _arguments -s \
+    "--install-dir=[base directory for installing data files (default: installation base dir)]" \
+    "-d[base directory for installing data files (default: installation base dir)]" \
+    "--root=[install everything relative to this alternate root directory]" \
+    "--force[force installation (overwrite existing files)]" \
+    "-f[force installation (overwrite existing files)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_sdist] )) ||
+_setuppy_sdist() {
+  _arguments -s \
+    "--formats=[formats for source distribution (comma-separated list)]" \
+    "--keep-temp[keep the distribution tree around after creating archive file(s)]" \
+    "-k[keep the distribution tree around after creating archive file(s)]" \
+    "--dist-dir=[directory to put the source distribution archive(s) in \[default: dist\]]" \
+    "-d[directory to put the source distribution archive(s) in \[default: dist\]]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_register] )) ||
+_setuppy_register() {
+  _arguments -s \
+    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "--show-response[display full response text from server]" \
+    "--list-classifiers[list the valid Trove classifiers]" \
+    "--strict[Will stop the registering if the meta-data are not fully compliant]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_bdist] )) ||
+_setuppy_bdist() {
+  _arguments -s \
+    "--bdist-base=[temporary directory for creating built distributions]" \
+    "-b[temporary directory for creating built distributions]" \
+    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
+    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
+    "--formats=[formats for distribution (comma-separated list)]" \
+    "--dist-dir=[directory to put final built distributions in \[default: dist\]]" \
+    "-d[directory to put final built distributions in \[default: dist\]]" \
+    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
+    "--owner=[Owner name used when creating a tar file \[default: current user\]]" \
+    "-u[Owner name used when creating a tar file \[default: current user\]]" \
+    "--group=[Group name used when creating a tar file \[default: current group\]]" \
+    "-g[Group name used when creating a tar file \[default: current group\]]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_bdist_dumb] )) ||
+_setuppy_bdist_dumb() {
+  _arguments -s \
+    "--bdist-dir=[temporary directory for creating the distribution]" \
+    "-d[temporary directory for creating the distribution]" \
+    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
+    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
+    "--format=[archive format to create (tar, ztar, gztar, zip)]" \
+    "-f[archive format to create (tar, ztar, gztar, zip)]" \
+    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "--dist-dir=[directory to put final built distributions in]" \
+    "-d[directory to put final built distributions in]" \
+    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
+    "--relative[build the archive using relative paths(default: false)]" \
+    "--owner=[Owner name used when creating a tar file \[default: current user\]]" \
+    "-u[Owner name used when creating a tar file \[default: current user\]]" \
+    "--group=[Group name used when creating a tar file \[default: current group\]]" \
+    "-g[Group name used when creating a tar file \[default: current group\]]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_bdist_rpm] )) ||
+_setuppy_bdist_rpm() {
+  _arguments -s \
+    "--bdist-base=[base directory for creating built distributions]" \
+    "--rpm-base=[base directory for creating RPMs (defaults to \"rpm\" under --bdist-base; must be specified for RPM 2)]" \
+    "--dist-dir=[directory to put final RPM files in (and .spec files if --spec-only)]" \
+    "-d[directory to put final RPM files in (and .spec files if --spec-only)]" \
+    "--python=[path to Python interpreter to hard-code in the .spec file (default: \"python\")]" \
+    "--fix-python[hard-code the exact path to the current Python interpreter in the .spec file]" \
+    "--spec-only[only regenerate spec file]" \
+    "--source-only[only generate source RPM]" \
+    "--binary-only[only generate binary RPM]" \
+    "--use-bzip2[use bzip2 instead of gzip to create source distribution]" \
+    "--distribution-name=[name of the (Linux) distribution to which this RPM applies (*not* the name of the module distribution!)]" \
+    "--group=[package classification \[default: \"Development/Libraries\"\]]" \
+    "--release=[RPM release number]" \
+    "--serial=[RPM serial number]" \
+    "--vendor=[RPM \"vendor\" (eg. \"Joe Blow <joe@example.com>\") \[default: maintainer or author from setup script\]]" \
+    "--packager=[RPM packager (eg. \"Jane Doe <jane@example.net>\")\[default: vendor\]]" \
+    "--doc-files=[list of documentation files (space or comma-separated)]" \
+    "--changelog=[RPM changelog]" \
+    "--icon=[name of icon file]" \
+    "--provides=[capabilities provided by this package]" \
+    "--requires=[capabilities required by this package]" \
+    "--conflicts=[capabilities which conflict with this package]" \
+    "--build-requires=[capabilities required to build this package]" \
+    "--obsoletes=[capabilities made obsolete by this package]" \
+    "--no-autoreq[do not automatically calculate dependencies]" \
+    "--keep-temp[don't clean up RPM build directory]" \
+    "-k[don't clean up RPM build directory]" \
+    "--no-keep-temp[clean up RPM build directory \[default\]]" \
+    "--use-rpm-opt-flags[compile with RPM_OPT_FLAGS when building from source RPM]" \
+    "--no-rpm-opt-flags[do not pass any RPM CFLAGS to compiler]" \
+    "--rpm3-mode[RPM 3 compatibility mode (default)]" \
+    "--rpm2-mode[RPM 2 compatibility mode]" \
+    "--prep-script=[Specify a script for the PREP phase of RPM building]" \
+    "--build-script=[Specify a script for the BUILD phase of RPM building]" \
+    "--pre-install=[Specify a script for the pre-INSTALL phase of RPM building]" \
+    "--install-script=[Specify a script for the INSTALL phase of RPM building]" \
+    "--post-install=[Specify a script for the post-INSTALL phase of RPM building]" \
+    "--pre-uninstall=[Specify a script for the pre-UNINSTALL phase of RPM building]" \
+    "--post-uninstall=[Specify a script for the post-UNINSTALL phase of RPM building]" \
+    "--clean-script=[Specify a script for the CLEAN phase of RPM building]" \
+    "--verify-script=[Specify a script for the VERIFY phase of the RPM build]" \
+    "--force-arch=[Force an architecture onto the RPM build process]" \
+    "--quiet[Run the INSTALL phase of RPM building in quiet mode]" \
+    "-q[Run the INSTALL phase of RPM building in quiet mode]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_bdist_wininst] )) ||
+_setuppy_bdist_wininst() {
+  _arguments -s \
+    "--bdist-dir=[temporary directory for creating the distribution]" \
+    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
+    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
+    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "--target-version=[require a specific python version on the target system]" \
+    "--no-target-compile[do not compile .py to .pyc on the target system]" \
+    "-c[do not compile .py to .pyc on the target system]" \
+    "--no-target-optimize[do not compile .py to .pyo (optimized)on the target system]" \
+    "-o[do not compile .py to .pyo (optimized)on the target system]" \
+    "--dist-dir=[directory to put final built distributions in]" \
+    "-d[directory to put final built distributions in]" \
+    "--bitmap=[bitmap to use for the installer instead of python-powered logo]" \
+    "-b[bitmap to use for the installer instead of python-powered logo]" \
+    "--title=[title to display on the installer background instead of default]" \
+    "-t[title to display on the installer background instead of default]" \
+    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
+    "--install-script=[basename of installation script to be run afterinstallation or before deinstallation]" \
+    "--pre-install-script=[Fully qualified filename of a script to be run before any files are installed.  This script need not be in the distribution]" \
+    "--user-access-control=[specify Vista's UAC handling - 'none'/default=no handling, 'auto'=use UAC if target Python installed for all users, 'force'=always use UAC]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_upload] )) ||
+_setuppy_upload() {
+  _arguments -s \
+    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "--show-response[display full response text from server]" \
+    "--sign[sign files to upload using gpg]" \
+    "-s[sign files to upload using gpg]" \
+    "--identity=[GPG identity used to sign files]" \
+    "-i[GPG identity used to sign files]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_check] )) ||
+_setuppy_check() {
+  _arguments -s \
+    "--metadata[Verify meta-data]" \
+    "-m[Verify meta-data]" \
+    "--restructuredtext[Checks if long string meta-data syntax are reStructuredText-compliant]" \
+    "-r[Checks if long string meta-data syntax are reStructuredText-compliant]" \
+    "--strict[Will exit with an error if a check fails]" \
+    "-s[Will exit with an error if a check fails]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_alias] )) ||
+_setuppy_alias() {
+  _arguments -s \
+    "--remove[remove (unset) the alias]" \
+    "-r[remove (unset) the alias]" \
+    "--global-config[save options to the site-wide distutils.cfg file]" \
+    "-g[save options to the site-wide distutils.cfg file]" \
+    "--user-config[save options to the current user's pydistutils.cfg file]" \
+    "-u[save options to the current user's pydistutils.cfg file]" \
+    "--filename=[configuration file to use (default=setup.cfg)]" \
+    "-f[configuration file to use (default=setup.cfg)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_bdist_egg] )) ||
+_setuppy_bdist_egg() {
+  _arguments -s \
+    "--bdist-dir=[temporary directory for creating the distribution]" \
+    "-b[temporary directory for creating the distribution]" \
+    "--plat-name=[platform name to embed in generated filenames (default: linux-i686)]" \
+    "-p[platform name to embed in generated filenames (default: linux-i686)]" \
+    "--exclude-source-files[remove all .py files from the generated egg]" \
+    "--keep-temp[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "-k[keep the pseudo-installation tree around after creating the distribution archive]" \
+    "--dist-dir=[directory to put final built distributions in]" \
+    "-d[directory to put final built distributions in]" \
+    "--skip-build[skip rebuilding everything (for testing/debugging)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_develop] )) ||
+_setuppy_develop() {
+  _arguments -s \
+    "--prefix=[installation prefix]" \
+    "--zip-ok[install package as a zipfile]" \
+    "-z[install package as a zipfile]" \
+    "--multi-version[make apps have to require() a version]" \
+    "-m[make apps have to require() a version]" \
+    "--upgrade[force upgrade (searches PyPI for latest versions)]" \
+    "-U[force upgrade (searches PyPI for latest versions)]" \
+    "--install-dir=[install package to DIR]" \
+    "-d[install package to DIR]" \
+    "--script-dir=[install scripts to DIR]" \
+    "-s[install scripts to DIR]" \
+    "--exclude-scripts[Don't install scripts]" \
+    "-x[Don't install scripts]" \
+    "--always-copy[Copy all needed packages to install dir]" \
+    "-a[Copy all needed packages to install dir]" \
+    "--index-url=[base URL of Python Package Index]" \
+    "-i[base URL of Python Package Index]" \
+    "--find-links=[additional URL(s) to search for packages]" \
+    "-f[additional URL(s) to search for packages]" \
+    "--build-directory=[download/extract/build in DIR; keep the results]" \
+    "-b[download/extract/build in DIR; keep the results]" \
+    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "--record=[filename in which to record list of installed files]" \
+    "--always-unzip[don't install as a zipfile, no matter what]" \
+    "-Z[don't install as a zipfile, no matter what]" \
+    "--site-dirs=[list of directories where .pth files work]" \
+    "-S[list of directories where .pth files work]" \
+    "--editable[Install specified packages in editable form]" \
+    "-e[Install specified packages in editable form]" \
+    "--no-deps[don't install dependencies]" \
+    "-N[don't install dependencies]" \
+    "--allow-hosts=[pattern(s) that hostnames must match]" \
+    "-H[pattern(s) that hostnames must match]" \
+    "--local-snapshots-ok[allow building eggs from local checkouts]" \
+    "-l[allow building eggs from local checkouts]" \
+    "--version[print version information and exit]" \
+    "--no-find-links[Don't load find-links defined in packages being installed]" \
+    "--user[install in user site-package]" \
+    "--uninstall[Uninstall this source package]" \
+    "-u[Uninstall this source package]" \
+    "--egg-path=[Set the path to be used in the .egg-link file]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_easy_install] )) ||
+_setuppy_easy_install() {
+  _arguments -s \
+    "--prefix=[installation prefix]" \
+    "--zip-ok[install package as a zipfile]" \
+    "-z[install package as a zipfile]" \
+    "--multi-version[make apps have to require() a version]" \
+    "-m[make apps have to require() a version]" \
+    "--upgrade[force upgrade (searches PyPI for latest versions)]" \
+    "-U[force upgrade (searches PyPI for latest versions)]" \
+    "--install-dir=[install package to DIR]" \
+    "-d[install package to DIR]" \
+    "--script-dir=[install scripts to DIR]" \
+    "-s[install scripts to DIR]" \
+    "--exclude-scripts[Don't install scripts]" \
+    "-x[Don't install scripts]" \
+    "--always-copy[Copy all needed packages to install dir]" \
+    "-a[Copy all needed packages to install dir]" \
+    "--index-url=[base URL of Python Package Index]" \
+    "-i[base URL of Python Package Index]" \
+    "--find-links=[additional URL(s) to search for packages]" \
+    "-f[additional URL(s) to search for packages]" \
+    "--build-directory=[download/extract/build in DIR; keep the results]" \
+    "-b[download/extract/build in DIR; keep the results]" \
+    "--optimize=[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "-O[also compile with optimization: -O1 for \"python -O\", -O2 for \"python -OO\", and -O0 to disable \[default: -O0\]]" \
+    "--record=[filename in which to record list of installed files]" \
+    "--always-unzip[don't install as a zipfile, no matter what]" \
+    "-Z[don't install as a zipfile, no matter what]" \
+    "--site-dirs=[list of directories where .pth files work]" \
+    "-S[list of directories where .pth files work]" \
+    "--editable[Install specified packages in editable form]" \
+    "-e[Install specified packages in editable form]" \
+    "--no-deps[don't install dependencies]" \
+    "-N[don't install dependencies]" \
+    "--allow-hosts=[pattern(s) that hostnames must match]" \
+    "-H[pattern(s) that hostnames must match]" \
+    "--local-snapshots-ok[allow building eggs from local checkouts]" \
+    "-l[allow building eggs from local checkouts]" \
+    "--version[print version information and exit]" \
+    "--no-find-links[Don't load find-links defined in packages being installed]" \
+    "--user[install in user site-package]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_egg_info] )) ||
+_setuppy_egg_info() {
+  _arguments -s \
+    "--egg-base=[directory containing .egg-info directories (default: top of the source tree)]" \
+    "-e[directory containing .egg-info directories (default: top of the source tree)]" \
+    "--tag-svn-revision[Add subversion revision ID to version number]" \
+    "-r[Add subversion revision ID to version number]" \
+    "--tag-date[Add date stamp (e.g. 20050528) to version number]" \
+    "-d[Add date stamp (e.g. 20050528) to version number]" \
+    "--tag-build=[Specify explicit tag to add to version number]" \
+    "-b[Specify explicit tag to add to version number]" \
+    "--no-svn-revision[Don't add subversion revision ID \[default\]]" \
+    "-R[Don't add subversion revision ID \[default\]]" \
+    "--no-date[Don't include date stamp \[default\]]" \
+    "-D[Don't include date stamp \[default\]]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_rotate] )) ||
+_setuppy_rotate() {
+  _arguments -s \
+    "--match=[patterns to match (required)]" \
+    "-m[patterns to match (required)]" \
+    "--dist-dir=[directory where the distributions are]" \
+    "-d[directory where the distributions are]" \
+    "--keep=[number of matching distributions to keep]" \
+    "-k[number of matching distributions to keep]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_saveopts] )) ||
+_setuppy_saveopts() {
+  _arguments -s \
+    "--global-config[save options to the site-wide distutils.cfg file]" \
+    "-g[save options to the site-wide distutils.cfg file]" \
+    "--user-config[save options to the current user's pydistutils.cfg file]" \
+    "-u[save options to the current user's pydistutils.cfg file]" \
+    "--filename=[configuration file to use (default=setup.cfg)]" \
+    "-f[configuration file to use (default=setup.cfg)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_setopt] )) ||
+_setuppy_setopt() {
+  _arguments -s \
+    "--command=[command to set an option for]" \
+    "-c[command to set an option for]" \
+    "--option=[option to set]" \
+    "-o[option to set]" \
+    "--set-value=[value of the option]" \
+    "-s[value of the option]" \
+    "--remove[remove (unset) the value]" \
+    "-r[remove (unset) the value]" \
+    "--global-config[save options to the site-wide distutils.cfg file]" \
+    "-g[save options to the site-wide distutils.cfg file]" \
+    "--user-config[save options to the current user's pydistutils.cfg file]" \
+    "-u[save options to the current user's pydistutils.cfg file]" \
+    "--filename=[configuration file to use (default=setup.cfg)]" \
+    "-f[configuration file to use (default=setup.cfg)]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_test] )) ||
+_setuppy_test() {
+  _arguments -s \
+    "--test-module=[Run 'test_suite' in specified module]" \
+    "-m[Run 'test_suite' in specified module]" \
+    "--test-suite=[Test suite to run (e.g. 'some_module.test_suite')]" \
+    "-s[Test suite to run (e.g. 'some_module.test_suite')]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_install_egg_info] )) ||
+_setuppy_install_egg_info() {
+  _arguments -s \
+    "--install-dir=[directory to install to]" \
+    "-d[directory to install to]" \
+    "*::setup.py commands:_setup.py"
+}
+
+(( $+functions[_setuppy_upload_docs] )) ||
+_setuppy_upload_docs() {
+  _arguments -s \
+    "--repository=[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "-r[url of repository \[default: http://pypi.python.org/pypi\]]" \
+    "--show-response[display full response text from server]" \
+    "--upload-dir=[directory to upload]" \
+    "*::setup.py commands:_setup.py"
+}
+
+_setup.py "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_showoff b/zsh/modules/completion/external/src/_showoff
new file mode 100644
index 0000000..f470141
--- /dev/null
+++ b/zsh/modules/completion/external/src/_showoff
@@ -0,0 +1,109 @@
+#compdef showoff
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Showoff (https://github.com/schacon/showoff).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Bruno Michel (https://github.com/nono)
+#
+# ------------------------------------------------------------------------------
+
+
+local curcontext="$curcontext" state line cmds ret=1
+
+_arguments -C \
+	'1: :->cmds' \
+	'*: :->args' && ret=0
+
+case $state in
+	cmds)
+		cmds=(
+		'add:Add a new slide at the end in a given dir'
+		'new:Add a new slide at the end in a given dir'
+		'create:Create new showoff presentation'
+		'init:Create new showoff presentation'
+		'help:Shows list of commands or help for one command'
+		'heroku:Setup your presentation to serve on Heroku'
+		'serve:Serves the showoff presentation in the current directory'
+		'static:Generate static version of presentation'
+		)
+		_describe -t commands 'showoff command' cmds && ret=0
+		;;
+	args)
+		case $line[1] in
+			(add|new)
+				_arguments \
+					'(-d --dir)'{-d,--dir}'=[Slide dir (where to put a new slide file)]:directory:_files' \
+					'(-n --name)'{-n,--name}'=[Slide name (name of the new slide file)]:basename' \
+					{-s,--source}'=[Include code from the given file as the slide body]:file:_files' \
+					'(-t --style --type)'{-t,--style,--type}'=[Slide Type/Style (default: title)]:style' \
+					'(-u --no-number)'{-u,--no-number}'[Dont number the slide, use the given name verbatim]' \
+					'1:title' && ret=0
+				;;
+			(create|init)
+				_arguments \
+					'(-d --slidedir)'{-d,--slidedir}'=[Sample slide directory name (default: one)]:arg' \
+					'(-n --nosamples)'{-n,--nosamples}'=[Dont create sample slides]' \
+					'1:dir_name' && ret=0
+				;;
+			help)
+				_values 'commands' add new create init help heroku serve static && ret=0
+				;;
+			heroku)
+				_message 'please entrer an heroku_name' && ret=0
+				;;
+			serve)
+				_arguments \
+					'(-h --host)'{-h,--host}'=[Host or ip to run on (default: localhost)]:host' \
+					'(-p --port)'{-p,--port}'=[Port on which to run (default: 9090)]:port' \
+					'1:title' && ret=0
+				;;
+			static)
+				_message 'please entrer a name' && ret=0
+				;;
+			*)
+				(( ret )) && _message 'no more arguments'
+				;;
+		esac
+		;;
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_shutdown b/zsh/modules/completion/external/src/_shutdown
new file mode 100644
index 0000000..f695b9d
--- /dev/null
+++ b/zsh/modules/completion/external/src/_shutdown
@@ -0,0 +1,71 @@
+#compdef shutdown
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for shutdown - Shut down the system
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Timofey Titovets <nefelim4ag@gmail.com>
+#
+# ------------------------------------------------------------------------------
+_shutdown(){
+	local -a _1st_arguments
+	_1st_arguments=(
+		"--help:Show help"
+		"-H:Halt the machine" "--halt:Halt the machine"
+		"-P:Power-off the machine" "--poweroff:Power-off the machine"
+		"-r:Reboot the machine" "--reboot:Reboot the machine"
+		"-h:Equivalent to --poweroff, overridden by --halt"
+		"-k:Dont halt/power-off/reboot, just send warnings"
+		"--no-wall:Dont send wall message before halt/power-off/reboot"
+		"-c:Cancel a pending shutdown"
+	)
+
+	local context state line expl
+	local -A opt_args
+
+	_arguments '*:: :->subcmds' && return 0
+
+	if (( CURRENT == 1 )); then
+		_describe -t commands "shutdown commands" _1st_arguments -V1
+		return
+	fi
+
+	case "$words[1]" in
+		*)
+			_arguments \
+				':list option:(now +{0,5,10,15,30} hh:mm)'
+		;;
+	esac
+}
+
+_shutdown "$@"
diff --git a/zsh/modules/completion/external/src/_smartmontools b/zsh/modules/completion/external/src/_smartmontools
new file mode 100644
index 0000000..5e8c788
--- /dev/null
+++ b/zsh/modules/completion/external/src/_smartmontools
@@ -0,0 +1,115 @@
+#compdef smartctl smartd
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for smartmontools (http://smartmontools.sourceforge.net).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_smartctl() {
+	local context state line expl
+	local -A opt_args
+
+	_arguments -A "-*" \
+		'(-h --help --usage)'{-h,--help,--usage}'[Show help message]' \
+		'(-V --version --copyright --license)'{-v,--version,--copyright,--license}'[Print license, copyright, and version information and exit]' \
+		'(-i --info)'{-i,--info}'[Show identity information for device]' \
+		'(-a --all)'{-a,--all}"[Show all SMART information for device]" \
+		'(-x --xall)'{-xa,--xall}"[Show all information for device]" \
+		'--scan[Scan for devices]' \
+		'--scan-open[Scan for devices and try to open each device]' \
+		\
+		'(-q --quietmode)'{-q,--quietmode}'[Set smartctl quiet mode]:TYPE:(errorsonly silent noserial)' \
+		'(-d --device)'{-d,--device}'[Specify device type]:TYPE:(ata scsi sat usbcypress usbjmicron usbsunplus marvell areca 3ware hpt megaraid cciss auto test)' \
+		'(-T --tolerance)'{-T,--tolerance}'[Set tolerance]:TOLERANCE:(normal conservative permissive verypermissive)' \
+		'(-b --badsum)'{-q,--badsum}'[Set action on bad checksum]:TYPE:(warn exit ignore)' \
+		'(-r --report)'{-r,--report}'[Report transactions]:TYPE:' \
+		'(-n --nocheck)'{-n,--nocheck}'[No check if MODE]:MODE:(never sleep standby idle)' \
+		\
+		'(-s --smart)'{-s,--smart}'[Enable/disable SMART on device]:VALUE:(on off)' \
+		'(-o --offlineauto)'{-o,--offlineauto}'[Enable/disable automatic offline testing on device]:VALUE:(on off)' \
+		'(-S --saveauto)'{-S,--saveauto}'[Enable/disable attribute autosave on device]:VALUE:(on off)' \
+		\
+		'(-H --health)'{-H,--health}'[Show device SMART health status]' \
+		'(-c --capabilities)'{-c,--capabilities}'[Show device SMART capabilities]' \
+		'(-A --attributes)'{-A,--attributes}'[Show device SMART vendor-specific attributes and values]' \
+		'(-f --format)'{-f,--format}'[Set output format for attributes]:FORMAT:(old brief)' \
+		'(-l --log)'{-l,--log}'[Show device log]:TYPE:(error selftest selective directory background sasphy sataphy scttemp scterc gplog smartlog xerror xselftest)' \
+		'(-v --vendorattribute)'{-v,--vendorattribute}'[Set display option for vendor attribute]:N,OPTION:' \
+		'(-F --firmwarebug)'{-F,--firmwarebug}'[Use firmware bug workaround]:TYPE:(none samsung samsung2 samsung3 swapid)' \
+		'(-P --presets)'{-P,--presets}'[Drive-specific presets]:TYPE:(use ignore show showall)' \
+		'(-B --drivedb)'{-B,--drivedb}'[Read and replace drive database from file]:FILE:_files' \
+		\
+		'(-t --test)'{-t,--test}'[Run test]:TEST:(offline short long conveyance vendor select pending afterselect,on afterselect,off scttempint)' \
+		'(-C --captive)'{-C,--captive}'[Do test in captive mode]' \
+		'(-X --abort)'{-X,--abort}'[Abort any non-captive test on device]' \
+		\
+		'1:Device:_files'
+}
+
+_smartd() {
+	local context state line expl
+	local -A opt_args
+
+	_arguments -A "-*" \
+		'(-h --help --usage)'{-h,--help,--usage}'[Show help message]' \
+		'(-V --version --copyright --license)'{-v,--version,--copyright,--license}'[Print license, copyright, and version information and exit]' \
+		\
+		'(-A --attributelog)'{-A,--attributelog}'[Log ATA attribute information to {PREFIX}MODEL-SERIAL.ata.csv]:PREFIX:' \
+		'(-B --drivedb)'{-B,--drivedb}'[Read and replace drive database from file]:FILE:_files' \
+		'(-c --configfile)'{-c,--configfile}'[Read configuration file or stdin]:FILE:_files' \
+		'(-d --debug)'{-d,--debug}'[Start smartd in debug mode]' \
+		'(-D --showdirectives)'{-D,--showdirectives}'[Print the configuration file directives and exit]' \
+		'(-i --interval)'{-i,--interval}'[Set interval between disk checks to N seconds, where N >= 10]:Seconds >= 10:' \
+		'(-l --logfacility)'{-l,--logfacility}'[Use syslogfacility local0 - local7 or daemon]:FACILITY:(local0 local1 local2 local3 local4 local5 local6 local7)' \
+		'(-n --no-fork)'{-n,--no-fork}'[Do not fork into background]' \
+		'(-p --pidfile)'{-p,--pidfile}'[Write PID file]:FILE:_files' \
+		'(-q --quit)'{-q,--quit}'[Quit on...]:WHEN:(nodev errors nodevstartup never onecheck showtests)' \
+		'(-r --report)'{-r,--report}'[Report transactions for...]:TYPE:(ioctl ataioctl scsiioctl)' \
+		'(-s --savestates)'{-s,--savestates}'[Save disk states to {PREFIX}MODEL-SERIAL.TYPE.state]:TYPE:'
+}
+
+_smartmontools() {
+	local ret=1
+	_call_function ret _$service
+	return ret
+}
+
+_smartmontools "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_srm b/zsh/modules/completion/external/src/_srm
new file mode 100644
index 0000000..08d2a32
--- /dev/null
+++ b/zsh/modules/completion/external/src/_srm
@@ -0,0 +1,84 @@
+#compdef srm
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for srm.
+#
+#  It is based on the rm completion script from Zsh.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Sorin Ionescu <sorin.ionescu@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+local -a opts args
+args=(
+  '(-f --force)'{-f,--force}'[ignore nonexistent files, never prompt]'
+  '(-r --interactive)'{-i,--interactive}'[prompt before any removal]'
+  '(-r -R --recursive)'{-r,-R,--recursive}'[remove the contents of directories recursively]'
+  '(-s --simple)'{-s,--simple}'[only overwrite with a single pass of random data]'
+  '(-v --verbose)'{-v,--verbose}'[explain what is being done]'
+  '(- *)--help[display help message and exit]'
+  '(- *)--version[output version information and exit]'
+  '*::files:->file'
+)
+
+if _pick_variant gnu=gnu unix --help; then
+  args+=(
+    '(-x --one-file-system)'{-x,--one-file-system}'[stay within filesystems of files given as arguments]'
+    '(-P --openbsd)'{-P,--openbsd}'[overwrite the file 3 times (0xff, 0x00, 0xff)]'
+    '(-D --dod)'{-D,--dod}'[overwrite the file with 7 US DoD compliant passes (0xF6, 0x00, 0xFF, random, 0x00, 0xFF, random)]'
+    '(-E --doe)'{-E,--doe}'[overwrite the file with 3 US DoE compliant passes (random, random, DoE)]'
+  )
+else
+  args+=(
+    '(-m --medium)'{-m,--medium}'[overwrite the file with 7 US DoD compliant passes (0xF6, 0x00, 0xFF, random, 0x00, 0xFF, random)]'
+    '(-z --zero)'{-z,--zero}'[after overwriting, zero blocks used by file]'
+    '(-n --nounlink)'{-n,--nounlink}'[overwrite file, but do not rename or unlink it]' 
+  )
+fi
+
+local curcontext=$curcontext state line ret=1
+local -A opt_args
+
+_arguments -s -S -C $opts \
+  $args && ret=0
+
+case $state in
+  (file)
+    local -a ignored
+    ignored=()
+    ((CURRENT > 1)) &&
+      ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+    ((CURRENT < $#line)) &&
+      ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH})
+    _files -F ignored && ret=0
+    ;;
+esac
+
+return $ret
diff --git a/zsh/modules/completion/external/src/_ssh-copy-id b/zsh/modules/completion/external/src/_ssh-copy-id
new file mode 100644
index 0000000..98daeba
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ssh-copy-id
@@ -0,0 +1,59 @@
+#compdef ssh-copy-id
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for ssh-copy-id.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+# FIXME This completes "user@host" and not "[user@]host" ("user@" is optional),
+#       should be merged in _ssh.
+
+_arguments -A "-*" \
+  '-i+[use identity file]:SSH identity file:_files' \
+  '-n+[do a dry-run]' \
+  '-h+[print usage summary]' \
+  '-p+[specify custom port]' \
+  '-o+[additional ssh option]' \
+  '1: :_user_at_host'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_stack b/zsh/modules/completion/external/src/_stack
new file mode 100644
index 0000000..75eebfc
--- /dev/null
+++ b/zsh/modules/completion/external/src/_stack
@@ -0,0 +1,93 @@
+#compdef stack
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for stack (https://github.com/commercialhaskell/stack).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Toshiki Teramura <toshiki.teramura@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_stack () {
+    _arguments \
+        --version'[Show version]' \
+        --help'[Show this help text]' \
+        '--docker*''[Run "stack --docker-help" for details]' \
+        --verbosity'[Verbosity: silent, error, warn, info, debug]' \
+        {-v,--verbose}'[Enable verbose mode: verbosity level "debug"]' \
+        --system-ghc'[Enable using the system installed GHC (on the PATH) if available and a matching version]' \
+        --no-system-ghc'[Disable using the system installed GHC (on the PATH) if available and a matching version]' \
+        --install-ghc'[Enable downloading and installing GHC if necessary (can be done manually with stack setup)]' \
+        --no-install-ghc'[Disable downloading and installing GHC if necessary (can be done manually with stack setup)]' \
+        --arch'[System architecture, e.g. i386, x86_64]' \
+        --os'[Operating system, e.g. linux, windows]' \
+        {-j,--jobs}'[Number of concurrent jobs to run]' \
+        --extra-include-dirs'[Extra directories to check for C header files]' \
+        --extra-lib-dirs'[Extra directories to check for libraries]' \
+        --skip-ghc-check'[Enable skipping the GHC version and architecture check]' \
+        --no-skip-ghc-check'[Disable skipping the GHC version and architecture check]' \
+        --skip-msys'[Enable skipping the local MSYS installation (Windows only)]' \
+        --no-skip-msys'[Disable skipping the local MSYS installation (Windows only)]' \
+        --resolver'[Override resolver in project file]' \
+        --no-terminal'[Override terminal detection in the case of running in a false terminal]' \
+        --stack-yaml'[Override project stack.yaml file (overrides any STACK_YAML environment variable)]' \
+        '*: :__stack_modes'
+}
+
+__stack_modes () {
+    _values \
+        'subcommand' \
+        'build[Build the project(s) in this directory/configuration]' \
+        'install[Build executables and install to a user path]' \
+        'test[Build and test the project(s) in this directory/configuration]' \
+        'bench[Build and benchmark the project(s) in this directory/configuration]' \
+        'haddock[Generate haddocks for the project(s) in this directory/configuration]' \
+        'new[Create a brand new project]' \
+        'init[Initialize a stack project based on one or more cabal packages]' \
+        'solver[Use a dependency solver to try and determine missing extra-deps]' \
+        'setup[Get the appropriate ghc for your project]' \
+        'path[Print out handy path information]' \
+        'unpack[Unpack one or more packages locally]' \
+        'update[Update the package index]' \
+        'upgrade[Upgrade to the latest stack (experimental)]' \
+        'upload[Upload a package to Hackage]' \
+        'dot[Visualize your projects dependency graph using Graphviz dot]' \
+        'exec[Execute a command]' \
+        'ghc[Run ghc]' \
+        'ghci[Run ghci in the context of project(s)]' \
+        'ide[Run ide-backend-client with the correct arguments]' \
+        'runghc[Run runghc]' \
+        'clean[Clean the local packages]' \
+        'docker[Subcommands specific to Docker use]'
+
+}
diff --git a/zsh/modules/completion/external/src/_subliminal b/zsh/modules/completion/external/src/_subliminal
new file mode 100644
index 0000000..73f097a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_subliminal
@@ -0,0 +1,63 @@
+#compdef subliminal
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Subliminal (https://github.com/Diaoul/subliminal).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_arguments \
+  '(- : *)'{-h,--help}'[show help message and exit]' \
+  '(- : *)--version[show version number and exit]' \
+  '*'{-l,--language}'[wanted language]: :_language_codes ISO-639-1' \
+  '*'{-p,--plugin}'[plugin to use]:plugin name:((OpenSubtitles BierDopje TheSubDB SubsWiki Subtitulos))' \
+  '(-m --multi)'{-m,--multi}'[download multiple subtitle languages]' \
+  '(-f --force)'{-f,--force}'[replace existing subtitle file]' \
+  '(-w --workers)'{-w,--workers}'[number of threads to use]:number' \
+  '(-c --compatibility)'{-c,--compatibility}'[try not to use unicode]' \
+  '(-q --quiet -v --verbose)'{-q,--quiet}'[disable output]' \
+  '(-v --verbose -q --quiet)'{-v,--verbose}'[verbose output]' \
+  '(--no-cache-dir)--cache-dir[cache directory to use]: :_files -/' \
+  '(--cache-dir)--no-cache-dir[do not use cache directory]' \
+  '*: :_files'
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_supervisorctl b/zsh/modules/completion/external/src/_supervisorctl
new file mode 100644
index 0000000..b48ce13
--- /dev/null
+++ b/zsh/modules/completion/external/src/_supervisorctl
@@ -0,0 +1,174 @@
+#compdef supervisorctl
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for supervisorctl from Supervisord (http://supervisord.org)
+#
+#  Sources:
+#  https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/supervisor
+#  https://github.com/zsh-users/zsh-completions/blob/master/src/_brew
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Matt Black (https://github.com/mafrosis)
+#  * dongweiming (https://github.com/dongweiming)
+#
+# ------------------------------------------------------------------------------
+
+
+_supervisorctl_list_procs() {
+  procs=(${(f)"$(_call_program supervisor_procs supervisorctl avail | awk '{print $1}')"})
+}
+_supervisorctl_list_groups() {
+  groups=(${(f)"$(_call_program supervisor_procs supervisorctl avail | awk '$1 ~ /:/ { print substr($1,1,index($1,":")) }' | uniq)"})
+}
+
+_supervisorctl_list_procs_stopped() {
+  procs=(${(f)"$(_call_program supervisor_procs supervisorctl status | awk '/STOPPED/ {print $1}')"})
+}
+_supervisorctl_list_groups_stopped() {
+  groups=(${(f)"$(_call_program supervisor_procs supervisorctl status | awk '$1$2 ~ /:(.*)STOPPED/ { print substr($1,1,index($1,":")) }' | uniq)"})
+}
+
+_supervisorctl_list_procs_running() {
+  procs=(${(f)"$(_call_program supervisor_procs supervisorctl status | awk '/RUNNING/ {print $1}')"})
+}
+_supervisorctl_list_groups_running() {
+  groups=(${(f)"$(_call_program supervisor_procs supervisorctl status | awk '$1$2 ~ /:(.*)RUNNING/ { print substr($1,1,index($1,":")) }' | uniq)"})
+}
+
+local -a _1st_arguments
+_1st_arguments=(
+  'add:Activates any updates in config for process/group'
+  'avail:Display all configured processes'
+  'clear:Clear single/multiple/all process log files'
+  'exit:Exit the supervisor shell'
+  'fg:Connect to a process in foreground mode'
+  'maintail:tail of supervisor main log file'
+  'open:Connect to a remote supervisord process. (for UNIX domain socket, use unix:///socket/path)'
+  'pid:Get the PID of process/supervisord'
+  'quit:Exit the supervisor shell'
+  'reload:Restart the remote supervisord'
+  'remove:Removes process/group from active config'
+  "reread:Reload the daemon's configuration files"
+  'restart:Restart process, group or all'
+  'shutdown:Shut the remote supervisord down'
+  'start:Start process, group or all'
+  'status:Get process/group status info'
+  'stop:Stop process, group or all'
+  'tail:tail of process stdout'
+  'update:Reload config and add/remove as necessary'
+  'version:Show the version of the remote supervisord process'
+  'help:Show help'
+)
+
+local expl
+local -a procs
+
+_arguments \
+  {--configuration,-c}='[configuration file path (default /etc/supervisor.conf)]:filename:_files' \
+  {--help,-h}'[print usage message and exit]:' \
+  {--interactive,-i}'[start an interactive shell after executing commands]' \
+  {--serverurl,-s}='[URL on which supervisord server is listening (default "http://localhost:9001")]' \
+  {--username,-u}='[username to use for authentication with server]:username:_users' \
+  {--password,-p}='[password to use for authentication with server]:password:' \
+  {--history-file,-r}'[keep a readline history (if readline is available)]:filename:_files' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands 'supervisorctl subcommand' _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  help)
+    tasks=(add avail clear exit fg maintail open pid quit reload remove \
+           reread restart shutdown start status stop tail update version)
+
+    _wanted tasks expl 'help' compadd $tasks ;;
+
+  add|fg|remove)
+    # commands that only operate on processes
+    _supervisorctl_list_procs
+    _wanted procs expl 'process' compadd -a procs ;;
+
+  clear|pid)
+    # commands that operate on processes and "all"
+    _supervisorctl_list_procs
+    procs+=('all')
+    _wanted procs expl 'process' compadd -a procs ;;
+
+  status|update)
+    # commands that operate on processes, groups & "all"
+    _supervisorctl_list_procs
+    procs+=('all')
+    _wanted procs expl 'process' compadd -a procs
+
+    _supervisorctl_list_groups
+    _wanted groups expl 'group' compadd -a groups ;;
+
+  stop)
+    # commands that operate on RUNNING processes, groups & "all"
+    _supervisorctl_list_procs_running
+    procs+=('all')
+    _wanted procs expl 'process' compadd -a procs
+
+    _supervisorctl_list_groups_running
+    _wanted groups expl 'group' compadd -a groups ;;
+
+  restart|start)
+    # commands that operate on STOPPED processes, groups & "all"
+    _supervisorctl_list_procs_stopped
+    procs+=('all')
+    _wanted procs expl 'process' compadd -a procs
+
+    _supervisorctl_list_groups_stopped
+    _wanted groups expl 'group' compadd -a groups ;;
+
+  tail|maintail)
+    _arguments \
+      '-f[Continuous tail of named process stdout]' \
+      '-[last N *bytes* of process stdout]:number' \
+      '1: :->forms' && return 0
+
+      if [[ $state == forms ]]; then
+        _supervisorctl_list_procs
+        _wanted procs expl 'processes' compadd -a procs
+      fi ;;
+esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_svm b/zsh/modules/completion/external/src/_svm
new file mode 100644
index 0000000..d778f34
--- /dev/null
+++ b/zsh/modules/completion/external/src/_svm
@@ -0,0 +1,169 @@
+#compdef svm
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for svm (https://github.com/yuroyoro/svm)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Hideaki Miyake (https://github.com/mollifier)
+#
+# ------------------------------------------------------------------------------
+
+local context curcontext="$curcontext" state line ret=1
+typeset -A opt_args
+
+
+local -a _1st_arguments
+_1st_arguments=(
+  'help:show this usage information'
+  'current:show the currently use scala version'
+  "list:show the scala version installed in svm_path(default is ${HOME}/.svm)"
+  "versions:show the available scala version not installed"
+  'install:install specific scala version'
+  'remove:uninstall specific scala version and remove their sources'
+  'switch:setup to use a specific scala version'
+  'update-latest:install or update nightly build scala version'
+  'latest:setup to use nightly build scala version'
+  'stable:setup to use stable(x.x.x.final) scala version'
+)
+
+_arguments -C \
+  '(-)-h[show this usage information]' \
+  '-c[show the currently use scala version]' \
+  "-l[show the scala version installed in svm_path(default is ${HOME}/.svm)]" \
+  '-v[show the abalabe scala version not installed]' \
+  '-i[install specific scala version]: :_svm_completion_not_installed_scala_versions' \
+  '-r[uninstall specific scala version and remove their sources]: :_svm_completion_installed_scala_versions' \
+  '(-s -u)'{-s,-u}'[setup to use a specific scala version]: :_svm_completion_not_selected_scala_versions' \
+  '1: :->cmds' \
+  '*:: :->args' && ret=0
+
+
+# installed scala versions
+(( $+functions[_svm_completion_installed_scala_versions] )) ||
+_svm_completion_installed_scala_versions() {
+  local -a _installed_versions
+  _current_version="${$(_call_program installed svm current)#currently version is[[:space:]]*}"
+
+  # collect lines starts with digit
+  _installed_versions=( ${(M)${(@f)"$(_call_program installed svm list)"}:#[[:digit:]]*} )
+
+  _describe -t installed "installed versions" _installed_versions
+}
+
+# installed and not selected scala versions
+(( $+functions[_svm_completion_not_selected_scala_versions] )) ||
+_svm_completion_not_selected_scala_versions() {
+  local _current_version
+  local -a _not_selected_versions
+
+  _current_version="${$(_call_program installed svm current)#currently version is[[:space:]]*}"
+
+  # collect lines starts with digit
+  _not_selected_versions=( ${(M)${(@f)"$(_call_program installed svm list)"}:#[[:digit:]]*} )
+
+  # remove current version
+  _not_selected_versions=( ${_not_selected_versions:#$_current_version})
+  _describe -t installed "not selected versions" _not_selected_versions
+}
+
+# not installed scala versions
+(( $+functions[_svm_completion_not_installed_scala_versions] )) ||
+_svm_completion_not_installed_scala_versions() {
+  local -a _not_installed_versions
+  # collect lines starts with digit
+  _not_installed_versions=( ${(M)${(@f)"$(_call_program installed svm versions)"}:#[[:digit:]]*} )
+
+  _describe -t notinstalled "not installed versions" _not_installed_versions
+}
+
+
+case $state in
+  cmds)
+    # action
+    case $PREFIX in
+      u*)
+        # complete command synonyms
+        local -a _synonym_arguments
+        _synonym_arguments=(
+          'uninstall:uninstall specific scala version and remove their sources'
+          'use:setup to use a specific scala version'
+          'update-latest:install or update nightly build scala version'
+        )
+        _describe -t actions 'svm actions' _synonym_arguments && ret=0
+        ;;
+
+      *)
+        _describe -t actions 'svm actions' _1st_arguments
+        _svm_completion_not_selected_scala_versions && ret=0
+        ;;
+    esac
+    ;;  # end action
+
+  args)
+    # scala version number
+    case $words[1] in
+      install)
+        # install not installed version
+        _arguments \
+          '1: :_svm_completion_not_installed_scala_versions' \
+          '--docs[with install, update-latest download scala-devel-docs.]' \
+          '--sources[with install, update-latest download scala-sources.]' && ret=0
+        ;;
+
+      remove|uninstall)
+        # remove installed version
+        _arguments \
+          '1: :_svm_completion_installed_scala_versions' && ret=0
+        ;;
+
+      switch|use)
+        # use installed version
+        _arguments \
+          '1: :_svm_completion_not_selected_scala_versions' && ret=0
+        ;;
+
+    esac
+
+    ;;  # end args
+esac
+
+return ret
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
+
diff --git a/zsh/modules/completion/external/src/_teamocil b/zsh/modules/completion/external/src/_teamocil
new file mode 100644
index 0000000..30e1c2a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_teamocil
@@ -0,0 +1,47 @@
+#compdef teamocil
+# ------------------------------------------------------------------------------
+# Copyright (c) 2014 Github zsh-users - https://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Teamocil 0.4.5 (https://github.com/remiprev/teamocil).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Petr Zelenin <petr.zelenin@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+_arguments \
+    '--here[set up the first window in the current window]' \
+    '--edit[edit the YAML layout file instead of using it]' \
+    '--layout [use a specific layout file, instead of \`~/.teamocil/<layout>.yml\`]' \
+    '--list[list all available layouts in \`~/.teamocil/\`]' \
+    '--show[show the content of the layout file instead of executing it]' \
+    '*:teamocil layouts:_files -W ~/.teamocil -g "*.yml(:r)"'
diff --git a/zsh/modules/completion/external/src/_thor b/zsh/modules/completion/external/src/_thor
new file mode 100644
index 0000000..081de1f
--- /dev/null
+++ b/zsh/modules/completion/external/src/_thor
@@ -0,0 +1,49 @@
+#compdef thor
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for thor (https://github.com/wycats/thor).
+#
+#  Source: https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/thor
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Andrew Hodges (https://github.com/betawaffle)
+#
+# ------------------------------------------------------------------------------
+
+
+# FIXME This should be rewritten using up-to-date ZSH completion API.
+compadd `thor list | grep thor | cut -d " " -f 2`
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_tmuxinator b/zsh/modules/completion/external/src/_tmuxinator
new file mode 100644
index 0000000..9fff48e
--- /dev/null
+++ b/zsh/modules/completion/external/src/_tmuxinator
@@ -0,0 +1,65 @@
+#compdef tmuxinator mux
+# ------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 Christopher Chow
+#
+# 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.
+# ------------------------------------------------------------------------------
+#
+# Description
+# -----------
+#
+#  Completion script for tmuxinator (https://github.com/tmuxinator/tmuxinator)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Christopher Chow (https://github.com/Soliah)
+#
+# ------------------------------------------------------------------------------
+
+_tmuxinator() {
+  local commands projects
+  commands=(${(f)"$(tmuxinator commands zsh)"})
+  projects=(${(f)"$(tmuxinator completions start)"})
+
+  if (( CURRENT == 2 )); then
+    _describe -t commands "tmuxinator subcommands" commands
+    _describe -t projects "tmuxinator projects" projects
+  elif (( CURRENT == 3)); then
+    case $words[2] in
+      copy|debug|delete|open|start)
+        _arguments '*:projects:($projects)'
+      ;;
+    esac
+  fi
+
+  return
+}
+
+_tmuxinator
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_trash-empty b/zsh/modules/completion/external/src/_trash-empty
new file mode 100644
index 0000000..b25ce93
--- /dev/null
+++ b/zsh/modules/completion/external/src/_trash-empty
@@ -0,0 +1,59 @@
+#compdef trash-empty
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for trash-empty a tool from trash management package trash-cli (http://code.google.com/p/trash-cli).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_trash-empty() {
+
+  _arguments -C \
+    '--version[Show programs version number and exit]' \
+    {-h,--help}'[Show help message and exit]' \
+    '*: :' \
+
+}
+
+_trash-empty
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_trash-list b/zsh/modules/completion/external/src/_trash-list
new file mode 100644
index 0000000..0f821c0
--- /dev/null
+++ b/zsh/modules/completion/external/src/_trash-list
@@ -0,0 +1,59 @@
+#compdef trash-list
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for trash-list a tool from trash management package trash-cli (http://code.google.com/p/trash-cli).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_trash-list() {
+
+  _arguments -C \
+    '--version[Show programs version number and exit]' \
+    {-h,--help}'[Show help message and exit]' \
+    '*: :' \
+
+}
+
+_trash-list
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_trash-put b/zsh/modules/completion/external/src/_trash-put
new file mode 100644
index 0000000..e9bf06d
--- /dev/null
+++ b/zsh/modules/completion/external/src/_trash-put
@@ -0,0 +1,64 @@
+#compdef trash-put trash
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for trash-put a tool from trash management package trash-cli (http://code.google.com/p/trash-cli).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_trash-put() {
+
+  _arguments -C \
+    '--version[Show programs version number and exit]' \
+    {-h,--help}'[Show help message and exit]' \
+    {-d,--directory}'[Remove empty directories - ignored (for GNU rm compabilty)]' \
+    {-f,--force}'[Ignore nonexistent arguments and never prompt - ignored (for GNU rm compabilty)]' \
+    {-i,--interactive}'[Prompt before every removal - ignored (for GNU rm compabilty)]' \
+    {-r,-R,--recursive}'[Remove directories and their content recursively - ignored (for GNU rm compabilty)]' \
+    {-v,--verbose}'[Explain what is being done]' \
+    '*: :_files' \
+
+}
+
+_trash-put
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_trash-restore b/zsh/modules/completion/external/src/_trash-restore
new file mode 100644
index 0000000..35e313a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_trash-restore
@@ -0,0 +1,58 @@
+#compdef trash-restore
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for trash-restore a tool from trash management package trash-cli (http://code.google.com/p/trash-cli).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_trash-restore() {
+
+  _arguments -C \
+    '--version[Show programs version number and exit]' \
+    '*: :' \
+
+}
+
+_trash-restore
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_udisksctl b/zsh/modules/completion/external/src/_udisksctl
new file mode 100644
index 0000000..267c4af
--- /dev/null
+++ b/zsh/modules/completion/external/src/_udisksctl
@@ -0,0 +1,163 @@
+#compdef udisksctl
+#
+# ------------------------------------------------------------------------------
+# The MIT License
+#
+# Copyright 2014 Damir Jelić
+# 
+# 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.
+#
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for udisksctl
+#   (https://cgit.freedesktop.org/udisks/tree/tools)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Damir Jelić <poljarinho at gmail.com> [1]
+#  * Ole Jørgen Brønner <olejorgenb at yahoo.no> (minor additions)
+#
+# [1] https://lists.freedesktop.org/archives/devkit-devel/2014-February/001554.html
+#
+# ------------------------------------------------------------------------------
+# Notes
+# -----
+#
+# udisksctl actually provide built-in support for completion: It accepts an
+# special command 'complete' that returns completeions. That is what drives the
+# upstream bash completion. In the future one might condsider rewriting using
+# that. (but not sure how straight forward it would be to provide descriptions?)
+#
+
+_paths() {
+    local -a _path_list
+
+    for _path in $(_call_program paths "udisksctl complete \"udisksctl $words\" $CURSOR"); do
+        _path_list+=$_path
+    done
+
+    _describe 'paths' _path_list
+}
+
+_filesystems() {
+    _fs_types=(
+        'adfs' 'affs' 'autofs' 'cifs' 'coda' 'coherent' 'cramfs' 'debugfs' 'devpts'
+        'efs' 'ext' 'ext2' 'ext3' 'ext4' 'hfs' 'hfsplus' 'hpfs' 'iso9660' 'jfs' 'minix'
+        'msdos' 'ncpfs' 'nfs' 'nfs4' 'ntfs' 'proc' 'qnx4' 'ramfs' 'reiserfs' 'romfs'
+        'squashfs' 'smbfs' 'sysv' 'tmpfs' 'ubifs' 'udf' 'ufs' 'umsdos' 'usbfs' 'vfat'
+        'xenix' 'xfs' 'xiafs'
+    )
+
+    _describe 'file system types' _fs_types
+}
+
+_udisksctl() {
+    typeset -A opt_args
+    local curcontext="$curcontext" state line
+
+    _arguments -C \
+        '1:udisksctl commands:->cmds' \
+        '*:: :->cmd_args' \
+
+    case $state in
+        cmds)
+            local commands; commands=(
+                'help: Show help'
+                'info: Show info about an object'
+                'dump: Show info about all object'
+                'status: Shows high-level status'
+                'monitor: Monitor changes to objects'
+                'mount: Mount a filesystem'
+                'unmount: Unmount a filesystem'
+                'unlock: Unlock an encrypted device'
+                'lock: Lock an encrypted device'
+                'loop-setup: Set-up a loop device'
+                'loop-delete: Delete a loop device'
+                'power-off: Safely power off a drive'
+                'smart-simulate: Set SMART data for a drive'
+            )
+            _describe -t commands 'udisksctl commands' commands
+        ;;
+
+        cmd_args)
+            case $words[1] in
+                info)
+                    _arguments \
+                        {-p,--object-path}'[Object to get information about]:object path:_paths' \
+                        {-b,--block-device}'[Block device to get information about]:block device:_paths' \
+                        {-d,--drive}'[Drive to get information about]:drives:_paths' \
+                ;;
+                mount)
+                    _arguments \
+                        {-p,--object-path}'[Object to mount]:object path:_paths' \
+                        {-b,--block-device}'[Block device to mount]:block device:_paths' \
+                        {-t,--filesystem-type}'[Filesystem type to use]:fs type:_filesystems' \
+                        {-o,--options}'[Mount options]' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                unmount)
+                    _arguments \
+                        {-p,--object-path}'[Object to unmount]:object path:_paths' \
+                        {-b,--block-device}'[Block device to unmount]:block device:_paths' \
+                        {-f,--force}'[Force/lazy unmount]' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                unlock|lock)
+                    _arguments \
+                        {-p,--object-path}'[Object to lock/unlock]:object path:_paths' \
+                        {-b,--block-device}'[Block device to lock/unlock]:block device:_paths' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                loop-setup)
+                    _arguments \
+                        {-f,--file}'[File to set-up a loop device for]:files:_files' \
+                        {-r,--read-only}'[Setup read-only device]' \
+                        {-o,--offset}'[Start at <num> bytes into file]:offset in bytes:' \
+                        {-s,--size}'[Limit size to <num> bytes]:limit in bytes:' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                loop-delete)
+                    _arguments \
+                        {-p,--object-path}'[Object for loop device to delete]:object path:_paths' \
+                        {-b,--block-device}'[Loop device to delete]:block device:_paths' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                power-off)
+                    _arguments \
+                        {-p,--object-path}'[Object path for ATA device]:object path:_paths' \
+                        {-b,--block-device}'[Device file for ATA devic]:block device:_paths' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+                smart-simulate)
+                    _arguments \
+                        {-f,--file}'[File with libatasmart blob]:files:_files' \
+                        {-p,--object-path}'[Object to get information about]:object path:_paths' \
+                        {-b,--block-device}'[Block device to get information about]:block device:_paths' \
+                        '(--no-user-interaction)--no-user-interaction[Do not authenticate the user if needed]' \
+                ;;
+            esac
+        ;;
+    esac
+}
+
+_udisksctl "$@"
diff --git a/zsh/modules/completion/external/src/_ufw b/zsh/modules/completion/external/src/_ufw
new file mode 100644
index 0000000..b4cf0f1
--- /dev/null
+++ b/zsh/modules/completion/external/src/_ufw
@@ -0,0 +1,143 @@
+#compdef ufw
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for The Uncomplicated Firewall (ufw). (https://launchpad.net/ufw).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jindřich Pilař (https://github.com/JindrichPilar)
+#
+# ------------------------------------------------------------------------------
+
+
+_ufw_logging() {
+
+    local main additional second
+    second=$words[2]
+
+    if [ ! -z $second ]; then
+        return
+    fi
+
+    params=(
+      "on"
+      "off"
+    )
+
+    additional=(
+      "low"
+      "medium"
+      "high"
+      "full"
+    )
+
+    _describe -t params 'On/Off' params
+    _describe -t additional 'Level' additional
+}
+
+
+_ufw_delete() {
+    local rules complrules second
+
+    second=$words[2]
+
+    if [ ! -z $second ]; then
+        return
+    fi
+
+    complrules=()
+    rules=("${(f)$(ufw status | tr -s ' ' | tail -n +5 | tr -s '\n')}")
+
+    for ((i=1; i<=${#rules[@]}; i++)); do
+        complrules+=("$i:$rules[i]");
+    done
+
+    _describe -t complrules 'Rules' complrules
+}
+
+_ufw() {
+    local -a commands
+
+    commands=(
+      "enable:Enables the firewall"
+      "disable:Disables the firewall"
+      "default:Set default policy"
+      "logging:Set logging to LEVEL"
+      "allow:Add allow rule"
+      "deny:Add deny rule"
+      "reject:Add reject rule"
+      "limit:Add limit rule"
+      "delete:Delete RULE"
+      "insert:Insert RULE at NUM"
+      "route:Add route RULE"
+      "reload:Reload firewall"
+      "reset:Reset firewall"
+      "status:Show firewall status"
+      "show:Show firewall report"
+      "version:Display version information"
+    )
+
+
+
+    _arguments -C -s -S -n \
+        '(- 1 *)'--version"[Show program\'s version number and exit]: :->full" \
+        '(- 1 *)'{-h,--help}'[Show help message and exit]: :->full' \
+        '(- 1 *)'--dry-run"[Don\'t modify anything, just show the changes]: :->cmds" \
+        '1:cmd:->cmds' \
+        '*:: :->args' \
+
+    case "$state" in
+      (cmds)
+          _describe -t commands 'commands' commands
+      ;;
+      (args)
+         local cmd
+         cmd=$words[1]
+         case "$cmd" in
+             (logging)
+                 _ufw_logging
+             ;;
+             (delete)
+                 _ufw_delete
+             ;;
+             (*)
+                 return
+             ;;
+         esac
+      ;;
+      (*)
+      ;;
+    esac
+}
+
+_ufw
+
diff --git a/zsh/modules/completion/external/src/_vagrant b/zsh/modules/completion/external/src/_vagrant
new file mode 100644
index 0000000..79d56fb
--- /dev/null
+++ b/zsh/modules/completion/external/src/_vagrant
@@ -0,0 +1,260 @@
+#compdef vagrant
+# ------------------------------------------------------------------------------
+# Copyright (c) 2009-2015 Robby Russell and contributors (see
+# https://github.com/robbyrussell/oh-my-zsh/contributors)
+#
+# 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for Vagrant (http://vagrantup.com).
+#
+#  Source: https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/vagrant
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Nikita Fedyashev (https://github.com/nfedyashev)
+#  * Mark Cornick (https://github.com/markcornick)
+#
+# ------------------------------------------------------------------------------
+
+# vagrant zsh completion
+
+local -a _1st_arguments
+_1st_arguments=(
+    'box:Box commands'
+    'connect:Connects to a shared, remote Vagrant environment'
+    'destroy:Destroys the vagrant environment'
+    'docker-logs:Shows Docker logs'
+    'docker-run:Run one-off commands against a Docker container'
+    'global-status:Reports the status of all active Vagrant environments on the system'
+    'halt:Halts the currently running vagrant environment'
+    'help:[TASK] Describe available tasks or one specific task'
+    'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
+    'list-commands:Outputs all available Vagrant subcommands'
+    'login:Authenticates against a Vagrant Cloud server to access protected boxes'
+    'package:Packages a vagrant environment for distribution'
+    'plugin:Manage plugins'
+    'provision:Run the provisioner'
+    'push:Deploys code in this environment to a configured destination'
+    'rdp:Connects to machine via RDP'
+    'reload:Reload the vagrant environment'
+    'resume:Resumes a suspend vagrant environment'
+    'rsync:Syncs rsync synced folders to remote machine'
+    'rsync-auto:Syncs rsync synced folders automatically when files change'
+    'share:Shares the Vagrant environment and allows remote access'
+    'ssh:SSH into the currently running environment'
+    'ssh-config:Outputs .ssh/config valid syntax for connecting to this environment via ssh'
+    'status:Shows the status of the current Vagrant environment'
+    'suspend:Suspends the currently running vagrant environment'
+    'up:Creates the vagrant environment'
+    'version:Prints the currently installed Vagrant version and checks for new updates'
+    '--version:Prints the Vagrant version information'
+)
+
+local -a _box_arguments
+_box_arguments=(
+    'add:NAME URI Add a box to the system'
+    'help:COMMAND Describe subcommands or one specific subcommand'
+    'list:Lists all installed boxes'
+    'outdated:Checks if there is a new version available for the box'
+    'remove:NAME Remove a box from the system'
+    'repackage:NAME Repackage an installed box into a `.box` file.'
+    'update:Updates the box, if there any updates available'
+)
+
+local -a _plugin_arguments
+_plugin_arguments=(
+    'install:NAME Install a plugin to the system'
+    'license:NAME LICENSE_FILE Add a license for an installed plugin'
+    'list:Lists all installed plugins'
+    'uninstall:NAME Uninstall a plugin from the system'
+    'update:[NAMES...] Update all or specified plugins'
+)
+
+__task_list ()
+{
+    local expl
+    declare -a tasks
+
+    tasks=(box destroy global-status halt init package plugin provision \
+           reload resume ssh ssh_config status suspend up version)
+
+    _wanted tasks expl 'help' compadd $tasks
+}
+
+__box_list ()
+{
+    _wanted application expl 'command' compadd $(command vagrant box list | \
+                                                 awk '{print $1}' | \
+                                                 sed -e 's/ /\\ /g')
+}
+
+__plugin_list ()
+{
+    _wanted application expl 'command' compadd $(command vagrant plugin list \
+                                                 2>/dev/null| cut -d' ' -f1)
+}
+
+_vagrant_caching_policy()
+{
+    local reg_time comp_time check_file
+
+    case "${1##*/}" in
+        VAGRANT_VMS)
+            if [[ -z $VAGRANT_CWD ]]; then
+                check_file=./Vagrantfile
+            else
+                check_file=$VAGRANT_CWD/Vagrantfile
+            fi
+            ;;
+        *)
+            echo "unknown type: $1"
+            return -1
+            ;;
+    esac
+
+    case $(uname -s) in
+        Darwin) STATCMD="stat -f '%c'" ;;
+        *)      STATCMD="stat -c '%Z'" ;;
+    esac
+    reg_time=${$(${(z)STATCMD} $check_file):Q}
+    comp_time=${$(${(z)STATCMD} $1):Q}
+
+    return $(( reg_time < comp_time ))
+}
+
+__vm_list ()
+{
+    local cache_policy
+    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
+    zstyle ":completion:${curcontext}:" cache-policy \
+        ${cache_policy:-_vagrant_caching_policy}
+
+    # Cache the list of VMs available
+    if ( [[ ${+_vagrant_vms} -eq 0 ]] || _cache_invalid VAGRANT_VMS ) &&
+        ! _retrieve_cache VAGRANT_VMS;
+    then
+      _vagrant_vms=( $(_call_program path-all "vagrant status | \
+                       awk '{print \$1}' | \
+                       egrep -v '^$|^(Current|This|above|VM,)$'" ) )
+      _store_cache VAGRANT_VMS _vagrant_vms
+    fi
+
+    _wanted application expl 'command' compadd $_vagrant_vms
+}
+
+__vagrant-box ()
+{
+    local curcontext="$curcontext" state line
+    typeset -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+       (command)
+           _describe -t commands "gem subcommand" _box_arguments
+           return
+       ;;
+
+       (options)
+           case $line[1] in
+               (repackage|remove)
+                   _arguments ':feature:__box_list'
+               ;;
+           esac
+       ;;
+    esac
+}
+
+__vagrant-plugin ()
+{
+    local curcontext="$curcontext" state line
+    local -A opt_args
+
+    _arguments -C \
+        ':command:->command' \
+        '*::options:->options'
+
+   case $state in
+       (command)
+           _describe -t commands "gem subcommand" _plugin_arguments
+           return
+       ;;
+
+       (options)
+           case $line[1] in
+               (license)
+                   _arguments ':feature:__plugin_list' '*:file:_files'
+               ;;
+               (uninstall)
+                   _arguments ':feature:__plugin_list'
+               ;;
+           esac
+       ;;
+    esac
+}
+
+local expl
+local -a boxes installed_boxes
+
+local curcontext="$curcontext" state line
+local -A opt_args
+
+_arguments -C \
+    ':command:->command' \
+    '*::options:->options'
+
+case $state in
+  (command)
+      _describe -t commands "gem subcommand" _1st_arguments
+      return
+  ;;
+
+  (options)
+    case $line[1] in
+      (help)
+         _arguments ':feature:__task_list'
+      ;;
+
+      (box)
+          __vagrant-box
+      ;;
+
+      (plugin)
+          __vagrant-plugin
+      ;;
+      (up|provision|package|destroy|reload|ssh|halt|resume|status|suspend)
+          _arguments ':feature:__vm_list'
+    esac
+  ;;
+esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_virsh b/zsh/modules/completion/external/src/_virsh
new file mode 100644
index 0000000..3dee9c7
--- /dev/null
+++ b/zsh/modules/completion/external/src/_virsh
@@ -0,0 +1,278 @@
+#compdef virsh
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for LibVirt's Shell (virsh) (http://libvirt.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Jan-Philipp Litza <janphilipp@litza.de>
+#  * Vadim A. Misbakh-Soloviov <mva@mva.name>
+#
+# ------------------------------------------------------------------------------
+
+local -a args reply
+
+function _virsh-domains() {
+  local -a out
+  out=( ${${${${(f)"$(virsh list "$@")"}:#(---| Id)*}## #[0-9-]## ##}%% *} )
+  _describe -t domains "${${1#--}:-running} domains" out
+  return $?
+}
+
+local -a expand_files
+expand_files=(/$'[^\0]##\0'/ ':file:file name:_files')
+
+local -a expand_dirs
+expand_dirs=(/$'[^\0]##\0'/ ":dir:dir name:_files -/")
+
+local -a expand_domains
+expand_domains=(
+  /$'[^\0]##\0'/
+  ":domains:domains:{_virsh-domains --all}"
+)
+
+local -a expand_domains_running
+expand_domains_running=(
+  /$'[^\0]##\0'/
+  ":domains:running domains:{_virsh-domains}"
+)
+
+local -a expand_domains_inactive
+expand_domains_inactive=(
+  /$'[^\0]##\0'/
+  ":domains:inactive domains:{_virsh-domains --inactive}"
+)
+
+local -a expand_kilobytes
+expand_kilobytes=(
+  /'\d+'/
+  ":kilobytes:kilobytes:"
+)
+
+local -a expand_count
+expand_count=(
+  /'\d+'/
+  ":count:count:"
+)
+
+local -a subcmd_help
+subcmd_help=(
+  /$'[^\0]##\0'/
+  ":command:virsh command:"
+)
+
+local -a subcmd_list
+_regex_words \
+  list-options 'list options' \
+  '--all:list all domains, not only active' \
+  '--inactive:list only inactive domains'
+subcmd_list=("$reply[@]")
+
+local -a subcmd_freecell
+subcmd_freecell=(
+  /'\d*'/
+  ":numa-cell:NUMA cell:"
+)
+
+local -a subcmd_autostart
+_regex_words \
+  autostart-options 'autostart options' \
+  '--disable:disables autostart instead of enabling'
+subcmd_autostart=("(" "$reply[@]" "|" ")" $expand_domains)
+
+local -a subcmd_create
+_regex_words \
+  create-options 'create options' \
+  '--console:attach to the console after creation' \
+  '--paused:pause domain after creation (if supported by driver)'
+subcmd_create=("(" "$reply[@]" "|" ")" $expand_files)
+
+local -a subcmd_dumpxml
+_regex_words \
+  dumpxml-options 'dumpxml options' \
+  '--inactive:use the config for next reboot instead of current' \
+  '--security-info:include security sensitive information' \
+  '--update-cpu:update CPU requirements according to host CPU'
+subcmd_dumpxml=("(" "$reply[@]" "|" ")" $expand_domains)
+
+local -a subcmd_start
+_regex_words \
+  start-options 'start options' \
+  '--console:attach to console after start' \
+  '--paused: pause after start (if supported by driver)'
+subcmd_start=("(" "$reply[@]" "|" ")" $expand_domains_inactive)
+
+args=( /$'[^\0]#\0'/ )
+
+_regex_words \
+  commands "virsh command" \
+    'help:print help:$subcmd_help' \
+    'attach-device:attach device from an XML file:$expand_domains $expand_files' \
+    'attach-disk:attach disk device' \
+    'attach-interface:attach network interface' \
+    'autostart:autostart a domain:$subcmd_autostart' \
+    'capabilities:capabilities:' \
+    'cd:change the current directory:$expand_dirs' \
+    'connect:(re)connect to hypervisor' \
+    'console:connect to the guest console:$expand_domains_running' \
+    'cpu-baseline:compute baseline CPU:$expand_files' \
+    'cpu-compare:compare host CPU with a CPU described by an XML file:$expand_files' \
+    'create:create a domain from an XML file:$subcmd_create' \
+    'start:start a (previously defined) inactive domain:$subcmd_start' \
+    'destroy:destroy a domain:$expand_domains_running' \
+    'detach-device:detach device from an XML file:$expand_domains $expand_files' \
+    'detach-disk:detach disk device' \
+    'detach-interface:detach network interface' \
+    'define:define (but don'"\'"'t start) a domain from an XML file:$expand_files' \
+    'domid:convert a domain name or UUID to domain id:$expand_domains' \
+    'domuuid:convert a domain name or id to domain UUID:$expand_domains' \
+    'dominfo:domain information:$expand_domains' \
+    'domjobinfo:domain job information:$expand_domains' \
+    'domjobabort:abort active domain job:$expand_domains' \
+    'domname:convert a domain id or UUID to domain name:$expand_domains' \
+    'domstate:domain state:$expand_domains' \
+    'domblkstat:get device block stats for a domain' \
+    'domifstat:get network interface stats for a domain' \
+    'dommemstat:get memory statistics for a domain:$expand_domains_running' \
+    'domblkinfo:domain block device size information' \
+    'domxml-from-native:Convert native config to domain XML' \
+    'domxml-to-native:Convert domain XML to native config' \
+    'dumpxml:domain information in XML:$subcmd_dumpxml' \
+    'edit:edit XML configuration for a domain:$expand_domains' \
+    'find-storage-pool-sources:discover potential storage pool sources' \
+    'find-storage-pool-sources-as:find potential storage pool sources' \
+    'freecell:NUMA free memory:$subcmd_freecell' \
+    'hostname:print the hypervisor hostname:' \
+    'list:list domains:$subcmd_list' \
+    'migrate:migrate domain to another host' \
+    'migrate-setmaxdowntime:set maximum tolerable downtime' \
+    'net-autostart:autostart a network' \
+    'net-create:create a network from an XML file:$expand_files' \
+    'net-define:define (but don'"\'"'t start) a network from an XML file:$expand_files' \
+    'net-destroy:destroy a network' \
+    'net-dumpxml:network information in XML' \
+    'net-edit:edit XML configuration for a network' \
+    'net-list:list networks' \
+    'net-name:convert a network UUID to network name' \
+    'net-start:start a (previously defined) inactive network' \
+    'net-undefine:undefine an inactive network' \
+    'net-uuid:convert a network name to network UUID' \
+    'iface-list:list physical host interfaces' \
+    'iface-name:convert an interface MAC address to interface name' \
+    'iface-mac:convert an interface name to interface MAC address' \
+    'iface-dumpxml:interface information in XML' \
+    'iface-define:define (but don'"\'"'t start) a physical host interface from an XML file' \
+    'iface-undefine:undefine a physical host interface (remove it from configuration)' \
+    'iface-edit:edit XML configuration for a physical host interface' \
+    'iface-start:start a physical host interface (enable it / "if-up")' \
+    'iface-destroy:destroy a physical host interface (disable it / "if-down")' \
+    'managedsave:managed save of a domain state:$expand_domains_running' \
+    'managedsave-remove:Remove managed save of a domain:$expand_domains' \
+    'nodeinfo:node information:' \
+    'nodedev-list:enumerate devices on this host' \
+    'nodedev-dumpxml:node device details in XML' \
+    'nodedev-dettach:dettach node device from its device driver' \
+    'nodedev-reattach:reattach node device to its device driver' \
+    'nodedev-reset:reset node device' \
+    'nodedev-create:create a device defined by an XML file on the node' \
+    'nodedev-destroy:destroy a device on the node' \
+    'nwfilter-define:define or update a network filter from an XML file:$expand_files' \
+    'nwfilter-undefine:undefine a network filter' \
+    'nwfilter-dumpxml:network filter information in XML' \
+    'nwfilter-list:list network filters' \
+    'nwfilter-edit:edit XML configuration for a network filter' \
+    'pool-autostart:autostart a pool' \
+    'pool-build:build a pool' \
+    'pool-create:create a pool from an XML file:$expand_files' \
+    'pool-create-as:create a pool from a set of args' \
+    'pool-define:define (but don'"\'"'t start) a pool from an XML file:$expand_files' \
+    'pool-define-as:define a pool from a set of args' \
+    'pool-destroy:destroy a pool' \
+    'pool-delete:delete a pool' \
+    'pool-dumpxml:pool information in XML' \
+    'pool-edit:edit XML configuration for a storage pool' \
+    'pool-info:storage pool information' \
+    'pool-list:list pools' \
+    'pool-name:convert a pool UUID to pool name' \
+    'pool-refresh:refresh a pool' \
+    'pool-start:start a (previously defined) inactive pool' \
+    'pool-undefine:undefine an inactive pool' \
+    'pool-uuid:convert a pool name to pool UUID' \
+    'secret-define:define or modify a secret from an XML file:$expand_files' \
+    'secret-dumpxml:secret attributes in XML' \
+    'secret-set-value:set a secret value' \
+    'secret-get-value:Output a secret value' \
+    'secret-undefine:undefine a secret' \
+    'secret-list:list secrets' \
+    'pwd:print the current directory:' \
+    'quit:quit this interactive terminal:' \
+    'exit:quit this interactive terminal:' \
+    'reboot:reboot a domain:$expand_domains' \
+    'restore:restore a domain from a saved state in a file:$expand_files' \
+    'resume:resume a domain:$expand_domains_running' \
+    'save:save a domain state to a file:$expand_domains $expand_files' \
+    'schedinfo:show/set scheduler parameters' \
+    'dump:dump the core of a domain to a file for analysis:$expand_domains $expand_files' \
+    'shutdown:gracefully shutdown a domain:$expand_domains_running' \
+    'setmem:change memory allocation:$expand_domains $expand_kilobytes' \
+    'setmaxmem:change maximum memory limit:$expand_domains $expand_kilobytes' \
+    'setvcpus:change number of virtual CPUs:$expand_domains $expand_count' \
+    'suspend:suspend a domain:$expand_domains_running' \
+    'ttyconsole:tty console:$expand_domains_running' \
+    'undefine:undefine an inactive domain:$expand_domains_inactive' \
+    'update-device:update device from an XML file' \
+    'uri:print the hypervisor canonical URI:' \
+    'vol-create:create a vol from an XML file' \
+    'vol-create-from:create a vol, using another volume as input' \
+    'vol-create-as:create a volume from a set of args' \
+    'vol-clone:clone a volume.' \
+    'vol-delete:delete a vol' \
+    'vol-wipe:wipe a vol' \
+    'vol-dumpxml:vol information in XML' \
+    'vol-info:storage vol information' \
+    'vol-list:list vols' \
+    'vol-pool:returns the storage pool for a given volume key or path' \
+    'vol-path:returns the volume path for a given volume name or key' \
+    'vol-name:returns the volume name for a given volume key or path' \
+    'vol-key:returns the volume key for a given volume name or path' \
+    'vcpuinfo:domain vcpu information:$expand_domains_running' \
+    'vcpupin:control domain vcpu affinity' \
+    'version:show version:' \
+    'vncdisplay:vnc display:$expand_domains_running' \
+    'snapshot-create:Create a snapshot:$expand_domains $expand_files' \
+    'snapshot-current:Get the current snapshot:$expand_domains' \
+    'snapshot-delete:Delete a domain snapshot' \
+    'snapshot-dumpxml:Dump XML for a domain snapshot' \
+    'snapshot-list:List snapshots for a domain:$expand_domains' \
+    'snapshot-revert:Revert a domain to a snapshot'
+args+=("$reply[@]")
+
+_regex_arguments _virsh "${args[@]}"
+
+_virsh "$@"
diff --git a/zsh/modules/completion/external/src/_virtualbox b/zsh/modules/completion/external/src/_virtualbox
new file mode 100644
index 0000000..de0e35a
--- /dev/null
+++ b/zsh/modules/completion/external/src/_virtualbox
@@ -0,0 +1,327 @@
+#compdef VBoxManage=vboxmanage VBoxHeadless=vboxheadless
+# ------------------------------------------------------------------------------
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for VirtualBox (http://www.virtualbox.org).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+_vboxmachines() {
+	VBoxManage list vms | egrep -o '^"[^"]+"' 2>/dev/null | sed -e 's|"||g' | while read machine; do
+		_wanted 'machine' expl 'machine' compadd $machine
+	done
+}
+
+# Roughly guess command options
+_vboxcommandoptions() {
+	cmd="$1"
+	cmdoutput=$(VBoxManage "$cmd" 2>/dev/null | tail -n +2 | grep -v 'Syntax error:' | grep -v '<uuid>|<name>' | sed 's|<[^>]\+>||g' | sed 's|VBoxManage [^ ]\+ |  |')
+
+	optcount=0
+	option=""
+	optlines=()
+	echo "$cmdoutput" | egrep -o '  [\[A-Za-z0-9\-\<].*' | while read line; do
+		option="${option}${line}"
+		if [[ $line[-1] != '|' ]]; then
+			optcount=$(($optcount+1))
+			optlines[$optcount]="$option"
+			option=""
+		fi
+	done
+
+	# optionals ([abc])
+	for line in $optlines; do
+		echo "$line" | egrep -o '\[[^]]+\]' | while read option; do
+			option=$(echo $option | sed 's|[]\[]||g' | cut -d ' ' -f 1)
+			_options=(${(s:|:)option})
+			for option in $_options; do
+				_wanted "${cmd}_option" expl "${cmd} option" compadd -- $option
+			done
+		done
+	done
+
+	# mandatory
+	for line in $optlines; do
+		echo "$line" | sed 's|\[[^]]\+\]|\n|g' | while read option; do
+			if [[ "$option" != "" ]]; then
+				_option=$(echo $option | cut -d ' ' -f 1)
+				_options=(${(s:|:)option})
+				for option in $_options; do
+					_wanted "${cmd}_option" expl "${cmd} option" compadd -- $option
+				done
+			fi
+		done
+	done
+}
+
+# List possible mediums
+_vboxmediums() {
+	_wanted "mediums" expl "mediums" compadd -- "none"
+	_wanted "mediums" expl "mediums" compadd -- "emptydrive"
+	_wanted "mediums" expl "mediums" compadd -- "iscsi"
+
+	_files -g '*.{iso,vmdk,vdi}'
+
+	for CD in /dev/cd/*; do
+		readlink -f $CD
+	done | uniq | while read CD; do
+		_wanted "host drives" expl "host drives" compadd -- "host:$CD"
+	done
+}
+
+# List available os types
+_vboxostypes() {
+	VBoxManage list ostypes | grep '^ID' | awk '{print $2}' | while read OSTYPE; do
+		_wanted 'ostype' expl 'os type' compadd -- $OSTYPE
+	done
+}
+
+# Guess options for this commands
+_vboxopts_controlvm() { _vboxcommandoptions controlvm }
+_vboxopts_modifyvm() { _vboxcommandoptions modifyvm }
+_vboxopts_export() { _vboxcommandoptions export }
+
+_vboxmanage() {
+	local -a _1st_arguments
+	_1st_arguments=(
+		"list:gives information about VirtualBox's current settings"
+		'showvminfo:shows information about a particular virtual machine'
+		'registervm:import a virtual machine definition in an XML file into VirtualBox'
+		'unregistervm:unregisters a virtual machine'
+		'createvm:creates a new XML virtual machine definition file'
+		'modifyvm:changes the properties of a registered virtual machine which is not running'
+		'import:imports a virtual appliance in OVF format by copying the virtual disk images and creating virtual machines in VirtualBox'
+		'export:exports one or more virtual machines from VirtualBox into a virtual appliance in OVF format'
+		'startvm:starts a virtual machine that is currently in the "Powered off" or "Saved" states'
+		'controlvm:change the state of a virtual machine that is currently running'
+		'discardstate:discards the saved state of a virtual machine which is not currently running'
+		'adoptstate:adopt a saved state file (.sav)'
+		'snapshot:control snapshots'
+		'closemedium:removes a hard disk, DVD or floppy image from a VirtualBox media registry'
+		'storageattach:attaches/modifies/removes a storage medium connected to a storage controller'
+		'storagectl:attaches/modifies/removes a storage controller'
+		'bandwidthctl:creates/deletes/modifies bandwidth groups'
+		'showhdinfo:shows information about a virtual hard disk image'
+		'createhd:creates a new virtual hard disk image'
+		'modifyhd:change the characteristics of a disk image after it has been created'
+		'clonehd:duplicates a registered virtual hard disk image to a new image file with a new unique identifier'
+		'convertfromraw:converts a raw disk image to a VirtualBox Disk Image (VDI) file'
+		'getextradata:retrieve string data to a virtual machine or to a VirtualBox configuration'
+		'setextradata:attach string data to a virtual machine or to a VirtualBox configuration'
+		'setproperty:change global settings which affect the entire VirtualBox installation'
+		'usbfilter:used for working with USB filters in virtual machines, or global filters'
+		'sharedfolder:share folders on the host computer with guest operating systems'
+		'guestproperty:get or set properties of a running virtual machine'
+		'guestcontrol:control certain things inside a guest from the host'
+		'debugvm:for experts who want to tinker with the exact details of virtual machine execution'
+		'metrics:monitor the usage of system resources'
+		'hostonlyif:change the IP configuration of a host-only network interface'
+		'dhcpserver:control the DHCP server that is built into VirtualBox'
+		'extpack:add or remove VirtualBox extension packs'
+	)
+
+	local context state line expl
+	local -A opt_args
+
+	_arguments '*:: :->subcmds' && return 0
+
+	if (( CURRENT == 1 )); then
+		_describe -t commands "VBoxManage commands" _1st_arguments -V1
+		return
+	fi
+
+	case "$words[1]" in
+		list)
+			_arguments \
+				'--long' \
+				':list option:(vms runningvms ostypes hostdvds hostfloppies bridgedifs hostonlyifs dhcpservers hostinfo hostcpuids hddbackends hdds dvds floppies usbhost usbfilters systemproperties extpacks)'
+		;;
+		showvminfo)
+			_arguments \
+				:machine:_vboxmachines \
+				'--details' \
+				'--machinereadable' \
+				'--log: :'
+		;;
+		unregistervm)
+			_arguments \
+				:machine:_vboxmachines \
+				'--delete'
+		;;
+		createvm)
+			_arguments \
+				'--name: :' \
+				'--ostype:os type:_vboxostypes' \
+				'--register' \
+				'--basefolder:folder:_files -/' \
+				'--settingsfile:file:_files' \
+				'--uuid: :'
+		;;
+		modifyvm)
+			_arguments \
+				:machine:_vboxmachines \
+				:modifyvm_option:_vboxopts_modifyvm
+		;;
+		modifyhd)
+			_arguments \
+				:filename:_files \
+				'--type:hd type:(normal writethrough immutable shareable readonly multiattach)' \
+				'--autoreset:on off:(on off)' \
+				'--property: :' \
+				'--compact' \
+				'--resize:megabytes:' \
+				'--resizebyte:bytes:'
+		;;
+		import)
+			_arguments \
+				':ovf file:_files -g \*.{ovf,ova}' \
+				'--dry-run'
+		;;
+		export)
+			_arguments \
+				:machine:_vboxmachines \
+				:export_option:_vboxopts_export
+		;;
+		startvm)
+			_arguments \
+				:machine:_vboxmachines \
+				'--type:running mode:(gui sdl headless)'
+		;;
+		controlvm)
+			_arguments \
+				:machine:_vboxmachines \
+				:controlvm_option:_vboxopts_controlvm
+		;;
+		adoptstate)
+			_arguments \
+				:machine:_vboxmachines \
+				':sav file:_files -g \*.sav'
+		;;
+		closemedium)
+			_arguments \
+				':type:(disk dvd floppy)' \
+				':file:_files' \
+				'--delete'
+		;;
+		discardstate|bandwidthctl|getextradata|setextradata|debugvm)
+			_arguments \
+				:machine:_vboxmachines
+		;;
+		storagectl)
+			_arguments \
+				:machine:_vboxmachines \
+				'--name: :' \
+				'--add:type:(ide scsi floppy sas)' \
+				'--controller:type:(LSILogic|LSILogicSAS|BusLogic|IntelAHCI|PIIX3|PIIX4|ICH6|I82078)' \
+				--sataideemulation{1..4}":port:({1..30})" \
+				"--sataportcount:num:({1..30})" \
+				'--hostiocache:bool:(on off)' \
+				'--bootable:bool:(on off)' \
+				'--remove' #"
+		;;
+		storageattach)
+			_arguments \
+				:machine:_vboxmachines\
+				'--storagectl:storage ctl:("IDE Controller" "SATA Controller")' \
+				'--port: :' \
+				'--device: :' \
+				'--type:drive type:(dvddrive hdd fdd)' \
+				'--medium:mediums:_vboxmediums' \
+				'--mtype:behaviour:(normal writethrough immutable shareable)' \
+				'--comment: :' \
+				'--passthrough:enabled?:(on off)' \
+				'--bandwidthgroup: :' \
+				'--forceunmount' '--server: :' \
+				'--target: :' \
+				'--lun: :' \
+				'--encodedlun: :' \
+				'--username: :' \
+				'--password: :' \
+				'--intnet: :'
+		;;
+		createhd)
+			_arguments \
+				'--filename:filename:_files -g \*.{vdi,vmdk,vhd}' \
+				'--size:megabytes:' \
+				'--sizebyte:bytes:' \
+				'--format:type:(VDI VMDK VHD)' \
+				'--variant:type:(Standard Fixed Split2G Stream ESX)'
+		;;
+		sharedfolder)
+			_arguments \
+				':action:(add remove)' \
+				:machine:_vboxmachines \
+				'--name: :' \
+				'--hostpath:path:_files -/' \
+				'--transient' \
+				'--readonly' \
+				'--automount'
+		;;
+	esac
+	return 1
+}
+
+_vboxheadless() {
+	local context state line expl
+	local -A opt_args
+
+	_arguments \
+		'(-s -startvm --startvm)'{-s,-startvm,--startvm}'[Start given VM]:machine:_vboxmachines' \
+		'(-n --vnc)'{-n,--vnc}'[Enable the built in VNC server]' \
+		'(-m --vncport)'{-m,--vncport}'[TCP port number to use for the VNC server]:port:' \
+		'(-o --vncpass)'{-o,--vncpass}'[Set the VNC server password]:pw:' \
+		'(-v -vrde --vrde)'{-v,-vrde,--vrde}"[Enable (default) or disable the VRDE server or don't change the setting]::(on off config)" \
+		'(-e -vrdeproperty --vrdeproperty)'{-e,-vrdeproperty,--vrdeproperty}'[Set a VRDE property]: :' \
+		'(-c -capture --capture)'{-c,-capture,--capture}'[Record the VM screen output to a file]' \
+		'(-w --width)'{-w,--width}'[Frame width when recording]:width:' \
+		'(-h --height)'{-h,--height}'[Frame height when recording]:height:' \
+		'(-r --bitrate)'{-r,--bitrate}'[Recording bit rate when recording]:bitrate:' \
+		'(-f --filename)'{-f,--filename}'[File name when recording.  The codec used will be chosen based on the file extension]:filename:_files'
+}
+
+_virtualbox() {
+  local ret=1
+  _call_function ret _$service
+  return ret
+}
+
+_virtualbox "$@"
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_vnstat b/zsh/modules/completion/external/src/_vnstat
new file mode 100644
index 0000000..bfb08dd
--- /dev/null
+++ b/zsh/modules/completion/external/src/_vnstat
@@ -0,0 +1,114 @@
+#compdef vnstat
+# ------------------------------------------------------------------------------
+# Copyright (c) 2012 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for vnstat 1.10
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Aaron Schrab <aaron@schrab.com>
+#
+# ------------------------------------------------------------------------------
+
+local context state state_descr line
+typeset -A opt_args
+
+local period="-d --days -h --hours -m --months -w --weeks"
+
+_arguments : \
+  '--cleartop[Remove all top 10 entries]' \
+  '--config[Specify alternate configuration file]:file:_files' \
+  "($period)"{-d,--days}'[Show traffic for days]' \
+  "($period)"{-h,--hours}'[Show trafic for last 24 hours]' \
+  "($period)"{-m,--months}'[Show traffic for months]' \
+  "($period)"{-w,--weeks}'[Show traffic for 7 days]' \
+  '--dbdir[Specify database directory]:directory:_files -/' \
+  '(-D --debug)'{-D,--debug}'[Show additional debug output]' \
+  '--delete[Delete database and stop monitoring selected interface]' \
+  '--dumpdb[Dump database in parseable format]' \
+  '(--disable)--enable[Enable updates for selected interface]' \
+  '(--enable)--disable[Disable updates for selected interface]' \
+  '(-i --iface)'{-i,--iface}'[Specify interface for actions]:interface:->interface' \
+  '--iflist[List available interfaces]' \
+  '(-l --live)'{-l,--live}'[Display current transfer rate]:mode:->live' \
+  '--locale[Specify locale]:locale:' \
+  '--nick[Set nickname for alias]:nickname:' \
+  '--oneline[Traffic summary in one-line, parseable format]' \
+  '(-q --query)'{-q,--query}'[Force database query mode]' \
+  '(-r --reset)'{-r,--reset}'[Reset internal counters]' \
+  '--rebuildtotal[Reset total trafic counters]' \
+  '(-ru --rateunit)'{-ru,--rateunit}'[Swap configured rate unit]' \
+  '--savemerged[Write result of database merge]'  \
+  '(-s --short)'{-s,--short}'[Use short output mode]' \
+  '--style[Modify content and style of output]:style:->style' \
+  '--sync[Synchronize internal counters]' \
+  '--testkernel[Test kernel boot time information]' \
+  '(-t --top10)'{-t,--top10}'[Show all time top 10 traffic days]' \
+  '-tr[Calculate amount of traffic in given time]:seconds:' \
+  '(-u --update)'{-u,--update}'[Update databases]' \
+  '--xml[Show database content in XML format]' \
+  '(-)'{-v,--version}'[Show current version]' \
+  '(-)'{-\?,--help}'[Show command summary]' \
+  '(-)--longhelp[Show complete options list]' \
+  && ret=0
+
+case "$state" in
+
+  (live)
+    _values 'Live mode' \
+      '0[Packets per second]' \
+      '1[Traffic counters]'
+    ;;
+
+  (style)
+    _values 'Output style' \
+      '0[Narrow output]' \
+      '1[Enable bar column]' \
+      '2[Bar column with average traffic rate]' \
+      '3[Enable average traffic rate]' \
+      '4[Disable use of terminal control characters]'
+    ;;
+
+  (interface)
+    local interfaces="$(_call_program interfaces 'vnstat --iflist')"
+    interfaces="${interfaces#*:}"
+    _values -s + 'Interface' ${(z)interfaces}
+    ;;
+
+esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: filetype=zsh shiftwidth=2 tabstop=2 expandtab
diff --git a/zsh/modules/completion/external/src/_vpnc b/zsh/modules/completion/external/src/_vpnc
new file mode 100644
index 0000000..b5235e4
--- /dev/null
+++ b/zsh/modules/completion/external/src/_vpnc
@@ -0,0 +1,207 @@
+#compdef vpnc vpnc-connect vpnc-disconnect
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for vpnc.
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Julien Nicoulaud <julien.nicoulaud@gmail.com>
+#
+# ------------------------------------------------------------------------------
+
+
+(( $+functions[_vpnc-connect] )) ||
+_vpnc-connect() {
+  _arguments \
+    '(- : *)--version[display version information]' \
+    '(- : *)--'{,long-}'help[display help information]' \
+    '--gateway[IP/name of your IPSec gateway]: :_hosts' \
+    '--id[your group name]: :_groups' \
+    '--username[your username]: :_users' \
+    '--domain[domain name for authentication]: :_domains' \
+    '--xauth-inter[enable interactive extended authentication]' \
+    '--vendor[vendor of your IPSec gateway]: :_vpnc_gateway_vendors' \
+    '--natt-mode[NAT-Traversal method]: :_vpnc_nat_traversal_methods' \
+    '--script[command executed using system() to configure the interface, routing and so on]:command path:_files' \
+    '--dh[name of the IKE DH Group]: :_vpnc_ike_diffie_hellman_groups' \
+    '--pfs[Diffie-Hellman group to use for PFS]: :_vpnc_pfs_diffie_hellman_groups' \
+    '--enable-1des[enable weak single DES encryption]' \
+    '--enable-no-encryption[enable using no encryption for data traffic (key exchanged must be encrypted)]' \
+    '--application-version[application version to report]:application version' \
+    '--ifname[visible name of the TUN/TAP interface]:name' \
+    '--ifmode[mode of TUN/TAP interface]: :_vpnc_tun_tap_modes' \
+    '--debug[show verbose debug messages]: :_vpnc_debug_levels' \
+    '--no-detach[Don'\''t detach from the console after login]' \
+    '--pid-file[store the pid of background process in the file]:pid file:_files' \
+    '--local-addr[local IP to use for ISAKMP/ESP/...]: :_hosts' \
+    '--local-port[local ISAKMP port number to use]: :_vpnc_isakmp_port_numbers' \
+    '--udp-port[local UDP port number to use]: :_vpnc_udp_port_numbers' \
+    '--dpd-idle[send DPD packet after not receiving anything for X seconds]: :_vpnc_dpd_idle_times' \
+    '--non-inter[Don'\''t ask anything, exit on missing options]' \
+    '--auth-mode[authentication mode]: :_vpnc_authentication_modes' \
+    '--ca-file[filename and path to the CA-PEM-File]:CA-PEM file:_files' \
+    '--ca-dir[path of the trusted CA-Directory]:CA directory:_files -/' \
+    '--target-network[target network in dotted decimal or CIDR notation]:target network/netmask' \
+    '--print-config[print your configuration; output can be used as vpnc.conf]' \
+    '*: :_vpnc_confs'
+}
+
+(( $+functions[_vpnc-disconnect] )) ||
+_vpnc-disconnect() {
+  _message 'no more arguments'
+}
+
+(( $+functions[_vpnc_confs] )) ||
+_vpnc_confs() {
+  # FIXME /etc/vpnc/ is only accessible to root, how do we deal with this ?
+  local confs; confs=(/etc/vpnc/*.conf(:t:s/\.conf/))
+  _describe -t confs 'VPNC conf' confs "$@"
+}
+
+(( $+functions[_vpnc_gateway_vendors] )) ||
+_vpnc_gateway_vendors() {
+  local vendors; vendors=(
+    'cisco'
+    'netscreen'
+  )
+  _describe -t vendors 'vendor' vendors "$@"
+}
+
+(( $+functions[_vpnc_nat_traversal_methods] )) ||
+_vpnc_nat_traversal_methods() {
+  local methods; methods=(
+    'natt:NAT-T as defined in RFC3947 (default)'
+    'none:disable use of any NAT-T method'
+    'force-natt:always use NAT-T encapsulation even without presence of a NAT device'
+    'cisco-udp:Cisco proprietary UDP encapsulation, commonly over Port 10000'
+  )
+  _describe -t methods 'NAT traversal method' methods "$@"
+}
+
+(( $+functions[_vpnc_ike_diffie_hellman_groups] )) ||
+_vpnc_ike_diffie_hellman_groups() {
+  local groups; groups=(
+    'dh1'
+    'dh2'
+    'dh5'
+  )
+  _describe -t groups 'IKE Diffie Hellman group' groups "$@"
+}
+
+(( $+functions[_vpnc_pfs_diffie_hellman_groups] )) ||
+_vpnc_pfs_diffie_hellman_groups() {
+  local groups; groups=(
+    'nopfs'
+    'dh1'
+    'dh2'
+    'dh5'
+    'server'
+  )
+  _describe -t groups 'PFS Diffie Hellman group' groups "$@"
+}
+
+(( $+functions[_vpnc_tun_tap_modes] )) ||
+_vpnc_tun_tap_modes() {
+  local modes; modes=(
+    'tun:virtual point to point interface (default)'
+    'tap:virtual ethernet interface'
+  )
+  _describe -t modes 'TUN/TAP interface mode' modes "$@"
+}
+
+(( $+functions[_vpnc_debug_levels] )) ||
+_vpnc_debug_levels() {
+  local levels; levels=(
+    '0:do not print debug information'
+    '1:print minimal debug information'
+    '2:show statemachine and packet/payload type information'
+    '3:dump everything excluding authentication data'
+    '99:dump everything INCLUDING AUTHENTICATION data (e.g. PASSWORDS)'
+  )
+  _describe -t levels 'debug level' levels "$@"
+}
+
+(( $+functions[_vpnc_isakmp_port_numbers] )) ||
+_vpnc_isakmp_port_numbers() {
+  local ports; ports=(
+    '0:use random port'
+    '1:minimum port number'
+    '500:default port number'
+    '65535:maximum port number'
+  )
+  _describe -t ports 'ISAKMP port number' ports "$@"
+}
+
+(( $+functions[_vpnc_udp_port_numbers] )) ||
+_vpnc_udp_port_numbers() {
+  local ports; ports=(
+    '0:use random port'
+    '1:minimum port number'
+    '10000:default port number'
+    '65535:maximum port number'
+  )
+  _describe -t ports 'UDP port number' ports "$@"
+}
+
+(( $+functions[_vpnc_dpd_idle_times] )) ||
+_vpnc_dpd_idle_times() {
+  local times; times=(
+    '0:completely disable DPD'
+    '10:minimum value'
+    '300:default value'
+    '86400:maximum value'
+  )
+  _describe -t times 'DPD idle wait time (seconds)' times "$@"
+}
+
+(( $+functions[_vpnc_authentication_modes] )) ||
+_vpnc_authentication_modes() {
+  local modes; modes=(
+    'psk:pre-shared key (default)'
+    'cert:server + client certificate'
+    'hybrid:server certificate + xauth'
+  )
+  _describe -t modes 'authentication mode' modes "$@"
+}
+
+case $service in
+  vpnc|vpnc-connect) _call_function ret _vpnc-connect && return ret ;;
+  vpnc-disconnect)   _call_function ret _vpnc-disconnect && return ret ;;
+esac
+
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/completion/external/src/_wemux b/zsh/modules/completion/external/src/_wemux
new file mode 100644
index 0000000..d38fc28
--- /dev/null
+++ b/zsh/modules/completion/external/src/_wemux
@@ -0,0 +1,82 @@
+#compdef wemux
+# ------------------------------------------------------------------------------
+# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for wemux (https://github.com/zolrath/wemux)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Akira Maeda <https://github.com/glidenote>
+#
+# ------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# ------------------------------------------------------------------------------
+
+_wemux() {
+
+  local -a host_commands client_commands multi_host_commands
+
+  host_commands=(
+    'start:Start the wemux server/attach to an existing wemux server.'
+    'attach:Attach to an existing wemux server.'
+    'stop:Kill the wemux server '\''wemux'\'', delete its socket.'
+    'users:List all users currently attached to '\''wemux'\'''
+    'kick:Disconnect an SSH user, remove their wemux server.'
+    'config:Open the wemux configuration file in your $EDITOR.'
+    'help:Display this screen.'
+    'version:shows wemux version number'
+  )
+
+  client_commands=(
+    'mirror:Attach to Host in read-only mode.'
+    'pair:Attach to Host in pair mode, which allows editing.'
+    'rogue:Attach to Host in rogue mode, which allows editing and switching to windows independently from the host.'
+    'logout:Log out of the wemux rogueing session.'
+    'users:List the currently attached wemux users.'
+  )
+
+  multi_host_commands=(
+    'join:Join wemux server with supplied name.'
+    'reset:Join default wemux server: wemux'
+    'list:List all currently active wemux servers.'
+  )
+
+  if (( CURRENT == 2 )); then
+    _describe -t host_commands 'HOST COMMANDS' host_commands
+    _describe -t client_commands 'CLIENT COMMANDS' client_commands
+    _describe -t multi_host_commands 'MULTI-HOST COMMANDS' multi_host_commands
+  fi
+
+  return 0
+}
+
+_wemux
diff --git a/zsh/modules/completion/external/src/_xinput b/zsh/modules/completion/external/src/_xinput
new file mode 100644
index 0000000..dd99c36
--- /dev/null
+++ b/zsh/modules/completion/external/src/_xinput
@@ -0,0 +1,208 @@
+#compdef xinput
+# ------------------------------------------------------------------------------
+# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+# names of its contributors may be used to endorse or promote products
+# derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for xinput
+#  TODO: Add property handler
+#  TODO: Add buttons handler
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Timofey Titovets <nefelim4ag@gmail.com>
+#
+# ------------------------------------------------------------------------------
+_xinput(){
+	# list of xinput arguments
+	local -a _1st_arguments
+	_1st_arguments=(
+		'version:show version' '--version:show version'
+		'help:show help options' '--help:show help options'
+		get-feedbacks
+		set-ptr-feedback 
+		set-integer-feedback 
+		get-button-map 
+		set-button-map 
+		set-pointer
+		'set-mode:change the mode of device' '--set-mode:change the mode of device'
+		'list:show devices' '--list:show devices'
+		query-state 
+		test --test
+		create-master 
+		remove-master 
+		reattach 
+		float 
+		set-cp 
+		test-xi2 
+		map-to-output 
+		list-props 
+		set-int-prop 
+		set-float-prop 
+		set-atom-prop 
+		watch-props 
+		delete-prop 
+		set-prop 
+		'disable:disable the device' '--disable:disable the device' 
+		'enable:enable the device'  '--enable:enable the device'
+		--get-feedbacks
+		--set-ptr-feedback 
+		--set-integer-feedback 
+		--get-button-map 
+		--set-button-map 
+		--set-pointer
+		--query-state  
+		--create-master 
+		--remove-master 
+		--reattach 
+		--float 
+		--set-cp 
+		--test-xi2 
+		--map-to-output 
+		--list-props 
+		--set-int-prop 
+		--set-float-prop 
+		--set-atom-prop 
+		--watch-props 
+		--delete-prop 
+		--set-prop 
+	)
+
+	local context state line
+	local -A opt_args
+	# Used with "-O expl" for unsorted.
+	local -a expl
+	expl=(-Vx)
+
+	_arguments '*:: :->subcmds' && return 0
+
+	if (( CURRENT == 1 )); then
+		_describe -t commands "xinput commands" _1st_arguments -V1
+		return
+	fi
+
+	typeset -a xinput_devices_id xinput_devices xinput_devices_name
+	local i name
+	for i in ${(on)$(xinput list --id-only)}; do
+		# Removing prefixes, e.g. from "∼ 7" (floating slave).
+		i=${i##[^[:digit:]]#}
+		[[ -n "$i" ]] || continue
+		xinput_devices_id+=($i)
+		name="$(xinput list --name-only $i)"
+		xinput_devices_name+=($name)
+		xinput_devices+=($i\:$name)
+	done
+	xinput_devices+=($xinput_devices_name)
+
+	# xinput arguments handler
+	case "$words[1]" in
+		--get-feedbacks|--set-ptr-feedback|--get-button-map|--query-state|--list-props|--watch-props|get-feedbacks|set-ptr-feedback|get-button-map|query-state|list-props|watch-props|--enable|enable|--map-to-output|map-to-output|--disable|disable)
+			_arguments -O expl \
+				':list option:(($xinput_devices))'
+		;;
+		--list|list)
+			_arguments -O expl \
+				'--short' \
+				'--long' \
+				'--name-only' \
+				'--id-only' \
+				':list option:(($xinput_devices))' \
+		;;
+		--set-integer-feedback|set-integer-feedback)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' \
+				':list option:( feedback )' \
+				':list option:( $xinput_devices_id )'
+		;;
+		--set-button-map|set-button-map)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' #map button 1 [map button 2 [...]]
+		;;
+		--set-pointer|set-pointer)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' # [x index y index]
+		;;
+		--set-mode|set-mode)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' \
+				':list option:(ABSOLUTE RELATIVE)'
+		;;
+		--test|test)
+			_arguments -O expl \
+				':list option:(-proximity ($xinput_devices ))' \
+				':list option:(($xinput_devices))'
+		;; 
+		--reattach|reattach)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' \
+				':list option:(master slave)'
+		;; 
+		--float|float)
+			_arguments -O expl \
+				':list option:(($xinput_devices))'
+		;; 
+		--test-xi2|test-xi2)
+			_arguments -O expl \
+				':list option:(($xinput_devices --root))' \
+				':list option:(($xinput_devices))'
+		;;
+		--delete-prop|delete-prop)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' #property
+		;;
+		--create-master|create-master)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' # [sendCore (dflt:1)] [enable (dflt:1)]
+		;; 
+		--remove-master|remove-master)
+			_arguments -O expl \
+				':list option:($xinput_devices_id)' # [Floating|AttachToMaster (dflt:Floating)] [returnPointer] [returnKeyboard]
+		;; 
+		# --set-cp|set-cp); window device;; 
+		--set-prop|set-prop)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' \
+				':list option:(--type={atom,float,int} --format={8,16,32})' \
+				':list option:(--type={atom,float,int} --format={8,16,32})' # property val [val ...]
+		;;
+		--set-int-prop|set-int-prop)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' # property format (8, 16, 32) val [val ...]
+		;;
+		--set-float-prop|set-float-prop)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' # property val [val ...]
+		;; 
+		--set-atom-prop|set-atom-prop)
+			_arguments -O expl \
+				':list option:(($xinput_devices))' # property val [val ...]
+		;;
+	esac
+}
+
+_xinput "$@"
diff --git a/zsh/modules/completion/external/src/_yaourt b/zsh/modules/completion/external/src/_yaourt
new file mode 100644
index 0000000..00c9f43
--- /dev/null
+++ b/zsh/modules/completion/external/src/_yaourt
@@ -0,0 +1,393 @@
+#compdef yaourt yaourt.static=yaourt
+# ------------------------------------------------------------------------------
+# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-users nor the
+#       names of its contributors may be used to endorse or promote products
+#       derived from this software without specific prior written permission.
+#
+# 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 ZSH-USERS 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.
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for yaourt (https://archlinux.fr/yaourt-en)
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * zsh-users mailing list
+#
+# ------------------------------------------------------------------------------
+
+# handles --help subcommand
+_yaourt_action_help() {
+    _arguments -s : \
+        "$_yaourt_opts_commands[@]"
+}
+
+# handles cases where no subcommand has yet been given
+_yaourt_action_none() {
+    _arguments -s : \
+        "$_yaourt_opts_commands[@]"
+}
+
+# handles --query subcommand
+_yaourt_action_query() {
+    local context state line
+    typeset -A opt_args
+    
+#   _arguments -s : \
+#       "$_yaourt_opts_common[@]" \
+#       "$_yaourt_opts_query_actions[@]" \
+#       "$_yaourt_opts_query_modifiers[@]"
+    
+    case $state in
+        query_file)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:package file:_files -g "*.pkg.tar*"'
+            ;;
+        query_group)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:groups:_yaourt_completions_installed_groups'
+            ;;
+        query_owner)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:file:_files'
+            ;;
+        query_search)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:search text: '
+            ;;
+        *)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_actions[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:package:_yaourt_completions_installed_packages'
+            ;;
+    esac
+}
+
+# handles --remove subcommand
+_yaourt_action_remove() {
+    _arguments -s : \
+        "$_yaourt_opts_common[@]" \
+        "$_yaourt_opts_remove[@]"
+}
+
+# handles --sync subcommand
+_yaourt_action_sync() {
+    local context state line
+    typeset -A opt_args
+    
+#   _arguments -s : \
+#       "$_yaourt_opts_common[@]" \
+#       "$_yaourt_opts_sync_actions[@]" #\
+#       #"$_yaourt_opts_sync_modifiers[@]"
+    
+    case $state in
+        sync_clean)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*-c[Remove old packages from cache]' \
+                ;;
+        sync_group)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*:package group:_yaourt_completions_all_groups'
+            ;;
+        sync_search)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*:search text: '
+            ;;
+        *)
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*:package:_yaourt_completions_all_packages'
+            ;;
+    esac
+}
+
+# handles --upgrade subcommand
+_yaourt_action_upgrade() {
+    _arguments -s : \
+        "$_yaourt_opts_common[@]" \
+        "$_yaourt_opts_pkgfile[@]"
+}
+
+# handles --version subcommand
+_yaourt_action_version() {
+    # no further arguments
+    return 0
+}
+
+# provides completions for package groups
+_yaourt_completions_all_groups() {
+    local -a cmd groups
+    _yaourt_get_command
+    groups=( $(_call_program groups $cmd[@] -Sg) )
+    typeset -U groups
+    compadd "$@" -a groups
+}
+
+# provides completions for packages available from repositories
+# these can be specified as either 'package' or 'repository/package'
+_yaourt_completions_all_packages() {
+    local -a cmd packages repositories packages_long
+    _yaourt_get_command
+
+    if compset -P1 '*/*'; then
+        packages=( $(_call_program packages $cmd[@] -Sql ${words[CURRENT]%/*}) )
+        typeset -U packages
+        if [[ -d /var/aur ]]; then
+            packages=( $packages $(ls /var/aur) )
+        fi
+        _wanted repo_packages expl "repository/package" compadd ${(@)packages}
+    else
+        packages=( $(_call_program packages $cmd[@] -Sql) )
+        typeset -U packages
+        if [[ -d /var/aur ]]; then
+            packages=( $packages $(ls /var/aur) )
+        fi
+        _wanted packages expl "packages" compadd - "${(@)packages}"
+
+        repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+        typeset -U repositories
+        _wanted repo_packages expl "repository/package" compadd -S "/" $repositories
+    fi
+}
+
+# provides completions for package groups
+_yaourt_completions_installed_groups() {
+    local -a cmd groups
+    _yaourt_get_command
+    groups=(${(o)${(f)"$(_call_program groups $cmd[@] -Qg)"}% *})
+    typeset -U groups
+    compadd "$@" -a groups
+}
+
+# provides completions for installed packages
+_yaourt_completions_installed_packages() {
+    local -a cmd packages packages_long
+    packages_long=(/var/lib/pacman/local/*(/))
+    packages=( ${${packages_long#/var/lib/pacman/local/}%-*-*} )
+    compadd "$@" -a packages
+}
+
+# provides completions for repository names
+_yaourt_completions_repositories() {
+    local -a cmd repositories
+    repositories=(${(o)${${${(M)${(f)"$(</etc/pacman.conf)"}:#\[*}/\[/}/\]/}:#options})
+    # Uniq the array
+    typeset -U repositories
+    compadd "$@" -a repositories
+}
+
+# builds command for invoking pacman in a _call_program command - extracts
+# relevant options already specified (config file, etc)
+# $cmd must be declared by calling function
+_yaourt_get_command() {
+    # this is mostly nicked from _perforce
+    cmd=$( grep "^PACMAN=" "/etc/yaourtrc" \
+           && grep "^PACMAN=" "/etc/yaourtrc" | cut -c8- \
+           || echo "pacman" )
+    integer i
+    for (( i = 2; i < CURRENT - 1; i++ )); do
+        if [[ ${words[i]} = "--config" || ${words[i]} = "--root" ]]; then
+            cmd+=( ${words[i,i+1]} )
+        fi
+    done
+}
+
+# main dispatcher
+_yaourt() {
+    typeset -A opt_args
+
+    # options for passing to _arguments: main pacman commands
+    typeset -a _yaourt_opts_commands
+    _yaourt_opts_commands=(
+        '-Q[Query the package database]'
+        '-R[Remove a package from the system]'
+        '-S[Synchronize packages]'
+        '-U[Upgrade a package]'
+        '-V[Display version and exit]'
+        '-h[Display usage]'
+        '-B[backup pacman database]'
+        '-G[Get PKGBUILD]'
+        '-C[Clean backup files]'
+        '--stats[Package Statistics]'
+    )
+
+    # options for passing to _arguments: options common to all commands
+    typeset -a _yaourt_opts_common
+    _yaourt_opts_common=(
+        '-b[Alternate database location]:database_location:_files -/'
+        '-h[Display syntax for the given operation]'
+        '-r[Alternate installation root]:installation root:_files -/'
+        '-v[Be more verbose]'
+        '--cachedir[Alternate package cache location]:cache_location:_files -/'
+        '--config[Alternate configuration file]:config file:_files'
+        '--debug[Display debug messages]'
+        '--gpgdir[Alternate GnuPG home directory]:gpg_directory:_files -/'
+        '--logfile[Alternate log file]:config file:_files'
+        '--noconfirm[Do not ask for confirmation]'
+        '--noprogressbar[Do not show a progress bar when downloading files]'
+        '--noscriptlet[Do not execute the install scriptlet if one exists]'
+        '--print[Only print the targets instead of performing the operation]'
+    )
+
+    # options for passing to _arguments: options for --upgrade commands
+    typeset -a _yaourt_opts_pkgfile
+    _yaourt_opts_pkgfile=(
+        '-d[Skip dependency checks]'
+        '-f[Overwrite conflicting files]'
+        '*:package file:_files -g "*.pkg.tar*(.)"'
+    )
+
+    # options for passing to _arguments: subactions for --query command
+    typeset -a _yaourt_opts_query_actions
+    _yaourt_opts_query_actions=(
+        '-g[View all members of a package group]:*:package groups:->query_group'
+        '-o[Query the package that owns a file]:file:_files'
+        '-p[Package file to query]:*:package file:->query_file'
+        '-s[Search package names and descriptions]:*:search text:->query_search'
+    )
+
+    # options for passing to _arguments: options for --query and subcommands
+    typeset -a _yaourt_opts_query_modifiers
+    _yaourt_opts_query_modifiers=(
+        '-c[List package changelog]'
+        '-d[List packages installed as dependencies]'
+        '-e[List packages explicitly installed]'
+        '-i[View package information]'
+        '-ii[View package information including backup files]'
+        '-k[Check package files]'
+        '-l[List package contents]'
+        '-m[List installed packages not found in sync db(s)]'
+        '-t[List packages not required by any package]'
+        '-u[List packages that can be upgraded]'
+        '--aur[Install packages from aur, even if they are in community, or, with the -u option, update packages installed from aur]'
+        '--devel[Used with -u updates all cvs/svn/git/hg/bzr packages]'
+        '--date[List packages sorted ascendingly (oldest is printed first) by installation date]'
+    )
+
+    # options for passing to _arguments: options for --remove command
+    typeset -a _yaourt_opts_remove
+    _yaourt_opts_remove=(
+        '-c[Remove all dependent packages]'
+        '-d[Skip dependency checks]'
+        '-k[Only remove database entry, do not remove files]'
+        '-n[Remove protected configuration files]'
+        '-s[Remove dependencies not required by other packages]'
+        '*:installed package:_yaourt_completions_installed_packages'
+    )
+
+    # options for passing to _arguments: options for --sync command
+    typeset -a _yaourt_opts_sync_actions
+    _yaourt_opts_sync_actions=(
+        '*-c[Remove old packages from cache]:*:clean:->sync_clean'
+        '*-cc[Remove all packages from cache]:*:clean:->sync_clean'
+        '-g[View all members of a package group]:*:package groups:->sync_group'
+        '-s[Search package names and descriptions]:*:search text:->sync_search'
+    )
+
+    # options for passing to _arguments: options for --sync command
+    typeset -a _yaourt_opts_sync_modifiers
+    _yaourt_opts_sync_modifiers=(
+        '-d[Skip dependency checks]'
+        '-f[Overwrite conflicting files]'
+        '-i[View package information]'
+        '-l[List all packages in a repository]'
+        '-p[Print download URIs for each package to be installed]'
+        '-u[Upgrade all out-of-date packages]'
+        '-w[Download packages only]'
+        '-y[Download fresh package databases]'
+        '*--ignore[Ignore a package upgrade]:package:
+            _yaourt_completions_all_packages'
+        '*--ignoregroup[Ignore a group upgrade]:package group:
+            _yaourt_completions_all_groups'
+        '--asdeps[Install packages as non-explicitly installed]'
+        '--asexplicit[Install packages as explicitly installed]'
+        '--needed[Do not reinstall up to date packages]'
+        '--devel[Used with -u updates all cvs/svn/git/hg/bzr packages]'
+    )
+
+    case $words[2] in
+        -Q*g*) # ipkg groups
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:groups:_yaourt_completions_installed_groups'
+            ;;
+        -Q*o*) # file
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:package file:_files'
+            ;;
+        -Q*p*) # file *.pkg.tar*
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_query_modifiers[@]" \
+                '*:package file:_files -g "*.pkg.tar*"'
+            ;;
+        -Q*)  _yaourt_action_query    ;;
+        -R*)  _yaourt_action_remove   ;;
+        -S*c*) # no completion
+            return 0
+            ;;
+        -S*l*) # repos
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*:package repo:_yaourt_completions_repositories' \
+                ;;
+        -S*g*) # pkg groups
+            _arguments -s : \
+                "$_yaourt_opts_common[@]" \
+                "$_yaourt_opts_sync_modifiers[@]" \
+                '*:package group:_yaourt_completions_all_groups'
+            ;;
+        -S*)  _yaourt_action_sync     ;;
+        -U*)  _yaourt_action_upgrade  ;;
+        -V*)  _yaourt_action_version  ;;
+        -h*)  _yaourt_action_help     ;;
+        -  )  _yaourt_action_none     ;;
+        *  )  return 1                ;;
+    esac
+}
+
+# run the main dispatcher
+_yaourt "$@"
diff --git a/zsh/modules/completion/external/zsh-completions-howto.org b/zsh/modules/completion/external/zsh-completions-howto.org
new file mode 100644
index 0000000..d494a10
--- /dev/null
+++ b/zsh/modules/completion/external/zsh-completions-howto.org
@@ -0,0 +1,440 @@
+* Intro
+The official documentation for writing zsh completion functions is difficult to understand, and doesn't give many examples.
+At the time of writing this document I was able to find a few other tutorials on the web, however those tutorials only
+explain a small portion of the capabilities of the completion system. This document aims to cover areas not explained elsewhere,
+with examples, so that you can learn how to write more advanced completion functions. I do not go into all the details, but will 
+give enough information and examples to get you up and running. If you need more details you can look it up for yourself in the
+ [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-System][official documentation]].
+
+Please make any scripts that you create publically available for others (e.g. by forking this repo and making a [[id:64bcd501-b0f0-48c7-b8e2-07af708b95ec][pull request]]).
+Also if you have any more information to add or improvements to make to this tutorial, please do.
+* Getting started
+** Telling zsh which function to use for completing a command
+Completion functions for commands are stored in files with names beginning with an underscore _, and these files should 
+be placed in a directory listed in the $fpath variable.
+You can add a directory to $fpath by adding a line like this to your ~/.zshrc file: 
+#+BEGIN_SRC sh 
+fpath=(~/newdir $fpath)
+#+END_SRC
+The first line of a completion function file can look something like this:
+#+BEGIN_SRC sh 
+#compdef foobar
+#+END_SRC
+This tells zsh that the file contains code for completing the foobar command.
+This is the format that you will use most often for the first line, but you can also use the same file for completing
+several different functions if you want. See [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Autoloaded-files][here]] for more details.
+
+You can also use the compdef command directly (e.g. in your ~/.zshrc file) to tell zsh which function to use for completing 
+a command like this:
+#+BEGIN_SRC sh 
+> compdef _function foobar
+#+END_SRC
+or to use the same completions for several commands:
+#+BEGIN_SRC sh 
+> compdef _function foobar goocar hoodar
+#+END_SRC
+or if you want to supply arguments:
+#+BEGIN_SRC sh 
+> compdef '_function arg1 arg2' foobar
+#+END_SRC
+See [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Functions-4][here]] for more details.
+** Completing generic gnu commands
+Many [[http://www.gnu.org/][gnu]] commands have a standardized way of listing option descriptions (when the --help option is used).
+For these commands you can use the _gnu_generic function for automatically creating completions, like this:
+#+BEGIN_SRC sh 
+> compdef _gnu_generic foobar
+#+END_SRC
+or to use _gnu_generic with several different commands:
+#+BEGIN_SRC sh 
+> compdef _gnu_generic foobar goocar hoodar
+#+END_SRC
+This line can be placed in your ~/.zshrc file.
+** Copying completions from another command
+If you want a command, say cmd1, to have the same completions as another, say cmd2, which has already had 
+completions defined for it, you can do this:
+#+BEGIN_SRC sh 
+> compdef cmd1=cmd2
+#+END_SRC
+This can be useful for example if you have created an alias for a command to help you remember it.
+* Writing your own completion functions
+A good way to get started is to look at some already defined completion functions.
+On my linux installation these are found in /usr/share/zsh/functions/Completion/Unix 
+and /usr/share/zsh/functions/Completion/Linux and a few other subdirs.
+
+You will notice that the _arguments function is used a lot in these files. 
+This is a utility function that makes it easy to write simple completion functions. 
+The _arguments function is a wrapper around the compadd builtin function.
+The compadd builtin is the core function used to add completion words to the command line, and control its behaviour.
+However, most of the time you will not need to use compadd, since there are many utility functions such as _arguments
+and _describe which are easier to use.
+
+For very basic completions the _describe function should be adequate
+
+** Utility functions
+Here is a list of some of the utility functions that may be of use. 
+The full list of utility functions, with full explanations, is available [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-Functions][here]].
+Examples of how to use these functions are given in the next section.
+
+*** main utility functions for overall completion
+| _alternative     | Can be used to generate completion candidates from other utility functions or shell code.                         |
+| _arguments       | Used to specify how to complete individual options & arguments for a command with unix style options.                             |
+| _describe        | Used for creating simple completions consisting of single words with descriptions (but no actions). Easier to use than _arguments |
+| _gnu_generic     | Can be used to complete options for commands that understand the `--help' option.                                                 |
+| _regex_arguments | Creates a function for matching commandline arguments with regular expressions, and then performing actions/completions.          |
+*** functions for performing complex completions of single words 
+| _values      | Used for completing arbitrary keywords (values) and their arguments, or comma separated lists of such combinations.                                                  |
+| _combination | Used to complete combinations of values, for example pairs of hostnames and usernames.                                                                               |
+| _multi_parts | Used for completing multiple parts of words separately where each part is separated by some char, e.g. for completing partial filepaths: /u/i/sy -> /usr/include/sys |
+| _sep_parts   | Like _multi_parts but allows different separators at different parts of the completion.                                                                              |
+*** functions for completing specific types of objects
+| _path_files     | Used to complete filepaths. Take several options to control behaviour.                                    |
+| _files          | Calls _path_files with all options except -g and -/. These options depend on file-patterns style setting. |
+| _net_interfaces | Used for completing network interface names                                                               |
+| _users          | Used for completing user names                                                                            |
+| _groups         | Used for completing group names                                                                           |
+| _options        | Used for completing the names of shell options.                                                           |
+| _parameters     | Used for completing the names of shell parameters/variables (can restrict to those matching a pattern).   |
+*** functions for handling cached completions
+If you have a very large number of completions you can save them in a cache file so that the completions load quickly.
+| _cache_invalid  | indicates whether the completions cache corresponding to a given cache identifier needs rebuilding |
+| _retrieve_cache | retrieves completion information from a cache file                                                 |
+| _store_cache    | store completions corresponding to a given cache identifier in a cache file                        |
+*** other functions
+| _message     | Used for displaying help messages in places where no completions can be generated.                                      |
+| _regex_words | Can be used to generate arguments for the _regex_arguments command. This is easier than writing the arguments manually. |
+| _guard       | Can be used in the ACTION of specifications for _arguments and similar functions to check the word being completed.     |
+*** Actions
+Many of the utility functions such as _arguments, _regex_arguments, _alternative and _values may include an action
+at the end of an option/argument specification. This action indicates how to complete the corresponding argument.
+The actions can take one of the following forms:
+| ( )                               | Argument is required but no matches are generated for it.                                                                                |
+| (ITEM1 ITEM2)                     | List of possible matches                                                                                                                 |
+| ((ITEM1\:'DESC1' ITEM2\:'DESC2')) | List of possible matches, with descriptions. Make sure to use different quotes than those around the whole specification.                |
+| ->STRING                          | Set $state to STRING and continue ($state can be checked in a case statement after the utility function call)                            |
+| FUNCTION                          | Name of a function to call for generating matches or performing some other action, e.g. _files or _message                               |
+| {EVAL-STRING}                     | Evaluate string as shell code to generate matches. This can be used to call a utility function with arguments, e.g. _values or _describe |
+| =ACTION                           | Inserts a dummy word into completion command line without changing the point at which completion takes place.                            |
+Not all action types are available for all utility functions that use them. For example the ->STRING type is not available in the
+_regex_arguments or _alternative functions. 
+** Writing simple completion functions using _describe
+The _describe function can be used for simple completions where the order and position of the options/arguments is
+not important. You just need to create an array parameter to hold the options & their descriptions, and then pass 
+the parameter name as an argument to _describe. The following example creates completion candidates -c and -d, with
+the descriptions (note this should be put in a file called _cmd in some directory listed in $fpath).
+#+BEGIN_SRC sh 
+#compdef cmd
+local -a options 
+options=('-c:description for -c opt' '-d:description for -d opt')
+_describe 'values' options
+#+END_SRC
+
+You can use several different lists separated by a double hyphen e.g. like this:
+#+BEGIN_SRC sh 
+local -a options arguments 
+options=('-c:description for -c opt' '-d:description for -d opt')
+arguments=('e:description for e arg' 'f:description for f arg')
+_describe 'values' options -- arguments
+#+END_SRC
+
+The _describe function can be used in an ACTION as part of a specification for _alternative, _arguments or _regex_arguments.
+In this case you will have to put it in braces with its arguments, e.g. 'TAG:DESCRIPTION:{_describe 'values' options}'
+** Writing completion functions using _alternative
+Like _describe, this function performs simple completions where the order and position of options/arguments is not important.
+However, unlike _describe, you can call execute shell code or call functions to obtain the completion candidates.
+
+As arguments it takes a list of specifications each in the form 'TAG:DESCRIPTION:ACTION' where TAG is a tag name, 
+DESCRIPTION is a description, and ACTION is one of the action types listed previously (apart from the ->STRING and =ACTION forms).
+For example:
+#+BEGIN_SRC sh 
+_alternative 'args:custom args:(a b c)' 'files:filenames:_files'
+#+END_SRC
+The first specification adds completion candidates a, b & c, and the second specification calls the _files function 
+for completing filepaths.
+
+We could split the specifications over several lines with \ and add descriptions to each of the custom args like this:
+#+BEGIN_SRC sh 
+_alternative 'args:custom args:((a\:"description a" b\:"description b" c\:"description c"))'\
+             'files:filenames:_files'
+#+END_SRC
+
+If we want to call _files with arguments we can put it in braces, like this:
+#+BEGIN_SRC sh 
+_alternative 'args:custom args:((a\:"description a" b\:"description b" c\:"description c"))'\
+             'files:filenames:{_files -/}'
+#+END_SRC
+
+To use parameter expansion to create our list of completions we must use double quotes to quote the specifications,
+e.g:
+#+BEGIN_SRC sh 
+_alternative "dirs:user directories:($userdirs)"\
+             "pids:process IDs:($(ps -A o pid=))"
+#+END_SRC
+In this case the first specification adds the words stored in the $userdirs variable, and the second specification
+evaluates 'ps -A o pid=' to get a list of pids to use as completion candidates.
+
+We can use other utility functions such as _values in the ACTION to perform more complex completions, e.g:
+#+BEGIN_SRC sh 
+_alternative "dirs:user directories:($userdirs)"\
+             'opts:comma separated opts:{_values -s , a b c}'
+#+END_SRC
+this will complete the items in $userdirs, aswell as a comma separated list containing a, b &/or c.
+
+As with _describe, the _alternative function can itself be used in an ACTION as part of a specification for _arguments 
+or _regex_arguments. 
+** Writing completion functions using _arguments
+With the _arguments function you can create more sophisticated completion functions.
+Like the _alternative function, _arguments takes a list of specification strings as arguments.
+These specification strings can be for specifying options and any corresponding option arguments (e.g. -f filename), 
+or command arguments. 
+
+Basic option specifications take the form '-OPT[DESCRIPTION]', e.g. like this:
+#+BEGIN_SRC sh 
+_arguments '-s[sort output]' '--l[long output]' '-l[long output]'
+#+END_SRC
+Arguments for the option can be specified after the option description in this form '-OPT[DESCRIPTION]:MESSAGE:ACTION',
+where MESSAGE is a message to display and ACTION can be any of the forms mentioned in the ACTIONS section above.
+For example:
+#+BEGIN_SRC sh 
+_arguments '-f[input file]:filename:_files' 
+#+END_SRC
+
+Command argument specifications take the form 'N:MESSAGE:ACTION' where N indicates that it is the Nth command argument,
+and MESSAGE & ACTION are as before. If the N is omitted then it just means the next command argument (after any that have
+already been specified). If a double colon is used at the start (after N) then the argument is optional.
+For example:
+#+BEGIN_SRC sh 
+_arguments '-s[sort output]' '1:first arg:_net_interfaces' '::optional arg:_files' ':next arg:(a b c)'
+#+END_SRC
+here the first arg is a network interface, the next optional arg is a file name, the last arg can be either a, b or c,
+and the -s option may be completed at any position.
+
+The _arguments function allows the full set of ACTION forms listed in the ACTION section above.
+This means that you can use actions for selecting case statement branches like this:
+#+BEGIN_SRC sh
+_arguments '-m[music file]:filename:->files' '-f[flags]:flag:->flags'
+case "$state" in
+    files)
+        local -a music_files
+        music_files=( Music/**/*.{mp3,wav,flac,ogg} )
+        _multi_parts / music_files
+        ;;
+    flags)
+        _values -s , 'flags' a b c d e
+        ;;
+esac
+#+END_SRC
+In this case paths to music files are completed stepwise descending down directories using the _multi_parts function, 
+and the flags are completed as a comma separated list using the _values function.
+
+I have just given you the basics of _arguments specifications here, you can also specify mutually exclusive options,
+repeated options & arguments, options beginning with + insead of -, etc. For more details see the [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-System][official documentation]].
+Also have a look at the tutorials mentioned at the end of this document, and the completion functions in the [[https://github.com/vapniks/zsh-completions/tree/master/src][src directory]].
+** Writing completion functions using _regex_arguments and _regex_words
+If you have a complex command line specification with several different possible argument sequences then 
+the _regex_arguments function may be what you need.
+
+_regex_arguments creates a completion function whose name is given by the first argument. 
+Hence you need to first call _regex_arguments to create the completion function, and then call that function, 
+e.g. like this:
+#+BEGIN_SRC sh 
+_regex_arguments _cmd OTHER_ARGS..
+_cmd "$@"
+#+END_SRC
+
+The OTHER_ARGS should be sequences of specifications for matching & completing words on the command line.
+These sequences can be separated by '|' to represent alternative sequences of words.
+You can use bracketing to arbitrary depth to specify alternate subsequences, but the brackets must be backslashed like this \( \) 
+or quoted like this '(' ')'.
+
+For example:
+#+BEGIN_SRC sh 
+_regex_arguments _cmd SEQ1 '|' SEQ2 \( SEQ2a '|' SEQ2b \)
+_cmd "$@"
+#+END_SRC
+this specifies a command line matching either SEQ1, or SEQ2 followed by SEQ2a or SEQ2b.
+
+Each specification in a sequence must contain a / PATTERN/ part at the start followed by an optional ':TAG:DESCRIPTION:ACTION' 
+part. 
+
+Each PATTERN is a regular expression to match a word on the command line. These patterns are processed sequentially
+until we reach a pattern that doesn't match at which point any corresponding ACTION is performed to obtain completions
+for that word. Note that there needs to be a pattern to match the initial command itself.
+See below for further explanation about PATTERNs.
+
+The ':TAG:DESCRIPTION:ACTION' part is interpreted in the same way as for the _alternative function specifications,
+except that it has an extra : at the start, and now all of the possible ACTION formats listed previously are allowed.
+
+Here is an example:
+#+BEGIN_SRC sh 
+_regex_arguments _hello /$'[^\0]##\0'/ \( /$'word1(a|b|c)\0'/ ':word:first word:(word1a word1b word1c)' '|'\
+   /$'word11(a|b|c)\0'/ ':word:first word:(word11a word11b word11c)' \( /$'word2(a|b|c)\0'/ ':word:second word:(word2a word2b word2c)'\
+   '|' /$'word22(a|b|c)\0'/ ':word:second word:(word22a word22b word22c)' \) \)
+_cmd "$@"
+#+END_SRC
+in this case the first word can be word1 or word11 followed by an a, b or c, and if the first word contains 11 then a second
+word is allowed which can be word2 followed by and a, b, or c, or a filename.
+
+If this sounds too complicated a much simpler alternative is to use the _regex_words function for creating
+specifications for _regex_arguments. 
+*** Patterns
+You may notice that the / PATTERN/ specs in the previous example don't look like normal regular expressions.
+Often a string parameter in the form $'foo\0' is used. This is so that the \0 in the string is interpreted correctly
+as a null char which is used to separate words in the internal representation. If you don't include the \0 at the end
+of the pattern you may get problems matching the next word. If you need to use the contents of a variable in a pattern, 
+you can double quote it so that it gets expanded and then put a string parameter containing a null char afterwards, 
+like this: "$somevar"$'\0'
+
+The regular expression syntax for patterns seems to be a bit different from normal regular expressions,
+and I can't find documentation anywhere. 
+However I have managed to work out what the following special chars are for:
+| *  | wildcard - any number of chars                                            |
+| ?  | wildcard - single char                                                    |
+| #  | zero or more of the previous char (like * in a normal regular expression) |
+| ## | one or more of the previous char (like + in a normal regular expression)  |
+*** _regex_words
+The _regex_words function makes it much easier to create specifications for _regex_arguments. 
+The results of calling _regex_words can be stored in a variable which can then be used instead 
+of a specification for _regex_arguments. 
+
+To create a specification using _regex_words you supply it with a tag followed by a description followed by a list
+of specifications for individual words. These specifications take the form 'WORD:DESCRIPTION:SPEC' where WORD is the 
+word to be completed, DESCRIPTION is a description for it, and SPEC can be another variable created by _regex_words 
+specifying words that come after the current word or blank if there are no further words.
+For example:
+#+BEGIN_SRC sh 
+_regex_words firstword 'The first word' 'word1a:a word:' 'word1b:b word:' 'word1c:c word'
+#+END_SRC
+the results of this function call will be stored in the $reply array, and so we should store it in another array 
+before $reply gets changed again, like this:
+#+BEGIN_SRC sh 
+local -a firstword
+_regex_words word 'The first word' 'word1a:a word:' 'word1b:b word:' 'word1c:c word'
+firstword="$reply[@]"
+#+END_SRC
+we could then use it with _regex_arguments like this:
+#+BEGIN_SRC sh 
+_regex_arguments _cmd /$'[^\0]##\0'/ "$firstword[@]"
+_cmd "$@"
+#+END_SRC
+Note that I have added an extra pattern for the initial command word itself.
+
+Here is a more complex example where we call _regex_words for different words on the command line
+#+BEGIN_SRC sh 
+local -a firstword firstword2 secondword secondword2
+_regex_words word1 'The second word' 'woo:tang clan' 'hoo:not me'
+secondword=("$reply[@]")
+_regex_words word2 'Another second word' 'yee:thou' 'haa:very funny!'
+secondword2=("$reply[@]")
+_regex_words commands 'The first word' 'foo:do foo' 'man:yeah man' 'chu:at chu'
+firstword=("$reply[@]")
+_regex_words word4 'Another first word' 'boo:scare somebody:$secondword' 'ga:baby noise:$secondword'\
+ 'loo:go to the toilet:$secondword2'
+firstword2=("$reply[@]")
+
+_regex_arguments _hello /$'[^\0]##\0'/ "${firstword[@]}" "${firstword2[@]}"
+_hello "$@"
+#+END_SRC
+In this case the first word can be one of "foo", "man", "chu", "boo", "ga" or "loo".
+If the first word is "boo" or "ga" then the second word can be "woo" or "hoo", 
+and if the first word is "loo" then the second word can be "yee" or "haa", in the other
+cases there is no second word.
+
+For a good example of the usage of _regex_words have a look at the _ip function.
+** complex completions with _values, _sep_parts, & _multi_parts
+The _values, _sep_parts & _multi_parts functions can be used either on their own, or as ACTIONs in specifications for 
+_alternative, _arguments or _regex_arguments. The following examples may be instructive.
+See the [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-System][official documentation]] for more info.
+
+Space separated list of mp3 files:
+#+BEGIN_SRC sh 
+_values 'mp3 files' ~/*.mp3
+#+END_SRC
+
+Comma separated list of session id numbers:
+#+BEGIN_SRC sh 
+_values -s , 'session id' "${(uonzf)$(ps -A o sid=)}"
+#+END_SRC
+
+Completes foo@news:woo, or foo@news:laa, or bar@news:woo, etc:
+#+BEGIN_SRC sh 
+_sep_parts '(foo bar)' @ '(news ftp)' : '(woo laa)'
+#+END_SRC
+
+Complete some MAC addresses one octet at a time:
+#+BEGIN_SRC sh 
+_multi_parts : '(00:11:22:33:44:55 00:23:34:45:56:67 00:23:45:56:67:78)'
+#+END_SRC
+
+** Adding completion words directly using compadd
+For more fine grained control you can use the builtin compadd function to add completion words directly.
+This function has many different options for controlling how completions are displayed and how text on the command line 
+can be altered when words are completed. Read the  [[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-System][official documentation]] for full details.
+Here I just give a few simple examples.
+
+Add some words to the list of possible completions:
+#+BEGIN_SRC sh 
+compadd foo bar blah
+#+END_SRC
+
+As above but also display an explanation:
+#+BEGIN_SRC sh 
+compadd -X 'Some completions' foo bar blah
+#+END_SRC
+
+As above but automatically insert a prefix of "what_" before the completed word:
+#+BEGIN_SRC sh 
+compadd -P what_ foo bar blah
+#+END_SRC
+
+As above but automatically insert a suffix of "_todo" after the completed word:
+#+BEGIN_SRC sh 
+compadd -S _todo foo bar blah
+#+END_SRC
+
+As above but automatically remove the "_todo" suffix if a blank char is typed after the suffix:
+#+BEGIN_SRC sh 
+compadd -P _todo -q foo bar blah
+#+END_SRC
+
+Add words in array $wordsarray to the list of possible completions
+#+BEGIN_SRC sh 
+compadd -a wordsarray
+#+END_SRC
+
+* Testing & debugging
+To reload a completion function:
+#+BEGIN_SRC sh 
+> unfunction _func
+> autoload -U _func
+#+END_SRC
+
+The following functions can be called to obtain useful information. 
+If the default keybindings don't work you can try pressing Alt+x and then enter the command name.
+| Function        | Default keybinding | Description                                                                                                                    |
+|-----------------+--------------------+--------------------------------------------------------------------------------------------------------------------------------|
+| _complete_help  | Ctrl+x h           | displays information about context names, tags, and completion functions used when completing at the current cursor position   |
+| _complete_help  | Alt+2 Ctrl+x h     | as above but displays even more information                                                                                    |
+| _complete_debug | Ctrl+x ?           | performs ordinary completion, but captures in a temporary file a trace of the shell commands executed by the completion system |
+* Gotchas (things to watch out for)
+Remember to include a #compdef line at the beginning of the file containing the completion function.
+
+Take care to use the correct type of quoting for specifications to _arguments or _regex_arguments:
+use double quotes if there is a parameter that needs to be expanded in the specification, single quotes otherwise,
+and make sure to use different quotes around item descriptions.
+
+Check that you have the correct number of :'s in the correct places for specifications for _arguments, 
+_alternative, _regex_arguments, etc.
+
+Remember to include an initial pattern to match the command word when using _regex_arguments (it does not need a matching action).
+
+Remember to put a null char $'\0' at the end of any PATTERN argument for _regex_arguments
+* Tips
+Sometimes you have a situation where there is just one option that can come after a subcommand, and zsh will complete this 
+automatically when tab is pressed after the subcommand. If instead you want it listed with its description before completing 
+you can add another empty option (i.e. \:) to the ACTION like this ':TAG:DESCRIPTION:((opt1\:"description for opt1" \:))' 
+Note this only applies to utility functions that use ACTIONs in their specification arguments (_arguments, _regex_arguments, etc.)
+
+* Other resources
+[[http://wikimatze.de/writing-zsh-completion-for-padrino.html][Here]] is a nicely formatted short tutorial showing basic usage of the _arguments function, 
+and [[http://www.linux-mag.com/id/1106/][here]] is a slightly more advanced tutorial using the _arguments function.
+[[http://zsh.sourceforge.net/Doc/Release/Completion-System.html#Completion-System][Here]] is the zshcompsys man page.
diff --git a/zsh/modules/completion/external/zsh-completions.plugin.zsh b/zsh/modules/completion/external/zsh-completions.plugin.zsh
new file mode 100644
index 0000000..f8be8e7
--- /dev/null
+++ b/zsh/modules/completion/external/zsh-completions.plugin.zsh
@@ -0,0 +1 @@
+fpath+="`dirname $0`/src"
diff --git a/zsh/modules/completion/init.zsh b/zsh/modules/completion/init.zsh
new file mode 100644
index 0000000..1658946
--- /dev/null
+++ b/zsh/modules/completion/init.zsh
@@ -0,0 +1,112 @@
+#
+# Completion enhancements
+#
+
+
+#
+# initialization
+#
+
+# if it's a dumb terminal, return.
+if [[ ${TERM} == 'dumb' ]]; then
+  return 1
+fi
+
+# add the completions to the fpath
+fpath=(${0:h}/external/src ${fpath})
+
+# load and initialize the completion system
+autoload -Uz compinit && compinit -C -d "${ZDOTDIR:-${HOME}}/${zcompdump_file:-.zcompdump}"
+
+# set any compdefs
+source ${0:h}/compdefs.zsh
+
+{
+  # zcomple the .zcompdump in the background
+  zcompdump=${ZDOTDIR:-${HOME}}/.zcompdump
+
+  if [[ -s ${zcompdump} && ( ! -s ${zcompdump}.zwc || ${zcompdump} -nt ${zcompdump}.zwc) ]]; then
+    zcompile ${zcompdump}
+  fi
+  
+  unset zcompdump
+} &!
+
+
+#
+# zsh options
+#
+
+# If a completion is performed with the cursor within a word, and a full completion is inserted,
+# the cursor is moved to the end of the word
+setopt ALWAYS_TO_END
+
+# Automatically use menu completion after the second consecutive request for completion
+setopt AUTO_MENU
+
+# Automatically list choices on an ambiguous completion. 
+setopt AUTO_LIST
+
+# Perform a path search even on command names with slashes in them.
+setopt PATH_DIRS
+
+# Make globbing (filename generation) sensitive to case.
+unsetopt CASE_GLOB
+
+# On an ambiguous completion, instead of listing possibilities or beeping, insert the first match immediately.
+# Then when completion is requested again, remove the first match and insert the second match, etc.
+unsetopt MENU_COMPLETE
+
+
+#
+# completion module options
+#
+
+# group matches and describe.
+zstyle ':completion:*:*:*:*:*' menu select
+zstyle ':completion:*:matches' group 'yes'
+zstyle ':completion:*:options' description 'yes'
+zstyle ':completion:*:options' auto-description '%d'
+zstyle ':completion:*:corrections' format ' %F{green}-- %d (errors: %e) --%f'
+zstyle ':completion:*:descriptions' format ' %F{yellow}-- %d --%f'
+zstyle ':completion:*:messages' format ' %F{purple} -- %d --%f'
+zstyle ':completion:*:warnings' format ' %F{red}-- no matches found --%f'
+zstyle ':completion:*:default' list-prompt '%S%M matches%s'
+zstyle ':completion:*' format ' %F{yellow}-- %d --%f'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' verbose yes
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+# directories
+zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS}
+zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
+zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
+zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'expand'
+zstyle ':completion:*' squeeze-slashes true
+
+# enable caching
+zstyle ':completion::complete:*' use-cache on
+zstyle ':completion::complete:*' cache-path "${ZDOTDIR:-${HOME}}/.zcompcache"
+
+# ignore useless commands and functions
+zstyle ':completion:*:functions' ignored-patterns '(_*|pre(cmd|exec)|prompt_*)'
+
+# completion sorting
+zstyle ':completion:*:*:-subscript-:*' tag-order indexes parameters
+
+# Man
+zstyle ':completion:*:manuals' separate-sections true
+zstyle ':completion:*:manuals.(^1*)' insert-sections true
+
+# history
+zstyle ':completion:*:history-words' stop yes
+zstyle ':completion:*:history-words' remove-all-dups yes
+zstyle ':completion:*:history-words' list false
+zstyle ':completion:*:history-words' menu yes
+
+# ignore multiple entries.
+zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
+zstyle ':completion:*:rm:*' file-patterns '*:all-files'
+
+# smart editor completion
+zstyle ':completion:*:(nano|vim|nvim|vi|emacs|e):*' ignored-patterns '*.(wav|mp3|flac|ogg|mp4|avi|mkv|webm|iso|dmg|so|o|a|bin|exe|dll|pcap|7z|zip|tar|gz|bz2|rar|deb|pkg|gzip|pdf|mobi|epub|png|jpeg|jpg|gif)'
diff --git a/zsh/modules/completion/init.zsh.zwc b/zsh/modules/completion/init.zsh.zwc
new file mode 100644
index 0000000..73d644c
Binary files /dev/null and b/zsh/modules/completion/init.zsh.zwc differ
diff --git a/zsh/modules/custom/README.md b/zsh/modules/custom/README.md
new file mode 100644
index 0000000..36fd8bf
--- /dev/null
+++ b/zsh/modules/custom/README.md
@@ -0,0 +1,18 @@
+Custom
+======
+
+Add any custom aliases/settings to the `init.zsh` file.
+
+Any functions should go in the `functions` folder, where the name of the file is the name of the function.
+
+For example, this function from your .zshrc:
+```
+foo() {
+  print 'bar'
+}
+```
+
+becomes a file named 'foo' in the functions folder containing:
+```
+print 'bar'
+```
diff --git a/zsh/modules/custom/functions/example_function b/zsh/modules/custom/functions/example_function
new file mode 100644
index 0000000..752e7df
--- /dev/null
+++ b/zsh/modules/custom/functions/example_function
@@ -0,0 +1,4 @@
+# this is an example function
+# running 'example_function' in a zsh session will execute the code below
+
+print "executed example function: ${ZDOTDIR:-${HOME}}/modules/custom/functions/example_function!"
diff --git a/zsh/modules/custom/functions/example_function.zwc b/zsh/modules/custom/functions/example_function.zwc
new file mode 100644
index 0000000..f6fd39a
Binary files /dev/null and b/zsh/modules/custom/functions/example_function.zwc differ
diff --git a/zsh/modules/custom/init.zsh b/zsh/modules/custom/init.zsh
new file mode 100644
index 0000000..57934ad
--- /dev/null
+++ b/zsh/modules/custom/init.zsh
@@ -0,0 +1,8 @@
+#
+# Custom aliases/settings
+#
+
+# any custom stuff should go here.
+# ensure that 'custom' exists in the zmodules array in your .zimrc
+
+
diff --git a/zsh/modules/custom/init.zsh.zwc b/zsh/modules/custom/init.zsh.zwc
new file mode 100644
index 0000000..1fce064
Binary files /dev/null and b/zsh/modules/custom/init.zsh.zwc differ
diff --git a/zsh/modules/debug/Readme.md b/zsh/modules/debug/Readme.md
new file mode 100644
index 0000000..0ec55a3
--- /dev/null
+++ b/zsh/modules/debug/Readme.md
@@ -0,0 +1,19 @@
+Debug
+=====
+
+Provides a function to debug Zim.
+
+Functions
+---------
+
+  - `trace-zim` provides a trace of Zsh/Zim startup
+
+Notes
+-----
+
+The `trace-zim` command will not alter your current dotfiles.
+It will copy your environment to a temporary directory, launch zsh
+within that environment, and output logs.
+
+This will provide a ztrace.tar.gz archive, which should be attached
+to any bug reports if you need help with an issue that you don't understand.
diff --git a/zsh/modules/debug/functions/trace-zim b/zsh/modules/debug/functions/trace-zim
new file mode 100644
index 0000000..4b9403a
--- /dev/null
+++ b/zsh/modules/debug/functions/trace-zim
@@ -0,0 +1,105 @@
+#!/usr/bin/env zsh
+#
+# Generates trace log to debug zim and zsh issues
+#
+
+print "This function creates a trace log to debug
+Zsh and Zim functionality.
+
+It will copy your .zshrc to /tmp/ztrace/, ammend profiling
+code, launch a new shell, log the trace, close the shell,
+archive the logs, and finally print the path to the archive."
+
+read \?"Press [Enter] to begin trace."
+
+mkdir -p /tmp/ztrace
+# make sure that we were able to create the directory
+if [[ ! -d /tmp/ztrace ]]; then
+  print 'failed to create /tmp/ztrace directory. Aborting.'
+  return 1
+else
+  # check if known output file, if exists
+  # rm all directory contents
+  if [[ -e /tmp/ztrace/ztrace.log ]]; then
+    print "\nLogs from previous run of trace-zim are present
+Deleting old logs now..."
+    # use of anonymous function for dotglob opt
+    () {
+      setopt dotglob
+      rm -rf /tmp/ztrace/*
+    }
+  fi
+fi
+
+# get some basic system information (kernel and zsh version)
+print "Zsh version:
+  $(zsh --version)
+Kernel information:
+  $(uname -a)
+fpath info:
+  ${fpath}" >! /tmp/ztrace/sysinfo
+
+cp ${ZDOTDIR:-${HOME}}/.zshrc /tmp/ztrace/.zshrc.orig
+cp ${ZDOTDIR:-${HOME}}/.zimrc /tmp/ztrace/.zimrc
+# rsync will allow us to not have to copy the .git folder; use if available 
+if (( ${+commands[rsync]} )); then
+  rsync -az --exclude .git ${ZDOTDIR:-${HOME}}/.zim /tmp/ztrace/
+else
+  cp -R ${ZDOTDIR:-${HOME}}/.zim /tmp/ztrace/
+fi
+
+# create a modified .zshrc to produce a trace log
+cat <<EOF >! /tmp/ztrace/.zshrc
+###################
+# zim trace start #
+###################
+PS4=$'%D{%s%6.}-_-'
+exec 3>&2 2>/tmp/ztrace/sample-time.$$.log
+zmodload zsh/zprof
+setopt xtrace prompt_subst
+EOF
+
+cat /tmp/ztrace/.zshrc.orig >>! /tmp/ztrace/.zshrc
+
+cat <<EOF >>! /tmp/ztrace/.zshrc
+#################
+# zim trace end #
+#################
+
+unsetopt xtrace
+zprof >! /tmp/ztrace/zprof
+#non-linux systems have weird fd; also, no real need to redirect back
+#prompt is (practically speaking) non-interactive, fd exists only for that process
+#which is closed (by typing exit)
+
+#exec 2>&3 3>&-
+EOF
+
+print "\nSpawning zsh and producing trace...\n\n"
+ZDOTDIR=/tmp/ztrace zsh -ic 'exit'
+print "Trace complete.
+Parsing logs to a nicer format; this may take some time..."
+
+# this is ugly thing makes it pretty...
+while read line; do if [[ ${line} =~ '^[0-9]+-_-' ]]; then crt=000000$((${line%%-_-*}-10#0$last)); printf "%12.9f %s\n" ${crt:0:${#crt}-6}.${crt:${#crt}-6} ${line#*-_-}; last=${line%%-_-*}; fi; done < /tmp/ztrace/sample-time.(*).log > /tmp/ztrace/ztrace.log
+print "Parsing complete!"
+
+# safe to remove old, unneeded environment files 
+print "Tidying up before archive..."
+rm -f /tmp/ztrace/sample-time.*
+rm -rf /tmp/ztrace/.zim
+rm -f /tmp/ztrace/.zshrc
+mv /tmp/ztrace/.zshrc.orig /tmp/ztrace/.zshrc
+rm -f /tmp/ztrace/.zhistory
+rm -f /tmp/ztrace/.zcompdump*
+
+print "Archiving trace logs...\n"
+
+tar -czf /tmp/ztrace.tar.gz /tmp/ztrace/
+
+print "Archive complete!\n
+Trace by with execution time available at:
+  /tmp/ztrace/ztrace.log
+Archive (for sharing/help) available at:
+  /tmp/ztrace.tar.gz"
+
diff --git a/zsh/modules/debug/functions/trace-zim.zwc b/zsh/modules/debug/functions/trace-zim.zwc
new file mode 100644
index 0000000..be09244
Binary files /dev/null and b/zsh/modules/debug/functions/trace-zim.zwc differ
diff --git a/zsh/modules/directory/README.md b/zsh/modules/directory/README.md
new file mode 100644
index 0000000..5677251
--- /dev/null
+++ b/zsh/modules/directory/README.md
@@ -0,0 +1,18 @@
+Directory
+=========
+
+Sets directory, navigation, and redirect options.
+
+ZSH options
+-----------
+
+| Option | Effect |
+| ------ | ----------- |
+| AUTO_CD | If the typed command is invalid, but is a directory, cd to that directory |
+| AUTO_PUSHD | After cd, push the old directory to the directory stack |
+| PUSHD_IGNORE_DUPS | Don't push multiple copies of the same directory to the stack |
+| PUSHD_SILENT | Don't print the directory after pushd or popd |
+| PUSHD_TO_HOME | pushd without arguments acts like `pushd ${HOME}` |
+| EXTENDED_GLOB | Treat `#`, `~`, and `^` as patterns for filename globbing |
+| MULTIOS | Performs implicit tees or cats when using redirections |
+| NO_CLOBBER | Disables overwrite existing files with `>`. Use `>|` or `>!` instead |
diff --git a/zsh/modules/directory/init.zsh b/zsh/modules/directory/init.zsh
new file mode 100644
index 0000000..60e332d
--- /dev/null
+++ b/zsh/modules/directory/init.zsh
@@ -0,0 +1,38 @@
+#
+# Directory navigation options
+#
+
+#
+# Navigation
+#
+
+# If a command is issued that can’t be executed as a normal command,
+# and the command is the name of a directory, perform the cd command to that directory.
+setopt AUTO_CD
+
+# Make cd push the old directory onto the directory stack.
+setopt AUTO_PUSHD
+
+# Don’t push multiple copies of the same directory onto the directory stack.
+setopt PUSHD_IGNORE_DUPS
+
+# Do not print the directory stack after pushd or popd.
+setopt PUSHD_SILENT
+
+# Have pushd with no arguments act like ‘pushd ${HOME}’.
+setopt PUSHD_TO_HOME
+
+#
+# Globbing and fds
+#
+
+# Treat the ‘#’, ‘~’ and ‘^’ characters as part of patterns for filename generation, etc.
+# (An initial unquoted ‘~’ always produces named directory expansion.)
+setopt EXTENDED_GLOB
+
+# Perform implicit tees or cats when multiple redirections are attempted.
+setopt MULTIOS
+
+# Disallow ‘>’ redirection to overwrite existing files.
+# ‘>|’ or ‘>!’ must be used to overwrite a file.
+setopt NO_CLOBBER
diff --git a/zsh/modules/environment/README.md b/zsh/modules/environment/README.md
new file mode 100644
index 0000000..e5eec80
--- /dev/null
+++ b/zsh/modules/environment/README.md
@@ -0,0 +1,20 @@
+Environment
+===========
+
+Sets generic Zsh built-in environment options.
+
+Also enables smart URL-pasting. This prevents the user from having to manually escape URLs.
+
+Uses `.zimrc` defined `${ztermtitle}` variable to set the terminal title, if defined.
+
+ZSH Options
+-----------
+
+| Option | Effect |
+| ------ | ------ |
+| AUTO_RESUME | Resume existing jobs before creating a new job |
+| LONG_LIST_JOBS | Use the verbose list format by default |
+| NOTIFY | Report job status immediately instead of waiting for new prompt |
+| BG_NICE | Disabled to prevent jobs being given a lower priority |
+| HUP | Disabed to prevent SIGHUP to jobs on shell close |
+| CHECK_JOBS | Disabled to prevent job report on shell close |
diff --git a/zsh/modules/environment/init.zsh b/zsh/modules/environment/init.zsh
new file mode 100644
index 0000000..0e8fd9d
--- /dev/null
+++ b/zsh/modules/environment/init.zsh
@@ -0,0 +1,59 @@
+#
+# generic options and environment settings
+#
+
+# use smart URL pasting and escaping
+autoload -Uz is-at-least
+if [[ ${ZSH_VERSION} != 5.1.1 ]]; then
+  if is-at-least 5.2; then
+    autoload -Uz bracketed-paste-url-magic
+    zle -N bracketed-paste bracketed-paste-url-magic
+  else
+    if is-at-least 5.1; then
+      autoload -Uz bracketed-paste-magic
+      zle -N bracketed-paste bracketed-paste-magic
+    fi
+    autoload -Uz url-quote-magic
+    zle -N self-insert url-quote-magic
+  fi
+fi
+
+# Treat single word simple commands without redirection as candidates for resumption of an existing job.
+setopt AUTO_RESUME
+
+# List jobs in the long format by default.
+setopt LONG_LIST_JOBS
+
+# Report the status of background jobs immediately, rather than waiting until just before printing a prompt.
+setopt NOTIFY
+
+# Run all background jobs at a lower priority. This option is set by default.
+unsetopt BG_NICE
+
+# Send the HUP signal to running jobs when the shell exits.
+unsetopt HUP
+
+# Report the status of background and suspended jobs before exiting a shell with job control;
+# a second attempt to exit the shell will succeed.
+# NO_CHECK_JOBS is best used only in combination with NO_HUP, else such jobs will be killed automatically.
+unsetopt CHECK_JOBS
+
+# Set less or more as the default pager.
+if [[ -z ${PAGER} ]]; then
+  if (( ${+commands[less]} )); then
+    export PAGER=less
+  else
+    export PAGER=more
+  fi
+fi
+
+# sets the window title and updates upon directory change
+# more work probably needs to be done here to support multiplexers
+if (($+ztermtitle)); then
+  case ${TERM} in
+    xterm*)
+      precmd() { print -Pn "\e]0;${ztermtitle}\a" }
+      precmd  # we execute it once to initialize the window title
+      ;;
+  esac
+fi
diff --git a/zsh/modules/fasd/README.md b/zsh/modules/fasd/README.md
new file mode 100644
index 0000000..2d85197
--- /dev/null
+++ b/zsh/modules/fasd/README.md
@@ -0,0 +1,14 @@
+fasd
+====
+
+[Fasd](https://github.com/clvv/fasd) (pronounced similar to "fast") is a command-line productivity booster.
+Fasd offers quick access to files and directories for POSIX shells. It is
+inspired by tools like [autojump](https://github.com/joelthelion/autojump),
+[z](http://github.com/rupa/z) and [v](https://github.com/rupa/v). Fasd keeps
+track of files and directories you have accessed, so that you can quickly
+reference them in the command line.
+
+Contributing
+------------
+
+Contributions should be submitted [upstream to fasd](https://github.com/clvv/fasd).
diff --git a/zsh/modules/fasd/functions/fasd b/zsh/modules/fasd/functions/fasd
new file mode 100644
index 0000000..fc16ee7
--- /dev/null
+++ b/zsh/modules/fasd/functions/fasd
@@ -0,0 +1,424 @@
+# Fasd is originally written based on code from z (https://github.com/rupa/z)
+# by rupa deadwyler under the WTFPL license. Most if not all of the code has
+# been rewritten.
+
+# Copyright (C) 2011, 2012 by Wei Dai. All rights reserved.
+#
+# 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.
+
+# make zsh do word splitting inside this function
+[ "$ZSH_VERSION" ] && emulate sh && setopt localoptions
+
+case $1 in
+--init) shift
+  while [ "$1" ]; do
+    case $1 in
+      env)
+        { # Load configuration files
+
+        if [[ -s ${XDG_CONFIG_HOME:-"${HOME}/.config"}/fasd/config ]]; then
+          source ${XDG_CONFIG_HOME:-"${HOME}/.config"}/fasd/config
+        else
+          [[ -s /etc/fasdrc ]] && source /etc/fasd
+          [[ -s ${HOME}/.fasdrc ]] && source ${HOME}/.fasdrc
+        fi
+
+        # set default options
+        [ -z "$_FASD_DATA" ] && _FASD_DATA="$HOME/.fasd"
+        [ -z "$_FASD_BLACKLIST" ] && _FASD_BLACKLIST="--help"
+        [ -z "$_FASD_SHIFT" ] && _FASD_SHIFT="sudo busybox"
+        [ -z "$_FASD_IGNORE" ] && _FASD_IGNORE="fasd ls echo"
+        [ -z "$_FASD_SINK" ] && _FASD_SINK=/dev/null
+        [ -z "$_FASD_TRACK_PWD" ] && _FASD_TRACK_PWD=1
+        [ -z "$_FASD_MAX" ] && _FASD_MAX=2000
+        [ -z "$_FASD_BACKENDS" ] && _FASD_BACKENDS=native
+        [ -z "$_FASD_FUZZY" ] && _FASD_FUZZY=2
+        [ -z "$_FASD_VIMINFO" ] && _FASD_VIMINFO="$HOME/.viminfo"
+        [ -z "$_FASD_RECENTLY_USED_XBEL" ] && \
+          _FASD_RECENTLY_USED_XBEL="$HOME/.local/share/recently-used.xbel"
+
+        if [ -z "$_FASD_AWK" ]; then
+          # awk preferences
+          local awk; for awk in mawk gawk original-awk nawk awk; do
+            $awk "" && _FASD_AWK=$awk && break
+          done
+        fi
+      } >> "${_FASD_SINK:-/dev/null}" 2>&1
+      ;;
+    esac; shift
+  done
+  ;;
+
+# if "$_fasd_cur" or "$2" is a query, then output shell code to be eval'd
+--word-complete-trigger)
+  shift; [ "$2" ] && local _fasd_cur="$2" || return
+  case $_fasd_cur in
+    ,*) printf %s\\n "$1 e $_fasd_cur";;
+    f,*) printf %s\\n "$1 f ${_fasd_cur#?}";;
+    d,*) printf %s\\n "$1 d ${_fasd_cur#?}";;
+    *,,) printf %s\\n "$1 e $_fasd_cur";;
+    *,,f) printf %s\\n "$1 f ${_fasd_cur%?}";;
+    *,,d) printf %s\\n "$1 d ${_fasd_cur%?}";;
+  esac
+  ;;
+
+--sanitize) shift; printf %s\\n "$*" | \
+    sed 's/\([^\]\)$( *[^ ]* *\([^)]*\)))*/\1\2/g
+      s/\([^\]\)[|&;<>$`{}]\{1,\}/\1 /g'
+  ;;
+
+--proc) shift # process commands
+  # stop if we don't own $_FASD_DATA or $_FASD_RO is set
+  [ -f "$_FASD_DATA" -a ! -O "$_FASD_DATA" ] || [ "$_FASD_RO" ] && return
+
+  # blacklists
+  local each; for each in $_FASD_BLACKLIST; do
+    case " $* " in *\ $each\ *) return;; esac
+  done
+
+  # shifts
+  while true; do
+    case " $_FASD_SHIFT " in
+      *\ $1\ *) shift;;
+      *) break;;
+    esac
+  done
+
+  # ignores
+  case " $_FASD_IGNORE " in
+    *\ $1\ *) return;;
+  esac
+
+  shift; fasd --add "$@" # add all arguments except command
+  ;;
+
+--add|-A) shift # add entries
+  # stop if we don't own $_FASD_DATA or $_FASD_RO is set
+  [ -f "$_FASD_DATA" -a ! -O "$_FASD_DATA" ] || [ "$_FASD_RO" ] && return
+
+  # find all valid path arguments, convert them to simplest absolute form
+  local paths="$(while [ "$1" ]; do
+    [ -e "$1" ] && printf %s\\n "$1"; shift
+  done | sed '/^[^/]/s@^@'"$PWD"'/@
+    s@/\.\.$@/../@;s@/\(\./\)\{1,\}@/@g;:0
+    s@[^/][^/]*//*\.\./@/@;t 0
+    s@^/*\.\./@/@;s@//*@/@g;s@/\.\{0,1\}$@@;s@^$@/@' 2>> "$_FASD_SINK" \
+    | tr '\n' '|')"
+
+  # add current pwd if the option is set
+  [ "$_FASD_TRACK_PWD" = "1" -a "$PWD" != "$HOME" ] && paths="$paths|$PWD"
+
+  [ -z "${paths##\|}" ] && return # stop if we have nothing to add
+
+  # maintain the file
+  local tempfile
+  tempfile="$(mktemp "$_FASD_DATA".XXXXXX)" || return
+  $_FASD_AWK -v list="$paths" -v now="$(date +%s)" -v max="$_FASD_MAX" -F"|" '
+    BEGIN {
+      split(list, files, "|")
+      for(i in files) {
+        path = files[i]
+        if(path == "") continue
+        paths[path] = path # array for checking
+        rank[path] = 1
+        time[path] = now
+      }
+    }
+    $2 >= 1 {
+      if($1 in paths) {
+        rank[$1] = $2 + 1 / $2
+        time[$1] = now
+      } else {
+        rank[$1] = $2
+        time[$1] = $3
+      }
+      count += $2
+    }
+    END {
+      if(count > max)
+        for(i in rank) print i "|" 0.9*rank[i] "|" time[i] # aging
+      else
+        for(i in rank) print i "|" rank[i] "|" time[i]
+    }' "$_FASD_DATA" 2>> "$_FASD_SINK" >| "$tempfile"
+  if [ $? -ne 0 -a -f "$_FASD_DATA" ]; then
+    env rm -f "$tempfile"
+  else
+    env mv -f "$tempfile" "$_FASD_DATA"
+  fi
+  ;;
+
+--delete|-D) shift # delete entries
+  # stop if we don't own $_FASD_DATA or $_FASD_RO is set
+  [ -f "$_FASD_DATA" -a ! -O "$_FASD_DATA" ] || [ "$_FASD_RO" ] && return
+
+  # turn valid arguments into entry-deleting sed commands
+  local sed_cmd="$(while [ "$1" ]; do printf %s\\n "$1"; shift; done | \
+    sed '/^[^/]/s@^@'"$PWD"'/@;s@/\.\.$@/../@;s@/\(\./\)\{1,\}@/@g;:0
+      s@[^/][^/]*//*\.\./@/@;t 0
+      s@^/*\.\./@/@;s@//*@/@g;s@/\.\{0,1\}$@@
+      s@^$@/@;s@\([.[\/*^$]\)@\\\1@g;s@^\(.*\)$@/^\1|/d@' 2>> "$_FASD_SINK")"
+
+  # maintain the file
+  local tempfile
+  tempfile="$(mktemp "$_FASD_DATA".XXXXXX)" || return
+
+  sed "$sed_cmd" "$_FASD_DATA" 2>> "$_FASD_SINK" >| "$tempfile"
+
+  if [ $? -ne 0 -a -f "$_FASD_DATA" ]; then
+    env rm -f "$tempfile"
+  else
+    env mv -f "$tempfile" "$_FASD_DATA"
+  fi
+  ;;
+
+--query) shift # query the db, --query [$typ ["$fnd" [$mode]]]
+  [ -f "$_FASD_DATA" ] || return # no db yet
+  [ "$1" ] && local typ="$1"
+  [ "$2" ] && local fnd="$2"
+  [ "$3" ] && local mode="$3"
+
+  # cat all backends
+  local each _fasd_data; for each in $_FASD_BACKENDS; do
+    _fasd_data="$_fasd_data
+$(fasd --backend $each)"
+  done
+  [ "$_fasd_data" ] || _fasd_data="$(cat "$_FASD_DATA")"
+
+  # set mode specific code for calculating the prior
+  case $mode in
+    rank) local prior='times[i]';;
+    recent) local prior='sqrt(100000/(1+t-la[i]))';;
+    *) local prior='times[i] * frecent(la[i])';;
+  esac
+
+  if [ "$fnd" ]; then # dafault matching
+    local bre="$(printf %s\\n "$fnd" | sed 's/\([*\.\\\[]\)/\\\1/g
+      s@ @[^|]*@g;s/\$$/|/')"
+    bre='^[^|]*'"$bre"'[^|/]*|'
+    local _ret="$(printf %s\\n "$_fasd_data" | grep "$bre")"
+    [ "$_ret" ] && _ret="$(printf %s\\n "$_ret" | while read -r line; do
+      [ -${typ:-e} "${line%%\|*}" ] && printf %s\\n "$line"
+    done)"
+    if [ "$_ret" ]; then
+      _fasd_data="$_ret"
+    else # no case mathcing
+      _ret="$(printf %s\\n "$_fasd_data" | grep -i "$bre")"
+      [ "$_ret" ] && _ret="$(printf %s\\n "$_ret" | while read -r line; do
+        [ -${typ:-e} "${line%%\|*}" ] && printf %s\\n "$line"
+      done)"
+      if [ "$_ret" ]; then
+        _fasd_data="$_ret"
+      elif [ "${_FASD_FUZZY:-0}" -gt 0 ]; then # fuzzy matching
+        local fuzzy_bre="$(printf %s\\n "$fnd" | \
+          sed 's/\([*\.\\\[]\)/\\\1/g;s/\$$/|/
+            s@\(\\\{0,1\}[^ ]\)@\1[^|/]\\{0,'"$_FASD_FUZZY"'\\}@g
+            s@ @[^|]*@g')"
+        fuzzy_bre='^[^|]*'"$fuzzy_bre"'[^|/]*|'
+        _ret="$(printf %s\\n "$_fasd_data" | grep -i "$fuzzy_bre")"
+        [ "$_ret" ] && _ret="$(printf %s\\n "$_ret" | while read -r line; do
+          [ -${typ:-e} "${line%%\|*}" ] && printf %s\\n "$line"
+        done)"
+        [ "$_ret" ] && _fasd_data="$_ret" || _fasd_data=
+      fi
+    fi
+  else # no query arugments
+    _fasd_data="$(printf %s\\n "$_fasd_data" | while read -r line; do
+      [ -${typ:-e} "${line%%\|*}" ] && printf %s\\n "$line"
+    done)"
+  fi
+
+  # query the database
+  [ "$_fasd_data" ] && printf %s\\n "$_fasd_data" | \
+    $_FASD_AWK -v t="$(date +%s)" -F"|" '
+    function frecent(time) {
+      dx = t-time
+      if( dx < 3600 ) return 6
+      if( dx < 86400 ) return 4
+      if( dx < 604800 ) return 2
+      return 1
+    }
+    {
+      if(!paths[$1]) {
+        times[$1] = $2
+        la[$1] = $3
+        paths[$1] = 1
+      } else {
+        times[$1] += $2
+        if($3 > la[$1]) la[$1] = $3
+      }
+    }
+    END {
+      for(i in paths) printf "%-10s %s\n", '"$prior"', i
+    }' - 2>> "$_FASD_SINK"
+  ;;
+
+--backend)
+  case $2 in
+    native) cat "$_FASD_DATA";;
+    viminfo)
+      < "$_FASD_VIMINFO" sed -n '/^>/{s@~@'"$HOME"'@
+        s/^..//
+        p
+        }' | $_FASD_AWK -v t="$(date +%s)" '{
+          t -= 60
+          print $0 "|1|" t
+        }'
+      ;;
+    recently-used)
+      local nl="$(printf '\\\nX')"; nl="${nl%X}" # slash newline for sed
+      tr -d '\n' < "$_FASD_RECENTLY_USED_XBEL" | \
+        sed 's@file:/@'"$nl"'@g;s@count="@'"$nl"'@g' | sed '1d;s/".*$//' | \
+        tr '\n' '|' | sed 's@|/@'"$nl"'@g' | $_FASD_AWK -F'|' '{
+          sum = 0
+          for( i=2; i<=NF; i++ ) sum += $i
+          print $1 "|" sum
+        }'
+      ;;
+    current)
+      for path in *; do
+        printf "$PWD/%s|1\\n" "$path"
+      done
+      ;;
+    spotlight)
+      mdfind '(kMDItemFSContentChangeDate >= $time.today) ||
+        kMDItemLastUsedDate >= $time.this_month' \
+        | sed '/Library\//d
+          /\.app$/d
+          s/$/|2/'
+      ;;
+    *) eval "$2";;
+  esac
+  ;;
+
+*) # parsing logic and processing
+  local fnd= last= _FASD_BACKENDS="$_FASD_BACKENDS" _fasd_data= comp= exec=
+  while [ "$1" ]; do case $1 in
+    --complete) [ "$2" = "--" ] && shift; set -- $2; local lst=1 r=r comp=1;;
+    --query|--add|--delete|-A|-D) fasd "$@"; return $?;;
+    --version) [ -z "$comp" ] && echo "1.0.1" && return;;
+    --) while [ "$2" ]; do shift; fnd="$fnd $1"; last="$1"; done;;
+    -*) local o="${1#-}"; while [ "$o" ]; do case $o in
+        s*) local show=1;;
+        l*) local lst=1;;
+        i*) [ -z "$comp" ] && local interactive=1 show=1;;
+        r*) local mode=rank;;
+        t*) local mode=recent;;
+        e*) o="${o#?}"; if [ "$o" ]; then # there are characters after "-e"
+              local exec="$o" # anything after "-e"
+            else # use the next argument
+              local exec="${2:?"-e: Argument needed "}"
+              shift
+            fi; break;;
+        b*) o="${o#?}"; if [ "$o" ]; then
+              _FASD_BACKENDS="$o"
+            else
+              _FASD_BACKENDS="${2:?"-b: Argument needed"}"
+              shift
+            fi; break;;
+        B*) o="${o#?}"; if [ "$o" ]; then
+              _FASD_BACKENDS="$_FASD_BACKENDS $o"
+            else
+              _FASD_BACKENDS="$_FASD_BACKENDS ${2:?"-B: Argument needed"}"
+              shift
+            fi; break;;
+        a*) local typ=e;;
+        d*) local typ=d;;
+        f*) local typ=f;;
+        R*) local r=r;;
+    [0-9]*) local _fasd_i="$o"; break;;
+        h*) [ -z "$comp" ] && echo "fasd [options] [query ...]
+[f|a|s|d|z] [options] [query ...]
+  options:
+    -s         list paths with scores
+    -l         list paths without scores
+    -i         interactive mode
+    -e <cmd>   set command to execute on the result file
+    -b <name>  only use <name> backend
+    -B <name>  add additional backend <name>
+    -a         match files and directories
+    -d         match directories only
+    -f         match files only
+    -r         match by rank only
+    -t         match by recent access only
+    -R         reverse listing order
+    -h         show a brief help message
+    -[0-9]     select the nth entry
+
+fasd [-A|-D] [paths ...]
+    -A    add paths
+    -D    delete paths" >&2 && return;;
+        esac; o="${o#?}"; done;;
+      *) fnd="$fnd $1"; last="$1";;
+    esac; shift; done
+
+  # guess whether the last query is selected from tab completion
+  case $last in
+    /?*) if [ -z "$show$lst" -a -${typ:-e} "$last" -a "$exec" ]; then
+           $exec "$last"
+           return
+         fi;;
+  esac
+
+  local R; [ -z "$r" ] && R=r || R= # let $R be the opposite of $r
+  fnd="${fnd# }"
+
+  local res
+  res="$(fasd --query 2>> "$_FASD_SINK")" # query the database
+  [ $? -gt 0 ] && return
+  if [ 0 -lt ${_fasd_i:-0} ] 2>> "$_FASD_SINK"; then
+    res="$(printf %s\\n "$res" | sort -n${R} | \
+      sed -n "$_fasd_i"'s/^[^ ]*[ ]*//p')"
+  elif [ "$interactive" ] || [ "$exec" -a -z "$fnd$lst$show" -a -t 1 ]; then
+    if [ "$(printf %s "$res" | sed -n '$=')" -gt 1 ]; then
+      res="$(printf %s\\n "$res" | sort -n${R})"
+      printf %s\\n "$res" | sed = | sed 'N;s/\n/	/' | sort -nr >&2
+      printf "> " >&2
+      local i; read i; [ 0 -lt "${i:-0}" ] 2>> "$_FASD_SINK" || return 1
+    fi
+    res="$(printf %s\\n "$res" | sed -n "${i:-1}"'s/^[^ ]*[ ]*//p')"
+  elif [ "$lst" ]; then
+    [ "$res" ] && printf %s\\n "$res" | sort -n${r} | sed 's/^[^ ]*[ ]*//'
+    return
+  elif [ "$show" ]; then
+    [ "$res" ] && printf %s\\n "$res" | sort -n${r}
+    return
+  elif [ "$fnd" ] && [ "$exec" -o ! -t 1 ]; then # exec or subshell
+    res="$(printf %s\\n "$res" | sort -n | sed -n '$s/^[^ ]*[ ]*//p')"
+  else # no args, show
+    [ "$res" ] && printf %s\\n "$res" | sort -n${r}
+    return
+  fi
+  if [ "$res" ]; then
+    fasd --add "$res"
+    [ -z "$exec" ] && exec='printf %s\n'
+    $exec "$res"
+  fi
+  ;;
+esac
+
+#case $- in
+#  *i*) ;; # assume being sourced, do nothing
+#  *) # assume being executed as an executable
+#    if [ -x "$_FASD_SHELL" -a -z "$_FASD_SET" ]; then
+#      _FASD_SET=1 exec $_FASD_SHELL "$0" "$@"
+#    else
+#      fasd "$@"
+#    fi;;
+#esac
diff --git a/zsh/modules/fasd/functions/fasd.zwc b/zsh/modules/fasd/functions/fasd.zwc
new file mode 100644
index 0000000..9d7564e
Binary files /dev/null and b/zsh/modules/fasd/functions/fasd.zwc differ
diff --git a/zsh/modules/fasd/init.zsh b/zsh/modules/fasd/init.zsh
new file mode 100644
index 0000000..cc05f62
--- /dev/null
+++ b/zsh/modules/fasd/init.zsh
@@ -0,0 +1,88 @@
+fasd --init env
+
+# function to execute built-in cd
+fasd_cd() {
+  if [ $# -le 1 ]; then
+    fasd "$@"
+  else
+    local _fasd_ret="$(fasd -e 'printf %s' "$@")"
+    [ -z "$_fasd_ret" ] && return
+    [ -d "$_fasd_ret" ] && cd "$_fasd_ret" || printf %s\n "$_fasd_ret"
+  fi
+}
+
+alias a='fasd -a'
+alias s='fasd -si'
+alias sd='fasd -sid'
+alias sf='fasd -sif'
+alias d='fasd -d'
+alias f='fasd -f'
+alias v='f -e vim -b viminfo'
+alias z='fasd_cd -d'
+alias zz='fasd_cd -d -i'
+
+# add zsh hook
+_fasd_preexec() {
+  { eval "fasd --proc $(fasd --sanitize $2)"; } >> "/dev/null" 2>&1
+}
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec _fasd_preexec
+
+# zsh command mode completion
+_fasd_zsh_cmd_complete() {
+  local compl
+  read -c compl
+  (( $+compstate )) && compstate[insert]=menu # no expand if compsys loaded
+  reply=(${(f)"$(fasd --complete "$compl")"})
+}
+
+# enable command mode completion
+compctl -U -K _fasd_zsh_cmd_complete -V fasd -x 'C[-1,-*e],s[-]n[1,e]' -c - \
+  'c[-1,-A][-1,-D]' -f -- fasd fasd_cd
+
+(( $+functions[compdef] )) && {
+  # zsh word mode completion
+  _fasd_zsh_word_complete() {
+    [ "$2" ] && local _fasd_cur="$2"
+    [ -z "$_fasd_cur" ] && local _fasd_cur="${words[CURRENT]}"
+    local fnd="${_fasd_cur//,/ }"
+    local typ=${1:-e}
+    fasd --query $typ "$fnd" 2>> "/dev/null" | \
+      sort -nr | sed 's/^[^ ]*[ ]*//' | while read -r line; do
+        compadd -U -V fasd "$line"
+      done
+    compstate[insert]=menu # no expand
+  }
+  _fasd_zsh_word_complete_f() { _fasd_zsh_word_complete f ; }
+  _fasd_zsh_word_complete_d() { _fasd_zsh_word_complete d ; }
+  _fasd_zsh_word_complete_trigger() {
+    local _fasd_cur="${words[CURRENT]}"
+    eval $(fasd --word-complete-trigger _fasd_zsh_word_complete $_fasd_cur)
+  }
+  # define zle widgets
+  zle -C fasd-complete complete-word _generic
+  zstyle ':completion:fasd-complete:*' completer _fasd_zsh_word_complete
+  zstyle ':completion:fasd-complete:*' menu-select
+
+  zle -C fasd-complete-f complete-word _generic
+  zstyle ':completion:fasd-complete-f:*' completer _fasd_zsh_word_complete_f
+  zstyle ':completion:fasd-complete-f:*' menu-select
+
+  zle -C fasd-complete-d complete-word _generic
+  zstyle ':completion:fasd-complete-d:*' completer _fasd_zsh_word_complete_d
+  zstyle ':completion:fasd-complete-d:*' menu-select
+}
+
+(( $+functions[compdef] )) && {
+  # enable word mode completion
+  orig_comp="$(zstyle -L ':completion:\*' completer 2>> "/dev/null")"
+  if [ "$orig_comp" ]; then
+    case $orig_comp in
+      *_fasd_zsh_word_complete_trigger*);;
+      *) eval "$orig_comp _fasd_zsh_word_complete_trigger";;
+    esac
+  else
+    zstyle ':completion:*' completer _complete _fasd_zsh_word_complete_trigger
+  fi
+  unset orig_comp
+}
diff --git a/zsh/modules/fasd/init.zsh.zwc b/zsh/modules/fasd/init.zsh.zwc
new file mode 100644
index 0000000..ae5daa9
Binary files /dev/null and b/zsh/modules/fasd/init.zsh.zwc differ
diff --git a/zsh/modules/git-info/README.md b/zsh/modules/git-info/README.md
new file mode 100644
index 0000000..956d540
--- /dev/null
+++ b/zsh/modules/git-info/README.md
@@ -0,0 +1,98 @@
+Git-info
+========
+
+Exposes git repository status information to prompts.
+
+Many thanks to [Sorin Ionescu](https://github.com/sorin-ionescu) and
+[Colin Hebert](https://github.com/ColinHebert) for the original code.
+
+Git **1.7.2** is the
+[minimum required version](https://github.com/sorin-ionescu/prezto/issues/219).
+
+Settings
+--------
+
+### Ignore Submodules
+
+Retrieving the status of a repository with submodules can take a long time.
+Submodules may be ignored when 'none', 'untracked', 'dirty', or 'all', which is
+the default.
+
+    zstyle ':zim:git-info' ignore-submodules 'none'
+
+### Verbose Mode
+
+Verbose mode uses `git status` and computes the count of indexed, unindexed and
+also untracked files. It can be enabled with the following zstyle:
+
+    zstyle ':zim:git-info' verbose 'yes'
+
+In non-verbose mode, the 'untracked' context is not available (see Main
+Contexts below), and untracked files are also not considered for computing the
+'dirty' context. Using `git status` or checking for untracked files can be
+[expensive](https://gist.github.com/sindresorhus/3898739).
+
+Theming
+-------
+
+To display information about the current repository in a prompt, define your
+custom styles in the `prompt_name_setup` function, where the syntax for setting
+a style is:
+
+    zstyle ':zim:git-info:context' format 'string'
+
+### Main Contexts
+
+| Name      |  Code  | Description
+| --------- | :----: | --------------------------------------------------------
+| action    |   %s   | Special action name (see Special Action Contexts below)
+| ahead     |   %A   | Commits ahead of remote count
+| behind    |   %B   | Commits behind of remote count
+| branch    |   %b   | Branch name
+| commit    |   %c   | Commit short hash (when in 'detached HEAD' state)
+| clean     |   %C   | Clean state
+| dirty     |   %D   | Dirty state (count with untracked files if verbose enabled)
+| indexed   |   %i   | Indexed files (count if verbose enabled)
+| unindexed |   %I   | Unindexed files (count if verbose enabled)
+| position  |   %p   | Commits from nearest tag count (when in 'detached HEAD' state)
+| remote    |   %R   | Remote name
+| stashed   |   %S   | Stashed states count
+| untracked |   %u   | Untracked files count (only if verbose enabled)
+
+### Special Action Contexts
+
+| Name                        | Format  | Default Value
+| --------------------------- | :-----: | -------------------------------------
+| action:apply                |  value  | 'apply'
+| action:bisect               |  value  | 'bisect'
+| action:cherry-pick          |  value  | 'cherry-pick'
+| action:cherry-pick-sequence |  value  | 'cherry-pick-sequence'
+| action:merge                |  value  | 'merge'
+| action:rebase               |  value  | 'rebase'
+| action:rebase-interactive   |  value  | 'rebase-interactive'
+| action:rebase-merge         |  value  | 'rebase-merge'
+
+Formatting example for special actions:
+
+    zstyle ':zim:git-info:action:bisect' format '<B>'
+    zstyle ':zim:git-info:action:merge'  format '>M<'
+    zstyle ':zim:git-info:action:rebase' format '>R>'
+
+### Usage
+
+First, format the repository state attributes. For example, to format the
+branch name, commit, and remote name, define the following styles:
+
+    zstyle ':zim:git-info:branch' format 'branch:%b'
+    zstyle ':zim:git-info:commit' format 'commit:%c'
+    zstyle ':zim:git-info:remote' format 'remote:%R'
+
+Second, format how the above attributes are displayed in prompts:
+
+    zstyle ':zim:git-info:keys' format \
+      'prompt'  'git(%b%c)' \
+      'rprompt' '[%R]'
+
+Last, add `$git_info[prompt]` to `$PROMPT` and `$git_info[rprompt]` to
+`$RPROMPT` respectively and call `git-info` in the `prompt_name_preexec` hook
+function.
diff --git a/zsh/modules/git-info/functions/coalesce b/zsh/modules/git-info/functions/coalesce
new file mode 100644
index 0000000..e9e838e
--- /dev/null
+++ b/zsh/modules/git-info/functions/coalesce
@@ -0,0 +1,6 @@
+# Prints the first non-empty string in the arguments array.
+for arg in ${argv}; do
+  print -n ${arg}
+  return 0
+done
+return 1
diff --git a/zsh/modules/git-info/functions/coalesce.zwc b/zsh/modules/git-info/functions/coalesce.zwc
new file mode 100644
index 0000000..ddc45df
Binary files /dev/null and b/zsh/modules/git-info/functions/coalesce.zwc differ
diff --git a/zsh/modules/git-info/init.zsh b/zsh/modules/git-info/init.zsh
new file mode 100644
index 0000000..1b4d16c
--- /dev/null
+++ b/zsh/modules/git-info/init.zsh
@@ -0,0 +1,336 @@
+# vim: et ts=2 sts=2 sw=2 ft=zsh
+#
+# Exposes Git repository information via the git_info associative array.
+#
+
+# Gets the Git special action (am, bisect, cherry, merge, rebase).
+# Borrowed from vcs_info and edited.
+function _git-action {
+  local git_dir=$(git-dir)
+  local action_dir
+  for action_dir in \
+    "${git_dir}/rebase-apply" \
+    "${git_dir}/rebase" \
+    "${git_dir}/../.dotest"
+  do
+    if [[ -d ${action_dir} ]]; then
+      local apply_formatted
+      local rebase_formatted
+      zstyle -s ':zim:git-info:action:apply' format 'apply_formatted' || apply_formatted='apply'
+      zstyle -s ':zim:git-info:action:rebase' format 'rebase_formatted' || rebase_formatted='rebase'
+
+      if [[ -f "${action_dir}/rebasing" ]]; then
+        print ${rebase_formatted}
+      elif [[ -f "${action_dir}/applying" ]]; then
+        print ${apply_formatted}
+      else
+        print "${rebase_formatted}/${apply_formatted}"
+      fi
+
+      return 0
+    fi
+  done
+
+  for action_dir in \
+    "${git_dir}/rebase-merge/interactive" \
+    "${git_dir}/.dotest-merge/interactive"
+  do
+    if [[ -f ${action_dir} ]]; then
+      local rebase_interactive_formatted
+      zstyle -s ':zim:git-info:action:rebase-interactive' format 'rebase_interactive_formatted' || rebase_interactive_formatted='rebase-interactive'
+      print ${rebase_interactive_formatted}
+      return 0
+    fi
+  done
+
+  for action_dir in \
+    "${git_dir}/rebase-merge" \
+    "${git_dir}/.dotest-merge"
+  do
+    if [[ -d ${action_dir} ]]; then
+      local rebase_merge_formatted
+      zstyle -s ':zim:git-info:action:rebase-merge' format 'rebase_merge_formatted' || rebase_merge_formatted='rebase-merge'
+      print ${rebase_merge_formatted}
+      return 0
+    fi
+  done
+
+  if [[ -f "${git_dir}/MERGE_HEAD" ]]; then
+    local merge_formatted
+    zstyle -s ':zim:git-info:action:merge' format 'merge_formatted' || merge_formatted='merge'
+    print ${merge_formatted}
+    return 0
+  fi
+
+  if [[ -f "${git_dir}/CHERRY_PICK_HEAD" ]]; then
+    if [[ -d "${git_dir}/sequencer" ]]; then
+      local cherry_pick_sequence_formatted
+      zstyle -s ':zim:git-info:action:cherry-pick-sequence' format 'cherry_pick_sequence_formatted' || cherry_pick_sequence_formatted='cherry-pick-sequence'
+      print ${cherry_pick_sequence_formatted}
+    else
+      local cherry_pick_formatted
+      zstyle -s ':zim:git-info:action:cherry-pick' format 'cherry_pick_formatted' || cherry_pick_formatted='cherry-pick'
+      print ${cherry_pick_formatted}
+    fi
+
+    return 0
+  fi
+
+  if [[ -f "${git_dir}/BISECT_LOG" ]]; then
+    local bisect_formatted
+    zstyle -s ':zim:git-info:action:bisect' format 'bisect_formatted' || bisect_formatted='bisect'
+    print ${bisect_formatted}
+    return 0
+  fi
+
+  return 1
+}
+
+# Gets the Git status information.
+function git-info {
+  # Extended globbing is needed to parse repository status.
+  setopt LOCAL_OPTIONS EXTENDED_GLOB
+
+  # Clean up previous git_info.
+  unset git_info
+  typeset -gA git_info
+
+  # Return if not inside a Git repository work tree.
+  if ! is-true $(git rev-parse --is-inside-work-tree 2>/dev/null); then
+    return 1
+  fi
+
+  if (( $# )); then
+    if [[ $1 == [Oo][Nn] ]]; then
+      git config --bool prompt.showinfo true
+    elif [[ $1 == [Oo][Ff][Ff] ]]; then
+      git config --bool prompt.showinfo false
+    else
+      print "usage: $0 [ on | off ]" >&2
+    fi
+    return 0
+  fi
+
+  # Return if git-info is disabled.
+  if ! is-true ${$(git config --bool prompt.showinfo):-true}; then
+    return 1
+  fi
+
+  # Ignore submodule status.
+  local ignore_submodules
+  zstyle -s ':zim:git-info' ignore-submodules 'ignore_submodules' || ignore_submodules='all'
+
+  # Format stashed.
+  local stashed_format
+  local stashed_formatted
+  zstyle -s ':zim:git-info:stashed' format 'stashed_format'
+  if [[ -n ${stashed_format} && -f "$(git-dir)/refs/stash" ]]; then
+    local stashed
+    (( stashed=$(git stash list 2>/dev/null | wc -l) ))
+    (( stashed )) && zformat -f stashed_formatted ${stashed_format} "S:${stashed}"
+  fi
+
+  # Format action.
+  local action_format
+  local action_formatted
+  zstyle -s ':zim:git-info:action' format 'action_format'
+  if [[ -n ${action_format} ]]; then
+    local action=$(_git-action)
+    if [[ -n ${action} ]]; then
+      zformat -f action_formatted ${action_format} "s:${action}"
+    fi
+  fi
+
+  # Get the branch.
+  local branch=$(git symbolic-ref -q --short HEAD 2>/dev/null)
+
+  local ahead_formatted
+  local behind_formatted
+  local branch_formatted
+  local commit_formatted
+  local position_formatted
+  local remote_formatted
+  if [[ -n ${branch} ]]; then
+    # Format branch.
+    local branch_format
+    zstyle -s ':zim:git-info:branch' format 'branch_format'
+    if [[ -n ${branch_format} ]]; then
+      zformat -f branch_formatted ${branch_format} "b:${branch}"
+    fi
+
+    # Format remote.
+    local remote_format
+    zstyle -s ':zim:git-info:remote' format 'remote_format'
+    if [[ -n ${remote_format} ]]; then
+      # Gets the remote name.
+      local remote_cmd='git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
+      local remote=${$(${(z)remote_cmd} 2>/dev/null)##refs/remotes/}
+      if [[ -n ${remote} ]]; then
+        zformat -f remote_formatted ${remote_format} "R:${remote}"
+      fi
+    fi
+
+    local ahead_format
+    local behind_format
+    zstyle -s ':zim:git-info:ahead' format 'ahead_format'
+    zstyle -s ':zim:git-info:behind' format 'behind_format'
+    if [[ -n ${ahead_format} || -n ${behind_format} ]]; then
+      # Gets the commit difference counts between local and remote.
+      local ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
+
+      # Get ahead and behind counts.
+      local ahead_and_behind=$(${(z)ahead_and_behind_cmd} 2>/dev/null)
+
+      # Format ahead.
+      if [[ -n ${ahead_format} ]]; then
+        local ahead=${ahead_and_behind[(w)1]}
+        (( ahead )) && zformat -f ahead_formatted ${ahead_format} "A:${ahead}"
+      fi
+
+      # Format behind.
+      if [[ -n ${behind_format} ]]; then
+        local behind=${ahead_and_behind[(w)2]}
+        (( behind )) && zformat -f behind_formatted ${behind_format} "B:${behind}"
+      fi
+    fi
+  else
+    # Format commit.
+    local commit_format
+    zstyle -s ':zim:git-info:commit' format 'commit_format'
+    if [[ -n ${commit_format} ]]; then
+      local commit=$(git rev-parse --short HEAD 2>/dev/null)
+      if [[ -n ${commit} ]]; then
+        zformat -f commit_formatted ${commit_format} "c:${commit}"
+      fi
+    fi
+
+    # Format position.
+    local position_format
+    zstyle -s ':zim:git-info:position' format 'position_format'
+    if [[ -n ${position_format} ]]; then
+      local position=$(git describe --contains --all HEAD 2>/dev/null)
+      if [[ -n ${position} ]]; then
+        zformat -f position_formatted ${position_format} "p:${position}"
+      fi
+    fi
+  fi
+
+  # Dirty and clean format.
+  local dirty_format
+  local dirty_formatted
+  local clean_format
+  local clean_formatted
+  zstyle -s ':zim:git-info:dirty' format 'dirty_format'
+  zstyle -s ':zim:git-info:clean' format 'clean_format'
+
+  local dirty
+  local indexed
+  local indexed_formatted
+  local unindexed
+  local unindexed_formatted
+  local untracked_formatted
+  if ! zstyle -t ':zim:git-info' verbose; then
+    # Format unindexed.
+    local unindexed_format
+    zstyle -s ':zim:git-info:unindexed' format 'unindexed_format'
+    if [[ -n ${unindexed_format} || -n ${dirty_format} || -n ${clean_format} ]]; then
+      (git diff-files --no-ext-diff --quiet --ignore-submodules=${ignore_submodules} 2>/dev/null)
+      unindexed=$?
+      if (( unindexed )); then
+        unindexed_formatted=${unindexed_format}
+        dirty=${unindexed}
+      fi
+    fi
+
+    # Format indexed.
+    local indexed_format
+    zstyle -s ':zim:git-info:indexed' format 'indexed_format'
+    if [[ -n ${indexed_format} || (${dirty} -eq 0 && (-n ${dirty_format} || -n ${clean_format})) ]]; then
+      (git diff-index --no-ext-diff --quiet --cached --ignore-submodules=${ignore_submodules} HEAD 2>/dev/null)
+      indexed=$?
+      if (( indexed )); then
+        indexed_formatted=${indexed_format}
+        dirty=${indexed}
+      fi
+    fi
+
+    # Format dirty and clean.
+    if (( dirty )); then
+      dirty_formatted=${dirty_format}
+    else
+      clean_formatted=${clean_format}
+    fi
+  else
+    # Use porcelain status for easy parsing.
+    local status_cmd="git status --porcelain --ignore-submodules=${ignore_submodules}"
+
+    local untracked
+    # Get current status.
+    while IFS=$'\n' read line; do
+      # T (type change) is undocumented, see http://git.io/FnpMGw.
+      if [[ ${line} == \?\?\ * ]]; then
+        (( untracked++ ))
+      elif [[ ${line} == \ [DMT]\ * ]]; then
+        (( unindexed++ ))
+      elif [[ ${line} == [ACDMRT]\ \ * ]]; then
+        (( indexed++ ))
+      elif [[ ${line} == ([ACMRT][DMT]|D[MT])\ * ]]; then
+        (( indexed++, unindexed++ ))
+      fi
+      (( dirty++ ))
+    done < <(${(z)status_cmd} 2>/dev/null)
+
+    # Format indexed.
+    if (( indexed )); then
+      local indexed_format
+      zstyle -s ':zim:git-info:indexed' format 'indexed_format'
+      zformat -f indexed_formatted ${indexed_format} "i:${indexed}"
+    fi
+
+    # Format unindexed.
+    if (( unindexed )); then
+      local unindexed_format
+      zstyle -s ':zim:git-info:unindexed' format 'unindexed_format'
+      zformat -f unindexed_formatted ${unindexed_format} "I:${unindexed}"
+    fi
+
+    # Format untracked.
+    if (( untracked )); then
+      local untracked_format
+      zstyle -s ':zim:git-info:untracked' format 'untracked_format'
+      zformat -f untracked_formatted ${untracked_format} "u:${untracked}"
+    fi
+
+    # Format dirty and clean.
+    if (( dirty )); then
+      zformat -f dirty_formatted ${dirty_format} "u:${dirty}"
+    else
+      clean_formatted=${clean_format}
+    fi
+  fi
+
+  # Format info.
+  local info_format
+  local -A info_formats
+  local reply
+  zstyle -a ':zim:git-info:keys' format 'info_formats'
+  for info_format in ${(k)info_formats}; do
+    zformat -f reply "${info_formats[${info_format}]}" \
+      "A:${ahead_formatted}" \
+      "B:${behind_formatted}" \
+      "b:${branch_formatted}" \
+      "C:${clean_formatted}" \
+      "c:${commit_formatted}" \
+      "D:${dirty_formatted}" \
+      "i:${indexed_formatted}" \
+      "I:${unindexed_formatted}" \
+      "p:${position_formatted}" \
+      "R:${remote_formatted}" \
+      "s:${action_formatted}" \
+      "S:${stashed_formatted}" \
+      "u:${untracked_formatted}"
+    git_info[${info_format}]=${reply}
+  done
+
+  return 0
+}
diff --git a/zsh/modules/git/README.md b/zsh/modules/git/README.md
new file mode 100644
index 0000000..b1db63a
--- /dev/null
+++ b/zsh/modules/git/README.md
@@ -0,0 +1,222 @@
+Git
+===
+
+Provides nice git aliases and functions.
+
+Also provides functions necessary for many prompts.
+
+Many thanks to [Sorin Ionescu](https://github.com/sorin-ionescu) for the excellent aliases.
+
+
+Aliases
+-------
+
+### Git
+
+  - `g` is short for `git`.
+
+### Branch
+
+  - `gb` lists, creates, renames, and deletes branches.
+  - `gbc` creates a new branch.
+  - `gbl` lists branches and their commits.
+  - `gbL` lists local and remote branches and their commits.
+  - `gbs` lists branches and their commits with ancestry graphs.
+  - `gbS` lists local and remote branches and their commits with ancestry
+    graphs.
+  - `gbx` deletes a branch.
+  - `gbX` deletes a branch irrespective of its merged status.
+  - `gbm` renames a branch.
+  - `gbM` renames a branch even if the new branch name already exists.
+
+
+### Commit
+
+  - `gc` records changes to the repository.
+  - `gca` stages all modified and deleted files.
+  - `gcm` records changes to the repository with the given message.
+  - `gco` checks out a branch or paths to work tree.
+  - `gcO` checks out hunks from the index or the tree interactively.
+  - `gcf` amends the tip of the current branch using the same log message as
+    *HEAD*.
+  - `gcF` amends the tip of the current branch.
+  - `gcp` applies changes introduced by existing commits.
+  - `gcP` applies changes introduced by existing commits without committing.
+  - `gcr` reverts existing commits by reverting patches and recording new
+     commits.
+  - `gcR` removes the *HEAD* commit.
+  - `gcs` displays various types of objects.
+  - `gcl` lists lost commits.
+
+### Conflict
+
+  - `gCl` lists unmerged files.
+  - `gCa` adds unmerged file contents to the index.
+  - `gCe` executes merge-tool on all unmerged file.
+  - `gCo` checks out our changes for unmerged paths.
+  - `gCO` checks out our changes for all unmerged paths.
+  - `gCt` checks out their changes for unmerged paths.
+  - `gCT` checks out their changes for all unmerged paths.
+
+### Data
+
+  - `gd` displays information about files in the index and the work tree.
+  - `gdc` lists cached files.
+  - `gdx` lists deleted files.
+  - `gdm` lists modified files.
+  - `gdu` lists untracked files.
+  - `gdk` lists killed files.
+  - `gdi` lists ignored files.
+
+### Fetch
+
+  - `gf` downloads objects and references from another repository.
+  - `gfc` clones a repository into a new directory.
+  - `gfm` fetches from and merges with another repository or local branch.
+  - `gfr` fetches from and rebases on another repository or local branch.
+
+### Grep
+
+  - `gg` displays lines matching a pattern.
+  - `ggi` displays lines matching a pattern ignoring case.
+  - `ggl` lists files matching a pattern.
+  - `ggL` lists files that are not matching a pattern.
+  - `ggv` displays lines not matching a pattern.
+  - `ggw` displays lines matching a pattern at word boundary.
+
+### Index
+
+  - `gia` adds file contents to the index.
+  - `giA` adds file contents to the index interactively.
+  - `giu` adds file contents to the index (updates only known files).
+  - `gid` displays changes between the index and a named commit (diff).
+  - `giD` displays changes between the index and a named commit (word diff).
+  - `gir` resets the current HEAD to the specified state.
+  - `giR` resets the current index interactively.
+  - `gix` removes files/directories from the index (recursively).
+  - `giX` removes files/directories from the index (recursively and forced).
+
+### Log
+
+  - `gl` displays the log.
+  - `gls` displays the stats log.
+  - `gld` displays the diff log.
+  - `glo` displays the one line log.
+  - `glg` displays the graph log.
+  - `glG` displays the graph log with authors and dates.
+  - `glb` displays the brief commit log.
+  - `glc` displays the commit count for each contributor in descending order.
+
+### Merge
+
+  - `gm` joins two or more development histories together.
+  - `gmC` joins two or more development histories together but does not commit.
+  - `gmF` joins two or more development histories together but does not commit
+     generating a merge commit even if the merge resolved as a fast-forward.
+  - `gma` aborts the conflict resolution, and reconstructs the pre-merge state.
+  - `gmt` runs the merge conflict resolution tools to resolve conflicts.
+
+### Push
+
+  - `gp` updates remote refs along with associated objects.
+  - `gpf` forcefully updates remote refs along with associated objects.
+  - `gpa` updates remote branches along with associated objects.
+  - `gpA` updates remote branches and tags along with associated objects.
+  - `gpt` updates remote tags along with associated objects.
+  - `gpc` updates remote refs along with associated objects and adds *origin*
+     as an upstream reference for the current branch.
+  - `gpp` pulls and pushes from origin to origin.
+
+### Rebase
+
+  - `gr` forward-ports local commits to the updated upstream head.
+  - `gra` aborts the rebase.
+  - `grc` continues the rebase after merge conflicts are resolved.
+  - `gri` makes a list of commits to be rebased and opens the editor.
+  - `grs` skips the current patch.
+
+### Remote
+
+  - `gR` manages tracked repositories.
+  - `gRl` lists remote names and their URLs.
+  - `gRa` adds a new remote.
+  - `gRx` removes a remote.
+  - `gRm` renames a remote.
+  - `gRu` fetches remotes updates.
+  - `gRp` prunes all stale remote tracking branches.
+  - `gRs` displays information about a given remote.
+  - `gRb` opens a remote on GitHub in the default browser.
+
+### Stash
+
+  - `gs` stashes the changes of the dirty working directory.
+  - `gsa` applies the changes recorded in a stash to the working directory.
+  - `gsx` drops a stashed state.
+  - `gsX` drops all the stashed states.
+  - `gsl` lists stashed states.
+  - `gsL` lists dropped stashed states.
+  - `gsd` displays changes between the stash and its original parent.
+  - `gsp` removes and applies a single stashed state from the stash list.
+  - `gsr` recovers a given stashed state.
+  - `gss` stashes the changes of the dirty working directory, including untracked.
+  - `gsS` stashes the changes of the dirty working directory interactively.
+  - `gsw` stashes the changes of the dirty working directory retaining the index.
+  - `gsu` unapplies (reverts) applied changes.
+
+### Submodule
+
+  - `gS` initializes, updates, or inspects submodules.
+  - `gSa` adds given a repository as a submodule.
+  - `gSf` evaluates a shell command in each of checked out submodules.
+  - `gSi` initializes submodules.
+  - `gSI` initializes and clones submodules recursively.
+  - `gSl` lists the commits of all submodules.
+  - `gSm` moves a submodule.
+  - `gSs` synchronizes submodules' remote URL to the value specified in
+    .gitmodules.
+  - `gSu` fetches and merges the latest changes for all submodule.
+  - `gSx` removes a submodule.
+
+### Working directory
+
+  - `gws` displays working-tree status in the short format.
+  - `gwS` displays working-tree status.
+  - `gwd` displays changes between the working tree and the index (diff).
+  - `gwD` displays changes between the working tree and the index (word diff).
+  - `gwr` resets the current HEAD to the specified state, does not touch the
+     index nor the working tree.
+  - `gwR` resets the current HEAD, index and working tree to the specified state.
+  - `gwc` removes untracked files from the working tree (dry-run).
+  - `gwC` removes untracked files from the working tree.
+  - `gwx` removes files from the working tree and from the index recursively.
+  - `gwX` removes files from the working tree and from the index recursively and
+    forcefully.
+
+### Shadows
+
+The following aliases may shadow system commands:
+
+  - `gpt` shadows the GUID partition table maintenance utility.
+  - `gs` shadows Ghostscript.
+
+If you frequently use the above commands, you may wish to remove said aliases
+from this module or to disable them at the bottom of the zshrc with `unalias`.
+
+You can temporarily bypass an alias by prefixing it with a backward slash:
+`\gpt`.
+
+Functions
+---------
+
+  - `git-branch-current` displays the current branch.
+  - `git-commit-lost` lists lost commits.
+  - `git-dir` displays the path to the Git directory.
+  - `git-hub-browse` opens the GitHub repository in the default browser.
+  - `git-hub-shorten-url` shortens GitHub URLs.
+  - `git-ignore-add` adds any arguments to the .gitignore in the project root.
+  - `git-root` displays the path to the working tree root.
+  - `git-stash-clear-interactive` asks for confirmation before clearing the stash.
+  - `git-stash-dropped` lists dropped stashed states.
+  - `git-stash-recover` recovers given dropped stashed states.
+  - `git-submodule-move` moves a submodule.
+  - `git-submodule-remove` removes a submodule.
diff --git a/zsh/modules/git/functions/git-branch-current b/zsh/modules/git/functions/git-branch-current
new file mode 120000
index 0000000..4b844e9
--- /dev/null
+++ b/zsh/modules/git/functions/git-branch-current
@@ -0,0 +1 @@
+git_current_branch
\ No newline at end of file
diff --git a/zsh/modules/git/functions/git-commit-lost b/zsh/modules/git/functions/git-commit-lost
new file mode 100644
index 0000000..e801e6d
--- /dev/null
+++ b/zsh/modules/git/functions/git-commit-lost
@@ -0,0 +1,13 @@
+if ! is-true "$(commmand git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+fi
+
+command git fsck 2> /dev/null \
+  | grep "^dangling commit" \
+  | awk '{print $3}' \
+  | command git log \
+      --date-order \
+      --no-walk \
+      --stdin \
+      --pretty=format:${_git_log_oneline_format}
diff --git a/zsh/modules/git/functions/git-commit-lost.zwc b/zsh/modules/git/functions/git-commit-lost.zwc
new file mode 100644
index 0000000..043eea8
Binary files /dev/null and b/zsh/modules/git/functions/git-commit-lost.zwc differ
diff --git a/zsh/modules/git/functions/git-dir b/zsh/modules/git/functions/git-dir
new file mode 100644
index 0000000..215c849
--- /dev/null
+++ b/zsh/modules/git/functions/git-dir
@@ -0,0 +1,9 @@
+local git_dir="${$(command git rev-parse --git-dir):A}"
+
+if [[ -n "${git_dir}" ]]; then
+  print "${git_dir}"
+  return 0
+else
+  print "${0}: not a repository: ${PWD}" >&2
+  return 1
+fi
diff --git a/zsh/modules/git/functions/git-dir.zwc b/zsh/modules/git/functions/git-dir.zwc
new file mode 100644
index 0000000..6fc042d
Binary files /dev/null and b/zsh/modules/git/functions/git-dir.zwc differ
diff --git a/zsh/modules/git/functions/git-ignore-add b/zsh/modules/git/functions/git-ignore-add
new file mode 100644
index 0000000..bb05ab8
--- /dev/null
+++ b/zsh/modules/git/functions/git-ignore-add
@@ -0,0 +1,10 @@
+# make sure we have a git-root
+if ! git-root &> /dev/null; then
+  print 'not in a git repository' >&2
+  return 1
+fi
+
+# we are in a git repository. add parameters to .gitignore
+for file in "${@}"; do
+  print "${file}" >>! $(git-root)/.gitignore
+done
diff --git a/zsh/modules/git/functions/git-ignore-add.zwc b/zsh/modules/git/functions/git-ignore-add.zwc
new file mode 100644
index 0000000..4a3ffc0
Binary files /dev/null and b/zsh/modules/git/functions/git-ignore-add.zwc differ
diff --git a/zsh/modules/git/functions/git-root b/zsh/modules/git/functions/git-root
new file mode 100644
index 0000000..7ed44ff
--- /dev/null
+++ b/zsh/modules/git/functions/git-root
@@ -0,0 +1,9 @@
+local root="$(command git rev-parse --show-toplevel 2> /dev/null)"
+
+if [[ -n "${root}" ]]; then
+  print "${root}"
+  return 0
+else
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+fi
diff --git a/zsh/modules/git/functions/git-root.zwc b/zsh/modules/git/functions/git-root.zwc
new file mode 100644
index 0000000..580fbef
Binary files /dev/null and b/zsh/modules/git/functions/git-root.zwc differ
diff --git a/zsh/modules/git/functions/git-stash-clear-interactive b/zsh/modules/git/functions/git-stash-clear-interactive
new file mode 100644
index 0000000..0197be9
--- /dev/null
+++ b/zsh/modules/git/functions/git-stash-clear-interactive
@@ -0,0 +1,15 @@
+if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+fi
+
+local stashed
+
+if [[ -f "$(git-dir)/refs/stash" ]]; then
+  stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
+  if (( ${stashed} > 0 )); then
+    if read -q "?Clear ${stashed} stashed state(s) [y/N]? "; then
+      command git stash clear
+    fi
+  fi
+fi
diff --git a/zsh/modules/git/functions/git-stash-clear-interactive.zwc b/zsh/modules/git/functions/git-stash-clear-interactive.zwc
new file mode 100644
index 0000000..f5e7bea
Binary files /dev/null and b/zsh/modules/git/functions/git-stash-clear-interactive.zwc differ
diff --git a/zsh/modules/git/functions/git-stash-dropped b/zsh/modules/git/functions/git-stash-dropped
new file mode 100644
index 0000000..1cc979b
--- /dev/null
+++ b/zsh/modules/git/functions/git-stash-dropped
@@ -0,0 +1,15 @@
+if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+fi
+
+command git fsck --unreachable 2> /dev/null \
+  | grep 'commit' \
+  | awk '{print $3}' \
+  | command git log \
+      --pretty=format:${_git_log_oneline_format} \
+      --extended-regexp \
+      --grep="${1:-(WIP )?[Oo]n [^:]+:}" \
+      --merges \
+      --no-walk \
+      --stdin
diff --git a/zsh/modules/git/functions/git-stash-dropped.zwc b/zsh/modules/git/functions/git-stash-dropped.zwc
new file mode 100644
index 0000000..8b495ff
Binary files /dev/null and b/zsh/modules/git/functions/git-stash-dropped.zwc differ
diff --git a/zsh/modules/git/functions/git-stash-recover b/zsh/modules/git/functions/git-stash-recover
new file mode 100644
index 0000000..8b5adec
--- /dev/null
+++ b/zsh/modules/git/functions/git-stash-recover
@@ -0,0 +1,11 @@
+if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+fi
+
+local commit
+
+for commit in "${@}"; do
+  git update-ref \
+    -m "$(command git log -1 --pretty="format:%s" "$commit")" refs/stash "${commit}"
+done
diff --git a/zsh/modules/git/functions/git-stash-recover.zwc b/zsh/modules/git/functions/git-stash-recover.zwc
new file mode 100644
index 0000000..fc1fa7e
Binary files /dev/null and b/zsh/modules/git/functions/git-stash-recover.zwc differ
diff --git a/zsh/modules/git/functions/git-submodule-move b/zsh/modules/git/functions/git-submodule-move
new file mode 100644
index 0000000..2f7132c
--- /dev/null
+++ b/zsh/modules/git/functions/git-submodule-move
@@ -0,0 +1,25 @@
+if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+elif [[ "${PWD}" != "$(git-root)" ]]; then
+  print "${0}: must be run from the root of the work tree" >&2
+  return 1
+fi
+
+local src="${1}"
+local dst="${2}"
+local url
+
+url="$(command git config --file "$(git-root)/.gitmodules" --get "submodule.${src}.url")"
+
+if [[ -z "${url}" ]]; then
+  print "${0}: submodule not found: ${src}" >&2
+  return 1
+fi
+
+mkdir -p "${dst:h}"
+
+git-submodule-remove "${src}"
+git submodule add "${url}" "${dst}"
+
+return 0
diff --git a/zsh/modules/git/functions/git-submodule-move.zwc b/zsh/modules/git/functions/git-submodule-move.zwc
new file mode 100644
index 0000000..435e1fc
Binary files /dev/null and b/zsh/modules/git/functions/git-submodule-move.zwc differ
diff --git a/zsh/modules/git/functions/git-submodule-remove b/zsh/modules/git/functions/git-submodule-remove
new file mode 100644
index 0000000..033d39a
--- /dev/null
+++ b/zsh/modules/git/functions/git-submodule-remove
@@ -0,0 +1,20 @@
+if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
+  print "${0}: not a repository work tree: ${PWD}" >&2
+  return 1
+elif [[ "${PWD}" != "$(git-root)" ]]; then
+  print "${0}: must be run from the root of the work tree" >&2
+  return 1
+elif ! command git config --file .gitmodules --get "submodule.${1}.path" &>/dev/null; then
+  print "${0}: submodule not found: ${1}" >&2
+  return 1
+fi
+
+command git config --file "$(git-dir)/config" --remove-section "submodule.${1}" &>/dev/null
+command git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &>/dev/null
+command git add .gitmodules
+
+command git rm --cached -rf "${1}"
+rm -rf "${1}"
+rm -rf "$(git-dir)/modules/${1}"
+
+return 0
diff --git a/zsh/modules/git/functions/git-submodule-remove.zwc b/zsh/modules/git/functions/git-submodule-remove.zwc
new file mode 100644
index 0000000..e8ae80a
Binary files /dev/null and b/zsh/modules/git/functions/git-submodule-remove.zwc differ
diff --git a/zsh/modules/git/functions/git_current_branch b/zsh/modules/git/functions/git_current_branch
new file mode 100644
index 0000000..7325a61
--- /dev/null
+++ b/zsh/modules/git/functions/git_current_branch
@@ -0,0 +1,9 @@
+# slightly modified git_current_branch from oh-my-zsh for theme compatibility
+local ref
+ref=$(command git symbolic-ref --quiet HEAD 2> /dev/null)
+local ret=${?}
+if [[ ${ret} != 0 ]]; then
+  [[ ${ret} == 128 ]] && return  # no git repo.
+  ref=$(command git rev-parse --short HEAD 2> /dev/null) || return
+fi
+print ${ref#refs/heads/}
diff --git a/zsh/modules/git/functions/git_current_branch.zwc b/zsh/modules/git/functions/git_current_branch.zwc
new file mode 100644
index 0000000..2c30ebd
Binary files /dev/null and b/zsh/modules/git/functions/git_current_branch.zwc differ
diff --git a/zsh/modules/git/functions/is-true b/zsh/modules/git/functions/is-true
new file mode 100644
index 0000000..e56f2bb
--- /dev/null
+++ b/zsh/modules/git/functions/is-true
@@ -0,0 +1,5 @@
+# Checks a boolean variable for "true".
+# Case insensitive: "1", "y", "yes", "t", "true", "o", and "on".
+is-true() {
+  [[ -n "$1" && "$1" == (1|[Yy]([Ee][Ss]|)|[Tt]([Rr][Uu][Ee]|)|[Oo]([Nn]|)) ]]
+}
diff --git a/zsh/modules/git/functions/is-true.zwc b/zsh/modules/git/functions/is-true.zwc
new file mode 100644
index 0000000..8bedbd2
Binary files /dev/null and b/zsh/modules/git/functions/is-true.zwc differ
diff --git a/zsh/modules/git/init.zsh b/zsh/modules/git/init.zsh
new file mode 100644
index 0000000..e03cb7b
--- /dev/null
+++ b/zsh/modules/git/init.zsh
@@ -0,0 +1,184 @@
+#
+# Git aliases.
+#
+
+#
+# Settings
+#
+
+# Log
+_git_log_medium_format='%C(bold)Commit:%C(reset) %C(green)%H%C(red)%d%n%C(bold)Author:%C(reset) %C(cyan)%an <%ae>%n%C(bold)Date:%C(reset)   %C(blue)%ai (%ar)%C(reset)%n%+B'
+_git_log_oneline_format='%C(green)%h%C(reset) %s%C(red)%d%C(reset)%n'
+_git_log_fullgraph_format='%C(green)%h%C(reset) %<|(50,trunc)%s %C(bold blue)<%an>%C(reset) %C(yellow)(%cd)%C(reset)%C(auto)%d%C(reset)%n'
+_git_log_brief_format='%C(green)%h%C(reset) %s%n%C(blue)(%ar by %an)%C(red)%d%C(reset)%n'
+
+#
+# Aliases
+#
+
+# Git
+alias g='git'
+
+# Branch (b)
+alias gb='git branch'
+alias gbc='git checkout -b'
+alias gbl='git branch -v'
+alias gbL='git branch -av'
+alias gbx='git branch -d'
+alias gbX='git branch -D'
+alias gbm='git branch -m'
+alias gbM='git branch -M'
+alias gbs='git show-branch'
+alias gbS='git show-branch -a'
+
+# Commit (c)
+alias gc='git commit --verbose'
+alias gca='git commit --verbose --all'
+alias gcm='git commit --message'
+alias gco='git checkout'
+alias gcO='git checkout --patch'
+alias gcf='git commit --amend --reuse-message HEAD'
+alias gcF='git commit --verbose --amend'
+alias gcp='git cherry-pick --ff'
+alias gcP='git cherry-pick --no-commit'
+alias gcr='git revert'
+alias gcR='git reset "HEAD^"'
+alias gcs='git show'
+alias gcl='git-commit-lost'
+alias gcS='git commit -S'
+alias gpS='git show --pretty=short --show-signature'
+
+# Conflict (C)
+alias gCl='git status | sed -n "s/^.*both [a-z]*ed: *//p"'
+alias gCa='git add $(gCl)'
+alias gCe='git mergetool $(gCl)'
+alias gCo='git checkout --ours --'
+alias gCO='gCo $(gCl)'
+alias gCt='git checkout --theirs --'
+alias gCT='gCt $(gCl)'
+
+# Data (d)
+alias gd='git ls-files'
+alias gdc='git ls-files --cached'
+alias gdx='git ls-files --deleted'
+alias gdm='git ls-files --modified'
+alias gdu='git ls-files --other --exclude-standard'
+alias gdk='git ls-files --killed'
+alias gdi='git status --porcelain --short --ignored | sed -n "s/^!! //p"'
+
+# Fetch (f)
+alias gf='git fetch'
+alias gfc='git clone'
+alias gfm='git pull'
+alias gfr='git pull --rebase'
+alias gfu='git remote update -p; git merge --ff-only @\{u\}'
+
+# Grep (g)
+alias gg='git grep'
+alias ggi='git grep --ignore-case'
+alias ggl='git grep --files-with-matches'
+alias ggL='git grep --files-without-match'
+alias ggv='git grep --invert-match'
+alias ggw='git grep --word-regexp'
+
+# Index (i)
+alias gia='git add'
+alias giA='git add --patch'
+alias giu='git add --update'
+alias gid='git diff --no-ext-diff --cached'
+alias giD='git diff --no-ext-diff --cached --word-diff'
+alias gir='git reset'
+alias giR='git reset --patch'
+alias gix='git rm -r --cached'
+alias giX='git rm -rf --cached'
+
+# Log (l)
+alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
+alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
+alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
+alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
+alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
+alias glG='git log --topo-order --all --graph --pretty=format:"${_git_log_fullgraph_format}" --date=relative'
+alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
+alias glc='git shortlog --summary --numbered'
+alias glS='git log --show-signature'
+
+# Merge (m)
+alias gm='git merge'
+alias gmC='git merge --no-commit'
+alias gmF='git merge --no-ff'
+alias gma='git merge --abort'
+alias gmt='git mergetool'
+
+# Push (p)
+alias gp='git push'
+alias gpf='git push --force'
+alias gpa='git push --all'
+alias gpA='git push --all && git push --tags'
+alias gpt='git push --tags'
+alias gpc='git push --set-upstream origin "$(git-branch-current 2> /dev/null)"'
+alias gpp='git pull origin "$(git-branch-current 2> /dev/null)" && git push origin "$(git-branch-current 2> /dev/null)"'
+
+# Rebase (r)
+alias gr='git rebase'
+alias gra='git rebase --abort'
+alias grc='git rebase --continue'
+alias gri='git rebase --interactive'
+alias grs='git rebase --skip'
+
+# Remote (R)
+alias gR='git remote'
+alias gRl='git remote --verbose'
+alias gRa='git remote add'
+alias gRx='git remote rm'
+alias gRm='git remote rename'
+alias gRu='git remote update'
+alias gRp='git remote prune'
+alias gRs='git remote show'
+alias gRb='git-hub-browse'
+
+# Stash (s)
+alias gs='git stash'
+alias gsa='git stash apply'
+alias gsx='git stash drop'
+alias gsX='git-stash-clear-interactive'
+alias gsl='git stash list'
+alias gsL='git-stash-dropped'
+alias gsd='git stash show --patch --stat'
+alias gsp='git stash pop'
+alias gsr='git-stash-recover'
+alias gss='git stash save --include-untracked'
+alias gsS='git stash save --patch --no-keep-index'
+alias gsw='git stash save --include-untracked --keep-index'
+alias gsu='git stash show -p | git apply -R'
+
+# Submodule (S)
+alias gS='git submodule'
+alias gSa='git submodule add'
+alias gSf='git submodule foreach'
+alias gSi='git submodule init'
+alias gSI='git submodule update --init --recursive'
+alias gSl='git submodule status'
+alias gSm='git-submodule-move'
+alias gSs='git submodule sync'
+alias gSu='git submodule foreach git pull origin master'
+alias gSx='git-submodule-remove'
+
+# Tag (t)
+alias gts='git tag -s'
+alias gtv='git verify-tag'
+
+# Working Copy (w)
+alias gws='git status --short'
+alias gwS='git status'
+alias gwd='git diff --no-ext-diff'
+alias gwD='git diff --no-ext-diff --word-diff'
+alias gwr='git reset --soft'
+alias gwR='git reset --hard'
+alias gwc='git clean -n'
+alias gwC='git clean -df'
+alias gwx='git rm -r'
+alias gwX='git rm -rf'
+
+# Misc
+alias g..='cd $(git-root || print .)'
diff --git a/zsh/modules/git/init.zsh.zwc b/zsh/modules/git/init.zsh.zwc
new file mode 100644
index 0000000..2ccde1b
Binary files /dev/null and b/zsh/modules/git/init.zsh.zwc differ
diff --git a/zsh/modules/history-substring-search/README.md b/zsh/modules/history-substring-search/README.md
new file mode 100644
index 0000000..eb5ce09
--- /dev/null
+++ b/zsh/modules/history-substring-search/README.md
@@ -0,0 +1,22 @@
+History-Substring-Search
+========================
+
+Allows for fish shell-like searching of history with UP and DOWN.
+
+![example][fish_shell]
+
+This module requires the [input](https://github.com/Eriner/zim/blob/master/modules/input/README.md) module. Without it, you may experience odd behavior.
+Put 'input' in the first line and 'history-substring-search' on the second line of `zmodules` in your `.zimrc`.
+
+Additionally, if you use [syntax-highlighting](https://github.com/Eriner/zim/blob/master/modules/syntax-highlighting/README.md), place 'syntax-highlighting' before 'history-substring-search' on the second line of `zmodules` in your `.zimrc`.
+
+The options set explicitly by init.zsh are the default options, and are only set for consistancy.
+
+Functionality is sourced from [history-substring-search](https://github.com/zsh-users/zsh-history-substring-search)
+
+Contributing
+------------
+
+Contributions should be submitted [upstream to history-substring-search](https://github.com/zsh-users/zsh-history-substring-search)
+
+[fish_shell]: https://i.eriner.me/zim_history-substring-search.gif
diff --git a/zsh/modules/history-substring-search/external/.gitignore b/zsh/modules/history-substring-search/external/.gitignore
new file mode 100644
index 0000000..75f3b76
--- /dev/null
+++ b/zsh/modules/history-substring-search/external/.gitignore
@@ -0,0 +1,2 @@
+# zsh word code files (zcompile)
+*.zwc
diff --git a/zsh/modules/history-substring-search/external/README.md b/zsh/modules/history-substring-search/external/README.md
new file mode 100644
index 0000000..e9642ba
--- /dev/null
+++ b/zsh/modules/history-substring-search/external/README.md
@@ -0,0 +1,142 @@
+# zsh-history-substring-search
+
+This is a clean-room implementation of the [Fish shell][1]'s history search
+feature, where you can type in any part of any command from history and then
+press chosen keys, such as the UP and DOWN arrows, to cycle through matches.
+
+[1]: http://fishshell.com
+[2]: http://www.zsh.org/mla/users/2009/msg00818.html
+[3]: http://sourceforge.net/projects/fizsh/
+[4]: https://github.com/robbyrussell/oh-my-zsh/pull/215
+[5]: https://github.com/zsh-users/zsh-history-substring-search
+[6]: https://github.com/zsh-users/zsh-syntax-highlighting
+
+
+Requirements
+------------------------------------------------------------------------------
+
+* [ZSH](http://zsh.sourceforge.net) 4.3 or newer
+
+
+Usage
+------------------------------------------------------------------------------
+
+1.  Load this script into your interactive ZSH session:
+
+        % source zsh-history-substring-search.zsh
+
+    If you want to use [zsh-syntax-highlighting][6] along with this script,
+    then make sure that you load it *before* you load this script:
+
+        % source zsh-syntax-highlighting.zsh
+        % source zsh-history-substring-search.zsh
+
+2.  Bind keyboard shortcuts to this script's functions.
+
+    Users typically bind their UP and DOWN arrow keys to this script, thus:
+    * Run `cat -v` in your favorite terminal emulator to observe key codes.
+    * Press the UP arrow key and observe what is printed in your terminal.
+    * Press the DOWN arrow key and observe what is printed in your terminal.
+    * Press the Control and C keys simultaneously to terminate the `cat -v`.
+    * Use your observations from the previous steps to create key bindings.
+      For example, if you observed `^[[A` for UP and `^[[B` for DOWN, then:
+
+            bindkey '^[[A' history-substring-search-up
+            bindkey '^[[B' history-substring-search-down
+
+    You might also want to bind the Control-P/N keys for use in EMACS mode:
+
+        bindkey -M emacs '^P' history-substring-search-up
+        bindkey -M emacs '^N' history-substring-search-down
+
+    You might also want to bind the `k` and `j` keys for use in VI mode:
+
+        bindkey -M vicmd 'k' history-substring-search-up
+        bindkey -M vicmd 'j' history-substring-search-down
+
+3.  Type any part of any previous command and then:
+
+    * Press the `history-substring-search-up` key, which was configured in
+      step 2 above, to select the nearest command that (1) contains your query
+      and (2) is also older than the current command in your command history.
+
+    * Press the `history-substring-search-down` key, which was configured in
+      step 2 above, to select the nearest command that (1) contains your query
+      and (2) is also newer than the current command in your command history.
+
+    * Press `^U` the Control and U keys simultaneously to abort the search.
+
+4.  If a matching command spans more than one line of text, press the LEFT
+    arrow key to move the cursor away from the end of the command, and then:
+
+    * Press the `history-substring-search-up` key, which was configured in
+      step 2 above, to move the cursor to the line above the cursored line.
+      When the cursor reaches the first line of the command, pressing the
+      `history-substring-search-up` key again will cause this script to
+      perform another search.
+
+    * Press the `history-substring-search-down` key, which was configured in
+      step 2 above, to move the cursor to the line below the cursored line.
+      When the cursor reaches the last line of the command, pressing the
+      `history-substring-search-down` key, which was configured in step 2
+      above, again will cause this script to perform another search.
+
+
+Configuration
+------------------------------------------------------------------------------
+
+This script defines the following global variables. You may override their
+default values only after having loaded this script into your ZSH session.
+
+* `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND` is a global variable that defines
+  how the query should be highlighted inside a matching command. Its default
+  value causes this script to highlight using bold, white text on a magenta
+  background. See the "Character Highlighting" section in the zshzle(1) man
+  page to learn about the kinds of values you may assign to this variable.
+
+* `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND` is a global variable that
+  defines how the query should be highlighted when no commands in the
+  history match it. Its default value causes this script to highlight using
+  bold, white text on a red background. See the "Character Highlighting"
+  section in the zshzle(1) man page to learn about the kinds of values you
+  may assign to this variable.
+
+* `HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS` is a global variable that defines
+  how the command history will be searched for your query. Its default value
+  causes this script to perform a case-insensitive search. See the "Globbing
+  Flags" section in the zshexpn(1) man page to learn about the kinds of
+  values you may assign to this variable.
+
+* `HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE` is a global variable that defines
+  whether all search results returned are _unique_. If set to a non-empty
+  value, then only unique search results are presented. This behaviour is off
+  by default. An alternative way to ensure that search results are unique is
+  to use `setopt HIST_IGNORE_ALL_DUPS`. If this configuration variable is off
+  and `setopt HIST_IGNORE_ALL_DUPS` is unset, then `setopt HIST_FIND_NO_DUPS`
+  is still respected and it makes this script skip duplicate _adjacent_ search
+  results as you cycle through them, but this does not guarantee that search
+  results are unique: if your search results were "Dog", "Dog", "HotDog",
+  "Dog", then cycling them gives "Dog", "HotDog", "Dog". Notice that the "Dog"
+  search result appeared twice as you cycled through them. If you wish to
+  receive globally unique search results only once, then use this
+  configuration variable, or use `setopt HIST_IGNORE_ALL_DUPS`.
+
+
+History
+------------------------------------------------------------------------------
+
+* September 2009: [Peter Stephenson][2] originally wrote this script and it
+  published to the zsh-users mailing list.
+
+* January 2011: Guido van Steen (@guidovansteen) revised this script and
+  released it under the 3-clause BSD license as part of [fizsh][3], the
+  Friendly Interactive ZSHell.
+
+* January 2011: Suraj N. Kurapati (@sunaku) extracted this script from
+  [fizsh][3] 1.0.1, refactored it heavily, and finally repackaged it as an
+  [oh-my-zsh plugin][4] and as an independently loadable [ZSH script][5].
+
+* July 2011: Guido van Steen, Suraj N. Kurapati, and Sorin Ionescu
+  (@sorin-ionescu) [further developed it][4] with Vincent Guerci (@vguerci).
+
+* March 2016: Geza Lore (@gezalore) greatly refactored it in pull request #55.
diff --git a/zsh/modules/history-substring-search/external/zsh-history-substring-search.zsh b/zsh/modules/history-substring-search/external/zsh-history-substring-search.zsh
new file mode 100644
index 0000000..34c3df5
--- /dev/null
+++ b/zsh/modules/history-substring-search/external/zsh-history-substring-search.zsh
@@ -0,0 +1,746 @@
+#!/usr/bin/env zsh
+##############################################################################
+#
+# Copyright (c) 2009 Peter Stephenson
+# Copyright (c) 2011 Guido van Steen
+# Copyright (c) 2011 Suraj N. Kurapati
+# Copyright (c) 2011 Sorin Ionescu
+# Copyright (c) 2011 Vincent Guerci
+# Copyright (c) 2016 Geza Lore
+# All rights reserved.
+#
+# Redistribution and use 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 the FIZSH nor the names of its contributors
+#    may be used to endorse or promote products derived from this
+#    software without specific prior written permission.
+#
+# 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 HOLDER 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.
+#
+##############################################################################
+
+#-----------------------------------------------------------------------------
+# declare global variables
+#-----------------------------------------------------------------------------
+
+typeset -g BUFFER MATCH MBEGIN MEND CURSOR
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+typeset -g HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS
+typeset -g HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE
+typeset -g _history_substring_search_refresh_display
+typeset -g _history_substring_search_query_highlight
+typeset -g _history_substring_search_result
+typeset -g _history_substring_search_query
+typeset -g -A _history_substring_search_raw_matches
+typeset -g _history_substring_search_raw_match_index
+typeset -g -A _history_substring_search_matches
+typeset -g -A _history_substring_search_unique_filter
+typeset -g _history_substring_search_match_index
+
+#-----------------------------------------------------------------------------
+# configuration variables
+#-----------------------------------------------------------------------------
+
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+typeset -g HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+typeset -g HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=''
+typeset -g _history_substring_search_{refresh_display,query_highlight,result,query,match_index,raw_match_index}
+typeset -ga _history_substring_search{,_raw}_matches
+
+#-----------------------------------------------------------------------------
+# the main ZLE widgets
+#-----------------------------------------------------------------------------
+
+history-substring-search-up() {
+  _history-substring-search-begin
+
+  _history-substring-search-up-history ||
+  _history-substring-search-up-buffer ||
+  _history-substring-search-up-search
+
+  _history-substring-search-end
+}
+
+history-substring-search-down() {
+  _history-substring-search-begin
+
+  _history-substring-search-down-history ||
+  _history-substring-search-down-buffer ||
+  _history-substring-search-down-search
+
+  _history-substring-search-end
+}
+
+zle -N history-substring-search-up
+zle -N history-substring-search-down
+
+#-----------------------------------------------------------------------------
+# implementation details
+#-----------------------------------------------------------------------------
+
+zmodload -F zsh/parameter
+
+#
+# We have to "override" some keys and widgets if the
+# zsh-syntax-highlighting plugin has not been loaded:
+#
+# https://github.com/nicoulaj/zsh-syntax-highlighting
+#
+if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
+  #
+  # Dummy implementation of _zsh_highlight() that
+  # simply removes any existing highlights when the
+  # user inserts printable characters into $BUFFER.
+  #
+  _zsh_highlight() {
+    if [[ $KEYS == [[:print:]] ]]; then
+      region_highlight=()
+    fi
+  }
+
+  #
+  # The following snippet was taken from the zsh-syntax-highlighting project:
+  #
+  # https://github.com/zsh-users/zsh-syntax-highlighting/blob/56b134f5d62ae3d4e66c7f52bd0cc2595f9b305b/zsh-syntax-highlighting.zsh#L126-161
+  #
+  # Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+  # All rights reserved.
+  #
+  # Redistribution and use 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 the zsh-syntax-highlighting contributors nor the
+  #    names of its contributors may be used to endorse or promote products
+  #    derived from this software without specific prior written permission.
+  #
+  # 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 HOLDER 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.
+  #
+  #--------------8<-------------------8<-------------------8<-----------------
+  # Rebind all ZLE widgets to make them invoke _zsh_highlights.
+  _zsh_highlight_bind_widgets()
+  {
+    # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
+    zmodload zsh/zleparameter 2>/dev/null || {
+      echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
+      return 1
+    }
+
+    # Override ZLE widgets to make them invoke _zsh_highlight.
+    local cur_widget
+    for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
+      case $widgets[$cur_widget] in
+
+        # Already rebound event: do nothing.
+        user:$cur_widget|user:_zsh_highlight_widget_*);;
+
+        # User defined widget: override and rebind old one with prefix "orig-".
+        user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
+                      _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                      zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+
+        # Completion widget: override and rebind old one with prefix "orig-".
+        completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
+                            _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                            zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+
+        # Builtin widget: override and make it call the builtin ".widget".
+        builtin) eval "_zsh_highlight_widget_$cur_widget() { builtin zle .$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                       zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+
+        # Default: unhandled case.
+        *) echo "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" >&2 ;;
+      esac
+    done
+  }
+  #-------------->8------------------->8------------------->8-----------------
+
+  _zsh_highlight_bind_widgets
+fi
+
+_history-substring-search-begin() {
+  setopt localoptions extendedglob
+
+  _history_substring_search_refresh_display=
+  _history_substring_search_query_highlight=
+
+  #
+  # If the buffer is the same as the previously displayed history substring
+  # search result, then just keep stepping through the match list. Otherwise
+  # start a new search.
+  #
+  if [[ -n $BUFFER && $BUFFER == ${_history_substring_search_result:-} ]]; then
+    return;
+  fi
+
+  #
+  # Clear the previous result.
+  #
+  _history_substring_search_result=''
+
+  if [[ -z $BUFFER ]]; then
+    #
+    # If the buffer is empty, we will just act like up-history/down-history
+    # in ZSH, so we do not need to actually search the history. This should
+    # speed things up a little.
+    #
+    _history_substring_search_query=
+    _history_substring_search_raw_matches=()
+
+  else
+    #
+    # For the purpose of highlighting we keep a copy of the original
+    # query string.
+    #
+    _history_substring_search_query=$BUFFER
+
+    #
+    # $BUFFER contains the text that is in the command-line currently.
+    # we put an extra "\\" before meta characters such as "\(" and "\)",
+    # so that they become "\\\(" and "\\\)".
+    #
+    local escaped_query=${BUFFER//(#m)[\][()|\\*?#<>~^]/\\$MATCH}
+
+    #
+    # Find all occurrences of the search query in the history file.
+    #
+    # (k) returns the "keys" (history index numbers) instead of the values
+    # (R) returns values in reverse older, so the index of the youngest
+    # matching history entry is at the head of the list.
+    #
+    _history_substring_search_raw_matches=(${(k)history[(R)(#$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)*${escaped_query}*]})
+  fi
+
+  #
+  # In order to stay as responsive as possible, we will process the raw
+  # matches lazily (when the user requests the next match) to choose items
+  # that need to be displayed to the user.
+  # _history_substring_search_raw_match_index holds the index of the last
+  # unprocessed entry in _history_substring_search_raw_matches. Any items
+  # that need to be displayed will be added to
+  # _history_substring_search_matches.
+  #
+  # We use an associative array (_history_substring_search_unique_filter) as
+  # a 'set' data structure to ensure uniqueness of the results if desired.
+  # If an entry (key) is in the set (non-empty value), then we have already
+  # added that entry to _history_substring_search_matches.
+  #
+  _history_substring_search_raw_match_index=0
+  _history_substring_search_matches=()
+  unset _history_substring_search_unique_filter
+  typeset -A -g _history_substring_search_unique_filter
+
+  #
+  # If $_history_substring_search_match_index is equal to
+  # $#_history_substring_search_matches + 1, this indicates that we
+  # are beyond the end of $_history_substring_search_matches and that we
+  # have also processed all entries in
+  # _history_substring_search_raw_matches.
+  #
+  # If $#_history_substring_search_match_index is equal to 0, this indicates
+  # that we are beyond the beginning of $_history_substring_search_matches.
+  #
+  # If we have initially pressed "up" we have to initialize
+  # $_history_substring_search_match_index to 0 so that it will be
+  # incremented to 1.
+  #
+  # If we have initially pressed "down" we have to initialize
+  # $_history_substring_search_match_index to 1 so that it will be
+  # decremented to 0.
+  #
+  if [[ $WIDGET == history-substring-search-down ]]; then
+     _history_substring_search_match_index=1
+  else
+    _history_substring_search_match_index=0
+  fi
+}
+
+_history-substring-search-end() {
+  setopt localoptions extendedglob
+
+  _history_substring_search_result=$BUFFER
+
+  # the search was successful so display the result properly by clearing away
+  # existing highlights and moving the cursor to the end of the result buffer
+  if [[ $_history_substring_search_refresh_display -eq 1 ]]; then
+    region_highlight=()
+    CURSOR=${#BUFFER}
+  fi
+
+  # highlight command line using zsh-syntax-highlighting
+  _zsh_highlight
+
+  # highlight the search query inside the command line
+  if [[ -n $_history_substring_search_query_highlight && -n $_history_substring_search_query ]]; then
+    #
+    # The following expression yields a variable $MBEGIN, which
+    # indicates the begin position + 1 of the first occurrence
+    # of _history_substring_search_query in $BUFFER.
+    #
+    : ${(S)BUFFER##(#m$HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS)($_history_substring_search_query##)}
+    local begin=$(( MBEGIN - 1 ))
+    local end=$(( begin + $#_history_substring_search_query ))
+    region_highlight+=("$begin $end $_history_substring_search_query_highlight")
+  fi
+
+  # For debugging purposes:
+  # zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
+  # read -k -t 200 && zle -U $REPLY
+
+  # Exit successfully from the history-substring-search-* widgets.
+  return 0
+}
+
+_history-substring-search-up-buffer() {
+  #
+  # Check if the UP arrow was pressed to move the cursor within a multi-line
+  # buffer. This amounts to three tests:
+  #
+  # 1. $#buflines -gt 1.
+  #
+  # 2. $CURSOR -ne $#BUFFER.
+  #
+  # 3. Check if we are on the first line of the current multi-line buffer.
+  #    If so, pressing UP would amount to leaving the multi-line buffer.
+  #
+  #    We check this by adding an extra "x" to $LBUFFER, which makes
+  #    sure that xlbuflines is always equal to the number of lines
+  #    until $CURSOR (including the line with the cursor on it).
+  #
+  local buflines XLBUFFER xlbuflines
+  buflines=(${(f)BUFFER})
+  XLBUFFER=$LBUFFER"x"
+  xlbuflines=(${(f)XLBUFFER})
+
+  if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xlbuflines -ne 1 ]]; then
+    zle up-line-or-history
+    return 0
+  fi
+
+  return 1
+}
+
+_history-substring-search-down-buffer() {
+  #
+  # Check if the DOWN arrow was pressed to move the cursor within a multi-line
+  # buffer. This amounts to three tests:
+  #
+  # 1. $#buflines -gt 1.
+  #
+  # 2. $CURSOR -ne $#BUFFER.
+  #
+  # 3. Check if we are on the last line of the current multi-line buffer.
+  #    If so, pressing DOWN would amount to leaving the multi-line buffer.
+  #
+  #    We check this by adding an extra "x" to $RBUFFER, which makes
+  #    sure that xrbuflines is always equal to the number of lines
+  #    from $CURSOR (including the line with the cursor on it).
+  #
+  local buflines XRBUFFER xrbuflines
+  buflines=(${(f)BUFFER})
+  XRBUFFER="x"$RBUFFER
+  xrbuflines=(${(f)XRBUFFER})
+
+  if [[ $#buflines -gt 1 && $CURSOR -ne $#BUFFER && $#xrbuflines -ne 1 ]]; then
+    zle down-line-or-history
+    return 0
+  fi
+
+  return 1
+}
+
+_history-substring-search-up-history() {
+  #
+  # Behave like up in ZSH, except clear the $BUFFER
+  # when beginning of history is reached like in Fish.
+  #
+  if [[ -z $_history_substring_search_query ]]; then
+
+    # we have reached the absolute top of history
+    if [[ $HISTNO -eq 1 ]]; then
+      BUFFER=
+
+    # going up from somewhere below the top of history
+    else
+      zle up-line-or-history
+    fi
+
+    return 0
+  fi
+
+  return 1
+}
+
+_history-substring-search-down-history() {
+  #
+  # Behave like down-history in ZSH, except clear the
+  # $BUFFER when end of history is reached like in Fish.
+  #
+  if [[ -z $_history_substring_search_query ]]; then
+
+    # going down from the absolute top of history
+    if [[ $HISTNO -eq 1 && -z $BUFFER ]]; then
+      BUFFER=${history[1]}
+      _history_substring_search_refresh_display=1
+
+    # going down from somewhere above the bottom of history
+    else
+      zle down-line-or-history
+    fi
+
+    return 0
+  fi
+
+  return 1
+}
+
+_history_substring_search_process_raw_matches() {
+  #
+  # Process more outstanding raw matches and append any matches that need to
+  # be displayed to the user to _history_substring_search_matches.
+  # Return whether there were any more results appended.
+  #
+
+  #
+  # While we have more raw matches. Process them to see if there are any more
+  # matches that need to be displayed to the user.
+  #
+  while [[ $_history_substring_search_raw_match_index -lt $#_history_substring_search_raw_matches ]]; do
+    #
+    # Move on to the next raw entry and get its history index.
+    #
+    (( _history_substring_search_raw_match_index++ ))
+    local index=${_history_substring_search_raw_matches[$_history_substring_search_raw_match_index]}
+
+    #
+    # If HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set to a non-empty value,
+    # then ensure that only unique matches are presented to the user.
+    # When HIST_IGNORE_ALL_DUPS is set, ZSH already ensures a unique history,
+    # so in this case we do not need to do anything.
+    #
+    if [[ ! -o HIST_IGNORE_ALL_DUPS && -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+      #
+      # Get the actual history entry at the new index, and check if we have
+      # already added it to _history_substring_search_matches.
+      #
+      local entry=${history[$index]}
+
+      if [[ -z ${_history_substring_search_unique_filter[$entry]} ]]; then
+        #
+        # This is a new unique entry. Add it to the filter and append the
+        # index to _history_substring_search_matches.
+        #
+        _history_substring_search_unique_filter[$entry]=1
+        _history_substring_search_matches+=($index)
+
+        #
+        # Indicate that we did find a match.
+        #
+        return 0
+      fi
+
+    else
+      #
+      # Just append the new history index to the processed matches.
+      #
+      _history_substring_search_matches+=($index)
+
+      #
+      # Indicate that we did find a match.
+      #
+      return 0
+    fi
+
+  done
+
+  #
+  # We are beyond the end of the list of raw matches. Indicate that no
+  # more matches are available.
+  #
+  return 1
+}
+
+_history-substring-search-has-next() {
+  #
+  # Predicate function that returns whether any more older matches are
+  # available.
+  #
+
+  if  [[ $_history_substring_search_match_index -lt $#_history_substring_search_matches ]]; then
+    #
+    # We did not reach the end of the processed list, so we do have further
+    # matches.
+    #
+    return 0
+
+  else
+    #
+    # We are at the end of the processed list. Try to process further
+    # unprocessed matches. _history_substring_search_process_raw_matches
+    # returns whether any more matches were available, so just return
+    # that result.
+    #
+    _history_substring_search_process_raw_matches
+    return $?
+  fi
+}
+
+_history-substring-search-has-prev() {
+  #
+  # Predicate function that returns whether any more younger matches are
+  # available.
+  #
+
+  if [[ $_history_substring_search_match_index -gt 1 ]]; then
+    #
+    # We did not reach the beginning of the processed list, so we do have
+    # further matches.
+    #
+    return 0
+
+  else
+    #
+    # We are at the beginning of the processed list. We do not have any more
+    # matches.
+    #
+    return 1
+  fi
+}
+
+_history-substring-search-found() {
+  #
+  # A match is available. The index of the match is held in
+  # $_history_substring_search_match_index
+  #
+  # 1. Make $BUFFER equal to the matching history entry.
+  #
+  # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+  #    to highlight the current buffer.
+  #
+  BUFFER=$history[$_history_substring_search_matches[$_history_substring_search_match_index]]
+  _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND
+}
+
+_history-substring-search-not-found() {
+  #
+  # No more matches are available.
+  #
+  # 1. Make $BUFFER equal to $_history_substring_search_query so the user can
+  #    revise it and search again.
+  #
+  # 2. Use $HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+  #    to highlight the current buffer.
+  #
+  BUFFER=$_history_substring_search_query
+  _history_substring_search_query_highlight=$HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND
+}
+
+_history-substring-search-up-search() {
+  _history_substring_search_refresh_display=1
+
+  #
+  # Select history entry during history-substring-down-search:
+  #
+  # The following variables have been initialized in
+  # _history-substring-search-up/down-search():
+  #
+  # $_history_substring_search_matches is the current list of matches that
+  # need to be displayed to the user.
+  # $_history_substring_search_match_index is the index of the current match
+  # that is being displayed to the user.
+  #
+  # The range of values that $_history_substring_search_match_index can take
+  # is: [0, $#_history_substring_search_matches + 1].  A value of 0
+  # indicates that we are beyond the beginning of
+  # $_history_substring_search_matches. A value of
+  # $#_history_substring_search_matches + 1 indicates that we are beyond
+  # the end of $_history_substring_search_matches and that we have also
+  # processed all entries in _history_substring_search_raw_matches.
+  #
+  # If $_history_substring_search_match_index equals
+  # $#_history_substring_search_matches and
+  # $_history_substring_search_raw_match_index is not greater than
+  # $#_history_substring_search_raw_matches, then we need to further process
+  # $_history_substring_search_raw_matches to see if there are any more
+  # entries that need to be displayed to the user.
+  #
+  # In _history-substring-search-up-search() the initial value of
+  # $_history_substring_search_match_index is 0. This value is set in
+  # _history-substring-search-begin(). _history-substring-search-up-search()
+  # will initially increment it to 1.
+  #
+
+  if [[ $_history_substring_search_match_index -gt $#_history_substring_search_matches ]]; then
+    #
+    # We are beyond the end of $_history_substring_search_matches. This
+    # can only happen if we have also exhausted the unprocessed matches in
+    # _history_substring_search_raw_matches.
+    #
+    # 1. Update display to indicate search not found.
+    #
+    _history-substring-search-not-found
+    return
+  fi
+
+  if _history-substring-search-has-next; then
+    #
+    # We do have older matches.
+    #
+    # 1. Move index to point to the next match.
+    # 2. Update display to indicate search found.
+    #
+    (( _history_substring_search_match_index++ ))
+    _history-substring-search-found
+
+  else
+    #
+    # We do not have older matches.
+    #
+    # 1. Move the index beyond the end of
+    #    _history_substring_search_matches.
+    # 2. Update display to indicate search not found.
+    #
+    (( _history_substring_search_match_index++ ))
+    _history-substring-search-not-found
+  fi
+
+  #
+  # When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
+  # history should be matched, make sure the new and old results are different.
+  #
+  # However, if the HIST_IGNORE_ALL_DUPS shell option, or
+  # HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
+  # unique history, so in this case we do not need to do anything.
+  #
+  if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+    return
+  fi
+
+  if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
+    #
+    # Repeat the current search so that a different (unique) match is found.
+    #
+    _history-substring-search-up-search
+  fi
+}
+
+_history-substring-search-down-search() {
+  _history_substring_search_refresh_display=1
+
+  #
+  # Select history entry during history-substring-down-search:
+  #
+  # The following variables have been initialized in
+  # _history-substring-search-up/down-search():
+  #
+  # $_history_substring_search_matches is the current list of matches that
+  # need to be displayed to the user.
+  # $_history_substring_search_match_index is the index of the current match
+  # that is being displayed to the user.
+  #
+  # The range of values that $_history_substring_search_match_index can take
+  # is: [0, $#_history_substring_search_matches + 1].  A value of 0
+  # indicates that we are beyond the beginning of
+  # $_history_substring_search_matches. A value of
+  # $#_history_substring_search_matches + 1 indicates that we are beyond
+  # the end of $_history_substring_search_matches and that we have also
+  # processed all entries in _history_substring_search_raw_matches.
+  #
+  # In _history-substring-search-down-search() the initial value of
+  # $_history_substring_search_match_index is 1. This value is set in
+  # _history-substring-search-begin(). _history-substring-search-down-search()
+  # will initially decrement it to 0.
+  #
+
+  if [[ $_history_substring_search_match_index -lt 1 ]]; then
+    #
+    # We are beyond the beginning of $_history_substring_search_matches.
+    #
+    # 1. Update display to indicate search not found.
+    #
+    _history-substring-search-not-found
+    return
+  fi
+
+  if _history-substring-search-has-prev; then
+    #
+    # We do have younger matches.
+    #
+    # 1. Move index to point to the previous match.
+    # 2. Update display to indicate search found.
+    #
+    (( _history_substring_search_match_index-- ))
+    _history-substring-search-found
+
+  else
+    #
+    # We do not have younger matches.
+    #
+    # 1. Move the index beyond the beginning of
+    #    _history_substring_search_matches.
+    # 2. Update display to indicate search not found.
+    #
+    (( _history_substring_search_match_index-- ))
+    _history-substring-search-not-found
+  fi
+
+  #
+  # When HIST_FIND_NO_DUPS is set, meaning that only unique command lines from
+  # history should be matched, make sure the new and old results are different.
+  #
+  # However, if the HIST_IGNORE_ALL_DUPS shell option, or
+  # HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE is set, then we already have a
+  # unique history, so in this case we do not need to do anything.
+  #
+  if [[ -o HIST_IGNORE_ALL_DUPS || -n $HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE ]]; then
+    return
+  fi
+
+  if [[ -o HIST_FIND_NO_DUPS && $BUFFER == $_history_substring_search_result ]]; then
+    #
+    # Repeat the current search so that a different (unique) match is found.
+    #
+    _history-substring-search-down-search
+  fi
+}
+
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/modules/history-substring-search/init.zsh b/zsh/modules/history-substring-search/init.zsh
new file mode 100644
index 0000000..b2a2b71
--- /dev/null
+++ b/zsh/modules/history-substring-search/init.zsh
@@ -0,0 +1,19 @@
+#
+# enables searching history with substrings
+#
+
+# source script
+source ${0:h}/external/zsh-history-substring-search.zsh || return 1
+
+# set options
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
+HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
+
+# bind UP and DOWN keys
+bindkey "${terminfo[kcuu1]}" history-substring-search-up
+bindkey "${terminfo[kcud1]}" history-substring-search-down
+
+# bind UP and DOWN arrow keys (compatibility fallback)
+bindkey '^[[A' history-substring-search-up
+bindkey '^[[B' history-substring-search-down
diff --git a/zsh/modules/history/README.md b/zsh/modules/history/README.md
new file mode 100644
index 0000000..46f5f77
--- /dev/null
+++ b/zsh/modules/history/README.md
@@ -0,0 +1,28 @@
+History
+=======
+
+Sets sane default history options.
+
+History file is set to save in `${ZDOTDIR:-${HOME}}/.zhistory`
+
+(most likely ~/.zhistory)
+
+Zsh Options
+-----------
+
+| Option | Effect |
+| ------ | ------ |
+| BANG_HIST | Use csh-style '!' expansion |
+| EXTENDED_HISTORY | Save timestamps along with commands |
+| INC_APPEND_HISTORY | Commands are added to the history file immediately upon execution |
+| SHARE_HISTORY | Causes all terminals to share the same history 'session' |
+| HIST_IGNORE_DUPS | Do not enter immediate duplicates into history |
+| HIST_IGNORE_ALL_DUPS | If duplicate is to be added, remove older instance in history |
+| HIST_IGNORE_SPACE | Do not add any commands to history that begin with a space |
+| HIST_SAVE_NO_DUPS | When saving, older commands that duplicate newer commands are omitted |
+| HIST_VERIFY | Upon history 'selection', don't execute immediately. Require a carriage return |
+
+Aliases
+-------
+
+  * `history-stat` lists the 10 most used commands
diff --git a/zsh/modules/history/init.zsh b/zsh/modules/history/init.zsh
new file mode 100644
index 0000000..d0d7928
--- /dev/null
+++ b/zsh/modules/history/init.zsh
@@ -0,0 +1,46 @@
+#
+# Configures history options
+#
+
+# sets the location of the history file
+HISTFILE="${ZDOTDIR:-${HOME}}/.zhistory"
+
+# limit of history entries
+HISTSIZE=10000
+SAVEHIST=10000
+
+# Perform textual history expansion, csh-style, treating the character ‘!’ specially.
+setopt BANG_HIST
+
+# Save each command’s beginning timestamp (in seconds since the epoch) and the duration (in seconds) to the history file.
+# ‘: <beginning time>:<elapsed seconds>;<command>’.
+setopt EXTENDED_HISTORY
+
+# This options works like APPEND_HISTORY except that new history lines are added to the ${HISTFILE} incrementally
+# (as soon as they are entered), rather than waiting until the shell exits.
+setopt INC_APPEND_HISTORY
+
+# Shares history across all sessions rather than waiting for a new shell invocation to read the history file.
+setopt SHARE_HISTORY
+
+# Do not enter command lines into the history list if they are duplicates of the previous event.
+setopt HIST_IGNORE_DUPS
+
+# If a new command line being added to the history list duplicates an older one, 
+# the older command is removed from the list (even if it is not the previous event).
+setopt HIST_IGNORE_ALL_DUPS
+
+# Remove command lines from the history list when the first character on the line is a space,
+# or when one of the expanded aliases contains a leading space.
+setopt HIST_IGNORE_SPACE
+
+# When writing out the history file, older commands that duplicate newer ones are omitted.
+setopt HIST_SAVE_NO_DUPS
+
+# Whenever the user enters a line with history expansion, don’t execute the line directly;
+# instead, perform history expansion and reload the line into the editing buffer.
+setopt HIST_VERIFY
+
+
+# Lists the ten most used commands.
+alias history-stat="history 0 | awk '{print \$2}' | sort | uniq -c | sort -n -r | head"
diff --git a/zsh/modules/input/README.md b/zsh/modules/input/README.md
new file mode 100644
index 0000000..456ad0c
--- /dev/null
+++ b/zsh/modules/input/README.md
@@ -0,0 +1,10 @@
+Input
+=====
+
+Applies correct bindkeys for input events.
+
+Without this module, you may experience oddities in how Zsh interprets input.
+For example, using the UP key, then using the back arrow and pressing DELETE may capatalize characters rather than delete them. 
+
+This module also provides double-dot parent directory expansion.
+It can be enabled by uncommenting `zdouble_dot_expand='true'` in your .zimrc
diff --git a/zsh/modules/input/init.zsh b/zsh/modules/input/init.zsh
new file mode 100644
index 0000000..6fb2bde
--- /dev/null
+++ b/zsh/modules/input/init.zsh
@@ -0,0 +1,126 @@
+#
+# Editor and input char assignment
+#
+
+
+# Return if requirements are not found.
+if [[ ${TERM} == 'dumb' ]]; then
+  return 1
+fi
+
+# Use human-friendly identifiers.
+zmodload zsh/terminfo
+typeset -gA key_info
+key_info=(
+  'Control'      '\C-'
+  'ControlLeft'  '\e[1;5D \e[5D \e\e[D \eOd \eOD'
+  'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc \eOC'
+  'Escape'       '\e'
+  'Meta'         '\M-'
+  'Backspace'    "^?"
+  'Delete'       "^[[3~"
+  'F1'           "${terminfo[kf1]}"
+  'F2'           "${terminfo[kf2]}"
+  'F3'           "${terminfo[kf3]}"
+  'F4'           "${terminfo[kf4]}"
+  'F5'           "${terminfo[kf5]}"
+  'F6'           "${terminfo[kf6]}"
+  'F7'           "${terminfo[kf7]}"
+  'F8'           "${terminfo[kf8]}"
+  'F9'           "${terminfo[kf9]}"
+  'F10'          "${terminfo[kf10]}"
+  'F11'          "${terminfo[kf11]}"
+  'F12'          "${terminfo[kf12]}"
+  'Insert'       "${terminfo[kich1]}"
+  'Home'         "${terminfo[khome]}"
+  'PageUp'       "${terminfo[kpp]}"
+  'End'          "${terminfo[kend]}"
+  'PageDown'     "${terminfo[knp]}"
+  'Up'           "${terminfo[kcuu1]}"
+  'Left'         "${terminfo[kcub1]}"
+  'Down'         "${terminfo[kcud1]}"
+  'Right'        "${terminfo[kcuf1]}"
+  'BackTab'      "${terminfo[kcbt]}"
+)
+
+# Bind the keys
+
+local key
+for key in "${(s: :)key_info[ControlLeft]}"; do
+  bindkey ${key} backward-word
+done
+for key in "${(s: :)key_info[ControlRight]}"; do
+  bindkey ${key} forward-word
+done
+
+if [[ -n "${key_info[Home]}" ]]; then
+  bindkey "${key_info[Home]}" beginning-of-line
+fi
+
+if [[ -n "${key_info[End]}" ]]; then
+  bindkey "${key_info[End]}" end-of-line
+fi
+
+if [[ -n "${key_info[PageUp]}" ]]; then
+  bindkey "${key_info[PageUp]}" up-line-or-history
+fi
+
+if [[ -n "${key_info[PageDown]}" ]]; then
+  bindkey "${key_info[PageDown]}" down-line-or-history
+fi
+
+if [[ -n "${key_info[Insert]}" ]]; then
+  bindkey "${key_info[Insert]}" overwrite-mode
+fi
+
+if [[ ${zdouble_dot_expand} == "true" ]]; then
+  double-dot-expand() {
+    if [[ ${LBUFFER} == *.. ]]; then
+      LBUFFER+='/..'
+    else
+      LBUFFER+='.'
+    fi
+  }
+  zle -N double-dot-expand
+  bindkey "." double-dot-expand
+fi
+
+bindkey "${key_info[Delete]}" delete-char
+bindkey "${key_info[Backspace]}" backward-delete-char
+
+bindkey "${key_info[Left]}" backward-char
+bindkey "${key_info[Right]}" forward-char
+
+# Expandpace.
+bindkey ' ' magic-space
+
+# Clear
+bindkey "${key_info[Control]}L" clear-screen
+
+# Bind Shift + Tab to go to the previous menu item.
+if [[ -n "${key_info[BackTab]}" ]]; then
+  bindkey "${key_info[BackTab]}" reverse-menu-complete
+fi
+
+# Redisplay after completing, and avoid blank prompt after <Tab><Tab><Ctrl-C>
+expand-or-complete-with-redisplay() {
+  print -n '...'
+  zle expand-or-complete
+  zle redisplay
+}
+zle -N expand-or-complete-with-redisplay
+bindkey "${key_info[Control]}I" expand-or-complete-with-redisplay
+
+# Put into application mode and validate ${terminfo}
+zle-line-init() {
+  if (( ${+terminfo[smkx]} )); then
+    echoti smkx
+  fi
+}
+zle-line-finish() {
+  if (( ${+terminfo[rmkx]} )); then
+    echoti rmkx
+  fi
+}
+zle -N zle-line-init
+zle -N zle-line-finish
diff --git a/zsh/modules/meta/README.md b/zsh/modules/meta/README.md
new file mode 100644
index 0000000..32e4675
--- /dev/null
+++ b/zsh/modules/meta/README.md
@@ -0,0 +1,21 @@
+Meta
+====
+
+Provides aliases and functions for management of the zim framework, specifically `zmanage`
+
+Usage
+-----
+
+`zmanage [arg]`
+
+|   Action    |                    Description                      |
+| ----------- | --------------------------------------------------- |
+| update      | Fetches and merges upstream zim commits if possible |
+| info        | Prints zim and system info                          |
+| issue       | Create a template for reporting an issue            |
+| clean-cache | Clean the zim cache                                 |
+| build-cache | Rebuild the zim cache                               |
+| remove      | *experimental* Remove zim as best we can            |
+| reset       | Reset zim to the latest commit                      |
+| help        | Print this usage message                            |
+| debug       | Invokes the trace-zim script which produces logs    |
diff --git a/zsh/modules/meta/functions/zmanage b/zsh/modules/meta/functions/zmanage
new file mode 100644
index 0000000..42522ee
--- /dev/null
+++ b/zsh/modules/meta/functions/zmanage
@@ -0,0 +1,40 @@
+local usage="${0} [action]
+Actions:
+    | update      | Fetches and merges upstream zim commits if possible |
+    | info        | Prints zim and system info                          |
+    | issue       | Create a template for reporting an issue            |
+    | clean-cache | Clean the zim cache                                 |
+    | build-cache | Rebuild the zim cache                               |
+    | remove      | *experimental* Remove zim as best we can            |
+    | reset       | Reset zim to the latest commit                      |
+    | help        | Print this usage message                            |
+    | debug       | Invokes the trace-zim script which produces logs    |"
+
+if (( ${#} != 1 )); then
+  print ${usage}
+  return 1
+fi
+
+local tools
+tools="${ZIM}/tools"
+
+case ${1} in
+  update)      zsh ${tools}/zim_update
+               ;;
+  info)        zsh ${tools}/zim_info
+               ;;
+  issue)       zsh ${tools}/zim_issue
+               ;;
+  clean-cache) zsh ${tools}/zim_clean_cache && print 'Cleaned cache'
+               ;;
+  build-cache) source ${tools}/zim_build_cache && print 'Rebuilt cache'
+               ;;
+  remove)      zsh ${tools}/zim_remove
+               ;;
+  reset)       zsh ${tools}/zim_reset
+               ;;
+  debug)       zsh ${ZIM}/modules/debug/functions/trace-zim
+               ;;
+  *)           print ${usage}
+               ;;
+esac
diff --git a/zsh/modules/meta/functions/zmanage.zwc b/zsh/modules/meta/functions/zmanage.zwc
new file mode 100644
index 0000000..e723a40
Binary files /dev/null and b/zsh/modules/meta/functions/zmanage.zwc differ
diff --git a/zsh/modules/pacman/README.md b/zsh/modules/pacman/README.md
new file mode 100644
index 0000000..0cf9ea1
--- /dev/null
+++ b/zsh/modules/pacman/README.md
@@ -0,0 +1,61 @@
+Pacman
+======
+
+Adds aliases for the pacman package manager.
+
+Also includes optional helper(s).
+
+.zimrc Configuration
+-------------
+  * `zpacman_frontend='helper_here'` Set helper_here to a wrapper if applicable (powerpill, pacmatic, etc).
+  * `zpacman_helper=(aur)` add/remove any helper scripts to be loaded here.
+
+Helpers
+-------
+
+### aur
+
+provides simple AUR helper aliases.
+
+  * `aurb package_name` clone the package from the AUR, build, and install.
+  * `aurd package_name` clone the package from the AUR, but do not build.
+  * `auru` run inside a directory created with `aurb`, this will update, build, and install a package.
+
+Aliases
+-------
+
+### Build
+
+  * `pacb` build package in the current directory, cleanup, and install.
+
+### Install
+
+  * `paci` install, sync, and upgrade packages.
+  * `pacu` install, sync, and upgrade packages (forcibly refresh package list).
+  * `pacU` install packages from pkg file.
+  * `pacd` install all packages in current directory.
+
+### Remove
+
+  * `pacr` remove package and unneeded dependencies.
+  * `pacrm` remove package, unneded dependencies, and configuration files.
+
+### Query
+
+  * `pacq` query package information from remote repository
+  * `pacQ` query package information from local repository
+
+### Search
+
+  * `pacs` search for package in the remote repository
+  * `pacS` search for package in the local repository
+
+### Orphans
+
+  * `pacol` list orphan packages
+  * `pacor` remove all orphan packages
+
+### Ownership
+
+  * `pacown` list all files provided by a given package
+  * `pacblame` show package(s) that own a specified file
diff --git a/zsh/modules/pacman/helper_aur.zsh b/zsh/modules/pacman/helper_aur.zsh
new file mode 100644
index 0000000..3d88883
--- /dev/null
+++ b/zsh/modules/pacman/helper_aur.zsh
@@ -0,0 +1,20 @@
+#
+# AUR aliases
+#
+
+# download and build AUR package
+aurb() {
+  git clone https://aur.archlinux.org/${1}.git && cd ${1} && makepkg --clean --install --syncdeps
+}
+
+# only download aur package; do not build
+aurd() {
+  git clone https://aur.archlinux.org/${1}.git 
+}
+
+# remove old package, rebuild, and install.
+#NOTE: this is will remove any unstashed/uncommitted changes.
+#      due to how makepkg will update the PKGBUILD, a git pull alone will not suffice.
+auru() {
+  git reset HEAD --hard && git pull && makepkg --clean --force --install --syncdeps --cleanbuild
+}
diff --git a/zsh/modules/pacman/init.zsh b/zsh/modules/pacman/init.zsh
new file mode 100644
index 0000000..a69b723
--- /dev/null
+++ b/zsh/modules/pacman/init.zsh
@@ -0,0 +1,135 @@
+#
+# Pacman aliases
+#
+
+# ${zpacman_frontend} is provided by either .zimrc or (if not set) init.zsh
+# The zpacman_frontend is _only_ used for package installs.
+
+#
+# Setup
+#
+
+# ensure pacman is available
+if (( ! ${+commands[pacman]} )); then
+  return 1
+fi
+
+local zpacman_frontend_priv helper
+
+if (( ! ${+zpacman_frontend} )); then
+  zpacman_frontend='pacman'
+  zpacman_frontend_priv='sudo pacman'
+elif (( ! ${+commands[${zpacman_frontend}]} )); then
+  print "pacman frontend \"${zpacman_frontend}\" is invalid or not installed. Reverting to \"pacman\".
+You can fix this error by editing the 'zpacman_frontend' variable in your .zimrc" >&2
+  zpacman_frontend='pacman'
+  zpacman_frontend_priv='sudo pacman'
+elif [[ ${zpacman_frontend} == ("yaourt"|"pacaur") ]]; then
+  # yaourt and pacaur handles SUID themselves
+  zpacman_frontend_priv="${zpacman_frontend}"
+else
+  zpacman_frontend_priv="sudo ${zpacman_frontend}"
+fi
+
+
+#
+# General
+#
+
+alias pac=${zpacman_frontend}
+
+#
+# Build
+#
+
+# build package in current directory, cleanup, and install
+alias pacb='makepkg -sci'
+
+#
+# Install
+#
+
+#NOTE: Installing/upgrading individual packages is NOT supported. Sync and upgrade ALL on install.
+
+# install, sync, and upgrade packages
+alias paci="${zpacman_frontend_priv} -Syu"
+
+# install packages without syncing
+alias pacI="${zpacman_frontend_priv} -S"
+
+# install, sync, and upgrade packages (forcibly refresh package lists)
+alias pacu="${zpacman_frontend_priv} -Syyu"
+
+# install packages by filename
+alias pacU="${zpacman_frontend_priv} -U"
+
+# install all packages in current directory
+alias pacd="${zpacman_frontend_priv} -U *.pkg.tar.xz"
+
+
+#
+# Remove
+#
+
+# remove package and unneeded dependencies
+alias pacr="${zpacman_frontend_priv} -R"
+
+# remove package, unneeded dependencies, and configuration files
+alias pacrm="${zpacman_frontend_priv} -Rns"
+
+
+#
+# Query
+#
+
+# query package information from the remote repository
+alias pacq="${zpacman_frontend} -Si"
+
+# query package information from the local repository
+alias pacQ="${zpacman_frontend} -Qi"
+
+
+#
+# Search
+#
+
+# search for package in the remote repository
+alias pacs="${zpacman_frontend} -Ss"
+
+# search for the package in the local repository
+alias pacS="${zpacman_frontend} -Qs"
+
+
+#
+# Orphans
+#
+
+# list orphan packages
+alias pacol="${zpacman_frontend} -Qdt"
+
+# remove orphan packages
+alias pacor="${zpacman_frontend_priv} -Rns \$(pacman -Qtdq)"
+
+
+#
+# Ownership
+#
+
+# list all files that belong to a package
+alias pacown="${zpacman_frontend} -Ql"
+
+# show package(s) owning the specified file
+alias pacblame="${zpacman_frontend} -Qo"
+
+#
+# Helpers
+#
+
+# source helper functions/aliases
+for helper ( ${zpacman_helper[@]} ); do
+  if [[ -s ${0:h}/helper_${helper}.zsh ]]; then
+    source ${0:h}/helper_${helper}.zsh
+  else
+    print "no such helper script \"helper_${helper}.zsh\"" >&2
+  fi
+done
diff --git a/zsh/modules/pacman/init.zsh.zwc b/zsh/modules/pacman/init.zsh.zwc
new file mode 100644
index 0000000..c16a827
Binary files /dev/null and b/zsh/modules/pacman/init.zsh.zwc differ
diff --git a/zsh/modules/prompt/README.md b/zsh/modules/prompt/README.md
new file mode 100644
index 0000000..23cb447
--- /dev/null
+++ b/zsh/modules/prompt/README.md
@@ -0,0 +1,15 @@
+Prompt
+======
+
+Initializes and provides customizable prompt themes.
+
+Images of various prompt themes can be found on the [wiki](https://github.com/Eriner/zim/wiki/Themes).
+
+A list of available prompts can be found by running `prompt -l`.
+
+To test a prompt, simply run `prompt prompt_name_here`.
+
+.zimrc Configuration
+--------------------
+
+  * `zprompt_theme='eriner'` change 'eriner' to the name of your desired prompt. This will set it as you default prompt.
diff --git a/zsh/modules/prompt/external-themes/lean/README.md b/zsh/modules/prompt/external-themes/lean/README.md
new file mode 100644
index 0000000..f0462e7
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/lean/README.md
@@ -0,0 +1,57 @@
+About
+=====
+
+After having used [prompt pure](https://github.com/sindresorhus/pure) for about
+a year, I felt that a two-line prompt was not for me. Also not utilizing the
+right side of the terminal seemed a missed opportunity. Still there is much to
+like: the elapsed time of a process, the coloring of the prompt if the exit
+code of the process isn't 0, git integration. So I took "pure", mixed in my
+ideas of what a prompt should look like and came up with "lean" - a 1 line
+prompt that stays out of your face.
+
+So lean is an evolution of pure, with the following changes:
+
+* Defaults to a very sparse setup, only showing information you need at the
+moment.
+* Comes with the perfect prompt character. Author went through the entire ASCII
+range to find it (and found it pretty quickly!)
+* Never displays your username (assuming you know who you are).
+* When tmux is active it shows a yellow 't' (I disabled the tmux bar, so this
+is some visual indication that tmux is active). If you don't want this
+indicator, you can always set `PROMPT_LEAN_TMUX=""` prior to loading this
+plugin (or prior to sourcing `zgen`, etc.).
+* Show remote host if logged in through SSH.
+* All in one line, most stuff in the right prompt, leaving the left prompt nice
+and clean
+* Shows background jobs (in the left prompt)
+* Show (dirty) git repos
+* Shortens path if needed (longer then 70% of your screen)
+* Uses `PROMPT_LEAN_LEFT` and `PROMPT_LEAN_RIGHT` to allow customization of the left
+  and/or right side of the prompt.
+* For a configurable insertmode indicator, set the `PROMPT_LEAN_VIMODE` and `PROMPT_LEAN_VIMODE_FORMAT`
+variables. 
+  `PROMPT_LEAN_VIMODE_FORMAT` defaults to `"%F{red}[NORMAL]%f"`
+
+When lean starts, only 2 characters show on the screen '%' on the left and '~'
+on the right. All other info is omitted (like the user and system you are on),
+and shown only when needed.
+
+Here is a [screencast](https://asciinema.org/a/d1b5wccq23kglwwhaymoi8z5i)
+showing the prompt.
+*Note*: for some reason the screencast does not show the space between the '%'
+character and the start of the command line. **NOTE** This
+[issue](https://github.com/miekg/lean/issues/2) has been fixed.
+
+[![asciicast](https://asciinema.org/a/d1b5wccq23kglwwhaymoi8z5i.png)](https://asciinema.org/a/d1b5wccq23kglwwhaymoi8z5i)
+
+Installation
+===========
+
+If you use [zgen](https://github.com/tarjoilija/zgen) you can add the following
+to your `~/.zshrc`:
+
+```
+zgen load miekg/lean
+```
+
+and force reload with `zgen reset && source~/.zshrc`.
diff --git a/zsh/modules/prompt/external-themes/lean/lean.plugin.zsh b/zsh/modules/prompt/external-themes/lean/lean.plugin.zsh
new file mode 120000
index 0000000..3cdb1e4
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/lean/lean.plugin.zsh
@@ -0,0 +1 @@
+prompt_lean_setup
\ No newline at end of file
diff --git a/zsh/modules/prompt/external-themes/lean/prompt_lean_setup b/zsh/modules/prompt/external-themes/lean/prompt_lean_setup
new file mode 100644
index 0000000..c853648
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/lean/prompt_lean_setup
@@ -0,0 +1,139 @@
+# lean prompt theme
+# by Miek Gieben: https://github.com/miekg/lean
+#
+# Base on Pure by Sindre Sorhus: https://github.com/sindresorhus/pure
+#
+# MIT License
+
+PROMPT_LEAN_TMUX=${PROMPT_LEAN_TMUX-"t "}
+PROMPT_LEAN_PATH_PERCENT=${PROMPT_LEAN_PATH_PERCENT-60}
+
+prompt_lean_help() {
+  cat <<'EOF'
+This is a one line prompt that tries to stay out of your face. It utilizes
+the right side prompt for most information, like the CWD. The left side of
+the prompt is only a '%'. The only other information shown on the left are
+the jobs numbers of background jobs. When the exit code of a process isn't
+zero the prompt turns red. If a process takes more then 5 (default) seconds
+to run the total running time is shown in the next prompt.
+
+Configuration:
+
+PROMPT_LEAN_TMUX: used to indicate being in tmux, set to "t ", by default
+PROMPT_LEAN_LEFT: executed to allow custom information in the left side
+PROMPT_LEAN_RIGHT: executed to allow custom information in the right side
+PROMPT_LEAN_VIMODE: used to determine wither or not to display indicator
+PROMPT_LEAN_VIMODE_FORMAT: Defaults to "%F{red}[NORMAL]%f"
+
+You can invoke it thus:
+
+  prompt lean
+
+EOF
+}
+
+# turns seconds into human readable time, 165392 => 1d 21h 56m 32s
+prompt_lean_human_time() {
+    local tmp=$1
+    local days=$(( tmp / 60 / 60 / 24 ))
+    local hours=$(( tmp / 60 / 60 % 24 ))
+    local minutes=$(( tmp / 60 % 60 ))
+    local seconds=$(( tmp % 60 ))
+    (( $days > 0 )) && echo -n "${days}d "
+    (( $hours > 0 )) && echo -n "${hours}h "
+    (( $minutes > 0 )) && echo -n "${minutes}m "
+    echo "${seconds}s "
+}
+
+# fastest possible way to check if repo is dirty
+prompt_lean_git_dirty() {
+    # check if we're in a git repo
+    command git rev-parse --is-inside-work-tree &>/dev/null || return
+    # check if it's dirty
+    local umode="-uno" #|| local umode="-unormal"
+    command test -n "$(git status --porcelain --ignore-submodules ${umode} 2>/dev/null | head -100)"
+
+    (($? == 0)) && echo ' +'
+}
+
+# displays the exec time of the last command if set threshold was exceeded
+prompt_lean_cmd_exec_time() {
+    local stop=$EPOCHSECONDS
+    local start=${cmd_timestamp:-$stop}
+    integer elapsed=$stop-$start
+    (($elapsed > ${PROMPT_LEAN_CMD_MAX_EXEC_TIME:=5})) && prompt_lean_human_time $elapsed
+}
+
+prompt_lean_preexec() {
+    cmd_timestamp=$EPOCHSECONDS
+
+    # shows the current dir and executed command in the title when a process is active
+    print -Pn "\e]0;"
+    echo -nE "$PWD:t: $2"
+    print -Pn "\a"
+}
+
+prompt_lean_pwd() {
+    local lean_path="`print -Pn '%~'`"
+    if (($#lean_path / $COLUMNS.0 * 100 > ${PROMPT_LEAN_PATH_PERCENT:=60})); then
+        print -Pn '...%2/'
+        return
+    fi
+    print "$lean_path"
+}
+
+prompt_lean_precmd() {
+    vcs_info
+    rehash
+
+    local jobs
+    local prompt_lean_jobs
+    unset jobs
+    for a (${(k)jobstates}) {
+        j=$jobstates[$a];i="${${(@s,:,)j}[2]}"
+        jobs+=($a${i//[^+-]/})
+    }
+    # print with [ ] and comma separated
+    prompt_lean_jobs=""
+    [[ -n $jobs ]] && prompt_lean_jobs="%F{242}["${(j:,:)jobs}"] "
+
+    local lean_vimode_default="%F{red}[NORMAL]%f"
+    #If LEAN_VIMODE is set, set lean_vimode_indicator to either PROMPT_LEAN_VIMOD_FORMAT or a default value
+    local lean_vimode_indicator="${PROMPT_LEAN_VIMODE:+${PROMPT_LEAN_VIMODE_FORMAT:-${lean_vimode_default}}}"
+
+    prompt_lean_vimode="${${KEYMAP/vicmd/$lean_vimode_indicator}/(main|viins)/}"
+
+    PROMPT="$prompt_lean_jobs%F{yellow}${prompt_lean_tmux}%f`$PROMPT_LEAN_LEFT`%f%(?.%F{blue}.%B%F{red})%#%f%b "
+    RPROMPT="%F{yellow}`prompt_lean_cmd_exec_time`%f$prompt_lean_vimode%F{blue}`prompt_lean_pwd`%F{242}$vcs_info_msg_0_`prompt_lean_git_dirty`$prompt_lean_host%f`$PROMPT_LEAN_RIGHT`%f"
+
+    unset cmd_timestamp # reset value since `preexec` isn't always triggered
+}
+
+function zle-keymap-select {
+    prompt_lean_precmd
+    zle reset-prompt
+}
+
+prompt_lean_setup() {
+    prompt_opts=(cr subst percent)
+
+    zmodload zsh/datetime
+    autoload -Uz add-zsh-hook
+    autoload -Uz vcs_info
+
+    [[ "$PROMPT_LEAN_VIMODE" != '' ]] && zle -N zle-keymap-select
+
+    add-zsh-hook precmd prompt_lean_precmd
+    add-zsh-hook preexec prompt_lean_preexec
+
+    zstyle ':vcs_info:*' enable git
+    zstyle ':vcs_info:git*' formats ' %b'
+    zstyle ':vcs_info:git*' actionformats ' %b|%a'
+
+    [[ "$SSH_CONNECTION" != '' ]] && prompt_lean_host=" %F{yellow}%m%f"
+    [[ "$TMUX" != '' ]] && prompt_lean_tmux=$PROMPT_LEAN_TMUX
+
+    return 0
+}
+
+prompt_lean_setup "$@"
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/.github/ISSUE_TEMPLATE.md b/zsh/modules/prompt/external-themes/liquidprompt/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..31ce617
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,4 @@
+Shell: bash/zsh
+Operating system: 
+Liquid Prompt version (tag, commit): 
+
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/.mailmap b/zsh/modules/prompt/external-themes/liquidprompt/.mailmap
new file mode 100644
index 0000000..2d8c0cd
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/.mailmap
@@ -0,0 +1,33 @@
+nojhan <nojhan@nojhan.net> <johann.dreo@thalesgroup.com>
+nojhan <nojhan@nojhan.net> <nojhan@gmail.com>
+Alexander Belaev (alexbel) <alexbel@lavabit.com>
+Alex Prengere <alexprengere@gmail.com> <alex.prengere@amadeus.com>
+Alex Prengere <alexprengere@gmail.com> Alex <alexprengere@gmail.com>
+Aurélien Requiem <aurelien@requiem.fr> <aurelien.requiem@loadedtech.com.au>
+Aurélien Requiem <aurelien@requiem.fr>
+Clément Mathieu <clement@unportant.info>
+Christophe Drevet (dr4Ke) <dr4ke@dr4ke.net> <christophe.drevet@cea.fr>
+François Schmidts (jaesivsm) <francois.schmidts@gmail.com>
+François Schmidts (jaesivsm) <francois.schmidts@gmail.com> <fschmidts@olfeo.com>
+François Schmidts (jaesivsm) <francois.schmidts@gmail.com> <jaesivsm>
+Frédéric Lepied <flepied@gmail.com>
+Étienne Deparis <etienne@depar.is>
+Étienne Deparis <etienne@depar.is> <etienne.deparis@umaneti.net>
+Felix Chern (dryman) <idryman@gmail.com>
+Jean-Sébastien Leroy <jean.sebastien.leroy@gmail.com>
+Joris Dedieu <joris@nfrance.com>
+Joris Dedieu <joris@nfrance.com> <joris@pontiac3.nfrance.com>
+Julien Pecqueur <jpec@julienpecqueur.net>
+Julien Pecqueur <jpec@julienpecqueur.net> <jpec80@gmail.com>
+Ludovic Rousseau <ludovic.rousseau@gmail.com> <lroussea@370bh2j.(none)>
+Matthew Micene (nzwulfin) <nzwulfin@gmail.com>
+Nicolas Lacourte <nicolas@dotinfra.fr>
+Olivier Dupuis <oj.dupuis@gmail.com>
+Ying Li (cyli) <cyli@twistedmatrix.com>
+Poil <poil@quake.fr> M.Poil <?@?>
+Poil <poil@quake.fr> Poil <?@?>
+Thomas Debesse <thomas.debesse@gmail.com>
+Rolf Morel (polyphemus) <rolfmorel@gmail.com>
+Wilson Maravilha (algaerhythm) <algaerhythm@gmail.com>
+Yannack <yannack@gmail.com>
+Brad Beyenhof <bbeyenhof@gmail.com> <bbeyenhof@icloud.com>
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/CHANGES b/zsh/modules/prompt/external-themes/liquidprompt/CHANGES
new file mode 100644
index 0000000..de81856
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/CHANGES
@@ -0,0 +1,208 @@
+
+NEXT
+	New features:
+	- Workaround broken .bashrc that export PROMPT_COMMAND (GH #450, #463):
+	  we now unexport it on startup
+	- Allow to customize the symbol before the path that shows if the
+	  directory is writable: LP_MARK_PERM (GitHub #430, #484)
+	Bug fixes:
+	- Fix regression in LP_ENABLE_FQDN implementation (GitHub #472)
+	- Fix LP_COLOR_HOST_HASH on SunOS (GitHub #461, #462)
+	- Fix LP_MARK_DEFAULT being ignored if root (GitHub #501)
+	- Git:
+	  * Faster "git stash" check (GitHub #503)
+	Thanks to Roman (@hatifnatt), Jon Garrison (@jpwgarrison),
+	Mark Vander Stel (@Rycieos), Bryce Jasmer (b-jazz), Felix
+	Schlitter (@felixSchl), Philip Garrison (@pgarrison), Lubomir
+	Host (@lhost), Iain Hallam (@iainhallam), Matt
+	Smith (@ncs-msmith)...
+	... for their patches or bug reports.
+
+1.11    2016-06-25
+	Bug fixes:
+	- OS X: sudo feature fixed
+	- OS X: battery level restored
+
+1.10    2016-05-30
+	Breaking changes:
+	- In themes, LP_COLORMAP_x variables are replaced by a single
+	  LP_COLORMAP array variable. A warning will be displayed at startup
+	  if your config still uses the old variables, but a compatibility
+	  shim is active (will be removed in next release).
+	- Many LP_ENABLE_* settings are now static (their effect applies when
+	  liquidprompt is loaded, and changing them at the prompt does nothing)
+	  to more and more improve speed.
+	- zsh: option 'nopromptsubst' is enabled for security reasons.
+          This will unfortunately also affect evaluations of other prompt
+	  contexts such as RPS1.
+	- Variables LP_SCREEN_TITLE_OPEN and LP_SCREEN_TITLE_CLOSE are now
+          removed to simplify the code (GitHub #371)
+	New features:
+	- Sudo:
+	    * The color of the prompt mark is now dynamic and changes to
+	      LP_COLOR_MARK_SUDO (default: bold red) as long as your sudo
+	      credentials are cached (GitHub #335).
+	      Requires sudo 1.7.0+.
+	      This feature must be enabled with LP_ENABLE_SUDO=1
+	      Use 'sudo -K' to revoke your credentials early.
+	    * This feature is disabled by default as there is no way to
+	      detect if the user has sudo rights without triggering a security
+	      alert that will annoy the sysadmin.
+	- Git:
+	    * Show the number of commits behind the remote (GitHub #269)
+	    * Show the rebasing/merging/cherry-picking state (GitHub #409)
+	- Add variable LP_TTYN: the basename of the terminal (GitHub #357)
+	- Add setting LP_ENABLE_FQDN to show the fully qualified domain name
+	  of the host (GitHub #254, #277)
+        - LP_HOSTNAME_ALWAYS=-1 to always hide the hostname (GitHub #406)
+	- Run duration of the last command (LP_ENABLE_RUNTIME) is now also
+	  supported on zsh (GitHub #404, #355)
+	- Python: add support for Conda (CONDA_DEFAULT_ENV) (GitHub #425)
+	Bug fixes:
+	- Use $XDG_CONFIG_HOME to locate the config (GitHub #415, #420, #425)
+	- Improved zsh integration (but most issues had no impact of the
+	  user experience)
+	- Fix escaping of special chars from $PWD (well, almost, see GitHub
+	  #389) and explicitely set the shell options we need (instead of
+	  relying on the shell default settings)
+	- Git:
+	    * Fix typo in git work directory detection
+	- Fossil:
+	    * Fix on darwin (GitHub #390)
+	- LP_DISABLED_VCS_PATH is fixed on zsh (GitHub #423)
+	- Battery indicator:
+	    * MacOS: many fixes to handle (all?) edge cases (GitHub #326)
+	      We now have a pmset simulator to better detect regressions.
+	- Temperature indicator:
+	    * The code using the 'sensors' command now uses the '-u' option
+	      ("raw output") that is easier to parse. This format is at least
+	      7 years old. (GitHub #379, #380)
+	    * We now try each backend (acpi/sensors) once to check it works
+	      at startup and disable the feature if none works.
+	      (GitHub #410, #319, #381, #387)
+	- CPU load indicator:
+	    * Fix the scale that was incorrectly 0-200 (GitHub #391)
+	- Title:
+	    * Fix terminal sequences that were sent in the title text (the
+	      escaping algorithm is rewritten and now just correct).
+	- Terminal channel:
+	    * Fix detection of tmux (GitHub #304, #377)
+            * Fix detection of local session on OS X (GitHub #407)
+	- Misc:
+	    * Fix bash 3 compatibility (GitHub #313)
+	    * Clear GREP_OPTIONS and skip 'grep' aliases (GitHub #372)
+	- Shortened path:
+	    * Fix bugs when $PWD contains spaces or special chars (GitHub #369)
+	    * Optimize implementation in case of LP_PATH_KEEP=-1 : LP_PWD
+	      becomes static (related to GitHub #256, #336)
+	    * Optimize implementation in case LP_ENABLE_SHORTEN_PATH=0
+	    * Optimize implementation in case LP_ENABLE_SHORTEN_PATH=0 on bash
+	      with PROMPT_DIRTRIM
+	- Sample configuration files:
+	    * example.bashrc: major fixes
+	- The last statement of liquidprompt did not return 0 (GitHub #360,#361)
+	- Analog clock:
+	    * complete rewrite for speed and correctness (GitHub #365 and other
+	      issues)
+	- Documentation:
+	    * Many small fixes
+	- Move dist/ to contrib/dist/ as files there are unmaintained
+	- Fix title escapes in zsh inside tmux/screen (GitHub #370, #371)
+
+	Thanks to Matt Fletcher (@MaffooBristol), Kevin Yap (@iKevinY), Sean
+	Hussey (@seanhussey), François Schmidts (@jaesivsm), Morgan Knicely
+	(@morganizeit), Daniel Serodio (@dserodio), Jonathan Giddy
+	(@jongiddy), Jeremy Clement (@jeremyclement), Panayiotis Kkolos
+	(@pkkolos), Arturo Borrero Gonzalez (@aborrero), Samuel Krieg
+	(@SamK), Brian May (@brianmay), Colin Lieberman (@colinlieberman),
+	@hegedus, Anthony Gelibert (@anthonygelibert), Anthony Ramine (@nox),
+	Erik M Jacobs (@thoraxe), Pedro Parracho (@berserck), Brad Beyenhof
+	(@augmentedfourth), Austen Adler (@stonewareslord), Hagen Graf
+	(@hcgraf), William P. Riley-Land (@wprl), Dave Rigby (@daverigby),
+	Ned Batchelder (@nedbat), Fabien Marty (@thefab), Alessio Garzi
+	(@Ozzyboshi), Roger Huang (@rhuang2014), Sebastian Bremicker
+	(@sebrem), Alex Prengere (@alexprengere), Philipp Grogg (@gro-gg),
+	Tener Hades (@tenerhades), Thomas Kühnel (@kuehnelth), Étienne Deparis
+	(@milouse), @Hotschke, Software Mechanic (@softwaremechanic), Simon
+	McVittie (@smcv)...
+	... for their patches or bug reports.
+
+1.9     2014-11-12  dolmen (Olivier Mengué)
+	Bug fixes:
+	- Battery indicator:
+	    * General fixes (GitHub #264)
+	    * MacOS: fix for computers without battery (like iMacs) (GitHub
+	      #319)
+	    * Optimize colormap
+	- Temperature indicator:
+	    * Linux: Add a guard against any future l10n of the 'acpi' command
+	    * Linux: Fix for negative temperature values (GitHub #308)
+	- CPU load:
+	    * Darwin/BSD: quoting fixes
+	- Hostname:
+	    * Fix colorization for SSH
+	    * Simplify chroot detection
+	- VCS:
+	    - Git:
+		* Use --porcelain for "git status" (GitHub #270)
+		* Minir optimization (GitHub #266)
+	    - Fossil:
+		* Cleanup and fixes (GitHub #274 and others)
+	    - Subversion:
+		* Fix branch/tag name extraction (GitHub #117, #237, #293)
+	    - Bazar:
+		* Fix branch name extraction
+		* zsh fixes (GitHub #303)
+	    - Mercurial:
+		* General cleanup for speed and fixes
+		* Disabled "hg outgoing" because it is slow (GitHub #217)
+	- Shortened path:
+	    * Bash: Fix quoting for PROMPT_DIRTRIM
+	- Prompt mark:
+	    * Simplify implementation of LP_MARK_DEFAULT
+	- Jobs:
+	    * Refactoring
+	    * Fix when screen/tmux are not installed (GitHub #304)
+	- Analog clock:
+	    * Fix hour for 12AM and 12PM (GitHub #273)
+	- Misc:
+	    * bash: save and set 'promptvars'
+	    * bash: workaround broken pattern substitution in bash 4.2 (GitHub
+	      #289, #294, #302)
+	    * zsh: fix restoration of the original (pre-liquidprompt) prompt
+	    * Fix tmux detection (GitHub #279)
+	    * Save IFS (GitHub #267)
+	    * Fix $TERM check (GitHub #291)
+	    * Various quoting fixes
+	    * Apply some shellcheck.com suggestions
+	    * Many, many optimizations (GitHub #267)
+	New features:
+	- Add vcsh support (GitHub #148, #287)
+	- Add support for Software Collections (GitHub #299, #300)
+
+	Thanks to Anthony Gelibert, Frédéric Mahé, Panayiotis Kkolos, Étienne
+	Deparis, François Schmidts, Linus Wallgren, Alexander Belaev, Bartosz
+	Janda, Brett McBride, Chase Colman, Cosmin L. Neagu, Matthew Micene,
+	Vincent Lara, Wilson Maravilha and Yannack for their patches. Thanks
+	to all the other contributors who reported issues or proposed patches
+	that have not been applied.
+
+1.8     2014-01-15  dolmen (Olivier Mengué)
+
+1.7     2013-11-30  nojhan
+
+1.6     2013-05-14  nojhan
+
+1.5     2013-04-20  nojhan
+
+1.4     2013-04-11  nojhan
+
+1.3     2013-03-11  nojhan
+
+1.2     2013-01-16  nojhan
+
+1.1     2012-08-16  nojhan
+
+1.0     2012-08-10  nojhan
+
+0.0     2011-02-05  nojhan
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/CONTRIBUTING.md b/zsh/modules/prompt/external-themes/liquidprompt/CONTRIBUTING.md
new file mode 100644
index 0000000..db117e1
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/CONTRIBUTING.md
@@ -0,0 +1,101 @@
+Contributing to Liquid Prompt
+=============================
+
+Contributing a patch
+--------------------
+
+The public stable branch for end users is `master`.
+
+
+How to do the right thing?
+--------------------------
+
+    $ git clone -o upstream git://github.com/nojhan/liquidprompt.git
+    $ cd liquidprompt
+
+    # Run liquidprompt and check that your issue is still on that branch
+    $ source liquidprompt
+
+    # Prepare a fix (include the issue number in the branch name if an issue
+    # already exists)
+    $ git checkout -b fix/my-fix
+    # Prepare a new feature
+    $ git checkout -b feature/my-feature
+
+    # Hack, commit, hack, commit...
+
+    # Fork the project on GitHub (if you haven't yet)
+
+    # Add the remote target for pushes
+    $ git remote add github git@github.com:$GITHUB_USER/liquidprompt.git
+
+    # Check that your local repo is up to date
+    $ git fetch
+    # Rebase your work on the latest state of `master`
+    $ git rebase upstream/master
+
+    # Push your commits
+    $ git push github fix/my-fix
+    $ git push github feature/my-feature
+
+    # Create the pull request on GitHub. Check that Github chose the `master`
+    # branch as the starting point for your branch.
+
+
+How to make a good pull request?
+--------------------------------
+
+1. Check that your Git authorship settings are correct:
+
+        $ git config -l | grep ^user\.
+
+2. All the commits in the pull request must be on the same topic. If instead
+   you propose fixes on different topics, use separate branches in your repo
+   and make a pull request for each.
+3. Good commit messages:
+     - first line must be 72 chars max and is a summary of the commit
+     - second line must be empty
+     - following lines (72 chars max) are optional and take this space freely
+       to express what that changes does.
+       Use references to GitHub issues number (ex: `#432`) if applicable
+4. Use a good title for your pull request.
+5. Put details, web links, in the pull request body. Use Markdown fully to
+   format the content (see
+   [Markdown syntax](http://daringfireball.net/projects/markdown/syntax)).
+   For example use triple backquotes for code blocks.
+
+
+Never, ever, merge the branches `master` of the main repo into one
+of your own branches. Instead, always rebase your own work on top the `master`
+branch.
+
+How my patch will be applied?
+-----------------------------
+
+Before being applied, your pull request will be reviewed, by the maintainer
+and also by other users. You can also help the project by reviewing others
+pull requests.
+
+If your patch is accepted it will be applied either:
+- by "merging" your branch
+- by cherry-picking your commit on top of the `master` branch. This makes the
+  history linear, and so easier to track.
+
+In any case, your authorship will be preserved in the commit.
+
+What if my patch is not applied?
+--------------------------------
+
+If you don't even get a review, add a "ping" comment with increasing delay
+between pings: 1 week, 2 weeks, then every month.
+
+If a stable version is released while your pull request has still not been
+merged on any working branch of the main repo, it would be helpful to ease
+the maitainer's work by rebasing your branch on top of the latest `master`
+and push it again to your GitHub repo. Be careful (for example create a
+branch or a tag before your rebase) because your may lose all your work in
+that process.
+
+
+Olivier Mengué, maintainer.
+http://github.com/dolmen
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/LICENSE b/zsh/modules/prompt/external-themes/liquidprompt/LICENSE
new file mode 100644
index 0000000..dba13ed
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 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.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/README.md b/zsh/modules/prompt/external-themes/liquidprompt/README.md
new file mode 100644
index 0000000..fd3c1c9
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/README.md
@@ -0,0 +1,368 @@
+Liquid Prompt — a useful adaptive prompt for Bash & zsh
+=======================================================
+
+Liquid Prompt gives you a nicely displayed prompt with useful information
+when you need it. It shows you what you need when you need it.
+You will notice what changes *when* it changes, saving time and frustration.
+You can even use it with your favorite shell – Bash or zsh.
+
+![Screenshot](https://raw.github.com/nojhan/liquidprompt/master/demo.png)
+
+
+## Features
+
+If there is nothing special about the current context, the appearance of Liquid
+Prompt is similar to that of a default prompt:
+
+`[user:~] $ `
+
+If you are running a background command and are also in the "myb" branch
+of a Git repository on a server:
+
+`1r [user@server:~/liquidprompt] myb ± `
+
+When Liquid Prompt is displaying everything (a rare event!), it may look like this:
+
+`code 🕤  ⌁24% ⌂42% 3d/2&/1z [user@server:~/ … /code/liquidprompt][pyenv]↥ master(+10/-5,3)*+ 125 ± `
+
+Here is an overview of what Liquid Prompt is capable of displaying:
+
+* a tag associated to the current shell session (you can easily add any
+  prefix tag to your prompt by invoking `prompt_tag MYTAG`)
+* the current time, displayed as either numeric values or as an analog clock
+* the current battery status:
+  * a green `⏚` if charging, above the given threshold, but not charged
+  * a yellow `⏚` if charging and under the given threshold
+  * a yellow `⌁` if discharging but above the given threshold
+  * a red `⌁` if discharging and under the given threshold
+* the remaining battery power if it is under the given threshold, displayed with
+  an increasingly red color map as remaining power decreases
+* the average of the processors load if it is over a given limit, displayed with
+  an intensity color map as load increases
+* the average temperature of the available system sensors (generally CPU and MB)
+* the number of detached sessions (`screen` or `tmux`)
+* the number of attached sleeping jobs (when you interrupt a command with Ctrl-Z
+  and bring it back with `fg`)
+* the number of attached running jobs (commands started with a `&`)
+* a pair of square brackets, in blue if your current shell is running in a
+  terminal multiplexer (`screen` or `tmux`)
+* the current user, in bold yellow if it is root and in light white if it is not
+  the same as the login user
+* a green `@` if the connection has X11 support; a yellow one if not
+* the current host – in bold red if you are connected via a `telnet` connection
+  and blue (or other unique colors) if connected via SSH
+* a green colon if the user has write permissions in the current directory and
+  a red one if not
+* the current directory in bold, shortened if it takes too much space while always
+  preserving the first two directory names
+* the current Python virtual environment
+* an up arrow if an HTTP proxy is in use
+* the name of the current branch if you are in a version control repository
+  (Git, Mercurial, Subversion, Bazaar, or Fossil):
+  * in green if everything is up-to-date
+  * in red if there are changes
+  * in yellow if there are pending commits to push
+* the number of added/deleted lines if changes have been made and the
+  number of pending commits
+* a yellow `+` if there are stashed modifications
+* a red `*` if there are untracked files in the repository
+* the runtime of the last command, if it has exceeded a certain threshold
+* the error code of the last command, if it has failed in some way
+* a smart mark at the end of the prompt:
+  * `±` for Git,
+  * `☿` for Mercurial,
+  * `‡` for Subversion,
+  * `‡±` for Git-Subversion,
+  * `⌘` for Fossil,
+  * `$` or `%` for a simple user, in red if you have `sudo` rights,
+  * a red `#` for the root user.
+* if desired, the prompt will be replicated in your terminal window's
+  title (without the colors)
+
+You can temporarily deactivate Liquid Prompt and revert to your previous prompt
+by typing `prompt_off`. Use `prompt_on` to bring it back. You can disable
+*all* prompts and simply use a single mark sign (`$ ` for user and `# ` for root)
+by using the `prompt_OFF` command.
+
+
+## Test Drive and Installation
+
+Installation is simple. The basic dependencies are standard Unix utilities/commands.
+If you experience some problems during the installation, please check that they
+are met; see the [dependencies](#dependencies) section for what you need specifically.
+
+Follow these steps:
+
+    cd
+    git clone https://github.com/nojhan/liquidprompt.git
+    source liquidprompt/liquidprompt
+
+To use it every time you start a shell, add the following lines to your
+`.bashrc` (if you use Bash) or `.zshrc` (if you use zsh):
+
+    # Only load Liquid Prompt in interactive shells, not from a script or from scp
+    [[ $- = *i* ]] && source ~/liquidprompt/liquidprompt
+
+Next up is the configuration; you can skip this step if you like the defaults:
+
+    cp ~/liquidprompt/liquidpromptrc-dist ~/.config/liquidpromptrc
+
+You can also copy the file to `~/.liquidpromptrc`.
+Use your favorite text editor to change the defaults.
+The `liquidpromptrc` file is richly commented and easy to set your own defaults.
+You can even theme Liquid Prompt and use a custom PS1 prompt. This is explained
+in the sections below.
+
+Check in your `.bashrc` that the `PROMPT_COMMAND` variable is not set, or else
+the prompt will not be available.
+
+### Installation via Antigen
+
+To install via antigen, simply add the following line in your `.zshrc` after activating antigen:
+
+    antigen bundle nojhan/liquidprompt
+
+
+## Dependencies
+
+Apart from obvious ones, some features depend on specific commands. If you do
+not install them, the corresponding feature will not be available, but no error
+will be displayed.
+
+* Battery status requires `acpi` on GNU/Linux.
+* Temperature status requires `acpi` or `lm-sensors` on GNU/Linux.
+* Detached session status looks for `screen` and/or `tmux`.
+* VCS support features require `git`, `hg`, `svn`, `bzr` or `fossil`, but you
+  probably already knew that.
+
+For other features, the script uses commands that should be available on a large
+variety of Unix systems: `tput`, `grep`, `awk`, `sed`, `ps`, `who`, and `expr`.
+
+
+## Feature Configuration
+
+You can configure some variables in the `~/.config/liquidpromptrc` file:
+
+* `LP_BATTERY_THRESHOLD`, the maximal value under which the battery level is displayed
+* `LP_LOAD_THRESHOLD`, the minimal value after which the load average is displayed
+* `LP_TEMP_THRESHOLD`, the minimal value after which the average temperature is displayed
+* `LP_RUNTIME_THRESHOLD`, the minimal value after which the runtime is displayed
+* `LP_PATH_LENGTH`, the maximum percentage of the screen width used to display the path
+* `LP_PATH_KEEP`, how many directories to keep at the beginning of a shortened path
+* `LP_HOSTNAME_ALWAYS`, a choice between always displaying the hostname or
+  showing it only when connected via a remote shell
+* `LP_USER_ALWAYS`, a choice between always displaying the user or showing
+  it only when he is different from the one that logged in
+
+You can also force some features to be disabled, to save some time in the
+prompt-building process:
+
+* `LP_ENABLE_PERM`, if you want to detect if the directory is writeable
+* `LP_ENABLE_SHORTEN_PATH`, if you want to shorten the path display
+* `LP_ENABLE_PROXY`, if you want to detect if a proxy is used
+* `LP_ENABLE_JOBS`, if you want to have jobs information
+* `LP_ENABLE_LOAD`, if you want to have load information
+* `LP_ENABLE_BATT`, if you want to have battery information
+* `LP_ENABLE_GIT`, if you want to have Git information
+* `LP_ENABLE_SVN`, if you want to have Subversion information
+* `LP_ENABLE_HG`, if you want to have Mercurial information
+* `LP_ENABLE_BZR`, if you want to have Bazaar information
+* `LP_ENABLE_FOSSIL`, if you want to have Fossil information
+* `LP_ENABLE_VCS_ROOT`, if you want to show VCS informations with root account
+* `LP_ENABLE_TITLE`, if you want to use the prompt as your terminal window's title
+* `LP_ENABLE_SCREEN_TITLE`, if you want to use the prompt as your screen window's title
+* `LP_ENABLE_SSH_COLORS`, if you want different colors for hosts you SSH into
+* `LP_ENABLE_RUNTIME`, if you want to display the runtime of the last command
+* `LP_ENABLE_SUDO`, if you want the prompt mark to change color while you have password-less root access
+* `LP_ENABLE_FQDN`, if you want the display of the fully qualified domain name
+* `LP_ENABLE_TIME`, if you want to display the time at which the prompt was shown
+* `LP_TIME_ANALOG`, if you want to show the time using an analog clock instead of numeric values
+
+Note that if required commands are not installed, enabling the corresponding
+feature will have no effect. Also, all the `LP_ENABLE_…` variables override the
+templates; i.e. if you use `$LP_BATT` in your template and you set `LP_ENABLE_BATT=0`
+in your configuration file, your prompt will not have any battery information.
+
+If you are using Bash and want to use the `PROMPT_DIRTRIM` built-in
+functionality to shorten but still want to have Liquid Prompt calculating the
+number of directories to keep in the path, precise a value for `PROMPT_DIRTRIM`
+before sourcing Liquid Prompt and it will override this value with one fitting
+the width of your terminal.
+
+You may face performances decrease when using VCS located in remote directories.
+To avoid this, you can set the `LP_DISABLED_VCS_PATH` variable to a list of
+absolute colon-separated paths where VCS-related features should be disabled.
+
+
+## Customizing the Prompt
+
+### Adding a Prefix/Postfix
+
+You can prefix the `LP_PS1` variable with anything you want using
+`LP_PS1_PREFIX`. The following example activate a custom window's title:
+
+    LP_PS1_PREFIX="\[\e]0;\u@\h: \w\a\]"
+
+To postfix the prompt, use the `LP_PS1_POSTFIX` variable. For example, to add a
+newline and a single character:
+
+    LP_PS1_POSTFIX="\n>"
+
+Note: the `prompt_tag` function is a convenient way to add a prefix. You can use
+it to add a keyword to each of your different terminals:
+
+    [:~/code/liquidprompt] develop ± prompt_tag mycode
+    mycode [:~/code/liquidprompt] develop ±
+
+
+### Rearranging the Prompt
+
+You can sort what you want to see by sourcing your favorite template file
+(`*.ps1`) in the configuration file.
+
+You can start from the `liquid.ps1` file, which show the default settings.
+To use your own configuration, just set `LP_PS1_FILE` to your own file path in
+your `~/.liquidpromptrc` and you're done.
+
+Those scripts basically export the `LP_PS1` variable, by appending features and
+theme colors.
+
+Available features:
+* `LP_BATT` battery
+* `LP_LOAD` load
+* `LP_TEMP` temperature
+* `LP_JOBS` detached `screen` or `tmux` sessions/running jobs/suspended jobs
+* `LP_USER` user
+* `LP_HOST` hostname
+* `LP_PERM` a colon (`:`)
+* `LP_PWD` current working directory
+* `LP_PROXY` HTTP proxy
+* `LP_VCS` informations concerning the current working repository
+* `LP_ERR` last error code
+* `LP_MARK` prompt mark
+* `LP_TITLE` the prompt as a window's title escaped sequences
+*  LP_TTYN  the terminal basename
+* `LP_BRACKET_OPEN` and `LP_BRACKET_CLOSE`, brackets enclosing the user+path part
+
+For example, if you just want to have a prompt displaying the user and the
+host, with a normal full path in blue and Git support only:
+
+    export LP_PS1=`echo -ne "[\${LP_USER}\${LP_HOST}:\${BLUE}\$(pwd)\${NO_COL}] \${LP_GIT} \\\$ "`
+
+Note that you need to properly escape dollar signs in a string that will be
+interpreted by Bash at each prompt.
+
+To erase your new formatting, just bind `LP_PS1` to a null string:
+
+    export LP_PS1=""
+
+
+## Themes
+
+You can change the colors and special characters of some parts of Liquid Prompt
+by sourcing your favorite theme file (`*.theme`) in the configuration file. See
+[`liquid.theme`](liquid.theme) for an example of the default Liquid Prompt theme.
+
+### Colors
+
+The available colours available for use are:
+
+`BOLD`, `BLACK`, `BOLD_GRAY`, `WHITE`, `BOLD_WHITE`, `GREEN`, `BOLD_GREEN`,
+`YELLOW`, `BOLD_YELLOW`, `BLUE`, `BOLD_BLUE`, `PINK`, `CYAN`, `BOLD_CYAN,`,
+`RED`, `BOLD_RED`, `WARN_RED`, `CRIT_RED`, `DANGER_RED`, and `NO_COL`.
+
+Set the variable to a null string (`""`) if you do not want color.
+
+* Current working directory
+    * `LP_COLOR_PATH` as normal user
+    * `LP_COLOR_PATH_ROOT` as root
+* Color of the proxy mark
+    * `LP_COLOR_PROXY`
+* Jobs count
+    * `LP_COLOR_JOB_D` Detached (`screen` / `tmux` sessions without attached clients)
+    * `LP_COLOR_JOB_R` Running (`xterm &`)
+    * `LP_COLOR_JOB_Z` Sleeping (Ctrl-Z)
+    * `LP_COLOR_IN_MULTIPLEXER` currently running in a terminal multiplexer
+* Last error code
+    * `LP_COLOR_ERR`
+* Prompt mark
+    * `LP_COLOR_MARK` as user
+    * `LP_COLOR_MARK_ROOT` as root
+    * `LP_COLOR_MARK_SUDO` when you did `sudo` and your credentials are still cached (use `sudo -K` to revoke them)
+    * `LP_MARK_PREFIX="\n"` put the prompt on the second line
+* Current user
+    * `LP_COLOR_USER_LOGGED` user who logged in
+    * `LP_COLOR_USER_ALT` user but not the one who logged in
+    * `LP_COLOR_USER_ROOT` root
+* Hostname
+    * `LP_COLOR_HOST` local host
+    * `LP_COLOR_SSH` connected via SSH
+    * `LP_COLOR_TELNET` connected via `telnet`
+    * `LP_COLOR_X11_ON` connected with X11 support
+    * `LP_COLOR_X11_OFF` connected without X11 support
+* Separation mark (by default, the colon before the path)
+    * `LP_COLOR_WRITE` have write permission
+    * `LP_COLOR_NOWRITE` do not have write permission
+* VCS
+    * `LP_COLOR_UP` repository is up-to-date / a push has been made
+    * `LP_COLOR_COMMITS` some commits have not been pushed
+    * `LP_COLOR_CHANGES` there are some changes to commit
+    * `LP_COLOR_DIFF` number of lines or files impacted by current changes
+* Battery
+    * `LP_COLOR_CHARGING_ABOVE` charging and above threshold
+    * `LP_COLOR_CHARGING_UNDER` charging but under threshold
+    * `LP_COLOR_DISCHARGING_ABOVE` discharging but above threshold
+    * `LP_COLOR_DISCHARGING_UNDER` discharging and under threshold
+
+
+### Special Characters
+
+* `LP_MARK_DEFAULT` (default: "") the mark you want at the end of your prompt
+  (leave empty to use your shell's default mark)
+* `LP_MARK_BATTERY` (default: "⌁") in front of the battery charge
+* `LP_MARK_ADAPTER` (default: "⏚") displayed when plugged-in
+* `LP_MARK_LOAD` (default: "⌂") in front of the load
+* `LP_MARK_PROXY` (default: "↥") indicate a proxy in use
+* `LP_MARK_HG` (default: "☿") prompt mark in Mercurial repositories
+* `LP_MARK_SVN` (default: "‡") prompt mark in Subversion repositories
+* `LP_MARK_GIT` (default: "±") prompt mark in Git repositories
+* `LP_MARK_FOSSIL` (default: "⌘") prompt mark in Fossil repositories
+* `LP_MARK_BZR` (default: "⚯") prompt mark in Bazaar repositories
+* `LP_MARK_DISABLED` (default: "⌀") prompt mark in disabled repositories
+  (see `LP_DISABLED_VCS_PATH`)
+* `LP_MARK_UNTRACKED` (default: "\*") if Git has untracked files
+* `LP_MARK_STASH` (default: "+") if Git has stashed modifications
+* `LP_MARK_BRACKET_OPEN` (default: "[") marks around the main part of the prompt
+* `LP_MARK_BRACKET_CLOSE` (default: "]") marks around the main part of the prompt
+* `LP_MARK_PERM` (default: ":") colored green red or green to indicate write
+  permissions of the current directory
+* `LP_TITLE_OPEN` (default: "\e]0;") escape character opening a window's title
+* `LP_TITLE_CLOSE` (default: "\a") escape character closing a window's title
+
+
+## Known Limitations and Bugs
+
+Liquid Prompt is distributed under the [GNU Affero General Public License
+version 3](LICENSE).
+
+* Does not display the number of commits to be pushed in Mercurial repositories.
+* Browsing very large Subversion repositories may dramatically slow down
+  the display of Liquid Prompt (use `LP_DISABLED_VCS_PATH` to avoid that).
+* Subversion repositories cannot display commits to be pushed because
+  that's not how Subversion works
+* The proxy detection only uses the `$http_proxy` environment variable.
+* The window's title escape sequence may not work properly on some terminals
+  (like `xterm-256`).
+* The analog clock requires a Unicode-aware terminal and at least a
+  sufficiently complete font on your system. The [Symbola](http://users.teilar.gr/~g1951d/)
+  font, designed by Georges Douros, is known to work well. On Debian or Ubuntu
+  install try the `fonts-symbola` or `ttf-ancient-fonts` package.
+
+
+## Authors
+
+Current Maintainer: [![endorse](https://api.coderwall.com/dolmen/endorsecount.png)](https://coderwall.com/dolmen)
+
+Original Author: [![endorse](https://api.coderwall.com/nojhan/endorsecount.png)](https://coderwall.com/nojhan)
+
+And many contributors!
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/README b/zsh/modules/prompt/external-themes/liquidprompt/contrib/README
new file mode 100644
index 0000000..e5143b3
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/contrib/README
@@ -0,0 +1,12 @@
+
+liquidprompt/contrib Policy
+---------------------------
+
+This directory contains files that have been contributed by contributors
+but that the core liquidprompt maintainers don't take care.
+So they are probably outdated, maybe of poor quality (because the maintainers
+do not have the knowledge to properly review them).
+
+So use them at your own risks, and don't fill issues about them, just send
+patches.
+
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD
new file mode 100644
index 0000000..75158be
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/PKGBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Julien Pecqueur (JPEC) <jpec[at]julienpecqueur[dot]net>
+pkgname=liquidprompt-git
+pkgver=20130314
+pkgrel=3
+pkgdesc="An intelligent and non intrusive prompt for bash and zsh"
+url="https://github.com/nojhan/liquidprompt"
+arch=('any')
+license=('AGPLv3')
+optdepends=('screen' 'acpi')
+makedepends=('git')
+md5sums=('SKIP')
+install=liquidprompt.install
+_gitroot="git://github.com/nojhan/liquidprompt.git"
+_gitname="liquidprompt"
+
+build() {
+  cd ${srcdir}/
+  msg "Connecting to the GIT server...."
+  if [[ -d ${srcdir}/${_gitname} ]] ; then
+    cd ${_gitname}
+    git reset --hard
+    git pull origin
+    msg "The local files are updated..."
+  else
+    msg "Cloning git repo..."
+    git clone ${_gitroot}
+    cd ${_gitname}
+  fi
+  git reset --hard
+  msg "GIT checkout done."
+}
+
+package() {
+  cd "${srcdir}/${_gitname}"
+  # install files
+  install -Dm755 liquidprompt "$pkgdir/usr/bin/liquidprompt"
+  install -Dm644 liquidpromptrc-dist "$pkgdir/etc/liquidpromptrc"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install
new file mode 100644
index 0000000..80cf376
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/archlinux-aur/liquidprompt.install
@@ -0,0 +1,4 @@
+post_install() {
+	 echo "Use 'source liquidprompt' to enable the prompt."
+}
+
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh
new file mode 100755
index 0000000..daf559e
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/create_deb.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo "Creating Debian's package..."
+nano ./liquidprompt/DEBIAN/control
+
+echo "Copying files..."
+cp ../../liquidprompt ./liquidprompt/usr/bin/liquidprompt
+cp ../../liquidpromptrc-dist ./liquidprompt/etc/liquidpromptrc
+chmod a+x ./liquidprompt/usr/bin/liquidprompt
+
+echo "Building liquidprompt.deb..."
+dpkg-deb -b liquidprompt
+
+echo "Deleting files..."
+rm -f ./liquidprompt/etc/*
+rm -f ./liquidprompt/usr/bin/*
+
+echo "Done !"
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control
new file mode 100644
index 0000000..95ee5ce
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/contrib/dist/debian/liquidprompt/DEBIAN/control
@@ -0,0 +1,11 @@
+Package: liquidprompt
+Version: 1.3-0
+Section: base
+Priority: optional
+Architecture: all
+Depends: bash
+Recommends: acpi
+Suggests: git, screen, tmux
+Maintainer: Julien Pecqueur <jpec@julienpecqueur.net>
+Description: A slick adaptative prompt for Bash and Zsh.
+Homepage: http://github.com/nojhan/liquidprompt
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/demo.png b/zsh/modules/prompt/external-themes/liquidprompt/demo.png
new file mode 100644
index 0000000..22abc40
Binary files /dev/null and b/zsh/modules/prompt/external-themes/liquidprompt/demo.png differ
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/example.bashrc b/zsh/modules/prompt/external-themes/liquidprompt/example.bashrc
new file mode 100644
index 0000000..6f5c508
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/example.bashrc
@@ -0,0 +1,25 @@
+
+# If you want to use Liquid Prompt without bothering about its configuration,
+# just run the following command:
+# cp example.bashrc ~/.bashrc
+
+# The following is a minimalistic Bash config file
+
+# Use the system config if it exists
+if [ -f /etc/bashrc ]; then
+    . /etc/bashrc        # --> Read /etc/bashrc, if present.
+elif [ -f /etc/bash.bashrc ]; then
+    . /etc/bash.bashrc   # --> Read /etc/bash.bashrc, if present.
+fi
+
+# The following lines are only for interactive shells
+[[ $- = *i* ]] || return
+
+# Use Bash completion, if installed
+if [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+fi
+
+# Use Liquid Prompt
+source ~/liquidprompt/liquidprompt
+
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/liquid.ps1 b/zsh/modules/prompt/external-themes/liquidprompt/liquid.ps1
new file mode 100644
index 0000000..bca782d
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/liquid.ps1
@@ -0,0 +1,53 @@
+
+#######################################
+# LIQUID PROMPT DEFAULT TEMPLATE FILE #
+#######################################
+
+# Available features:
+# LP_BATT battery
+# LP_LOAD load
+# LP_JOBS screen sessions/running jobs/suspended jobs
+# LP_USER user
+# LP_HOST hostname
+# LP_PERM a colon ":"
+# LP_PWD current working directory
+# LP_VENV Python virtual environment
+# LP_PROXY HTTP proxy
+# LP_VCS the content of the current repository
+# LP_ERR last error code
+# LP_MARK prompt mark
+# LP_TIME current time
+# LP_TTYN number of current terminal (useful in title for quick switching)
+# LP_RUNTIME runtime of last command
+# LP_MARK_PREFIX user-defined prompt mark prefix (helpful if you want 2-line prompts)
+# LP_PS1_PREFIX user-defined general-purpose prefix (default set a generic prompt as the window title)
+# LP_PS1_POSTFIX user-defined general-purpose postfix
+# LP_BRACKET_OPEN open bracket
+# LP_BRACKET_CLOSE close bracket
+
+# Remember that most features come with their corresponding colors,
+# see the README.
+
+# add time, jobs, load and battery
+LP_PS1="${LP_PS1_PREFIX}${LP_TIME}${LP_BATT}${LP_LOAD}${LP_JOBS}"
+# add user, host and permissions colon
+LP_PS1="${LP_PS1}${LP_BRACKET_OPEN}${LP_USER}${LP_HOST}${LP_PERM}"
+
+LP_PS1="${LP_PS1}${LP_PWD}${LP_BRACKET_CLOSE}${LP_VENV}${LP_PROXY}"
+
+# Add VCS infos
+# If root, the info has not been collected unless LP_ENABLE_VCS_ROOT
+# is set.
+LP_PS1="${LP_PS1}${LP_VCS}"
+
+# add return code and prompt mark
+LP_PS1="${LP_PS1}${LP_RUNTIME}${LP_ERR}${LP_MARK_PREFIX}${LP_MARK}${LP_PS1_POSTFIX}"
+
+# "invisible" parts
+# Get the current prompt on the fly and make it a title
+LP_TITLE="$(_lp_title "$LP_PS1")"
+
+# Insert it in the prompt
+LP_PS1="${LP_TITLE}${LP_PS1}"
+
+# vim: set et sts=4 sw=4 tw=120 ft=sh:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/liquid.theme b/zsh/modules/prompt/external-themes/liquidprompt/liquid.theme
new file mode 100644
index 0000000..1a4ef4a
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/liquid.theme
@@ -0,0 +1,137 @@
+
+####################################
+# LIQUID PROMPT DEFAULT THEME FILE #
+####################################
+
+# Special characters
+# Be sure to use characters that exists in the font you use. You can use several
+# characters at once.
+# Below is an example of how to fallback to ASCII if the term is not Unicode-capable.
+# Defaults to UTF-8 characters.
+if [[ "$(locale -k LC_CTYPE | sed -n 's/^charmap="\(.*\)"/\1/p')" == *"UTF-8"* ]]; then
+    # If charset is UTF-8.
+    LP_MARK_BATTERY="⌁"        # in front of the battery charge
+    LP_MARK_ADAPTER="⏚"        # displayed when plugged
+    LP_MARK_LOAD="⌂"           # in front of the load
+    LP_MARK_TEMP="θ"           # in front of the temp
+    LP_MARK_PROXY="↥"          # indicate a proxy in use
+    LP_MARK_HG="☿"             # prompt mark in hg repositories
+    LP_MARK_SVN="‡"            # prompt mark in svn repositories
+    LP_MARK_GIT="±"            # prompt mark in git repositories
+    LP_MARK_FOSSIL="⌘"         # prompt mark in fossil repositories
+    LP_MARK_DISABLED="⌀"       # prompt mark in directory with disabled VCS info
+    LP_MARK_UNTRACKED="*"      # if git has untracked files
+    LP_MARK_STASH="+"          # if git has stashs
+    LP_MARK_SHORTEN_PATH=" … " # prompt mark in shortened paths
+    LP_MARK_PERM=":"           # separator between host and path
+else
+    # If charset is anything else, fallback to ASCII chars
+    LP_MARK_BATTERY="b"
+    LP_MARK_ADAPTER="p"
+    LP_MARK_LOAD="c"
+    LP_MARK_TEMP="T"
+    LP_MARK_PROXY="^"
+    LP_MARK_HG="m"
+    LP_MARK_SVN="="
+    LP_MARK_GIT="+"
+    LP_MARK_FOSSIL="f"
+    LP_MARK_DISABLED="!"
+    LP_MARK_UNTRACKED="*"
+    LP_MARK_STASH="+"
+    LP_MARK_SHORTEN_PATH=" ... "
+    LP_MARK_PERM=":"
+fi
+
+LP_MARK_BRACKET_OPEN="["  # open bracket
+LP_MARK_BRACKET_CLOSE="]" # close bracket
+#LP_MARK_DEFAULT=""        # default prompt mark
+LP_MARK_PREFIX=" "        # prompt mark prefix
+LP_PS1_PREFIX=""
+LP_PS1_POSTFIX=""
+
+# Colors
+# Available colors are:
+# BOLD, BLACK, BOLD_GRAY, WHITE, BOLD_WHITE,
+# RED, BOLD_RED, WARN_RED, CRIT_RED, DANGER_RED,
+# GREEN, BOLD_GREEN, YELLOW, BOLD_YELLOW, BLUE,
+# BOLD_BLUE, PURPLE, PINK, CYAN, BOLD_CYAN
+# Set to a null string "" if you do not want color.
+
+# Current working directory
+LP_COLOR_PATH="$BOLD"         # as normal user
+LP_COLOR_PATH_ROOT="$BOLD_YELLOW"   # as root
+
+# Color of the proxy mark
+LP_COLOR_PROXY="$BOLD_BLUE"
+
+# Jobs count
+LP_COLOR_JOB_D="$YELLOW"        # Detached (aka screen sessions)
+LP_COLOR_JOB_R="$BOLD_YELLOW"   # Running (xterm &)
+LP_COLOR_JOB_Z="$BOLD_YELLOW"   # Sleeping (Ctrl-Z)
+
+# Last error code
+LP_COLOR_ERR="$PURPLE"
+
+# Prompt mark
+LP_COLOR_MARK="$BOLD"     # as user
+LP_COLOR_MARK_ROOT="$BOLD_RED"  # as root
+LP_COLOR_MARK_SUDO="$BOLD_RED"  # when sudo credentials are cached
+
+# Current user
+LP_COLOR_USER_LOGGED=""           # user who logged in
+LP_COLOR_USER_ALT="$BOLD"         # user but not the one who logged in
+LP_COLOR_USER_ROOT="$BOLD_YELLOW" # root
+
+# Hostname
+LP_COLOR_HOST=""            # local host
+LP_COLOR_SSH="$BLUE"        # connected via SSH
+LP_COLOR_SU="$BOLD_YELLOW"  # connected remotely but in new environment through su/sudo
+LP_COLOR_TELNET="$WARN_RED" # connected via telnet
+LP_COLOR_X11_ON="$GREEN"    # connected with X11 support
+LP_COLOR_X11_OFF="$YELLOW"  # connected without X11 support
+
+# Separation mark (aka permission in the working dir)
+LP_COLOR_WRITE="$GREEN"  # have write permission
+LP_COLOR_NOWRITE="$RED"  # do not have write permission
+
+# VCS
+LP_COLOR_UP="$GREEN"                # repository is up to date / a push have been made
+LP_COLOR_COMMITS="$YELLOW"          # some commits have not been pushed
+LP_COLOR_COMMITS_BEHIND="$BOLD_RED" # some commits have not been pushed
+LP_COLOR_CHANGES="$RED"             # there is some changes to commit
+LP_COLOR_DIFF="$PURPLE"             # number of lines impacted by current changes
+
+# Battery
+LP_COLOR_CHARGING_ABOVE="$GREEN"      # charging and above threshold
+LP_COLOR_CHARGING_UNDER="$YELLOW"     # charging but under threshold
+LP_COLOR_DISCHARGING_ABOVE="$YELLOW"  # discharging but above threshold
+LP_COLOR_DISCHARGING_UNDER="$RED"     # discharging and under threshold
+
+# Time
+LP_COLOR_TIME="$BLUE"
+
+# Brackets inside screen/tmux
+LP_COLOR_IN_MULTIPLEXER="$BOLD_BLUE"
+
+# Virtual environment
+LP_COLOR_VIRTUALENV="$CYAN"
+
+# Runtime
+LP_COLOR_RUNTIME="$YELLOW"
+
+# Color map (for battery and load levels, and temperature)
+# Range from 0 (nothing special) to 9 (alert)
+LP_COLORMAP=(
+    ""
+    "$GREEN"
+    "$BOLD_GREEN"
+    "$YELLOW"
+    "$BOLD_YELLOW"
+    "$RED"
+    "$BOLD_RED"
+    "$WARN_RED"
+    "$CRIT_RED"
+    "$DANGER_RED"
+)
+
+# vim: set et sts=4 sw=4 tw=120 ft=sh:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt b/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt
new file mode 100755
index 0000000..794d472
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt
@@ -0,0 +1,1974 @@
+################################################################################
+# LIQUID PROMPT
+# An intelligent and non-intrusive prompt for Bash and zsh
+################################################################################
+
+
+# Licensed under the AGPL version 3
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 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 Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+###########
+# AUTHORS #
+###########
+
+# Alex Prengère     <alexprengere@gmail.com>      # Untracked git files
+# Anthony Gelibert  <anthony.gelibert@me.com>     # Several fix
+# Aurelien Requiem  <aurelien@requiem.fr>         # Major clean refactoring, variable path length, error codes, several bugfixes.
+# Brendan Fahy      <bmfahy@gmail.com>            # Postfix variable
+# Clément Mathieu   <clement@unportant.info>      # Bazaar support
+# David Loureiro    <david.loureiro@sysfera.com>  # Small portability fix
+# Étienne Deparis   <etienne@depar.is>            # Fossil support
+# Florian Le Frioux <florian@lefrioux.fr>         # Use ± mark when root in VCS dir.
+# François Schmidts <francois.schmidts@gmail.com> # Initial PROMPT_DIRTRIM support
+# Frédéric Lepied   <flepied@gmail.com>           # Python virtual env
+# Jonas Bengtsson   <jonas.b@gmail.com>           # Git remotes fix
+# Joris Dedieu      <joris@pontiac3.nfrance.com>  # Portability framework, FreeBSD support, bugfixes.
+# Joris Vaillant    <joris.vaillant@gmail.com>    # Small git fix
+# Luc Didry         <luc@fiat-tux.fr>             # ZSH port, several fix
+# Ludovic Rousseau  <ludovic.rousseau@gmail.com>  # Lot of bugfixes.
+# Markus Dreseler   <github@dreseler.de>          # Runtime of last command
+# Nicolas Lacourte  <nicolas@dotinfra.fr>         # Screen title
+# nojhan            <nojhan@gmail.com>            # Original author.
+# Olivier Mengué    <dolmen@cpan.org>             # Major optimizations, refactorings everywhere; current maintainer
+# Poil              <poil@quake.fr>               # Speed improvements
+# Rolf Morel        <rolfmorel@gmail.com>         # "Shorten path" refactoring and fixes
+# Thomas Debesse    <thomas.debesse@gmail.com>    # Fix columns use.
+# Yann 'Ze' Richard <ze@nbox.org>                 # Do not fail on missing commands.
+# Austen Adler      <stonewareslord@gmail.com>    # ZSH runtime
+
+# See the README.md file for a summary of features.
+
+# Issue #161: do not load if not an interactive shell
+test -z "$TERM" -o "x$TERM" = xdumb && return
+
+# Check for recent enough version of bash.
+if test -n "${BASH_VERSION-}" -a -n "$PS1" ; then
+    bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
+    if (( bmajor < 3 || ( bmajor == 3 && bminor < 2 ) )); then
+        unset bash bmajor bminor
+        return
+    fi
+
+    unset bash bmajor bminor
+
+    _LP_SHELL_bash=true
+    _LP_SHELL_zsh=false
+    _LP_OPEN_ESC="\["
+    _LP_CLOSE_ESC="\]"
+
+    _LP_USER_SYMBOL="\u"
+    _LP_HOST_SYMBOL="\h"
+    _LP_FQDN_SYMBOL="\H"
+    _LP_TIME_SYMBOL="\t"
+    _LP_MARK_SYMBOL='\$'
+    _LP_PWD_SYMBOL="\\w"
+    _LP_DIR_SYMBOL="\\W"
+
+    _LP_FIRST_INDEX=0
+    _LP_PERCENT='%'    # must be escaped on zsh
+    _LP_BACKSLASH='\\' # must be escaped on bash
+
+    # Escape the given strings
+    # Must be used for all strings injected in PS1 that may comes from remote sources,
+    # like $PWD, VCS branch names...
+    _lp_escape()
+    {
+        echo -nE "${1//\\/\\\\}"
+    }
+
+    # Disable the DEBUG trap used by the RUNTIME feature
+    # (in case we are reloading LP in the same shell after disabling
+    # the feature in .liquidpromptrc)
+    # FIXME this doesn't seem to work :(
+    [[ -n "${LP_ENABLE_RUNTIME-}" ]] && trap - DEBUG
+elif test -n "${ZSH_VERSION-}" ; then
+    _LP_SHELL_bash=false
+    _LP_SHELL_zsh=true
+    _LP_OPEN_ESC="%{"
+    _LP_CLOSE_ESC="%}"
+
+    _LP_USER_SYMBOL="%n"
+    _LP_HOST_SYMBOL="%m"
+    _LP_FQDN_SYMBOL="%M"
+    _LP_TIME_SYMBOL="%*"
+    _LP_MARK_SYMBOL='%(!.#.%%)'
+    _LP_PWD_SYMBOL="%~"
+    _LP_DIR_SYMBOL="%1~"
+
+    _LP_FIRST_INDEX=1
+    _LP_PERCENT='%%'
+    _LP_BACKSLASH="\\"
+
+    _lp_escape()
+    {
+        arg="${1//\\/\\\\}"
+        echo -nE "${arg//\%/$_LP_PERCENT}"
+    }
+
+    # For ZSH, autoload required functions
+    autoload -Uz add-zsh-hook
+
+    # Disable previous hooks as options that set them
+    # may have changed
+    {
+        add-zsh-hook -d precmd  _lp_set_prompt
+        add-zsh-hook -d preexec _lp_runtime_before
+        add-zsh-hook -d precmd  _lp_runtime_after
+    } >/dev/null
+else
+    echo "liquidprompt: shell not supported" >&2
+    return
+fi
+
+
+# Store $2 (or $?) as a true/false value in variable named $1
+# $? is propagated
+#   _lp_bool foo 5
+#   => foo=false
+#   _lp_bool foo 0
+#   => foo=true
+_lp_bool()
+{
+    local res=${2:-$?}
+    if (( res )); then
+        eval $1=false
+    else
+        eval $1=true
+    fi
+    return $res
+}
+
+# Save $IFS as we want to restore the default value at the beginning of the
+# prompt function
+_LP_IFS="$IFS"
+
+
+###############
+# OS specific #
+###############
+
+# LP_OS detection, default to Linux
+case $(uname) in
+    FreeBSD)   LP_OS=FreeBSD ;;
+    DragonFly) LP_OS=FreeBSD ;;
+    OpenBSD)   LP_OS=OpenBSD ;;
+    Darwin)    LP_OS=Darwin  ;;
+    SunOS)     LP_OS=SunOS   ;;
+    *)         LP_OS=Linux   ;;
+esac
+
+# Get cpu count
+case "$LP_OS" in
+    Linux)   _lp_CPUNUM=$( nproc 2>/dev/null || \grep -c '^[Pp]rocessor' /proc/cpuinfo ) ;;
+    FreeBSD|Darwin|OpenBSD) _lp_CPUNUM=$( sysctl -n hw.ncpu ) ;;
+    SunOS)   _lp_CPUNUM=$( kstat -m cpu_info | \grep -c "module: cpu_info" ) ;;
+esac
+
+# Extended regexp patterns for sed
+# GNU/BSD sed
+_LP_SED_EXTENDED=r
+[[ "$LP_OS" = Darwin ]] && _LP_SED_EXTENDED=E
+
+
+# get current load
+case "$LP_OS" in
+    Linux)
+        _lp_cpu_load () {
+            local eol
+            read lp_cpu_load eol < /proc/loadavg
+        }
+        ;;
+    FreeBSD|Darwin|OpenBSD)
+        _lp_cpu_load () {
+            local bol eol
+            # If you have problems with syntax coloring due to the following
+            # line, do this: ln -s liquidprompt liquidprompt.bash
+            # and edit liquidprompt.bash
+            read bol lp_cpu_load eol <<<"$( LANG=C sysctl -n vm.loadavg )"
+        }
+        ;;
+    SunOS)
+        _lp_cpu_load () {
+            read lp_cpu_load <<<"$( LANG=C uptime | sed 's/.*load average: *\([0-9.]*\).*/\1/' )"
+        }
+esac
+
+
+#################
+# CONFIGURATION #
+#################
+
+# The following code is run just once. But it is encapsulated in a function
+# to benefit of 'local' variables.
+#
+# What we do here:
+# 1. Setup variables that can be used by the user: the "API" of Liquid Prompt
+#    for config/theme. Those variables are local to the function.
+#    In practice, this is only color variables.
+# 2. Setup default values
+# 3. Load the configuration
+_lp_source_config()
+{
+
+    # TermInfo feature detection
+    local ti_sgr0="$( { tput sgr0 || tput me ; } 2>/dev/null )"
+    local ti_bold="$( { tput bold || tput md ; } 2>/dev/null )"
+    local ti_setaf
+    local ti_setab
+    if tput setaf 0 >/dev/null 2>&1; then
+        ti_setaf() { tput setaf "$1" ; }
+    elif tput AF 0 >/dev/null 2>&1; then
+        # FreeBSD
+        ti_setaf() { tput AF "$1" ; }
+    elif tput AF 0 0 0 >/dev/null 2>&1; then
+        # OpenBSD
+        ti_setaf() { tput AF "$1" 0 0 ; }
+    else
+        echo "liquidprompt: terminal $TERM not supported" >&2
+        ti_setaf () { : ; }
+    fi
+    if tput setab 0 >/dev/null 2>&1; then
+        ti_setab() { tput setab "$1" ; }
+    elif tput AB 0 >/dev/null 2>&1; then
+        # FreeBSD
+        ti_setab() { tput AB "$1" ; }
+    elif tput AB 0 0 0 >/dev/null 2>&1; then
+        # OpenBSD
+        ti_setab() { tput AB "$1" 0 0 ; }
+    else
+        echo "liquidprompt: terminal $TERM not supported" >&2
+        ti_setab() { : ; }
+    fi
+
+    # Colors: variables are local so they will have a value only
+    # during config loading and will not conflict with other values
+    # with the same names defined by the user outside the config.
+    local BOLD="${_LP_OPEN_ESC}${ti_bold}${_LP_CLOSE_ESC}"
+
+    local BLACK="${_LP_OPEN_ESC}$(ti_setaf 0)${_LP_CLOSE_ESC}"
+    local BOLD_GRAY="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 0)${_LP_CLOSE_ESC}"
+    local WHITE="${_LP_OPEN_ESC}$(ti_setaf 7)${_LP_CLOSE_ESC}"
+    local BOLD_WHITE="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 7)${_LP_CLOSE_ESC}"
+
+    local RED="${_LP_OPEN_ESC}$(ti_setaf 1)${_LP_CLOSE_ESC}"
+    local BOLD_RED="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 1)${_LP_CLOSE_ESC}"
+    local WARN_RED="${_LP_OPEN_ESC}$(ti_setaf 0 ; ti_setab 1)${_LP_CLOSE_ESC}"
+    local CRIT_RED="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 7 ; ti_setab 1)${_LP_CLOSE_ESC}"
+    local DANGER_RED="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 3 ; ti_setab 1)${_LP_CLOSE_ESC}"
+
+    local GREEN="${_LP_OPEN_ESC}$(ti_setaf 2)${_LP_CLOSE_ESC}"
+    local BOLD_GREEN="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 2)${_LP_CLOSE_ESC}"
+
+    local YELLOW="${_LP_OPEN_ESC}$(ti_setaf 3)${_LP_CLOSE_ESC}"
+    local BOLD_YELLOW="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 3)${_LP_CLOSE_ESC}"
+
+    local BLUE="${_LP_OPEN_ESC}$(ti_setaf 4)${_LP_CLOSE_ESC}"
+    local BOLD_BLUE="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 4)${_LP_CLOSE_ESC}"
+
+    local PURPLE="${_LP_OPEN_ESC}$(ti_setaf 5)${_LP_CLOSE_ESC}"
+    local PINK="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 5)${_LP_CLOSE_ESC}"
+
+    local CYAN="${_LP_OPEN_ESC}$(ti_setaf 6)${_LP_CLOSE_ESC}"
+    local BOLD_CYAN="${_LP_OPEN_ESC}${ti_bold}$(ti_setaf 6)${_LP_CLOSE_ESC}"
+
+    # NO_COL is special: it will be used at runtime, not just during config loading
+    NO_COL="${_LP_OPEN_ESC}${ti_sgr0}${_LP_CLOSE_ESC}"
+
+    # compute the hash of the hostname
+    # and get the corresponding number in [1-6] (red,green,yellow,blue,purple or cyan)
+    # FIXME Add more formats (bold? 256 colors?)
+    # cksum is separated with tab on SunOS, space on others
+    local cksum="$(hostname | cksum)"
+    LP_COLOR_HOST_HASH="${_LP_OPEN_ESC}$(ti_setaf $(( 1 + ${cksum%%[ 	]*} % 6 )) )${_LP_CLOSE_ESC}"
+
+    unset ti_sgr0 ti_bold
+    unset -f ti_setaf ti_setab
+
+
+    # Default values (globals)
+    LP_BATTERY_THRESHOLD=${LP_BATTERY_THRESHOLD:-75}
+    LP_LOAD_THRESHOLD=${LP_LOAD_THRESHOLD:-60}
+    LP_TEMP_THRESHOLD=${LP_TEMP_THRESHOLD:-60}
+    LP_RUNTIME_THRESHOLD=${LP_RUNTIME_THRESHOLD:-2}
+    LP_PATH_LENGTH=${LP_PATH_LENGTH:-35}
+    LP_PATH_KEEP=${LP_PATH_KEEP:-2}
+    LP_PATH_DEFAULT="${LP_PATH_DEFAULT:-$_LP_PWD_SYMBOL}"
+    LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0}
+    LP_USER_ALWAYS=${LP_USER_ALWAYS:-1}
+    LP_PERCENTS_ALWAYS=${LP_PERCENTS_ALWAYS:-1}
+    LP_PS1=${LP_PS1:-""}
+    LP_PS1_PREFIX=${LP_PS1_PREFIX:-""}
+    LP_PS1_POSTFIX=${LP_PS1_POSTFIX:-""}
+
+    LP_ENABLE_PERM=${LP_ENABLE_PERM:-1}
+    LP_ENABLE_SHORTEN_PATH=${LP_ENABLE_SHORTEN_PATH:-1}
+    LP_ENABLE_PROXY=${LP_ENABLE_PROXY:-1}
+    LP_ENABLE_TEMP=${LP_ENABLE_TEMP:-1}
+    LP_ENABLE_JOBS=${LP_ENABLE_JOBS:-1}
+    LP_ENABLE_LOAD=${LP_ENABLE_LOAD:-1}
+    LP_ENABLE_BATT=${LP_ENABLE_BATT:-1}
+    LP_ENABLE_GIT=${LP_ENABLE_GIT:-1}
+    LP_ENABLE_SVN=${LP_ENABLE_SVN:-1}
+    LP_ENABLE_VCSH=${LP_ENABLE_VCSH:-1}
+    LP_ENABLE_FOSSIL=${LP_ENABLE_FOSSIL:-1}
+    LP_ENABLE_HG=${LP_ENABLE_HG:-1}
+    LP_ENABLE_BZR=${LP_ENABLE_BZR:-1}
+    LP_ENABLE_TIME=${LP_ENABLE_TIME:-0}
+    LP_ENABLE_RUNTIME=${LP_ENABLE_RUNTIME:-1}
+    LP_ENABLE_VIRTUALENV=${LP_ENABLE_VIRTUALENV:-1}
+    LP_ENABLE_SCLS=${LP_ENABLE_SCLS:-1}
+    LP_ENABLE_VCS_ROOT=${LP_ENABLE_VCS_ROOT:-0}
+    LP_ENABLE_TITLE=${LP_ENABLE_TITLE:-0}
+    LP_ENABLE_SCREEN_TITLE=${LP_ENABLE_SCREEN_TITLE:-0}
+    LP_ENABLE_SSH_COLORS=${LP_ENABLE_SSH_COLORS:-0}
+    LP_ENABLE_FQDN=${LP_ENABLE_FQDN:-0}
+    # LP_DISABLED_VCS_PATH="${LP_DISABLED_VCS_PATH}"
+    LP_ENABLE_SUDO=${LP_ENABLE_SUDO:-0}
+
+    LP_MARK_DEFAULT="${LP_MARK_DEFAULT:-$_LP_MARK_SYMBOL}"
+    LP_MARK_BATTERY="${LP_MARK_BATTERY:-"⌁"}"
+    LP_MARK_ADAPTER="${LP_MARK_ADAPTER:-"⏚"}"
+    LP_MARK_LOAD="${LP_MARK_LOAD:-"⌂"}"
+    LP_MARK_TEMP="${LP_MARK_TEMP:-"θ"}"
+    LP_MARK_PROXY="${LP_MARK_PROXY:-"↥"}"
+    LP_MARK_HG="${LP_MARK_HG:-"☿"}"
+    LP_MARK_SVN="${LP_MARK_SVN:-"‡"}"
+    LP_MARK_GIT="${LP_MARK_GIT:-"±"}"
+    LP_MARK_VCSH="${LP_MARK_VCSH:-"|"}"
+    LP_MARK_FOSSIL="${LP_MARK_FOSSIL:-"⌘"}"
+    LP_MARK_BZR="${LP_MARK_BZR:-"⚯"}"
+    LP_MARK_DISABLED="${LP_MARK_DISABLED:-"⌀"}"
+    LP_MARK_UNTRACKED="${LP_MARK_UNTRACKED:-"*"}"
+    LP_MARK_STASH="${LP_MARK_STASH:-"+"}"
+    LP_MARK_BRACKET_OPEN="${LP_MARK_BRACKET_OPEN:-"["}"
+    LP_MARK_BRACKET_CLOSE="${LP_MARK_BRACKET_CLOSE:-"]"}"
+    LP_MARK_SHORTEN_PATH="${LP_MARK_SHORTEN_PATH:-" … "}"
+    LP_MARK_PREFIX="${LP_MARK_PREFIX:-" "}"
+    LP_MARK_PERM="${LP_MARK_PERM:-":"}"
+
+    LP_COLOR_PATH=${LP_COLOR_PATH:-$BOLD}
+    LP_COLOR_PATH_ROOT=${LP_COLOR_PATH_ROOT:-$BOLD_YELLOW}
+    LP_COLOR_PROXY=${LP_COLOR_PROXY:-$BOLD_BLUE}
+    LP_COLOR_JOB_D=${LP_COLOR_JOB_D:-$YELLOW}
+    LP_COLOR_JOB_R=${LP_COLOR_JOB_R:-$BOLD_YELLOW}
+    LP_COLOR_JOB_Z=${LP_COLOR_JOB_Z:-$BOLD_YELLOW}
+    LP_COLOR_ERR=${LP_COLOR_ERR:-$PURPLE}
+    LP_COLOR_MARK=${LP_COLOR_MARK:-$BOLD}
+    LP_COLOR_MARK_ROOT=${LP_COLOR_MARK_ROOT:-$BOLD_RED}
+    LP_COLOR_MARK_SUDO=${LP_COLOR_MARK_SUDO:-$LP_COLOR_MARK_ROOT}
+    LP_COLOR_USER_LOGGED=${LP_COLOR_USER_LOGGED:-""}
+    LP_COLOR_USER_ALT=${LP_COLOR_USER_ALT:-$BOLD}
+    LP_COLOR_USER_ROOT=${LP_COLOR_USER_ROOT:-$BOLD_YELLOW}
+    LP_COLOR_HOST=${LP_COLOR_HOST:-""}
+    LP_COLOR_SSH=${LP_COLOR_SSH:-$BLUE}
+    LP_COLOR_SU=${LP_COLOR_SU:-$BOLD_YELLOW}
+    LP_COLOR_TELNET=${LP_COLOR_TELNET:-$WARN_RED}
+    LP_COLOR_X11_ON=${LP_COLOR_X11_ON:-$GREEN}
+    LP_COLOR_X11_OFF=${LP_COLOR_X11_OFF:-$YELLOW}
+    LP_COLOR_WRITE=${LP_COLOR_WRITE:-$GREEN}
+    LP_COLOR_NOWRITE=${LP_COLOR_NOWRITE:-$RED}
+    LP_COLOR_UP=${LP_COLOR_UP:-$GREEN}
+    LP_COLOR_COMMITS=${LP_COLOR_COMMITS:-$YELLOW}
+    LP_COLOR_COMMITS_BEHIND=${LP_COLOR_COMMITS_BEHIND:-$BOLD_RED}
+    LP_COLOR_CHANGES=${LP_COLOR_CHANGES:-$RED}
+    LP_COLOR_DIFF=${LP_COLOR_DIFF:-$PURPLE}
+    LP_COLOR_CHARGING_ABOVE=${LP_COLOR_CHARGING_ABOVE:-$GREEN}
+    LP_COLOR_CHARGING_UNDER=${LP_COLOR_CHARGING_UNDER:-$YELLOW}
+    LP_COLOR_DISCHARGING_ABOVE=${LP_COLOR_DISCHARGING_ABOVE:-$YELLOW}
+    LP_COLOR_DISCHARGING_UNDER=${LP_COLOR_DISCHARGING_UNDER:-$RED}
+    LP_COLOR_TIME=${LP_COLOR_TIME:-$BLUE}
+    LP_COLOR_IN_MULTIPLEXER=${LP_COLOR_IN_MULTIPLEXER:-$BOLD_BLUE}
+    LP_COLOR_RUNTIME=${LP_COLOR_RUNTIME:-$YELLOW}
+    LP_COLOR_VIRTUALENV=${LP_COLOR_VIRTUALENV:-$CYAN}
+
+    if [[ -z "${LP_COLORMAP-}" ]]; then
+        LP_COLORMAP=(
+            ""               # 0
+            "$GREEN"         # 1
+            "$BOLD_GREEN"    # 2
+            "$YELLOW"        # 3
+            "$BOLD_YELLOW"   # 4
+            "$RED"           # 5
+            "$BOLD_RED"      # 6
+            "$WARN_RED"      # 7
+            "$CRIT_RED"      # 8
+            "$DANGER_RED"    # 9
+        )
+    fi
+
+    # Debugging flags
+    LP_DEBUG_TIME=${LP_DEBUG_TIME:-0}
+
+
+    local configfile
+
+    # Default config file may be the XDG standard ~/.config/liquidpromptrc,
+    # but heirloom dotfile has priority.
+
+    if [[ -f "$HOME/.liquidpromptrc" ]]; then
+        configfile="$HOME/.liquidpromptrc"
+    else
+        local first
+        local search
+        # trailing ":" is so that ${search#*:} always removes something
+        search="${XDG_CONFIG_HOME:-"$HOME/.config"}:${XDG_CONFIG_DIRS:-/etc/xdg}:"
+        while [[ -n "$search" ]]; do
+            first="${search%%:*}"
+            search="${search#*:}"
+            if [[ -f "$first/liquidpromptrc" ]]; then
+                configfile="$first/liquidpromptrc"
+                break
+            fi
+        done
+    fi
+
+    if [[ -n "$configfile" ]]; then
+        source "$configfile"
+    elif [[ -f "/etc/liquidpromptrc" ]]; then
+        source "/etc/liquidpromptrc"
+    fi
+
+    # Delete this code in version 1.11
+    if [[ -n "${LP_COLORMAP_1-}" ]]; then
+        echo "liquidprompt: LP_COLORMAP_x variables are deprecated. Update your theme to use LP_COLORMAP array." >&2
+        LP_COLORMAP=(
+            "$LP_COLORMAP_0"
+            "$LP_COLORMAP_1"
+            "$LP_COLORMAP_2"
+            "$LP_COLORMAP_3"
+            "$LP_COLORMAP_4"
+            "$LP_COLORMAP_5"
+            "$LP_COLORMAP_6"
+            "$LP_COLORMAP_7"
+            "$LP_COLORMAP_8"
+            "$LP_COLORMAP_9"
+        )
+        unset LP_COLORMAP_0 LP_COLORMAP_1 LP_COLORMAP_2 LP_COLORMAP_3 LP_COLORMAP_4 \
+              LP_COLORMAP_5 LP_COLORMAP_6 LP_COLORMAP_7 LP_COLORMAP_8 LP_COLORMAP_9
+    fi
+}
+# do source config files
+_lp_source_config
+unset -f _lp_source_config
+
+# Disable feature if the tool is not installed
+_lp_require_tool()
+{
+    (( LP_ENABLE_$1 )) && { command -v $2 >/dev/null || eval LP_ENABLE_$1=0 ; }
+}
+
+_lp_require_tool GIT git
+_lp_require_tool SVN svn
+_lp_require_tool FOSSIL fossil
+_lp_require_tool HG hg
+_lp_require_tool BZR bzr
+
+if [[ "$LP_OS" = Darwin ]]; then
+    _lp_require_tool BATT pmset
+else
+    _lp_require_tool BATT acpi
+fi
+
+unset -f _lp_require_tool
+
+if (( LP_ENABLE_JOBS )); then
+    typeset -i _LP_ENABLE_DETACHED_SESSION _LP_ENABLE_SCREEN _LP_ENABLE_TMUX
+    command -v screen >/dev/null ; _LP_ENABLE_SCREEN=!$?
+    command -v tmux >/dev/null   ; _LP_ENABLE_TMUX=!$?
+    (( _LP_ENABLE_DETACHED_SESSIONS = ( _LP_ENABLE_SCREEN || _LP_ENABLE_TMUX ) ))
+fi
+
+# Use standard path symbols inside Midnight Commander
+[[ -n "${MC_SID-}" ]] && LP_ENABLE_SHORTEN_PATH=0
+
+# If we are running in a terminal multiplexer, brackets are colored
+if [[ "$TERM" == screen* ]]; then
+    LP_BRACKET_OPEN="${LP_COLOR_IN_MULTIPLEXER}${LP_MARK_BRACKET_OPEN}${NO_COL}"
+    LP_BRACKET_CLOSE="${LP_COLOR_IN_MULTIPLEXER}${LP_MARK_BRACKET_CLOSE}${NO_COL}"
+    (( LP_ENABLE_TITLE = LP_ENABLE_TITLE && LP_ENABLE_SCREEN_TITLE ))
+    LP_TITLE_OPEN="$(printf '\033k')"
+    # "\e\" but on bash \ must be escaped
+    LP_TITLE_CLOSE="$(printf '\033%s' "$_LP_BACKSLASH")"
+else
+    LP_BRACKET_OPEN="${LP_MARK_BRACKET_OPEN}"
+    LP_BRACKET_CLOSE="${LP_MARK_BRACKET_CLOSE}"
+    LP_TITLE_OPEN="$(printf '\e]0;')"
+    LP_TITLE_CLOSE="$(printf '\a')"
+fi
+
+[[ "_$TERM" == _linux* ]] && LP_ENABLE_TITLE=0
+
+# update_terminal_cwd is a shell function available on MacOS X Lion that
+# will update an icon of the directory displayed in the title of the terminal
+# window.
+# See http://hints.macworld.com/article.php?story=20110722211753852
+if [[ "${TERM_PROGRAM-}" == Apple_Terminal ]] && command -v update_terminal_cwd >/dev/null; then
+    _LP_TERM_UPDATE_DIR=update_terminal_cwd
+    # Remove "update_terminal_cwd; " that has been add by Apple in /et/bashrc.
+    # See issue #196
+    PROMPT_COMMAND="${PROMPT_COMMAND//update_terminal_cwd; /}"
+else
+    _LP_TERM_UPDATE_DIR=:
+fi
+
+# Default value for LP_PERM when LP_ENABLE_PERM is 0
+LP_PERM=${LP_MARK_PERM}   # without color
+
+# Same as bash '\l', but inlined as a constant as the value will not change
+# during the shell's life
+LP_TTYN="$(basename -- "$(tty)" 2>/dev/null)"
+
+
+
+###############
+# Who are we? #
+###############
+command -v _lp_sudo_check >/dev/null && unset -f _lp_sudo_check
+
+# Yellow for root, bold if the user is not the login one, else no color.
+if (( EUID != 0 )); then  # if user is not root
+    # if user is not login user
+    if [[ "${USER}" != "$(logname 2>/dev/null || echo "$LOGNAME")" ]]; then
+        LP_USER="${LP_COLOR_USER_ALT}${_LP_USER_SYMBOL}${NO_COL}"
+    elif (( LP_USER_ALWAYS )); then
+        LP_USER="${LP_COLOR_USER_LOGGED}${_LP_USER_SYMBOL}${NO_COL}"
+    else
+        LP_USER=""
+    fi
+    # "sudo -n" is only supported from sudo 1.7.0
+    if (( LP_ENABLE_SUDO )) \
+            && command -v sudo >/dev/null \
+            && LC_MESSAGES=C sudo -V | GREP_OPTIONS= \grep -qE '^Sudo version (1(\.([789]\.|[1-9][0-9])|[0-9])|[2-9])'
+    then
+        LP_COLOR_MARK_NO_SUDO="$LP_COLOR_MARK"
+        # Test the code with the commands:
+        #   sudo id   # sudo, enter your credentials
+        #   sudo -K   # revoke your credentials
+        _lp_sudo_check()
+        {
+            if sudo -n true 2>/dev/null; then
+                LP_COLOR_MARK=$LP_COLOR_MARK_SUDO
+            else
+                LP_COLOR_MARK=$LP_COLOR_MARK_NO_SUDO
+            fi
+        }
+    fi
+else # root!
+    LP_USER="${LP_COLOR_USER_ROOT}${_LP_USER_SYMBOL}${NO_COL}"
+    LP_COLOR_MARK="${LP_COLOR_MARK_ROOT}"
+    LP_COLOR_PATH="${LP_COLOR_PATH_ROOT}"
+    # Disable VCS info for all paths
+    if (( ! LP_ENABLE_VCS_ROOT )); then
+        LP_DISABLED_VCS_PATH=/
+        LP_MARK_DISABLED="$LP_MARK_DEFAULT"
+    fi
+fi
+
+# Empty _lp_sudo_check if root or sudo disabled
+if ! command -v _lp_sudo_check >/dev/null; then
+    _lp_sudo_check() { :; }
+fi
+
+
+#################
+# Where are we? #
+#################
+
+_lp_connection()
+{
+    if [[ -n "${SSH_CLIENT-}${SSH2_CLIENT-}${SSH_TTY-}" ]]; then
+        echo ssh
+    else
+        # tmux: see GH #304
+        # TODO check on *BSD
+        local whoami="$(LANG=C who am i)"
+        local sess_parent="$(ps -o comm= -p $PPID 2> /dev/null)"
+        if [[ x"$whoami" != *'('* || x"$whoami" = *'(:'* || x"$whoami" = *'(tmux'* ]]; then
+            echo lcl  # Local
+        elif [[ "$sess_parent" = "su" || "$sess_parent" = "sudo" ]]; then
+            echo su   # Remote su/sudo
+        else
+            echo tel  # Telnet
+        fi
+    fi
+}
+
+# Put the hostname if not locally connected
+# color it in cyan within SSH, and a warning red if within telnet
+# else display the host without color
+# The connection is not expected to change from inside the shell, so we
+# build this just once
+LP_HOST=""
+
+# Only process hostname elements if we haven't turned them off
+if (( LP_HOSTNAME_ALWAYS != -1 )); then
+
+    [[ -r /etc/debian_chroot ]] && LP_HOST="($(< /etc/debian_chroot))"
+
+    # Which host symbol should we use?
+    if (( LP_ENABLE_FQDN )); then
+        LP_HOST_SYMBOL="${_LP_FQDN_SYMBOL}"
+    else
+        LP_HOST_SYMBOL="${_LP_HOST_SYMBOL}"
+    fi
+
+    # If we are connected with a X11 support
+    if [[ -n "$DISPLAY" ]]; then
+        LP_HOST="${LP_COLOR_X11_ON}${LP_HOST}@${NO_COL}"
+    else
+        LP_HOST="${LP_COLOR_X11_OFF}${LP_HOST}@${NO_COL}"
+    fi
+
+    case "$(_lp_connection)" in
+    lcl)
+        if (( LP_HOSTNAME_ALWAYS )); then
+            LP_HOST+="${LP_COLOR_HOST}${LP_HOST_SYMBOL}${NO_COL}"
+        else
+            # FIXME do we want to display the chroot if local?
+            LP_HOST="" # no hostname if local
+        fi
+        ;;
+    ssh)
+        # If we want a different color for each host
+        (( LP_ENABLE_SSH_COLORS )) && LP_COLOR_SSH="$LP_COLOR_HOST_HASH"
+        LP_HOST+="${LP_COLOR_SSH}${LP_HOST_SYMBOL}${NO_COL}"
+        ;;
+    su)
+        LP_HOST+="${LP_COLOR_SU}${LP_HOST_SYMBOL}${NO_COL}"
+        ;;
+    tel)
+        LP_HOST+="${LP_COLOR_TELNET}${LP_HOST_SYMBOL}${NO_COL}"
+        ;;
+    *)
+        LP_HOST+="${LP_HOST_SYMBOL}" # defaults to no color
+        ;;
+    esac
+
+fi
+
+# Useless now, so undefine
+unset -f _lp_connection
+
+
+_lp_get_home_tilde_collapsed()
+{
+    local tilde="~"
+    echo "${PWD/#$HOME/$tilde}"
+}
+
+# Shorten the path of the current working directory
+# * Show only the current directory
+# * Show as much of the cwd path as possible, if shortened display a
+#   leading mark, such as ellipses, to indicate that part is missing
+# * show at least LP_PATH_KEEP leading dirs and current directory
+_lp_shorten_path()
+{
+
+    if (( ! LP_ENABLE_SHORTEN_PATH )); then
+        # We are not supposed to come here often as this case is already
+        # optimized at install time
+        LP_PWD="${LP_COLOR_PATH}${LP_PATH_DEFAULT}$NO_COL"
+        return
+    fi
+
+    local ret=
+
+    local p="$(_lp_get_home_tilde_collapsed)"
+    local mask="${LP_MARK_SHORTEN_PATH}"
+    local -i max_len=$(( ${COLUMNS:-80} * LP_PATH_LENGTH / 100 ))
+
+    if (( LP_PATH_KEEP == -1 )); then
+        # only show the current directory, excluding any parent dirs
+        ret="${p##*/}" # discard everything up to and including the last slash
+        [[ "${ret}" == "" ]] && ret="/" # if in root directory
+    elif (( ${#p} <= max_len )); then
+        ret="${p}"
+    elif (( LP_PATH_KEEP == 0 )); then
+        # len is over max len, show as much of the tail as is allowed
+        ret="${p##*/}" # show at least complete current directory
+        p="${p:0:${#p} - ${#ret}}"
+        ret="${mask}${p:${#p} - (${max_len} - ${#ret} - ${#mask})}${ret}"
+    else
+        # len is over max len, show at least LP_PATH_KEEP leading dirs and
+        # current directory
+        local tmp="${p//\//}"
+        local -i delims=$(( ${#p} - ${#tmp} ))
+
+        for (( dir=0; dir < LP_PATH_KEEP; dir++ )); do
+            (( dir == delims )) && break
+
+            local left="${p#*/}"
+            local name="${p:0:${#p} - ${#left}}"
+            p="${left}"
+            ret+="${name%/}/"
+        done
+
+        if (( delims <= LP_PATH_KEEP )); then
+            # no dirs between LP_PATH_KEEP leading dirs and current dir
+            ret+="${p##*/}"
+        else
+            local base="${p##*/}"
+
+            p="${p:0:${#p} - ${#base}}"
+
+            [[ ${ret} != "/" ]] && ret="${ret%/}" # strip trailing slash
+
+            local -i len_left=$(( max_len - ${#ret} - ${#base} - ${#mask} ))
+
+            ret+="${mask}${p:${#p} - ${len_left}}${base}"
+        fi
+    fi
+    # Escape special chars
+    LP_PWD="${LP_COLOR_PATH}$(_lp_escape "$ret")$NO_COL"
+}
+
+if (( LP_ENABLE_SHORTEN_PATH )); then
+    if (( LP_PATH_KEEP == -1 )); then
+        # _lp_shorten_path becomes a noop
+        _lp_shorten_path()
+        {
+            :
+        }
+        # Will never change
+        LP_PWD="${LP_COLOR_PATH}${_LP_DIR_SYMBOL}$NO_COL"
+    fi
+else
+    # Will never change
+    LP_PWD="${LP_COLOR_PATH}${LP_PATH_DEFAULT}$NO_COL"
+
+    if $_LP_SHELL_bash && [[ -n "$PROMPT_DIRTRIM" ]]; then
+        unset -f _lp_shorten_path
+        alias _lp_shorten_path=_lp_set_dirtrim
+    fi
+fi
+
+
+# In Bash shells, PROMPT_DIRTRIM is the number of directories to keep at the end
+# of the displayed path (if "\w" is present in the PS1 var).
+# Liquid Prompt can calculate this number under two conditions, path shortening
+# must be disabled and PROMPT_DIRTRIM must be already set.
+_lp_set_dirtrim() {
+    local p="$(_lp_get_home_tilde_collapsed)"
+    local -i max_len="${COLUMNS:-80}*$LP_PATH_LENGTH/100"
+    local -i dt=0
+
+    if (( ${#p} > max_len )); then
+        local q="/${p##*/}"
+        local show="$q"
+        # +3 because of the ellipsis: "..."
+        while (( ${#show}+3 < max_len )); do
+            (( dt++ ))
+            p="${p%$q}"
+            q="/${p##*/}"
+            show="$q$show"
+        done
+        (( dt == 0 )) && dt=1
+    fi
+    PROMPT_DIRTRIM=$dt
+    # For debugging
+    # echo PROMPT_DIRTRIM=$PROMPT_DIRTRIM >&2
+}
+
+
+
+################
+# Related jobs #
+################
+
+# Display the count of each if non-zero:
+# - detached screens sessions and/or tmux sessions running on the host
+# - attached running jobs (started with $ myjob &)
+# - attached stopped jobs (suspended with Ctrl-Z)
+_lp_jobcount_color()
+{
+    (( LP_ENABLE_JOBS )) || return
+
+    local ret=""
+    local -i r s
+
+    # Count detached sessions
+    if (( _LP_ENABLE_DETACHED_SESSIONS )); then
+        local -i detached=0
+        (( _LP_ENABLE_SCREEN )) && detached=$(screen -ls 2> /dev/null | \grep -c '[Dd]etach[^)]*)$')
+        (( _LP_ENABLE_TMUX )) && detached+=$(tmux list-sessions 2> /dev/null | \grep -cv 'attached')
+        (( detached > 0 )) && ret+="${LP_COLOR_JOB_D}${detached}d${NO_COL}"
+    fi
+
+    # Count running jobs
+    if (( r = $(jobs -r | wc -l) )); then
+        [[ -n "$ret" ]] && ret+='/'
+        ret+="${LP_COLOR_JOB_R}${r}&${NO_COL}"
+    fi
+
+    # Count stopped jobs
+    if (( s = $(jobs -s | wc -l) )); then
+        [[ -n "$ret" ]] && ret+='/'
+        ret+="${LP_COLOR_JOB_Z}${s}z${NO_COL}"
+    fi
+
+    echo -nE "$ret"
+}
+
+
+
+######################
+# VCS branch display #
+######################
+
+_lp_are_vcs_enabled()
+{
+    [[ -z "$LP_DISABLED_VCS_PATH" ]] && return 0
+    $_LP_SHELL_zsh && setopt local_options && setopt sh_word_split
+    local path
+    local IFS=:
+    for path in $LP_DISABLED_VCS_PATH; do
+        [[ "$PWD" == *"$path"* ]] && return 1
+    done
+    return 0
+}
+
+# GIT #
+
+# Get the branch name of the current directory
+_lp_git_branch()
+{
+    (( LP_ENABLE_GIT )) || return
+
+    \git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return
+
+    local branch
+    # Recent versions of Git support the --short option for symbolic-ref, but
+    # not 1.7.9 (Ubuntu 12.04)
+    if branch="$(\git symbolic-ref -q HEAD)"; then
+        _lp_escape "${branch#refs/heads/}"
+    else
+        # In detached head state, use commit instead
+        # No escape needed
+        \git rev-parse --short -q HEAD
+    fi
+}
+
+
+# Display additional information if HEAD is in merging, rebasing
+# or cherry-picking state
+_lp_git_head_status() {
+    local gitdir
+    gitdir="$(\git rev-parse --git-dir 2>/dev/null)"
+    if [[ -f "${gitdir}/MERGE_HEAD" ]]; then
+        echo " MERGING"
+    elif [[ -d "${gitdir}/rebase-apply" || -d "${gitdir}/rebase-merge" ]]; then
+        echo " REBASING"
+    elif [[ -f "${gitdir}/CHERRY_PICK_HEAD" ]]; then
+        echo " CHERRY-PICKING"
+    fi
+}
+
+# Set a color depending on the branch state:
+# - green if the repository is up to date
+# - yellow if there is some commits not pushed
+# - red if there is changes to commit
+#
+# Add the number of pending commits and the impacted lines.
+_lp_git_branch_color()
+{
+    (( LP_ENABLE_GIT )) || return
+
+    local branch
+    branch="$(_lp_git_branch)"
+    if [[ -n "$branch" ]]; then
+
+        local end
+        end="${LP_COLOR_CHANGES}$(_lp_git_head_status)${NO_COL}"
+
+        if LC_ALL=C \git status --porcelain 2>/dev/null | \grep -q '^\?\?'; then
+            end="$LP_COLOR_CHANGES$LP_MARK_UNTRACKED$end"
+        fi
+
+        # Show if there is a git stash
+        if \git rev-parse --verify -q refs/stash >/dev/null; then
+            end="$LP_COLOR_COMMITS$LP_MARK_STASH$end"
+        fi
+
+        local remote
+        remote="$(\git config --get branch.${branch}.remote 2>/dev/null)"
+
+        local has_commit=""
+        local commit_ahead
+        local commit_behind
+        if [[ -n "$remote" ]]; then
+            local remote_branch
+            remote_branch="$(\git config --get branch.${branch}.merge)"
+            if [[ -n "$remote_branch" ]]; then
+                remote_branch=${remote_branch/refs\/heads/refs\/remotes\/$remote}
+                commit_ahead="$(\git rev-list --count $remote_branch..HEAD 2>/dev/null)"
+                commit_behind="$(\git rev-list --count HEAD..$remote_branch 2>/dev/null)"
+                if [[ "$commit_ahead" -ne "0" && "$commit_behind" -ne "0" ]]; then
+                    has_commit="${LP_COLOR_COMMITS}+$commit_ahead${NO_COL}/${LP_COLOR_COMMITS_BEHIND}-$commit_behind${NO_COL}"
+                elif [[ "$commit_ahead" -ne "0" ]]; then
+                    has_commit="${LP_COLOR_COMMITS}$commit_ahead${NO_COL}"
+                elif [[ "$commit_behind" -ne "0" ]]; then
+                    has_commit="${LP_COLOR_COMMITS_BEHIND}-$commit_behind${NO_COL}"
+                fi
+            fi
+        fi
+
+        local ret
+        local shortstat # only to check for uncommitted changes
+        shortstat="$(LC_ALL=C \git diff --shortstat HEAD 2>/dev/null)"
+
+        if [[ -n "$shortstat" ]]; then
+            local u_stat # shorstat of *unstaged* changes
+            u_stat="$(LC_ALL=C \git diff --shortstat 2>/dev/null)"
+            u_stat=${u_stat/*changed, /} # removing "n file(s) changed"
+
+            local i_lines # inserted lines
+            if [[ "$u_stat" = *insertion* ]]; then
+                i_lines=${u_stat/ inser*}
+            else
+                i_lines=0
+            fi
+
+            local d_lines # deleted lines
+            if [[ "$u_stat" = *deletion* ]]; then
+                d_lines=${u_stat/*\(+\), }
+                d_lines=${d_lines/ del*/}
+            else
+                d_lines=0
+            fi
+
+            local has_lines
+            has_lines="+$i_lines/-$d_lines"
+
+            if [[ -n "$has_commit" ]]; then
+                # Changes to commit and commits to push
+                ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$has_lines${NO_COL},$has_commit)"
+            else
+                ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$has_lines${NO_COL})" # changes to commit
+            fi
+        elif [[ -n "$has_commit" ]]; then
+            # some commit(s) to push
+            if [[ "$commit_behind" -gt "0" ]]; then
+                ret="${LP_COLOR_COMMITS_BEHIND}${branch}${NO_COL}($has_commit)"
+            else
+                ret="${LP_COLOR_COMMITS}${branch}${NO_COL}($has_commit)"
+            fi
+        else
+            ret="${LP_COLOR_UP}${branch}" # nothing to commit or push
+        fi
+        echo -nE "$ret$end"
+    fi
+}
+
+# Search upwards through a directory structure looking for a file/folder with
+# the given name.  Used to avoid invoking 'hg' and 'bzr'.
+_lp_upwards_find()
+{
+    local dir
+    dir="$PWD"
+    while [[ -n "$dir" ]]; do
+        [[ -d "$dir/$1" ]] && return 0
+        dir="${dir%/*}"
+    done
+    return 1
+}
+
+# MERCURIAL #
+
+# Get the branch name of the current directory
+_lp_hg_branch()
+{
+    (( LP_ENABLE_HG )) || return
+
+    # First do a simple search to avoid having to invoke hg -- at least on my
+    # machine, the python startup causes a noticeable hitch when changing
+    # directories.
+    _lp_upwards_find .hg || return
+
+    # We found an .hg folder, so we need to invoke hg and see if we're actually
+    # in a repository.
+
+    local branch
+    branch="$(hg branch 2>/dev/null)"
+
+    (( $? == 0 )) && _lp_escape "$branch"
+}
+
+# Set a color depending on the branch state:
+# - green if the repository is up to date
+# - red if there is changes to commit
+# - TODO: yellow if there is some commits not pushed
+_lp_hg_branch_color()
+{
+    (( LP_ENABLE_HG )) || return
+
+    local branch
+    local ret
+    branch="$(_lp_hg_branch)"
+    if [[ -n "$branch" ]]; then
+
+        local has_untracked
+        has_untracked=
+        if hg status -u 2>/dev/null | \grep -q '^\?' >/dev/null ; then
+            has_untracked="$LP_COLOR_CHANGES$LP_MARK_UNTRACKED"
+        fi
+
+        # Count local commits waiting for a push
+        #
+        # Unfortunately this requires contacting the remote, so this is always slow
+        # => disabled  https://github.com/nojhan/liquidprompt/issues/217
+        local -i commits
+        #commits=$(hg outgoing --no-merges ${branch} 2>/dev/null | \grep -c '\(^changeset\:\)')
+        commits=0
+
+        # Check if there is some uncommitted stuff
+        if [[ -z "$(hg status --quiet -n)" ]]; then
+            if (( commits > 0 )); then
+                # some commit(s) to push
+                ret="${LP_COLOR_COMMITS}${branch}${NO_COL}(${LP_COLOR_COMMITS}$commits${NO_COL})${has_untracked}${NO_COL}"
+            else
+                # nothing to commit or push
+                ret="${LP_COLOR_UP}${branch}${has_untracked}${NO_COL}"
+            fi
+        else
+            local has_lines
+            # Parse the last line of the diffstat-style output
+            has_lines="$(hg diff --stat 2>/dev/null | sed -n '$ s!^.*, \([0-9]*\) .*, \([0-9]*\).*$!+\1/-\2!p')"
+            if (( commits > 0 )); then
+                # Changes to commit and commits to push
+                ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$has_lines${NO_COL},${LP_COLOR_COMMITS}$commits${NO_COL})${has_untracked}${NO_COL}"
+            else
+                ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$has_lines${NO_COL})${has_untracked}${NO_COL}" # changes to commit
+            fi
+        fi
+        echo -nE "$ret"
+    fi
+}
+
+# SUBVERSION #
+
+# Get the branch name of the current directory
+# For the first level of the repository, gives the repository name
+_lp_svn_branch()
+{
+    (( LP_ENABLE_SVN )) || return
+
+    local root=
+    local url=
+    eval "$(LANG=C LC_ALL=C svn info 2>/dev/null | sed -n 's/^URL: \(.*\)/url="\1"/p;s/^Repository Root: \(.*\)/root="\1"/p' )"
+    [[ -z "${root-}" ]] && return
+
+    # Make url relative to root
+    url="${url:${#root}}"
+    if [[ "$url" == */trunk* ]]; then
+        echo -n trunk
+    elif [[ "$url" == */branches/?* ]]; then
+        url="${url##*/branches/}"
+        _lp_escape "${url%/*}"
+    elif [[ "$url" == */tags/?* ]]; then
+        url="${url##*/tags/}"
+        _lp_escape "${url%/*}"
+    else
+        _lp_escape "${root##*/}"
+    fi
+}
+
+# Set a color depending on the branch state:
+# - green if the repository is clean
+#   (use $LP_SVN_STATUS_OPTIONS to define what that means with
+#    the --depth option of 'svn status')
+# - red if there is changes to commit
+# Note that, due to subversion way of managing changes,
+# informations are only displayed for the CURRENT directory.
+_lp_svn_branch_color()
+{
+    (( LP_ENABLE_SVN )) || return
+
+    local branch
+    branch="$(_lp_svn_branch)"
+    if [[ -n "$branch" ]]; then
+        local changes
+        changes=$(( $(svn status ${LP_SVN_STATUS_OPTIONS-} | \grep -c -v "?") ))
+        if (( changes == 0 )); then
+            echo -nE "${LP_COLOR_UP}${branch}${NO_COL}"
+        else
+            echo -nE "${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_DIFF}$changes${NO_COL})" # changes to commit
+        fi
+    fi
+}
+
+
+# FOSSIL #
+
+# Get the tag name of the current directory
+_lp_fossil_branch()
+{
+    (( LP_ENABLE_FOSSIL )) || return
+    local branch
+    branch=$(fossil branch list 2>/dev/null | sed -n -$_LP_SED_EXTENDED 's/^\*\s+(\w*)$/\1/p')
+    if [[ -n "$branch" ]]; then
+        echo -nE "$branch"
+    elif fossil info &>/dev/null ; then
+        echo -n "no-branch"
+    fi
+}
+
+# Set a color depending on the branch state:
+# - green if the repository is clean
+# - red if there is changes to commit
+# - yellow if the branch has no tag name
+#
+# Add the number of impacted files with a
+# + when files are ADDED or EDITED
+# - when files are DELETED
+_lp_fossil_branch_color()
+{
+    (( LP_ENABLE_FOSSIL )) || return
+
+    local branch
+    branch="$(_lp_fossil_branch)"
+
+    if [[ -n "$branch" ]]; then
+        local -i C2E # Modified files (added or edited)
+        local C2A # Extras files
+        local ret
+        C2E=$(fossil changes | wc -l)
+        C2A=$(fossil extras | wc -l)
+        ret=$(fossil diff -i -v | awk '
+            /^(\+[^+])|(\+$)/ { plus+=1 }
+            /^(-[^-])|(-$)/ { minus+=1 }
+            END {
+                total=""
+                if (plus>0) {
+                    total="+"plus
+                    if(minus>0) total=total"/"
+                }
+                if (minus>0) {
+                    total=total"-"minus
+                }
+                print total
+            }')
+
+        if (( C2E > 0 )); then
+            [[ -n "$ret" ]] && ret+=" in "
+            ret="(${LP_COLOR_DIFF}${ret}${C2E}${NO_COL})"
+        fi
+
+        if (( C2A > 0 )); then
+            C2A="$LP_COLOR_CHANGES$LP_MARK_UNTRACKED"
+        else
+            C2A=""
+        fi
+
+        if [[ "$branch" = "no-tag" ]]; then
+            # Warning, your branch has no tag name !
+            branch="${LP_COLOR_COMMITS}$branch${NO_COL}$ret${LP_COLOR_COMMITS}$C2A${NO_COL}"
+        elif (( C2E == 0 )); then
+            # All is up-to-date
+            branch="${LP_COLOR_UP}$branch$C2A${NO_COL}"
+        else
+            # There're some changes to commit
+            branch="${LP_COLOR_CHANGES}$branch${NO_COL}$ret${LP_COLOR_CHANGES}$C2A${NO_COL}"
+        fi
+        echo -nE "$branch"
+    fi
+}
+
+# Bazaar #
+
+# Get the branch name of the current directory
+_lp_bzr_branch()
+{
+    (( LP_ENABLE_BZR )) || return
+
+    # First do a simple search to avoid having to invoke bzr -- at least on my
+    # machine, the python startup causes a noticeable hitch when changing
+    # directories.
+    _lp_upwards_find .bzr || return
+
+    # We found an .bzr folder, so we need to invoke bzr and see if we're
+    # actually in a repository.
+
+    local branch
+    branch="$(bzr nick 2> /dev/null)"
+    (( $? != 0 )) && return
+    _lp_escape "$branch"
+}
+
+
+# Set a color depending on the branch state:
+# - green if the repository is up to date
+# - red if there is changes to commit
+# - TODO: yellow if there is some commits not pushed
+#
+# Add the number of pending commits and the impacted lines.
+_lp_bzr_branch_color()
+{
+    (( LP_ENABLE_BZR )) || return
+
+    # First do a simple search to avoid having to invoke bzr -- at least on my
+    # machine, the python startup causes a noticeable hitch when changing
+    # directories.
+    _lp_upwards_find .bzr || return
+
+    # We found an .bzr folder, so we need to invoke bzr and see if we're
+    # actually in a repository.
+
+    local output
+    output="$(bzr version-info --check-clean --custom --template='{branch_nick} {revno} {clean}' 2> /dev/null)"
+    (( $? != 0 )) && return
+    $_LP_SHELL_zsh && setopt local_options && setopt sh_word_split
+    local tuple
+    tuple=($output)
+    $_LP_SHELL_zsh && unsetopt sh_word_split
+    local branch=${tuple[_LP_FIRST_INDEX+0]}
+    local revno=${tuple[_LP_FIRST_INDEX+1]}
+    local clean=${tuple[_LP_FIRST_INDEX+2]}
+    local ret=
+
+    if [[ -n "$branch" ]]; then
+        if (( clean == 0 )); then
+            ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_COMMITS}$revno${NO_COL})"
+        else
+            ret="${LP_COLOR_UP}${branch}${NO_COL}(${LP_COLOR_COMMITS}$revno${NO_COL})"
+        fi
+
+    fi
+    echo -nE "$ret"
+}
+
+
+####################
+# Wifi link status #
+####################
+_lp_wifi()
+{
+    # Linux
+    sed -n '3s/^ *[^ ]*  *[^ ]*  *\([0-9]*\).*/\1/p' /proc/net/wireless
+}
+
+##################
+# Battery status #
+##################
+
+# Get the battery status in percent
+# returns 0 (and battery level) if battery is discharging and under threshold
+# returns 1 (and battery level) if battery is discharging and above threshold
+# returns 2 (and battery level) if battery is charging but under threshold
+# returns 3 (and battery level) if battery is charging and above threshold
+# returns 4 if no battery support
+case "$LP_OS" in
+    Linux)
+    _lp_battery()
+    {
+        (( LP_ENABLE_BATT )) || return 4
+        local acpi
+        acpi="$(acpi --battery 2>/dev/null)"
+        # Extract the battery load value in percent
+        # First, remove the beginning of the line...
+        local bat="${acpi#Battery *, }"
+        bat="${bat%%%*}" # remove everything starting at '%'
+
+        if [[ -z "${bat}" ]]; then
+            # no battery level found
+            return 4
+        fi
+        echo -nE "$bat"
+        # discharging
+        if [[ "$acpi" == *"Discharging"* ]]; then
+            # under => 0, above => 1
+            return $(( bat > LP_BATTERY_THRESHOLD ))
+        # charging
+        else
+            # under => 2, above => 3
+            return $(( 1 + ( bat > LP_BATTERY_THRESHOLD ) ))
+        fi
+    }
+    ;;
+    Darwin)
+    _lp_battery()
+    {
+        (( LP_ENABLE_BATT )) || return 4
+        local percent batt_status
+        eval "$(pmset -g batt | sed -n 's/^ -InternalBattery[^	 ]*[	 ]\([0-9]*[0-9]\)%; \([^;]*\).*$/percent=\1 batt_status='\'\\2\'/p)"
+        case "$batt_status" in
+            charged | "")
+            return 4
+            ;;
+            discharging)
+                echo -nE "$percent"
+                # under => 0, above => 1
+                return $(( percent > LP_BATTERY_THRESHOLD ))
+            ;;
+            *)  # "charging", "AC attached"
+                echo -nE "$percent"
+                # under => 2, above => 3
+                return $(( 1 + ( percent > LP_BATTERY_THRESHOLD ) ))
+            ;;
+        esac
+    }
+    ;;
+esac
+
+# Compute a gradient of background/foreground colors depending on the battery status
+# Display:
+# a  green ⏚ if the battery is charging    and above threshold
+# a yellow ⏚ if the battery is charging    and under threshold
+# a yellow ⌁ if the battery is discharging but above threshold
+# a    red ⌁ if the battery is discharging and above threshold
+_lp_battery_color()
+{
+    (( LP_ENABLE_BATT )) || return
+
+    local mark=$LP_MARK_BATTERY
+    local chargingmark=$LP_MARK_ADAPTER
+    local -i bat ret
+    bat="$(_lp_battery)"
+    ret=$?
+
+    if (( ret == 4 || bat == 100 )); then
+        # no battery support or battery full: nothing displayed
+        :
+    elif (( ret == 3 && bat != 100 )); then
+        # charging and above threshold and not 100%
+        # green ⏚
+        echo -nE "${LP_COLOR_CHARGING_ABOVE}$chargingmark${NO_COL}"
+    elif (( ret == 2 )); then
+        # charging but under threshold
+        # yellow ⏚
+        echo -nE "${LP_COLOR_CHARGING_UNDER}$chargingmark${NO_COL}"
+    elif (( ret == 1 )); then
+        # discharging but above threshold
+        # yellow ⌁
+        echo -nE "${LP_COLOR_DISCHARGING_ABOVE}$mark${NO_COL}"
+    # discharging and under threshold
+    else
+        local res
+        res="${LP_COLOR_DISCHARGING_UNDER}${mark}${NO_COL}"
+
+        if (( LP_PERCENTS_ALWAYS )); then
+            local -i idx
+            if   (( bat <=  0 )); then
+                idx=0
+            elif (( bat <=  5 )); then         #  5
+                idx=9
+            elif (( bat <= 10 )); then         #  5
+                idx=8
+            elif (( bat <= 20 )); then         # 10
+                idx=7
+            elif (( bat <= 30 )); then         # 10
+                idx=6
+            elif (( bat <= 40 )); then         # 10
+                idx=5
+            elif (( bat <= 50 )); then         # 10
+                idx=4
+            elif (( bat <= 65 )); then         # 15
+                idx=3
+            elif (( bat <= 80 )); then         # 15
+                idx=2
+            elif (( bat < 100 )); then         # 20
+                idx=1
+            else # >= 100
+                idx=0
+            fi
+
+            res+="${LP_COLORMAP[idx+_LP_FIRST_INDEX]}${bat}$_LP_PERCENT${NO_COL}"
+        fi # LP_PERCENTS_ALWAYS
+        echo -nE "${res}"
+    fi
+}
+
+_lp_color_map() {
+    # Default scale: 0..100
+    # Custom scale: 0..$2
+    local -i scale idx
+    scale=${2:-100}
+    # Transform the value to a 0..${#COLOR_MAP} scale
+    idx=_LP_FIRST_INDEX+100*$1/scale/${#LP_COLORMAP[*]}
+    echo -nE "${LP_COLORMAP[idx]}"
+}
+
+###########################
+# runtime of last command #
+###########################
+
+_LP_RUNTIME_LAST_SECONDS=$SECONDS
+
+_lp_runtime()
+{
+    if (( LP_ENABLE_RUNTIME && _LP_RUNTIME_SECONDS >= LP_RUNTIME_THRESHOLD ))
+    then
+        echo -nE "${LP_COLOR_RUNTIME}"
+        # display runtime seconds as days, hours, minutes, and seconds
+        (( _LP_RUNTIME_SECONDS >= 86400 )) && echo -n $((_LP_RUNTIME_SECONDS / 86400))d
+        (( _LP_RUNTIME_SECONDS >= 3600 )) && echo -n $((_LP_RUNTIME_SECONDS % 86400 / 3600))h
+        (( _LP_RUNTIME_SECONDS >= 60 )) && echo -n $((_LP_RUNTIME_SECONDS % 3600 / 60))m
+        echo -n $((_LP_RUNTIME_SECONDS % 60))"s${NO_COL}"
+    fi
+    :
+}
+
+if (( LP_ENABLE_RUNTIME )); then
+    if $_LP_SHELL_zsh; then
+        _lp_runtime_before() {
+          _LP_RUNTIME_LAST_SECONDS=$SECONDS
+        }
+        _lp_runtime_after() {
+            if [[ -n "$_LP_RUNTIME_LAST_SECONDS" ]]; then
+                (( _LP_RUNTIME_SECONDS=SECONDS-_LP_RUNTIME_LAST_SECONDS ))
+                unset _LP_RUNTIME_LAST_SECONDS
+            fi
+        }
+
+        add-zsh-hook preexec _lp_runtime_before
+        add-zsh-hook precmd  _lp_runtime_after
+    else
+        _lp_runtime_before()
+        {
+            # For debugging
+            #echo "XXX $BASH_COMMAND"
+
+            # If the previous command was just the refresh of the prompt,
+            # reset the counter
+            if (( _LP_RUNTIME_SKIP )); then
+                _LP_RUNTIME_SECONDS=-1 _LP_RUNTIME_LAST_SECONDS=$SECONDS
+            else
+                # Compute number of seconds since program was started
+                (( _LP_RUNTIME_SECONDS=SECONDS-_LP_RUNTIME_LAST_SECONDS ))
+            fi
+
+            # If the command to run is the prompt, we'll have to ignore it
+            [[ "$BASH_COMMAND" != "$PROMPT_COMMAND" ]]
+            _LP_RUNTIME_SKIP=$?
+        }
+
+        _LP_RUNTIME_SKIP=0
+        # _lp_runtime_before gets called just before bash executes a command,
+        # including $PROMPT_COMMAND
+        trap _lp_runtime_before DEBUG
+    fi
+fi
+
+###############
+# System load #
+###############
+
+# Compute a gradient of background/forground colors depending on the battery status
+_lp_load_color()
+{
+    # Colour progression is important ...
+    #   bold gray -> bold green -> bold yellow -> bold red ->
+    #   black on red -> bold white on red
+    #
+    # Then we have to choose the values at which the colours switch, with
+    # anything past yellow being pretty important.
+
+    (( LP_ENABLE_LOAD )) || return
+
+    local lp_cpu_load
+    # Get value (OS-specific) into lp_cpu_load
+    _lp_cpu_load
+
+    lp_cpu_load=${lp_cpu_load/./}   # Remove '.'
+    lp_cpu_load=${lp_cpu_load#0}    # Remove leading '0'
+    lp_cpu_load=${lp_cpu_load#0}    # Remove leading '0', again (ex: 0.09)
+    local -i load=${lp_cpu_load:-0}/$_lp_CPUNUM
+
+    if (( load > LP_LOAD_THRESHOLD )); then
+        local ret="$(_lp_color_map $load)${LP_MARK_LOAD}"
+
+        if (( LP_PERCENTS_ALWAYS )); then
+            ret+="${load}${_LP_PERCENT}"
+        fi
+        echo -nE "${ret}${NO_COL}"
+    fi
+}
+
+######################
+# System temperature #
+######################
+
+# Will set _LP_TEMP_FUNCTION so the temperature monitoring feature use an
+# available command.
+if (( LP_ENABLE_TEMP )); then
+
+    # Backends for TEMP. Each backend must return the result in $temperature.
+
+    # Implementation using lm-sensors
+    _lp_temp_sensors()
+    {
+        # Return the hottest system temperature we get through the sensors command
+        # Only the integer part is retained
+        local -i i
+        for i in $(sensors -u |
+                sed -n 's/^  temp[0-9][0-9]*_input: \([0-9]*\)\..*$/\1/p'); do
+            (( $i > ${temperature:-0} )) && temperature=i
+        done
+    }
+
+    # Implementation using 'acpi -t'
+    _lp_temp_acpi()
+    {
+        local -i i
+        # Only the integer part is retained
+        for i in $(LANG=C acpi -t |
+                sed 's/.* \(-\?[0-9]*\)\.[0-9]* degrees C$/\1/p'); do
+            (( $i > ${temperature:-0} )) && temperature=i
+        done
+    }
+
+    # Dynamic selection of backend
+    _lp_temp_detect()
+    {
+        local -i temperature
+        local cmd
+
+        # Global variable
+        unset _LP_TEMP_FUNCTION
+
+        for cmd
+        do
+            command -v $cmd >/dev/null || continue
+
+            _LP_TEMP_FUNCTION=_lp_temp_$cmd
+            # Check that we can retrieve temperature at least once
+            $_LP_TEMP_FUNCTION 2>/dev/null
+            # If $temperature is set, success!
+            [[ -n "$temperature" ]] && return 0
+            unset -f $_LP_TEMP_FUNCTION
+            unset _LP_TEMP_FUNCTION
+        done
+        return 1
+    }
+
+    # Try each _lp_temp method
+    # If no function worked, disable the feature
+    _lp_temp_detect acpi sensors || LP_ENABLE_TEMP=0
+    unset -f _lp_temp_detect
+fi
+
+
+# Will display the numeric value as we get through the _LP_TEMP_FUNCTION
+# and colorize it through _lp_color_map.
+_lp_temperature()
+{
+    (( LP_ENABLE_TEMP )) || return
+
+    local -i temperature
+    temperature=0
+    $_LP_TEMP_FUNCTION
+    (( temperature >= LP_TEMP_THRESHOLD )) && \
+        echo -nE "${LP_MARK_TEMP}$(_lp_color_map $temperature 120)$temperature°${NO_COL}"
+}
+
+##########
+# DESIGN #
+##########
+
+
+# Sed expression using extended regexp to match terminal
+# escape sequences with their wrappers
+if $_LP_SHELL_bash; then
+    _LP_CLEAN_ESC='\\\[([^\]+|\\[^]])*\\\]'
+else
+    _LP_CLEAN_ESC='%\{([^%]+|%[^}])*%\}'
+fi
+
+# Remove all colors and escape characters of the given string and return a pure text
+_lp_as_text()
+{
+    # Remove all terminal sequences that we wrapped with $_LP_OPEN_ESC and
+    # $_LP_CLOSE_ESC.
+    echo -nE "$1" | sed -$_LP_SED_EXTENDED "s,$_LP_CLEAN_ESC,,g"
+}
+
+_lp_title()
+{
+    (( LP_ENABLE_TITLE )) || return
+
+    # Get the current computed prompt as pure text
+    echo -nE "${_LP_OPEN_ESC}${LP_TITLE_OPEN}"
+    _lp_as_text "$1"
+    echo -nE "${LP_TITLE_CLOSE}${_LP_CLOSE_ESC}"
+}
+
+# Set the prompt mark to ± if git, to ☿ if mercurial, to ‡ if subversion
+# to # if root and else $
+_lp_smart_mark()
+{
+    local mark
+    case "$LP_VCS_TYPE" in
+    git)      mark="$LP_MARK_GIT"             ;;
+    git-svn)  mark="$LP_MARK_GIT$LP_MARK_SVN" ;;
+    git-vcsh) mark="$LP_MARK_VCSH$LP_MARK_GIT$LP_MARK_VCSH";;
+    hg)       mark="$LP_MARK_HG"              ;;
+    svn)      mark="$LP_MARK_SVN"             ;;
+    fossil)   mark="$LP_MARK_FOSSIL"          ;;
+    bzr)      mark="$LP_MARK_BZR"             ;;
+    disabled) mark="$LP_MARK_DISABLED"        ;;
+    *)        mark="$LP_MARK_DEFAULT"         ;;
+    esac
+    echo -nE "${mark}${NO_COL}"
+}
+
+# insert a space on the right
+_lp_sr()
+{
+    [[ -n "$1" ]] && echo -nE "$1 "
+}
+
+# insert a space on the left
+_lp_sl()
+{
+    [[ -n "$1" ]] && echo -nE " $1"
+}
+
+# insert two space, before and after
+_lp_sb()
+{
+    [[ -n "$1" ]] && echo -nE " $1 "
+}
+
+###################
+# CURRENT TIME    #
+###################
+
+# LP_TIME is set colored, with a space on the right side
+if (( LP_ENABLE_TIME )); then
+    if (( LP_TIME_ANALOG )); then
+        typeset -i _LP_CLOCK_PREV=-1
+        # The targeted unicode characters are the "CLOCK FACE" ones
+        # They are located in the codepages between:
+        #     U+1F550 (ONE OCLOCK) and U+1F55B (TWELVE OCLOCK), for the plain hours
+        #     U+1F55C (ONE-THIRTY) and U+1F567 (TWELVE-THIRTY), for the thirties
+        # Generated with:
+        # perl -C -E 'say join("", map {chr(0x1F550+$_)." ".chr(0x1F55C+$_)." "} 0..11)'
+        _LP_CLOCK=(🕐 🕜 🕑 🕝 🕒 🕞 🕓 🕟 🕔 🕠 🕕 🕡 🕖 🕢 🕗 🕣 🕘 🕤 🕙 🕥 🕚 🕦 🕛 🕧 )
+
+        _lp_time()
+        {
+            # %I: "00".."12"  %M: "00".."59"
+            # Bash interprets a '0' prefix as octal
+            # so we have to clean that
+            local hhmm="$(date "+hh=%I mm=%M")"
+            # hh:  1..12  mm: 0..59
+            local -i hh mm clock
+            eval ${hhmm//=0/=}  # Line split for zsh
+            # clock: 0 .. 25
+            #   1:00..1:14 -> 0
+            #   1:15..1:44 -> 1
+            #   1:45..2:15 -> 2
+            #   ...
+            #   12:15..12:44 -> 23
+            #   12:45..12:59 -> 0
+            if (( ( clock=((hh*60+mm-45)/30)%24 ) != _LP_CLOCK_PREV )); then
+                # There is a space just after the clock char because the glyph
+                # width is twice usual glyphs
+                LP_TIME="${LP_COLOR_TIME}${_LP_CLOCK[clock+_LP_FIRST_INDEX]} ${NO_COL} "
+                _LP_CLOCK_PREV=clock
+            fi
+        }
+    else
+        # Never changes
+        LP_TIME="${LP_COLOR_TIME}${_LP_TIME_SYMBOL}${NO_COL} "
+        _lp_time() { : ; }
+    fi
+else
+    LP_TIME=""
+    _lp_time() { : ; }
+fi
+
+
+########################
+# Construct the prompt #
+########################
+
+
+_lp_set_prompt()
+{
+    # Display the return value of the last command, if different from zero
+    # As this get the last returned code, it should be called first
+    local -i err=$?
+    if (( err != 0 )); then
+        LP_ERR=" $LP_COLOR_ERR$err$NO_COL"
+    else
+        LP_ERR=''     # Hidden
+    fi
+
+    # Reset IFS to its default value to avoid strange behaviors
+    # (in case the user is playing with the value at the prompt)
+    local IFS="$_LP_IFS"
+    local GREP_OPTIONS=
+
+    # bash: execute the old prompt hook
+    eval "$LP_OLD_PROMPT_COMMAND"
+
+    # left of main prompt: space at right
+    LP_JOBS="$(_lp_sr "$(_lp_jobcount_color)")"
+    LP_TEMP="$(_lp_sr "$(_lp_temperature)")"
+    LP_LOAD="$(_lp_sr "$(_lp_load_color)")"
+    LP_BATT="$(_lp_sr "$(_lp_battery_color)")"
+    _lp_time
+    _lp_sudo_check
+
+    # in main prompt: no space
+    if [[ "$LP_ENABLE_PROXY,${http_proxy-}" = 1,?* ]]; then
+        LP_PROXY="$LP_COLOR_PROXY$LP_MARK_PROXY$NO_COL"
+    else
+        LP_PROXY=
+    fi
+
+    # Display the current Python virtual environment, if available
+    if [[ "$LP_ENABLE_VIRTUALENV,${VIRTUAL_ENV-}${CONDA_DEFAULT_ENV-}" = 1,?* ]]; then
+        if [[ -n "${VIRTUAL_ENV-}" ]]; then
+            LP_VENV=" [${LP_COLOR_VIRTUALENV}${VIRTUAL_ENV##*/}${NO_COL}]"
+        else
+            LP_VENV=" [${LP_COLOR_VIRTUALENV}${CONDA_DEFAULT_ENV##*/}${NO_COL}]"
+        fi
+    else
+        LP_VENV=
+    fi
+
+    # Display the current software collections enabled, if available
+    if [[ "$LP_ENABLE_SCLS,${X_SCLS-}" = 1,?* ]]; then
+        LP_SCLS=" [${LP_COLOR_VIRTUALENV}${X_SCLS%"${X_SCLS##*[![:space:]]}"}${NO_COL}]"
+    else
+        LP_SCLS=
+    fi
+
+    LP_RUNTIME=$(_lp_sl "$(_lp_runtime)")
+
+    # if change of working directory
+    if [[ "${LP_OLD_PWD-}" != "LP:$PWD" ]]; then
+        # Update directory icon for MacOS X
+        $_LP_TERM_UPDATE_DIR
+
+        LP_VCS=""
+        LP_VCS_TYPE=""
+        # LP_HOST is a global set at load time
+
+        # LP_PERM: shows a ":"
+        # - colored in green if user has write permission on the current dir
+        # - colored in red if not
+        # - can set another symbol with LP_MARK_PERM
+        if (( LP_ENABLE_PERM )); then
+            if [[ -w "${PWD}" ]]; then
+                LP_PERM="${LP_COLOR_WRITE}${LP_MARK_PERM}${NO_COL}"
+            else
+                LP_PERM="${LP_COLOR_NOWRITE}${LP_MARK_PERM}${NO_COL}"
+            fi
+        fi
+
+        _lp_shorten_path   # set LP_PWD
+
+        if _lp_are_vcs_enabled; then
+            LP_VCS="$(_lp_git_branch_color)"
+            LP_VCS_TYPE="git"
+            if [[ -n "$LP_VCS" ]]; then
+                # If this is a vcsh repository
+                if [[ -n "${VCSH_DIRECTORY-}" ]]; then
+                    LP_VCS_TYPE="git-vcsh"
+                fi
+                # If this is a git-svn repository
+                if [[ -d "$(\git rev-parse --git-dir 2>/dev/null)/svn" ]]; then
+                    LP_VCS_TYPE="git-svn"
+                fi # git-svn
+            else
+                LP_VCS="$(_lp_hg_branch_color)"
+                LP_VCS_TYPE="hg"
+                if [[ -z "$LP_VCS" ]]; then
+                    LP_VCS="$(_lp_svn_branch_color)"
+                    LP_VCS_TYPE="svn"
+                    if [[ -z "$LP_VCS" ]]; then
+                        LP_VCS="$(_lp_fossil_branch_color)"
+                        LP_VCS_TYPE="fossil"
+                        if [[ -z "$LP_VCS" ]]; then
+                            LP_VCS="$(_lp_bzr_branch_color)"
+                            LP_VCS_TYPE="bzr"
+                            if [[ -z "$LP_VCS" ]]; then
+                                LP_VCS=""
+                                LP_VCS_TYPE=""
+                            fi # nothing
+                        fi # bzr
+                    fi # fossil
+                fi # svn
+            fi # hg
+
+        else # if this vcs rep is disabled
+            LP_VCS="" # not necessary, but more readable
+            LP_VCS_TYPE="disabled"
+        fi
+
+        if [[ -z "$LP_VCS_TYPE" ]]; then
+            LP_VCS=""
+        else
+            LP_VCS="$(_lp_sl "${LP_VCS}")"
+        fi
+
+        # end of the prompt line: double spaces
+        LP_MARK="$(_lp_sr "$(_lp_smart_mark $LP_VCS_TYPE)")"
+
+        LP_OLD_PWD="LP:$PWD"
+
+    # if do not change of working directory but...
+    elif [[ -n "$LP_VCS_TYPE" ]]; then # we are still in a VCS dir
+        case "$LP_VCS_TYPE" in
+            # git, git-svn
+            git*)    LP_VCS="$(_lp_sl "$(_lp_git_branch_color)")";;
+            hg)      LP_VCS="$(_lp_sl "$(_lp_hg_branch_color)")";;
+            svn)     LP_VCS="$(_lp_sl "$(_lp_svn_branch_color)")";;
+            fossil)  LP_VCS="$(_lp_sl "$(_lp_fossil_branch_color)")";;
+            bzr)     LP_VCS="$(_lp_sl "$(_lp_bzr_branch_color)")";;
+            disabled)LP_VCS="";;
+        esac
+    fi
+
+    if [[ -f "${LP_PS1_FILE-}" ]]; then
+        source "$LP_PS1_FILE"
+    fi
+
+    if [[ -z "$LP_PS1" ]]; then
+        # add title escape time, jobs, load and battery
+        PS1="${LP_PS1_PREFIX}${LP_TIME}${LP_BATT}${LP_LOAD}${LP_TEMP}${LP_JOBS}"
+        # add user, host and permissions colon
+        PS1+="${LP_BRACKET_OPEN}${LP_USER}${LP_HOST}${LP_PERM}"
+
+        PS1+="${LP_PWD}${LP_BRACKET_CLOSE}${LP_SCLS}${LP_VENV}${LP_PROXY}"
+
+        # Add VCS infos
+        # If root, the info has not been collected unless LP_ENABLE_VCS_ROOT
+        # is set.
+        PS1+="${LP_VCS}"
+
+        # add return code and prompt mark
+        PS1+="${LP_RUNTIME}${LP_ERR}${LP_MARK_PREFIX}${LP_COLOR_MARK}${LP_MARK}${LP_PS1_POSTFIX}"
+
+        # "invisible" parts
+        # Get the current prompt on the fly and make it a title
+        LP_TITLE="$(_lp_title "$PS1")"
+
+        # Insert it in the prompt
+        PS1="${LP_TITLE}${PS1}"
+
+        # Glue the bash prompt always go to the first column.
+        # Avoid glitches after interrupting a command with Ctrl-C
+        # Does not seem to be necessary anymore?
+        #PS1="\[\033[G\]${PS1}${NO_COL}"
+    else
+        PS1=$LP_PS1
+    fi
+}
+
+prompt_tag()
+{
+    export LP_PS1_PREFIX="$(_lp_sr "$1")"
+}
+
+# Activate Liquid Prompt
+prompt_on()
+{
+    # Reset so all PWD dependent variables are computed after loading
+    LP_OLD_PWD=""
+
+    # if Liquid Prompt has not been already set
+    if [[ -z "${LP_OLD_PS1-}" ]]; then
+        LP_OLD_PS1="$PS1"
+        if $_LP_SHELL_bash; then
+            LP_OLD_PROMPT_COMMAND="$PROMPT_COMMAND"
+            _LP_OLD_SHOPT="$(shopt -p promptvars)"
+        else # zsh
+            LP_OLD_PROMPT_COMMAND=""
+            _LP_ZSH_PROMPT_THEME=""
+            if [[ -n "$prompt_theme" && "$prompt_theme" != off ]]; then
+                _LP_ZSH_PROMPT_THEME="$prompt_theme"
+                # Disable the prompt to disable its precmd hook
+                prompt off
+            fi
+            _LP_OLD_SETOPT=()
+            # Dump option names: echo ${(ko)options}
+            for o in promptpercent promptbang promptsubst
+            do
+                if [[ "${options[$o]}" = on ]]; then
+                    _LP_OLD_SETOPT+=$o
+                else
+                    _LP_OLD_SETOPT+=no$o
+                fi
+            done
+        fi
+    fi
+    if $_LP_SHELL_bash; then
+        # Prevent some cases where the user shoots in his own foot.
+        # PROMPT_COMMAND is not exported by default, but some users
+        # incorrectly export it from their profile/bashrc (GitHub #450),
+        # so we preventively UNexport it.
+        # TODO: warn the user if it was exported
+        if (( ${BASH_VERSION%%.*} > 4 )) || [[ ${BASH_VERSION} > 4.2 ]]; then
+            # -g is only available since bash 4.2
+            declare -g +x PROMPT_COMMAND
+        fi
+
+        # Disable parameter/command expansion from PS1
+        shopt -u promptvars
+        PROMPT_COMMAND=_lp_set_prompt
+        (( LP_DEBUG_TIME )) && PROMPT_COMMAND="time $PROMPT_COMMAND" || true
+    else # zsh
+        [[ -n "$_LP_ZSH_HOOK" ]] && add-zsh-hook -d precmd $_LP_ZSH_HOOK
+        # Set options that affect PS1 evaluation
+        # Disable parameter/command expansion; enable percent expansion
+        setopt promptpercent nopromptbang nopromptsubst
+        # 'time' doesn't seem to work on shell functions: no time output
+        #if (( LP_DEBUG_TIME )); then
+        #    _lp_main_precmd() {
+        #        local TIMEFMT='Liquid Prompt build time: %*E'
+        #        time _lp_set_prompt
+        #    }
+        #    _LP_ZSH_HOOK=_lp_main_precmd
+        #else
+            _LP_ZSH_HOOK=_lp_set_prompt
+        #fi
+        add-zsh-hook precmd $_LP_ZSH_HOOK
+    fi
+}
+
+# Come back to the old prompt
+prompt_off()
+{
+    PS1=$LP_OLD_PS1
+    if $_LP_SHELL_bash; then
+        eval "$_LP_OLD_SHOPT"
+        PROMPT_COMMAND="$LP_OLD_PROMPT_COMMAND"
+    else # zsh
+        add-zsh-hook -d precmd $_LP_ZSH_HOOK
+        setopt ${_LP_OLD_SETOPT}
+        (( ${#_LP_ZSH_PROMPT_THEME} )) && prompt $_LP_ZSH_PROMPT_THEME
+    fi
+}
+
+# Use an empty prompt: just the \$ mark
+prompt_OFF()
+{
+    PS1="$_LP_MARK_SYMBOL "
+    if $_LP_SHELL_bash; then
+        shopt -u promptvars
+        PROMPT_COMMAND="$LP_OLD_PROMPT_COMMAND"
+    else # zsh
+        add-zsh-hook -d precmd $_LP_ZSH_HOOK
+        setopt promptpercent nopromptbang nopromptsubst
+    fi
+}
+
+# By default, sourcing liquidprompt will activate Liquid Prompt
+prompt_on
+
+# vim: set et sts=4 sw=4 tw=120 ft=sh:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt.plugin.zsh b/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt.plugin.zsh
new file mode 100644
index 0000000..4359f7e
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/liquidprompt.plugin.zsh
@@ -0,0 +1 @@
+source ${0%/*}/liquidprompt
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/liquidpromptrc-dist b/zsh/modules/prompt/external-themes/liquidprompt/liquidpromptrc-dist
new file mode 100644
index 0000000..72f0d2b
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/liquidpromptrc-dist
@@ -0,0 +1,165 @@
+
+####################################
+# LIQUID PROMPT CONFIGURATION FILE #
+####################################
+
+# If you want to use different themes and features,
+# you can load the corresponding files here:
+#source ~/.config/liquidprompt/nojhan.theme
+#LP_PS1_FILE=~/.config/liquidprompt/nojhan.ps1
+
+#############
+# BEHAVIOUR #
+#############
+
+# Display the battery level when the level is below this threshold.
+# Recommended value is 75
+LP_BATTERY_THRESHOLD=75
+
+# Display the load average when the load is above this threshold.
+# Recommended value is 60
+LP_LOAD_THRESHOLD=60
+
+# Display the temperature when the temperate is above this threshold (in
+# degrees Celsius).
+# Recommended value is 60
+LP_TEMP_THRESHOLD=60
+
+# Use the shorten path feature if the path is too long to fit in the prompt
+# line.
+# Recommended value is 1
+LP_ENABLE_SHORTEN_PATH=1
+
+# The maximum percentage of the screen width used to display the path before
+# removing the center portion of the path and replacing with '...'.
+# Recommended value is 35
+LP_PATH_LENGTH=35
+
+# The number of directories (including '/') to keep at the beginning of a
+# shortened path.
+# Recommended value is 2
+LP_PATH_KEEP=2
+
+# Determine if the hostname should always be displayed, even if not connecting
+# through network.
+# Defaults to 0 (do not display hostname when locally connected)
+# set to 1 if you want to always see the hostname
+# set to -1 if you want to never see the hostname
+LP_HOSTNAME_ALWAYS=0
+
+# Use the fully qualified domain name (FQDN) instead of the short hostname when
+# the hostname is displayed
+LP_ENABLE_FQDN=0
+
+# Always display the user name, even if the user is the same as the one logged
+# in.
+# Defaults to 1 (always display the user name)
+# set to 0 if you want to hide the logged user (it will always display different
+# users)
+LP_USER_ALWAYS=1
+
+# Display the percentages of load/batteries along with their
+# corresponding marks. Set to 0 to only print the colored marks.
+# Defaults to 1 (display percentages)
+LP_PERCENTS_ALWAYS=1
+
+# Use the permissions feature and display a red ':' before the prompt to show
+# when you don't have write permission to the current directory.
+# Recommended value is 1
+LP_ENABLE_PERM=1
+
+# Enable the proxy detection feature.
+# Recommended value is 1
+LP_ENABLE_PROXY=1
+
+# Enable the jobs feature.
+# Recommended value is 1
+LP_ENABLE_JOBS=1
+
+# Enable the load feature.
+# Recommended value is 1
+LP_ENABLE_LOAD=1
+
+# Enable the battery feature.
+# Recommended value is 1
+LP_ENABLE_BATT=1
+
+# Enable the 'sudo credentials' feature.
+# Be warned that this may pollute the syslog if you don't have sudo
+# credentials, and the sysadmin will hate you.
+LP_ENABLE_SUDO=0
+
+# Enable the VCS features with the root account.
+# Recommended value is 0
+LP_ENABLE_VCS_ROOT=0
+
+# Enable the Git special features.
+# Recommended value is 1
+LP_ENABLE_GIT=1
+
+# Enable the Subversion special features.
+# Recommended value is 1
+LP_ENABLE_SVN=1
+
+# Enable the Mercurial special features.
+# Recommended value is 1
+LP_ENABLE_HG=1
+
+# Enable the Fossil special features.
+# Recommended value is 1
+LP_ENABLE_FOSSIL=1
+
+# Enable the Bazaar special features.
+# Recommanded value is 1
+LP_ENABLE_BZR=1
+
+# Show time of when the current prompt was displayed. (Must be enabled and
+# disabled in the config file and not after liquidprompt has already been
+# sourced.)
+LP_ENABLE_TIME=0
+
+# Show runtime of the previous command if over LP_RUNTIME_THRESHOLD
+# Recommended value is 0
+LP_ENABLE_RUNTIME=0
+
+# Minimal runtime (in seconds) before the runtime will be displayed
+# Recommended value is 2
+LP_RUNTIME_THRESHOLD=2
+
+# Display the virtualenv that is currently activated, if any
+# Recommended value is 1
+LP_ENABLE_VIRTUALENV=1
+
+# Display the enabled software collections, if any
+# Recommended value is 1
+LP_ENABLE_SCLS=1
+
+# Show average system temperature
+LP_ENABLE_TEMP=1
+
+# When showing the time, use an analog clock instead of numeric values.
+# The analog clock is "accurate" to the nearest half hour.
+# You must have a unicode-capable terminal and a font with the "CLOCK"
+# characters.
+# Recommended value is 0
+LP_TIME_ANALOG=0
+
+# Use the prompt as the title of the terminal window
+# The content is not customizable, the implementation is very basic,
+# and this may not work properly on exotic terminals, thus the
+# recommended value is 0
+# See LP_TITLE_OPEN and LP_TITLE_CLOSE to change escape characters to adapt this
+# feature to your specific terminal.
+LP_ENABLE_TITLE=0
+
+# Enable Title for screen and byobu
+LP_ENABLE_SCREEN_TITLE=0
+
+# Use different colors for the different hosts you SSH to
+LP_ENABLE_SSH_COLORS=0
+
+# Specify a list of complete and colon (":") separated paths in which, all vcs
+# will be disabled
+LP_DISABLED_VCS_PATH=""
+
+# vim: set et sts=4 sw=4 tw=120 ft=sh:
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/pmset-simulator b/zsh/modules/prompt/external-themes/liquidprompt/pmset-simulator
new file mode 100644
index 0000000..ccd2e2d
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/pmset-simulator
@@ -0,0 +1,48 @@
+
+# Simulator for "pmset -g batt" for testing the implementation of
+# battery display on MacOS X
+
+pmset()
+{
+	case "$pmset_sim" in
+	iMac|no-battery)
+		# https://github.com/nojhan/liquidprompt/issues/315
+		cat <<EOF
+Now drawing from 'AC Power'
+EOF
+		;;
+	attached)
+		# https://github.com/nojhan/liquidprompt/issues/326#issuecomment-66120495
+		cat <<'EOF'
+Now drawing from 'AC Power'
+ -InternalBattery-0	37%; AC attached; not charging
+EOF
+		;;
+	charging)
+		# https://github.com/nojhan/liquidprompt/issues/326
+		cat <<'EOF'
+Now drawing from 'AC Power'
+ -InternalBattery-0	8%; charging; 2:46 remaining
+EOF
+		;;
+	discharging)
+		# https://github.com/nojhan/liquidprompt/issues/326
+		cat <<'EOF'
+Now drawing from 'Battery Power'
+ -InternalBattery-0	9%; discharging; (no estimate)
+EOF
+		;;
+	warning-Early)
+		# https://github.com/nojhan/liquidprompt/issues/326
+		cat <<'EOF'
+Now drawing from 'Battery Power'
+ -InternalBattery-0	7%; discharging; 0:13 remaining
+    Battery Warning: Early
+EOF
+		;;
+	*)
+		echo "unsupported '$pmset_sim' pmset simulation"
+		;;
+	esac
+}
+
diff --git a/zsh/modules/prompt/external-themes/liquidprompt/test.sh b/zsh/modules/prompt/external-themes/liquidprompt/test.sh
new file mode 100755
index 0000000..616aee9
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/liquidprompt/test.sh
@@ -0,0 +1,351 @@
+#!/bin/sh
+
+
+# Run the testsuite with both bash and zsh
+if [ -z "$BASH_VERSION$ZSH_VERSION" ]; then
+    for sh in bash zsh
+    do
+	if [ -x /bin/$sh ]; then
+	    /bin/$sh "$0"
+	elif [ -x /usr/bin/$sh ]; then
+	    /usr/bin/$sh "$0"
+	fi
+    done
+    exit 0
+fi
+
+
+print_ok()
+{
+    local OK="\\033[1;32m"
+    local RAZ="\\033[0;39m"
+    local cols=$1
+    local name=$2
+    # printf "\e${OK}%-${cols}s %-${cols}s\n${RAZ}" "$name" "OK"
+    printf "${OK}%-${cols}s %-${cols}s\n${RAZ}" "$name" "OK"
+}
+
+print_no()
+{
+    local NOK="\\033[1;31m"
+    local RAZ="\\033[0;39m"
+    local cols=$1
+    local name=$2
+    local sub=$3
+    local line=$4
+    # printf "\e${NOK}%-${cols}s %-${cols}s #%-5s\n${RAZ}" "$name" "$sub" "$line"
+    printf "${NOK}%-${cols}s %-${cols}s #%-5s\n${RAZ}" "$name" "$sub" "$line"
+}
+
+assert()
+{
+    local has=$1
+    local name=$2
+    local sub=$3
+    local line=$4
+
+    if [[ -z "$sub" ]]
+    then
+        return 1
+    fi
+
+    cols=20
+
+    if [[ $has == 1 ]] ; then
+        if [[ "$PS1" == *$sub* ]]
+        then
+            print_ok $cols "has $name"
+        else
+            print_no $cols "has $name" $sub $line
+        fi
+    elif [[ $has == 0 ]] ; then
+        if [[ "$PS1" != *$sub* ]]
+        then
+            print_ok $cols " no $name"
+        else
+            print_no $cols " no $name" $sub $line
+        fi
+    else
+        if [[ "$PS1" == $sub ]]
+        then
+            print_ok $cols " is $name"
+        else
+            print_no $cols " is $name" $sub $line
+        fi
+    fi
+}
+
+assert_has()
+{
+
+    assert 1 "$@"
+}
+
+assert_not()
+{
+    assert 0 "$@"
+}
+
+assert_is()
+{
+    assert 2 "$@"
+}
+
+log_prompt()
+{
+    echo -e "$PS1" 1>&2
+}
+
+#####################
+# REDEFINE COMMANDS #
+#####################
+
+command()
+{
+    echo "fake command $@" 1>&2
+    echo "/bin/fake"
+}
+
+uname()
+{
+    echo "fake uname $@" 1>&2
+    echo Linux
+}
+
+nproc()
+{
+    echo "fake nproc $@" 1>&2
+    echo 2
+}
+
+# battery
+acpi()
+{
+    echo "fake acpi $@" 1>&2
+    if [[ "x$1" == --battery ]]; then
+	echo 'Battery 0: Discharging, 55%, 01:39:34 remaining'
+    elif [[ "x$1" == -t ]]; then
+	echo 'Thermal 0: ok, 36.0 degrees C'
+    else
+	return 1
+    fi
+}
+
+
+git()
+{
+    echo "fake git $@" 1>&2
+    case $1 in
+        "rev-parse" )
+            echo ".git";;
+        "branch" )
+            echo "* fake_test";;
+        "diff" )
+            echo "2       1       fake_file"
+            return 1;;
+        "status" )
+            echo "# Untracked";;
+        "rev-list" )
+            echo 111;;
+    esac
+}
+
+# global variables
+export http_proxy="fake"
+
+
+##########################
+# Call the liquid prompt #
+##########################
+
+# As if we were in an interactive shell
+export PS1="fake prompt \$"
+# load functions
+source ./liquidprompt
+
+# Force liquid prompt function redefinition
+_lp_cpu_load()
+{
+    echo "fake _lp_cpu_load $@" 1>&2
+    echo "0.64"
+}
+
+
+################
+# ADHOC CONFIG #
+################
+
+export LP_BATTERY_THRESHOLD=60
+export LP_LOAD_THRESHOLD=1
+export LP_MARK_PROXY="proxy"
+export LP_MARK_BATTERY="BATT"
+export LP_MARK_LOAD="LOAD"
+export LP_MARK_UNTRACKED="untracked"
+export LP_MARK_GIT="gitmark"
+export LP_USER_ALWAYS=1
+
+
+# Force erroneous command
+fake_error
+
+# Force set prompt
+_lp_set_prompt
+
+
+#########
+# TESTS #
+#########
+
+echo "FULL PROMPT"
+log_prompt
+
+assert_has Battery_Mark     BATT    $LINENO
+assert_has Battery_Level    55%    $LINENO
+assert_has Load_Mark        LOAD    $LINENO
+assert_has Load_Level       32%    $LINENO
+assert_has User             "[\\\u"    $LINENO
+if [[ $LP_HOSTNAME_ALWAYS == 0 ]] ; then
+    assert_not Hostname     "\\\h"    $LINENO
+else
+    assert_has Hostname     "\\\h"    $LINENO
+fi
+assert_has Perms            :    $LINENO
+assert_has Path             $(pwd | sed -e "s|$HOME|~|")    $LINENO
+assert_has Proxy            proxy    $LINENO
+assert_has Error            127    $LINENO
+assert_has GIT_Branch       fake_test    $LINENO
+assert_has GIT_Changes      "+2/-1"    $LINENO
+assert_has GIT_Commits      111    $LINENO
+assert_has GIT_Untrack      untracked    $LINENO
+assert_has GIT_Mark         gitmark    $LINENO
+
+# start hiding features
+echo "DISABLE BATTERY"
+export LP_ENABLE_BATT=0
+_lp_set_prompt
+log_prompt
+assert_not Battery_Mark     BATT    $LINENO
+assert_not Battery_level    55%    $LINENO
+assert_not Error            127    $LINENO
+
+echo "HIDE BATTERY LEVEL"
+export LP_ENABLE_BATT=1
+export LP_BATTERY_THRESHOLD=50
+_lp_set_prompt
+log_prompt
+assert_has Battery_Mark     BATT    $LINENO
+assert_not Battery_level    55%    $LINENO
+assert_not Error            127    $LINENO
+
+alias acpi="echo 'Battery 0: Full, 100%'"
+_lp_set_prompt
+log_prompt
+assert_not Battery_Mark     BATT    $LINENO
+
+echo "DISABLE LOAD"
+export LP_ENABLE_LOAD=0
+_lp_set_prompt
+log_prompt
+assert_not Load_Mark        LOAD    $LINENO
+assert_not Load_Level       32%    $LINENO
+
+echo "HIDE LOAD"
+export LP_ENABLE_LOAD=1
+export LP_LOAD_THRESHOLD=40
+_lp_set_prompt
+log_prompt
+assert_not Load_Mark        LOAD    $LINENO
+assert_not Load_Level       32%    $LINENO
+
+echo "DISABLE PROXY"
+export LP_ENABLE_PROXY=0
+_lp_set_prompt
+log_prompt
+assert_not Proxy_Mark        proxy    $LINENO
+
+echo "NO PROXY"
+export LP_ENABLE_PROXY=1
+export http_proxy=""
+_lp_set_prompt
+log_prompt
+assert_not Proxy_Mark        proxy    $LINENO
+
+echo "DISABLE GIT"
+export LP_ENABLE_GIT=0
+_lp_set_prompt
+log_prompt
+assert_not GIT_Branch       fake_test    $LINENO
+assert_not GIT_Changes      "+2/-1"    $LINENO
+assert_not GIT_Commits      111    $LINENO
+assert_not GIT_Untrack      untracked    $LINENO
+assert_not GIT_Mark         gitmark    $LINENO
+assert_has User_Mark        $    $LINENO
+
+echo "NO GIT"
+export LP_ENABLE_GIT=1
+alias git="echo"
+_lp_set_prompt
+log_prompt
+assert_not GIT_Branch       fake_test    $LINENO
+assert_not GIT_Changes      "+2/-1"    $LINENO
+assert_not GIT_Commits      111    $LINENO
+assert_not GIT_Untrack      untracked    $LINENO
+assert_not GIT_Mark         gitmark    $LINENO
+assert_has User_Mark        $    $LINENO
+
+# create a deep dir tree
+current=$PWD
+for d in $(seq 20) ; do
+    dirname=""
+    for i in $(seq 5); do
+         dirname="$dirname$d"
+    done
+    mkdir -p $dirname
+    cd $dirname
+done
+
+echo "DISABLE SHORTEN PATH"
+export LP_ENABLE_SHORTEN_PATH=0
+_lp_set_prompt
+log_prompt
+assert_has Path       "$(pwd | sed -e "s|$HOME|~|")"    $LINENO
+
+echo "ENABLE SHORTEN PATH"
+export LP_ENABLE_SHORTEN_PATH=1
+export LP_PATH_LENGTH=35
+export LP_PATH_KEEP=1
+_lp_set_prompt
+log_prompt
+assert_has Short_Path       " … "    $LINENO
+
+# get back out of the deep tree
+cd $current
+
+echo "LOCAL HOST NAME"
+_lp_set_prompt
+log_prompt
+# As the hostname is set once at the script start,
+# and not re-interpret at each prompt,
+# we cannot export the option in the test script.
+# We thus rely on the existing config.
+if [[ $LP_HOSTNAME_ALWAYS == 0 ]] ; then
+    assert_not Hostname     "\\\h"    $LINENO
+else
+    assert_has Hostname     "\\\h"    $LINENO
+fi
+
+echo "prompt_OFF"
+prompt_OFF
+log_prompt
+assert_is Prompt            "$ "    $LINENO
+
+echo "prompt_on"
+prompt_on
+export LP_USER_ALWAYS=1
+log_prompt
+assert_has User             "\\\u"    $LINENO
+assert_has Perms            :    $LINENO
+assert_has Path             $(pwd | sed -e "s|$HOME|~|")    $LINENO
+# assert_has Path             "\\\w"    $LINENO
+assert_has Prompt           "$ "    $LINENO
+
diff --git a/zsh/modules/prompt/external-themes/pure/.editorconfig b/zsh/modules/prompt/external-themes/pure/.editorconfig
new file mode 100644
index 0000000..86c8f59
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+indent_style = tab
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[package.json]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/zsh/modules/prompt/external-themes/pure/.gitattributes b/zsh/modules/prompt/external-themes/pure/.gitattributes
new file mode 100644
index 0000000..176a458
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/zsh/modules/prompt/external-themes/pure/.github/issue_template.md b/zsh/modules/prompt/external-themes/pure/.github/issue_template.md
new file mode 100644
index 0000000..6e09db0
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/.github/issue_template.md
@@ -0,0 +1,34 @@
+<!-- TIP: Hit 'Preview' for a more readable version of this template --> 
+
+### General information
+
+- Pure version: 1.x.x
+- ZSH version: 5.x.x
+- Terminal program & version: <!-- e.g. Hyper 1.0.0, iTerm 3.0.0, Terminal 2.7.1, xterm 327, other? -->
+- Operating system: <!-- e.g. macOS Sierra 10.12.1 -->
+- ZSH framework: <!-- e.g. oh-my-zsh, prezto, antigen, antibody, zplug, other? -->
+
+I have:
+- [ ] Tested with another terminal program and can reproduce the issue: <!-- e.g. iTerm, etc. -->
+- [ ] Followed the [Integration](https://github.com/sindresorhus/pure#integration) instructions for my framework
+
+### Problem description
+
+
+### Reproduction steps
+
+1.
+2.
+3.
+
+### My `.zshrc`:
+
+<!--
+Please provide a minimal `.zshrc` that reproduces the issue.
+Try to remove everything that that does not affect the issue, the fewer lines, the better.
+-->
+
+```shell
+autoload -U promptinit; promptinit
+prompt pure
+```
diff --git a/zsh/modules/prompt/external-themes/pure/arch/PKGBUILD b/zsh/modules/prompt/external-themes/pure/arch/PKGBUILD
new file mode 100644
index 0000000..18cdc92
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/arch/PKGBUILD
@@ -0,0 +1,26 @@
+# Author: Sindre Sorhus
+# Maintainer: Pat Brisbin <pbrisbin@gmail.com>
+# Contributor: Emil Falk <emph@emph.se>
+pkgname=zsh-pure-prompt-git
+pkgver=r61.7d3b317
+pkgrel=1
+pkgdesc='A minimal and pure prompt for zsh.'
+arch=('any')
+url='https://github.com/sindresorhus/pure'
+license=('MIT')
+depends=('zsh' 'git')
+source=("$pkgname::git://github.com/sindresorhus/pure.git")
+sha256sums=('SKIP')
+
+pkgver() {
+  cd $srcdir/$pkgname
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+package() {
+  cd $srcdir/$pkgname
+  install -Dm644 pure.zsh \
+    "$pkgdir/usr/share/zsh/functions/Prompts/prompt_pure_setup"
+  install -Dm644 async.zsh \
+    "$pkgdir/usr/share/zsh/functions/async"
+}
diff --git a/zsh/modules/prompt/external-themes/pure/async.zsh b/zsh/modules/prompt/external-themes/pure/async.zsh
new file mode 100644
index 0000000..c1a4f68
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/async.zsh
@@ -0,0 +1,493 @@
+#!/usr/bin/env zsh
+
+#
+# zsh-async
+#
+# version: 1.5.0
+# author: Mathias Fredriksson
+# url: https://github.com/mafredri/zsh-async
+#
+
+# Produce debug output from zsh-async when set to 1.
+ASYNC_DEBUG=${ASYNC_DEBUG:-0}
+
+# Wrapper for jobs executed by the async worker, gives output in parseable format with execution time
+_async_job() {
+	# Disable xtrace as it would mangle the output.
+	setopt localoptions noxtrace
+
+	# Store start time as double precision (+E disables scientific notation)
+	float -F duration=$EPOCHREALTIME
+
+	# Run the command and capture both stdout (`eval`) and stderr (`cat`) in
+	# separate subshells. When the command is complete, we grab write lock
+	# (mutex token) and output everything except stderr inside the command
+	# block, after the command block has completed, the stdin for `cat` is
+	# closed, causing stderr to be appended with a $'\0' at the end to mark the
+	# end of output from this job.
+	local stdout stderr ret tok
+	{
+		stdout=$(eval "$@")
+		ret=$?
+		duration=$(( EPOCHREALTIME - duration ))  # Calculate duration.
+
+		# Grab mutex lock, stalls until token is available.
+		read -r -k 1 -p tok || exit 1
+
+		# Return output (<job_name> <return_code> <stdout> <duration> <stderr>).
+		print -r -n - ${(q)1} $ret ${(q)stdout} $duration
+	} 2> >(stderr=$(cat) && print -r -n - " "${(q)stderr}$'\0')
+
+	# Unlock mutex by inserting a token.
+	print -n -p $tok
+}
+
+# The background worker manages all tasks and runs them without interfering with other processes
+_async_worker() {
+	# Reset all options to defaults inside async worker.
+	emulate -R zsh
+
+	# Make sure monitor is unset to avoid printing the
+	# pids of child processes.
+	unsetopt monitor
+
+	# Redirect stderr to `/dev/null` in case unforseen errors produced by the
+	# worker. For example: `fork failed: resource temporarily unavailable`.
+	# Some older versions of zsh might also print malloc errors (know to happen
+	# on at least zsh 5.0.2 and 5.0.8) likely due to kill signals.
+	exec 2>/dev/null
+
+	# When a zpty is deleted (using -d) all the zpty instances created before
+	# the one being deleted receive a SIGHUP, unless we catch it, the async
+	# worker would simply exit (stop working) even though visible in the list
+	# of zpty's (zpty -L).
+	TRAPHUP() {
+		return 0  # Return 0, indicating signal was handled.
+	}
+
+	local -A storage
+	local unique=0
+	local notify_parent=0
+	local parent_pid=0
+	local coproc_pid=0
+	local processing=0
+
+	local -a zsh_hooks zsh_hook_functions
+	zsh_hooks=(chpwd periodic precmd preexec zshexit zshaddhistory)
+	zsh_hook_functions=(${^zsh_hooks}_functions)
+	unfunction $zsh_hooks &>/dev/null   # Deactivate all zsh hooks inside the worker.
+	unset $zsh_hook_functions           # And hooks with registered functions.
+	unset zsh_hooks zsh_hook_functions  # Cleanup.
+
+	child_exit() {
+		local -a pids
+		pids=(${${(v)jobstates##*:*:}%\=*})
+
+		# If coproc (cat) is the only child running, we close it to avoid
+		# leaving it running indefinitely and cluttering the process tree.
+		if  (( ! processing )) && [[ $#pids = 1 ]] && [[ $coproc_pid = $pids[1] ]]; then
+			coproc :
+			coproc_pid=0
+		fi
+
+		# On older version of zsh (pre 5.2) we notify the parent through a
+		# SIGWINCH signal because `zpty` did not return a file descriptor (fd)
+		# prior to that.
+		if (( notify_parent )); then
+			# We use SIGWINCH for compatibility with older versions of zsh
+			# (pre 5.1.1) where other signals (INFO, ALRM, USR1, etc.) could
+			# cause a deadlock in the shell under certain circumstances.
+			kill -WINCH $parent_pid
+		fi
+	}
+
+	# Register a SIGCHLD trap to handle the completion of child processes.
+	trap child_exit CHLD
+
+	# Process option parameters passed to worker
+	while getopts "np:u" opt; do
+		case $opt in
+			n) notify_parent=1;;
+			p) parent_pid=$OPTARG;;
+			u) unique=1;;
+		esac
+	done
+
+	killjobs() {
+		local tok
+		local -a pids
+		pids=(${${(v)jobstates##*:*:}%\=*})
+
+		# No need to send SIGHUP if no jobs are running.
+		(( $#pids == 0 )) && continue
+		(( $#pids == 1 )) && [[ $coproc_pid = $pids[1] ]] && continue
+
+		# Grab lock to prevent half-written output in case a child
+		# process is in the middle of writing to stdin during kill.
+		(( coproc_pid )) && read -r -k 1 -p tok
+
+		kill -HUP -$$  # Send to entire process group.
+		coproc :       # Quit coproc.
+		coproc_pid=0   # Reset pid.
+	}
+
+	local request
+	local -a cmd
+	while :; do
+		# Wait for jobs sent by async_job.
+		read -r -d $'\0' request || {
+			# Since we handle SIGHUP above (and thus do not know when `zpty -d`)
+			# occurs, a failure to read probably indicates that stdin has
+			# closed. This is why we propagate the signal to all children and
+			# exit manually.
+			kill -HUP -$$  # Send SIGHUP to all jobs.
+			exit 0
+		}
+
+		# Check for non-job commands sent to worker
+		case $request in
+			_unset_trap) notify_parent=0; continue;;
+			_killjobs)   killjobs; continue;;
+		esac
+
+		# Parse the request using shell parsing (z) to allow commands
+		# to be parsed from single strings and multi-args alike.
+		cmd=("${(z)request}")
+
+		# Name of the job (first argument).
+		local job=$cmd[1]
+
+		# If worker should perform unique jobs
+		if (( unique )); then
+			# Check if a previous job is still running, if yes, let it finnish
+			for pid in ${${(v)jobstates##*:*:}%\=*}; do
+				if [[ ${storage[$job]} == $pid ]]; then
+					continue 2
+				fi
+			done
+		fi
+
+		# Guard against closing coproc from trap before command has started.
+		processing=1
+
+		# Because we close the coproc after the last job has completed, we must
+		# recreate it when there are no other jobs running.
+		if (( ! coproc_pid )); then
+			# Use coproc as a mutex for synchronized output between children.
+			coproc cat
+			coproc_pid="$!"
+			# Insert token into coproc
+			print -n -p "t"
+		fi
+
+		# Run job in background, completed jobs are printed to stdout.
+		_async_job $cmd &
+		# Store pid because zsh job manager is extremely unflexible (show jobname as non-unique '$job')...
+		storage[$job]="$!"
+
+		processing=0  # Disable guard.
+	done
+}
+
+#
+#  Get results from finnished jobs and pass it to the to callback function. This is the only way to reliably return the
+#  job name, return code, output and execution time and with minimal effort.
+#
+# usage:
+# 	async_process_results <worker_name> <callback_function>
+#
+# callback_function is called with the following parameters:
+# 	$1 = job name, e.g. the function passed to async_job
+# 	$2 = return code
+# 	$3 = resulting stdout from execution
+# 	$4 = execution time, floating point e.g. 2.05 seconds
+# 	$5 = resulting stderr from execution
+#
+async_process_results() {
+	setopt localoptions noshwordsplit
+
+	local worker=$1
+	local callback=$2
+	local caller=$3
+	local -a items
+	local null=$'\0' data
+	integer -l len pos num_processed
+
+	typeset -gA ASYNC_PROCESS_BUFFER
+
+	# Read output from zpty and parse it if available.
+	while zpty -r -t $worker data 2>/dev/null; do
+		ASYNC_PROCESS_BUFFER[$worker]+=$data
+		len=${#ASYNC_PROCESS_BUFFER[$worker]}
+		pos=${ASYNC_PROCESS_BUFFER[$worker][(i)$null]}  # Get index of NULL-character (delimiter).
+
+		# Keep going until we find a NULL-character.
+		if (( ! len )) || (( pos > len )); then
+			continue
+		fi
+
+		while (( pos <= len )); do
+			# Take the content from the beginning, until the NULL-character and
+			# perform shell parsing (z) and unquoting (Q) as an array (@).
+			items=("${(@Q)${(z)ASYNC_PROCESS_BUFFER[$worker][1,$pos-1]}}")
+
+			# Remove the extracted items from the buffer.
+			ASYNC_PROCESS_BUFFER[$worker]=${ASYNC_PROCESS_BUFFER[$worker][$pos+1,$len]}
+
+			if (( $#items == 5 )); then
+				$callback "${(@)items}"  # Send all parsed items to the callback.
+			else
+				# In case of corrupt data, invoke callback with *async* as job
+				# name, non-zero exit status and an error message on stderr.
+				$callback "async" 1 "" 0 "$0:$LINENO: error: bad format, got ${#items} items (${(@q)items})"
+			fi
+
+			(( num_processed++ ))
+
+			len=${#ASYNC_PROCESS_BUFFER[$worker]}
+			if (( len > 1 )); then
+				pos=${ASYNC_PROCESS_BUFFER[$worker][(i)$null]}  # Get index of NULL-character (delimiter).
+			fi
+		done
+	done
+
+	(( num_processed )) && return 0
+
+	# Avoid printing exit value when `setopt printexitvalue` is active.`
+	[[ $caller = trap || $caller = watcher ]] && return 0
+
+	# No results were processed
+	return 1
+}
+
+# Watch worker for output
+_async_zle_watcher() {
+	setopt localoptions noshwordsplit
+	typeset -gA ASYNC_PTYS ASYNC_CALLBACKS
+	local worker=$ASYNC_PTYS[$1]
+	local callback=$ASYNC_CALLBACKS[$worker]
+
+	if [[ -n $callback ]]; then
+		async_process_results $worker $callback watcher
+	fi
+}
+
+#
+# Start a new asynchronous job on specified worker, assumes the worker is running.
+#
+# usage:
+# 	async_job <worker_name> <my_function> [<function_params>]
+#
+async_job() {
+	setopt localoptions noshwordsplit
+
+	local worker=$1; shift
+
+	local -a cmd
+	cmd=("$@")
+	if (( $#cmd > 1 )); then
+		cmd=(${(q)cmd})  # Quote special characters in multi argument commands.
+	fi
+
+	zpty -w $worker $cmd$'\0'
+}
+
+# This function traps notification signals and calls all registered callbacks
+_async_notify_trap() {
+	setopt localoptions noshwordsplit
+
+	for k in ${(k)ASYNC_CALLBACKS}; do
+		async_process_results $k ${ASYNC_CALLBACKS[$k]} trap
+	done
+}
+
+#
+# Register a callback for completed jobs. As soon as a job is finnished, async_process_results will be called with the
+# specified callback function. This requires that a worker is initialized with the -n (notify) option.
+#
+# usage:
+# 	async_register_callback <worker_name> <callback_function>
+#
+async_register_callback() {
+	setopt localoptions noshwordsplit nolocaltraps
+
+	typeset -gA ASYNC_CALLBACKS
+	local worker=$1; shift
+
+	ASYNC_CALLBACKS[$worker]="$*"
+
+	# Enable trap when the ZLE watcher is unavailable, allows
+	# workers to notify (via -n) when a job is done.
+	if [[ ! -o interactive ]] || [[ ! -o zle ]]; then
+		trap '_async_notify_trap' WINCH
+	fi
+}
+
+#
+# Unregister the callback for a specific worker.
+#
+# usage:
+# 	async_unregister_callback <worker_name>
+#
+async_unregister_callback() {
+	typeset -gA ASYNC_CALLBACKS
+
+	unset "ASYNC_CALLBACKS[$1]"
+}
+
+#
+# Flush all current jobs running on a worker. This will terminate any and all running processes under the worker, use
+# with caution.
+#
+# usage:
+# 	async_flush_jobs <worker_name>
+#
+async_flush_jobs() {
+	setopt localoptions noshwordsplit
+
+	local worker=$1; shift
+
+	# Check if the worker exists
+	zpty -t $worker &>/dev/null || return 1
+
+	# Send kill command to worker
+	async_job $worker "_killjobs"
+
+	# Clear the zpty buffer.
+	local junk
+	if zpty -r -t $worker junk '*'; then
+		(( ASYNC_DEBUG )) && print -n "async_flush_jobs $worker: ${(V)junk}"
+		while zpty -r -t $worker junk '*'; do
+			(( ASYNC_DEBUG )) && print -n "${(V)junk}"
+		done
+		(( ASYNC_DEBUG )) && print
+	fi
+
+	# Finally, clear the process buffer in case of partially parsed responses.
+	typeset -gA ASYNC_PROCESS_BUFFER
+	unset "ASYNC_PROCESS_BUFFER[$worker]"
+}
+
+#
+# Start a new async worker with optional parameters, a worker can be told to only run unique tasks and to notify a
+# process when tasks are complete.
+#
+# usage:
+# 	async_start_worker <worker_name> [-u] [-n] [-p <pid>]
+#
+# opts:
+# 	-u unique (only unique job names can run)
+# 	-n notify through SIGWINCH signal
+# 	-p pid to notify (defaults to current pid)
+#
+async_start_worker() {
+	setopt localoptions noshwordsplit
+
+	local worker=$1; shift
+	zpty -t $worker &>/dev/null && return
+
+	typeset -gA ASYNC_PTYS
+	typeset -h REPLY
+	typeset has_xtrace=0
+
+	# Make sure async worker is started without xtrace
+	# (the trace output interferes with the worker).
+	[[ -o xtrace ]] && {
+		has_xtrace=1
+		unsetopt xtrace
+	}
+
+	if (( ! ASYNC_ZPTY_RETURNS_FD )) && [[ -o interactive ]] && [[ -o zle ]]; then
+		# When zpty doesn't return a file descriptor (on older versions of zsh)
+		# we try to guess it anyway.
+		integer -l zptyfd
+		exec {zptyfd}>&1  # Open a new file descriptor (above 10).
+		exec {zptyfd}>&-  # Close it so it's free to be used by zpty.
+	fi
+
+	zpty -b $worker _async_worker -p $$ $@ || {
+		async_stop_worker $worker
+		return 1
+	}
+
+	# Re-enable it if it was enabled, for debugging.
+	(( has_xtrace )) && setopt xtrace
+
+	if [[ $ZSH_VERSION < 5.0.8 ]]; then
+		# For ZSH versions older than 5.0.8 we delay a bit to give
+		# time for the worker to start before issuing commands,
+		# otherwise it will not be ready to receive them.
+		sleep 0.001
+	fi
+
+	if [[ -o interactive ]] && [[ -o zle ]]; then
+		if (( ! ASYNC_ZPTY_RETURNS_FD )); then
+			REPLY=$zptyfd  # Use the guessed value for the file desciptor.
+		fi
+
+		ASYNC_PTYS[$REPLY]=$worker        # Map the file desciptor to the worker.
+		zle -F $REPLY _async_zle_watcher  # Register the ZLE handler.
+
+		# Disable trap in favor of ZLE handler when notify is enabled (-n).
+		async_job $worker _unset_trap
+	fi
+}
+
+#
+# Stop one or multiple workers that are running, all unfetched and incomplete work will be lost.
+#
+# usage:
+# 	async_stop_worker <worker_name_1> [<worker_name_2>]
+#
+async_stop_worker() {
+	setopt localoptions noshwordsplit
+
+	local ret=0
+	for worker in $@; do
+		# Find and unregister the zle handler for the worker
+		for k v in ${(@kv)ASYNC_PTYS}; do
+			if [[ $v == $worker ]]; then
+				zle -F $k
+				unset "ASYNC_PTYS[$k]"
+			fi
+		done
+		async_unregister_callback $worker
+		zpty -d $worker 2>/dev/null || ret=$?
+
+		# Clear any partial buffers.
+		typeset -gA ASYNC_PROCESS_BUFFER
+		unset "ASYNC_PROCESS_BUFFER[$worker]"
+	done
+
+	return $ret
+}
+
+#
+# Initialize the required modules for zsh-async. To be called before using the zsh-async library.
+#
+# usage:
+# 	async_init
+#
+async_init() {
+	(( ASYNC_INIT_DONE )) && return
+	ASYNC_INIT_DONE=1
+
+	zmodload zsh/zpty
+	zmodload zsh/datetime
+
+	# Check if zsh/zpty returns a file descriptor or not,
+	# shell must also be interactive with zle enabled.
+	ASYNC_ZPTY_RETURNS_FD=0
+	[[ -o interactive ]] && [[ -o zle ]] && {
+		typeset -h REPLY
+		zpty _async_test :
+		(( REPLY )) && ASYNC_ZPTY_RETURNS_FD=1
+		zpty -d _async_test
+	}
+}
+
+async() {
+	async_init
+}
+
+async "$@"
diff --git a/zsh/modules/prompt/external-themes/pure/license b/zsh/modules/prompt/external-themes/pure/license
new file mode 100644
index 0000000..654d0bf
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/license
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.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.
diff --git a/zsh/modules/prompt/external-themes/pure/package.json b/zsh/modules/prompt/external-themes/pure/package.json
new file mode 100644
index 0000000..4114488
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/package.json
@@ -0,0 +1,45 @@
+{
+  "name": "pure-prompt",
+  "version": "1.5.1",
+  "description": "Pretty, minimal and fast ZSH prompt",
+  "license": "MIT",
+  "repository": "sindresorhus/pure",
+  "author": {
+    "name": "Sindre Sorhus",
+    "email": "sindresorhus@gmail.com",
+    "url": "sindresorhus.com"
+  },
+  "maintainers": [
+    {
+      "name": "Mathias Fredriksson",
+      "url": "github.com/mafredri"
+    }
+  ],
+  "engines": {
+    "node": ">=0.10.0"
+  },
+  "scripts": {
+    "postinstall": "PURE_DEST=/usr/local/share/zsh/site-functions npm run --silent postinstall-link && exit 0; PURE_DEST=\"$PWD/functions\" npm run postinstall-link && npm run postinstall-fail-instructions",
+    "postinstall-link": "mkdir -p \"$PURE_DEST\" && ln -sf \"$PWD/pure.zsh\" \"$PURE_DEST/prompt_pure_setup\" && ln -sf \"$PWD/async.zsh\" \"$PURE_DEST/async\"",
+    "postinstall-fail-instructions": "echo \"ERROR: Could not automagically symlink the prompt. Either:\\n1. Check out the readme on how to do it manually: https://github.com/sindresorhus/pure#manually\\n2. Or add the following to your \\`.zshrc\\`:\\n\\n    fpath+=(\\$fpath '$PWD/functions')\""
+  },
+  "files": [
+    "pure.zsh",
+    "async.zsh"
+  ],
+  "keywords": [
+    "zsh",
+    "zshell",
+    "sh",
+    "shell",
+    "bash",
+    "pure",
+    "prompt",
+    "theme",
+    "git",
+    "async",
+    "fast",
+    "minimal",
+    "pretty"
+  ]
+}
diff --git a/zsh/modules/prompt/external-themes/pure/pure.plugin.zsh b/zsh/modules/prompt/external-themes/pure/pure.plugin.zsh
new file mode 120000
index 0000000..f5f60e7
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/pure.plugin.zsh
@@ -0,0 +1 @@
+pure.zsh
\ No newline at end of file
diff --git a/zsh/modules/prompt/external-themes/pure/pure.zsh b/zsh/modules/prompt/external-themes/pure/pure.zsh
new file mode 100644
index 0000000..59f8f11
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/pure.zsh
@@ -0,0 +1,436 @@
+# Pure
+# by Sindre Sorhus
+# https://github.com/sindresorhus/pure
+# MIT License
+
+# For my own and others sanity
+# git:
+# %b => current branch
+# %a => current action (rebase/merge)
+# prompt:
+# %F => color dict
+# %f => reset color
+# %~ => current path
+# %* => time
+# %n => username
+# %m => shortname host
+# %(?..) => prompt conditional - %(condition.true.false)
+# terminal codes:
+# \e7   => save cursor position
+# \e[2A => move cursor 2 lines up
+# \e[1G => go to position 1 in terminal
+# \e8   => restore cursor position
+# \e[K  => clears everything after the cursor on the current line
+# \e[2K => clear everything on the current line
+
+
+# turns seconds into human readable time
+# 165392 => 1d 21h 56m 32s
+# https://github.com/sindresorhus/pretty-time-zsh
+prompt_pure_human_time_to_var() {
+	local human=" " total_seconds=$1 var=$2
+	local days=$(( total_seconds / 60 / 60 / 24 ))
+	local hours=$(( total_seconds / 60 / 60 % 24 ))
+	local minutes=$(( total_seconds / 60 % 60 ))
+	local seconds=$(( total_seconds % 60 ))
+	(( days > 0 )) && human+="${days}d "
+	(( hours > 0 )) && human+="${hours}h "
+	(( minutes > 0 )) && human+="${minutes}m "
+	human+="${seconds}s"
+
+	# store human readable time in variable as specified by caller
+	typeset -g "${var}"="${human}"
+}
+
+# stores (into prompt_pure_cmd_exec_time) the exec time of the last command if set threshold was exceeded
+prompt_pure_check_cmd_exec_time() {
+	integer elapsed
+	(( elapsed = EPOCHSECONDS - ${prompt_pure_cmd_timestamp:-$EPOCHSECONDS} ))
+	prompt_pure_cmd_exec_time=
+	(( elapsed > ${PURE_CMD_MAX_EXEC_TIME:=5} )) && {
+		prompt_pure_human_time_to_var $elapsed "prompt_pure_cmd_exec_time"
+	}
+}
+
+prompt_pure_clear_screen() {
+	# enable output to terminal
+	zle -I
+	# clear screen and move cursor to (0, 0)
+	print -n '\e[2J\e[0;0H'
+	# print preprompt
+	prompt_pure_preprompt_render precmd
+}
+
+prompt_pure_set_title() {
+	# emacs terminal does not support settings the title
+	(( ${+EMACS} )) && return
+
+	# tell the terminal we are setting the title
+	print -n '\e]0;'
+	# show hostname if connected through ssh
+	[[ -n $SSH_CONNECTION ]] && print -Pn '(%m) '
+	case $1 in
+		expand-prompt)
+			print -Pn $2;;
+		ignore-escape)
+			print -rn $2;;
+	esac
+	# end set title
+	print -n '\a'
+}
+
+prompt_pure_preexec() {
+	if [[ -n $prompt_pure_git_fetch_pattern ]]; then
+		# detect when git is performing pull/fetch (including git aliases).
+		if [[ $2 =~ (git|hub)\ (.*\ )?($prompt_pure_git_fetch_pattern)(\ .*)?$ ]]; then
+			# we must flush the async jobs to cancel our git fetch in order
+			# to avoid conflicts with the user issued pull / fetch.
+			async_flush_jobs 'prompt_pure'
+		fi
+	fi
+
+	prompt_pure_cmd_timestamp=$EPOCHSECONDS
+
+	# shows the current dir and executed command in the title while a process is active
+	prompt_pure_set_title 'ignore-escape' "$PWD:t: $2"
+}
+
+# string length ignoring ansi escapes
+prompt_pure_string_length_to_var() {
+	local str=$1 var=$2 length
+	# perform expansion on str and check length
+	length=$(( ${#${(S%%)str//(\%([KF1]|)\{*\}|\%[Bbkf])}} ))
+
+	# store string length in variable as specified by caller
+	typeset -g "${var}"="${length}"
+}
+
+prompt_pure_preprompt_render() {
+	# store the current prompt_subst setting so that it can be restored later
+	local prompt_subst_status=$options[prompt_subst]
+
+	# make sure prompt_subst is unset to prevent parameter expansion in preprompt
+	setopt local_options no_prompt_subst
+
+	# check that no command is currently running, the preprompt will otherwise be rendered in the wrong place
+	[[ -n ${prompt_pure_cmd_timestamp+x} && "$1" != "precmd" ]] && return
+
+	# set color for git branch/dirty status, change color if dirty checking has been delayed
+	local git_color=242
+	[[ -n ${prompt_pure_git_last_dirty_check_timestamp+x} ]] && git_color=red
+
+	# construct preprompt, beginning with path
+	local preprompt="%F{blue}%~%f"
+	# git info
+	preprompt+="%F{$git_color}${vcs_info_msg_0_}${prompt_pure_git_dirty}%f"
+	# git pull/push arrows
+	preprompt+="%F{cyan}${prompt_pure_git_arrows}%f"
+	# username and machine if applicable
+	preprompt+=$prompt_pure_username
+	# execution time
+	preprompt+="%F{yellow}${prompt_pure_cmd_exec_time}%f"
+
+	# make sure prompt_pure_last_preprompt is a global array
+	typeset -g -a prompt_pure_last_preprompt
+
+	# if executing through precmd, do not perform fancy terminal editing
+	if [[ "$1" == "precmd" ]]; then
+		print -P "\n${preprompt}"
+	else
+		# only redraw if the expanded preprompt has changed
+		[[ "${prompt_pure_last_preprompt[2]}" != "${(S%%)preprompt}" ]] || return
+
+		# calculate length of preprompt and store it locally in preprompt_length
+		integer preprompt_length lines
+		prompt_pure_string_length_to_var "${preprompt}" "preprompt_length"
+
+		# calculate number of preprompt lines for redraw purposes
+		(( lines = ( preprompt_length - 1 ) / COLUMNS + 1 ))
+
+		# calculate previous preprompt lines to figure out how the new preprompt should behave
+		integer last_preprompt_length last_lines
+		prompt_pure_string_length_to_var "${prompt_pure_last_preprompt[1]}" "last_preprompt_length"
+		(( last_lines = ( last_preprompt_length - 1 ) / COLUMNS + 1 ))
+
+		# clr_prev_preprompt erases visual artifacts from previous preprompt
+		local clr_prev_preprompt
+		if (( last_lines > lines )); then
+			# move cursor up by last_lines, clear the line and move it down by one line
+			clr_prev_preprompt="\e[${last_lines}A\e[2K\e[1B"
+			while (( last_lines - lines > 1 )); do
+				# clear the line and move cursor down by one
+				clr_prev_preprompt+='\e[2K\e[1B'
+				(( last_lines-- ))
+			done
+
+			# move cursor into correct position for preprompt update
+			clr_prev_preprompt+="\e[${lines}B"
+		# create more space for preprompt if new preprompt has more lines than last
+		elif (( last_lines < lines )); then
+			# move cursor using newlines because ansi cursor movement can't push the cursor beyond the last line
+			printf $'\n'%.0s {1..$(( lines - last_lines ))}
+		fi
+
+		# disable clearing of line if last char of preprompt is last column of terminal
+		local clr='\e[K'
+		(( COLUMNS * lines == preprompt_length )) && clr=
+
+		# modify previous preprompt
+		print -Pn "${clr_prev_preprompt}\e[${lines}A\e[${COLUMNS}D${preprompt}${clr}\n"
+
+		if [[ $prompt_subst_status = 'on' ]]; then
+			# re-eanble prompt_subst for expansion on PS1
+			setopt prompt_subst
+		fi
+
+		# redraw prompt (also resets cursor position)
+		zle && zle .reset-prompt
+	fi
+
+	# store both unexpanded and expanded preprompt for comparison
+	prompt_pure_last_preprompt=("$preprompt" "${(S%%)preprompt}")
+}
+
+prompt_pure_precmd() {
+	# check exec time and store it in a variable
+	prompt_pure_check_cmd_exec_time
+
+	# by making sure that prompt_pure_cmd_timestamp is defined here the async functions are prevented from interfering
+	# with the initial preprompt rendering
+	prompt_pure_cmd_timestamp=
+
+	# shows the full path in the title
+	prompt_pure_set_title 'expand-prompt' '%~'
+
+	# get vcs info
+	vcs_info
+
+	# preform async git dirty check and fetch
+	prompt_pure_async_tasks
+
+	# print the preprompt
+	prompt_pure_preprompt_render "precmd"
+
+	# remove the prompt_pure_cmd_timestamp, indicating that precmd has completed
+	unset prompt_pure_cmd_timestamp
+}
+
+prompt_pure_async_git_aliases() {
+	setopt localoptions noshwordsplit
+	local dir=$1
+	local -a gitalias pullalias
+
+	# we enter repo to get local aliases as well.
+	builtin cd -q $dir
+
+	# list all aliases and split on newline.
+	gitalias=(${(@f)"$(command git config --get-regexp "^alias\.")"})
+	for line in $gitalias; do
+		parts=(${(@)=line})           # split line on spaces
+		aliasname=${parts[1]#alias.}  # grab the name (alias.[name])
+		shift parts                   # remove aliasname
+
+		# check alias for pull or fetch (must be exact match).
+		if [[ $parts =~ ^(.*\ )?(pull|fetch)(\ .*)?$ ]]; then
+			pullalias+=($aliasname)
+		fi
+	done
+
+	print -- ${(j:|:)pullalias}  # join on pipe (for use in regex).
+}
+
+# fastest possible way to check if repo is dirty
+prompt_pure_async_git_dirty() {
+	setopt localoptions noshwordsplit
+	local untracked_dirty=$1 dir=$2
+
+	# use cd -q to avoid side effects of changing directory, e.g. chpwd hooks
+	builtin cd -q $dir
+
+	if [[ $untracked_dirty = 0 ]]; then
+		command git diff --no-ext-diff --quiet --exit-code
+	else
+		test -z "$(command git status --porcelain --ignore-submodules -unormal)"
+	fi
+
+	return $?
+}
+
+prompt_pure_async_git_fetch() {
+	setopt localoptions noshwordsplit
+	# use cd -q to avoid side effects of changing directory, e.g. chpwd hooks
+	builtin cd -q $1
+
+	# set GIT_TERMINAL_PROMPT=0 to disable auth prompting for git fetch (git 2.3+)
+	export GIT_TERMINAL_PROMPT=0
+	# set ssh BachMode to disable all interactive ssh password prompting
+	export GIT_SSH_COMMAND=${GIT_SSH_COMMAND:-"ssh -o BatchMode=yes"}
+
+	command git -c gc.auto=0 fetch &>/dev/null || return 1
+
+	# check arrow status after a successful git fetch
+	prompt_pure_async_git_arrows $1
+}
+
+prompt_pure_async_git_arrows() {
+	setopt localoptions noshwordsplit
+	builtin cd -q $1
+	command git rev-list --left-right --count HEAD...@'{u}'
+}
+
+prompt_pure_async_tasks() {
+	setopt localoptions noshwordsplit
+
+	# initialize async worker
+	((!${prompt_pure_async_init:-0})) && {
+		async_start_worker "prompt_pure" -u -n
+		async_register_callback "prompt_pure" prompt_pure_async_callback
+		prompt_pure_async_init=1
+	}
+
+	# store working_tree without the "x" prefix
+	local working_tree="${vcs_info_msg_1_#x}"
+
+	# check if the working tree changed (prompt_pure_current_working_tree is prefixed by "x")
+	if [[ ${prompt_pure_current_working_tree#x} != $working_tree ]]; then
+		# stop any running async jobs
+		async_flush_jobs "prompt_pure"
+
+		# reset git preprompt variables, switching working tree
+		unset prompt_pure_git_dirty
+		unset prompt_pure_git_last_dirty_check_timestamp
+		unset prompt_pure_git_fetch_pattern
+		prompt_pure_git_arrows=
+
+		# set the new working tree and prefix with "x" to prevent the creation of a named path by AUTO_NAME_DIRS
+		prompt_pure_current_working_tree="x${working_tree}"
+	fi
+
+	# only perform tasks inside git working tree
+	[[ -n $working_tree ]] || return
+
+	if [[ -z $prompt_pure_git_fetch_pattern ]]; then
+		# we set the pattern here to avoid redoing the pattern check until the
+		# working three has changed. pull and fetch are always valid patterns.
+		prompt_pure_git_fetch_pattern="pull|fetch"
+		async_job "prompt_pure" prompt_pure_async_git_aliases $working_tree
+	fi
+
+	async_job "prompt_pure" prompt_pure_async_git_arrows $working_tree
+
+	# do not preform git fetch if it is disabled or working_tree == HOME
+	if (( ${PURE_GIT_PULL:-1} )) && [[ $working_tree != $HOME ]]; then
+		# tell worker to do a git fetch
+		async_job "prompt_pure" prompt_pure_async_git_fetch $working_tree
+	fi
+
+	# if dirty checking is sufficiently fast, tell worker to check it again, or wait for timeout
+	integer time_since_last_dirty_check=$(( EPOCHSECONDS - ${prompt_pure_git_last_dirty_check_timestamp:-0} ))
+	if (( time_since_last_dirty_check > ${PURE_GIT_DELAY_DIRTY_CHECK:-1800} )); then
+		unset prompt_pure_git_last_dirty_check_timestamp
+		# check check if there is anything to pull
+		async_job "prompt_pure" prompt_pure_async_git_dirty ${PURE_GIT_UNTRACKED_DIRTY:-1} $working_tree
+	fi
+}
+
+prompt_pure_check_git_arrows() {
+	setopt localoptions noshwordsplit
+	local arrows left=${1:-0} right=${2:-0}
+
+	(( right > 0 )) && arrows+=${PURE_GIT_DOWN_ARROW:-⇣}
+	(( left > 0 )) && arrows+=${PURE_GIT_UP_ARROW:-⇡}
+
+	[[ -n $arrows ]] || return
+	typeset -g REPLY=" $arrows"
+}
+
+prompt_pure_async_callback() {
+	setopt localoptions noshwordsplit
+	local job=$1 code=$2 output=$3 exec_time=$4
+
+	case $job in
+		prompt_pure_async_git_aliases)
+			if [[ -n $output ]]; then
+				# append custom git aliases to the predefined ones.
+				prompt_pure_git_fetch_pattern+="|$output"
+			fi
+			;;
+		prompt_pure_async_git_dirty)
+			local prev_dirty=$prompt_pure_git_dirty
+			if (( code == 0 )); then
+				prompt_pure_git_dirty=
+			else
+				prompt_pure_git_dirty="*"
+			fi
+
+			[[ $prev_dirty != $prompt_pure_git_dirty ]] && prompt_pure_preprompt_render
+
+			# When prompt_pure_git_last_dirty_check_timestamp is set, the git info is displayed in a different color.
+			# To distinguish between a "fresh" and a "cached" result, the preprompt is rendered before setting this
+			# variable. Thus, only upon next rendering of the preprompt will the result appear in a different color.
+			(( $exec_time > 2 )) && prompt_pure_git_last_dirty_check_timestamp=$EPOCHSECONDS
+			;;
+		prompt_pure_async_git_fetch|prompt_pure_async_git_arrows)
+			# prompt_pure_async_git_fetch executes prompt_pure_async_git_arrows
+			# after a successful fetch.
+			if (( code == 0 )); then
+				local REPLY
+				prompt_pure_check_git_arrows ${(ps:\t:)output}
+				if [[ $prompt_pure_git_arrows != $REPLY ]]; then
+					prompt_pure_git_arrows=$REPLY
+					prompt_pure_preprompt_render
+				fi
+			fi
+			;;
+	esac
+}
+
+prompt_pure_setup() {
+	# prevent percentage showing up
+	# if output doesn't end with a newline
+	export PROMPT_EOL_MARK=''
+
+	prompt_opts=(subst percent)
+
+	# borrowed from promptinit, sets the prompt options in case pure was not
+	# initialized via promptinit.
+	setopt noprompt{bang,cr,percent,subst} "prompt${^prompt_opts[@]}"
+
+	zmodload zsh/datetime
+	zmodload zsh/zle
+	zmodload zsh/parameter
+
+	autoload -Uz add-zsh-hook
+	autoload -Uz vcs_info
+	autoload -Uz async && async
+
+	add-zsh-hook precmd prompt_pure_precmd
+	add-zsh-hook preexec prompt_pure_preexec
+
+	zstyle ':vcs_info:*' enable git
+	zstyle ':vcs_info:*' use-simple true
+	# only export two msg variables from vcs_info
+	zstyle ':vcs_info:*' max-exports 2
+	# vcs_info_msg_0_ = ' %b' (for branch)
+	# vcs_info_msg_1_ = 'x%R' git top level (%R), x-prefix prevents creation of a named path (AUTO_NAME_DIRS)
+	zstyle ':vcs_info:git*' formats ' %b' 'x%R'
+	zstyle ':vcs_info:git*' actionformats ' %b|%a' 'x%R'
+
+	# if the user has not registered a custom zle widget for clear-screen,
+	# override the builtin one so that the preprompt is displayed correctly when
+	# ^L is issued.
+	if [[ $widgets[clear-screen] == 'builtin' ]]; then
+		zle -N clear-screen prompt_pure_clear_screen
+	fi
+
+	# show username@host if logged in through SSH
+	[[ "$SSH_CONNECTION" != '' ]] && prompt_pure_username=' %F{242}%n@%m%f'
+
+	# show username@host if root, with username in white
+	[[ $UID -eq 0 ]] && prompt_pure_username=' %F{white}%n%f%F{242}@%m%f'
+
+	# prompt turns red if the previous command didn't exit with 0
+	PROMPT='%(?.%F{magenta}.%F{red})${PURE_PROMPT_SYMBOL:-❯}%f '
+}
+
+prompt_pure_setup "$@"
diff --git a/zsh/modules/prompt/external-themes/pure/readme.md b/zsh/modules/prompt/external-themes/pure/readme.md
new file mode 100644
index 0000000..3a60e9a
--- /dev/null
+++ b/zsh/modules/prompt/external-themes/pure/readme.md
@@ -0,0 +1,236 @@
+# Pure
+
+> Pretty, minimal and fast ZSH prompt
+
+<img src="screenshot.png" width="864">
+
+
+## Overview
+
+Most prompts are cluttered, ugly and slow. I wanted something visually pleasing that stayed out of my way.
+
+### Why?
+
+- Comes with the perfect prompt character.
+  Author went through the whole Unicode range to find it.
+- Shows `git` branch and whether it's dirty (with a `*`).
+- Indicates when you have unpushed/unpulled `git` commits with up/down arrows. *(Check is done asynchronously!)*
+- Prompt character turns red if the last command didn't exit with `0`.
+- Command execution time will be displayed if it exceeds the set threshold.
+- Username and host only displayed when in an SSH session.
+- Shows the current path in the title and the [current folder & command](screenshot-title-cmd.png) when a process is running.
+- Makes an excellent starting point for your own custom prompt.
+
+
+## Install
+
+Can be installed with `npm` or manually. Requires Git 2.0.0+ and ZSH 5.2+. Older versions of ZSH are known to work, but they are **not** recommended.
+
+### npm
+
+```console
+$ npm install --global pure-prompt
+```
+
+That's it. Skip to [Getting started](#getting-started).
+
+### Manually
+
+1. Either…
+  - Clone this repo
+  - add it as a submodule, or
+  - just download `pure.zsh` and `async.zsh`
+
+2. Symlink `pure.zsh` to somewhere in [`$fpath`](http://www.refining-linux.org/archives/46/ZSH-Gem-12-Autoloading-functions/) with the name `prompt_pure_setup`.
+
+3. Symlink `async.zsh` in `$fpath` with the name `async`.
+
+#### Example
+
+```console
+$ ln -s "$PWD/pure.zsh" /usr/local/share/zsh/site-functions/prompt_pure_setup
+$ ln -s "$PWD/async.zsh" /usr/local/share/zsh/site-functions/async
+```
+*Run `echo $fpath` to see possible locations.*
+
+For a user-specific installation (which would not require escalated privileges), simply add a directory to `$fpath` for that user:
+
+```sh
+# .zshenv or .zshrc
+fpath=( "$HOME/.zfunctions" $fpath )
+```
+
+Then install the theme there:
+
+```console
+$ ln -s "$PWD/pure.zsh" "$HOME/.zfunctions/prompt_pure_setup"
+$ ln -s "$PWD/async.zsh" "$HOME/.zfunctions/async"
+```
+
+
+## Getting started
+
+Initialize the prompt system (if not so already) and choose `pure`:
+
+```sh
+# .zshrc
+autoload -U promptinit; promptinit
+prompt pure
+```
+
+
+## Options
+
+### `PURE_CMD_MAX_EXEC_TIME`
+
+The max execution time of a process before its run time is shown when it exits. Defaults to `5` seconds.
+
+### `PURE_GIT_PULL`
+
+Set `PURE_GIT_PULL=0` to prevent Pure from checking whether the current Git remote has been updated.
+
+### `PURE_GIT_UNTRACKED_DIRTY`
+
+Set `PURE_GIT_UNTRACKED_DIRTY=0` to not include untracked files in dirtiness check. Only really useful on extremely huge repos like the WebKit repo.
+
+### `PURE_GIT_DELAY_DIRTY_CHECK`
+
+Time in seconds to delay git dirty checking for large repositories (git status takes > 2 seconds). The check is performed asynchronously, this is to save CPU. Defaults to `1800` seconds.
+
+### `PURE_PROMPT_SYMBOL`
+
+Defines the prompt symbol. The default value is `❯`.
+
+### `PURE_GIT_DOWN_ARROW`
+
+Defines the git down arrow symbol. The default value is `⇣`.
+
+### `PURE_GIT_UP_ARROW`
+
+Defines the git up arrow symbol. The default value is `⇡`.
+
+## Example
+
+```sh
+# .zshrc
+
+autoload -U promptinit; promptinit
+
+# optionally define some options
+PURE_CMD_MAX_EXEC_TIME=10
+
+prompt pure
+```
+
+
+## Tips
+
+In the screenshot you see Pure running in [Hyper](https://hyper.is) with the [hyper-snazzy](https://github.com/sindresorhus/hyper-snazzy) theme and Menlo font.
+
+The [Tomorrow Night Eighties](https://github.com/chriskempson/tomorrow-theme) theme with the [Droid Sans Mono](https://fonts.google.com/specimen/Droid+Sans+Mono) font (15pt) is also a [nice combination](https://github.com/sindresorhus/pure/blob/95ee3e7618c6e2162a1e3cdac2a88a20ac3beb27/screenshot.png).<br>
+*Just make sure you have anti-aliasing enabled in your terminal.*
+
+To have commands colorized as seen in the screenshot, install [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting).
+
+
+## Integration
+
+### [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+
+1. Symlink (or copy) `pure.zsh` to `~/.oh-my-zsh/custom/pure.zsh-theme`.
+2. Symlink (or copy) `async.zsh` to `~/.oh-my-zsh/custom/async.zsh`.
+3. Set `ZSH_THEME="pure"` in your `.zshrc` file.
+
+Or skip the `oh-my-zsh` integration above and simply:
+
+1. Set `ZSH_THEME=""` in your `.zshrc` to disable oh-my-zsh themes.
+2. Follow the Pure [Install](#install) instructions.
+
+### [prezto](https://github.com/zsh-users/prezto)
+
+Pure is bundled with Prezto. No need to install it.
+
+Set `zstyle ':prezto:module:prompt' theme 'pure'` in `~/.zpreztorc`.
+
+### [zim](https://github.com/Eriner/zim)
+
+Pure is bundled with Zim. No need to install it.
+
+Set `zprompt_theme='pure'` in `~/.zimrc`.
+
+### [antigen](https://github.com/zsh-users/antigen)
+
+Update your `.zshrc` file with the following two lines (order matters). Do not use the `antigen theme` function.
+
+```sh
+antigen bundle mafredri/zsh-async
+antigen bundle sindresorhus/pure
+```
+
+### [antibody](https://github.com/getantibody/antibody)
+
+Update your `.zshrc` file with the following two lines (order matters):
+
+```sh
+antibody bundle mafredri/zsh-async
+antibody bundle sindresorhus/pure
+```
+
+### [zplug](https://github.com/zplug/zplug)
+
+Update your `.zshrc` file with the following two lines:
+
+```sh
+zplug mafredri/zsh-async, from:github
+zplug sindresorhus/pure, use:pure.zsh, from:github, as:theme
+```
+
+## FAQ
+
+### My preprompt is missing when I clear the screen with Ctrl+L
+
+Pure doesn't register its custom *clear-screen* widget if it has been previously modified. If you haven't registered your own zle widget with `zle -N clear-screen custom-clear-screen` it might have been done by third-party modules. For example `zsh-syntax-highlighting` and `zsh-history-substring-search` are known to do this and they should for that reason be **the very last thing** in your `.zshrc` (as pointed out in their documentation).
+
+To find out the culprit that is overriding your *clear-screen* widget, you can run the following command: `zle -l | grep clear-screen`.
+
+### I am stuck in a shell loop in my terminal that ask me to authenticate. What should I do ?
+
+[This is a known issue](https://github.com/sindresorhus/pure/issues/76).
+Using `git pull` when you get the username prompt should help you to break the loop by giving you a real prompt for this. **[This has been fixed in git 2.3](https://github.com/sindresorhus/pure/commit/f43ab97e1cf4a276b7a6e33eac055ee16610be15)**
+
+### I am seeing the error `zpty: can't open pseudo terminal: bad file descriptor`.
+
+[This is a known issue](https://github.com/sindresorhus/pure/issues/117). `zsh/zpty` requires either legacy bsd ptys or access to `/dev/ptmx`. Here are some known solutions.
+
+#### Gentoo
+
+```console
+$ sudo sh -c "echo 'SANDBOX_WRITE=\"/dev/ptmx\"' > /etc/sandbox.d/10zsh"
+$ sudo emerge -1 zsh
+```
+
+#### FreeBSD 10.1
+
+On a default setup, running the command `kldload pty` should do the trick. If you have a custom kernel, you might need to add `device pty` to the configuration file ([example](https://github.com/nbari/freebsd/blob/58646a9c3c4aaabf6f6467ff505f27f09e29dc75/kernels/xen.kernel#L188)).
+
+## Ports
+
+* **Bash**
+	* [sapegin/dotfiles](https://github.com/sapegin/dotfiles)’s [prompt](https://github.com/sapegin/dotfiles/blob/dd063f9c30de7d2234e8accdb5272a5cc0a3388b/includes/bash_prompt.bash) and [color theme](https://github.com/sapegin/dotfiles/tree/master/color) for `Terminal.app`.
+* **Fish**
+	* [brandonweiss/pure.fish](https://github.com/brandonweiss/pure.fish): a Pure-inspired prompt for Fish, not intended to have feature parity.
+	* [rafaelrinaldi/pure](https://github.com/rafaelrinaldi/pure), support for bare Fish and various framework ([Oh-My-Fish](https://github.com//oh-my-fish/oh-my-fish), [Fisherman](https://github.com//fisherman/fisherman) and [Wahoo](https://github.com//bucaran/wahoo)).
+* **Zsh**
+  * [therealklanni/purity](https://github.com/therealklanni/purity): a more compact current working directory, important details on the main prompt line, and extra Git indicators.
+  * [intelfx/pure](https://github.com/intelfx/pure): Solarized-friendly colors, highly verbose and fully async Git integration
+
+## Team
+
+[![Sindre Sorhus](https://avatars.githubusercontent.com/u/170270?v=3&s=100)](http://sindresorhus.com) | [![Mathias Fredriksson](https://avatars.githubusercontent.com/u/147409?v=3&s=100)](https://github.com/mafredri)
+---|---
+[Sindre Sorhus](http://sindresorhus.com) | [Mathias Fredriksson](https://github.com/mafredri)
+
+
+## License
+
+MIT © [Sindre Sorhus](http://sindresorhus.com)
diff --git a/zsh/modules/prompt/external-themes/pure/screenshot-title-cmd.png b/zsh/modules/prompt/external-themes/pure/screenshot-title-cmd.png
new file mode 100644
index 0000000..3f4b77c
Binary files /dev/null and b/zsh/modules/prompt/external-themes/pure/screenshot-title-cmd.png differ
diff --git a/zsh/modules/prompt/external-themes/pure/screenshot.png b/zsh/modules/prompt/external-themes/pure/screenshot.png
new file mode 100644
index 0000000..1a27678
Binary files /dev/null and b/zsh/modules/prompt/external-themes/pure/screenshot.png differ
diff --git a/zsh/modules/prompt/functions/async b/zsh/modules/prompt/functions/async
new file mode 120000
index 0000000..0429419
--- /dev/null
+++ b/zsh/modules/prompt/functions/async
@@ -0,0 +1 @@
+../external-themes/pure/async.zsh
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/ext-liquidprompt b/zsh/modules/prompt/functions/ext-liquidprompt
new file mode 120000
index 0000000..588a0c8
--- /dev/null
+++ b/zsh/modules/prompt/functions/ext-liquidprompt
@@ -0,0 +1 @@
+../external-themes/liquidprompt/liquidprompt
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_eriner_setup b/zsh/modules/prompt/functions/prompt_eriner_setup
new file mode 120000
index 0000000..d727475
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_eriner_setup
@@ -0,0 +1 @@
+../themes/eriner.zsh-theme
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_gitster_setup b/zsh/modules/prompt/functions/prompt_gitster_setup
new file mode 120000
index 0000000..a818a68
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_gitster_setup
@@ -0,0 +1 @@
+../themes/gitster.zsh-theme
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_lean_setup b/zsh/modules/prompt/functions/prompt_lean_setup
new file mode 120000
index 0000000..13294d9
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_lean_setup
@@ -0,0 +1 @@
+../external-themes/lean/prompt_lean_setup
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_liquidprompt_setup b/zsh/modules/prompt/functions/prompt_liquidprompt_setup
new file mode 100644
index 0000000..ebcaf0e
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_liquidprompt_setup
@@ -0,0 +1,13 @@
+prompt_liquidprompt_setup() {
+  autoload -Uz ex-liquidprompt
+
+  ext-liquidprompt
+  prompt_opts=(cr subst percent)
+}
+
+prompt_liquidprompt_preview() {
+  _lp_set_prompt
+  prompt_preview_theme liquidprompt
+}
+
+prompt_liquidprompt_setup "$@"
diff --git a/zsh/modules/prompt/functions/prompt_liquidprompt_setup.zwc b/zsh/modules/prompt/functions/prompt_liquidprompt_setup.zwc
new file mode 100644
index 0000000..3b2443e
Binary files /dev/null and b/zsh/modules/prompt/functions/prompt_liquidprompt_setup.zwc differ
diff --git a/zsh/modules/prompt/functions/prompt_magicmace_setup b/zsh/modules/prompt/functions/prompt_magicmace_setup
new file mode 120000
index 0000000..cafc569
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_magicmace_setup
@@ -0,0 +1 @@
+../themes/magicmace.zsh-theme
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_minimal_setup b/zsh/modules/prompt/functions/prompt_minimal_setup
new file mode 120000
index 0000000..7e226df
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_minimal_setup
@@ -0,0 +1 @@
+../themes/minimal.zsh-theme
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_pure_setup b/zsh/modules/prompt/functions/prompt_pure_setup
new file mode 120000
index 0000000..30f245d
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_pure_setup
@@ -0,0 +1 @@
+../external-themes/pure/pure.zsh
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/prompt_steeef_setup b/zsh/modules/prompt/functions/prompt_steeef_setup
new file mode 120000
index 0000000..c2abe5e
--- /dev/null
+++ b/zsh/modules/prompt/functions/prompt_steeef_setup
@@ -0,0 +1 @@
+../themes/steeef.zsh-theme
\ No newline at end of file
diff --git a/zsh/modules/prompt/functions/short_pwd b/zsh/modules/prompt/functions/short_pwd
new file mode 100644
index 0000000..37950cc
--- /dev/null
+++ b/zsh/modules/prompt/functions/short_pwd
@@ -0,0 +1,13 @@
+# shortens the pwd for use in prompt
+
+local current_dir="${1:-${PWD}}"
+local return_dir='~'
+
+current_dir="${current_dir/#${HOME}/~}"
+
+# if we aren't in ~
+if [[ ${current_dir} != '~' ]]; then
+  return_dir="${${${${(@j:/:M)${(@s:/:)current_dir}##.#?}:h}%/}//\%/%%}/${${current_dir:t}//\%/%%}"
+fi
+
+print ${return_dir}
diff --git a/zsh/modules/prompt/functions/short_pwd.zwc b/zsh/modules/prompt/functions/short_pwd.zwc
new file mode 100644
index 0000000..e1af8c1
Binary files /dev/null and b/zsh/modules/prompt/functions/short_pwd.zwc differ
diff --git a/zsh/modules/prompt/init.zsh b/zsh/modules/prompt/init.zsh
new file mode 100644
index 0000000..abe443c
--- /dev/null
+++ b/zsh/modules/prompt/init.zsh
@@ -0,0 +1,8 @@
+#
+# load user-defined prompt
+#
+
+if [[ ! ${TERM} == (linux|*bsd*|dumb) ]] && (( ${+zprompt_theme} )); then
+  autoload -Uz promptinit && promptinit
+  prompt ${zprompt_theme}
+fi
diff --git a/zsh/modules/prompt/themes/eriner.zsh-theme b/zsh/modules/prompt/themes/eriner.zsh-theme
new file mode 100644
index 0000000..ef4a1b9
--- /dev/null
+++ b/zsh/modules/prompt/themes/eriner.zsh-theme
@@ -0,0 +1,117 @@
+# vim:ts=2 sw=2 sts=2 ft=zsh
+#
+# Eriner's Theme - fork of agnoster
+# A Powerline-inspired theme for ZSH
+#
+# In order for this theme to render correctly, you will need a font with
+# powerline symbols. A simple way to add the powerline symbols is to follow the
+# instructions here:
+# https://simplyian.com/2014/03/28/using-powerline-symbols-with-your-current-font/
+#
+# The aim of this theme is to only show you *relevant* information. Like most
+# prompts, it will only show git information when in a git working directory.
+# However, it goes a step further: everything from the current user and
+# hostname to whether the last call exited with an error to whether background
+# jobs are running in this shell will all be displayed automatically when
+# appropriate.
+#
+# Requires the `git-info` zmodule to be included in the .zimrc file.
+
+### Segment drawing
+# Utility functions to make it easy and re-usable to draw segmented prompts.
+
+local prompt_eriner_bg
+
+# Begin a segment. Takes two arguments, background color and contents of the
+# new segment.
+prompt_eriner_segment() {
+  print -n "%K{$1}"
+  if [[ -n ${prompt_eriner_bg} ]]; then
+    print -n "%F{${prompt_eriner_bg}}"
+  fi
+  print -n "$2"
+  prompt_eriner_bg=$1
+}
+
+# End the prompt, closing last segment.
+prompt_eriner_end() {
+  print -n "%k%F{${prompt_eriner_bg}}%f "
+}
+
+### Prompt components
+# Each component will draw itself, or hide itself if no information needs to be
+# shown.
+
+# Status: Was there an error? Am I root? Are there background jobs? Who and
+# where am I (user@hostname)?
+prompt_eriner_status() {
+  local segment=''
+  (( ${RETVAL} )) && segment+=' %F{red}✘'
+  (( ${UID} == 0 )) && segment+=' %F{yellow}⚡'
+  (( $(jobs -l | wc -l) > 0 )) && segment+=' %F{cyan}⚙'
+  if [[ ${USER} != ${DEFAULT_USER} || -n ${SSH_CLIENT} ]]; then
+     segment+=' %F{%(!.yellow.default)}${USER}@%m'
+  fi
+  if [[ -n ${segment} ]]; then
+    prompt_eriner_segment black "${segment} "
+  fi
+}
+
+# Ranger: <https://github.com/ranger/ranger>, which can spawn a shell under its
+# own process.
+prompt_eriner_ranger() {
+  if (( ${RANGER_LEVEL} )); then
+    prompt_eriner_segment blue ' %F{black}r '
+  fi
+}
+
+# Pwd: current working directory.
+prompt_eriner_pwd() {
+  prompt_eriner_segment cyan " %F{black}$(short_pwd) "
+}
+
+# Git: branch/detached head, dirty status.
+prompt_eriner_git() {
+  if [[ -n ${git_info} ]]; then
+    local indicator
+    [[ ${git_info[color]} == yellow ]] && indicator='± '
+    prompt_eriner_segment ${git_info[color]} " %F{black}${(e)git_info[prompt]} ${indicator}"
+  fi
+}
+
+### Main prompt
+prompt_eriner_main() {
+  RETVAL=$?
+  prompt_eriner_status
+  prompt_eriner_ranger
+  prompt_eriner_pwd
+  prompt_eriner_git
+  prompt_eriner_end
+}
+
+prompt_eriner_precmd() {
+  (( ${+functions[git-info]} )) && git-info
+}
+
+prompt_eriner_setup() {
+  autoload -Uz colors && colors
+  autoload -Uz add-zsh-hook
+
+  prompt_opts=(cr percent subst)
+
+  add-zsh-hook precmd prompt_eriner_precmd
+
+  zstyle ':zim:git-info:branch' format ' %b'
+  zstyle ':zim:git-info:commit' format '➦ %c'
+  zstyle ':zim:git-info:action' format ' (%s)'
+  zstyle ':zim:git-info:clean' format 'green'
+  zstyle ':zim:git-info:dirty' format 'yellow'
+  zstyle ':zim:git-info:keys' format \
+    'prompt' '%b%c%s' \
+    'color' '%C%D'
+
+  PROMPT='${(e)$(prompt_eriner_main)}'
+  RPROMPT=''
+}
+
+prompt_eriner_setup "$@"
diff --git a/zsh/modules/prompt/themes/gitster.zsh-theme b/zsh/modules/prompt/themes/gitster.zsh-theme
new file mode 100644
index 0000000..55c52c1
--- /dev/null
+++ b/zsh/modules/prompt/themes/gitster.zsh-theme
@@ -0,0 +1,44 @@
+#
+# Gitster theme
+# https://github.com/shashankmehta/dotfiles/blob/master/thesetup/zsh/.oh-my-zsh/custom/themes/gitster.zsh-theme
+#
+# Requires the `git-info` zmodule to be included in the .zimrc file.
+
+prompt_gitster_status() {
+  print -n '%(?:%F{green}➜:%F{red}➜) '
+}
+
+prompt_gitster_pwd() {
+  prompt_short_dir=$(short_pwd)
+  git_root=$(command git rev-parse --show-toplevel 2> /dev/null) && prompt_short_dir=${prompt_short_dir#${$(short_pwd $git_root):h}/}
+  print -n "%F{white}${prompt_short_dir}"
+}
+
+prompt_gitster_git() {
+  [[ -n ${git_info} ]] && print -n "${(e)git_info[prompt]}"
+}
+
+prompt_gitster_precmd() {
+  (( ${+functions[git-info]} )) && git-info
+}
+
+prompt_gitster_setup() {
+  autoload -Uz colors && colors
+  autoload -Uz add-zsh-hook
+
+  prompt_opts=(cr percent subst)
+
+  add-zsh-hook precmd prompt_gitster_precmd
+
+  zstyle ':zim:git-info:branch' format '%b'
+  zstyle ':zim:git-info:commit' format '%c'
+  zstyle ':zim:git-info:clean' format '%F{green}✓'
+  zstyle ':zim:git-info:dirty' format '%F{yellow}✗'
+  zstyle ':zim:git-info:keys' format \
+    'prompt' ' %F{cyan}%b%c %C%D'
+
+  PROMPT='$(prompt_gitster_status)$(prompt_gitster_pwd)$(prompt_gitster_git)%f '
+  RPROMPT=''
+}
+
+prompt_gitster_setup "$@"
diff --git a/zsh/modules/prompt/themes/magicmace.zsh-theme b/zsh/modules/prompt/themes/magicmace.zsh-theme
new file mode 100644
index 0000000..038d46e
--- /dev/null
+++ b/zsh/modules/prompt/themes/magicmace.zsh-theme
@@ -0,0 +1,73 @@
+#
+# magicmace theme
+# Ideas and code taken from:
+#   xero's zsh prompt <http://code.xero.nu/dotfiles>
+#   eriner's eriner prompt <https://github.com/Eriner/zim/blob/master/modules/prompt/themes/eriner.zsh-theme>
+#
+# Requires the `git-info` zmodule to be included in the .zimrc file.
+
+# Global variables
+function {
+  COLOR_ROOT="%F{red}"
+  COLOR_USER="%F{cyan}"
+  COLOR_NORMAL="%F{white}"
+  COLOR_ERROR="%F{red}"
+
+  if (( ${EUID} )); then
+    COLOR_USER_LEVEL=${COLOR_USER}
+  else
+    COLOR_USER_LEVEL=${COLOR_ROOT}
+  fi
+}
+
+# Status:
+# - was there an error?
+# - are there background jobs?
+# - are we in a ranger session?
+prompt_magicmace_status() {
+  local symbols=""
+
+  (( ${RETVAL} )) && symbols+="${COLOR_ERROR}${RETVAL}${COLOR_NORMAL}" # $? for error.
+  (( $(jobs -l | wc -l) > 0 )) && symbols+='b' # 'b' for background.
+  (( ${RANGER_LEVEL} )) && symbols+='r' # 'r' for... you guessed it!
+
+  [[ -n ${symbols} ]] && print -n "─${COLOR_NORMAL}${symbols}${COLOR_USER_LEVEL}─"
+}
+
+prompt_magicmace_git() {
+  [[ -n ${git_info} ]] && print -n "${(e)git_info[prompt]}"
+}
+
+prompt_magicmace_precmd() {
+  # While it would be apt to have this as a local variable in prompt_status(),
+  # $? (returned value) and ${(%):-%?} ("The return status of the last command
+  # executed just before the prompt") both change before executing the function.
+  # Is this perhaps because prompt_status _is_ here?
+  # We could also just set $? as an argument, and thus get our nifty local variable,
+  # but that's stretching it, and makes the code harder to read.
+  RETVAL=$?
+  (( ${+functions[git-info]} )) && git-info
+}
+
+prompt_magicmace_setup() {
+  autoload -Uz colors && colors
+  autoload -Uz add-zsh-hook
+
+  prompt_opts=(cr percent subst)
+
+  add-zsh-hook precmd prompt_magicmace_precmd
+
+  zstyle ':zim:git-info:branch' format '%b'
+  zstyle ':zim:git-info:commit' format '%c...'
+  zstyle ':zim:git-info:dirty' format '*'
+  zstyle ':zim:git-info:ahead' format '↑'
+  zstyle ':zim:git-info:behind' format '↓'
+  zstyle ':zim:git-info:keys' format \
+    'prompt' '─[${COLOR_NORMAL}%b%c%D%A%B${COLOR_USER_LEVEL}]'
+
+  # Call git directly, ignoring aliases under the same name.
+  PROMPT='${COLOR_USER_LEVEL}$(prompt_magicmace_status)[${COLOR_NORMAL}$(short_pwd)${COLOR_USER_LEVEL}]$(prompt_magicmace_git)── ─%f '
+  RPROMPT=''
+}
+
+prompt_magicmace_setup "$@"
diff --git a/zsh/modules/prompt/themes/minimal.zsh-theme b/zsh/modules/prompt/themes/minimal.zsh-theme
new file mode 100644
index 0000000..839a790
--- /dev/null
+++ b/zsh/modules/prompt/themes/minimal.zsh-theme
@@ -0,0 +1,98 @@
+#
+# Minimal theme
+# https://github.com/S1cK94/minimal
+#
+
+minimal_user() {
+  print "%(!.$on_color.$off_color)$prompt_char%f"
+}
+
+minimal_jobs() {
+  print "%(1j.$on_color.$off_color)$prompt_char%f"
+}
+
+minimal_vimode(){
+  local ret=""
+
+  case $KEYMAP in
+    main|viins)
+      ret+="$on_color"
+      ;;
+    vicmd)
+      ret+="$off_color"
+      ;;
+  esac
+
+  ret+="$prompt_char%f"
+
+  print "$ret"
+}
+
+minimal_status() {
+  print "%(0?.$on_color.$err_color)$prompt_char%f"
+}
+
+minimal_path() {
+  local path_color="%F{244}"
+  local rsc="%f"
+  local sep="$rsc/$path_color"
+
+  print "$path_color$(sed s_/_${sep}_g <<< $(short_pwd))$rsc"
+}
+
+git_branch_name() {
+  local branch_name="$(command git rev-parse --abbrev-ref HEAD 2> /dev/null)"
+  [[ -n $branch_name ]] && print "$branch_name"
+}
+
+git_repo_status(){
+  local rs="$(command git status --porcelain -b)"
+
+  if $(print "$rs" | grep -v '^##' &> /dev/null); then # is dirty
+    print "%F{red}"
+  elif $(print "$rs" | grep '^## .*diverged' &> /dev/null); then # has diverged
+    print "%F{red}"
+  elif $(print "$rs" | grep '^## .*behind' &> /dev/null); then # is behind
+    print "%F{11}"
+  elif $(print "$rs" | grep '^## .*ahead' &> /dev/null); then # is ahead
+    print "%f"
+  else # is clean
+    print "%F{green}"
+  fi
+}
+
+minimal_git() {
+  local bname=$(git_branch_name)
+  if [[ -n ${bname} ]]; then
+    local infos="$(git_repo_status)${bname}%f"
+    print " $infos"
+  fi
+}
+
+function zle-line-init zle-line-finish zle-keymap-select {
+  zle reset-prompt
+  zle -R
+}
+
+prompt_minimal_precmd() {
+  zle -N zle-line-init
+  zle -N zle-keymap-select
+  zle -N zle-line-finish
+
+  PROMPT='$(minimal_user)$(minimal_jobs)$(minimal_vimode)$(minimal_status) '
+  RPROMPT='$(minimal_path)$(minimal_git)'
+}
+
+prompt_minimal_setup() {
+  prompt_char="❯"
+  on_color="%F{green}"
+  off_color="%f"
+  err_color="%F{red}"
+
+  autoload -Uz add-zsh-hook
+
+  add-zsh-hook precmd prompt_minimal_precmd
+  prompt_opts=(cr subst percent)
+}
+
+prompt_minimal_setup "$@"
diff --git a/zsh/modules/prompt/themes/steeef.zsh-theme b/zsh/modules/prompt/themes/steeef.zsh-theme
new file mode 100644
index 0000000..0d44159
--- /dev/null
+++ b/zsh/modules/prompt/themes/steeef.zsh-theme
@@ -0,0 +1,102 @@
+# prompt style and colors based on Steve Losh's Prose theme:
+# http://github.com/sjl/oh-my-zsh/blob/master/themes/prose.zsh-theme
+#
+# vcs_info modifications from Bart Trojanowski's zsh prompt:
+# http://www.jukie.net/bart/blog/pimping-out-zsh-prompt
+#
+# git untracked files modification from Brian Carper:
+# http://briancarper.net/blog/570/git-info-in-your-zsh-prompt
+
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+
+virtualenv_info() {
+  [ ${VIRTUAL_ENV} ] && print '('${fg[blue]}${VIRTUAL_ENV:t}%{${reset_color}%}') '
+}
+
+steeef_preexec() {
+  case "$(history $HISTCMD)" in
+    *git*)PR_GIT_UPDATE=1
+          ;;
+    *svn*)PR_GIT_UPDATE=1
+          ;;
+  esac
+}
+
+steeef_chpwd() {
+  PR_GIT_UPDATE=1
+}
+
+prompt_steeef_precmd() {
+  if [[ -n "$PR_GIT_UPDATE" ]] ; then
+    # check for untracked files or updated submodules, since vcs_info doesn't
+    if git ls-files --other --exclude-standard 2> /dev/null | grep -q "."; then
+      PR_GIT_UPDATE=1
+      FMT_BRANCH="(%{$turquoise%}%b%u%c%{$hotpink%}●${PR_RST})"
+    else
+      FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+    fi
+    zstyle ':vcs_info:*:prompt:*' formats "${FMT_BRANCH} "
+
+    vcs_info 'prompt'
+  fi
+
+  PROMPT='
+%{$purple%}%n${${reset_color}%} at %{$orange%}%m${${reset_color}%} in %{$limegreen%}%~${${reset_color}%} $vcs_info_msg_0_$(virtualenv_info)%{${reset_color}%}
+%(!.#.$) '
+}
+
+prompt_steeef_setup() {
+  #use extended color pallete if available
+  if [[ ${TERM} == *256* || ${TERM} == *rxvt* ]]; then
+    turquoise="%F{81}"
+    orange="%F{166}"
+    purple="%F{135}"
+    hotpink="%F{161}"
+    limegreen="%F{118}"
+  else
+    turquoise="%F{cyan}"
+    orange="%F{yellow}"
+    purple="%F{magenta}"
+    hotpink="%F{red}"
+    limegreen="%F{green}"
+  fi
+
+  # enable VCS systems you use
+  zstyle ':vcs_info:*' enable git svn
+
+  # check-for-changes can be really slow.
+  # you should disable it, if you work with large repositories
+  zstyle ':vcs_info:*:prompt:*' check-for-changes true
+
+  # set formats
+  # %b - branchname
+  # %u - unstagedstr (see below)
+  # %c - stagedstr (see below)
+  # %a - action (e.g. rebase-i)
+  # %R - repository path
+  # %S - path in the repository
+  PR_RST="%f"
+  FMT_BRANCH="(%{$turquoise%}%b%u%c${PR_RST})"
+  FMT_ACTION="(%{$limegreen%}%a${PR_RST})"
+  FMT_UNSTAGED="%{$orange%}●"
+  FMT_STAGED="%{$limegreen%}●"
+
+  zstyle ':vcs_info:*:prompt:*' unstagedstr   "${FMT_UNSTAGED}"
+  zstyle ':vcs_info:*:prompt:*' stagedstr     "${FMT_STAGED}"
+  zstyle ':vcs_info:*:prompt:*' actionformats "${FMT_BRANCH}${FMT_ACTION}"
+  zstyle ':vcs_info:*:prompt:*' formats       "${FMT_BRANCH}"
+  zstyle ':vcs_info:*:prompt:*' nvcsformats   ""
+
+  PR_GIT_UPDATE=1
+
+  autoload -Uz add-zsh-hook
+  autoload -Uz vcs_info
+  autoload -Uz colors && colors
+
+  add-zsh-hook preexec steeef_preexec
+  add-zsh-hook chpwd steeef_chpwd
+  add-zsh-hook precmd prompt_steeef_precmd
+  prompt_opts=(cr subst percent)
+}
+
+prompt_steeef_setup "$@"
diff --git a/zsh/modules/spectrum/README.md b/zsh/modules/spectrum/README.md
new file mode 100644
index 0000000..97451b3
--- /dev/null
+++ b/zsh/modules/spectrum/README.md
@@ -0,0 +1,8 @@
+Spectrum
+========
+
+Provides initialization for easy 256 colours and effects.
+
+See [a guide to 256 color codes](http://lucentbeing.com/writing/archives/a-guide-to-256-color-codes/), in particular, the "Spectrum, a ZSH Abstraction" section.
+
+
diff --git a/zsh/modules/spectrum/init.zsh b/zsh/modules/spectrum/init.zsh
new file mode 100644
index 0000000..3300228
--- /dev/null
+++ b/zsh/modules/spectrum/init.zsh
@@ -0,0 +1,39 @@
+#
+# Provides for easier use of 256 colors and effects.
+#
+
+# Return if requirements are not found.
+if [[ ${TERM} == 'dumb' ]]; then
+  return 1
+elif
+  [[ -n ${FX} ]]; then
+  # FX is set or sourced by another module
+  return 1
+fi
+
+typeset -gA FX FG BG
+
+FX=(
+                                        reset                        "\e[00m"
+                                        normal                       "\e[22m"
+  bold                      "\e[01m"    no-bold                      "\e[22m"
+  italic                    "\e[03m"    no-italic                    "\e[23m"
+  underline                 "\e[04m"    no-underline                 "\e[24m"
+  blink                     "\e[05m"    no-blink                     "\e[25m"
+  reverse                   "\e[07m"    no-reverse                   "\e[27m"
+)
+
+FG[none]="${FX[none]}"
+BG[none]="${FX[none]}"
+colors=(black red green yellow blue magenta cyan white)
+for color in {0..255}; do
+  if (( ${color} >= 0 )) && (( ${color} < ${#colors} )); then
+    index=$(( ${color} + 1 ))
+    FG[${colors[${index}]}]="\e[38;5;${color}m"
+    BG[${colors[${index}]}]="\e[48;5;${color}m"
+  fi
+
+  FG[${color}]="\e[38;5;${color}m"
+  BG[${color}]="\e[48;5;${color}m"
+done
+unset color{s,} index
diff --git a/zsh/modules/spectrum/init.zsh.zwc b/zsh/modules/spectrum/init.zsh.zwc
new file mode 100644
index 0000000..674b928
Binary files /dev/null and b/zsh/modules/spectrum/init.zsh.zwc differ
diff --git a/zsh/modules/ssh/README.md b/zsh/modules/ssh/README.md
new file mode 100644
index 0000000..ea176c1
--- /dev/null
+++ b/zsh/modules/ssh/README.md
@@ -0,0 +1,9 @@
+SSH
+===
+
+Provides a convenient way to load ssh-agent. This enables one-time login and caching of SSH credentials per session.
+
+.zimrc Configuration
+--------------------
+
+  * `zssh_ids=(id_rsa)` add any identities (from ~/.ssh) to this list to have them loaded and cached on login.
diff --git a/zsh/modules/ssh/init.zsh b/zsh/modules/ssh/init.zsh
new file mode 100644
index 0000000..4411406
--- /dev/null
+++ b/zsh/modules/ssh/init.zsh
@@ -0,0 +1,46 @@
+#
+# sets up ssh-agent
+#
+
+# don't do anything unless we can actually use ssh-agent
+if (( ! ${+commands[ssh-agent]} )); then
+  return 1
+fi
+
+# use a sane temp dir; creating 1k ssh-* files in /tmp is crazy
+if [[ ${TMPDIR} ]]; then
+  local ssh_env=${TMPDIR}/ssh-agent.env
+  local ssh_sock=${TMPDIR}/ssh-agent.sock
+else
+  # create a sane tmp dir at /tmp/username
+  mkdir -p /tmp/${USER}
+  local ssh_env=/tmp/${USER}/ssh-agent.env
+  local ssh_sock=/tmp/${USER}/ssh-agent.sock
+fi
+
+# start ssh-agent if not already running
+if [[ ! -S ${SSH_AUTH_SOCK} ]]; then
+  # read environment if possible
+  source ${ssh_env} 2> /dev/null
+
+  if ! ps -U ${LOGNAME} -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
+    eval "$(ssh-agent | sed '/^echo /d' | tee ${ssh_env})"
+  fi
+fi
+
+# create socket
+if [[ -S ${SSH_AUTH_SOCKET} && ${SSH_AUTH_SOCKET} != ${ssh_sock} ]]; then
+  ln -sf ${SSH_AUTH_SOCKET} ${ssh_sock}
+  export SSH_AUTH_SOCK=${ssh_sock}
+fi
+
+# load ids
+if ssh-add -l 2>&1 | grep -q 'no identities'; then
+  if (( ${#zssh_ids} > 0 )); then
+    ssh-add "${HOME}/.ssh/${^zssh_ids[@]}" 2> /dev/null
+  else
+    ssh-add 2> /dev/null
+  fi
+fi
+
+unset ssh_{sock,env}
diff --git a/zsh/modules/syntax-highlighting/README.md b/zsh/modules/syntax-highlighting/README.md
new file mode 100644
index 0000000..8f224cd
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/README.md
@@ -0,0 +1,21 @@
+Syntax-Highlighting
+===================
+
+Adds fish shell-like [syntax highlighting](https://github.com/zsh-users/zsh-syntax-highlighting) to your shell.
+
+![syntax-highlighting][syntax_highlighting]
+
+If you are also using [history-substring-search](https://github.com/Eriner/zim/blob/master/modules/history-substring-search/README.md), 
+ensure you have placed 'syntax-highlighting' before 'history-substring-search' on the second line of `zmodules` in your `.zimrc`.
+
+.zimrc Configuration
+--------------------
+
+  * `zhighlighters=(main brackets cursor)` add any highlighters you want as described [here](https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md#zsh-syntax-highlighting--highlighters).
+
+Contributing
+------------
+
+Contributions should be submitted [upstream to zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)
+
+[syntax_highlighting]: https://i.eriner.me/zim_syntax-highlighting.gif
diff --git a/zsh/modules/syntax-highlighting/external/.gitattributes b/zsh/modules/syntax-highlighting/external/.gitattributes
new file mode 100644
index 0000000..715e624
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/.gitattributes
@@ -0,0 +1 @@
+.revision-hash export-subst
diff --git a/zsh/modules/syntax-highlighting/external/.gitignore b/zsh/modules/syntax-highlighting/external/.gitignore
new file mode 100644
index 0000000..18fa5ec
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/.gitignore
@@ -0,0 +1,3 @@
+*.zwc*
+.pc/
+docs/all.md
diff --git a/zsh/modules/syntax-highlighting/external/.revision-hash b/zsh/modules/syntax-highlighting/external/.revision-hash
new file mode 100644
index 0000000..6828f88
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/.revision-hash
@@ -0,0 +1 @@
+$Format:%H$
diff --git a/zsh/modules/syntax-highlighting/external/.version b/zsh/modules/syntax-highlighting/external/.version
new file mode 100644
index 0000000..fb0b754
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/.version
@@ -0,0 +1 @@
+0.6.0-dev
diff --git a/zsh/modules/syntax-highlighting/external/COPYING.md b/zsh/modules/syntax-highlighting/external/COPYING.md
new file mode 100644
index 0000000..3d6b811
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/COPYING.md
@@ -0,0 +1,23 @@
+Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+All rights reserved.
+
+Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+   may be used to endorse or promote products derived from this software without specific prior
+   written permission.
+
+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 HOLDER 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.
diff --git a/zsh/modules/syntax-highlighting/external/HACKING.md b/zsh/modules/syntax-highlighting/external/HACKING.md
new file mode 100644
index 0000000..39d82fa
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/HACKING.md
@@ -0,0 +1,75 @@
+Hacking on zsh-syntax-highlighting itself
+=========================================
+
+This document includes information for people working on z-sy-h itself: on the
+core driver (`zsh-syntax-highlighting.zsh`), on the highlighters in the
+distribution, and on the test suite.  It does not target third-party
+highlighter authors (although they may find it an interesting read).
+
+The `main` highlighter
+----------------------
+
+The following function `pz` is useful when working on the `main` highlighting:
+
+    pq() {
+      (( $#argv )) || return 0
+      print -r -l -- ${(qqqq)argv}
+    }
+    pz() {
+      local arg
+      for arg; do
+        pq ${(z)arg}
+      done
+    }
+
+It prints, for each argument, its token breakdown, similar to how the main
+loop of the `main` highlighter sees it.
+
+Testing the `brackets` highlighter
+----------------------------------
+
+Since the test harness empties `ZSH_HIGHLIGHT_STYLES` and the `brackets`
+highlighter interrogates `ZSH_HIGHLIGHT_STYLES` to determine how to highlight,
+tests must set the `bracket-level-#` keys themselves.  For example:
+
+    ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+    ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+    BUFFER='echo ({x})'
+
+    expected_region_highlight=(
+      "6  6  bracket-level-1" # (
+      "7  7  bracket-level-2" # {
+      "9  9  bracket-level-2" # }
+      "10 10 bracket-level-1" # )
+    )
+
+Testing the `pattern` highlighter
+---------------------------------
+
+Because the `pattern` highlighter modifies `region_highlight` directly instead
+of using `_zsh_highlight_add_highlight`, the test harness cannot get the
+`ZSH_HIGHLIGHT_STYLES` keys.  Therefore, when writing tests, use the style
+itself as third word (cf. the [documentation for `expected_region_highlight`]
+(docs/highlighters.md)).  For example:
+
+    ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+
+    BUFFER='rm -rf /'
+
+    expected_region_highlight=(
+      "1 8 fg=white,bold,bg=red" # rm -rf /
+    )
+
+Miscellany
+----------
+
+If you work on the driver (`zsh-syntax-highlighting.zsh`), you may find the following zstyle useful:
+
+    zstyle ':completion:*:*:*:*:globbed-files' ignored-patterns {'*/',}zsh-syntax-highlighting.plugin.zsh
+
+IRC channel
+-----------
+
+We're on #zsh-syntax-highlighting on freenode.
+
diff --git a/zsh/modules/syntax-highlighting/external/INSTALL.md b/zsh/modules/syntax-highlighting/external/INSTALL.md
new file mode 100644
index 0000000..8532560
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/INSTALL.md
@@ -0,0 +1,105 @@
+How to install
+--------------
+
+### Using packages
+
+* Arch Linux: [community/zsh-syntax-highlighting][arch-package] / [AUR/zsh-syntax-highlighting-git][AUR-package]
+* Debian: `zsh-syntax-highlighting` package [in `stretch`][debian-package]
+* Fedora: [zsh-syntax-highlighting package][fedora-package] in Fedora 24+
+* FreeBSD: `pkg install zsh-syntax-highlighting` (port name: [`textproc/zsh-syntax-highlighting`][freebsd-port])
+* Gentoo: [mv overlay][gentoo-overlay]
+* Mac OS X / Homebrew: [brew install zsh-syntax-highlighting][brew-package]
+* Ubuntu: `zsh-syntax-highlighting` package [in Xenial][ubuntu-package]
+
+[arch-package]: https://www.archlinux.org/packages/zsh-syntax-highlighting
+[AUR-package]: https://aur.archlinux.org/packages/zsh-syntax-highlighting-git
+[debian-package]: https://packages.debian.org/zsh-syntax-highlighting
+[freebsd-port]: http://www.freshports.org/textproc/zsh-syntax-highlighting/
+[gentoo-overlay]: http://gpo.zugaina.org/app-shells/zsh-syntax-highlighting
+[brew-package]: https://github.com/Homebrew/homebrew-core/blob/master/Formula/zsh-syntax-highlighting.rb
+[ubuntu-package]: https://launchpad.net/ubuntu/+source/zsh-syntax-highlighting
+[fedora-package]: https://apps.fedoraproject.org/packages/zsh-syntax-highlighting
+
+
+### In your ~/.zshrc
+
+Simply clone this repository and source the script:
+
+        git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
+        echo "source ${(q-)PWD}/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
+
+  Then, enable syntax highlighting in the current interactive shell:
+
+        source ./zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+  If `git` is not installed, download and extract a snapshot of the latest
+  development tree from:
+
+        https://github.com/zsh-users/zsh-syntax-highlighting/archive/master.tar.gz
+
+  Note the `source` command must be **at the end** of `~/.zshrc`.
+
+
+### With a plugin manager
+
+Note that `zsh-syntax-highlighting` must be the last plugin sourced.
+
+The zsh-syntax-highlighting authors recommend manual installation over the use
+of a framework or plugin manager.
+
+This list is incomplete as there are too many [frameworks / plugin managers]
+(https://github.com/unixorn/awesome-zsh-plugins#frameworks) to list them all
+here.
+
+#### [Antigen](https://github.com/zsh-users/antigen)
+
+Add `antigen bundle zsh-users/zsh-syntax-highlighting` as the last bundle in
+your `.zshrc`.
+
+#### [Oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+
+1. Clone this repository in oh-my-zsh's plugins directory:
+
+        git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+
+2. Activate the plugin in `~/.zshrc`:
+
+        plugins=( [plugins...] zsh-syntax-highlighting)
+
+3. Source `~/.zshrc`  to take changes into account:
+
+        source ~/.zshrc
+
+#### [Prezto](https://github.com/sorin-ionescu/prezto)
+
+Zsh-syntax-highlighting is included with Prezto. See the [Prezto documentation]
+(https://github.com/sorin-ionescu/prezto/tree/master/modules/syntax-highlighting)
+to enable and configure highlighters.
+
+#### [zgen](https://github.com/tarjoilija/zgen)
+
+Add `zgen load zsh-users/zsh-syntax-highlighting` to the end of your `.zshrc`.
+
+#### [zplug](https://github.com/zplug/zplug)
+
+Add `zplug "zsh-users/zsh-syntax-highlighting", defer:2` to your `.zshrc`.
+
+#### [zplugin](https://github.com/psprint/zplugin)
+
+Add `zplugin load zsh-users/zsh-syntax-highlighting` to the end of your
+`.zshrc`.
+
+
+### System-wide installation
+
+Any of the above methods is suitable for a single-user installation,
+which requires no special privileges.  If, however, you desire to install
+zsh-syntax-highlighting system-wide, you may do so by running
+
+    make install
+
+and directing your users to add
+
+    source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+to their `.zshrc`s.
diff --git a/zsh/modules/syntax-highlighting/external/Makefile b/zsh/modules/syntax-highlighting/external/Makefile
new file mode 100644
index 0000000..f454324
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/Makefile
@@ -0,0 +1,62 @@
+NAME=zsh-syntax-highlighting
+
+INSTALL?=install -c
+PREFIX?=/usr/local
+SHARE_DIR?=$(DESTDIR)$(PREFIX)/share/$(NAME)
+DOC_DIR?=$(DESTDIR)$(PREFIX)/share/doc/$(NAME)
+ZSH?=zsh # zsh binary to run tests with
+
+all:
+	cd docs && \
+	cp highlighters.md all.md && \
+	printf '\n\nIndividual highlighters documentation\n=====================================' >> all.md && \
+	for doc in highlighters/*.md; do printf '\n\n'; cat "$$doc"; done >> all.md
+
+install: all
+	$(INSTALL) -d $(SHARE_DIR)
+	$(INSTALL) -d $(DOC_DIR)
+	cp .version zsh-syntax-highlighting.zsh $(SHARE_DIR)
+	cp COPYING.md README.md changelog.md $(DOC_DIR)
+	if [ x"true" = x"`git rev-parse --is-inside-work-tree 2>/dev/null`" ]; then \
+		git rev-parse HEAD; \
+	else \
+		cat .revision-hash; \
+	fi > $(SHARE_DIR)/.revision-hash
+	:
+# The [ -e ] check below is to because sh evaluates this with (the moral
+# equivalent of) NONOMATCH in effect, and highlighters/*.zsh has no matches.
+	for dirname in highlighters highlighters/*/ ; do \
+		$(INSTALL) -d $(SHARE_DIR)/"$$dirname"; \
+		for fname in "$$dirname"/*.zsh ; do [ -e "$$fname" ] && cp "$$fname" $(SHARE_DIR)"/$$dirname"; done; \
+	done
+	cp -R docs/* $(DOC_DIR)
+
+clean:
+	rm -f docs/all.md
+
+test:
+	@result=0; \
+	for test in highlighters/*; do \
+		if [ -d $$test/test-data ]; then \
+			echo "Running test $${test##*/}"; \
+			$(ZSH) -f tests/test-highlighting.zsh "$${test##*/}"; \
+			: $$(( result |= $$? )); \
+		fi \
+	done; \
+	exit $$result
+
+quiet-test:
+	$(MAKE) test QUIET=y
+
+perf:
+	@result=0; \
+	for test in highlighters/*; do \
+		if [ -d $$test/test-data ]; then \
+			echo "Running test $${test##*/}"; \
+			$(ZSH) -f tests/test-perfs.zsh "$${test##*/}"; \
+			: $$(( result |= $$? )); \
+		fi \
+	done; \
+	exit $$result
+
+.PHONY: all install clean test perf
diff --git a/zsh/modules/syntax-highlighting/external/README.md b/zsh/modules/syntax-highlighting/external/README.md
new file mode 100644
index 0000000..2c2b6d6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/README.md
@@ -0,0 +1,78 @@
+zsh-syntax-highlighting
+=======================
+
+**[Fish shell][fish]-like like syntax highlighting for [Zsh][zsh].**
+
+*Requirements: zsh 4.3.17+.*
+
+[fish]: http://www.fishshell.com/
+[zsh]: http://www.zsh.org/
+
+This package provides syntax highlighing for the shell zsh.  It enables
+highlighing of commands whilst they are typed at a zsh prompt into an
+interactive terminal.  This helps in reviewing commands before running
+them, particularly in catching syntax errors.
+
+Some examples:
+
+Before: [![Screenshot #1.1](images/before1-smaller.png)](images/before1.png)
+<br/>
+After:&nbsp; [![Screenshot #1.2](images/after1-smaller.png)](images/after1.png)
+
+Before: [![Screenshot #2.1](images/before2-smaller.png)](images/before2.png)
+<br/>
+After:&nbsp; [![Screenshot #2.2](images/after2-smaller.png)](images/after2.png)
+
+Before: [![Screenshot #3.1](images/before3-smaller.png)](images/before3.png)
+<br/>
+After:&nbsp; [![Screenshot #3.2](images/after3-smaller.png)](images/after3.png)
+
+
+How to install
+--------------
+
+See [INSTALL.md](INSTALL.md).
+
+
+FAQ
+---
+
+### Why must `zsh-syntax-highlighting.zsh` be sourced at the end of the `.zshrc` file?
+
+`zsh-syntax-highlighting.zsh` wraps ZLE widgets.  It must be sourced after all
+custom widgets have been created (i.e., after all `zle -N` calls and after
+running `compinit`).  Widgets created later will work, but will not update the
+syntax highlighting.
+
+### Does syntax highlighting work during incremental history search?
+
+Highlighting the command line during an incremental history search
+(with the `history-incremental-search-backward` widget, which is
+bound by default to <kbd>Ctrl+R</kbd> in zsh's emacs keymap) requires zsh 5.3
+or newer.
+
+Under zsh 5.2 and older, the zsh-default [underlining][zshzle-Character-Highlighting]
+of the matched portion of the buffer remains available, but zsh-syntax-highlighting's
+additional highlighting is unavailable.  (Those versions of zsh do not provide
+enough information to allow computing the highlighting correctly.)
+
+See [issue #288][i288] for details.
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+[i288]: https://github.com/zsh-users/zsh-syntax-highlighting/pull/288
+
+### How are new releases announced?
+
+There is currently no "push" announcements channel.  However, the following
+alternatives exist:
+
+- GitHub's RSS feed of releases: https://github.com/zsh-users/zsh-syntax-highlighting/releases.atom
+- An anitya entry: https://release-monitoring.org/project/7552/
+
+
+How to tweak
+------------
+
+Syntax highlighting is done by pluggable highlighter scripts.  See the
+[documentation on highlighters](docs/highlighters.md) for details and
+configuration settings.
diff --git a/zsh/modules/syntax-highlighting/external/changelog.md b/zsh/modules/syntax-highlighting/external/changelog.md
new file mode 100644
index 0000000..26b93d8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/changelog.md
@@ -0,0 +1,497 @@
+up to 28d7056a7a06
+
+# Changes in version 0.6.0
+
+
+## Added highlighting of:
+
+- The `isearch` and `suffix` [`$zle_highlight` settings][zshzle-Character-Highlighting].
+  (79e4d3d12405, 15db71abd0cc; requires zsh 5.3 for `$ISEARCHMATCH_ACTIVE` / `$SUFFIX_ACTIVE` support)
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+
+
+# Changes in version 0.5.0
+
+
+## Performance improvements:
+
+We thank Sebastian Gniazdowski and "m0viefreak" for significant contributions
+in this area.
+
+- Optimize string operations in the `main` (default) highlighter.
+  (#372/3cb58fd7d7b9, 02229ebd6328, ef4bfe5bcc14, #372/c6b6513ac0d6, #374/15461e7d21c3)
+
+- Command word highlighting:  Use the `zsh/parameter` module to avoid forks.
+  Memoize (cache) the results.
+  (#298, 3ce01076b521, 2f18ba64e397, 12b879caf7a6; #320, 3b67e656bff5)
+
+- Avoid forks in the driver and in the `root` highlighter.
+  (b9112aec798a, 38c8fbea2dd2)
+
+
+## Added highlighting of:
+
+- `pkexec` (a precommand).
+  (#248, 4f3910cbbaa5)
+
+- Aliases that cannot be defined normally nor invoked normally (highlighted as an error).
+  (#263 (in part), 28932316cca6)
+
+- Path separators (`/`) — the default behaviour remains to highlight path separators
+  and path components the same way.
+  (#136, #260, 6cd39e7c70d3, 9a934d291e7c, f3d3aaa00cc4)
+
+- Assignments to individual positional arguments (`42=foo` to assign to `$42`).
+  (f4036a09cee3)
+
+- Linewise region (the `visual-line-mode` widget, bound to `V` in zsh's `vi` keymap).
+  (#267, a7a7f8b42280, ee07588cfd9b)
+
+- Command-lines recalled by `isearch` mode; requires zsh≥5.3.
+  (#261 (in part); #257; 4ad311ec0a68)
+
+- Command-lines whilst the `IGNORE_BRACES` or `IGNORE_CLOSE_BRACES` option is in effect.
+  (a8a6384356af, 02807f1826a5)
+
+- Mismatched parentheses and braces (in the `main` highlighter).
+  (51b9d79c3bb6, 2fabf7ca64b7, a4196eda5e6f, and others)
+
+- Mismatched `do`/`done` keywords.
+  (b2733a64da93)
+
+- Mismatched `foreach`/`end` keywords.
+  (#96, 2bb8f0703d8f)
+
+- In Bourne-style function definitions, when the `MULTI_FUNC_DEF` option is set
+  (which is the default), highlight the first word in the function body as
+  a command word: `f() { g "$@" }`.
+  (6f91850a01e1)
+
+- `always` blocks.
+  (#335, e5782e4ddfb6)
+
+- Command substitutions inside double quotes, `"$(echo foo)"`.
+  (#139 (in part), c3913e0d8ead)
+
+- Non-alphabetic parameters inside double quotes (`"$$"`, `"$#"`, `"$*"`, `"$@"`, `"$?"`, `"$-"`).
+  (4afe670f7a1b, 44ef6e38e5a7)
+
+- Command words from future versions of zsh (forward compatibly).
+  This also adds an `arg0` style that all other command word styles fall back to.
+  (b4537a972eed, bccc3dc26943)
+
+- Escaped history expansions inside double quotes: `: "\!"`
+  (28d7056a7a06, et seq)
+
+
+## Fixed highlighting of:
+
+- Command separator tokens in syntactically-invalid positions.
+  (09c4114eb980)
+
+- Redirections with a file descriptor number at command word.
+  (#238 (in part), 73ee7c1f6c4a)
+
+- The `select` prompt, `$PS3`.
+  (#268, 451665cb2a8b)
+
+- Values of variables in `vared`.
+  (e500ca246286)
+
+- `!` as an argument (neither a history expansion nor a reserved word).
+  (4c23a2fd1b90)
+
+- "division by zero" error under the `brackets` highlighter when `$ZSH_HIGHLIGHT_STYLES` is empty.
+  (f73f3d53d3a6)
+
+- Process substitutions, `<(pwd)` and `>(wc -l)`.
+  (#302, 6889ff6bd2ad, bfabffbf975c, fc9c892a3f15)
+
+- The non-`SHORT_LOOPS` form of `repeat` loops: `repeat 42; do true; done`.
+  (#290, 4832f18c50a5, ef68f50c048f, 6362c757b6f7)
+
+- Broken symlinks (are now highlighted as files).
+  (#342, 95f7206a9373, 53083da8215e)
+
+- Lines accepted from `isearch` mode.
+  (#284; #257, #259, #288; 5bae6219008b, a8fe22d42251)
+
+- Work around upstream bug that triggered when the command word was a relative
+  path, that when interpreted relative to a $PATH directory denoted a command;
+  the effect of that upstream bug was that the relative path was cached as
+  a "valid external command name".
+  (#354, #355, 51614ca2c994, fdaeec45146b, 7d38d07255e4;
+  upstream fix slated to be released in 5.3 (workers/39104))
+
+- After accepting a line with the cursor on a bracket, the matching bracket
+  of the bracket under the cursor no longer remains highlighted (with the
+  `brackets` highlighter).
+  (4c4baede519a)
+
+- The first word on a new line within an array assignment or initialization is no
+  longer considered a command position.
+  (8bf423d16d46)
+
+- Subshells that end at command position, `(A=42)`, `(true;)`.
+  (#231, 7fb6f9979121; #344, 4fc35362ee5a)
+
+- Command word after array assignment, `a=(lorem ipsum) pwd`.
+  (#330, 7fb6f9979121)
+
+
+## API changes (for highlighter authors):
+
+- New interface `_zsh_highlight_add_highlight`.
+  (341a3ae1f015, c346f6eb6fb6)
+
+- tests: Specify the style key, not its value, in test expectations.
+  (a830613467af, fd061b5730bf, eaa4335c3441, among others)
+
+- Module author documentation improvements.
+  (#306 (in part), 217669270418, 0ff354b44b6e, 80148f6c8402, 364f206a547f, and others)
+
+- The driver no longer defines a `_zsh_highlight_${highlighter}_highlighter_cache`
+  variable, which is in the highlighters' namespace.
+  (3e59ab41b6b8, 80148f6c8402, f91a7b885e7d)
+
+- Rename highlighter entry points.  The old names remain supported for
+  backwards compatibility.
+  (a3d5dfcbdae9, c793e0dceab1)
+
+- tests: Add the "NONE" expectation.
+  (4da9889d1545, 13018f3dd735, d37c55c788cd)
+
+- tests: consider a test that writes to stderr to have failed.
+  (#291, 1082067f9315)
+
+
+## Developer-visible changes:
+
+- Add `make quiet-test`.
+  (9b64ad750f35)
+
+- test harness: Better quote replaceables in error messages.
+  (30d8f92df225)
+
+- test harness: Fix exit code for XPASS.
+  (bb8d325c0cbd)
+
+- Create [HACKING.md](HACKING.md).
+  (cef49752fd0e)
+
+- tests: Emit a description for PASS test points.
+  (6aa57d60aa64, f0bae44b76dd)
+
+- tests: Create a script that generates a test file.
+  (8013dc3b8db6, et seq; `tests/generate.zsh`)
+
+
+## Other changes:
+
+- Under zsh≤5.2, widgets whose names start with a `_` are no longer excluded
+  from highlighting.
+  (ed33d2cb1388; reverts part of 186d80054a40 which was for #65)
+
+- Under zsh≤5.2, widgets implemented by a function named after the widget are
+  no longer excluded from highlighting.
+  (487b122c480d; reverts part of 776453cb5b69)
+
+- Under zsh≤5.2, shell-unsafe widget names can now be wrapped.
+  (#278, 6a634fac9fb9, et seq)
+
+- Correct some test expectations.
+  (78290e043bc5)
+
+- `zsh-syntax-highlighting.plugin.zsh`: Convert from symlink to plain file
+  for msys2 compatibility.
+  (#292, d4f8edc9f3ad)
+
+- Document installation under some plugin managers.
+  (e635f766bef9, 9cab566f539b)
+
+- Don't leak the `PATH_DIRS` option.
+  (7b82b88a7166)
+
+- Don't require the `FUNCTION_ARGZERO` option to be set.
+  (#338, 750aebc553f2)
+
+- Under zsh≤5.2, support binding incomplete/nonexistent widgets.
+  (9e569bb0fe04, part of #288)
+
+- Make the driver reentrant, fixing possibility of infinite recursion
+  under zsh≤5.2 under interaction with theoretical third-party code.
+  (#305, d711563fe1bf, 295d62ec888d, f3242cbd6aba)
+
+- Fix warnings when `WARN_CREATE_GLOBAL` is set prior to sourcing zsh-syntax-highlighting.
+  (z-sy-h already sets `WARN_CREATE_GLOBAL` internally.)
+  (da60234fb236)
+
+- Warn only once, rather than once per keypress, when a highlighter is unavailable.
+  (0a9b347483ae)
+
+
+# Changes in version 0.4.1
+
+## Fixes:
+
+- Arguments to widgets were not properly dash-escaped.  Only matters for widgets
+  that take arguments (i.e., that are invoked as `zle ${widget} -- ${args}`).
+  (282c7134e8ac, reverts c808d2187a73)
+
+
+# Changes in version 0.4.0
+
+
+## Added highlighting of:
+
+- incomplete sudo commands
+  (a3047a912100, 2f05620b19ae)
+
+        sudo;
+        sudo -u;
+
+- command words following reserved words
+  (#207, #222, b397b12ac139 et seq, 6fbd2aa9579b et seq, 8b4adbd991b0)
+
+        if ls; then ls; else ls; fi
+        repeat 10 do ls; done
+
+    (The `ls` are now highlighted as a command.)
+
+- comments (when `INTERACTIVE_COMMENTS` is set)
+  (#163, #167, 693de99a9030)
+
+        echo Hello # comment
+
+- closing brackets of arithmetic expansion, subshells, and blocks
+  (#226, a59f442d2d34, et seq)
+
+        (( foo ))
+        ( foo )
+        { foo }
+
+- command names enabled by the `PATH_DIRS` option
+  (#228, 96ee5116b182)
+
+        # When ~/bin/foo/bar exists, is executable, ~/bin is in $PATH,
+        # and 'setopt PATH_DIRS' is in effect
+        foo/bar
+
+- parameter expansions with braces inside double quotes
+  (#186, 6e3720f39d84)
+
+        echo "${foo}"
+
+- parameter expansions in command word
+  (#101, 4fcfb15913a2)
+
+        x=/bin/ls
+        $x -l
+
+- the command separators '|&', '&!', '&|'
+
+        view file.pdf &!  ls
+
+
+## Fixed highlighting of:
+
+- precommand modifiers at non-command-word position
+  (#209, 2c9f8c8c95fa)
+
+        ls command foo
+
+- sudo commands with infix redirections
+  (#221, be006aded590, 86e924970911)
+
+        sudo -u >/tmp/foo.out user ls
+
+- subshells; anonymous functions
+  (#166, #194, 0d1bfbcbfa67, 9e178f9f3948)
+
+        (true)
+        () { true }
+
+- parameter assignment statements with no command
+  (#205, 01d7eeb3c713)
+
+        A=1;
+
+    (The semicolon used to be highlighted as a mistake)
+
+- cursor highlighter: Remove the cursor highlighting when accepting a line.
+  (#109, 4f0c293fdef0)
+
+
+## Removed features:
+
+- Removed highlighting of approximate paths (`path_approx`).
+  (#187, 98aee7f8b9a3)
+
+
+## Other changes:
+
+- main highlighter refactored to use states rather than booleans.
+  (2080a441ac49, et seq)
+
+- Fix initialization when sourcing `zsh-syntax-highlighting.zsh` via a symlink
+  (083c47b00707)
+
+- docs: Add screenshot.
+  (57624bb9f64b)
+
+- widgets wrapping: Don't add '--' when invoking widgets.
+  (c808d2187a73) [_reverted in 0.4.1_]
+
+- Refresh highlighting upon `accept-*` widgets (`accept-line` et al).
+  (59fbdda64c21)
+
+- Stop leaking match/mbegin/mend to global scope (thanks to upstream
+  `WARN_CREATE_GLOBAL` improvements).
+  (d3deffbf46a4)
+
+- 'make install': Permit setting `$(SHARE_DIR)` from the environment.
+  (e1078a8b4cf1)
+
+- driver: Tolerate KSH_ARRAYS being set in the calling context.
+  (#162, 8f19af6b319d)
+
+- 'make install': Install documentation fully and properly.
+  (#219, b1619c001390, et seq)
+
+- docs: Improve 'main' highlighter's documentation.
+  (00de155063f5, 7d4252f5f596)
+
+- docs: Moved to a new docs/ tree; assorted minor updates
+  (c575f8f37567, 5b34c23cfad5, et seq)
+
+- docs: Split README.md into INSTALL.md
+  (0b3183f6cb9a)
+
+- driver: Report `$ZSH_HIGHLIGHT_REVISION` when running from git
+  (84734ba95026)
+
+
+## Developer-visible changes:
+
+- Test harness converted to [TAP](http://testanything.org/tap-specification.html) format
+  (d99aa58aaaef, et seq)
+
+- Run each test in a separate subprocess, isolating them from each other
+  (d99aa58aaaef, et seq)
+
+- Fix test failure with nonexisting $HOME
+  (#216, b2ac98b98150)
+
+- Test output is now colorized.
+  (4d3da30f8b72, 6fe07c096109)
+
+- Document `make install`
+  (a18a7427fd2c)
+
+- tests: Allow specifying the zsh binary to use.
+  (557bb7e0c6a0)
+
+- tests: Add 'make perf' target
+  (4513eaea71d7)
+
+- tests: Run each test in a sandbox directory
+  (c01533920245)
+
+
+# Changes in version 0.3.0
+
+
+## Added highlighting of:
+
+- suffix aliases (requires zsh 5.1.1 or newer):
+
+        alias -s png=display
+        foo.png
+
+- prefix redirections:
+
+        <foo.txt cat
+
+- redirection operators:
+
+        echo > foo.txt
+
+- arithmetic evaluations:
+
+        (( 42 ))
+
+- $'' strings, including \x/\octal/\u/\U escapes
+
+        : $'foo\u0040bar'
+
+- multiline strings:
+
+        % echo "line 1
+        line 2"
+
+- string literals that haven't been finished:
+
+        % echo "Hello, world
+
+- command words that involve tilde expansion:
+
+        % ~/bin/foo
+
+
+## Fixed highlighting of:
+
+- quoted command words:
+
+        % \ls
+
+- backslash escapes in "" strings:
+
+        % echo "\x41"
+
+- noglob after command separator:
+
+        % :; noglob echo *
+
+- glob after command separator, when the first command starts with 'noglob':
+
+        % noglob true; echo *
+
+- the region (vi visual mode / set-mark-command) (issue #165)
+
+- redirection and command separators that would be highlighted as `path_approx`
+
+        % echo foo;‸
+        % echo <‸
+
+    (where `‸` represents the cursor location)
+
+- escaped globbing (outside quotes)
+
+        % echo \*
+
+
+## Other changes:
+
+- implemented compatibility with zsh's paste highlighting (issue #175)
+
+- `$?` propagated correctly to wrapped widgets
+
+- don't leak $REPLY into global scope
+
+
+## Developer-visible changes:
+
+- added makefile with `install` and `test` targets
+
+- set `warn_create_global` internally
+
+- document release process
+
+
+
+
+# Version 0.2.1
+
+(Start of changelog.)
+
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters.md b/zsh/modules/syntax-highlighting/external/docs/highlighters.md
new file mode 100644
index 0000000..c0f79bc
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters.md
@@ -0,0 +1,97 @@
+zsh-syntax-highlighting / highlighters
+======================================
+
+Syntax highlighting is done by pluggable highlighters:
+
+* `main` - the base highlighter, and the only one [active by default][1].
+* `brackets` - [matches brackets][2] and parenthesis.
+* `pattern` - matches [user-defined patterns][3].
+* `cursor` - matches [the cursor position][4].
+* `root` - highlights the whole command line [if the current user is root][5].
+* `line` - applied to [the whole command line][6].
+
+[1]: highlighters/main.md
+[2]: highlighters/brackets.md
+[3]: highlighters/pattern.md
+[4]: highlighters/cursor.md
+[5]: highlighters/root.md
+[6]: highlighters/line.md
+
+
+How to activate highlighters
+----------------------------
+
+To activate an highlighter, add it to the `ZSH_HIGHLIGHT_HIGHLIGHTERS` array in
+`~/.zshrc`, for example:
+
+    ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
+
+By default, `$ZSH_HIGHLIGHT_HIGHLIGHTERS` is unset and only the `main`
+highlighter is active.
+
+
+How to tweak highlighters
+-------------------------
+
+Highlighters look up styles from the `ZSH_HIGHLIGHT_STYLES` associative array.
+Navigate into the [individual highlighters' documentation](highlighters/) to
+see what styles (keys) each highlighter defines; the syntax for values is the
+same as the syntax of "types of highlighting" of the zsh builtin
+`$zle_highlight` array, which is documented in [the `zshzle(1)` manual
+page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+
+Some highlighters support additional configuration parameters; see each
+highlighter's documentation for details and examples.
+
+
+How to implement a new highlighter
+----------------------------------
+
+To create your own `acme` highlighter:
+
+* Create your script at
+    `highlighters/acme/acme-highlighter.zsh`.
+
+* Implement the `_zsh_highlight_highlighter_acme_predicate` function.
+  This function must return 0 when the highlighter needs to be called and
+  non-zero otherwise, for example:
+
+        _zsh_highlight_highlighter_acme_predicate() {
+          # Call this highlighter in SVN working copies
+          [[ -d .svn ]]
+        }
+
+* Implement the `_zsh_highlight_highlighter_acme_paint` function.
+  This function does the actual syntax highlighting, by calling
+  `_zsh_highlight_add_highlight` with the start and end of the region to
+  be highlighted and the `ZSH_HIGHLIGHT_STYLES` key to use. Define the default
+  style for that key in the highlighter script outside of any function with
+  `: ${ZSH_HIGHLIGHT_STYLES[key]:=value}`, being sure to prefix
+  the key with your highlighter name and a colon. For example:
+
+        : ${ZSH_HIGHLIGHT_STYLES[acme:aurora]:=fg=green}
+
+        _zsh_highlight_highlighter_acme_paint() {
+          # Colorize the whole buffer with the 'aurora' style
+          _zsh_highlight_add_highlight 0 $#BUFFER acme:aurora
+        }
+
+* Name your own functions and global variables `_zsh_highlight_acme_*`.
+
+    - In zsh-syntax-highlighting 0.4.0 and earlier, the entrypoints 
+        `_zsh_highlight_highlighter_acme_predicate` and
+        `_zsh_highlight_highlighter_acme_paint`
+        were named
+        `_zsh_highlight_acme_highlighter_predicate` and
+        `_zsh_highlight_highlighter_acme_paint` respectively.
+
+        These names are still supported for backwards compatibility;
+        however, support for them will be removed in a a future major or minor release (v0.x.0 or v1.0.0).
+
+* Activate your highlighter in `~/.zshrc`:
+
+        ZSH_HIGHLIGHT_HIGHLIGHTERS+=(acme)
+
+* [Write tests](../tests/README.md).
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/brackets.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/brackets.md
new file mode 100644
index 0000000..9001074
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/brackets.md
@@ -0,0 +1,29 @@
+zsh-syntax-highlighting / highlighters / brackets
+-------------------------------------------------
+
+This is the `brackets` highlighter, that highlights brackets and parentheses, and
+matches them.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `bracket-error` - unmatched brackets
+* `bracket-level-N` - brackets with nest level N
+* `cursor-matchingbracket` - the matching bracket, if cursor is on a bracket
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+    # To define styles for nested brackets up to level 4
+    ZSH_HIGHLIGHT_STYLES[bracket-level-1]='fg=blue,bold'
+    ZSH_HIGHLIGHT_STYLES[bracket-level-2]='fg=red,bold'
+    ZSH_HIGHLIGHT_STYLES[bracket-level-3]='fg=yellow,bold'
+    ZSH_HIGHLIGHT_STYLES[bracket-level-4]='fg=magenta,bold'
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/cursor.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/cursor.md
new file mode 100644
index 0000000..7295fd1
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/cursor.md
@@ -0,0 +1,22 @@
+zsh-syntax-highlighting / highlighters / cursor
+-----------------------------------------------
+
+This is the `cursor` highlighter, that highlights the cursor.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `cursor` - the style for the current cursor position
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+    ZSH_HIGHLIGHT_STYLES[cursor]='bg=blue'
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/line.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/line.md
new file mode 100644
index 0000000..4ba14e9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/line.md
@@ -0,0 +1,22 @@
+zsh-syntax-highlighting / highlighters / line
+---------------------------------------------
+
+This is the `line` highlighter, that highlights the whole line.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `line` - the style for the whole line
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+    ZSH_HIGHLIGHT_STYLES[line]='bold'
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/main.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/main.md
new file mode 100644
index 0000000..bf83820
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/main.md
@@ -0,0 +1,91 @@
+zsh-syntax-highlighting / highlighters / main
+---------------------------------------------
+
+This is the `main` highlighter, that highlights:
+
+* Commands
+* Options
+* Arguments
+* Paths
+* Strings
+
+This highlighter is active by default.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `unknown-token` - unknown tokens / errors
+* `reserved-word` - shell reserved words (`if`, `for`)
+* `alias` - aliases
+* `suffix-alias` - suffix aliases (requires zsh 5.1.1 or newer)
+* `builtin` - shell builtin commands (`shift`, `pwd`, `zstyle`)
+* `function` - function names
+* `command` - command names
+* `precommand` - precommand modifiers (e.g., `noglob`, `builtin`)
+* `commandseparator` - command separation tokens (`;`, `&&`)
+* `hashed-command` - hashed commands
+* `path` - existing filenames
+* `path_pathseparator` - path separators in filenames (`/`); if unset, `path` is used (default)
+* `path_prefix` - prefixes of existing filenames
+* `path_prefix_pathseparator` - path separators in prefixes of existing filenames (`/`); if unset, `path_prefix` is used (default)
+* `globbing` - globbing expressions (`*.txt`)
+* `history-expansion` - history expansion expressions (`!foo` and `^foo^bar`)
+* `single-hyphen-option` - single hyphen options (`-o`)
+* `double-hyphen-option` - double hyphen options (`--option`)
+* `back-quoted-argument` - backquoted expressions (`` `foo` ``)
+* `single-quoted-argument` - single quoted arguments (`` 'foo' ``)
+* `double-quoted-argument` - double quoted arguments (`` "foo" ``)
+* `dollar-quoted-argument` - dollar quoted arguments (`` $'foo' ``)
+* `dollar-double-quoted-argument` - parameter expansion inside double quotes (`$foo` inside `""`)
+* `back-double-quoted-argument` -  back double quoted arguments (`\x` inside `""`)
+* `back-dollar-quoted-argument` -  back dollar quoted arguments (`\x` inside `$''`)
+* `assign` - parameter assignments
+* `redirection` - redirection operators (`<`, `>`, etc)
+* `comment` - comments, when `setopt INTERACTIVE_COMMENTS` is in effect (`echo # foo`)
+* `arg0` - a command word other than one of those enumrated above (other than a command, precommand, alias, function, or shell builtin command).
+* `default` - everything else
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+    # Declare the variable
+    typeset -A ZSH_HIGHLIGHT_STYLES
+
+    # To differentiate aliases from other command types
+    ZSH_HIGHLIGHT_STYLES[alias]='fg=magenta,bold'
+    
+    # To have paths colored instead of underlined
+    ZSH_HIGHLIGHT_STYLES[path]='fg=cyan'
+    
+    # To disable highlighting of globbing expressions
+    ZSH_HIGHLIGHT_STYLES[globbing]='none'
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+### Useless trivia
+
+#### Forward compatibility.
+
+zsh-syntax-highlighting attempts to be forward-compatible with zsh.
+Specifically, we attempt to facilitate highlighting _command word_ types that
+had not yet been invented when this version of zsh-syntax-highlighting was
+released.
+
+A _command word_ is something like a function name, external command name, et
+cetera.  (See
+[Simple Commands & Pipelines in `zshmisc(1)`][zshmisc-Simple-Commands-And-Pipelines]
+for a formal definition.)
+
+If a new _kind_ of command word is ever added to zsh — something conceptually
+different than "function" and "alias" and "external command" — then command words
+of that (new) kind will be highlighted by the style `arg0_$kind`,
+where `$kind` is the output of `type -w` on the new kind of command word.  If that
+style is not defined, then the style `arg0` will be used instead.
+
+[zshmisc-Simple-Commands-And-Pipelines]: http://zsh.sourceforge.net/Doc/Release/Shell-Grammar.html#Simple-Commands-_0026-Pipelines
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/pattern.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/pattern.md
new file mode 100644
index 0000000..3ad5f24
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/pattern.md
@@ -0,0 +1,19 @@
+zsh-syntax-highlighting / highlighters / pattern
+------------------------------------------------
+
+This is the `pattern` highlighter, that highlights user-defined patterns.
+
+
+### How to tweak it
+
+To use this highlighter, associate patterns with styles in the
+`ZSH_HIGHLIGHT_PATTERNS` associative array, for example in `~/.zshrc`:
+
+    # To have commands starting with `rm -rf` in red:
+    ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/docs/highlighters/root.md b/zsh/modules/syntax-highlighting/external/docs/highlighters/root.md
new file mode 100644
index 0000000..0b0d41f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/docs/highlighters/root.md
@@ -0,0 +1,23 @@
+zsh-syntax-highlighting / highlighters / root
+---------------------------------------------
+
+This is the `root` highlighter, that highlights the whole line if the current
+user is root.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `root` - the style for the whole line if the current user is root.
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+    ZSH_HIGHLIGHT_STYLES[root]='bg=red'
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/README.md b/zsh/modules/syntax-highlighting/external/highlighters/README.md
new file mode 100644
index 0000000..8490ddf
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/README.md
@@ -0,0 +1,8 @@
+zsh-syntax-highlighting / highlighters
+======================================
+
+Navigate into the individual highlighters' documentation to see
+what styles (`$ZSH_HIGHLIGHT_STYLES` keys) each highlighter defines.
+
+Refer to the [documentation on highlighters](../docs/highlighters.md) for further
+information.
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/README.md b/zsh/modules/syntax-highlighting/external/highlighters/brackets/README.md
new file mode 120000
index 0000000..6997bd6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/brackets.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/brackets-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/brackets-highlighter.zsh
new file mode 100644
index 0000000..1bdd1f9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/brackets-highlighter.zsh
@@ -0,0 +1,107 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[bracket-error]:=fg=red,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-1]:=fg=blue,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-2]:=fg=green,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-3]:=fg=magenta,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-4]:=fg=yellow,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-5]:=fg=cyan,bold}
+: ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
+
+# Whether the brackets highlighter should be called or not.
+_zsh_highlight_highlighter_brackets_predicate()
+{
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
+}
+
+# Brackets highlighting function.
+_zsh_highlight_highlighter_brackets_paint()
+{
+  local char style
+  local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
+  local -A levelpos lastoflevel matching
+
+  # Find all brackets and remember which one is matching
+  for (( pos = 1; pos <= buflen; pos++ )) ; do
+    char=$BUFFER[pos]
+    case $char in
+      ["([{"])
+        levelpos[$pos]=$((++level))
+        lastoflevel[$level]=$pos
+        ;;
+      [")]}"])
+        matchingpos=$lastoflevel[$level]
+        levelpos[$pos]=$((level--))
+	if _zsh_highlight_brackets_match $matchingpos $pos; then
+          matching[$matchingpos]=$pos
+          matching[$pos]=$matchingpos
+        fi
+        ;;
+      ['"'\'])
+        # Skip everything inside quotes
+	pos=$BUFFER[(ib:pos+1:)$char]
+        ;;
+    esac
+  done
+
+  # Now highlight all found brackets
+  for pos in ${(k)levelpos}; do
+    if (( $+matching[$pos] )); then
+      if (( bracket_color_size )); then
+        style=bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
+      fi
+    else
+      style=bracket-error
+    fi
+    _zsh_highlight_add_highlight $((pos - 1)) $pos $style
+  done
+
+  # If cursor is on a bracket, then highlight corresponding bracket, if any.
+  if [[ $WIDGET != zle-line-finish ]]; then
+    pos=$((CURSOR + 1))
+    if [[ -n $levelpos[$pos] ]] && [[ -n $matching[$pos] ]]; then
+      local -i otherpos=$matching[$pos]
+      _zsh_highlight_add_highlight $((otherpos - 1)) $otherpos cursor-matchingbracket
+    fi
+  fi
+}
+
+# Helper function to differentiate type 
+_zsh_highlight_brackets_match()
+{
+  case $BUFFER[$1] in
+    \() [[ $BUFFER[$2] == \) ]];;
+    \[) [[ $BUFFER[$2] == \] ]];;
+    \{) [[ $BUFFER[$2] == \} ]];;
+    *) false;;
+  esac
+}
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh
new file mode 100644
index 0000000..23b317b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+WIDGET=zle-line-finish
+
+BUFFER=': $foo[bar]'
+CURSOR=6 # cursor is zero-based
+
+expected_region_highlight=(
+  "11 11 NONE"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket.zsh
new file mode 100644
index 0000000..5e9cf62
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/cursor-matchingbracket.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER=': ((( )))'
+CURSOR=2 # cursor is zero-based
+
+expected_region_highlight=(
+  "9 9 cursor-matchingbracket"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/empty-styles.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/empty-styles.zsh
new file mode 100644
index 0000000..2de1b20
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/empty-styles.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': (x)'
+
+expected_region_highlight=(
+  "1 5 NONE"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/loop-styles.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/loop-styles.zsh
new file mode 100644
index 0000000..a5be21d
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/loop-styles.zsh
@@ -0,0 +1,51 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER=': ({[({[(x)]})]})'
+
+expected_region_highlight=(
+  "3  3  bracket-level-1"
+  "4  4  bracket-level-2"
+  "5  5  bracket-level-3"
+  "6  6  bracket-level-1"
+  "7  7  bracket-level-2"
+  "8  8  bracket-level-3"
+  "9  9  bracket-level-1"
+  "11 11 bracket-level-1"
+  "12 12 bracket-level-3"
+  "13 13 bracket-level-2"
+  "14 14 bracket-level-1"
+  "15 15 bracket-level-3"
+  "16 16 bracket-level-2"
+  "17 17 bracket-level-1"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/mismatch-patentheses.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/mismatch-patentheses.zsh
new file mode 100644
index 0000000..f40226f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/mismatch-patentheses.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x}]'
+
+expected_region_highlight=(
+  "6  6  bracket-error" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+  "10 10 bracket-error" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/near-quotes.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/near-quotes.zsh
new file mode 100644
index 0000000..b7cc2cb
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/near-quotes.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+
+BUFFER=': {"{x}"}'
+
+expected_region_highlight=(
+  "3 3 bracket-level-1"
+  "4 8 NONE"
+  "9 9 bracket-level-1"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-parentheses.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-parentheses.zsh
new file mode 100644
index 0000000..413394f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-parentheses.zsh
@@ -0,0 +1,43 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER='echo $(echo ${(z)array})'
+
+expected_region_highlight=(
+  "7  7  bracket-level-1" # (
+  "14 14 bracket-level-2" # {
+  "15 15 bracket-level-3" # (
+  "17 17 bracket-level-3" # )
+  "23 23 bracket-level-2" # }
+  "24 24 bracket-level-1" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-quote.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-quote.zsh
new file mode 100644
index 0000000..8febae8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/nested-quote.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+
+BUFFER=': "\"{x"'
+
+expected_region_highlight=(
+  "3 9 NONE 'issue #303'"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/quoted-patentheses.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/quoted-patentheses.zsh
new file mode 100644
index 0000000..5c3dcea
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/quoted-patentheses.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo ( bar"'
+
+expected_region_highlight=(
+"1  16 NONE" # We expect the brackets highlighter to do nothing
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/simple-parentheses.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/simple-parentheses.zsh
new file mode 100644
index 0000000..186d0b9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/simple-parentheses.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x})'
+
+expected_region_highlight=(
+  "6  6  bracket-level-1" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+  "10 10 bracket-level-1" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses.zsh
new file mode 100644
index 0000000..941d092
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x}'
+
+expected_region_highlight=(
+  "6  6  bracket-error" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses2.zsh
new file mode 100644
index 0000000..41b6836
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/brackets/test-data/unclosed-patentheses2.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+
+BUFFER='echo {x})'
+
+expected_region_highlight=(
+  "6  6  bracket-level-1" # {
+  "8  8  bracket-level-1" # }
+  "9  9 bracket-error" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/cursor/README.md b/zsh/modules/syntax-highlighting/external/highlighters/cursor/README.md
new file mode 120000
index 0000000..70e0c8c
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/cursor/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/cursor.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/cursor/cursor-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/cursor/cursor-highlighter.zsh
new file mode 100644
index 0000000..81633a3
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/cursor/cursor-highlighter.zsh
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
+
+# Whether the cursor highlighter should be called or not.
+_zsh_highlight_highlighter_cursor_predicate()
+{
+  # remove cursor highlighting when the line is finished
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved
+}
+
+# Cursor highlighting function.
+_zsh_highlight_highlighter_cursor_paint()
+{
+  [[ $WIDGET == zle-line-finish ]] && return
+  
+  _zsh_highlight_add_highlight $CURSOR $(( $CURSOR + 1 )) cursor
+}
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/line/README.md b/zsh/modules/syntax-highlighting/external/highlighters/line/README.md
new file mode 120000
index 0000000..052fe20
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/line/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/line.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/line/line-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/line/line-highlighter.zsh
new file mode 100644
index 0000000..f922dc9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/line/line-highlighter.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[line]:=}
+
+# Whether the root highlighter should be called or not.
+_zsh_highlight_highlighter_line_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# root highlighting function.
+_zsh_highlight_highlighter_line_paint()
+{
+  _zsh_highlight_add_highlight 0 $#BUFFER line
+}
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/README.md b/zsh/modules/syntax-highlighting/external/highlighters/main/README.md
new file mode 120000
index 0000000..0354731
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/main.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/main-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/main-highlighter.zsh
new file mode 100644
index 0000000..d4a396a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/main-highlighter.zsh
@@ -0,0 +1,934 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[default]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[unknown-token]:=fg=red,bold}
+: ${ZSH_HIGHLIGHT_STYLES[reserved-word]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[suffix-alias]:=fg=green,underline}
+: ${ZSH_HIGHLIGHT_STYLES[precommand]:=fg=green,underline}
+: ${ZSH_HIGHLIGHT_STYLES[commandseparator]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[path]:=underline}
+: ${ZSH_HIGHLIGHT_STYLES[path_pathseparator]:=}
+: ${ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]:=}
+: ${ZSH_HIGHLIGHT_STYLES[globbing]:=fg=blue}
+: ${ZSH_HIGHLIGHT_STYLES[history-expansion]:=fg=blue}
+: ${ZSH_HIGHLIGHT_STYLES[single-hyphen-option]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[double-hyphen-option]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[back-quoted-argument]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[redirection]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
+: ${ZSH_HIGHLIGHT_STYLES[arg0]:=fg=green}
+
+# Whether the highlighter should be called or not.
+_zsh_highlight_highlighter_main_predicate()
+{
+  # may need to remove path_prefix highlighting when the line ends
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_buffer_modified
+}
+
+# Helper to deal with tokens crossing line boundaries.
+_zsh_highlight_main_add_region_highlight() {
+  integer start=$1 end=$2
+  shift 2
+
+  if (( $+argv[2] )); then
+    # Caller specified inheritance explicitly.
+  else
+    # Automate inheritance.
+    typeset -A fallback_of; fallback_of=(
+        alias arg0
+        suffix-alias arg0
+        builtin arg0
+        function arg0
+        command arg0
+        precommand arg0
+        hashed-command arg0
+        
+        path_prefix path
+        # The path separator fallback won't ever be used, due to the optimisation
+        # in _zsh_highlight_main_highlighter_highlight_path_separators().
+        path_pathseparator path
+        path_prefix_pathseparator path_prefix
+    )
+    local needle=$1 value
+    while [[ -n ${value::=$fallback_of[$needle]} ]]; do
+      unset "fallback_of[$needle]" # paranoia against infinite loops
+      argv+=($value)
+      needle=$value
+    done
+  fi
+
+  # The calculation was relative to $PREBUFFER$BUFFER, but region_highlight is
+  # relative to $BUFFER.
+  (( start -= $#PREBUFFER ))
+  (( end -= $#PREBUFFER ))
+
+  (( end < 0 )) && return # having end<0 would be a bug
+  (( start < 0 )) && start=0 # having start<0 is normal with e.g. multiline strings
+  _zsh_highlight_add_highlight $start $end "$@"
+}
+
+# Get the type of a command.
+#
+# Uses the zsh/parameter module if available to avoid forks, and a
+# wrapper around 'type -w' as fallback.
+#
+# Takes a single argument.
+#
+# The result will be stored in REPLY.
+_zsh_highlight_main__type() {
+  if (( $+_zsh_highlight_main__command_type_cache )); then
+    REPLY=$_zsh_highlight_main__command_type_cache[(e)$1]
+    if [[ -n "$REPLY" ]]; then
+      return
+    fi
+  fi
+  if (( $#options_to_set )); then
+    setopt localoptions $options_to_set;
+  fi
+  unset REPLY
+  if zmodload -e zsh/parameter; then
+    if (( $+aliases[(e)$1] )); then
+      REPLY=alias
+    elif (( $+saliases[(e)${1##*.}] )); then
+      REPLY='suffix alias'
+    elif (( $reswords[(Ie)$1] )); then
+      REPLY=reserved
+    elif (( $+functions[(e)$1] )); then
+      REPLY=function
+    elif (( $+builtins[(e)$1] )); then
+      REPLY=builtin
+    elif (( $+commands[(e)$1] )); then
+      REPLY=command
+    # zsh 5.2 and older have a bug whereby running 'type -w ./sudo' implicitly
+    # runs 'hash ./sudo=/usr/local/bin/./sudo' (assuming /usr/local/bin/sudo
+    # exists and is in $PATH).  Avoid triggering the bug, at the expense of
+    # falling through to the $() below, incurring a fork.  (Issue #354.)
+    #
+    # The first disjunct mimics the isrelative() C call from the zsh bug.
+    elif {  [[ $1 != */* ]] || is-at-least 5.3 } &&
+         ! builtin type -w -- $1 >/dev/null 2>&1; then
+      REPLY=none
+    fi
+  fi
+  if ! (( $+REPLY )); then
+    REPLY="${$(LC_ALL=C builtin type -w -- $1 2>/dev/null)##*: }"
+  fi
+  if (( $+_zsh_highlight_main__command_type_cache )); then
+    _zsh_highlight_main__command_type_cache[(e)$1]=$REPLY
+  fi
+}
+
+# Check whether the first argument is a redirection operator token.
+# Report result via the exit code.
+_zsh_highlight_main__is_redirection() {
+  # A redirection operator token:
+  # - starts with an optional single-digit number;
+  # - then, has a '<' or '>' character;
+  # - is not a process substitution [<(...) or >(...)].
+  [[ $1 == (<0-9>|)(\<|\>)* ]] && [[ $1 != (\<|\>)$'\x28'* ]]
+}
+
+# Resolve alias.
+#
+# Takes a single argument.
+#
+# The result will be stored in REPLY.
+_zsh_highlight_main__resolve_alias() {
+  if zmodload -e zsh/parameter; then
+    REPLY=${aliases[$arg]}
+  else
+    REPLY="${"$(alias -- $arg)"#*=}"
+  fi
+}
+
+# Check that the top of $braces_stack has the expected value.  If it does, set
+# the style according to $2; otherwise, set style=unknown-token.
+#
+# $1: character expected to be at the top of $braces_stack
+# $2: assignment to execute it if matches
+_zsh_highlight_main__stack_pop() {
+  if [[ $braces_stack[1] == $1 ]]; then
+    braces_stack=${braces_stack:1}
+    eval "$2"
+  else
+    style=unknown-token
+  fi
+}
+
+# Main syntax highlighting function.
+_zsh_highlight_highlighter_main_paint()
+{
+  ## Before we even 'emulate -L', we must test a few options that would reset.
+  if [[ -o interactive_comments ]]; then
+    local interactive_comments= # set to empty
+  fi
+  if [[ -o ignore_braces ]] || eval '[[ -o ignore_close_braces ]] 2>/dev/null'; then
+    local right_brace_is_recognised_everywhere=false
+  else
+    local right_brace_is_recognised_everywhere=true
+  fi
+  if [[ -o path_dirs ]]; then
+    integer path_dirs_was_set=1
+  else
+    integer path_dirs_was_set=0
+  fi
+  if [[ -o multi_func_def ]]; then
+    integer multi_func_def=1
+  else
+    integer multi_func_def=0
+  fi
+  emulate -L zsh
+  setopt localoptions extendedglob bareglobqual
+
+  # At the PS3 prompt and in vared, highlight nothing.
+  #
+  # (We can't check this in _zsh_highlight_highlighter_main_predicate because
+  # if the predicate returns false, the previous value of region_highlight
+  # would be reused.)
+  if [[ $CONTEXT == (select|vared) ]]; then
+    return
+  fi
+
+  ## Variable declarations and initializations
+  local start_pos=0 end_pos highlight_glob=true arg style
+  local in_array_assignment=false # true between 'a=(' and the matching ')'
+  typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR
+  typeset -a ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS
+  typeset -a ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW
+  local -a options_to_set # used in callees
+  local buf="$PREBUFFER$BUFFER"
+  integer len="${#buf}"
+  integer pure_buf_len=$(( len - ${#PREBUFFER} ))   # == $#BUFFER, used e.g. in *_check_path
+
+  # "R" for round
+  # "Q" for square
+  # "Y" for curly
+  # "D" for do/done
+  # "$" for 'end' (matches 'foreach' always; also used with cshjunkiequotes in repeat/while)
+  # "?" for 'if'/'fi'; also checked by 'elif'/'else'
+  # ":" for 'then'
+  local braces_stack
+
+  if (( path_dirs_was_set )); then
+    options_to_set+=( PATH_DIRS )
+  fi
+  unset path_dirs_was_set
+
+  ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR=(
+    '|' '||' ';' '&' '&&'
+    '|&'
+    '&!' '&|'
+    # ### 'case' syntax, but followed by a pattern, not by a command
+    # ';;' ';&' ';|'
+  )
+  ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS=(
+    'builtin' 'command' 'exec' 'nocorrect' 'noglob'
+    'pkexec' # immune to #121 because it's usually not passed --option flags
+  )
+
+  # Tokens that, at (naively-determined) "command position", are followed by
+  # a de jure command position.  All of these are reserved words.
+  ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW=(
+    $'\x7b' # block
+    $'\x28' # subshell
+    '()' # anonymous function
+    'while'
+    'until'
+    'if'
+    'then'
+    'elif'
+    'else'
+    'do'
+    'time'
+    'coproc'
+    '!' # reserved word; unrelated to $histchars[1]
+  )
+
+  local -a match mbegin mend
+
+  # State machine
+  #
+  # The states are:
+  # - :start:      Command word
+  # - :sudo_opt:   A leading-dash option to sudo (such as "-u" or "-i")
+  # - :sudo_arg:   The argument to a sudo leading-dash option that takes one,
+  #                when given as a separate word; i.e., "foo" in "-u foo" (two
+  #                words) but not in "-ufoo" (one word).
+  # - :regular:    "Not a command word", and command delimiters are permitted.
+  #                Mainly used to detect premature termination of commands.
+  # - :always:     The word 'always' in the «{ foo } always { bar }» syntax.
+  #
+  # When the kind of a word is not yet known, $this_word / $next_word may contain
+  # multiple states.  For example, after "sudo -i", the next word may be either
+  # another --flag or a command name, hence the state would include both :start:
+  # and :sudo_opt:.
+  #
+  # The tokens are always added with both leading and trailing colons to serve as
+  # word delimiters (an improvised array); [[ $x == *:foo:* ]] and x=${x//:foo:/} 
+  # will DTRT regardless of how many elements or repetitions $x has..
+  #
+  # Handling of redirections: upon seeing a redirection token, we must stall
+  # the current state --- that is, the value of $this_word --- for two iterations
+  # (one for the redirection operator, one for the word following it representing
+  # the redirection target).  Therefore, we set $in_redirection to 2 upon seeing a
+  # redirection operator, decrement it each iteration, and stall the current state
+  # when it is non-zero.  Thus, upon reaching the next word (the one that follows
+  # the redirection operator and target), $this_word will still contain values
+  # appropriate for the word immediately following the word that preceded the
+  # redirection operator.
+  #
+  # The "the previous word was a redirection operator" state is not communicated
+  # to the next iteration via $next_word/$this_word as usual, but via
+  # $in_redirection.  The value of $next_word from the iteration that processed
+  # the operator is discarded.
+  #
+  local this_word=':start:' next_word
+  integer in_redirection
+  # Processing buffer
+  local proc_buf="$buf"
+  for arg in ${interactive_comments-${(z)buf}} \
+             ${interactive_comments+${(zZ+c+)buf}}; do
+    # Initialize $next_word.
+    if (( in_redirection )); then
+      (( --in_redirection ))
+    fi
+    if (( in_redirection == 0 )); then
+      # Initialize $next_word to its default value.
+      next_word=':regular:'
+    else
+      # Stall $next_word.
+    fi
+
+    # Initialize per-"simple command" [zshmisc(1)] variables:
+    #
+    #   $already_added       (see next paragraph)
+    #   $style               how to highlight $arg
+    #   $in_array_assignment boolean flag for "between '(' and ')' of array assignment"
+    #   $highlight_glob      boolean flag for "'noglob' is in effect"
+    #
+    # $already_added is set to 1 to disable adding an entry to region_highlight
+    # for this iteration.  Currently, that is done for "" and $'' strings,
+    # which add the entry early so escape sequences within the string override
+    # the string's color.
+    integer already_added=0
+    style=unknown-token
+    if [[ $this_word == *':start:'* ]]; then
+      in_array_assignment=false
+      if [[ $arg == 'noglob' ]]; then
+        highlight_glob=false
+      fi
+    fi
+
+    # Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
+    if [[ $arg == ';' ]] ; then
+      # We're looking for either a semicolon or a newline, whichever comes
+      # first.  Both of these are rendered as a ";" (SEPER) by the ${(z)..}
+      # flag.
+      #
+      # We can't use the (Z+n+) flag because that elides the end-of-command
+      # token altogether, so 'echo foo\necho bar' (two commands) becomes
+      # indistinguishable from 'echo foo echo bar' (one command with three
+      # words for arguments).
+      local needle=$'[;\n]'
+      integer offset=$(( ${proc_buf[(i)$needle]} - 1 ))
+      (( start_pos += offset ))
+      (( end_pos = start_pos + $#arg ))
+    else
+      # The line was:
+      #
+      # integer offset=$(((len-start_pos)-${#${proc_buf##([[:space:]]|\\[[:space:]])#}}))
+      #
+      # - len-start_pos is length of current proc_buf; basically: initial length minus where
+      #   we are, and proc_buf is chopped to the "where we are" (compare the "previous value
+      #   of start_pos" below, and the len-(start_pos-offset) = len-start_pos+offset)
+      # - what's after main minus sign is: length of proc_buf without spaces at the beginning
+      # - so what the line actually did, was computing length of the spaces!
+      # - this can be done via (#b) flag, like below
+      if [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\[[:space:]])##)* ]]; then
+          # The first, outer parenthesis
+          integer offset="${#match[1]}"
+      else
+          integer offset=0
+      fi
+      ((start_pos+=offset))
+      ((end_pos=$start_pos+${#arg}))
+    fi
+
+    # Compute the new $proc_buf. We advance it
+    # (chop off characters from the beginning)
+    # beyond what end_pos points to, by skipping
+    # as many characters as end_pos was advanced.
+    #
+    # end_pos was advanced by $offset (via start_pos)
+    # and by $#arg. Note the `start_pos=$end_pos`
+    # below.
+    #
+    # As for the [,len]. We could use [,len-start_pos+offset]
+    # here, but to make it easier on eyes, we use len and
+    # rely on the fact that Zsh simply handles that. The
+    # length of proc_buf is len-start_pos+offset because
+    # we're chopping it to match current start_pos, so its
+    # length matches the previous value of start_pos.
+    #
+    # Why [,-1] is slower than [,length] isn't clear.
+    proc_buf="${proc_buf[offset + $#arg + 1,len]}"
+
+    # Handle the INTERACTIVE_COMMENTS option.
+    #
+    # We use the (Z+c+) flag so the entire comment is presented as one token in $arg.
+    if [[ -n ${interactive_comments+'set'} && $arg[1] == $histchars[3] ]]; then
+      if [[ $this_word == *(':regular:'|':start:')* ]]; then
+        style=comment
+      else
+        style=unknown-token # prematurely terminated
+      fi
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+      already_added=1
+      start_pos=$end_pos
+      continue
+    fi
+
+    # Analyse the current word.
+    if _zsh_highlight_main__is_redirection $arg ; then
+      # A '<' or '>', possibly followed by a digit
+      in_redirection=2
+    fi
+
+    # Special-case the first word after 'sudo'.
+    if (( ! in_redirection )); then
+      if [[ $this_word == *':sudo_opt:'* ]] && [[ $arg != -* ]]; then
+        this_word=${this_word//:sudo_opt:/}
+      fi
+    fi
+
+    # Parse the sudo command line
+    if (( ! in_redirection )); then
+      if [[ $this_word == *':sudo_opt:'* ]]; then
+        case "$arg" in
+          # Flag that requires an argument
+          '-'[Cgprtu]) this_word=${this_word//:start:/};
+                       next_word=':sudo_arg:';;
+          # This prevents misbehavior with sudo -u -otherargument
+          '-'*)        this_word=${this_word//:start:/};
+                       next_word+=':start:';
+                       next_word+=':sudo_opt:';;
+          *)           ;;
+        esac
+      elif [[ $this_word == *':sudo_arg:'* ]]; then
+        next_word+=':sudo_opt:'
+        next_word+=':start:'
+      fi
+   fi
+
+   # The Great Fork: is this a command word?  Is this a non-command word?
+   if [[ $this_word == *':always:'* && $arg == 'always' ]]; then
+     # try-always construct
+     style=reserved-word # de facto a reserved word, although not de jure
+     next_word=':start:'
+   elif [[ $this_word == *':start:'* ]] && (( in_redirection == 0 )); then # $arg is the command word
+     if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]]; then
+      style=precommand
+     elif [[ "$arg" = "sudo" ]]; then
+      style=precommand
+      next_word=${next_word//:regular:/}
+      next_word+=':sudo_opt:'
+      next_word+=':start:'
+     else
+      _zsh_highlight_main_highlighter_expand_path $arg
+      local expanded_arg="$REPLY"
+      _zsh_highlight_main__type ${expanded_arg}
+      local res="$REPLY"
+      () {
+        # Special-case: command word is '$foo', like that, without braces or anything.
+        #
+        # That's not entirely correct --- if the parameter's value happens to be a reserved
+        # word, the parameter expansion will be highlighted as a reserved word --- but that
+        # incorrectness is outweighed by the usability improvement of permitting the use of
+        # parameters that refer to commands, functions, and builtins.
+        local -a match mbegin mend
+        local MATCH; integer MBEGIN MEND
+        if [[ $res == none ]] && (( ${+parameters} )) &&
+           [[ ${arg[1]} == \$ ]] && [[ ${arg:1} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+)$ ]] &&
+           (( ${+parameters[${MATCH}]} ))
+           then
+          _zsh_highlight_main__type ${(P)MATCH}
+          res=$REPLY
+        fi
+      }
+      case $res in
+        reserved)       # reserved word
+                        style=reserved-word
+                        case $arg in
+                          ($'\x7b')
+                            braces_stack='Y'"$braces_stack"
+                            ;;
+                          ($'\x7d')
+                            # We're at command word, so no need to check $right_brace_is_recognised_everywhere
+                            _zsh_highlight_main__stack_pop 'Y' style=reserved-word
+                            if [[ $style == reserved-word ]]; then
+                              next_word+=':always:'
+                            fi
+                            ;;
+                          ('do')
+                            braces_stack='D'"$braces_stack"
+                            ;;
+                          ('done')
+                            _zsh_highlight_main__stack_pop 'D' style=reserved-word
+                            ;;
+                          ('if')
+                            braces_stack=':?'"$braces_stack"
+                            ;;
+                          ('then')
+                            _zsh_highlight_main__stack_pop ':' style=reserved-word
+                            ;;
+                          ('elif')
+                            if [[ ${braces_stack[1]} == '?' ]]; then
+                              braces_stack=':'"$braces_stack"
+                            else
+                              style=unknown-token
+                            fi
+                            ;;
+                          ('else')
+                            if [[ ${braces_stack[1]} == '?' ]]; then
+                              :
+                            else
+                              style=unknown-token
+                            fi
+                            ;;
+                          ('fi')
+                            _zsh_highlight_main__stack_pop '?' ""
+                            ;;
+                          ('foreach')
+                            braces_stack='$'"$braces_stack"
+                            ;;
+                          ('end')
+                            _zsh_highlight_main__stack_pop '$' style=reserved-word
+                            ;;
+                        esac
+                        ;;
+        'suffix alias') style=suffix-alias;;
+        alias)          () {
+                          integer insane_alias
+                          case $arg in 
+                            # Issue #263: aliases with '=' on their LHS.
+                            #
+                            # There are three cases:
+                            #
+                            # - Unsupported, breaks 'alias -L' output, but invokable:
+                            ('='*) :;;
+                            # - Unsupported, not invokable:
+                            (*'='*) insane_alias=1;;
+                            # - The common case:
+                            (*) :;;
+                          esac
+                          if (( insane_alias )); then
+                            style=unknown-token
+                          else
+                            style=alias
+                            _zsh_highlight_main__resolve_alias $arg
+                            local alias_target="$REPLY"
+                            [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$alias_target"} && -z ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} ]] && ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS+=($arg)
+                          fi
+                        }
+                        ;;
+        builtin)        style=builtin;;
+        function)       style=function;;
+        command)        style=command;;
+        hashed)         style=hashed-command;;
+        none)           if _zsh_highlight_main_highlighter_check_assign; then
+                          style=assign
+                          if [[ $arg[-1] == '(' ]]; then
+                            in_array_assignment=true
+                          else
+                            # assignment to a scalar parameter.
+                            # (For array assignments, the command doesn't start until the ")" token.)
+                            next_word+=':start:'
+                          fi
+                        elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
+                          style=history-expansion
+                        elif [[ $arg[0,1] == $histchars[2,2] ]]; then
+                          style=history-expansion
+                        elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
+                          if [[ $this_word == *':regular:'* ]]; then
+                            # This highlights empty commands (semicolon follows nothing) as an error.
+                            # Zsh accepts them, though.
+                            style=commandseparator
+                          else
+                            style=unknown-token
+                          fi
+                        elif (( in_redirection == 2 )); then
+                          style=redirection
+                        elif [[ $arg[1,2] == '((' ]]; then
+                          # Arithmetic evaluation.
+                          #
+                          # Note: prior to zsh-5.1.1-52-g4bed2cf (workers/36669), the ${(z)...}
+                          # splitter would only output the '((' token if the matching '))' had
+                          # been typed.  Therefore, under those versions of zsh, BUFFER="(( 42"
+                          # would be highlighted as an error until the matching "))" are typed.
+                          #
+                          # We highlight just the opening parentheses, as a reserved word; this
+                          # is how [[ ... ]] is highlighted, too.
+                          style=reserved-word
+                          _zsh_highlight_main_add_region_highlight $start_pos $((start_pos + 2)) $style
+                          already_added=1
+                          if [[ $arg[-2,-1] == '))' ]]; then
+                            _zsh_highlight_main_add_region_highlight $((end_pos - 2)) $end_pos $style
+                            already_added=1
+                          fi
+                        elif [[ $arg == '()' ]]; then
+                          # anonymous function
+                          style=reserved-word
+                        elif [[ $arg == $'\x28' ]]; then
+                          # subshell
+                          style=reserved-word
+                          braces_stack='R'"$braces_stack"
+                        elif [[ $arg == $'\x29' ]]; then
+                          # end of subshell
+                          _zsh_highlight_main__stack_pop 'R' style=reserved-word
+                        else
+                          if _zsh_highlight_main_highlighter_check_path; then
+                            style=$REPLY
+                          else
+                            style=unknown-token
+                          fi
+                        fi
+                        ;;
+        *)              _zsh_highlight_main_add_region_highlight $start_pos $end_pos arg0_$res arg0
+                        already_added=1
+                        ;;
+      esac
+     fi
+   fi
+   if (( ! already_added )) && [[ $style == unknown-token ]] && # not handled by the 'command word' codepath
+      { (( in_redirection )) || [[ $this_word == *':regular:'* ]] || [[ $this_word == *':sudo_opt:'* ]] || [[ $this_word == *':sudo_arg:'* ]] }
+   then # $arg is a non-command word
+      case $arg in
+        $'\x29') # subshell or end of array assignment
+                 if $in_array_assignment; then
+                   style=assign
+                   in_array_assignment=false
+                   next_word+=':start:'
+                 else
+                   _zsh_highlight_main__stack_pop 'R' style=reserved-word
+                 fi;;
+        $'\x28\x29') # possibly a function definition
+                 if (( multi_func_def )) || false # TODO: or if the previous word was a command word
+                 then
+                   next_word+=':start:'
+                 fi
+                 style=reserved-word
+                 ;;
+        $'\x7d') # right brace
+                 #
+                 # Parsing rule: # {
+                 #
+                 #     Additionally, `tt(})' is recognized in any position if neither the
+                 #     tt(IGNORE_BRACES) option nor the tt(IGNORE_CLOSE_BRACES) option is set."""
+                 if $right_brace_is_recognised_everywhere; then
+                   _zsh_highlight_main__stack_pop 'Y' style=reserved-word
+                   if [[ $style == reserved-word ]]; then
+                     next_word+=':always:'
+                   fi
+                 else
+                   # Fall through to the catchall case at the end.
+                 fi
+                 ;|
+        '--'*)   style=double-hyphen-option;;
+        '-'*)    style=single-hyphen-option;;
+        "'"*)    style=single-quoted-argument;;
+        '"'*)    style=double-quoted-argument
+                 _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+                 _zsh_highlight_main_highlighter_highlight_string
+                 already_added=1
+                 ;;
+        \$\'*)   style=dollar-quoted-argument
+                 _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+                 _zsh_highlight_main_highlighter_highlight_dollar_string
+                 already_added=1
+                 ;;
+        '`'*)    style=back-quoted-argument;;
+        [$][*])  style=default;;
+        [*?]*|*[^\\][*?]*)
+                 $highlight_glob && style=globbing || style=default;;
+        *)       if false; then
+                 elif [[ $arg = $'\x7d' ]] && $right_brace_is_recognised_everywhere; then
+                   # was handled by the $'\x7d' case above
+                 elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
+                   style=history-expansion
+                 elif [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
+                   if [[ $this_word == *':regular:'* ]]; then
+                     style=commandseparator
+                   else
+                     style=unknown-token
+                   fi
+                 elif (( in_redirection == 2 )); then
+                   style=redirection
+                 else
+                   if _zsh_highlight_main_highlighter_check_path; then
+                     style=$REPLY
+                   else
+                     style=default
+                   fi
+                 fi
+                 ;;
+      esac
+    fi
+    if ! (( already_added )); then
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+      [[ $style == path || $style == path_prefix ]] && _zsh_highlight_main_highlighter_highlight_path_separators
+    fi
+    if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]]; then
+      if [[ $arg == ';' ]] && $in_array_assignment; then
+        # literal newline inside an array assignment
+        next_word=':regular:'
+      else
+        next_word=':start:'
+        highlight_glob=true
+      fi
+    elif
+       [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW:#"$arg"} && $this_word == *':start:'* ]] ||
+       [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_PRECOMMANDS:#"$arg"} && $this_word == *':start:'* ]]; then
+      next_word=':start:'
+    elif [[ $arg == "repeat" && $this_word == *':start:'* ]]; then
+      # skip the repeat-count word
+      in_redirection=2
+      # The redirection mechanism assumes $this_word describes the word
+      # following the redirection.  Make it so.
+      #
+      # That word can be a command word with shortloops (`repeat 2 ls`)
+      # or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`).
+      #
+      # The repeat-count word will be handled like a redirection target.
+      this_word=':start::regular:'
+    fi
+    start_pos=$end_pos
+    if (( in_redirection == 0 )); then
+      # This is the default/common codepath.
+      this_word=$next_word
+    else
+      # Stall $this_word.
+    fi
+  done
+}
+
+# Check if $arg is variable assignment
+_zsh_highlight_main_highlighter_check_assign()
+{
+    setopt localoptions extended_glob
+    [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[*\])(|[+])=* ]] ||
+      [[ $arg == [0-9]##(|[+])=* ]]
+}
+
+_zsh_highlight_main_highlighter_highlight_path_separators()
+{
+  local pos style_pathsep
+  style_pathsep=${style}_pathseparator
+  [[ -z "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" || "$ZSH_HIGHLIGHT_STYLES[$style]" == "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" ]] && return 0
+  for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
+    if [[ $BUFFER[pos] == / ]]; then
+      _zsh_highlight_main_add_region_highlight $((pos - 1)) $pos $style_pathsep
+    fi
+  done
+}
+
+# Check if $arg is a path.
+# If yes, return 0 and in $REPLY the style to use.
+# Else, return non-zero (and the contents of $REPLY is undefined).
+_zsh_highlight_main_highlighter_check_path()
+{
+  _zsh_highlight_main_highlighter_expand_path $arg;
+  local expanded_path="$REPLY"
+
+  REPLY=path
+
+  [[ -z $expanded_path ]] && return 1
+  [[ -L $expanded_path ]] && return 0
+  [[ -e $expanded_path ]] && return 0
+
+  # Search the path in CDPATH
+  local cdpath_dir
+  for cdpath_dir in $cdpath ; do
+    [[ -e "$cdpath_dir/$expanded_path" ]] && return 0
+  done
+
+  # If dirname($arg) doesn't exist, neither does $arg.
+  [[ ! -d ${expanded_path:h} ]] && return 1
+
+  # If this word ends the buffer, check if it's the prefix of a valid path.
+  if [[ ${BUFFER[1]} != "-" && $pure_buf_len == $end_pos ]] &&
+     [[ $WIDGET != zle-line-finish ]]; then
+    local -a tmp
+    tmp=( ${expanded_path}*(N) )
+    (( $#tmp > 0 )) && REPLY=path_prefix && return 0
+  fi
+
+  # It's not a path.
+  return 1
+}
+
+# Highlight special chars inside double-quoted strings
+_zsh_highlight_main_highlighter_highlight_string()
+{
+  setopt localoptions noksharrays
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+  local i j k style
+  # Starting quote is at 1, so start parsing at offset 2 in the string.
+  for (( i = 2 ; i < end_pos - start_pos ; i += 1 )) ; do
+    (( j = i + start_pos - 1 ))
+    (( k = j + 1 ))
+    case "$arg[$i]" in
+      '$' ) style=dollar-double-quoted-argument
+            # Look for an alphanumeric parameter name.
+            if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then
+              (( k += $#MATCH )) # highlight the parameter name
+              (( i += $#MATCH )) # skip past it
+            elif [[ ${arg:$i} =~ ^[{]([A-Za-z_][A-Za-z0-9_]*|[0-9]+)[}] ]] ; then
+              (( k += $#MATCH )) # highlight the parameter name and braces
+              (( i += $#MATCH )) # skip past it
+            elif [[ $arg[i+1] == '$' ]]; then
+              # $$ - pid
+              (( k += 1 )) # highlight both dollar signs
+              (( i += 1 )) # don't consider the second one as introducing another parameter expansion
+            elif [[ $arg[i+1] == [-#*@?] ]]; then
+              # $#, $*, $@, $?, $- - like $$ above
+              (( k += 1 )) # highlight both dollar signs
+              (( i += 1 )) # don't consider the second one as introducing another parameter expansion
+            elif [[ $arg[i+1] == $'\x28' ]]; then
+              # Highlight just the '$'.
+            else
+              continue
+            fi
+            ;;
+      "\\") style=back-double-quoted-argument
+            if [[ \\\`\"\$${histchars[1]} == *$arg[$i+1]* ]]; then
+              (( k += 1 )) # Color following char too.
+              (( i += 1 )) # Skip parsing the escaped char.
+            else
+              continue
+            fi
+            ;;
+      ($histchars[1]) # ! - may be a history expansion
+            if [[ $arg[i+1] != ('='|$'\x28'|$'\x7b'|[[:blank:]]) ]]; then
+              style=history-expansion
+            else
+              continue
+            fi
+            ;;
+      *) continue ;;
+
+    esac
+    _zsh_highlight_main_add_region_highlight $j $k $style
+  done
+}
+
+# Highlight special chars inside dollar-quoted strings
+_zsh_highlight_main_highlighter_highlight_dollar_string()
+{
+  setopt localoptions noksharrays
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+  local i j k style
+  local AA
+  integer c
+  # Starting dollar-quote is at 1:2, so start parsing at offset 3 in the string.
+  for (( i = 3 ; i < end_pos - start_pos ; i += 1 )) ; do
+    (( j = i + start_pos - 1 ))
+    (( k = j + 1 ))
+    case "$arg[$i]" in
+      "\\") style=back-dollar-quoted-argument
+            for (( c = i + 1 ; c <= end_pos - start_pos ; c += 1 )); do
+              [[ "$arg[$c]" != ([0-9xXuUa-fA-F]) ]] && break
+            done
+            AA=$arg[$i+1,$c-1]
+            # Matching for HEX and OCT values like \0xA6, \xA6 or \012
+            if [[    "$AA" =~ "^(x|X)[0-9a-fA-F]{1,2}"
+                  || "$AA" =~ "^[0-7]{1,3}"
+                  || "$AA" =~ "^u[0-9a-fA-F]{1,4}"
+                  || "$AA" =~ "^U[0-9a-fA-F]{1,8}"
+               ]]; then
+              (( k += $#MATCH ))
+              (( i += $#MATCH ))
+            else
+              if (( $#arg > $i+1 )) && [[ $arg[$i+1] == [xXuU] ]]; then
+                # \x not followed by hex digits is probably an error
+                style=unknown-token
+              fi
+              (( k += 1 )) # Color following char too.
+              (( i += 1 )) # Skip parsing the escaped char.
+            fi
+            ;;
+      *) continue ;;
+
+    esac
+    _zsh_highlight_main_add_region_highlight $j $k $style
+  done
+}
+
+# Called with a single positional argument.
+# Perform filename expansion (tilde expansion) on the argument and set $REPLY to the expanded value.
+#
+# Does not perform filename generation (globbing).
+_zsh_highlight_main_highlighter_expand_path()
+{
+  (( $# == 1 )) || print -r -- >&2 "zsh-syntax-highlighting: BUG: _zsh_highlight_main_highlighter_expand_path: called without argument"
+
+  # The $~1 syntax normally performs filename generation, but not when it's on the right-hand side of ${x:=y}.
+  setopt localoptions nonomatch
+  unset REPLY
+  : ${REPLY:=${(Q)~1}}
+}
+
+# -------------------------------------------------------------------------------------------------
+# Main highlighter initialization
+# -------------------------------------------------------------------------------------------------
+
+_zsh_highlight_main__precmd_hook() {
+  _zsh_highlight_main__command_type_cache=()
+}
+
+autoload -U add-zsh-hook
+if add-zsh-hook precmd _zsh_highlight_main__precmd_hook 2>/dev/null; then
+  # Initialize command type cache
+  typeset -gA _zsh_highlight_main__command_type_cache
+else
+  print -r -- >&2 'zsh-syntax-highlighting: Failed to load add-zsh-hook. Some speed optimizations will not be used.'
+  # Make sure the cache is unset
+  unset _zsh_highlight_main__command_type_cache
+fi
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias-assignment1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias-assignment1.zsh
new file mode 100644
index 0000000..cf5be75
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias-assignment1.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Issue #263 (more-pathological case): aliases[x=y]=z works; the ${(z)} splitter considers
+# that a single word; but it's not looked up as an alias.  Hence, highlight it as an error.
+aliases[x=y]='lorem ipsum dolor sit amet'
+BUFFER='x=y ls'
+
+expected_region_highlight=(
+  "1 3 unknown-token" # x=y
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias.zsh
new file mode 100644
index 0000000..2977343
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/alias.zsh
@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias alias1="unused expansion"
+alias -s alias2="echo"
+if set -o | grep -q aliasfuncdef; then
+  setopt alias_func_def # 5.4+
+fi
+alias1() {} # to check that it's highlighted as an alias, not as a function
+
+BUFFER='x.alias2; alias1'
+
+# Set expected_region_highlight as a function of zsh version.
+#
+# Highlight of suffix alias requires zsh-5.1.1 or newer; see issue #126,
+# and commit 36403 to zsh itself.  Therefore, check if the requisite zsh
+# functionality is present, and skip verifying suffix-alias highlighting
+# if it isn't.
+expected_region_highlight=()
+if [[ "$(type -w x.alias2)" == *suffix* ]]; then
+  expected_region_highlight+=(
+    "1 8 suffix-alias" # x.alias2
+  )
+fi
+expected_region_highlight+=(
+  "11 16 alias" # alias1
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always1.zsh
new file mode 100644
index 0000000..ae40a72
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='{ ls } always { pwd }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '3 4 command' # ls
+  '6 6 reserved-word' # }
+  '8 13 reserved-word' # always
+  '15 15 reserved-word' # {
+  '17 19 builtin' # pwd
+  '21 21 reserved-word' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always2.zsh
new file mode 100644
index 0000000..f5852c6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always2.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'{\nls\n} always { pwd }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '2 2 unknown-token' # \n
+  '3 4 command' # ls
+  '5 5 commandseparator' # \n
+  '6 6 reserved-word' # }
+  '8 13 reserved-word' # always
+  '15 15 reserved-word' # {
+  '17 19 builtin' # pwd
+  '21 21 reserved-word' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always3.zsh
new file mode 100644
index 0000000..d41beeb
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/always3.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt ignorebraces
+BUFFER='echo { foo } always { bar }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 default' # {
+  '8 10 default' # foo
+  '12 12 default' # }
+  '14 19 default' # always
+  '21 21 default' # {
+  '23 25 default' # bar
+  '27 27 default' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/anonymous-function.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/anonymous-function.zsh
new file mode 100644
index 0000000..5b8e0b6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/anonymous-function.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() echo hello; () { echo world } "argument"'
+
+expected_region_highlight=(
+  "1 2 reserved-word" # ()
+  "4 7 builtin" # echo
+  "9 13 default" # hello
+  "14 14 commandseparator" # ;
+  "16 17 reserved-word" # ()
+  "19 19 reserved-word" # {
+  "21 24 builtin" # echo
+  "34 43 double-quoted-argument" # "argument"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arg0-colon.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arg0-colon.zsh
new file mode 100644
index 0000000..8955bd2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arg0-colon.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=''\''x: /'
+
+expected_region_highlight=(
+  '1 5 unknown-token' # \'x: /
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arithmetic-evaluation.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arithmetic-evaluation.zsh
new file mode 100644
index 0000000..e0eb6e7
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/arithmetic-evaluation.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Must be at command word, since the word following 'if' isn't currently considered
+# a command word (issue #207).
+#
+# An opening '((' without matching '))' is highlighted correctly under zsh-5.1.1-52-g4bed2cf
+# or newer, only (issue #188).
+BUFFER='(( x == 42 ))'
+
+expected_region_highlight=(
+  "1 2 reserved-word" # ((
+  "12 13 reserved-word" # ))
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-append.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-append.zsh
new file mode 100644
index 0000000..6485f0e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-append.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='a+=(lorem ipsum)'
+
+expected_region_highlight=(
+  "1 4 assign" # a+=(
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-argv.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-argv.zsh
new file mode 100644
index 0000000..fdf30aa
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-argv.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='42=foo 43+=bar'
+
+expected_region_highlight=(
+  "1 6 assign" # 42=foo
+  "8 14 assign" # 43+=bar
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array.zsh
new file mode 100644
index 0000000..8995162
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(A=(hello world))'
+
+expected_region_highlight=(
+  "1 1 reserved-word" # (
+  "2 4 assign" # A=(
+  "16 16 assign" # )
+  "17 17 reserved-word" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array2.zsh
new file mode 100644
index 0000000..37ba372
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=(hello world) ls'
+
+expected_region_highlight=(
+  "1 3 assign" # A=(
+  "15 15 assign" # )
+  "17 18 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array3.zsh
new file mode 100644
index 0000000..26c42e9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-array3.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=(hello world) b=42'
+
+expected_region_highlight=(
+  "1 3 assign" # A=(
+  "15 15 assign" # )
+  "17 20 assign" # b=42
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-semicolon.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-semicolon.zsh
new file mode 100644
index 0000000..c2618b0
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-semicolon.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=1; echo hello world'
+
+expected_region_highlight=(
+  "4 4 commandseparator" # ;
+  "6 9 builtin" # echo
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-subshell.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-subshell.zsh
new file mode 100644
index 0000000..fc04f6b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign-subshell.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(A=1)'
+
+expected_region_highlight=(
+  "1 1 reserved-word" # (
+  "2 4 assign" # A=1
+  "5 5 reserved-word" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign.zsh
new file mode 100644
index 0000000..713a5f2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/assign.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=1 b=("foo" bar)'
+
+expected_region_highlight=(
+  "1 3 assign" # A=1
+  "5 7 assign" # b=(
+  "8 12 double-quoted-argument" # "foo"
+  "14 16 default" # bar
+  "17 17 assign" # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/back-quoted-argument.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/back-quoted-argument.zsh
new file mode 100644
index 0000000..f8329ea
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/back-quoted-argument.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo `echo 42`'
+
+expected_region_highlight=(
+  "6 14 back-quoted-argument"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/backslash-continuation.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/backslash-continuation.zsh
new file mode 100644
index 0000000..ebcf2e1
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/backslash-continuation.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo \\\n'
+BUFFER='noglob'
+
+expected_region_highlight=(
+  "1 6 default" # 'noglob' highlighted as a string, not as a precomand
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces1.zsh
new file mode 100644
index 0000000..3c5b1f0
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'() { echo }\n}'
+# no special setopts
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 11 reserved-word' # }
+  '12 12 commandseparator' # \n
+  '13 13 unknown-token' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces2.zsh
new file mode 100644
index 0000000..a3ea7c9
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/braces2.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'() { echo }\n}'
+setopt ignorebraces
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 11 default' # }
+  '12 12 commandseparator' # \n
+  '13 13 reserved-word' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch1.zsh
new file mode 100644
index 0000000..5e6e80f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch1.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() { echo foo )'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 13 default' # foo
+  '15 15 unknown-token' # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh
new file mode 100644
index 0000000..9d0b53c
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='elif true; then echo two; fi'
+
+expected_region_highlight=(
+  '1 4 unknown-token' # elif
+  '6 9 builtin' # true
+  '10 10 commandseparator' # ;
+  '12 15 unknown-token' # then
+  '17 20 builtin' # echo
+  '22 24 default' # two
+  '25 25 commandseparator' # ;
+  '27 28 unknown-token' # fi
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch2.zsh
new file mode 100644
index 0000000..2d98ac2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() ( echo foo }'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # (
+  '6 9 builtin' # echo
+  '11 13 default' # foo
+  '15 15 unknown-token' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch3.zsh
new file mode 100644
index 0000000..e33040a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch3.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo )'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 unknown-token' # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch4.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch4.zsh
new file mode 100644
index 0000000..a9b15dc
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch4.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 unknown-token' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch5.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch5.zsh
new file mode 100644
index 0000000..21e8bb2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch5.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo { }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 default' # {
+  '8 8 unknown-token' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch6.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch6.zsh
new file mode 100644
index 0000000..9df8388
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch6.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(repeat 1; do)'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # (
+  '2 7 reserved-word' # repeat
+  '9 9 default' # 1
+  '10 10 commandseparator' # ;
+  '12 13 reserved-word' # do
+  '14 14 unknown-token' # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch7.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch7.zsh
new file mode 100644
index 0000000..27d5920
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch7.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2012 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='for n in *; do echo $n; end'
+
+expected_region_highlight=(
+  '1 3 reserved-word' # for
+  '5 5 default' # n
+  '7 8 default' # in
+  '10 10 globbing' # *
+  '11 11 commandseparator' # ;
+  '13 14 reserved-word' # do
+  '16 19 builtin' # echo
+  '21 22 default' # $n
+  '23 23 commandseparator' # ;
+  '25 27 unknown-token' # end
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh
new file mode 100644
index 0000000..d6838f0
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh
@@ -0,0 +1,53 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='if false; then echo one; elif true; then echo two; else echo three; fi'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # if
+  '4 8 builtin' # false
+  '9 9 commandseparator' # ;
+  '11 14 reserved-word' # then
+  '16 19 builtin' # echo
+  '21 23 default' # one
+  '24 24 commandseparator' # ;
+  '26 29 reserved-word' # elif
+  '31 34 builtin' # true
+  '35 35 commandseparator' # ;
+  '37 40 reserved-word' # then
+  '42 45 builtin' # echo
+  '47 49 default' # two
+  '50 50 commandseparator' # ;
+  '52 55 reserved-word' # else
+  '57 60 builtin' # echo
+  '62 66 default' # three
+  '67 67 commandseparator' # ;
+  '69 70 reserved-word' # fi
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8.zsh
new file mode 100644
index 0000000..07a42e3
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch8.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(ls&)'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # (
+  '2 3 command' # ls
+  '4 4 commandseparator' # &
+  '5 5 reserved-word' # )
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh
new file mode 100644
index 0000000..87c1ba7
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='if false; then echo one; fi'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # if
+  '4 8 builtin' # false
+  '9 9 commandseparator' # ;
+  '11 14 reserved-word' # then
+  '16 19 builtin' # echo
+  '21 23 default' # one
+  '24 24 commandseparator' # ;
+  '26 27 reserved-word' # fi
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commandseparator.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commandseparator.zsh
new file mode 100644
index 0000000..e8d93a6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commandseparator.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=':; pwd &! ls'
+
+expected_region_highlight=(
+  "2 2 commandseparator" # ;
+  "4 6 builtin" # pwd
+  "8 9 commandseparator" # &!
+  "11 12 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-followed.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-followed.zsh
new file mode 100644
index 0000000..af4e9b5
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-followed.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactivecomments
+BUFFER=$'# foo\ntrue'
+
+expected_region_highlight=(
+  '1 5 comment' # #
+  #'6 6 '"' # \n
+
+  '7 10 builtin' # true
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-leading.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-leading.zsh
new file mode 100644
index 0000000..f750cc4
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-leading.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+
+BUFFER='# echo foo'
+
+expected_region_highlight=(
+  "1 1 comment" # #
+  "2 10 comment" # " echo foo"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-off.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-off.zsh
new file mode 100644
index 0000000..0381bdb
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comment-off.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsetopt interactive_comments
+
+BUFFER='# echo foo'
+
+expected_region_highlight=(
+  "1 1 unknown-token" # #
+  "3 6 default" # " echo foo"
+  "8 10 default" # " echo foo"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comments.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comments.zsh
new file mode 100644
index 0000000..3bb008e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/comments.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+
+BUFFER='echo "foo #bar" #baz # quux'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "6 15 double-quoted-argument" # "foo #bar"
+  "17 27 comment" # #baz # quux
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commmand-parameter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commmand-parameter.zsh
new file mode 100644
index 0000000..fb43e9e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/commmand-parameter.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+x=/usr/bin/env
+BUFFER='$x "argument"'
+
+expected_region_highlight=(
+  "1 2 command" # $x
+  "4 13 double-quoted-argument" # "argument"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow.zsh
new file mode 100644
index 0000000..2f6a160
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow.zsh
@@ -0,0 +1,50 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='while if echo Hello; then ls /; else ls; fi; do stat "x"; done; repeat 10 ls'
+
+expected_region_highlight+=(
+  "1 5 reserved-word" # while
+  "7 8 reserved-word" # if
+  "10 13 builtin" # echo
+  "15 19 default" # Hello
+  "22 25 reserved-word" # then
+  "27 28 command" # ls
+  "30 30 path" # /
+  "31 31 commandseparator" # ;
+  "33 36 reserved-word" # else
+  "38 39 command" # ls
+  "42 43 reserved-word" # fi
+  "46 47 reserved-word" # do
+  "49 52 command" # stat
+  "54 56 double-quoted-argument" # "x"
+  "59 62 reserved-word" # done
+  "65 70 reserved-word" # repeat
+  "75 76 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow2.zsh
new file mode 100644
index 0000000..acf99e1
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat 42; do ls; done'
+
+expected_region_highlight+=(
+  "1 6 reserved-word" # repeat
+  "8 9 default" # 42
+  "10 10 commandseparator" # ;
+  "12 13 reserved-word" # do
+  "15 16 command" # ls
+  "17 17 commandseparator" # ;
+  "19 22 reserved-word" # done
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow3.zsh
new file mode 100644
index 0000000..58f507f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/control-flow3.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat 42; ls; pwd'
+
+expected_region_highlight+=(
+  "1 6 reserved-word" # repeat
+  "8 9 default" # 42
+  "10 10 commandseparator" # ;
+  "12 13 command" # ls
+  "14 14 commandseparator" # ;
+  "16 18 builtin" # pwd
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-dollar.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-dollar.zsh
new file mode 100644
index 0000000..79d7f7d
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-dollar.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$$ $$foo"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 double-quoted-argument' # "
+  '4 5 dollar-double-quoted-argument' # $$
+  '7 8 dollar-double-quoted-argument' # $$
+  '9 12 double-quoted-argument' # foo"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-noise.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-noise.zsh
new file mode 100644
index 0000000..e900b02
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-noise.zsh
@@ -0,0 +1,46 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$- $# $* $@ $?"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 double-quoted-argument' # "
+  '4 5 dollar-double-quoted-argument' # $-
+  '6 6 double-quoted-argument' # <space>
+  '7 8 dollar-double-quoted-argument' # $#
+  '9 9 double-quoted-argument' # <space>
+  '10 11 dollar-double-quoted-argument' # $*
+  '12 12 double-quoted-argument' # <space>
+  '13 14 dollar-double-quoted-argument' # $@
+  '15 15 double-quoted-argument' # <space>
+  '16 17 dollar-double-quoted-argument' # $?
+  '18 18 double-quoted-argument' # "
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-paren.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-paren.zsh
new file mode 100644
index 0000000..354daa0
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-paren.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$(:)"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 double-quoted-argument' # "
+  '4 4 dollar-double-quoted-argument' # $
+  '5 8 double-quoted-argument' # (:)"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted.zsh
new file mode 100644
index 0000000..8c4c16f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=": \$'*' 'foo'"
+
+expected_region_highlight=(
+  "3 6 dollar-quoted-argument" # $'*' - not a glob
+  "8 12 single-quoted-argument" # 'foo'
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted2.zsh
new file mode 100644
index 0000000..a69373f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=": \$'foo\xbar\udeadbeef\uzzzz'"
+
+expected_region_highlight=(
+  "3 7 dollar-quoted-argument" # $'foo
+  "8 11 back-dollar-quoted-argument" # \xba
+  "12 12 dollar-quoted-argument" # r
+  "13 18 back-dollar-quoted-argument" # \dead
+  "19 22 dollar-quoted-argument" # beef
+  "23 24 unknown-token" # \u
+  "25 29 dollar-quoted-argument" # zzzz'
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted3.zsh
new file mode 100644
index 0000000..320cd94
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/dollar-quoted3.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Similar to double-quoted2.zsh
+# This test checks that the '1' gets highlighted correctly.  Do not append to the BUFFER.
+BUFFER=": \$'\xa1"
+
+expected_region_highlight=(
+  "3 4 dollar-quoted-argument" # $'
+  "5 8 back-dollar-quoted-argument" # \xa1
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-hyphen-option.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-hyphen-option.zsh
new file mode 100644
index 0000000..9728cd8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-hyphen-option.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='hello --world'
+
+expected_region_highlight=(
+  "7 13 double-hyphen-option" # --world
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted.zsh
new file mode 100644
index 0000000..7e379f8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted.zsh
@@ -0,0 +1,45 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "foo$bar:\`:\":\$:'
+BUFFER+=\\\\:\"
+
+expected_region_highlight=(
+  "3 6 double-quoted-argument" # "foo
+  "7 10 dollar-double-quoted-argument" # $bar
+  "11 11 double-quoted-argument" # :
+  "12 13 back-double-quoted-argument" # \`
+  "14 14 double-quoted-argument" # :
+  "15 16 back-double-quoted-argument" # \$
+  "17 17 double-quoted-argument" # :
+  "18 19 back-double-quoted-argument" # \"
+  "20 20 double-quoted-argument" # :
+  "21 22 back-double-quoted-argument" # \\
+  "23 24 double-quoted-argument" # :"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted2.zsh
new file mode 100644
index 0000000..1538423
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted2.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Similar to dollar-quoted3.zsh
+# This test checks that the 'r' gets highlighted correctly.  Do not append to the BUFFER.
+BUFFER=': "foo$bar'
+
+expected_region_highlight=(
+  "3 6 double-quoted-argument" # "foo
+  "7 10 dollar-double-quoted-argument" # $bar
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted3.zsh
new file mode 100644
index 0000000..39514e0
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted3.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$" "$42foo"'
+BUFFER+=\ \"\\\'\\x\"
+
+expected_region_highlight=(
+  "3 5 double-quoted-argument" # "$"
+  "7 7 double-quoted-argument" # "
+  "8 10 dollar-double-quoted-argument" # $42
+  "11 14 double-quoted-argument" # foo"
+  "16 21 double-quoted-argument" # "\'\x" - \' and \x are not escape sequences
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted4.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted4.zsh
new file mode 100644
index 0000000..51bb25e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/double-quoted4.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "${foo}bar"'
+
+expected_region_highlight=(
+  "3 3 double-quoted-argument" # "
+  "4 9 dollar-double-quoted-argument" # ${foo}
+  "10 13 double-quoted-argument" # bar"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command.zsh
new file mode 100644
index 0000000..6e68184
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo; ;'
+
+expected_region_highlight=(
+  "5 5 commandseparator" # ;
+  "7 7 unknown-token" # ;
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command2.zsh
new file mode 100644
index 0000000..698b3a7
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/empty-command2.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Same test data and expectations as empty-command.zsh; the only difference is:
+touch ';'
+
+BUFFER='echo; ;'
+
+expected_region_highlight=(
+  "5 5 commandseparator" # ;
+  "7 7 unknown-token" # ;
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/exec-redirection1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/exec-redirection1.zsh
new file mode 100644
index 0000000..caec2f1
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/exec-redirection1.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='exec {foo}>&/tmp ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # exec
+  "6 10 redirection 'issue #238'" # {foo}
+  "11 12 redirection" # >&
+  "13 16 path" # /tmp
+  "18 19 command 'issue #238'" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named1.zsh
new file mode 100644
index 0000000..c962ddb
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named1.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='f() pwd; f() { balanced braces }'
+
+expected_region_highlight=(
+  '1 1 TBD "issue #223"' # f
+  '2 3 reserved-word' # ()
+  '5 7 builtin' # pwd
+  '8 8 commandseparator' # ;
+  '10 10 TBD "issue #223"' # f
+  '11 12 reserved-word' # ()
+  '14 14 reserved-word' # {
+  '16 23 unknown-token' # balanced
+  '25 30 default' # braces
+  '32 32 reserved-word' # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named2.zsh
new file mode 100644
index 0000000..e12fce6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function-named2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='f g h () pwd'
+
+expected_region_highlight=(
+  '1 1 TBD "issue #223"' # f
+  '3 3 TBD "issue #223"' # g
+  '5 5 TBD "issue #223"' # h
+  '7 8 reserved-word' # ()
+  '10 12 builtin' # pwd
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function.zsh
new file mode 100644
index 0000000..6876391
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/function.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+cd() {
+  builtin cd "$@"
+}
+ls() {
+  command ls "$@"
+}
+BUFFER='cd;ls'
+
+expected_region_highlight=(
+  "1 2 function" # cd
+  "4 5 function" # ls
+)
+
+# don't 'unfunction cd ls', since cd() and ls() should still be a functions
+# when _zsh_highlight runs.  Leaving the wrapper functions is harmless.
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/glob.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/glob.zsh
new file mode 100644
index 0000000..2fd9c6f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/glob.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': foo* bar? *baz qux\?'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 6 globbing" # foo*
+  "8 11 globbing" # bar?
+  "13 16 globbing" # *baz
+  "18 22 default" # qux\?
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/hashed-command.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/hashed-command.zsh
new file mode 100644
index 0000000..2983ef8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/hashed-command.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash zsh_syntax_highlighting_hash=/doesnotexist
+BUFFER='zsh_syntax_highlighting_hash'
+
+expected_region_highlight=(
+  "1 28 hashed-command 'zsh/parameter cannot distinguish between hashed and command'"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-escaped.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-escaped.zsh
new file mode 100644
index 0000000..c447a78
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-escaped.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "Hello\!"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 11 double-quoted-argument' # "Hello
+  '12 13 back-double-quoted-argument' # \!
+  '14 14 double-quoted-argument' # "Hello\!"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-no.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-no.zsh
new file mode 100644
index 0000000..7867e83
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-no.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo != bar !{baz}"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 24 double-quoted-argument' # "foo != bar !{baz}" - no history expansions
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-unescaped.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-unescaped.zsh
new file mode 100644
index 0000000..c828b44
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-unescaped.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "Hello!"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 11 double-quoted-argument' # "Hello
+  '12 12 history-expansion' # !
+  '13 13 double-quoted-argument' # "
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-yes.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-yes.zsh
new file mode 100644
index 0000000..88c300e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-double-quoted-yes.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo !bar"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 10 double-quoted-argument' # "foo 
+  '11 11 history-expansion' # !
+  '12 15 double-quoted-argument' # bar"
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion.zsh
new file mode 100644
index 0000000..3e23711
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='!foo bar !baz ! ; !'
+
+expected_region_highlight=(
+  "1 4 history-expansion" # !foo
+  "6 8 default" # bar
+  "10 13 history-expansion" # !baz
+  "15 15 default" # ! (before the semicolon)
+  "19 19 reserved-word" # ! (after the semicolon)
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion2.zsh
new file mode 100644
index 0000000..386d0df
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/history-expansion2.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='^foo^bar'
+
+expected_region_highlight=(
+  "1 8 history-expansion" # ^foo^bar
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/inheritance.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/inheritance.zsh
new file mode 100644
index 0000000..e851ca3
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/inheritance.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 ${(j.,.)argv[3,-1]}")
+}
+
+BUFFER='type'
+
+expected_region_highlight=(
+  '1 4 builtin,arg0' # type
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-array-assignment1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-array-assignment1.zsh
new file mode 100644
index 0000000..3734c7a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-array-assignment1.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=(\nbar) env'
+
+expected_region_highlight=(
+  '1 5 assign' # foo=(
+  '6 6 commandseparator' # \n
+  '7 9 default' # bar
+  '10 10 assign' # )
+  '12 14 command' # env
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string.zsh
new file mode 100644
index 0000000..484c951
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo "foo1\n'
+BUFFER='foo2" ./'
+
+expected_region_highlight=(
+  "1 5 double-quoted-argument" # 'foo2"'
+  "7 8 path" # './'
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string2.zsh
new file mode 100644
index 0000000..8ecce5b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiline-string2.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'echo "foo1\n'
+
+expected_region_highlight=(
+  "6 10 double-quoted-argument" # 'foo2"'
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiple-redirections.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiple-redirections.zsh
new file mode 100644
index 0000000..778e712
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/multiple-redirections.zsh
@@ -0,0 +1,46 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ps aux | grep java | sort | uniq | tail | head'
+
+expected_region_highlight=(
+  "1  2  command" # ps
+  "4  6  default" # aux
+  "8  8  commandseparator" # |
+  "10 13 command" # grep
+  "15 18 default" # java
+  "20 20 commandseparator" # |
+  "22 25 command" # sort
+  "27 27 commandseparator" # |
+  "29 32 command" # uniq
+  "34 34 commandseparator" # |
+  "36 39 command" # tail
+  "41 41 commandseparator" # |
+  "43 46 command" # head
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob-alias.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob-alias.zsh
new file mode 100644
index 0000000..6f3a7f7
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob-alias.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x=command
+BUFFER='x ls'
+
+expected_region_highlight=(
+  "3 4 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob1.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob1.zsh
new file mode 100644
index 0000000..ea70a83
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob1.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=':; noglob echo *'
+
+expected_region_highlight=(
+  "16 16 default" # *
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob2.zsh
new file mode 100644
index 0000000..6d7a940
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/noglob2.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='noglob echo *; echo *'
+
+expected_region_highlight=(
+  "13 13 default" # *
+  "21 21 globbing" # *
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/off-by-one.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/off-by-one.zsh
new file mode 100644
index 0000000..550c09f
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/off-by-one.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=A
+f() {}
+
+BUFFER='a;f;'
+
+expected_region_highlight=(
+  "1 1 alias" # f
+  "2 2 commandseparator" # ;
+  "3 3 function" # g
+  "4 4 commandseparator" # ;
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/option-path_dirs.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/option-path_dirs.zsh
new file mode 100644
index 0000000..1f3002a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/option-path_dirs.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+## setup
+setopt PATH_DIRS
+mkdir -p foo/bar
+touch foo/bar/testing-issue-228
+chmod  +x foo/bar/testing-issue-228
+path+=( "$PWD"/foo )
+
+BUFFER='bar/testing-issue-228'
+
+expected_region_highlight=(
+  "1 21 command" # bar/testing-issue-228
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/parameter-star.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/parameter-star.zsh
new file mode 100644
index 0000000..1797e58
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/parameter-star.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() { : $* }'
+
+# This tests that $* isn't highlighted as a glob.
+# If we ever add a "unquoted parameter" style, the expectation may change.
+expected_region_highlight=(
+  "8 9 default" # $*
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-broken-symlink.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-broken-symlink.zsh
new file mode 100644
index 0000000..84c7d59
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-broken-symlink.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ln -s /nonexistent broken-symlink
+BUFFER=': broken-symlink'
+CURSOR=5 # to make path_prefix ineligible
+
+expected_region_highlight=(
+  "3 16 path" # broken-symlink
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-dollared-word2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-dollared-word2.zsh
new file mode 100644
index 0000000..3485b45
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-dollared-word2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+lambda="''"
+touch \$lambda
+BUFFER=': \$lambda'
+
+expected_region_highlight=(
+  "3 8 path" # \$lambda
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators.zsh
new file mode 100644
index 0000000..cf13dad
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators.zsh
@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# ZSH_HIGHLIGHT_STYLES is empty in tests. The path-separator code however compares its values.
+# Make sure the relevant ones are set to something.
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=set
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=set
+
+mkdir A
+touch A/mu
+BUFFER='ls /bin/ / A/mu A/m'
+
+expected_region_highlight=(
+  "4 4 path_pathseparator"           # /
+  "5 7 path"                         # bin
+  "8 8 path_pathseparator"           # /
+
+  "10 10 path_pathseparator"         # /
+
+  "12 12 path"                       # A
+  "13 13 path_pathseparator"         # /
+  "14 15 path"                       # mu
+
+  "17 17 path_prefix"                # A
+  "18 18 path_prefix_pathseparator"  # /
+  "19 19 path_prefix"                # m
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators2.zsh
new file mode 100644
index 0000000..db4e706
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-separators2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# ZSH_HIGHLIGHT_STYLES is empty in tests. The path-separator code however compares its values.
+# For this test, make sure both these styles are set and identical:
+ZSH_HIGHLIGHT_STYLES[path]=value
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=value
+
+BUFFER='ls /bin/'
+
+expected_region_highlight=(
+  "4 8 path"    # /bin/
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-space.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-space.zsh
new file mode 100644
index 0000000..67a26fd
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-space.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir A
+touch "A/mu with spaces"
+BUFFER='ls A/mu\ with\ spaces'
+
+expected_region_highlight=(
+  "1 2  command" # ls
+  "4 19 path"    # A/mu\ with\ spaces
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home.zsh
new file mode 100644
index 0000000..8b1c680
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+HOME="."
+BUFFER='ls ~'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 4 path"    # ~
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home2.zsh
new file mode 100644
index 0000000..3f7b820
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-home2.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+HOME="/nonexistent"
+BUFFER='ls ~'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 4 default"    # ~
+)
+
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-named.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-named.zsh
new file mode 100644
index 0000000..335b3fd
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path-tilde-named.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir mydir
+touch mydir/path-tilde-named.test
+hash -d D=mydir
+
+BUFFER='ls ~D/path-tilde-named.test'
+
+expected_region_highlight=(
+  "1 2  command" # ls
+  "4 27 path"    # ~D/path-tilde-named.test
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path.zsh
new file mode 100644
index 0000000..d387eff
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir A
+touch A/mu
+BUFFER='ls A/mu'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 7 path"     # A/mu
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix.zsh
new file mode 100644
index 0000000..12fb30b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Assumes that '/bin/sh' exists and '/bin/s' does not exist.
+# Related to path_prefix2.zsh
+
+BUFFER='ls /bin/s'
+
+expected_region_highlight=(
+  "4 9 path_prefix"    # /bin/s
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix2.zsh
new file mode 100644
index 0000000..501928a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/path_prefix2.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Assumes that '/bin/sh' exists and '/bin/s' does not exist.
+# Related to path_prefix.zsh
+
+BUFFER='ls /bin/s'
+WIDGET=zle-line-finish
+
+expected_region_highlight=(
+  "4 9 default"    # /bin/s
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand.zsh
new file mode 100644
index 0000000..a03b331
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': command zzzzzz'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 9 default" # not precommand
+  "11 16 default" # not unknown-token (since 'zzzzzz' is not a command)
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand2.zsh
new file mode 100644
index 0000000..3d8f332
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/precommand2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='command -v ls'
+
+expected_region_highlight=(
+  "1 7 precommand" # command
+  "9 10 single-hyphen-option 'issue #343'" # -v
+  "12 13 command 'issue #343'" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/prefix-redirection.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/prefix-redirection.zsh
new file mode 100644
index 0000000..5a5c0e2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/prefix-redirection.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='>/tmp >/tmp sudo echo >/tmp foo'
+
+expected_region_highlight=(
+  "2  5  path"       # /tmp
+  "8  11 path"       # /tmp
+  "13 16 precommand" # sudo
+  "18 21 builtin"    # echo
+  "24 27 path"       # /tmp
+  "29 31 default"    # foo
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection.zsh
new file mode 100644
index 0000000..5086082
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Redirection before and after the command word are implemented differently; test both.
+BUFFER='<<<foo echo >>&!bar'
+
+expected_region_highlight=(
+  "1 3 redirection" # <<<
+  "13 16 redirection" # >>&!
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection2.zsh
new file mode 100644
index 0000000..83f7c08
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/redirection2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ls >(wc) | nl'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "10 10 commandseparator" # |
+  "12 13 command" # nl
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/reserved-word.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/reserved-word.zsh
new file mode 100644
index 0000000..e71fe0a
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/reserved-word.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat "1" do done'
+
+expected_region_highlight=(
+  "1 6 reserved-word" # repeat
+  "8 10 double-quoted-argument" # "1"
+  "12 13 reserved-word" # do
+  "15 18 reserved-word" # done
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-command.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-command.zsh
new file mode 100644
index 0000000..8bb41fd
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-command.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ls'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-redirection.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-redirection.zsh
new file mode 100644
index 0000000..e8c25e5
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/simple-redirection.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ps aux | grep java'
+
+expected_region_highlight=(
+  "1  2  command" # ps
+  "4  6  default" # aux
+  "8  8  commandseparator" # |
+  "10 13 command" # grep
+  "15 18 default" # java
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/subshell.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/subshell.zsh
new file mode 100644
index 0000000..0080ad2
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/subshell.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='tar cf - * | (cd /target; tar xfp -) | { cat }'
+
+expected_region_highlight=(
+  "1 3 command" # tar
+  "14 14 reserved-word" # (
+  "15 16 builtin" # cd
+  "27 29 command" # tar
+  "36 36 reserved-word" # )
+  "40 40 reserved-word" # {
+  "42 44 command" # cat
+  "46 46 reserved-word" # }
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-command.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-command.zsh
new file mode 100644
index 0000000..3183a23
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-command.zsh
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Tests three codepaths:
+# * -i  (no argument)
+# * -C3 (pasted argument)
+# * -u otheruser (non-pasted argument)
+BUFFER='sudo -C3 -u otheruser -i ls /; sudo ; sudo -u ; sudo notacommand'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 8 single-hyphen-option" # -C3
+  "10 11 single-hyphen-option" # -u
+  "13 21 default" # otheruser
+  "23 24 single-hyphen-option" # -i
+  "26 27 command" # ls
+  "29 29 path" # /
+  "37 37 unknown-token" # ;, error because empty command
+  "47 47 unknown-token" # ;, error because incomplete command
+  "54 64 unknown-token" # notacommand - doesn't falls back to "not a command word" codepath
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-comment.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-comment.zsh
new file mode 100644
index 0000000..856567b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-comment.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+BUFFER='sudo -u # comment'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 single-hyphen-option" # -u
+  "9 17 unknown-token" # "# comment" - error because argument missed
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection.zsh
new file mode 100644
index 0000000..f507899
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection.zsh
@@ -0,0 +1,46 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='sudo -u >/tmp otheruser ls; sudo ls; sudo -i ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 single-hyphen-option" # -u
+  "9 9 redirection" # >
+  "10 13 path" # /tmp
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+  "27 27 commandseparator" # ;
+  "29 32 precommand" # sudo
+  "34 35 command" # ls
+  "36 36 commandseparator" # ;
+  "38 41 precommand" # sudo
+  "43 44 single-hyphen-option" # -i
+  "46 47 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection2.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection2.zsh
new file mode 100644
index 0000000..30f6ff8
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='sudo >/tmp -u otheruser ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 6 redirection" # >
+  "7 10 path" # /tmp
+  "12 13 single-hyphen-option" # -u
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection3.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection3.zsh
new file mode 100644
index 0000000..fdd426d
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/sudo-redirection3.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='sudo 2>./. -u otheruser ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 redirection" # 2>
+  "8 10 path" # ./. # a 3-character path, for alignment with sudo-redirection2.zsh
+  "12 13 single-hyphen-option" # -u
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/tilde-command-word.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/tilde-command-word.zsh
new file mode 100644
index 0000000..67c996c
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/tilde-command-word.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash -d D=/usr/bin
+
+BUFFER='~D/env foo'
+
+expected_region_highlight=(
+  "1 6  command" # ~D/env [= /usr/bin/env
+  "8 10 default" # foo
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unbackslash.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unbackslash.zsh
new file mode 100644
index 0000000..c8dfbd4
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unbackslash.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='\sh'
+
+expected_region_highlight=(
+  "1 3 command" # \sh (runs 'sh', bypassing aliases)
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unknown-command.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unknown-command.zsh
new file mode 100644
index 0000000..e71faec
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/unknown-command.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='azertyuiop'
+
+expected_region_highlight=(
+  "1  10  unknown-token" # azertyuiop
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vanilla-newline.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vanilla-newline.zsh
new file mode 100644
index 0000000..bd60ad4
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vanilla-newline.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo foo; echo bar\n\n\n'
+BUFFER=' echo baz; echo qux'
+
+expected_region_highlight=(
+  "2 5 builtin" # echo
+  "7 9 default" # baz
+  "10 10 commandseparator" # semicolon
+  "12 15 builtin" # echo
+  "17 19 default" # qux
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vi-linewise-mode.zsh b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vi-linewise-mode.zsh
new file mode 100644
index 0000000..4b77766
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/main/test-data/vi-linewise-mode.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See issue #267 for the magic numbers
+BUFFER=$'foo foo\nbar bar'
+REGION_ACTIVE=2
+CURSOR=4
+MARK=12
+
+expected_region_highlight=(
+  "1 3 standout" # foo
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/pattern/README.md b/zsh/modules/syntax-highlighting/external/highlighters/pattern/README.md
new file mode 120000
index 0000000..5ff00e6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/pattern/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/pattern.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/pattern/pattern-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/pattern/pattern-highlighter.zsh
new file mode 100644
index 0000000..054eff7
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/pattern/pattern-highlighter.zsh
@@ -0,0 +1,60 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# List of keyword and color pairs.
+typeset -gA ZSH_HIGHLIGHT_PATTERNS
+
+# Whether the pattern highlighter should be called or not.
+_zsh_highlight_highlighter_pattern_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# Pattern syntax highlighting function.
+_zsh_highlight_highlighter_pattern_paint()
+{
+  setopt localoptions extendedglob
+  local pattern
+  for pattern in ${(k)ZSH_HIGHLIGHT_PATTERNS}; do
+    _zsh_highlight_pattern_highlighter_loop "$BUFFER" "$pattern"
+  done
+}
+
+_zsh_highlight_pattern_highlighter_loop()
+{
+  # This does *not* do its job syntactically, sorry.
+  local buf="$1" pat="$2"
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+  if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
+    region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat]")
+    "$0" "$match[1]" "$pat"; return $?
+  fi
+}
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/pattern/test-data/rm-rf.zsh b/zsh/modules/syntax-highlighting/external/highlighters/pattern/test-data/rm-rf.zsh
new file mode 100644
index 0000000..2f76929
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/pattern/test-data/rm-rf.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+
+BUFFER='rm -rf /'
+
+expected_region_highlight=(
+  "1 8 fg=white,bold,bg=red" # rm -rf /
+)
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/root/README.md b/zsh/modules/syntax-highlighting/external/highlighters/root/README.md
new file mode 120000
index 0000000..ca6799d
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/root/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/root.md
\ No newline at end of file
diff --git a/zsh/modules/syntax-highlighting/external/highlighters/root/root-highlighter.zsh b/zsh/modules/syntax-highlighting/external/highlighters/root/root-highlighter.zsh
new file mode 100644
index 0000000..3718c44
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/highlighters/root/root-highlighter.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
+
+# Whether the root highlighter should be called or not.
+_zsh_highlight_highlighter_root_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# root highlighting function.
+_zsh_highlight_highlighter_root_paint()
+{
+  if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
+}
diff --git a/zsh/modules/syntax-highlighting/external/images/after1-smaller.png b/zsh/modules/syntax-highlighting/external/images/after1-smaller.png
new file mode 100644
index 0000000..768294c
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after1-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/after1.png b/zsh/modules/syntax-highlighting/external/images/after1.png
new file mode 100644
index 0000000..ea378d3
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after1.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/after2-smaller.png b/zsh/modules/syntax-highlighting/external/images/after2-smaller.png
new file mode 100644
index 0000000..8b5b1f8
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after2-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/after2.png b/zsh/modules/syntax-highlighting/external/images/after2.png
new file mode 100644
index 0000000..ddcbfad
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after2.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/after3-smaller.png b/zsh/modules/syntax-highlighting/external/images/after3-smaller.png
new file mode 100644
index 0000000..d6aaa7b
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after3-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/after3.png b/zsh/modules/syntax-highlighting/external/images/after3.png
new file mode 100644
index 0000000..7a0af88
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/after3.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before1-smaller.png b/zsh/modules/syntax-highlighting/external/images/before1-smaller.png
new file mode 100644
index 0000000..b29551e
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before1-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before1.png b/zsh/modules/syntax-highlighting/external/images/before1.png
new file mode 100644
index 0000000..80c6f54
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before1.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before2-smaller.png b/zsh/modules/syntax-highlighting/external/images/before2-smaller.png
new file mode 100644
index 0000000..991a716
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before2-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before2.png b/zsh/modules/syntax-highlighting/external/images/before2.png
new file mode 100644
index 0000000..48cfc32
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before2.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before3-smaller.png b/zsh/modules/syntax-highlighting/external/images/before3-smaller.png
new file mode 100644
index 0000000..e525c6d
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before3-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/before3.png b/zsh/modules/syntax-highlighting/external/images/before3.png
new file mode 100644
index 0000000..40c3601
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/before3.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/preview-smaller.png b/zsh/modules/syntax-highlighting/external/images/preview-smaller.png
new file mode 100644
index 0000000..6fb84d1
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/preview-smaller.png differ
diff --git a/zsh/modules/syntax-highlighting/external/images/preview.png b/zsh/modules/syntax-highlighting/external/images/preview.png
new file mode 100644
index 0000000..545cc51
Binary files /dev/null and b/zsh/modules/syntax-highlighting/external/images/preview.png differ
diff --git a/zsh/modules/syntax-highlighting/external/release.md b/zsh/modules/syntax-highlighting/external/release.md
new file mode 100644
index 0000000..08bcfa6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/release.md
@@ -0,0 +1,18 @@
+# Release procedure (for developers):
+
+- For minor (A.B.0) releases:
+  - Check whether the release uses any not-yet-released zsh features
+- Check open issues and outstanding pull requests
+- Confirm `make test` passes
+  - check with multiple zsh versions
+- Update changelog.md
+  `tig --abbrev=12  --abbrev-commit 0.4.1..upstream/master`
+- Remove `-dev` suffix from `./.version`;
+  Commit that using 'git commit -m "Tag version $(<.version).";
+  Tag it using `git tag $(<.version)`;
+  Increment `./.version` and restore the `-dev` suffix;
+  Commit that using 'git commit -C b5c30ae52638e81a38fe5329081c5613d7bd6ca5'.
+- Push with `git push --tags`
+- Notify downstreams (OS packages)
+  - anitya should autodetect the tag
+- Update /topic on IRC
diff --git a/zsh/modules/syntax-highlighting/external/tests/README.md b/zsh/modules/syntax-highlighting/external/tests/README.md
new file mode 100644
index 0000000..5526612
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/README.md
@@ -0,0 +1,87 @@
+zsh-syntax-highlighting / tests
+===============================
+
+Utility scripts for testing zsh-syntax-highlighting highlighters.
+
+The tests harness expects the highlighter directory to contain a `test-data`
+directory with test data files.
+See the [main highlighter](../highlighters/main/test-data) for examples.
+
+Each test should define the string `$BUFFER` that is to be highlighted and the
+array parameter `$expected_region_highlight`.
+The value of that parameter is a list of strings of the form  `"$i $j $style"`.
+or `"$i $j $style $todo"`.
+Each string specifies the highlighting that `$BUFFER[$i,$j]` should have;
+that is, `$i` and `$j` specify a range, 1-indexed, inclusive of both endpoints.
+`$style` is either a key of `$ZSH_HIGHLIGHT_STYLES` or `NONE` to specify no
+highlighting should be observed.
+If `$todo` exists, the test point is marked as TODO (the failure of that test
+point will not fail the test), and `$todo` is used as the explanation.
+
+**Note**: `$region_highlight` uses the same `"$i $j $style"` syntax but
+interprets the indexes differently.
+
+**Isolation**: Each test is run in a separate subshell, so any variables,
+aliases, functions, etc., it defines will be visible to the tested code (that
+computes `$region_highlight`), but will not affect subsequent tests.  The
+current working directory of tests is set to a newly-created empty directory,
+which is automatically cleaned up after the test exits. For example:
+
+    setopt PATH_DIRS
+    mkdir -p foo/bar
+    touch foo/bar/testing-issue-228
+    chmod  +x foo/bar/testing-issue-228
+    path+=( "$PWD"/foo )
+
+    BUFFER='bar/testing-issue-228'
+
+    expected_region_highlight=(
+      "1 21 command" # bar/testing-issue-228
+    )
+
+
+Writing new tests
+-----------------
+
+An experimental tool is available to generate test files:
+
+    zsh -f tests/generate.zsh 'ls -x' acme newfile
+
+This generates a `highlighters/acme/test-data/newfile.zsh` test file based on
+the current highlighting of the given `$BUFFER` (in this case, `ls -x`).
+
+_This tool is experimental._  Its interface may change.  In particular it may
+grow ways to set `$PREBUFFER` to inject free-form code into the generated file.
+
+
+Highlighting test
+-----------------
+
+[`test-highlighting.zsh`](tests/test-highlighting.zsh) tests the correctness of
+the highlighting. Usage:
+
+    zsh test-highlighting.zsh <HIGHLIGHTER NAME>
+
+All tests may be run with
+
+    make test
+
+which will run all highlighting tests and report results in [TAP format][TAP].
+By default, the results of all tests will be printed; to show only "interesting"
+results (tests that failed but were expected to succeed, or vice-versa), run
+`make quiet-test` (or `make test QUIET=y`).
+
+[TAP]: http://testanything.org/
+
+
+Performance test
+----------------
+
+[`test-perfs.zsh`](tests/test-perfs.zsh) measures the time spent doing the
+highlighting. Usage:
+
+    zsh test-perfs.zsh <HIGHLIGHTER NAME>
+
+All tests may be run with
+
+    make perf
diff --git a/zsh/modules/syntax-highlighting/external/tests/generate.zsh b/zsh/modules/syntax-highlighting/external/tests/generate.zsh
new file mode 100755
index 0000000..64a1ede
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/generate.zsh
@@ -0,0 +1,99 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+emulate -LR zsh
+setopt localoptions extendedglob
+
+# Argument parsing.
+if (( $# != 3 )) || [[ $1 == -* ]]; then
+  print -r -- >&2 "$0: usage: $0 BUFFER HIGHLIGHTER BASENAME"
+  print -r -- >&2 ""
+  print -r -- >&2 "Generate highlighters/HIGHLIGHTER/test-data/BASENAME.zsh based on the"
+  print -r -- >&2 "current highlighting of BUFFER."
+  exit 1
+fi
+buffer=$1
+ZSH_HIGHLIGHT_HIGHLIGHTERS=( $2 )
+fname=${0:A:h:h}/highlighters/$2/test-data/${3%.zsh}.zsh
+
+# Load the main script.
+. ${0:A:h:h}/zsh-syntax-highlighting.zsh
+
+# Overwrite _zsh_highlight_add_highlight so we get the key itself instead of the style
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 $3")
+}
+
+
+# Copyright block
+year="`LC_ALL=C date +%Y`"
+if ! read -q "?Set copyright year to $year? "; then
+  year="YYYY"
+fi
+exec >$fname
+<$0 sed -n -e '1,/^$/p' | sed -e "s/2[0-9][0-9][0-9]/${year}/"
+# Assumes stdout is line-buffered
+git add -- $fname
+
+# Buffer
+print -n 'BUFFER='
+if [[ $buffer != (#s)[$'\t -~']#(#e) ]]; then
+  print -r -- ${(qqqq)buffer}
+else
+  print -r -- ${(qq)buffer}
+fi
+echo ""
+
+# Expectations
+print 'expected_region_highlight=('
+() {
+  local i
+  local PREBUFFER
+  local BUFFER
+  
+  PREBUFFER=""
+  BUFFER="$buffer"
+  region_highlight=()
+  # TODO: use run_test() from tests/test-highlighting.zsh (to get a tempdir)
+  _zsh_highlight
+
+  for ((i=1; i<=${#region_highlight}; i++)); do
+    local -a highlight_zone; highlight_zone=( ${(z)region_highlight[$i]} )
+    integer start=$highlight_zone[1] end=$highlight_zone[2]
+    if (( start < end )) # region_highlight ranges are half-open
+    then
+      (( --end )) # convert to closed range, like expected_region_highlight
+      (( ++start, ++end )) # region_highlight is 0-indexed; expected_region_highlight is 1-indexed
+    fi
+    printf "  %s # %s\n" ${(qq):-"$start $end $highlight_zone[3]"} ${${(qqqq)BUFFER[start,end]}[3,-2]}
+  done
+}
+print ')'
diff --git a/zsh/modules/syntax-highlighting/external/tests/tap-colorizer.zsh b/zsh/modules/syntax-highlighting/external/tests/tap-colorizer.zsh
new file mode 100755
index 0000000..cb645c6
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/tap-colorizer.zsh
@@ -0,0 +1,67 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This is a stdin-to-stdout filter that takes TAP output (such as 'make test')
+# on stdin and passes it, colorized, to stdout.
+
+emulate -LR zsh
+
+if [[ ! -t 1 ]] ; then
+  exec cat
+fi
+
+while read -r line;
+do
+  case $line in
+    # comment (filename header) or plan
+    (#* | <->..<->)
+      print -nP %F{blue}
+      ;;
+    # XPASS
+    (ok*# TODO*)
+      print -nP %F{red}
+      ;;
+    # XFAIL
+    (not ok*# TODO*)
+      print -nP %F{yellow}
+      ;;
+    # FAIL
+    (not ok*)
+      print -nP %F{red}
+      ;;
+    # PASS
+    (ok*)
+      print -nP %F{green}
+      ;;
+  esac
+  print -nr - "$line"
+  print -nP %f
+  echo "" # newline
+done
diff --git a/zsh/modules/syntax-highlighting/external/tests/tap-filter b/zsh/modules/syntax-highlighting/external/tests/tap-filter
new file mode 100755
index 0000000..6587808
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/tap-filter
@@ -0,0 +1,45 @@
+#!/usr/bin/env perl
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# vim: ft=perl sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This is a stdin-to-stdout filter that takes TAP output (such as 'make test')
+# on stdin and deletes lines pertaining to expected results.
+#
+# More specifically, if any of the test points in a test file either failed but
+# was expected to pass, or passed but was expected to fail, then emit that test
+# file's output; else, elide that test file's output.
+
+use v5.10.0;
+use warnings;
+use strict;
+
+undef $/; # slurp mode
+print for
+  grep { /^ok.*# TODO/m or /^not ok(?!.*# TODO)/m }
+    split /^(?=#)/m,
+      <STDIN>;
diff --git a/zsh/modules/syntax-highlighting/external/tests/test-highlighting.zsh b/zsh/modules/syntax-highlighting/external/tests/test-highlighting.zsh
new file mode 100755
index 0000000..94c4152
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/test-highlighting.zsh
@@ -0,0 +1,193 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Check an highlighter was given as argument.
+[[ -n "$1" ]] || {
+  echo >&2 "Bail out! You must provide the name of a valid highlighter as argument."
+  exit 2
+}
+
+# Check the highlighter is valid.
+[[ -f ${0:h:h}/highlighters/$1/$1-highlighter.zsh ]] || {
+  echo >&2 "Bail out! Could not find highlighter ${(qq)1}."
+  exit 2
+}
+
+# Check the highlighter has test data.
+[[ -d ${0:h:h}/highlighters/$1/test-data ]] || {
+  echo >&2 "Bail out! Highlighter ${(qq)1} has no test data."
+  exit 2
+}
+
+# Set up results_filter
+local results_filter
+if [[ $QUIET == y ]]; then
+  if type -w perl >/dev/null; then
+    results_filter=${0:A:h}/tap-filter
+  else
+    echo >&2 "Bail out! quiet mode not supported: perl not found"; exit 2
+  fi
+else
+  results_filter=cat
+fi
+[[ -n $results_filter ]] || { echo >&2 "Bail out! BUG setting \$results_filter"; exit 2 }
+
+# Load the main script.
+# While here, test that it doesn't eat aliases.
+print > >($results_filter | ${0:A:h}/tap-colorizer.zsh) -r -- "# global (driver) tests"
+print > >($results_filter | ${0:A:h}/tap-colorizer.zsh) -r -- "1..1"
+alias -- +plus=plus
+alias -- _other=other
+original_alias_dash_L_output="$(alias -L)"
+. ${0:h:h}/zsh-syntax-highlighting.zsh
+if [[ $original_alias_dash_L_output == $(alias -L) ]]; then
+  print -r -- "ok 1 # 'alias -- +foo=bar' is preserved"
+else
+  print -r -- "not ok 1 # 'alias -- +foo=bar' is preserved"
+  exit 1
+fi > >($results_filter | ${0:A:h}/tap-colorizer.zsh) 
+
+# Overwrite _zsh_highlight_add_highlight so we get the key itself instead of the style
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 $3")
+}
+
+# Activate the highlighter.
+ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
+
+# Runs a highlighting test
+# $1: data file
+run_test_internal() {
+
+  local tests_tempdir="$1"; shift
+  local srcdir="$PWD"
+  builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! cd failed: $?"; return 1 }
+
+  echo "# ${1:t:r}"
+
+  # Load the data and prepare checking it.
+  PREBUFFER= BUFFER= ;
+  . "$srcdir"/"$1"
+
+  # Check the data declares $PREBUFFER or $BUFFER.
+  [[ -z $PREBUFFER && -z $BUFFER ]] && { echo >&2 "Bail out! Either 'PREBUFFER' or 'BUFFER' must be declared and non-blank"; return 1; }
+  # Check the data declares $expected_region_highlight.
+  (( ${#expected_region_highlight} == 0 )) && { echo >&2 "Bail out! 'expected_region_highlight' is not declared or empty."; return 1; }
+
+  # Process the data.
+  region_highlight=()
+  _zsh_highlight
+
+  # Overlapping regions can be declared in region_highlight, so we first build an array of the
+  # observed highlighting.
+  local -A observed_result
+  for ((i=1; i<=${#region_highlight}; i++)); do
+    local -a highlight_zone; highlight_zone=( ${(z)region_highlight[$i]} )
+    integer start=$highlight_zone[1] end=$highlight_zone[2]
+    if (( start < end )) # region_highlight ranges are half-open
+    then
+      (( --end )) # convert to closed range, like expected_region_highlight
+      (( ++start, ++end )) # region_highlight is 0-indexed; expected_region_highlight is 1-indexed
+      for j in {$start..$end}; do
+        observed_result[$j]=$highlight_zone[3]
+      done
+    else
+      # noop range; ignore.
+    fi
+    unset start end
+    unset highlight_zone
+  done
+
+  # Then we compare the observed result with the expected one.
+  echo "1..${#expected_region_highlight}"
+  for ((i=1; i<=${#expected_region_highlight}; i++)); do
+    local -a highlight_zone; highlight_zone=( ${(z)expected_region_highlight[$i]} )
+    local todo=
+    integer start=$highlight_zone[1] end=$highlight_zone[2]
+    # Escape # as ♯ since the former is illegal in the 'description' part of TAP output
+    local desc="[$start,$end] «${BUFFER[$start,$end]//'#'/♯}»"
+    # Match the emptiness of observed_result if no highlighting is expected
+    [[ $highlight_zone[3] == NONE ]] && highlight_zone[3]=
+    [[ -n "$highlight_zone[4]" ]] && todo="# TODO $highlight_zone[4]"
+    for j in {$start..$end}; do
+      if [[ "$observed_result[$j]" != "$highlight_zone[3]" ]]; then
+        print -r -- "not ok $i - $desc - expected ${(qqq)highlight_zone[3]}, observed ${(qqq)observed_result[$j]}. $todo"
+        continue 2
+      fi
+    done
+    print -r -- "ok $i - $desc${todo:+ - }$todo"
+    unset desc
+    unset start end
+    unset todo
+    unset highlight_zone
+  done
+}
+
+# Run a single test file.  The exit status is 1 if the test harness had
+# an error and 0 otherwise.  The exit status does not depend on whether
+# test points succeeded or failed.
+run_test() {
+  # Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
+  local __tests_tempdir
+  __tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
+    echo >&2 "Bail out! mktemp failed"; return 1
+  }
+  typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
+
+  {
+    # Use a subshell to isolate tests from each other.
+    # (So tests can alter global shell state using 'cd', 'hash', etc)
+    {
+      # These braces are so multios don't come into play.
+      { (run_test_internal "$__tests_tempdir" "$@") 3>&1 >&2 2>&3 } | grep \^
+      local ret=$pipestatus[1] stderr=$pipestatus[2]
+      if (( ! stderr )); then
+        # stdout will become stderr
+        echo "Bail out! output on stderr"; return 1
+      else
+        return $ret
+      fi
+    } 3>&1 >&2 2>&3
+  } always {
+    rm -rf -- "$__tests_tempdir"
+  }
+}
+
+# Process each test data file in test data directory.
+integer something_failed=0
+ZSH_HIGHLIGHT_STYLES=()
+for data_file in ${0:h:h}/highlighters/$1/test-data/*.zsh; do
+  run_test "$data_file" | tee >($results_filter | ${0:A:h}/tap-colorizer.zsh) | grep -v '^not ok.*# TODO' | grep -Eq '^not ok|^ok.*# TODO' && (( something_failed=1 ))
+  (( $pipestatus[1] )) && exit 2
+done
+
+exit $something_failed
diff --git a/zsh/modules/syntax-highlighting/external/tests/test-perfs.zsh b/zsh/modules/syntax-highlighting/external/tests/test-perfs.zsh
new file mode 100755
index 0000000..3411754
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/tests/test-perfs.zsh
@@ -0,0 +1,100 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Check an highlighter was given as argument.
+[[ -n "$1" ]] || {
+  echo >&2 "Bail out! You must provide the name of a valid highlighter as argument."
+  exit 2
+}
+
+# Check the highlighter is valid.
+[[ -f ${0:h:h}/highlighters/$1/$1-highlighter.zsh ]] || {
+  echo >&2 "Bail out! Could not find highlighter ${(qq)1}."
+  exit 2
+}
+
+# Check the highlighter has test data.
+[[ -d ${0:h:h}/highlighters/$1/test-data ]] || {
+  echo >&2 "Bail out! Highlighter ${(qq)1} has no test data."
+  exit 2
+}
+
+# Load the main script.
+. ${0:h:h}/zsh-syntax-highlighting.zsh
+
+# Activate the highlighter.
+ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
+
+# Runs a highlighting test
+# $1: data file
+run_test_internal() {
+  local -a highlight_zone
+
+  local tests_tempdir="$1"; shift
+  local srcdir="$PWD"
+  builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! cd failed: $?"; return 1 }
+
+  echo -n "# ${1:t:r}: "
+
+  # Load the data and prepare checking it.
+  PREBUFFER= BUFFER= ;
+  . "$srcdir"/"$1"
+
+  # Check the data declares $PREBUFFER or $BUFFER.
+  [[ -z $PREBUFFER && -z $BUFFER ]] && { echo >&2 "Bail out! Either 'PREBUFFER' or 'BUFFER' must be declared and non-blank"; return 1; }
+
+  # Measure the time taken by _zsh_highlight.
+  TIMEFMT="%*Es"
+  time (BUFFER="$BUFFER" && _zsh_highlight)
+}
+
+run_test() {
+  # Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
+  local __tests_tempdir
+  __tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
+    echo >&2 "Bail out! mktemp failed"; return 1
+  }
+  typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
+
+  {
+    (run_test_internal "$__tests_tempdir" "$@")
+  } always {
+    rm -rf -- "$__tests_tempdir"
+  }
+}
+
+# Process each test data file in test data directory.
+for data_file in ${0:h:h}/highlighters/$1/test-data/*.zsh; do
+  run_test "$data_file"
+  (( $pipestatus[1] )) && exit 2
+done
+
+exit 0
diff --git a/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.plugin.zsh b/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.plugin.zsh
new file mode 100644
index 0000000..f2456ae
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.plugin.zsh
@@ -0,0 +1,2 @@
+0=${(%):-%N}
+source ${0:A:h}/zsh-syntax-highlighting.zsh
diff --git a/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh b/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh
new file mode 100644
index 0000000..008970b
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/external/zsh-syntax-highlighting.zsh
@@ -0,0 +1,408 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use 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 the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# 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 HOLDER 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.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# First of all, ensure predictable parsing.
+zsh_highlight__aliases=`builtin alias -Lm '[^+]*'`
+# In zsh <= 5.2, `alias -L` emits aliases that begin with a plus sign ('alias -- +foo=42')
+# them without a '--' guard, so they don't round trip.
+#
+# Hence, we exclude them from unaliasing:
+builtin unalias -m '[^+]*'
+
+# Set $0 to the expected value, regardless of functionargzero.
+0=${(%):-%N}
+if true; then
+  # $0 is reliable
+  typeset -g ZSH_HIGHLIGHT_VERSION=$(<"${0:A:h}"/.version)
+  typeset -g ZSH_HIGHLIGHT_REVISION=$(<"${0:A:h}"/.revision-hash)
+  if [[ $ZSH_HIGHLIGHT_REVISION == \$Format:* ]]; then
+    # When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION
+    # would be set to '$Format:%H$' literally.  That's an invalid value, and obtaining
+    # the valid value (via `git rev-parse HEAD`, as Makefile does) might be costly, so:
+    ZSH_HIGHLIGHT_REVISION=HEAD
+  fi
+fi
+
+# -------------------------------------------------------------------------------------------------
+# Core highlighting update system
+# -------------------------------------------------------------------------------------------------
+
+# Array declaring active highlighters names.
+typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
+
+# Update ZLE buffer syntax highlighting.
+#
+# Invokes each highlighter that needs updating.
+# This function is supposed to be called whenever the ZLE state changes.
+_zsh_highlight()
+{
+  # Store the previous command return code to restore it whatever happens.
+  local ret=$?
+
+  # Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
+  # For details see FAQ entry 'Why does syntax highlighting not work while searching history?'.
+  if [[ $WIDGET == zle-isearch-update ]] && ! (( $+ISEARCHMATCH_ACTIVE )); then
+    region_highlight=()
+    return $ret
+  fi
+
+  setopt localoptions warncreateglobal
+  setopt localoptions noksharrays
+  local REPLY # don't leak $REPLY into global scope
+
+  # Do not highlight if there are more than 300 chars in the buffer. It's most
+  # likely a pasted command or a huge list of files in that case..
+  [[ -n ${ZSH_HIGHLIGHT_MAXLENGTH:-} ]] && [[ $#BUFFER -gt $ZSH_HIGHLIGHT_MAXLENGTH ]] && return $ret
+
+  # Do not highlight if there are pending inputs (copy/paste).
+  [[ $PENDING -gt 0 ]] && return $ret
+
+  # Reset region highlight to build it from scratch
+  typeset -ga region_highlight
+  region_highlight=();
+
+  {
+    local cache_place
+    local -a region_highlight_copy
+
+    # Select which highlighters in ZSH_HIGHLIGHT_HIGHLIGHTERS need to be invoked.
+    local highlighter; for highlighter in $ZSH_HIGHLIGHT_HIGHLIGHTERS; do
+
+      # eval cache place for current highlighter and prepare it
+      cache_place="_zsh_highlight__highlighter_${highlighter}_cache"
+      typeset -ga ${cache_place}
+
+      # If highlighter needs to be invoked
+      if ! type "_zsh_highlight_highlighter_${highlighter}_predicate" >&/dev/null; then
+        echo "zsh-syntax-highlighting: warning: disabling the ${(qq)highlighter} highlighter as it has not been loaded" >&2
+        # TODO: use ${(b)} rather than ${(q)} if supported
+        ZSH_HIGHLIGHT_HIGHLIGHTERS=( ${ZSH_HIGHLIGHT_HIGHLIGHTERS:#${highlighter}} )
+      elif "_zsh_highlight_highlighter_${highlighter}_predicate"; then
+
+        # save a copy, and cleanup region_highlight
+        region_highlight_copy=("${region_highlight[@]}")
+        region_highlight=()
+
+        # Execute highlighter and save result
+        {
+          "_zsh_highlight_highlighter_${highlighter}_paint"
+        } always {
+          eval "${cache_place}=(\"\${region_highlight[@]}\")"
+        }
+
+        # Restore saved region_highlight
+        region_highlight=("${region_highlight_copy[@]}")
+
+      fi
+
+      # Use value form cache if any cached
+      eval "region_highlight+=(\"\${${cache_place}[@]}\")"
+
+    done
+
+    # Re-apply zle_highlight settings
+
+    # region
+    if (( REGION_ACTIVE == 1 )); then
+      _zsh_highlight_apply_zle_highlight region standout "$MARK" "$CURSOR"
+    elif (( REGION_ACTIVE == 2 )); then
+      () {
+        local needle=$'\n'
+        integer min max
+        if (( MARK > CURSOR )) ; then
+          min=$CURSOR max=$MARK
+        else
+          min=$MARK max=$CURSOR
+        fi
+        (( min = ${${BUFFER[1,$min]}[(I)$needle]} ))
+        (( max += ${${BUFFER:($max-1)}[(i)$needle]} - 1 ))
+        _zsh_highlight_apply_zle_highlight region standout "$min" "$max"
+      }
+    fi
+
+    # yank / paste (zsh-5.1.1 and newer)
+    (( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
+
+    # isearch
+    (( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
+
+    # suffix
+    (( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
+
+
+    return $ret
+
+
+  } always {
+    typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER="$BUFFER"
+    typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=$CURSOR
+  }
+}
+
+# Apply highlighting based on entries in the zle_highlight array.
+# This function takes four arguments:
+# 1. The exact entry (no patterns) in the zle_highlight array:
+#    region, paste, isearch, or suffix
+# 2. The default highlighting that should be applied if the entry is unset
+# 3. and 4. Two integer values describing the beginning and end of the
+#    range. The order does not matter.
+_zsh_highlight_apply_zle_highlight() {
+  local entry="$1" default="$2"
+  integer first="$3" second="$4"
+
+  # read the relevant entry from zle_highlight
+  local region="${zle_highlight[(r)${entry}:*]}"
+
+  if [[ -z "$region" ]]; then
+    # entry not specified at all, use default value
+    region=$default
+  else
+    # strip prefix
+    region="${region#${entry}:}"
+
+    # no highlighting when set to the empty string or to 'none'
+    if [[ -z "$region" ]] || [[ "$region" == none ]]; then
+      return
+    fi
+  fi
+
+  integer start end
+  if (( first < second )); then
+    start=$first end=$second
+  else
+    start=$second end=$first
+  fi
+  region_highlight+=("$start $end $region")
+}
+
+
+# -------------------------------------------------------------------------------------------------
+# API/utility functions for highlighters
+# -------------------------------------------------------------------------------------------------
+
+# Array used by highlighters to declare user overridable styles.
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Whether the command line buffer has been modified or not.
+#
+# Returns 0 if the buffer has changed since _zsh_highlight was last called.
+_zsh_highlight_buffer_modified()
+{
+  [[ "${_ZSH_HIGHLIGHT_PRIOR_BUFFER:-}" != "$BUFFER" ]]
+}
+
+# Whether the cursor has moved or not.
+#
+# Returns 0 if the cursor has moved since _zsh_highlight was last called.
+_zsh_highlight_cursor_moved()
+{
+  [[ -n $CURSOR ]] && [[ -n ${_ZSH_HIGHLIGHT_PRIOR_CURSOR-} ]] && (($_ZSH_HIGHLIGHT_PRIOR_CURSOR != $CURSOR))
+}
+
+# Add a highlight defined by ZSH_HIGHLIGHT_STYLES.
+#
+# Should be used by all highlighters aside from 'pattern' (cf. ZSH_HIGHLIGHT_PATTERN).
+# Overwritten in tests/test-highlighting.zsh when testing.
+_zsh_highlight_add_highlight()
+{
+  local -i start end
+  local highlight
+  start=$1
+  end=$2
+  shift 2
+  for highlight; do
+    if (( $+ZSH_HIGHLIGHT_STYLES[$highlight] )); then
+      region_highlight+=("$start $end $ZSH_HIGHLIGHT_STYLES[$highlight]")
+      break
+    fi
+  done
+}
+
+# -------------------------------------------------------------------------------------------------
+# Setup functions
+# -------------------------------------------------------------------------------------------------
+
+# Helper for _zsh_highlight_bind_widgets
+# $1 is name of widget to call
+_zsh_highlight_call_widget()
+{
+  builtin zle "$@" && 
+  _zsh_highlight
+}
+
+# Rebind all ZLE widgets to make them invoke _zsh_highlights.
+_zsh_highlight_bind_widgets()
+{
+  setopt localoptions noksharrays
+  typeset -F SECONDS
+  local prefix=orig-s$SECONDS-r$RANDOM # unique each time, in case we're sourced more than once
+
+  # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
+  zmodload zsh/zleparameter 2>/dev/null || {
+    print -r -- >&2 'zsh-syntax-highlighting: failed loading zsh/zleparameter.'
+    return 1
+  }
+
+  # Override ZLE widgets to make them invoke _zsh_highlight.
+  local -U widgets_to_bind
+  widgets_to_bind=(${${(k)widgets}:#(.*|run-help|which-command|beep|set-local-history|yank)})
+
+  # Always wrap special zle-line-finish widget. This is needed to decide if the
+  # current line ends and special highlighting logic needs to be applied.
+  # E.g. remove cursor imprint, don't highlight partial paths, ...
+  widgets_to_bind+=(zle-line-finish)
+
+  # Always wrap special zle-isearch-update widget to be notified of updates in isearch.
+  # This is needed because we need to disable highlighting in that case.
+  widgets_to_bind+=(zle-isearch-update)
+
+  local cur_widget
+  for cur_widget in $widgets_to_bind; do
+    case $widgets[$cur_widget] in
+
+      # Already rebound event: do nothing.
+      user:_zsh_highlight_widget_*);;
+
+      # The "eval"'s are required to make $cur_widget a closure: the value of the parameter at function
+      # definition time is used.
+      #
+      # We can't use ${0/_zsh_highlight_widget_} because these widgets are always invoked with
+      # NO_function_argzero, regardless of the option's setting here.
+
+      # User defined widget: override and rebind old one with prefix "orig-".
+      user:*) zle -N $prefix-$cur_widget ${widgets[$cur_widget]#*:}
+              eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
+              zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+      # Completion widget: override and rebind old one with prefix "orig-".
+      completion:*) zle -C $prefix-$cur_widget ${${(s.:.)widgets[$cur_widget]}[2,3]} 
+                    eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
+                    zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+      # Builtin widget: override and make it call the builtin ".widget".
+      builtin) eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget .${(q)cur_widget} -- \"\$@\" }"
+               zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+      # Incomplete or nonexistent widget: Bind to z-sy-h directly.
+      *) 
+         if [[ $cur_widget == zle-* ]] && [[ -z $widgets[$cur_widget] ]]; then
+           _zsh_highlight_widget_${cur_widget}() { :; _zsh_highlight }
+           zle -N $cur_widget _zsh_highlight_widget_$cur_widget
+         else
+      # Default: unhandled case.
+           print -r -- >&2 "zsh-syntax-highlighting: unhandled ZLE widget ${(qq)cur_widget}"
+           print -r -- >&2 "zsh-syntax-highlighting: (This is sometimes caused by doing \`bindkey <keys> ${(q-)cur_widget}\` without creating the ${(qq)cur_widget} widget with \`zle -N\` or \`zle -C\`.)"
+         fi
+    esac
+  done
+}
+
+# Load highlighters from directory.
+#
+# Arguments:
+#   1) Path to the highlighters directory.
+_zsh_highlight_load_highlighters()
+{
+  setopt localoptions noksharrays
+
+  # Check the directory exists.
+  [[ -d "$1" ]] || {
+    print -r -- >&2 "zsh-syntax-highlighting: highlighters directory ${(qq)1} not found."
+    return 1
+  }
+
+  # Load highlighters from highlighters directory and check they define required functions.
+  local highlighter highlighter_dir
+  for highlighter_dir ($1/*/); do
+    highlighter="${highlighter_dir:t}"
+    [[ -f "$highlighter_dir${highlighter}-highlighter.zsh" ]] &&
+      . "$highlighter_dir${highlighter}-highlighter.zsh"
+    if type "_zsh_highlight_highlighter_${highlighter}_paint" &> /dev/null &&
+       type "_zsh_highlight_highlighter_${highlighter}_predicate" &> /dev/null;
+    then
+        # New (0.5.0) function names
+    elif type "_zsh_highlight_${highlighter}_highlighter" &> /dev/null &&
+         type "_zsh_highlight_${highlighter}_highlighter_predicate" &> /dev/null;
+    then
+        # Old (0.4.x) function names
+        if false; then
+            # TODO: only show this warning for plugin authors/maintainers, not for end users
+            print -r -- >&2 "zsh-syntax-highlighting: warning: ${(qq)highlighter} highlighter uses deprecated entry point names; please ask its maintainer to update it: https://github.com/zsh-users/zsh-syntax-highlighting/issues/329"
+        fi
+        # Make it work.
+        eval "_zsh_highlight_highlighter_${(q)highlighter}_paint() { _zsh_highlight_${(q)highlighter}_highlighter \"\$@\" }"
+        eval "_zsh_highlight_highlighter_${(q)highlighter}_predicate() { _zsh_highlight_${(q)highlighter}_highlighter_predicate \"\$@\" }"
+    else
+        print -r -- >&2 "zsh-syntax-highlighting: ${(qq)highlighter} highlighter should define both required functions '_zsh_highlight_highlighter_${highlighter}_paint' and '_zsh_highlight_highlighter_${highlighter}_predicate' in ${(qq):-"$highlighter_dir${highlighter}-highlighter.zsh"}."
+    fi
+  done
+}
+
+
+# -------------------------------------------------------------------------------------------------
+# Setup
+# -------------------------------------------------------------------------------------------------
+
+# Try binding widgets.
+_zsh_highlight_bind_widgets || {
+  print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
+  return 1
+}
+
+# Resolve highlighters directory location.
+_zsh_highlight_load_highlighters "${ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR:-${${0:A}:h}/highlighters}" || {
+  print -r -- >&@ 'zsh-syntax-highlighting: failed loading highlighters, exiting.'
+  return 1
+}
+
+# Reset scratch variables when commandline is done.
+_zsh_highlight_preexec_hook()
+{
+  typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER=
+  typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=
+}
+autoload -U add-zsh-hook
+add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
+    print -r -- >&2 'zsh-syntax-highlighting: failed loading add-zsh-hook.'
+  }
+
+# Load zsh/parameter module if available
+zmodload zsh/parameter 2>/dev/null || true
+
+autoload -U is-at-least
+
+# Initialize the array of active highlighters if needed.
+[[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
+
+# Restore the aliases we unned
+eval "$zsh_highlight__aliases"
+builtin unset zsh_highlight__aliases
+
+# Set $?.
+true
diff --git a/zsh/modules/syntax-highlighting/init.zsh b/zsh/modules/syntax-highlighting/init.zsh
new file mode 100644
index 0000000..6dddf5e
--- /dev/null
+++ b/zsh/modules/syntax-highlighting/init.zsh
@@ -0,0 +1,8 @@
+#
+# enables fish-shell like syntax highlighting
+#
+
+# highlighters
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(${zhighlighters[@]})
+
+source "${0:h}/external/zsh-syntax-highlighting.zsh" || return 1
diff --git a/zsh/modules/utility/README.md b/zsh/modules/utility/README.md
new file mode 100644
index 0000000..52bf0fc
--- /dev/null
+++ b/zsh/modules/utility/README.md
@@ -0,0 +1,48 @@
+Utility
+=======
+
+Utility aliases and functions.
+
+Adds colour to `ls`, `grep` and `less`.
+
+Aliases
+-------
+
+### ls
+
+| alias | command | description |
+| ----- | ------- | ----------- |
+| `ls` | `ls --group-directories-first --color=auto` | directories first, use color (applies to all ls aliases) |
+| `l` | `ls -lAh` | all files, human-readable sizes |
+| `lm` | `l | ${PAGER}` | all files, human-readable sizes, use pager |
+| `ll` | `ls -lh` | human-readable sizes |
+| `lr` | `ll -R` | human-readable sizes, recursive |
+| `lx` | `ll -XB` | human-readable sizes, sort by extension (GNU only) |
+| `lk` | `ll -Sr` | human-readable sizes, largest last |
+| `lt` | `ll -tr` | human-readable sizes, most recent last |
+| `lc` | `lt -c` | human-readable sizes, most recent last, change time |
+
+### File Downloads
+
+Aliases `get` to ( `aria2c` || `axel` || `wget` || `curl` ).
+
+### Resource Usage
+
+| alias | command |
+| ----- | ------- |
+| `df` | `df -kh` |
+| `du` | `du -kh` |
+
+### Condoms
+
+| alias | command |
+| ----- | ------- |
+| `chmod` | `chmod --preserve-root -v` |
+| `chown` | `chown --preserve-root -v` |
+| `rm` | if available, `safe-rm` |
+
+### Misc
+
+| alias | description |
+| ----- | ----------- |
+| `mkcd` | mkdir and cd |
diff --git a/zsh/modules/utility/init.zsh b/zsh/modules/utility/init.zsh
new file mode 100644
index 0000000..f8e2cfb
--- /dev/null
+++ b/zsh/modules/utility/init.zsh
@@ -0,0 +1,122 @@
+#
+# Utility Functions and Options
+#
+
+#
+# Colours
+#
+
+if [[ ! -z ${terminfo[colors]} ]] && (( ${terminfo[colors]} >= 8 )); then
+  # ls Colors
+  if (( ${+commands[dircolors]} )); then
+    # GNU
+    if [[ -s ${HOME}/.dir_colors ]]; then
+      eval "$(dircolors --sh ${HOME}/.dir_colors)"
+    else
+      eval "$(dircolors --sh)"
+    fi
+
+    alias ls='ls --group-directories-first --color=auto'
+
+  else
+    # BSD
+
+    # colours for ls and completion
+    export LSCOLORS='exfxcxdxbxGxDxabagacad'
+    export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=36;01:cd=33;01:su=31;40;07:sg=36;40;07:tw=32;40;07:ow=33;40;07:'
+
+    # stock OpenBSD ls does not support colors at all, but colorls does.
+    if [[ $OSTYPE == openbsd* ]]; then
+      if (( ${+commands[colorls]} )); then
+        alias ls='colorls -G'
+      fi
+    else
+      alias ls='ls -G'
+    fi
+  fi
+
+  # grep Colours
+  export GREP_COLOR='37;45'             #BSD
+  export GREP_COLORS="mt=${GREP_COLOR}" #GNU
+  if [[ ${OSTYPE} == openbsd* ]]; then
+    if (( ${+commands[ggrep]} )); then
+      alias grep='ggrep --color=auto'
+    fi
+  else
+   alias grep='grep --color=auto'
+  fi
+
+  # less Colours
+  if [[ ${PAGER} == 'less' ]]; then
+    export LESS_TERMCAP_mb=$'\E[1;31m'    # Begins blinking.
+    export LESS_TERMCAP_md=$'\E[1;31m'    # Begins bold.
+    export LESS_TERMCAP_me=$'\E[0m'       # Ends mode.
+    export LESS_TERMCAP_se=$'\E[0m'       # Ends standout-mode.
+    export LESS_TERMCAP_so=$'\E[7m'       # Begins standout-mode.
+    export LESS_TERMCAP_ue=$'\E[0m'       # Ends underline.
+    export LESS_TERMCAP_us=$'\E[1;32m'    # Begins underline.
+  fi
+fi
+
+
+#
+# ls Aliases
+#
+
+alias l='ls -lAh'         # all files, human-readable sizes
+[[ -n ${PAGER} ]] && alias lm="l | ${PAGER}" # all files, human-readable sizes, use pager
+alias ll='ls -lh'         # human-readable sizes
+alias lr='ll -R'          # human-readable sizes, recursive
+alias lx='ll -XB'         # human-readable sizes, sort by extension (GNU only)
+alias lk='ll -Sr'         # human-readable sizes, largest last
+alias lt='ll -tr'         # human-readable sizes, most recent last
+alias lc='lt -c'          # human-readable sizes, most recent last, change time
+
+
+#
+# File Downloads
+#
+
+# order of preference: aria2c, axel, wget, curl. This order is derrived from speed based on personal tests.
+if (( ${+commands[aria2c]} )); then
+  alias get='aria2c --max-connection-per-server=5 --continue'
+elif (( ${+commands[axel]} )); then
+  alias get='axel --num-connections=5 --alternate'
+elif (( ${+commands[wget]} )); then
+  alias get='wget --continue --progress=bar --timestamping'
+elif (( ${+commands[curl]} )); then
+  alias get='curl --continue-at - --location --progress-bar --remote-name --remote-time'
+fi
+
+
+#
+# Resource Usage
+#
+
+alias df='df -kh'
+alias du='du -kh'
+
+
+#
+# Always wear a condom
+#
+
+if [[ ${OSTYPE} == linux* ]]; then
+  alias chmod='chmod --preserve-root -v'
+  alias chown='chown --preserve-root -v'
+fi
+
+# not aliasing rm -i, but if safe-rm is available, use condom.
+# if safe-rmdir is available, the OS is suse which has its own terrible 'safe-rm' which is not what we want
+if (( ${+commands[safe-rm]} && ! ${+commands[safe-rmdir]} )); then
+  alias rm='safe-rm'
+fi
+
+
+#
+# Misc
+#
+
+mkcd() {
+  [[ -n ${1} ]] && mkdir -p ${1} && builtin cd ${1}
+}
diff --git a/zsh/modules/utility/init.zsh.zwc b/zsh/modules/utility/init.zsh.zwc
new file mode 100644
index 0000000..05e9510
Binary files /dev/null and b/zsh/modules/utility/init.zsh.zwc differ
diff --git a/zsh/modules/zsh-autosuggestions/.editorconfig b/zsh/modules/zsh-autosuggestions/.editorconfig
new file mode 100644
index 0000000..51c4765
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/.editorconfig
@@ -0,0 +1,10 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+
+[*.md]
+indent_style = space
diff --git a/zsh/modules/zsh-autosuggestions/.gitmodules b/zsh/modules/zsh-autosuggestions/.gitmodules
new file mode 100644
index 0000000..b45eb46
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "vendor/shunit2"]
+	path = vendor/shunit2
+	url = https://github.com/kward/shunit2
+[submodule "vendor/stub.sh"]
+	path = vendor/stub.sh
+	url = https://github.com/ericfreese/stub.sh
diff --git a/zsh/modules/zsh-autosuggestions/CHANGELOG.md b/zsh/modules/zsh-autosuggestions/CHANGELOG.md
new file mode 100644
index 0000000..50a1e0a
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/CHANGELOG.md
@@ -0,0 +1,36 @@
+# Changelog
+
+## v0.3.3
+- Switch from $history array to fc builtin for better performance with large HISTFILEs (#164)
+- Fix tilde handling when extended_glob is set (#168)
+- Add config option for maximum buffer length to fetch suggestions for (#178)
+- Add config option for list of widgets to ignore (#184)
+- Don't fetch a new suggestion unless a modification widget actually modifies the buffer (#183)
+
+## v0.3.2
+- Test runner now supports running specific tests and choosing zsh binary
+- Return code from original widget is now correctly passed through (#135)
+- Add `vi-add-eol` to list of accept widgets (#143)
+- Escapes widget names within evals to fix problems with irregular widget names (#152)
+- Plugin now clears suggestion while within a completion menu (#149)
+- .plugin file no longer relies on symbolic link support, fixing issues on Windows (#156)
+
+## v0.3.1
+
+- Fixes issue with `vi-next-char` not accepting suggestion (#137).
+- Fixes global variable warning when WARN_CREATE_GLOBAL option enabled (#133).
+- Split out a separate test file for each widget.
+
+## v0.3.0
+
+- Adds `autosuggest-execute` widget (PR #124).
+- Adds concept of suggestion "strategies" for different ways of fetching suggestions.
+- Adds "match_prev_cmd" strategy (PR #131).
+- Uses git submodules for testing dependencies.
+- Lots of test cleanup.
+- Various bug fixes for zsh 5.0.x and `sh_word_split` option.
+
+
+## v0.2.17
+
+Start of changelog.
diff --git a/zsh/modules/zsh-autosuggestions/DESCRIPTION b/zsh/modules/zsh-autosuggestions/DESCRIPTION
new file mode 100644
index 0000000..b69200f
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/DESCRIPTION
@@ -0,0 +1 @@
+Fish-like fast/unobtrusive autosuggestions for zsh.
diff --git a/zsh/modules/zsh-autosuggestions/LICENSE b/zsh/modules/zsh-autosuggestions/LICENSE
new file mode 100644
index 0000000..ee52ee2
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2013 Thiago de Arruda
+Copyright (c) 2016 Eric Freese
+
+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/zsh/modules/zsh-autosuggestions/Makefile b/zsh/modules/zsh-autosuggestions/Makefile
new file mode 100644
index 0000000..fde3691
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/Makefile
@@ -0,0 +1,47 @@
+SRC_DIR    := ./src
+VENDOR_DIR := ./vendor
+
+SRC_FILES := \
+	$(SRC_DIR)/config.zsh \
+	$(SRC_DIR)/deprecated.zsh \
+	$(SRC_DIR)/bind.zsh \
+	$(SRC_DIR)/highlight.zsh \
+	$(SRC_DIR)/widgets.zsh \
+	$(SRC_DIR)/suggestion.zsh \
+	$(SRC_DIR)/strategies/*.zsh \
+	$(SRC_DIR)/start.zsh
+
+HEADER_FILES := \
+	DESCRIPTION \
+	URL \
+	VERSION \
+	LICENSE
+
+PLUGIN_TARGET := zsh-autosuggestions.zsh
+
+SHUNIT2 := $(VENDOR_DIR)/shunit2/2.1.6
+STUB_SH := $(VENDOR_DIR)/stub.sh/stub.sh
+
+TEST_PREREQS := \
+	$(SHUNIT2) \
+	$(STUB_SH)
+
+all: $(PLUGIN_TARGET)
+
+$(PLUGIN_TARGET): $(HEADER_FILES) $(SRC_FILES)
+	cat $(HEADER_FILES) | sed -e 's/^/# /g' > $@
+	cat $(SRC_FILES) >> $@
+
+$(SHUNIT2):
+	git submodule update --init vendor/shunit2
+
+$(STUB_SH):
+	git submodule update --init vendor/stub.sh
+
+.PHONY: clean
+clean:
+	rm $(PLUGIN_TARGET)
+
+.PHONY: test
+test: all $(TEST_PREREQS)
+	script/test_runner.zsh $(TESTS)
diff --git a/zsh/modules/zsh-autosuggestions/README.md b/zsh/modules/zsh-autosuggestions/README.md
new file mode 100644
index 0000000..3a5c3f3
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/README.md
@@ -0,0 +1,165 @@
+# zsh-autosuggestions
+
+_[Fish](http://fishshell.com/)-like fast/unobtrusive autosuggestions for zsh._
+
+It suggests commands as you type, based on command history.
+
+<a href="https://asciinema.org/a/37390" target="_blank"><img src="https://asciinema.org/a/37390.png" width="400" /></a>
+
+
+## Installation
+
+### Manual
+
+1. Clone this repository somewhere on your machine. This guide will assume `~/.zsh/zsh-autosuggestions`.
+
+    ```sh
+    git clone git://github.com/zsh-users/zsh-autosuggestions ~/.zsh/zsh-autosuggestions
+    ```
+
+2. Add the following to your `.zshrc`:
+
+    ```sh
+    source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+    ```
+
+3. Start a new terminal session.
+
+
+### Oh My Zsh
+
+1. Clone this repository into `$ZSH_CUSTOM/plugins` (by default `~/.oh-my-zsh/custom/plugins`)
+
+    ```sh
+    git clone git://github.com/zsh-users/zsh-autosuggestions $ZSH_CUSTOM/plugins/zsh-autosuggestions
+    ```
+
+2. Add the plugin to the list of plugins for Oh My Zsh to load:
+
+    ```sh
+    plugins=(zsh-autosuggestions)
+    ```
+
+3. Start a new terminal session.
+
+
+## Usage
+
+As you type commands, you will see a completion offered after the cursor in a muted gray color. This color can be changed by setting the `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` variable. See [configuration](#configuration).
+
+If you press the <kbd>→</kbd> key (`forward-char` widget) or <kbd>End</kbd> (`end-of-line` widget) with the cursor at the end of the buffer, it will accept the suggestion, replacing the contents of the command line buffer with the suggestion.
+
+If you invoke the `forward-word` widget, it will partially accept the suggestion up to the point that the cursor moves to.
+
+
+## Configuration
+
+You may want to override the default global config variables after sourcing the plugin. Default values of these variables can be found [here](src/config.zsh).
+
+**Note:** If you are using Oh My Zsh, you can put this configuration in a file in the `$ZSH_CUSTOM` directory. See their comments on [overriding internals](https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals).
+
+
+### Suggestion Highlight Style
+
+Set `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` to configure the style that the suggestion is shown with. The default is `fg=8`.
+
+
+### Suggestion Strategy
+
+Set `ZSH_AUTOSUGGEST_STRATEGY` to choose the strategy for generating suggestions. There are currently two to choose from:
+
+- `default`: Chooses the most recent match.
+- `match_prev_cmd`: Chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
+
+
+### Widget Mapping
+
+This plugin works by triggering custom behavior when certain [zle widgets](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets) are invoked. You can add and remove widgets from these arrays to change the behavior of this plugin:
+
+- `ZSH_AUTOSUGGEST_CLEAR_WIDGETS`: Widgets in this array will clear the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_ACCEPT_WIDGETS`: Widgets in this array will accept the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_EXECUTE_WIDGETS`: Widgets in this array will execute the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS`: Widgets in this array will partially accept the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_IGNORE_WIDGETS`: Widgets in this array will not trigger any custom behavior.
+
+Widgets that modify the buffer and are not found in any of these arrays will fetch a new suggestion after they are invoked.
+
+**Note:** A widget shouldn't belong to more than one of the above arrays.
+
+
+### Disabling suggestion for large buffers
+
+Set `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an integer value to disable autosuggestion for large buffers. The default is unset, which means that autosuggestion will be tried for any buffer size. Recommended value is 20.
+This can be useful when pasting large amount of text in the terminal, to avoid triggering autosuggestion for too long strings.
+
+
+### Key Bindings
+
+This plugin provides three widgets that you can use with `bindkey`:
+
+1. `autosuggest-accept`: Accepts the current suggestion.
+2. `autosuggest-execute`: Accepts and executes the current suggestion.
+3. `autosuggest-clear`: Clears the current suggestion.
+
+For example, this would bind <kbd>ctrl</kbd> + <kbd>space</kbd> to accept the current suggestion.
+
+```sh
+bindkey '^ ' autosuggest-accept
+```
+
+
+## Troubleshooting
+
+If you have a problem, please search through [the list of issues on GitHub](https://github.com/zsh-users/zsh-autosuggestions/issues) to see if someone else has already reported it.
+
+
+### Reporting an Issue
+
+Before reporting an issue, please try temporarily disabling sections of your configuration and other plugins that may be conflicting with this plugin to isolate the problem.
+
+When reporting an issue, please include:
+
+- The smallest, simplest `.zshrc` configuration that will reproduce the problem. See [this comment](https://github.com/zsh-users/zsh-autosuggestions/issues/102#issuecomment-180944764) for a good example of what this means.
+- The version of zsh you're using (`zsh --version`)
+- Which operating system you're running
+
+
+## Uninstallation
+
+1. Remove the code referencing this plugin from `~/.zshrc`.
+
+2. Remove the git repository from your hard drive
+
+    ```sh
+    rm -rf ~/.zsh/zsh-autosuggestions # Or wherever you installed
+    ```
+
+
+## Development
+
+### Build Process
+
+Edit the source files in `src/`. Run `make` to build `zsh-autosuggestions.zsh` from those source files.
+
+
+### Pull Requests
+
+Pull requests are welcome! If you send a pull request, please:
+
+- Request to merge into the `develop` branch (*NOT* `master`)
+- Match the existing coding conventions.
+- Include helpful comments to keep the barrier-to-entry low for people new to the project.
+- Write tests that cover your code as much as possible.
+
+
+### Testing
+
+Testing is performed with [`shunit2`](https://github.com/kward/shunit2) (v2.1.6). Documentation can be found [here](http://shunit2.googlecode.com/svn/trunk/source/2.1/doc/shunit2.html).
+
+The test script lives at `script/test_runner.zsh`. To run the tests, run `make test`.
+
+
+## License
+
+This project is licensed under [MIT license](http://opensource.org/licenses/MIT).
+For the full text of the license, see the [LICENSE](LICENSE) file.
diff --git a/zsh/modules/zsh-autosuggestions/URL b/zsh/modules/zsh-autosuggestions/URL
new file mode 100644
index 0000000..4e2bd94
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/URL
@@ -0,0 +1 @@
+https://github.com/zsh-users/zsh-autosuggestions
diff --git a/zsh/modules/zsh-autosuggestions/VERSION b/zsh/modules/zsh-autosuggestions/VERSION
new file mode 100644
index 0000000..600e6fd
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/VERSION
@@ -0,0 +1 @@
+v0.3.3
diff --git a/zsh/modules/zsh-autosuggestions/script/test_runner.zsh b/zsh/modules/zsh-autosuggestions/script/test_runner.zsh
new file mode 100755
index 0000000..0ff4173
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/script/test_runner.zsh
@@ -0,0 +1,54 @@
+#!/usr/bin/env zsh
+
+DIR="${0:a:h}"
+ROOT_DIR="$DIR/.."
+TEST_DIR="$ROOT_DIR/test"
+
+header() {
+	local message="$1"
+
+	cat <<-EOF
+
+#====================================================================#
+# $message
+#====================================================================#
+	EOF
+}
+
+# ZSH binary to use
+local zsh_bin="zsh"
+
+while getopts ":z:" opt; do
+	case $opt in
+		z)
+			zsh_bin="$OPTARG"
+			;;
+		\?)
+			echo "Invalid option: -$OPTARG" >&2
+			exit 1
+			;;
+		:)
+			echo "Option -$OPTARG requires an argument" >&2
+			exit 1
+			;;
+	esac
+done
+
+shift $((OPTIND -1))
+
+# Test suites to run
+local -a tests
+if [ $#@ -gt 0 ]; then
+	tests=($@)
+else
+	tests=($TEST_DIR/**/*_test.zsh)
+fi
+
+local -i retval=0
+
+for suite in $tests; do
+	header "${suite#"$ROOT_DIR/"}"
+	"$zsh_bin" -f "$suite" || retval=$?
+done
+
+exit $retval
diff --git a/zsh/modules/zsh-autosuggestions/src/bind.zsh b/zsh/modules/zsh-autosuggestions/src/bind.zsh
new file mode 100644
index 0000000..49763e8
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/bind.zsh
@@ -0,0 +1,91 @@
+
+#--------------------------------------------------------------------#
+# Widget Helpers                                                     #
+#--------------------------------------------------------------------#
+
+# Bind a single widget to an autosuggest widget, saving a reference to the original widget
+_zsh_autosuggest_bind_widget() {
+	local widget=$1
+	local autosuggest_action=$2
+	local prefix=$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX
+
+	# Save a reference to the original widget
+	case $widgets[$widget] in
+		# Already bound
+		user:_zsh_autosuggest_(bound|orig)_*);;
+
+		# User-defined widget
+		user:*)
+			zle -N $prefix$widget ${widgets[$widget]#*:}
+			;;
+
+		# Built-in widget
+		builtin)
+			eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
+			zle -N $prefix$widget _zsh_autosuggest_orig_$widget
+			;;
+
+		# Completion widget
+		completion:*)
+			eval "zle -C $prefix${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
+			;;
+	esac
+
+	# Pass the original widget's name explicitly into the autosuggest
+	# function. Use this passed in widget name to call the original
+	# widget instead of relying on the $WIDGET variable being set
+	# correctly. $WIDGET cannot be trusted because other plugins call
+	# zle without the `-w` flag (e.g. `zle self-insert` instead of
+	# `zle self-insert -w`).
+	eval "_zsh_autosuggest_bound_${(q)widget}() {
+		_zsh_autosuggest_widget_$autosuggest_action $prefix${(q)widget} \$@
+	}"
+
+	# Create the bound widget
+	zle -N $widget _zsh_autosuggest_bound_$widget
+}
+
+# Map all configured widgets to the right autosuggest widgets
+_zsh_autosuggest_bind_widgets() {
+	local widget
+	local ignore_widgets
+
+	ignore_widgets=(
+		.\*
+		_\*
+		zle-line-\*
+		autosuggest-\*
+		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Find every widget we might want to bind and bind it appropriately
+	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
+		if [ ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget clear
+		elif [ ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget accept
+		elif [ ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget execute
+		elif [ ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget partial_accept
+		else
+			# Assume any unspecified widget might modify the buffer
+			_zsh_autosuggest_bind_widget $widget modify
+		fi
+	done
+}
+
+# Given the name of an original widget and args, invoke it, if it exists
+_zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	[ $# -gt 0 ] || return
+
+	local original_widget_name="$1"
+
+	shift
+
+	if [ $widgets[$original_widget_name] ]; then
+		zle $original_widget_name -- $@
+	fi
+}
diff --git a/zsh/modules/zsh-autosuggestions/src/config.zsh b/zsh/modules/zsh-autosuggestions/src/config.zsh
new file mode 100644
index 0000000..f519f6f
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/config.zsh
@@ -0,0 +1,62 @@
+
+#--------------------------------------------------------------------#
+# Global Configuration Variables                                     #
+#--------------------------------------------------------------------#
+
+# Color to use when highlighting suggestion
+# Uses format of `region_highlight`
+# More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
+
+# Prefix to use when saving original versions of bound widgets
+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
+
+ZSH_AUTOSUGGEST_STRATEGY=default
+
+# Widgets that clear the suggestion
+ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+	history-search-forward
+	history-search-backward
+	history-beginning-search-forward
+	history-beginning-search-backward
+	history-substring-search-up
+	history-substring-search-down
+	up-line-or-history
+	down-line-or-history
+	accept-line
+)
+
+# Widgets that accept the entire suggestion
+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+	forward-char
+	end-of-line
+	vi-forward-char
+	vi-end-of-line
+	vi-add-eol
+)
+
+# Widgets that accept the entire suggestion and execute it
+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+)
+
+# Widgets that accept the suggestion as far as the cursor moves
+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+	forward-word
+	vi-forward-word
+	vi-forward-word-end
+	vi-forward-blank-word
+	vi-forward-blank-word-end
+)
+
+# Widgets that should be ignored (globbing supported but must be escaped)
+ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+	orig-\*
+	beep
+	run-help
+	set-local-history
+	which-command
+	yank
+)
+
+# Max size of buffer to trigger autosuggestion. Leave undefined for no upper bound.
+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
diff --git a/zsh/modules/zsh-autosuggestions/src/deprecated.zsh b/zsh/modules/zsh-autosuggestions/src/deprecated.zsh
new file mode 100644
index 0000000..bcf0d74
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/deprecated.zsh
@@ -0,0 +1,36 @@
+
+#--------------------------------------------------------------------#
+# Handle Deprecated Variables/Widgets                                #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_deprecated_warning() {
+	>&2 echo "zsh-autosuggestions: $@"
+}
+
+_zsh_autosuggest_check_deprecated_config() {
+	if [ -n "$AUTOSUGGESTION_HIGHLIGHT_COLOR" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_HIGHLIGHT_COLOR is deprecated. Use ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE instead."
+		[ -z "$ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE" ] && ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=$AUTOSUGGESTION_HIGHLIGHT_STYLE
+		unset AUTOSUGGESTION_HIGHLIGHT_STYLE
+	fi
+
+	if [ -n "$AUTOSUGGESTION_HIGHLIGHT_CURSOR" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_HIGHLIGHT_CURSOR is deprecated."
+		unset AUTOSUGGESTION_HIGHLIGHT_CURSOR
+	fi
+
+	if [ -n "$AUTOSUGGESTION_ACCEPT_RIGHT_ARROW" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_ACCEPT_RIGHT_ARROW is deprecated. The right arrow now accepts the suggestion by default."
+		unset AUTOSUGGESTION_ACCEPT_RIGHT_ARROW
+	fi
+}
+
+_zsh_autosuggest_deprecated_start_widget() {
+	_zsh_autosuggest_deprecated_warning "The autosuggest-start widget is deprecated. For more info, see the README at https://github.com/zsh-users/zsh-autosuggestions."
+	zle -D autosuggest-start
+	eval "zle-line-init() {
+		$(echo $functions[${widgets[zle-line-init]#*:}] | sed -e 's/zle autosuggest-start//g')
+	}"
+}
+
+zle -N autosuggest-start _zsh_autosuggest_deprecated_start_widget
diff --git a/zsh/modules/zsh-autosuggestions/src/highlight.zsh b/zsh/modules/zsh-autosuggestions/src/highlight.zsh
new file mode 100644
index 0000000..a8ff08a
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/highlight.zsh
@@ -0,0 +1,26 @@
+
+#--------------------------------------------------------------------#
+# Highlighting                                                       #
+#--------------------------------------------------------------------#
+
+# If there was a highlight, remove it
+_zsh_autosuggest_highlight_reset() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [ -n "$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT" ]; then
+		region_highlight=("${(@)region_highlight:#$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT}")
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+# If there's a suggestion, highlight it
+_zsh_autosuggest_highlight_apply() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [ $#POSTDISPLAY -gt 0 ]; then
+		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
+	else
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
diff --git a/zsh/modules/zsh-autosuggestions/src/start.zsh b/zsh/modules/zsh-autosuggestions/src/start.zsh
new file mode 100644
index 0000000..54f5bb8
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/start.zsh
@@ -0,0 +1,13 @@
+
+#--------------------------------------------------------------------#
+# Start                                                              #
+#--------------------------------------------------------------------#
+
+# Start the autosuggestion widgets
+_zsh_autosuggest_start() {
+	_zsh_autosuggest_check_deprecated_config
+	_zsh_autosuggest_bind_widgets
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd _zsh_autosuggest_start
diff --git a/zsh/modules/zsh-autosuggestions/src/strategies/default.zsh b/zsh/modules/zsh-autosuggestions/src/strategies/default.zsh
new file mode 100644
index 0000000..29333f5
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/strategies/default.zsh
@@ -0,0 +1,11 @@
+
+#--------------------------------------------------------------------#
+# Default Suggestion Strategy                                        #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix.
+#
+
+_zsh_autosuggest_strategy_default() {
+	fc -lnrm "$1*" 1 2>/dev/null | head -n 1
+}
diff --git a/zsh/modules/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh b/zsh/modules/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh
new file mode 100644
index 0000000..bf8bdd9
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh
@@ -0,0 +1,52 @@
+
+#--------------------------------------------------------------------#
+# Match Previous Command Suggestion Strategy                         #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix and whose preceding history item also matches the most
+# recently executed command.
+#
+# For example, suppose your history has the following entries:
+#   - pwd
+#   - ls foo
+#   - ls bar
+#   - pwd
+#
+# Given the history list above, when you type 'ls', the suggestion
+# will be 'ls foo' rather than 'ls bar' because your most recently
+# executed command (pwd) was previously followed by 'ls foo'.
+#
+# Note that this strategy won't work as expected with ZSH options that don't
+# preserve the history order such as `HIST_IGNORE_ALL_DUPS` or
+# `HIST_EXPIRE_DUPS_FIRST`.
+
+_zsh_autosuggest_strategy_match_prev_cmd() {
+	local prefix="$1"
+
+	# Get all history event numbers that correspond to history
+	# entries that match pattern $prefix*
+	local history_match_keys
+	history_match_keys=(${(k)history[(R)$prefix*]})
+
+	# By default we use the first history number (most recent history entry)
+	local histkey="${history_match_keys[1]}"
+
+	# Get the previously executed command
+	local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
+
+	# Iterate up to the first 200 history event numbers that match $prefix
+	for key in "${(@)history_match_keys[1,200]}"; do
+		# Stop if we ran out of history
+		[[ $key -gt 1 ]] || break
+
+		# See if the history entry preceding the suggestion matches the
+		# previous command, and use it if it does
+		if [[ "${history[$((key - 1))]}" == "$prev_cmd" ]]; then
+			histkey="$key"
+			break
+		fi
+	done
+
+	# Echo the matched history entry
+	echo -E "$history[$histkey]"
+}
diff --git a/zsh/modules/zsh-autosuggestions/src/suggestion.zsh b/zsh/modules/zsh-autosuggestions/src/suggestion.zsh
new file mode 100644
index 0000000..31a9f76
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/suggestion.zsh
@@ -0,0 +1,21 @@
+
+#--------------------------------------------------------------------#
+# Suggestion                                                         #
+#--------------------------------------------------------------------#
+
+# Delegate to the selected strategy to determine a suggestion
+_zsh_autosuggest_suggestion() {
+	local escaped_prefix="$(_zsh_autosuggest_escape_command "$1")"
+	local strategy_function="_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY"
+
+	if [ -n "$functions[$strategy_function]" ]; then
+		echo -E "$($strategy_function "$escaped_prefix")"
+	fi
+}
+
+_zsh_autosuggest_escape_command() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\\()\[\]|*?~]/\\$MATCH}"
+}
diff --git a/zsh/modules/zsh-autosuggestions/src/widgets.zsh b/zsh/modules/zsh-autosuggestions/src/widgets.zsh
new file mode 100644
index 0000000..57f378e
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/src/widgets.zsh
@@ -0,0 +1,135 @@
+
+#--------------------------------------------------------------------#
+# Autosuggest Widget Implementations                                 #
+#--------------------------------------------------------------------#
+
+# Clear the suggestion
+_zsh_autosuggest_clear() {
+	# Remove the suggestion
+	unset POSTDISPLAY
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Modify the buffer and get a new suggestion
+_zsh_autosuggest_modify() {
+	local -i retval
+
+	# Save the contents of the buffer/postdisplay
+	local orig_buffer="$BUFFER"
+	local orig_postdisplay="$POSTDISPLAY"
+
+	# Clear suggestion while original widget runs
+	unset POSTDISPLAY
+
+	# Original widget may modify the buffer
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Don't fetch a new suggestion if the buffer hasn't changed
+	if [ "$BUFFER" = "$orig_buffer" ]; then
+		POSTDISPLAY="$orig_postdisplay"
+		return $retval
+	fi
+
+	# Get a new suggestion if the buffer is not empty after modification
+	local suggestion
+	if [ $#BUFFER -gt 0 ]; then
+		if [ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" -o $#BUFFER -lt "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]; then
+			suggestion="$(_zsh_autosuggest_suggestion "$BUFFER")"
+		fi
+	fi
+
+	# Add the suggestion to the POSTDISPLAY
+	if [ -n "$suggestion" ]; then
+		POSTDISPLAY="${suggestion#$BUFFER}"
+	fi
+
+	return $retval
+}
+
+# Accept the entire suggestion
+_zsh_autosuggest_accept() {
+	local -i max_cursor_pos=$#BUFFER
+
+	# When vicmd keymap is active, the cursor can't move all the way
+	# to the end of the buffer
+	if [ "$KEYMAP" = "vicmd" ]; then
+		max_cursor_pos=$((max_cursor_pos - 1))
+	fi
+
+	# Only accept if the cursor is at the end of the buffer
+	if [ $CURSOR -eq $max_cursor_pos ]; then
+		# Add the suggestion to the buffer
+		BUFFER="$BUFFER$POSTDISPLAY"
+
+		# Remove the suggestion
+		unset POSTDISPLAY
+
+		# Move the cursor to the end of the buffer
+		CURSOR=${#BUFFER}
+	fi
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Accept the entire suggestion and execute it
+_zsh_autosuggest_execute() {
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	unset POSTDISPLAY
+
+	# Call the original `accept-line` to handle syntax highlighting or
+	# other potential custom behavior
+	_zsh_autosuggest_invoke_original_widget "accept-line"
+}
+
+# Partially accept the suggestion
+_zsh_autosuggest_partial_accept() {
+	local -i retval
+
+	# Save the contents of the buffer so we can restore later if needed
+	local original_buffer="$BUFFER"
+
+	# Temporarily accept the suggestion.
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Original widget moves the cursor
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# If we've moved past the end of the original buffer
+	if [ $CURSOR -gt $#original_buffer ]; then
+		# Set POSTDISPLAY to text right of the cursor
+		POSTDISPLAY="$RBUFFER"
+
+		# Clip the buffer at the cursor
+		BUFFER="$LBUFFER"
+	else
+		# Restore the original buffer
+		BUFFER="$original_buffer"
+	fi
+
+	return $retval
+}
+
+for action in clear modify accept partial_accept execute; do
+	eval "_zsh_autosuggest_widget_$action() {
+		local -i retval
+
+		_zsh_autosuggest_highlight_reset
+
+		_zsh_autosuggest_$action \$@
+		retval=\$?
+
+		_zsh_autosuggest_highlight_apply
+
+		return \$retval
+	}"
+done
+
+zle -N autosuggest-accept _zsh_autosuggest_widget_accept
+zle -N autosuggest-clear _zsh_autosuggest_widget_clear
+zle -N autosuggest-execute _zsh_autosuggest_widget_execute
diff --git a/zsh/modules/zsh-autosuggestions/test/bind_test.zsh b/zsh/modules/zsh-autosuggestions/test/bind_test.zsh
new file mode 100644
index 0000000..f73ea7f
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/bind_test.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+testInvokeOriginalWidgetDefined() {
+	stub_and_eval \
+		zle \
+		'return 1'
+
+	_zsh_autosuggest_invoke_original_widget 'self-insert'
+
+	assertEquals \
+		'1' \
+		"$?"
+
+	assertTrue \
+		'zle was not invoked' \
+		'stub_called zle'
+
+	restore zle
+}
+
+testInvokeOriginalWidgetUndefined() {
+	stub_and_eval \
+		zle \
+		'return 1'
+
+	_zsh_autosuggest_invoke_original_widget 'some-undefined-widget'
+
+	assertEquals \
+		'0' \
+		"$?"
+
+	assertFalse \
+		'zle was invoked' \
+		'stub_called zle'
+
+	restore zle
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/highlight_test.zsh b/zsh/modules/zsh-autosuggestions/test/highlight_test.zsh
new file mode 100644
index 0000000..7268af8
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/highlight_test.zsh
@@ -0,0 +1,73 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+testHighlightDefaultStyle() {
+	assertEquals \
+		'fg=8' \
+		"$ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+}
+
+testHighlightApplyWithSuggestion() {
+	local orig_style=ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE
+	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=4'
+
+	BUFFER='ec'
+	POSTDISPLAY='ho hello'
+	region_highlight=('0 2 fg=1')
+
+	_zsh_autosuggest_highlight_apply
+
+	assertEquals \
+		'highlight did not use correct style' \
+		"0 2 fg=1 2 10 $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE" \
+		"$region_highlight"
+
+	assertEquals \
+		'higlight was not saved to be removed later' \
+		"2 10 $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE" \
+		"$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT"
+
+	ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=orig_style
+}
+
+testHighlightApplyWithoutSuggestion() {
+	BUFFER='echo hello'
+	POSTDISPLAY=''
+	region_highlight=('0 4 fg=1')
+
+	_zsh_autosuggest_highlight_apply
+
+	assertEquals \
+		'region_highlight was modified' \
+		'0 4 fg=1' \
+		"$region_highlight"
+
+	assertNull \
+		'last highlight region was not cleared' \
+		"$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT"
+}
+
+testHighlightReset() {
+	BUFFER='ec'
+	POSTDISPLAY='ho hello'
+	region_highlight=('0 1 fg=1' '2 10 fg=8' '1 2 fg=1')
+	_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT='2 10 fg=8'
+
+	_zsh_autosuggest_highlight_reset
+
+	assertEquals \
+		'last highlight region was not removed' \
+		'0 1 fg=1 1 2 fg=1' \
+		"$region_highlight"
+
+	assertNull \
+		'last highlight variable was not cleared' \
+		"$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT"
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/strategies/default_test.zsh b/zsh/modules/zsh-autosuggestions/test/strategies/default_test.zsh
new file mode 100755
index 0000000..f5200e6
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/strategies/default_test.zsh
@@ -0,0 +1,56 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+testNoMatch() {
+	set_history <<-'EOF'
+		ls foo
+		ls bar
+	EOF
+
+	assertSuggestion \
+		'foo' \
+		''
+
+	assertSuggestion \
+		'ls q' \
+		''
+}
+
+testBasicMatches() {
+	set_history <<-'EOF'
+		ls foo
+		ls bar
+	EOF
+
+	assertSuggestion \
+		'ls f' \
+		'ls foo'
+
+	assertSuggestion \
+		'ls b' \
+		'ls bar'
+}
+
+testMostRecentMatch() {
+	set_history <<-'EOF'
+		ls foo
+		cd bar
+		ls baz
+		cd quux
+	EOF
+
+	assertSuggestion \
+		'ls' \
+		'ls baz'
+
+	assertSuggestion \
+		'cd' \
+		'cd quux'
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/strategies/match_prev_cmd_test.zsh b/zsh/modules/zsh-autosuggestions/test/strategies/match_prev_cmd_test.zsh
new file mode 100755
index 0000000..bf3fc64
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/strategies/match_prev_cmd_test.zsh
@@ -0,0 +1,74 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+
+	ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd
+}
+
+testNoMatch() {
+	set_history <<-'EOF'
+		ls foo
+		ls bar
+	EOF
+
+	assertSuggestion \
+		'foo' \
+		''
+
+	assertSuggestion \
+		'ls q' \
+		''
+}
+
+testBasicMatches() {
+	set_history <<-'EOF'
+		ls foo
+		ls bar
+	EOF
+
+	assertSuggestion \
+		'ls f' \
+		'ls foo'
+
+	assertSuggestion \
+		'ls b' \
+		'ls bar'
+}
+
+testMostRecentMatch() {
+	set_history <<-'EOF'
+		ls foo
+		cd bar
+		ls baz
+		cd quux
+	EOF
+
+	assertSuggestion \
+		'ls' \
+		'ls baz'
+
+	assertSuggestion \
+		'cd' \
+		'cd quux'
+}
+
+testMatchMostRecentAfterPreviousCmd() {
+	set_history <<-'EOF'
+		echo what
+		ls foo
+		ls bar
+		echo what
+		ls baz
+		ls quux
+		echo what
+	EOF
+
+	assertSuggestion \
+		'ls' \
+		'ls baz'
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/strategies_test.zsh b/zsh/modules/zsh-autosuggestions/test/strategies_test.zsh
new file mode 100644
index 0000000..0a937f4
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/strategies_test.zsh
@@ -0,0 +1,102 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+assertBackslashSuggestion() {
+	set_history <<-'EOF'
+		echo "hello\nworld"
+	EOF
+
+	assertSuggestion \
+		'echo "hello\' \
+		'echo "hello\nworld"'
+}
+
+assertDoubleBackslashSuggestion() {
+	set_history <<-'EOF'
+		echo "\\"
+	EOF
+
+	assertSuggestion \
+		'echo "\\' \
+		'echo "\\"'
+}
+
+assertTildeSuggestion() {
+	set_history <<-'EOF'
+		cd ~/something
+	EOF
+
+	assertSuggestion \
+		'cd' \
+		'cd ~/something'
+
+	assertSuggestion \
+		'cd ~' \
+		'cd ~/something'
+
+	assertSuggestion \
+		'cd ~/s' \
+		'cd ~/something'
+}
+
+assertTildeSuggestionWithExtendedGlob() {
+	setopt local_options extended_glob
+
+	assertTildeSuggestion
+}
+
+assertParenthesesSuggestion() {
+	set_history <<-'EOF'
+		echo "$(ls foo)"
+	EOF
+
+	assertSuggestion \
+		'echo "$(' \
+		'echo "$(ls foo)"'
+}
+
+assertSquareBracketsSuggestion() {
+	set_history <<-'EOF'
+		echo "$history[123]"
+	EOF
+
+	assertSuggestion \
+		'echo "$history[' \
+		'echo "$history[123]"'
+}
+
+assertHashSuggestion() {
+	set_history <<-'EOF'
+		echo "#yolo"
+	EOF
+
+	assertSuggestion \
+		'echo "#' \
+		'echo "#yolo"'
+}
+
+testSpecialCharsForAllStrategies() {
+	local strategies
+	strategies=(
+		"default"
+		"match_prev_cmd"
+	)
+
+	for s in $strategies; do
+		ZSH_AUTOSUGGEST_STRATEGY="$s"
+
+		assertBackslashSuggestion
+		assertDoubleBackslashSuggestion
+		assertTildeSuggestion
+		assertTildeSuggestionWithExtendedGlob
+		assertParenthesesSuggestion
+		assertSquareBracketsSuggestion
+	done
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/suggestion_test.zsh b/zsh/modules/zsh-autosuggestions/test/suggestion_test.zsh
new file mode 100644
index 0000000..fc6330d
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/suggestion_test.zsh
@@ -0,0 +1,46 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+testEscapeCommand() {
+	assertEquals \
+		'Did not escape single backslash' \
+		'\\' \
+		"$(_zsh_autosuggest_escape_command '\')"
+
+	assertEquals \
+		'Did not escape two backslashes' \
+		'\\\\' \
+		"$(_zsh_autosuggest_escape_command '\\')"
+
+	assertEquals \
+		'Did not escape parentheses' \
+		'\(\)' \
+		"$(_zsh_autosuggest_escape_command '()')"
+
+	assertEquals \
+		'Did not escape square brackets' \
+		'\[\]' \
+		"$(_zsh_autosuggest_escape_command '[]')"
+
+	assertEquals \
+		'Did not escape pipe' \
+		'\|' \
+		"$(_zsh_autosuggest_escape_command '|')"
+
+	assertEquals \
+		'Did not escape star' \
+		'\*' \
+		"$(_zsh_autosuggest_escape_command '*')"
+
+	assertEquals \
+		'Did not escape question mark' \
+		'\?' \
+		"$(_zsh_autosuggest_escape_command '?')"
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/test_helper.zsh b/zsh/modules/zsh-autosuggestions/test/test_helper.zsh
new file mode 100644
index 0000000..7e7dbc0
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/test_helper.zsh
@@ -0,0 +1,60 @@
+DIR="${0:a:h}"
+ROOT_DIR="$DIR/.."
+VENDOR_DIR="$ROOT_DIR/vendor"
+
+# Use stub.sh for stubbing/mocking
+source "$VENDOR_DIR/stub.sh/stub.sh"
+
+#--------------------------------------------------------------------#
+# Helper Functions                                                   #
+#--------------------------------------------------------------------#
+
+# Source the autosuggestions plugin file
+source_autosuggestions() {
+	source "$ROOT_DIR/zsh-autosuggestions.zsh"
+}
+
+# Set history list from stdin
+set_history() {
+	# Make a tmp file in shunit's tmp dir
+	local tmp=$(mktemp "$SHUNIT_TMPDIR/hist.XXX")
+
+	# Write from stdin to the tmp file
+	> "$tmp"
+
+	# Write an extra line to simulate history active mode
+	# See https://github.com/zsh-users/zsh/blob/ca3bc0d95d7deab4f5381f12b15047de748c0814/Src/hist.c#L69-L82
+	echo >> "$tmp"
+
+	# Clear history and re-read from the tmp file
+	fc -P; fc -p; fc -R "$tmp"
+
+	rm "$tmp"
+}
+
+# Should be called at the bottom of every test suite file
+# Pass in the name of the test script ($0) for shunit
+run_tests() {
+	local test_script="$1"
+	shift
+
+	# Required for shunit to work with zsh
+	setopt localoptions shwordsplit
+	SHUNIT_PARENT="$test_script"
+
+	source "$VENDOR_DIR/shunit2/2.1.6/src/shunit2"
+}
+
+#--------------------------------------------------------------------#
+# Custom Assertions                                                  #
+#--------------------------------------------------------------------#
+
+assertSuggestion() {
+	local prefix="$1"
+	local expected_suggestion="$2"
+
+	assertEquals \
+		"Did not get correct suggestion for prefix:<$prefix> using strategy <$ZSH_AUTOSUGGEST_STRATEGY>" \
+		"$expected_suggestion" \
+		"$(_zsh_autosuggest_suggestion "$prefix")"
+}
diff --git a/zsh/modules/zsh-autosuggestions/test/widgets/accept_test.zsh b/zsh/modules/zsh-autosuggestions/test/widgets/accept_test.zsh
new file mode 100644
index 0000000..f126091
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/widgets/accept_test.zsh
@@ -0,0 +1,161 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+setUp() {
+	BUFFER=''
+	POSTDISPLAY=''
+	CURSOR=0
+	KEYMAP='main'
+}
+
+tearDown() {
+	restore _zsh_autosuggest_invoke_original_widget
+}
+
+testCursorAtEnd() {
+	BUFFER='echo'
+	POSTDISPLAY=' hello'
+	CURSOR=4
+
+	stub _zsh_autosuggest_invoke_original_widget
+
+	_zsh_autosuggest_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was not modified' \
+		'echo hello' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was not cleared' \
+		'' \
+		"$POSTDISPLAY"
+}
+
+testCursorNotAtEnd() {
+	BUFFER='echo'
+	POSTDISPLAY=' hello'
+	CURSOR=2
+
+	stub _zsh_autosuggest_invoke_original_widget
+
+	_zsh_autosuggest_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was modified' \
+		'echo' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was modified' \
+		' hello' \
+		"$POSTDISPLAY"
+}
+
+testViCursorAtEnd() {
+	BUFFER='echo'
+	POSTDISPLAY=' hello'
+	CURSOR=3
+	KEYMAP='vicmd'
+
+	stub _zsh_autosuggest_invoke_original_widget
+
+	_zsh_autosuggest_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was not modified' \
+		'echo hello' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was not cleared' \
+		'' \
+		"$POSTDISPLAY"
+}
+
+testViCursorNotAtEnd() {
+	BUFFER='echo'
+	POSTDISPLAY=' hello'
+	CURSOR=2
+	KEYMAP='vicmd'
+
+	stub _zsh_autosuggest_invoke_original_widget
+
+	_zsh_autosuggest_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was modified' \
+		'echo' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was modified' \
+		' hello' \
+		"$POSTDISPLAY"
+}
+
+testRetval() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'return 1'
+
+	_zsh_autosuggest_widget_accept 'original-widget'
+
+	assertEquals \
+		'Did not return correct value from original widget' \
+		'1' \
+		"$?"
+}
+
+testWidget() {
+	stub _zsh_autosuggest_highlight_reset
+	stub _zsh_autosuggest_accept
+	stub _zsh_autosuggest_highlight_apply
+
+	# Call the function pointed to by the widget since we can't call
+	# the widget itself when zle is not active
+	${widgets[autosuggest-accept]#*:} 'original-widget'
+
+	assertTrue \
+		'autosuggest-accept widget does not exist' \
+		'zle -l autosuggest-accept'
+
+	assertTrue \
+		'highlight_reset was not called' \
+		'stub_called _zsh_autosuggest_highlight_reset'
+
+	assertTrue \
+		'widget function was not called' \
+		'stub_called _zsh_autosuggest_accept'
+
+	assertTrue \
+		'highlight_apply was not called' \
+		'stub_called _zsh_autosuggest_highlight_apply'
+
+	restore _zsh_autosuggest_highlight_reset
+	restore _zsh_autosuggest_accept
+	restore _zsh_autosuggest_highlight_apply
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/widgets/clear_test.zsh b/zsh/modules/zsh-autosuggestions/test/widgets/clear_test.zsh
new file mode 100644
index 0000000..f0500c5
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/widgets/clear_test.zsh
@@ -0,0 +1,77 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+setUp() {
+	BUFFER=''
+	POSTDISPLAY=''
+}
+
+tearDown() {
+	restore _zsh_autosuggest_invoke_original_widget
+}
+
+testClear() {
+	BUFFER='ec'
+	POSTDISPLAY='ho hello'
+
+	_zsh_autosuggest_clear 'original-widget'
+
+	assertEquals \
+		'BUFFER was modified' \
+		'ec' \
+		"$BUFFER"
+
+	assertNull \
+		'POSTDISPLAY was not cleared' \
+		"$POSTDISPLAY"
+}
+
+testRetval() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'return 1'
+
+	_zsh_autosuggest_widget_clear 'original-widget'
+
+	assertEquals \
+		'Did not return correct value from original widget' \
+		'1' \
+		"$?"
+}
+
+testWidget() {
+	stub _zsh_autosuggest_highlight_reset
+	stub _zsh_autosuggest_clear
+	stub _zsh_autosuggest_highlight_apply
+
+	# Call the function pointed to by the widget since we can't call
+	# the widget itself when zle is not active
+	${widgets[autosuggest-clear]#*:} 'original-widget'
+
+	assertTrue \
+		'autosuggest-clear widget does not exist' \
+		'zle -l autosuggest-clear'
+
+	assertTrue \
+		'highlight_reset was not called' \
+		'stub_called _zsh_autosuggest_highlight_reset'
+
+	assertTrue \
+		'widget function was not called' \
+		'stub_called _zsh_autosuggest_clear'
+
+	assertTrue \
+		'highlight_apply was not called' \
+		'stub_called _zsh_autosuggest_highlight_apply'
+
+	restore _zsh_autosuggest_highlight_reset
+	restore _zsh_autosuggest_clear
+	restore _zsh_autosuggest_highlight_apply
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/widgets/execute_test.zsh b/zsh/modules/zsh-autosuggestions/test/widgets/execute_test.zsh
new file mode 100644
index 0000000..cb346db
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/widgets/execute_test.zsh
@@ -0,0 +1,26 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+tearDown() {
+	restore _zsh_autosuggest_invoke_original_widget
+}
+
+testRetval() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'return 1'
+
+	_zsh_autosuggest_widget_execute 'original-widget'
+
+	assertEquals \
+		'Did not return correct value from original widget' \
+		'1' \
+		"$?"
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/widgets/modify_test.zsh b/zsh/modules/zsh-autosuggestions/test/widgets/modify_test.zsh
new file mode 100644
index 0000000..7ed6346
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/widgets/modify_test.zsh
@@ -0,0 +1,88 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+setUp() {
+	BUFFER=''
+	POSTDISPLAY=''
+	ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=''
+}
+
+tearDown() {
+	restore _zsh_autosuggest_invoke_original_widget
+	restore _zsh_autosuggest_suggestion
+}
+
+testModify() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'BUFFER+="e"'
+
+	stub_and_echo \
+		_zsh_autosuggest_suggestion \
+		'echo hello'
+
+	_zsh_autosuggest_modify 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was not modified' \
+		'e' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY does not contain suggestion' \
+		'cho hello' \
+		"$POSTDISPLAY"
+}
+
+testModifyBufferTooLarge() {
+
+	ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE='20'
+
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'BUFFER+="012345678901234567890"'
+
+	stub_and_echo \
+		_zsh_autosuggest_suggestion \
+		'012345678901234567890123456789'
+
+	_zsh_autosuggest_modify 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was not modified' \
+		'012345678901234567890' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY does not contain suggestion' \
+		'' \
+		"$POSTDISPLAY"
+}
+
+testRetval() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'return 1'
+
+	_zsh_autosuggest_widget_modify 'original-widget'
+
+	assertEquals \
+		'Did not return correct value from original widget' \
+		'1' \
+		"$?"
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/test/widgets/partial_accept_test.zsh b/zsh/modules/zsh-autosuggestions/test/widgets/partial_accept_test.zsh
new file mode 100644
index 0000000..60c78a6
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/test/widgets/partial_accept_test.zsh
@@ -0,0 +1,84 @@
+#!/usr/bin/env zsh
+
+source "${0:a:h}/../test_helper.zsh"
+
+oneTimeSetUp() {
+	source_autosuggestions
+}
+
+setUp() {
+	BUFFER=''
+	POSTDISPLAY=''
+	CURSOR=0
+}
+
+tearDown() {
+	restore _zsh_autosuggest_invoke_original_widget
+}
+
+testCursorMovesOutOfBuffer() {
+	BUFFER='ec'
+	POSTDISPLAY='ho hello'
+	CURSOR=1
+
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'CURSOR=5; LBUFFER="echo "; RBUFFER="hello"'
+
+	_zsh_autosuggest_partial_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was not modified correctly' \
+		'echo ' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was not modified correctly' \
+		'hello' \
+		"$POSTDISPLAY"
+}
+
+testCursorStaysInBuffer() {
+	BUFFER='echo hello'
+	POSTDISPLAY=' world'
+	CURSOR=1
+
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'CURSOR=5; LBUFFER="echo "; RBUFFER="hello"'
+
+	_zsh_autosuggest_partial_accept 'original-widget'
+
+	assertTrue \
+		'original widget not invoked' \
+		'stub_called _zsh_autosuggest_invoke_original_widget'
+
+	assertEquals \
+		'BUFFER was modified' \
+		'echo hello' \
+		"$BUFFER"
+
+	assertEquals \
+		'POSTDISPLAY was modified' \
+		' world' \
+		"$POSTDISPLAY"
+}
+
+testRetval() {
+	stub_and_eval \
+		_zsh_autosuggest_invoke_original_widget \
+		'return 1'
+
+	_zsh_autosuggest_widget_partial_accept 'original-widget'
+
+	assertEquals \
+		'Did not return correct value from original widget' \
+		'1' \
+		"$?"
+}
+
+run_tests "$0"
diff --git a/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh b/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
new file mode 100644
index 0000000..16c2256
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
@@ -0,0 +1 @@
+source ${0:A:h}/zsh-autosuggestions.zsh
diff --git a/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.zsh b/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.zsh
new file mode 100644
index 0000000..3761efe
--- /dev/null
+++ b/zsh/modules/zsh-autosuggestions/zsh-autosuggestions.zsh
@@ -0,0 +1,473 @@
+# Fish-like fast/unobtrusive autosuggestions for zsh.
+# https://github.com/zsh-users/zsh-autosuggestions
+# v0.3.3
+# Copyright (c) 2013 Thiago de Arruda
+# Copyright (c) 2016 Eric Freese
+# 
+# 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.
+
+#--------------------------------------------------------------------#
+# Global Configuration Variables                                     #
+#--------------------------------------------------------------------#
+
+# Color to use when highlighting suggestion
+# Uses format of `region_highlight`
+# More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
+
+# Prefix to use when saving original versions of bound widgets
+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
+
+ZSH_AUTOSUGGEST_STRATEGY=default
+
+# Widgets that clear the suggestion
+ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+	history-search-forward
+	history-search-backward
+	history-beginning-search-forward
+	history-beginning-search-backward
+	history-substring-search-up
+	history-substring-search-down
+	up-line-or-history
+	down-line-or-history
+	accept-line
+)
+
+# Widgets that accept the entire suggestion
+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+	forward-char
+	end-of-line
+	vi-forward-char
+	vi-end-of-line
+	vi-add-eol
+)
+
+# Widgets that accept the entire suggestion and execute it
+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+)
+
+# Widgets that accept the suggestion as far as the cursor moves
+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+	forward-word
+	vi-forward-word
+	vi-forward-word-end
+	vi-forward-blank-word
+	vi-forward-blank-word-end
+)
+
+# Widgets that should be ignored (globbing supported but must be escaped)
+ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+	orig-\*
+	beep
+	run-help
+	set-local-history
+	which-command
+	yank
+)
+
+# Max size of buffer to trigger autosuggestion. Leave undefined for no upper bound.
+ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=
+
+#--------------------------------------------------------------------#
+# Handle Deprecated Variables/Widgets                                #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_deprecated_warning() {
+	>&2 echo "zsh-autosuggestions: $@"
+}
+
+_zsh_autosuggest_check_deprecated_config() {
+	if [ -n "$AUTOSUGGESTION_HIGHLIGHT_COLOR" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_HIGHLIGHT_COLOR is deprecated. Use ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE instead."
+		[ -z "$ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE" ] && ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE=$AUTOSUGGESTION_HIGHLIGHT_STYLE
+		unset AUTOSUGGESTION_HIGHLIGHT_STYLE
+	fi
+
+	if [ -n "$AUTOSUGGESTION_HIGHLIGHT_CURSOR" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_HIGHLIGHT_CURSOR is deprecated."
+		unset AUTOSUGGESTION_HIGHLIGHT_CURSOR
+	fi
+
+	if [ -n "$AUTOSUGGESTION_ACCEPT_RIGHT_ARROW" ]; then
+		_zsh_autosuggest_deprecated_warning "AUTOSUGGESTION_ACCEPT_RIGHT_ARROW is deprecated. The right arrow now accepts the suggestion by default."
+		unset AUTOSUGGESTION_ACCEPT_RIGHT_ARROW
+	fi
+}
+
+_zsh_autosuggest_deprecated_start_widget() {
+	_zsh_autosuggest_deprecated_warning "The autosuggest-start widget is deprecated. For more info, see the README at https://github.com/zsh-users/zsh-autosuggestions."
+	zle -D autosuggest-start
+	eval "zle-line-init() {
+		$(echo $functions[${widgets[zle-line-init]#*:}] | sed -e 's/zle autosuggest-start//g')
+	}"
+}
+
+zle -N autosuggest-start _zsh_autosuggest_deprecated_start_widget
+
+#--------------------------------------------------------------------#
+# Widget Helpers                                                     #
+#--------------------------------------------------------------------#
+
+# Bind a single widget to an autosuggest widget, saving a reference to the original widget
+_zsh_autosuggest_bind_widget() {
+	local widget=$1
+	local autosuggest_action=$2
+	local prefix=$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX
+
+	# Save a reference to the original widget
+	case $widgets[$widget] in
+		# Already bound
+		user:_zsh_autosuggest_(bound|orig)_*);;
+
+		# User-defined widget
+		user:*)
+			zle -N $prefix$widget ${widgets[$widget]#*:}
+			;;
+
+		# Built-in widget
+		builtin)
+			eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
+			zle -N $prefix$widget _zsh_autosuggest_orig_$widget
+			;;
+
+		# Completion widget
+		completion:*)
+			eval "zle -C $prefix${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
+			;;
+	esac
+
+	# Pass the original widget's name explicitly into the autosuggest
+	# function. Use this passed in widget name to call the original
+	# widget instead of relying on the $WIDGET variable being set
+	# correctly. $WIDGET cannot be trusted because other plugins call
+	# zle without the `-w` flag (e.g. `zle self-insert` instead of
+	# `zle self-insert -w`).
+	eval "_zsh_autosuggest_bound_${(q)widget}() {
+		_zsh_autosuggest_widget_$autosuggest_action $prefix${(q)widget} \$@
+	}"
+
+	# Create the bound widget
+	zle -N $widget _zsh_autosuggest_bound_$widget
+}
+
+# Map all configured widgets to the right autosuggest widgets
+_zsh_autosuggest_bind_widgets() {
+	local widget
+	local ignore_widgets
+
+	ignore_widgets=(
+		.\*
+		_\*
+		zle-line-\*
+		autosuggest-\*
+		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Find every widget we might want to bind and bind it appropriately
+	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
+		if [ ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget clear
+		elif [ ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget accept
+		elif [ ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget execute
+		elif [ ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]; then
+			_zsh_autosuggest_bind_widget $widget partial_accept
+		else
+			# Assume any unspecified widget might modify the buffer
+			_zsh_autosuggest_bind_widget $widget modify
+		fi
+	done
+}
+
+# Given the name of an original widget and args, invoke it, if it exists
+_zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	[ $# -gt 0 ] || return
+
+	local original_widget_name="$1"
+
+	shift
+
+	if [ $widgets[$original_widget_name] ]; then
+		zle $original_widget_name -- $@
+	fi
+}
+
+#--------------------------------------------------------------------#
+# Highlighting                                                       #
+#--------------------------------------------------------------------#
+
+# If there was a highlight, remove it
+_zsh_autosuggest_highlight_reset() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [ -n "$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT" ]; then
+		region_highlight=("${(@)region_highlight:#$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT}")
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+# If there's a suggestion, highlight it
+_zsh_autosuggest_highlight_apply() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [ $#POSTDISPLAY -gt 0 ]; then
+		_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
+	else
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+#--------------------------------------------------------------------#
+# Autosuggest Widget Implementations                                 #
+#--------------------------------------------------------------------#
+
+# Clear the suggestion
+_zsh_autosuggest_clear() {
+	# Remove the suggestion
+	unset POSTDISPLAY
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Modify the buffer and get a new suggestion
+_zsh_autosuggest_modify() {
+	local -i retval
+
+	# Save the contents of the buffer/postdisplay
+	local orig_buffer="$BUFFER"
+	local orig_postdisplay="$POSTDISPLAY"
+
+	# Clear suggestion while original widget runs
+	unset POSTDISPLAY
+
+	# Original widget may modify the buffer
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Don't fetch a new suggestion if the buffer hasn't changed
+	if [ "$BUFFER" = "$orig_buffer" ]; then
+		POSTDISPLAY="$orig_postdisplay"
+		return $retval
+	fi
+
+	# Get a new suggestion if the buffer is not empty after modification
+	local suggestion
+	if [ $#BUFFER -gt 0 ]; then
+		if [ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" -o $#BUFFER -lt "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]; then
+			suggestion="$(_zsh_autosuggest_suggestion "$BUFFER")"
+		fi
+	fi
+
+	# Add the suggestion to the POSTDISPLAY
+	if [ -n "$suggestion" ]; then
+		POSTDISPLAY="${suggestion#$BUFFER}"
+	fi
+
+	return $retval
+}
+
+# Accept the entire suggestion
+_zsh_autosuggest_accept() {
+	local -i max_cursor_pos=$#BUFFER
+
+	# When vicmd keymap is active, the cursor can't move all the way
+	# to the end of the buffer
+	if [ "$KEYMAP" = "vicmd" ]; then
+		max_cursor_pos=$((max_cursor_pos - 1))
+	fi
+
+	# Only accept if the cursor is at the end of the buffer
+	if [ $CURSOR -eq $max_cursor_pos ]; then
+		# Add the suggestion to the buffer
+		BUFFER="$BUFFER$POSTDISPLAY"
+
+		# Remove the suggestion
+		unset POSTDISPLAY
+
+		# Move the cursor to the end of the buffer
+		CURSOR=${#BUFFER}
+	fi
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Accept the entire suggestion and execute it
+_zsh_autosuggest_execute() {
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	unset POSTDISPLAY
+
+	# Call the original `accept-line` to handle syntax highlighting or
+	# other potential custom behavior
+	_zsh_autosuggest_invoke_original_widget "accept-line"
+}
+
+# Partially accept the suggestion
+_zsh_autosuggest_partial_accept() {
+	local -i retval
+
+	# Save the contents of the buffer so we can restore later if needed
+	local original_buffer="$BUFFER"
+
+	# Temporarily accept the suggestion.
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Original widget moves the cursor
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# If we've moved past the end of the original buffer
+	if [ $CURSOR -gt $#original_buffer ]; then
+		# Set POSTDISPLAY to text right of the cursor
+		POSTDISPLAY="$RBUFFER"
+
+		# Clip the buffer at the cursor
+		BUFFER="$LBUFFER"
+	else
+		# Restore the original buffer
+		BUFFER="$original_buffer"
+	fi
+
+	return $retval
+}
+
+for action in clear modify accept partial_accept execute; do
+	eval "_zsh_autosuggest_widget_$action() {
+		local -i retval
+
+		_zsh_autosuggest_highlight_reset
+
+		_zsh_autosuggest_$action \$@
+		retval=\$?
+
+		_zsh_autosuggest_highlight_apply
+
+		return \$retval
+	}"
+done
+
+zle -N autosuggest-accept _zsh_autosuggest_widget_accept
+zle -N autosuggest-clear _zsh_autosuggest_widget_clear
+zle -N autosuggest-execute _zsh_autosuggest_widget_execute
+
+#--------------------------------------------------------------------#
+# Suggestion                                                         #
+#--------------------------------------------------------------------#
+
+# Delegate to the selected strategy to determine a suggestion
+_zsh_autosuggest_suggestion() {
+	local escaped_prefix="$(_zsh_autosuggest_escape_command "$1")"
+	local strategy_function="_zsh_autosuggest_strategy_$ZSH_AUTOSUGGEST_STRATEGY"
+
+	if [ -n "$functions[$strategy_function]" ]; then
+		echo -E "$($strategy_function "$escaped_prefix")"
+	fi
+}
+
+_zsh_autosuggest_escape_command() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\\()\[\]|*?~]/\\$MATCH}"
+}
+
+#--------------------------------------------------------------------#
+# Default Suggestion Strategy                                        #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix.
+#
+
+_zsh_autosuggest_strategy_default() {
+	fc -lnrm "$1*" 1 2>/dev/null | head -n 1
+}
+
+#--------------------------------------------------------------------#
+# Match Previous Command Suggestion Strategy                         #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix and whose preceding history item also matches the most
+# recently executed command.
+#
+# For example, suppose your history has the following entries:
+#   - pwd
+#   - ls foo
+#   - ls bar
+#   - pwd
+#
+# Given the history list above, when you type 'ls', the suggestion
+# will be 'ls foo' rather than 'ls bar' because your most recently
+# executed command (pwd) was previously followed by 'ls foo'.
+#
+# Note that this strategy won't work as expected with ZSH options that don't
+# preserve the history order such as `HIST_IGNORE_ALL_DUPS` or
+# `HIST_EXPIRE_DUPS_FIRST`.
+
+_zsh_autosuggest_strategy_match_prev_cmd() {
+	local prefix="$1"
+
+	# Get all history event numbers that correspond to history
+	# entries that match pattern $prefix*
+	local history_match_keys
+	history_match_keys=(${(k)history[(R)$prefix*]})
+
+	# By default we use the first history number (most recent history entry)
+	local histkey="${history_match_keys[1]}"
+
+	# Get the previously executed command
+	local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
+
+	# Iterate up to the first 200 history event numbers that match $prefix
+	for key in "${(@)history_match_keys[1,200]}"; do
+		# Stop if we ran out of history
+		[[ $key -gt 1 ]] || break
+
+		# See if the history entry preceding the suggestion matches the
+		# previous command, and use it if it does
+		if [[ "${history[$((key - 1))]}" == "$prev_cmd" ]]; then
+			histkey="$key"
+			break
+		fi
+	done
+
+	# Echo the matched history entry
+	echo -E "$history[$histkey]"
+}
+
+#--------------------------------------------------------------------#
+# Start                                                              #
+#--------------------------------------------------------------------#
+
+# Start the autosuggestion widgets
+_zsh_autosuggest_start() {
+	_zsh_autosuggest_check_deprecated_config
+	_zsh_autosuggest_bind_widgets
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd _zsh_autosuggest_start
diff --git a/zsh/templates/zimrc b/zsh/templates/zimrc
new file mode 100644
index 0000000..b37e839
--- /dev/null
+++ b/zsh/templates/zimrc
@@ -0,0 +1,92 @@
+
+
+#################
+# CORE SETTINGS #
+#################
+
+#
+# Zim settings
+#
+
+# Select what modules you would like enabled.
+# The second line of modules may depend on options set by modules in the first line.
+# These dependencies are noted on the respective module's README.md.
+zmodules=(directory environment git history input utility meta custom \
+          syntax-highlighting history-substring-search prompt completion)
+
+
+###################
+# MODULE SETTINGS #
+###################
+
+#
+# Prompt
+#
+
+# Set your desired prompt here
+zprompt_theme='steeef'
+
+#
+# Completion
+#
+
+# set an optional host-specific filename for the completion cache file
+# if none is provided, the default '.zcompdump' is used.
+#zcompdump_file=".zcompdump-${HOST}-${ZSH_VERSION}"
+
+#
+# Utility
+#
+
+# Uncomment to enable command correction prompts
+# See: http://zsh.sourceforge.net/Doc/Release/Options.html#Input_002fOutput
+#setopt CORRECT
+
+#
+# Environment
+#
+
+# Set the string below to the desired terminal title format string.
+# The terminal title is redrawn upon directory change, however, variables like 
+# ${PWD} are only evaluated once. Use prompt expansion strings for dynamic data:
+#   http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Simple-Prompt-Escapes
+# The example below uses the following format: 'username@host:/current/directory'
+ztermtitle='%n@%m:%~'
+
+#
+# Input
+#
+
+# Uncomment to enable double-dot expansion.
+# This appends '../' to your input for each '.' you type after an initial '..'
+#zdouble_dot_expand='true'
+
+#
+# Syntax-Highlighting
+#
+
+# This determines what highlighters will be used with the syntax-highlighting module.
+# Documentation of the highlighters can be found here:
+#   https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/docs/highlighters.md
+# For (u)rxvt, termite and gnome-terminal users,
+# removing the 'cursor' highlighter will fix the disappearing cursor problem
+zhighlighters=(main brackets cursor)
+
+
+#
+# SSH
+#
+
+# Load these ssh identities with the ssh module
+#zssh_ids=(id_rsa)
+
+
+#
+# Pacman
+#
+
+# Set (optional) pacman front-end.
+#zpacman_frontend='powerpill'
+
+# Load any helper scripts as defined here
+#zpacman_helper=(aur)
diff --git a/zsh/templates/zlogin b/zsh/templates/zlogin
new file mode 100644
index 0000000..f05b263
--- /dev/null
+++ b/zsh/templates/zlogin
@@ -0,0 +1,59 @@
+
+
+#
+# startup file read in interactive login shells
+#
+# The following code helps us by optimizing the existing framework.
+# This includes zcompile, zcompdump, etc.
+#
+
+(
+  # Function to determine the need of a zcompile. If the .zwc file
+  # does not exist, or the base file is newer, we need to compile.
+  # These jobs are asynchronous, and will not impact the interactive shell
+  zcompare() {
+    if [[ -s ${1} && ( ! -s ${1}.zwc || ${1} -nt ${1}.zwc) ]]; then
+      zcompile ${1}
+    fi
+  }
+
+  zim_mods=${ZDOTDIR:-${HOME}}/.zim/modules
+  setopt EXTENDED_GLOB
+
+  # zcompile the completion cache; siginificant speedup.
+  for file in ${ZDOTDIR:-${HOME}}/.zcomp^(*.zwc)(.); do
+    zcompare ${file}
+  done
+
+  # zcompile .zshrc
+  zcompare ${ZDOTDIR:-${HOME}}/.zshrc
+
+  # zcompile some light module init scripts
+  zcompare ${zim_mods}/git/init.zsh
+  zcompare ${zim_mods}/utility/init.zsh
+  zcompare ${zim_mods}/pacman/init.zsh
+  zcompare ${zim_mods}/spectrum/init.zsh
+  zcompare ${zim_mods}/completion/init.zsh
+  zcompare ${zim_mods}/fasd/init.zsh
+
+  # zcompile all .zsh files in the custom module
+  for file in ${zim_mods}/custom/**/^(README.md|*.zwc)(.); do
+    zcompare ${file}
+  done
+
+  # zcompile all autoloaded functions
+  for file in ${zim_mods}/**/functions/^(*.zwc)(.); do
+    zcompare ${file}
+  done
+
+  # syntax-highlighting
+  for file in ${zim_mods}/syntax-highlighting/external/highlighters/**/*.zsh; do
+    zcompare ${file}
+  done
+  zcompare ${zim_mods}/syntax-highlighting/external/zsh-syntax-highlighting.zsh
+
+  # zsh-histery-substring-search
+  zcompare ${zim_mods}/history-substring-search/external/zsh-history-substring-search.zsh
+  
+
+) &!
diff --git a/zsh/templates/zshrc b/zsh/templates/zshrc
new file mode 100644
index 0000000..e640dcc
--- /dev/null
+++ b/zsh/templates/zshrc
@@ -0,0 +1,11 @@
+
+
+#
+# User configuration sourced by interactive shells
+#
+
+# Source zim
+if [[ -s ${ZDOTDIR:-${HOME}}/.zim/init.zsh ]]; then
+  source ${ZDOTDIR:-${HOME}}/.zim/init.zsh
+fi
+
diff --git a/zsh/tools/zim_build_cache b/zsh/tools/zim_build_cache
new file mode 100644
index 0000000..3e747e4
--- /dev/null
+++ b/zsh/tools/zim_build_cache
@@ -0,0 +1,5 @@
+#
+# zim_build_cache - rebuilds the zim cache
+#
+
+source ${ZDOTDIR:-${HOME}}/.zim/templates/zlogin
diff --git a/zsh/tools/zim_clean_cache b/zsh/tools/zim_clean_cache
new file mode 100644
index 0000000..cc62215
--- /dev/null
+++ b/zsh/tools/zim_clean_cache
@@ -0,0 +1,8 @@
+#
+# zim_clean_cache - removes all zcompiled files
+#
+
+find ${ZDOTDIR:-${HOME}}/.zim/ -iname '*.zwc' | xargs rm
+rm -f ${ZDOTDIR:-${HOME}}/.{zshrc.zwc,zcompdump,zcompdump.zwc}
+
+print 'To rebuild the completion cache, please restart your terminal'
diff --git a/zsh/tools/zim_info b/zsh/tools/zim_info
new file mode 100644
index 0000000..856d2b4
--- /dev/null
+++ b/zsh/tools/zim_info
@@ -0,0 +1,9 @@
+#
+# zim_info - prints zim and system info
+#
+
+cd ${ZDOTDIR:-${HOME}}/.zim
+
+print "Zim commit ref:   $(command git rev-parse --short HEAD)"
+print "Zsh version:      $(command zsh --version)"
+print "System info:      $(command uname -a)"
diff --git a/zsh/tools/zim_issue b/zsh/tools/zim_issue
new file mode 100644
index 0000000..5d99cea
--- /dev/null
+++ b/zsh/tools/zim_issue
@@ -0,0 +1,80 @@
+#
+# zim_info - easily create an issue template
+#
+
+# create our 'pause' function
+waiter_func() {
+  local input_key
+  read -sk \?"Press [Enter] to continue; anything else to quit." input_key
+  if [[ ${input_key} == $'\n' ]]; then
+    print "\r                                                    "
+    return 0
+  else
+    return 1
+  fi
+}
+
+# print init dialog
+print "Please check the existing issues to make sure you\'re not duplicating a report"
+print "https://github.com/Eriner/zim/issues"
+
+# if they don't accept, bail
+if ! waiter_func; then
+  return 1
+fi
+
+# for convenience, this is our new home
+cd ${ZDOTDIR:-${HOME}}/.zim
+
+# collect sys info
+git_dirty=$(command git status --porcelain 2>/dev/null | tail -n1)
+git_ref=$(command git rev-parse --short HEAD)
+zsh_version=$(zsh --version)
+operating_sys=$(uname -a)
+
+
+
+# we're going to template and build the issue here (as an array for convenience)
+
+issue_md=("Environment Info"
+          "----------------"
+	  "- Zim commit ref: ${git_ref}"
+	  "- Zsh version: ${zsh_version}"
+	  "- Operating System Info: ${operating_sys}"
+	  ""
+	  "Description"
+	  "-----------"
+	  "${user_desc}"
+	  ""
+	  "Steps to Reproduce"
+	  "------------------"
+	  "${user_reproduce}"
+	  ""
+	  "Images or other Information"
+	  "---------------------------"
+	  ""
+	  )
+	  
+
+# print the output:
+# hack: we need to iterate over the elements to capture the blank spaces (to print newlines)
+for (( i=0; i < ${#issue_md[@]}; i++ )); do
+  printf '%s\n' ${issue_md[i]}
+done
+
+# if we have a dirty git, report it
+if [[ -n ${git_dirty} ]]; then
+  print "${ZDOTDIR:-${HOME}}/.zim has a dirty git working tree."
+  print "here is the diff:"
+  print '```'
+  print $(command git diff)
+  print '```'
+fi
+
+
+print '\n\n'
+print 'Please copy the above and use this when reporting the issue\n'
+
+# optionally, now we can produce debug info
+print 'If you would like to produce some helpful logs about your environment, run:'
+print '$ zmanage debug'
diff --git a/zsh/tools/zim_remove b/zsh/tools/zim_remove
new file mode 100644
index 0000000..925f9b5
--- /dev/null
+++ b/zsh/tools/zim_remove
@@ -0,0 +1,13 @@
+#
+# zim_remove - removes zim from the system
+#
+# Note: this doesn't remove _everything_. It removes as much as
+#       possible while maintaining safety (don't delete custom user content).
+#
+
+sed '/# Source zim/,/fi/d' ${ZDOTDIR:-${HOME}}/.zshrc
+sed '/# The following code helps/,/) &!/d' ${ZDOTDIR:-${HOME}}/.zlogin
+rm -f ${ZDOTDIR:-${HOME}}/.zimrc
+
+# not forcing this one, as it is recursive. It's possible something went wrong.
+rm -r ${ZDOTDIR:-${HOME}}/.zim/
diff --git a/zsh/tools/zim_reset b/zsh/tools/zim_reset
new file mode 100644
index 0000000..2357fc0
--- /dev/null
+++ b/zsh/tools/zim_reset
@@ -0,0 +1,6 @@
+#
+# zim_reset - resets the zim repository to latest commit
+#
+
+cd ${ZDOTDIR:-${HOME}}/.zim
+git reset --hard
diff --git a/zsh/tools/zim_update b/zsh/tools/zim_update
new file mode 100644
index 0000000..5f3f73e
--- /dev/null
+++ b/zsh/tools/zim_update
@@ -0,0 +1,11 @@
+#
+# zim_update - update the zim repository
+#
+
+cd ${ZDOTDIR:-${HOME}/.zim}
+
+# this is the cleanest way I know how to update a repository
+git remote update -p
+git merge --ff-only @\{u\}
+# and update the submodules
+git submodule update --init --recursive